501 files changed, 35729 insertions, 43881 deletions

diff --git a/.gitignore b/.gitignore
index fa09c4ee6..c77ee0466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,10 @@ apps/
 home.html
 # page header plugin
 pageheader.html
-# Ignore site TOS
+# Ignore site TOS & gddpr
 doc/SiteTOS.md
+doc/*/SiteTOS.md
+doc/*/gdpr.md
 # themes except for redbasic
 view/theme/*
 !view/theme/redbasic
@@ -55,6 +57,7 @@ tests/results/
 .buildpath
 .externalToolBuilders
 .settings/
+.pydevproject
 # NetBeans project folder
 nbproject/
 # Kdevelop project files
@@ -75,3 +78,5 @@ composer.phar
 vendor/**/tests/
 vendor/**/Test/
 vendor/sabre/*/examples/
+# /info is a directory containing site-specific HTML documents
+/info/
diff --git a/CHANGELOG b/CHANGELOG
index 1c4b6cdd6..69bc63be5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,51 @@
+Hubzilla 6.0 (2021-07-xx)
+	- Implement swipe to right for bringing in left aside
+	- DB update 1247 to clean up bogus entries in updates
+	- DB update 1246 to mark legacy zot xchans and hublocs deleted
+	- Implement desktop notifications
+	- Emit a warning if the calendar for the created event is disabled
+	- Add an option to drop media for bbcode processing
+	- Make mod HQ the default landing page after login
+	- Implement direct messages view for mod HQ
+	- Implement public/restricted messages view for mod HQ
+	- Implement starred messages view for mod HQ (only available if the Star Posts feature is enabled)
+	- Update composer libs
+	- Remove deprecated mod ping
+	- Remove legacy zot libs and functions - major cleanup
+
+	Bugfixes
+	- Fix deleting and starring in unthreaded view
+	- Fix issue where incomplete datasets were stored into updates
+	- Fix photo item tags not stored and propagated
+	- Fix notifications not loading if a filter was applied
+	- Fix in browser email validation for registrations
+	- Fix directory sync issues
+	- Fix issue where the original rawmsg iconfig got overwritten
+	- Fix unmaintained id3 pareser for PHP8
+	- Fix item_private state for imported items
+	- Random PHP8 fixes (ongoing)
+
+	Addons
+	- Pubcrawl: fix ld-signature for profile updates
+	- Pubcrawl: deprecate as_actor_store() in favor of Activity::actor_store()
+	- Twitter: prevent duplicated tweets
+	- Remove legacy zot dpendencies and deprecated functions
+	- Pubcrawl: fix remote reply for peertube
+	- Pubcrawl: fix issue where we could end up with an xchan but without hubloc
+	- Diaspora: implement the direct_message_recipients hook
+	- Queueworker: add a simple priority mechanism to prevent not so important janitor tasks (e.g. onedirsync) stuffing up the queue and delaying delivery of items
+	- Pubcrawl: implement direct message recognision for activities coming from Mastodon
+	- Pubcrawl: always show complete threads (complete as in all the messages we have received) in public stream
+	- Twitter_api: remove the mail endpoint
+	- Mail: make interface read only with the possibility to download and delete mails (this addon will be removed in a future version)
+	- Pubsubhubbub: move to addons-unmaintained
+	- GNU-Social: move to addons-unmaintained
+	- Fixes to reflect core notifier changes
+	- Diaspora: refactor conversations a.k.a mail to implement direct messages infrastructure
+	- Pubcrawl: allow hublocs to be upgraded from ostatus
+	- Diaspora: fix issue where we could end up with an xchan but without hubloc
+
+
 Hubzilla 5.6.1 (2021-06-04)
 	- Update spanish translations
 	- Fix login name label if register email verification is disabled
diff --git a/SBOM.md b/SBOM.md
index 3d9a5edc9..fec5f406a 100644
--- a/SBOM.md
+++ b/SBOM.md
@@ -5,15 +5,15 @@
 |blueimp/jquery-file-upload|10.31.0.0|MIT|https://github.com/vkhramtsov/jQuery-File-Upload.git|
 |brick/math|0.9.2.0|MIT|https://github.com/brick/math.git|
 |bshaffer/oauth2-server-php|1.11.1.0|MIT|https://github.com/bshaffer/oauth2-server-php.git|
-|commerceguys/intl|1.0.7.0|MIT|https://github.com/commerceguys/intl.git|
+|commerceguys/intl|1.1.0.0|MIT|https://github.com/commerceguys/intl.git|
 |desandro/imagesloaded|4.1.4.0|MIT|https://github.com/desandro/imagesloaded.git|
 |ezyang/htmlpurifier|4.13.0.0|LGPL-2.1-or-later|https://github.com/ezyang/htmlpurifier.git|
-|league/html-to-markdown|4.10.0.0|MIT|https://github.com/thephpleague/html-to-markdown.git|
+|league/html-to-markdown|5.0.0.0|MIT|https://github.com/thephpleague/html-to-markdown.git|
 |lukasreschke/id3parser|0.0.3.0|GPL|https://github.com/LukasReschke/ID3Parser.git|
 |michelf/php-markdown|1.9.0.0|BSD-3-Clause|https://github.com/michelf/php-markdown.git|
 |pear/text_languagedetect|1.0.1.0|BSD-2-Clause|https://github.com/pear/Text_LanguageDetect.git|
 |phpseclib/phpseclib|2.0.30.0|MIT|https://github.com/phpseclib/phpseclib.git|
-|psr/log|1.1.3.0|MIT|https://github.com/php-fig/log.git|
+|psr/log|1.1.4.0|MIT|https://github.com/php-fig/log.git|
 |ramsey/collection|1.1.3.0|MIT|https://github.com/ramsey/collection.git|
 |ramsey/uuid|4.1.1.0|MIT|https://github.com/ramsey/uuid.git|
 |sabre/dav|4.1.5.0|BSD-3-Clause|https://github.com/sabre-io/dav.git|
@@ -23,8 +23,8 @@
 |sabre/vobject|4.3.5.0|BSD-3-Clause|https://github.com/sabre-io/vobject.git|
 |sabre/xml|2.2.3.0|BSD-3-Clause|https://github.com/sabre-io/xml.git|
 |simplepie/simplepie|1.5.6.0|BSD-3-Clause|https://github.com/simplepie/simplepie.git|
-|smarty/smarty|3.1.38.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
-|symfony/polyfill-ctype|1.22.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
+|smarty/smarty|3.1.39.0|LGPL-3.0|https://github.com/smarty-php/smarty.git|
+|symfony/polyfill-ctype|1.23.0.0|MIT|https://github.com/symfony/polyfill-ctype.git|
 |twbs/bootstrap|4.6.0.0|MIT|https://github.com/twbs/bootstrap.git|
 |fullcalendar/fullcalendar|4.4.2.0|MIT|https://github.com/fullcalendar/fullcalendar.git|
 |miromannino/Justified-Gallery|3.8.1.0|MIT|https://github.com/miromannino/Justified-Gallery.git|
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 5c0330806..29a8902b0 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -165,11 +165,6 @@ class Cron {
 			}
 		}
 
-
-		// check if any connections transitioned to zot6 and upgrade the connections to zot6 at this hub if so.
-		require_once('include/connections.php');
-		z6trans_connections();
-
 		require_once('include/attach.php');
 		attach_upgrade();
 
diff --git a/Zotlabs/Daemon/Cron_daily.php b/Zotlabs/Daemon/Cron_daily.php
index bebccca9d..d1b74a032 100644
--- a/Zotlabs/Daemon/Cron_daily.php
+++ b/Zotlabs/Daemon/Cron_daily.php
@@ -95,8 +95,6 @@ class Cron_daily {
 		remove_obsolete_hublocs();
 		remove_duplicate_singleton_hublocs();
 
-		z6_discover();
-
 		$date = datetime_convert();
 		call_hooks('cron_daily', $date);
 
diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php
index f8149ee69..400ef697b 100644
--- a/Zotlabs/Daemon/Deliver.php
+++ b/Zotlabs/Daemon/Deliver.php
@@ -2,7 +2,7 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/queue_fn.php');
+use Zotlabs\Lib\Queue;
 
 class Deliver {
 
@@ -23,7 +23,7 @@ class Deliver {
 			);
 
 			if ($r) {
-				queue_deliver($r[0], true);
+				Queue::deliver($r[0], true);
 			}
 
 		}
diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php
index 1f307b273..35d184206 100644
--- a/Zotlabs/Daemon/Directory.php
+++ b/Zotlabs/Daemon/Directory.php
@@ -74,7 +74,7 @@ class Directory {
 			 * the directory packet. That means we'll try again on the next poll run.
 			 */
 
-			$hash = random_string();
+			$hash = new_uuid();
 
 			Queue::insert(array(
 				'hash'       => $hash,
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
index c4ff8aec6..99fe68b6f 100644
--- a/Zotlabs/Daemon/Expire.php
+++ b/Zotlabs/Daemon/Expire.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Daemon;
 
+require_once('include/items.php');
 
 class Expire {
 
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 741078422..0ae887932 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -6,23 +6,14 @@ use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Activity;
 use Zotlabs\Lib\Queue;
 
-require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
 require_once('include/conversation.php');
-require_once('include/zot.php');
 require_once('include/items.php');
 require_once('include/bbcode.php');
 
 
 /*
- * This file was at one time responsible for doing all deliveries, but this caused
- * big problems on shared hosting systems, where the process might get killed by the
- * hosting provider and nothing would get delivered.
- * It now only delivers one message under certain cases, and invokes a queued
- * delivery mechanism (include/deliver.php) to deliver individual contacts at
- * controlled intervals.
- * This has a much better chance of surviving random processes getting killed
- * by the hosting provider.
+ * Notifier - message dispatch and preparation for delivery
  *
  * The basic flow is:
  *   Identify the type of message
@@ -53,7 +44,6 @@ require_once('include/bbcode.php');
  *	event			(in events.php)
  *	expire			(in items.php)
  *	like			(in like.php, poke.php)
- *	mail			(in message.php)
  *	tag			(in photos.php, poke.php, tagger.php)
  *	tgroup			(in items.php)
  *	wall-new		(in photos.php, item.php)
@@ -63,7 +53,6 @@ require_once('include/bbcode.php');
  * ZOT
  *       permission_create      abook_id
  *       permission_accept      abook_id
- *       permission_reject      abook_id
  *       permission_update      abook_id
  *       refresh_all            channel_id
  *       purge                  channel_id            xchan_hash
@@ -71,7 +60,6 @@ require_once('include/bbcode.php');
  *       expire                 channel_id
  *       relay			item_id (item was relayed to owner, we will deliver it as owner)
  *       single_activity        item_id (deliver to a singleton network from the appropriate clone)
- *       single_mail            mail_id (deliver to a singleton network from the appropriate clone)
  *       location               channel_id
  *       request                channel_id            xchan_hash             message_id
  *       rating                 xlink_id
@@ -82,10 +70,20 @@ require_once('include/bbcode.php');
 
 class Notifier {
 
+	static public $deliveries = [];
+	static public $recipients = [];
+	static public $env_recips = [];
+	static public $packet_type = 'activity';
+	static public $encoding = 'activitystreams';
+	static public $encoded_item = null;
+	static public $channel = null;
+	static public $private = false;
+
 	static public function run($argc, $argv) {
 
-		if ($argc < 3)
+		if ($argc < 3) {
 			return;
+		}
 
 		logger('notifier: invoked: ' . print_r($argv, true), LOGGER_DEBUG);
 
@@ -93,153 +91,97 @@ class Notifier {
 
 		$item_id = $argv[2];
 
-		if (!$item_id)
+		if (!$item_id) {
 			return;
-
-		$sys = get_sys_channel();
-
-		$deliveries = [];
-
-		$request        = false;
-		$mail           = false;
-		$location       = false;
-		$recipients     = [];
-		$normal_mode    = true;
-		$packet_type    = 'undefined';
-
-		if ($cmd === 'mail' || $cmd === 'single_mail') {
-			$normal_mode = false;
-			$mail        = true;
-			$private     = true;
-			$message     = q("SELECT * FROM mail WHERE id = %d LIMIT 1",
-				intval($item_id)
-			);
-			if (!$message) {
-				return;
-			}
-			xchan_mail_query($message[0]);
-			$uid          = $message[0]['channel_id'];
-			$recipients[] = $message[0]['from_xchan']; // include clones
-			$recipients[] = $message[0]['to_xchan'];
-			$item         = $message[0];
-			$encoded_item = encode_mail($item);
-
-			$s = q("select * from channel where channel_id = %d limit 1",
-				intval($uid)
-			);
-			if ($s)
-				$channel = $s[0];
-
 		}
-		elseif ($cmd === 'request') {
-			$channel_id         = $item_id;
-			$xchan              = $argv[3];
-			$request_message_id = $argv[4];
 
-			$s = q("select * from channel where channel_id = %d limit 1",
-				intval($channel_id)
-			);
-			if ($s)
-				$channel = $s[0];
 
-			$private      = true;
-			$recipients[] = $xchan;
-			$packet_type  = 'request';
-			$normal_mode  = false;
-		}
-		elseif ($cmd === 'keychange') {
-			$channel = channelx_by_n($item_id);
+		self::$deliveries   = [];
+		self::$recipients   = [];
+		self::$env_recips   = [];
+		self::$packet_type  = 'activity';
+		self::$encoding     = 'activitystreams';
+		self::$encoded_item = null;
+		self::$channel      = null;
+		self::$private      = false;
+
+		$sys         = get_sys_channel();
+		$normal_mode = true;
 
-			$r       = q("select abook_xchan from abook where abook_channel = %d",
+		if ($cmd === 'keychange') {
+			self::$channel = channelx_by_n($item_id);
+			$r             = q("select abook_xchan from abook where abook_channel = %d",
 				intval($item_id)
 			);
 			if ($r) {
 				foreach ($r as $rr) {
-					$recipients[] = $rr['abook_xchan'];
+					self::$recipients[] = $rr['abook_xchan'];
 				}
 			}
-			$private     = false;
-			$packet_type = 'keychange';
-			$normal_mode = false;
+			self::$private      = false;
+			self::$packet_type  = 'keychange';
+			self::$encoded_item = get_pconfig(self::$channel['channel_id'], 'system', 'keychange');
+			self::$encoding     = 'zot';
+			$normal_mode        = false;
 		}
-		elseif (in_array($cmd, ['permission_update', 'permission_reject', 'permission_accept', 'permission_create'])) {
+		elseif (in_array($cmd, ['permission_update', 'permission_accept', 'permission_create'])) {
 			// Get the (single) recipient
 			$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_self = 0",
 				intval($item_id)
 			);
 			if ($r) {
-				$uid = $r[0]['abook_channel'];
+				$recip = $r[0];
+
 				// Get the sender
-				$channel = channelx_by_n($uid);
-				if ($channel) {
-					$perm_update = ['sender' => $channel, 'recipient' => $r[0], 'success' => false, 'deliveries' => ''];
-
-					if ($cmd === 'permission_create')
-						call_hooks('permissions_create', $perm_update);
-					elseif ($cmd === 'permission_accept')
-						call_hooks('permissions_accept', $perm_update);
-					elseif ($cmd === 'permission_reject')
-						call_hooks('permissions_reject', $perm_update);
-					else
-						call_hooks('permissions_update', $perm_update);
+				self::$channel = channelx_by_n($recip['abook_channel']);
+				if (self::$channel) {
+					$perm_update = ['sender' => self::$channel, 'recipient' => $recip, 'success' => false, 'deliveries' => ''];
+
+					switch ($cmd) {
+						case 'permission_create':
+							call_hooks('permissions_create', $perm_update);
+							break;
+						case 'permission_accept':
+							call_hooks('permissions_accept', $perm_update);
+							break;
+						case 'permission_update':
+							call_hooks('permissions_update', $perm_update);
+							break;
+						default:
+							break;
+					}
 
 					if ($perm_update['success']) {
 						if ($perm_update['deliveries']) {
-							$deliveries[] = $perm_update['deliveries'];
-							do_delivery($deliveries);
+							self::$deliveries[] = $perm_update['deliveries'];
+							do_delivery(self::$deliveries);
 						}
 						return;
 					}
 					else {
-						$recipients[]  = $r[0]['abook_xchan'];
-						$private       = false;
-						$packet_type   = 'refresh';
-						$packet_recips = [['guid' => $r[0]['xchan_guid'], 'guid_sig' => $r[0]['xchan_guid_sig'], 'hash' => $r[0]['xchan_hash']]];
+						self::$recipients[] = $recip['abook_xchan'];
+						self::$private      = false;
+						self::$packet_type  = 'refresh';
+						self::$env_recips   = [$recip['xchan_hash']];
 					}
 				}
 			}
 		}
 		elseif ($cmd === 'refresh_all') {
 			logger('notifier: refresh_all: ' . $item_id);
-			$uid     = $item_id;
-			$channel = channelx_by_n($item_id);
 
-			$r       = q("select abook_xchan from abook where abook_channel = %d",
-				intval($uid)
-			);
-			if ($r) {
-				foreach ($r as $rr) {
-					$recipients[] = $rr['abook_xchan'];
-				}
-			}
-			$private     = false;
-			$packet_type = 'refresh';
-		}
-		elseif ($cmd === 'location') {
-			logger('notifier: location: ' . $item_id);
-			$s = q("select * from channel where channel_id = %d limit 1",
-				intval($item_id)
-			);
-			if ($s)
-				$channel = $s[0];
+			self::$channel = channelx_by_n($item_id);
 
-			$uid        = $item_id;
-			$recipients = [];
-
-			$r          = q("select abook_xchan from abook where abook_channel = %d",
-				intval($uid)
+			$r = q("select abook_xchan from abook where abook_channel = %d",
+				intval($item_id)
 			);
 			if ($r) {
 				foreach ($r as $rr) {
-					$recipients[] = $rr['abook_xchan'];
+					self::$recipients[] = $rr['abook_xchan'];
 				}
 			}
-
-			$encoded_item = ['locations' => Libzot::encode_locations($channel), 'type' => 'location', 'encoding' => 'zot'];
-			$target_item  = ['aid' => $channel['channel_account_id'], 'uid' => $channel['channel_id']];
-			$private      = false;
-			$packet_type  = 'location';
-			$location     = true;
+			self::$private     = false;
+			self::$packet_type = 'refresh';
 		}
 		elseif ($cmd === 'purge') {
 			$xchan = $argv[3];
@@ -248,33 +190,27 @@ class Notifier {
 				return;
 			}
 
-			$channel         = channelx_by_n($item_id);
-			$recipients[]    = $xchan;
-			$private         = true;
-			$packet_type     = 'purge';
-			$packet_recips[] = ['hash' => $xchan];
+			self::$channel     = channelx_by_n($item_id);
+			self::$recipients  = [$xchan];
+			self::$private     = true;
+			self::$packet_type = 'purge';
 		}
 		elseif ($cmd === 'purge_all') {
-
 			logger('notifier: purge_all: ' . $item_id);
-			$channel = channelx_by_n($item_id);
+			self::$channel     = channelx_by_n($item_id);
+			self::$recipients  = [];
+			self::$private     = false;
+			self::$packet_type = 'purge';
 
-			$recipients = [];
-			$r          = q("select abook_xchan from abook where abook_channel = %d and abook_self = 0",
+			$r = q("select abook_xchan from abook where abook_channel = %d and abook_self = 0",
 				intval($item_id)
 			);
 			if (!$r) {
 				return;
 			}
 			foreach ($r as $rr) {
-				$recipients[]    = $rr['abook_xchan'];
-				$packet_recips[] = ['hash' => $rr['abook_xchan']];
+				self::$recipients[] = $rr['abook_xchan'];
 			}
-
-			$private     = false;
-			$packet_type = 'purge';
-
-
 		}
 		else {
 
@@ -282,15 +218,14 @@ class Notifier {
 
 			// Fetch the target item
 
-			$r = q("SELECT * FROM item WHERE id = %d and parent != 0 LIMIT 1",
+			$r = q("SELECT * FROM item WHERE id = %d AND parent != 0",
 				intval($item_id)
 			);
-
-			if (!$r)
+			if (!$r) {
 				return;
+			}
 
 			xchan_query($r);
-
 			$r = fetch_post_tags($r);
 
 			$target_item = $r[0];
@@ -345,11 +280,12 @@ class Notifier {
 			$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			if ($s)
-				$channel = $s[0];
+			if ($s) {
+				self::$channel = $s[0];
+			}
 
-			if ($channel['channel_hash'] !== $target_item['author_xchan'] && $channel['channel_hash'] !== $target_item['owner_xchan']) {
-				logger("notifier: Sending channel {$channel['channel_hash']} is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
+			if (self::$channel['channel_hash'] !== $target_item['author_xchan'] && self::$channel['channel_hash'] !== $target_item['owner_xchan']) {
+				logger("notifier: Sending channel " . self::$channel['channel_hash'] . " is not owner {$target_item['owner_xchan']} or author {$target_item['author_xchan']}", LOGGER_NORMAL, LOG_WARNING);
 				return;
 			}
 
@@ -359,12 +295,13 @@ class Notifier {
 			}
 			else {
 				// fetch the parent item
-				$r = q("SELECT * from item where id = %d order by id asc",
+				$r = q("SELECT * FROM item WHERE id = %d",
 					intval($target_item['parent'])
 				);
 
-				if (!$r)
+				if (!$r) {
 					return;
+				}
 
 				if (strpos($r[0]['postopts'], 'nodeliver') !== false) {
 					logger('notifier: target item is undeliverable', LOGGER_DEBUG, LOG_NOTICE);
@@ -379,20 +316,17 @@ class Notifier {
 			}
 
 			// avoid looping of discover items 12/4/2014
-
-			if ($sys && $parent_item['uid'] == $sys['channel_id'])
+			if ($sys && $parent_item['uid'] == $sys['channel_id']) {
 				return;
+			}
 
-			$encoded_item = encode_item($target_item);
-
+			$m = get_iconfig($target_item, 'activitypub', 'signed_data');
 			// Re-use existing signature unless the activity type changed to a Tombstone, which won't verify.
-			$m = ((intval($target_item['item_deleted'])) ? '' : get_iconfig($target_item, 'activitypub', 'signed_data'));
-
-			if ($m) {
-				$activity = json_decode($m, true);
+			if ($m && (!intval($target_item['item_deleted']))) {
+				self::$encoded_item = json_decode($m, true);
 			}
 			else {
-				$activity = array_merge(['@context' => [
+				self::$encoded_item = array_merge(['@context' => [
 					ACTIVITYSTREAMS_JSONLD_REV,
 					'https://w3id.org/security/v1',
 					z_root() . ZOT_APSCHEMA_REV
@@ -401,7 +335,7 @@ class Notifier {
 			}
 
 			logger('target_item: ' . print_r($target_item, true), LOGGER_DEBUG);
-			logger('encoded: ' . print_r($activity, true), LOGGER_DEBUG);
+			logger('encoded: ' . print_r(self::$encoded_item, true), LOGGER_DEBUG);
 
 			// Send comments to the owner to re-deliver to everybody in the conversation
 			// We only do this if the item in question originated on this site. This prevents looping.
@@ -412,9 +346,9 @@ class Notifier {
 			// flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
 			// the hostname in the message_id and provides a second (fallback) opinion.
 
-			$relay_to_owner = (((!$top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
-
-			$uplink = false;
+			$relay_to_owner = (!$top_level_post && intval($target_item['item_origin']) && comment_local_origin($target_item));
+			$uplink         = false;
+			$upstream       = false;
 
 			// $cmd === 'relay' indicates the owner is sending it to the original recipients
 			// don't allow the item in the relay command to relay to owner under any circumstances, it will loop
@@ -426,27 +360,34 @@ class Notifier {
 
 			if (($cmd === 'uplink') && intval($parent_item['item_uplink']) && (!$top_level_post)) {
 				logger('notifier: uplink');
-				$uplink = true;
+				$uplink            = true;
+				self::$packet_type = 'response';
 			}
 
 			if (($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
 				logger('notifier: followup relay', LOGGER_DEBUG);
-				$recipients = [($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']];
-				$private    = true;
-				if (!$encoded_item['flags'])
-					$encoded_item['flags'] = [];
-				$encoded_item['flags'][] = 'relay';
-				$upstream                = true;
+				$sendto            = (($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);
+				self::$recipients  = [$sendto];
+				self::$private     = true;
+				$upstream          = true;
+				self::$packet_type = 'response';
 			}
 			else {
-				logger('notifier: normal distribution', LOGGER_DEBUG);
-				if ($cmd === 'relay')
-					logger('notifier: owner relay');
-				$upstream = false;
+				if ($cmd === 'relay') {
+					logger('owner relay (downstream delivery)');
+				}
+				else {
+					logger('normal (downstream) distribution', LOGGER_DEBUG);
+				}
+
+				if ($parent_item && $parent_item['item_private'] !== $target_item['item_private']) {
+					logger('conversation privacy mismatch - downstream delivery prevented');
+					return;
+				}
+
 				// if our parent is a tag_delivery recipient, uplink to the original author causing
 				// a delivery fork.
-
-				if (($parent_item) && intval($parent_item['item_uplink']) && (!$top_level_post) && ($cmd !== 'uplink')) {
+				if ($parent_item && intval($parent_item['item_uplink']) && !$top_level_post && $cmd !== 'uplink') {
 					// don't uplink a relayed post to the relay owner
 					if ($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
 						logger('notifier: uplinking this item');
@@ -454,98 +395,88 @@ class Notifier {
 					}
 				}
 
-				$private    = false;
-				$recipients = collect_recipients($parent_item, $private);
+				self::$private    = false;
+				self::$recipients = collect_recipients($parent_item, self::$private);
+
+				// FIXME add any additional recipients such as mentions, etc.
 
 				if ($top_level_post) {
 					// remove clones who will receive the post via sync
-					$recipients = array_diff($recipients, [$target_item['owner_xchan']]);
+					self::$recipients = array_values(array_diff(self::$recipients, [$target_item['owner_xchan']]));
 				}
 
-				// FIXME add any additional recipients such as mentions, etc.
-
+				// don't send deletions onward for other people's stuff
+				if (intval($target_item['item_deleted']) && (!intval($target_item['item_wall']))) {
+					logger('notifier: ignoring delete notification for non-wall item', LOGGER_NORMAL, LOG_NOTICE);
+					return;
+				}
 			}
 		}
 
-		$walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false);
-
 		// Generic delivery section, we have an encoded item and recipients
 		// Now start the delivery process
 
-		$x          = $encoded_item;
-		$x['title'] = 'private';
-		$x['body']  = 'private';
-		logger('notifier: encoded item: ' . print_r($x, true), LOGGER_DATA, LOG_DEBUG);
+		logger('encoded item: ' . print_r(self::$encoded_item, true), LOGGER_DATA, LOG_DEBUG);
 
-		//logger('notifier: encoded activity: ' . print_r($activity,true), LOGGER_DATA, LOG_DEBUG);
-
-		stringify_array_elms($recipients);
-		if (!$recipients) {
+		stringify_array_elms(self::$recipients);
+		if (!self::$recipients) {
 			logger('no recipients');
 			return;
 		}
 
-		//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
-
-		$env_recips = (($private) ? [] : null);
+		// logger('recipients: ' . print_r(self::$recipients,true), LOGGER_NORMAL, LOG_DEBUG);
 
-		$details = q("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',', $recipients)) . ")");
+		if (!count(self::$env_recips)) {
+			self::$env_recips = ((self::$private) ? [] : null);
+		}
 
 		$recip_list = [];
 
+		$details = dbq("select xchan_hash, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ")");
+
 		if ($details) {
 			foreach ($details as $d) {
 				$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')';
-				if ($private) {
-					$env_recips[] = [
-						'guid'     => $d['xchan_guid'],
-						'guid_sig' => $d['xchan_guid_sig'],
-						'hash'     => $d['xchan_hash']
-					];
+				if (self::$private) {
+					self::$env_recips[] = $d['xchan_hash'];
 				}
 			}
 		}
 
 
 		$narr = [
-			'channel'        => $channel,
+			'channel'        => self::$channel,
 			'upstream'       => $upstream,
-			'env_recips'     => $env_recips,
-			'packet_recips'  => $packet_recips,
-			'recipients'     => $recipients,
-			'item'           => $item,
+			'env_recips'     => self::$env_recips,
+			'recipients'     => self::$recipients,
 			'target_item'    => $target_item,
 			'parent_item'    => $parent_item,
 			'top_level_post' => $top_level_post,
-			'private'        => $private,
+			'private'        => self::$private,
 			'relay_to_owner' => $relay_to_owner,
 			'uplink'         => $uplink,
 			'cmd'            => $cmd,
-			'mail'           => $mail,
-			'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-			'location'       => $location,
-			'request'        => $request,
+			'single'         => ($cmd === 'single_activity'),
 			'normal_mode'    => $normal_mode,
-			'packet_type'    => $packet_type,
-			'walltowall'     => $walltowall,
+			'packet_type'    => self::$packet_type,
 			'queued'         => []
 		];
 
 		call_hooks('notifier_process', $narr);
 		if ($narr['queued']) {
 			foreach ($narr['queued'] as $pq)
-				$deliveries[] = $pq;
+				self::$deliveries[] = $pq;
 		}
 
 		// notifier_process can alter the recipient list
 
-		$recipients    = $narr['recipients'];
-		$env_recips    = $narr['env_recips'];
-		$packet_recips = $narr['packet_recips'];
+		self::$recipients = $narr['recipients'];
+		self::$env_recips = $narr['env_recips'];
 
-		if (($private) && (!$env_recips)) {
+		if (self::$private && !self::$env_recips) {
 			// shouldn't happen
 			logger('notifier: private message with no envelope recipients.' . print_r($argv, true), LOGGER_NORMAL, LOG_NOTICE);
+			return;
 		}
 
 		logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list, true), LOGGER_DEBUG);
@@ -554,15 +485,15 @@ class Notifier {
 		// Now we have collected recipients (except for external mentions, FIXME)
 		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
-		$hubs = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc left join site on site_url = hubloc_url
-			where hubloc_hash in (" . protect_sprintf(implode(',', $recipients)) . ")
+		$hubs = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc left join site on site_url = hubloc_url
+			where hubloc_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ")
 			and hubloc_error = 0 and hubloc_deleted = 0"
 		);
 
 		// public posts won't make it to the local public stream unless there's a recipient on this site.
 		// This code block sees if it's a public post and localhost is missing, and if so adds an entry for the local sys channel to the $hubs list
 
-		if (!$private) {
+		if (!self::$private) {
 			$found_localhost = false;
 			if ($hubs) {
 				foreach ($hubs as $h) {
@@ -573,12 +504,12 @@ class Notifier {
 				}
 			}
 			if (!$found_localhost) {
-				$localhub = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc
-					left join site on site_url = hubloc_url where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0",
+				$localhub = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc left join site on site_url = hubloc_url
+				 	where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0",
 					dbesc(z_root() . '/channel/sys')
 				);
 				if ($localhub) {
-					$hubs = array_merge($hubs, $localhub);
+					$hubs = array_merge($localhub, $hubs);
 				}
 			}
 		}
@@ -603,33 +534,24 @@ class Notifier {
 		$dead    = []; // known dead hubs - report them as undeliverable
 
 		foreach ($hubs as $hub) {
-
-			if (intval($hub['site_dead'])) {
+			if (isset($hub['site_dead']) && intval($hub['site_dead'])) {
 				$dead[] = $hub;
 				continue;
 			}
 
-			if ($env_recips) {
-				foreach ($env_recips as $er) {
-					if ($hub['hubloc_hash'] === $er['hash']) {
-						if (!array_key_exists($hub['hubloc_host'] . $hub['hubloc_sitekey'], $hub_env)) {
-							$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] = [];
+			if (self::$env_recips) {
+				foreach (self::$env_recips as $er) {
+					if ($hub['hubloc_hash'] === $er) {
+						if (!array_key_exists($hub['hubloc_site_id'], $hub_env)) {
+							$hub_env[$hub['hubloc_site_id']] = [];
 						}
-						$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']][] = $er;
+						$hub_env[$hub['hubloc_site_id']][] = $er;
 					}
 				}
 			}
 
-
-			if ($hub['hubloc_network'] == 'zot') {
+			if ($hub['hubloc_network'] === 'zot6') {
 				if (!in_array($hub['hubloc_sitekey'], $keys)) {
-					$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
-					$dhubs[]   = $hub;
-					$keys[]    = $hub['hubloc_sitekey'];
-				}
-			}
-			else {
-				if (!in_array($hub['hubloc_url'], $urls)) {
 					if ($hub['hubloc_url'] === z_root()) {
 						//deliver to local hub first
 						array_unshift($hublist, $hub['hubloc_host'] . ' ' . $hub['hubloc_network']);
@@ -639,7 +561,14 @@ class Notifier {
 						$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
 						$dhubs[]   = $hub;
 					}
-					$urls[] = $hub['hubloc_url'];
+					$keys[] = $hub['hubloc_sitekey'];
+				}
+			}
+			else {
+				if (!in_array($hub['hubloc_url'], $urls)) {
+					$hublist[] = $hub['hubloc_host'] . ' ' . $hub['hubloc_network'];
+					$dhubs[]   = $hub;
+					$urls[]    = $hub['hubloc_url'];
 				}
 			}
 		}
@@ -650,37 +579,30 @@ class Notifier {
 
 			logger('notifier_hub: ' . $hub['hubloc_url'], LOGGER_DEBUG);
 
-			if (!in_array($hub['hubloc_network'], ['zot', 'zot6'])) {
+			if ($hub['hubloc_network'] !== 'zot6') {
 				$narr = [
-					'channel'        => $channel,
+					'channel'        => self::$channel,
 					'upstream'       => $upstream,
-					'env_recips'     => $env_recips,
-					'packet_recips'  => $packet_recips,
-					'recipients'     => $recipients,
-					'item'           => $item,
+					'env_recips'     => self::$env_recips,
+					'recipients'     => self::$recipients,
 					'target_item'    => $target_item,
 					'parent_item'    => $parent_item,
 					'hub'            => $hub,
 					'top_level_post' => $top_level_post,
-					'private'        => $private,
+					'private'        => self::$private,
 					'relay_to_owner' => $relay_to_owner,
 					'uplink'         => $uplink,
 					'cmd'            => $cmd,
-					'mail'           => $mail,
-					'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-					'location'       => $location,
-					'request'        => $request,
+					'single'         => $cmd === 'single_activity',
 					'normal_mode'    => $normal_mode,
-					'packet_type'    => $packet_type,
-					'walltowall'     => $walltowall,
+					'packet_type'    => self::$packet_type,
 					'queued'         => []
 				];
 
-
 				call_hooks('notifier_hub', $narr);
 				if ($narr['queued']) {
 					foreach ($narr['queued'] as $pq)
-						$deliveries[] = $pq;
+						self::$deliveries[] = $pq;
 				}
 				continue;
 
@@ -695,153 +617,62 @@ class Notifier {
 			// will invoke a delivery to those connections which are connected to just that
 			// hub instance.
 
-			if ($cmd === 'single_mail' || $cmd === 'single_activity') {
-				continue;
-			}
-
-			if (!in_array($hub['hubloc_network'], ['zot', 'zot6'])) {
+			if ($cmd === 'single_activity') {
 				continue;
 			}
 
-			// Do not change this to a uuid as long as we have traditional zot servers
-			// in the loop. The signature verification step can't handle dashes in the
-			// hashes.
+			// default: zot protocol
 
-			$hash = random_string(48);
+			$hash = new_uuid();
 
-			$packet = null;
-			$pmsg   = '';
-
-			if ($packet_type === 'refresh' || $packet_type === 'purge') {
-				if ($hub['hubloc_network'] === 'zot6') {
-					$packet = Libzot::build_packet($channel, $packet_type, ids_to_array($packet_recips, 'hash'));
-				}
-				else {
-					$packet = zot_build_packet($channel, $packet_type, (($packet_recips) ? $packet_recips : null));
-				}
-			}
-			if ($packet_type === 'keychange' && $hub['hubloc_network'] === 'zot') {
-				$pmsg   = get_pconfig($channel['channel_id'], 'system', 'keychange');
-				$packet = zot_build_packet($channel, $packet_type, (($packet_recips) ? $packet_recips : null));
-			}
-			elseif ($packet_type === 'request' && $hub['hubloc_network'] === 'zot') {
-				$env    = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
-				$packet = zot_build_packet($channel, $packet_type, $env, $hub['hubloc_sitekey'], $hub['site_crypto'],
-					$hash, ['message_id' => $request_message_id]
-				);
-			}
-
-			if ($packet) {
-				Queue::insert(
-					[
-						'hash'       => $hash,
-						'account_id' => $channel['channel_account_id'],
-						'channel_id' => $channel['channel_id'],
-						'posturl'    => $hub['hubloc_callback'],
-						'driver'     => $hub['hubloc_network'],
-						'notify'     => $packet,
-						'msg'        => (($pmsg) ? json_encode($pmsg) : '')
-					]
-				);
+			$env = (($hub_env && $hub_env[$hub['hubloc_site_id']]) ? $hub_env[$hub['hubloc_site_id']] : '');
+			if ((self::$private) && (!$env)) {
+				continue;
 			}
-			else {
-				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
-
-				if ($hub['hubloc_network'] === 'zot6') {
-					$zenv = [];
-					if ($env) {
-						foreach ($env as $e) {
-							$zenv[] = $e['hash'];
-						}
-					}
-
-					$packet_type = (($upstream || $uplink) ? 'response' : 'activity');
-
-					// block zot private reshares from zot6, as this could cause a number of privacy issues
-					// due to parenting differences between the reshare implementations. In zot a reshare is
-					// a standalone parent activity and in zot6 it is a followup/child of the original activity.
-					// For public reshares, some comments to the reshare on the zot fork will not make it to zot6
-					// due to these different message models. This cannot be prevented at this time.
-
-					if ($packet_type === 'activity' && $activity['type'] === 'Announce' && intval($target_item['item_private'])) {
-						continue;
-					}
-
-					$packet = Libzot::build_packet($channel, $packet_type, $zenv, $activity, 'activitystreams', (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto']);
-				}
-				else {
-					// currently zot6 delivery is only performed on normal items and not sync items or mail or anything else
-					// Eventually we will do this for all deliveries, but for now ensure this is precisely what we are dealing
-					// with before switching to zot6 as the primary zot6 handler checks for the existence of a message delivery report
-					// to trigger dequeue'ing
-
-					$z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (!array_key_exists('allow_cid', $encoded_item))) ? true : false);
-					if ($z6) {
-						$packet = zot6_build_packet($channel, 'notify', $env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'], $hash);
-					}
-					else {
-						$packet = zot_build_packet($channel, 'notify', $env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'], $hash);
-
-					}
-				}
 
+			$packet = Libzot::build_packet(self::$channel, self::$packet_type, $env, self::$encoded_item, self::$encoding, ((self::$private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto']);
 
-				// remove this after most hubs have updated to version 5.0
-				if (stripos($hub['site_project'], 'hubzilla') !== false && version_compare($hub['site_version'], '4.7.3', '<=')) {
-					if ($encoded_item['type'] === 'mail') {
-						$encoded_item['from']['network']  = 'zot';
-						$encoded_item['from']['guid_sig'] = str_replace('sha256.', '', $encoded_item['from']['guid_sig']);
-					}
-					else {
-						$encoded_item['owner']['network']  = 'zot';
-						$encoded_item['owner']['guid_sig'] = str_replace('sha256.', '', $encoded_item['owner']['guid_sig']);
-						if (strpos($encoded_item['author']['url'], z_root()) === 0) {
-							$encoded_item['author']['network']  = 'zot';
-							$encoded_item['author']['guid_sig'] = str_replace('sha256.', '', $encoded_item['author']['guid_sig']);
-						}
-					}
-				}
+			Queue::insert(
+				[
+					'hash'       => $hash,
+					'account_id' => self::$channel['channel_account_id'],
+					'channel_id' => self::$channel['channel_id'],
+					'posturl'    => $hub['hubloc_callback'],
+					'notify'     => $packet,
+					'msg'        => EMPTY_STR
+				]
+			);
 
-				Queue::insert(
-					[
-						'hash'       => $hash,
-						'account_id' => $target_item['aid'],
-						'channel_id' => $target_item['uid'],
-						'posturl'    => $hub['hubloc_callback'],
-						'driver'     => $hub['hubloc_network'],
-						'notify'     => $packet,
-						'msg'        => json_encode($encoded_item)
-					]
+			// only create delivery reports for normal undeleted items
+			if (is_array($target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) {
+				q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue )
+					values ( '%s', '%s','%s','%s','%s','%s','%s','%s' ) ",
+					dbesc($target_item['mid']),
+					dbesc($hub['hubloc_host']),
+					dbesc($hub['hubloc_host']),
+					dbesc($hub['hubloc_host']),
+					dbesc('queued'),
+					dbesc(datetime_convert()),
+					dbesc(self::$channel['channel_hash']),
+					dbesc($hash)
 				);
-
-				// only create delivery reports for normal undeleted items
-				if (is_array($target_item) && array_key_exists('postopts', $target_item) && (!$target_item['item_deleted']) && (!get_config('system', 'disable_dreport'))) {
-					q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan, dreport_queue ) values ( '%s','%s','%s','%s','%s','%s','%s' ) ",
-						dbesc($target_item['mid']),
-						dbesc($hub['hubloc_host']),
-						dbesc($hub['hubloc_host']),
-						dbesc('queued'),
-						dbesc(datetime_convert()),
-						dbesc($channel['channel_hash']),
-						dbesc($hash)
-					);
-				}
 			}
 
-			$deliveries[] = $hash;
+			self::$deliveries[] = $hash;
+
 		}
 
 		if ($normal_mode) {
+			// This wastes a process if there are no delivery hooks configured, so check this before launching the new process
 			$x = q("select * from hook where hook = 'notifier_normal'");
 			if ($x) {
 				Master::Summon(['Deliver_hooks', $target_item['id']]);
 			}
 		}
 
-		if ($deliveries)
-			do_delivery($deliveries);
-
-		logger('notifier: basic loop complete.', LOGGER_DEBUG);
+		if (self::$deliveries) {
+			do_delivery(self::$deliveries);
+		}
 
 		if ($dead) {
 			foreach ($dead as $deceased) {
@@ -854,8 +685,8 @@ class Notifier {
 						dbesc($deceased['hubloc_host']),
 						dbesc('undeliverable/unresponsive site'),
 						dbesc(datetime_convert()),
-						dbesc($channel['channel_hash']),
-						dbesc(random_string(48))
+						dbesc(self::$channel['channel_hash']),
+						dbesc(new_uuid())
 					);
 				}
 			}
@@ -864,6 +695,7 @@ class Notifier {
 		call_hooks('notifier_end', $target_item);
 
 		logger('notifer: complete.');
+
 		return;
 
 	}
diff --git a/Zotlabs/Daemon/Onedirsync.php b/Zotlabs/Daemon/Onedirsync.php
index 47904ea21..ea995be9e 100644
--- a/Zotlabs/Daemon/Onedirsync.php
+++ b/Zotlabs/Daemon/Onedirsync.php
@@ -5,10 +5,6 @@ namespace Zotlabs\Daemon;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Libzotdir;
 
-require_once('include/zot.php');
-require_once('include/dir_fns.php');
-
-
 class Onedirsync {
 
 	static public function run($argc, $argv) {
@@ -55,14 +51,14 @@ class Onedirsync {
 		// ignore doing an update if this ud_addr refers to a known dead hubloc
 
 		$h = q("select * from hubloc where hubloc_addr = '%s'",
-			dbesc($r[0]['ud_addr'])
+			dbesc($r[0]['ud_addr']),
 		);
 
 		$h = Libzot::zot_record_preferred($h);
 
-		if (($h) && (($h['hubloc_status'] & HUBLOC_OFFLINE) || $h['hubloc_deleted'] || $h['hubloc_error']) ) {
+		if (($h) && (($h['hubloc_status'] & HUBLOC_OFFLINE) || $h['hubloc_deleted'] || $h['hubloc_error'])) {
 			q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 ",
-				intval(UPDATE_FLAGS_UPDATED),
+				intval(UPDATE_FLAGS_DELETED),
 				dbesc($r[0]['ud_addr']),
 				intval(UPDATE_FLAGS_UPDATED)
 			);
@@ -72,7 +68,7 @@ class Onedirsync {
 		// we might have to pull this out some day, but for now update_directory_entry()
 		// runs zot_finger() and is kind of zot specific
 
-		if ($h && !in_array($h['hubloc_network'], ['zot6', 'zot']))
+		if ($h && $h['hubloc_network'] !== 'zot6')
 			return;
 
 		Libzotdir::update_directory_entry($r[0]);
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
index d747e65f3..4aebf64b0 100644
--- a/Zotlabs/Daemon/Onepoll.php
+++ b/Zotlabs/Daemon/Onepoll.php
@@ -8,6 +8,7 @@ use Zotlabs\Lib\ASCollection;
 use Zotlabs\Lib\Libzot;
 
 require_once('include/socgraph.php');
+require_once('include/feedutils.php');
 
 class Onepoll {
 
@@ -44,7 +45,7 @@ class Onepoll {
 			return;
 		}
 
-		$contact      = array_shift($contacts);
+		$contact      = $contacts[0];
 		$importer_uid = $contact['abook_channel'];
 
 		$r = q("SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
@@ -75,16 +76,12 @@ class Onepoll {
 			return;
 		}
 
-		if (!in_array($contact['xchan_network'], ['zot', 'zot6']))
+		if ($contact['xchan_network'] !== 'zot6')
 			return;
 
 		// update permissions
 
-		if ($contact['xchan_network'] === 'zot6')
-			$x = Libzot::refresh($contact, $importer);
-
-		if ($contact['xchan_network'] === 'zot')
-			$x = zot_refresh($contact, $importer);
+		$x = Libzot::refresh($contact, $importer);
 
 		$responded = false;
 		$updated   = datetime_convert();
@@ -109,31 +106,30 @@ class Onepoll {
 			return;
 
 		$fetch_feed = true;
-		$x          = null;
 
 		// They haven't given us permission to see their stream
-
 		$can_view_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'their_perms', 'view_stream'));
 
-		if (!$can_view_stream)
+		if (!$can_view_stream) {
 			$fetch_feed = false;
+		}
 
 		// we haven't given them permission to send us their stream
-
 		$can_send_stream = intval(get_abconfig($importer_uid, $contact['abook_xchan'], 'my_perms', 'send_stream'));
 
-		if (!$can_send_stream)
+		if (!$can_send_stream) {
 			$fetch_feed = false;
+		}
 
-		if ($fetch_feed && $contact['xchan_network'] !== 'zot') {
+		if ($fetch_feed) {
 
 			$max = intval(get_config('system', 'max_imported_posts', 30));
 
 			if (intval($max)) {
 				$cl = get_xconfig($contact['abook_xchan'], 'activitypub', 'collections');
 
-				if (is_array($cl) && $cl) {
-					$url = ((array_key_exists('outbox', $cl)) ? $cl['outbox'] : '');
+				if (is_array($cl) && array_key_exists('outbox', $cl)) {
+					$url = $cl['outbox'];
 				}
 				else {
 					$url = str_replace('/poco/', '/zotfeed/', $contact['xchan_connurl']);
@@ -163,8 +159,10 @@ class Onepoll {
 		// update the poco details for this connection
 		$r = q("SELECT xlink_id from xlink where xlink_xchan = '%s' and xlink_updated > %s - INTERVAL %s and xlink_static = 0 limit 1",
 			intval($contact['xchan_hash']),
-			db_utcnow(), db_quoteinterval('1 DAY')
+			db_utcnow(),
+			db_quoteinterval('1 DAY')
 		);
+
 		if (!$r) {
 			poco_load($contact['xchan_hash'], $contact['xchan_connurl']);
 		}
diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php
index 762f1349c..88213a7c9 100644
--- a/Zotlabs/Daemon/Poller.php
+++ b/Zotlabs/Daemon/Poller.php
@@ -69,11 +69,11 @@ class Poller {
 			abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending,
 			abook.abook_ignored, abook.abook_blocked,
 			xchan.xchan_network,
-			account.account_lastlog, account.account_flags 
-			FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash 
+			account.account_lastlog, account.account_flags
+			FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash
 			LEFT JOIN account on abook_account = account_id
 			where abook_self = 0
-			$sql_extra 
+			$sql_extra
 			AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc",
 			intval(ACCOUNT_OK),
 			intval(ACCOUNT_UNVERIFIED)     // FIXME
@@ -102,8 +102,7 @@ class Poller {
 					continue;
 				}
 
-
-				if (!in_array($contact['xchan_network'], ['zot', 'zot6']))
+				if ($contact['xchan_network'] !== 'zot6')
 					continue;
 
 				if ($c == $t) {
@@ -191,7 +190,7 @@ class Poller {
 
 		set_config('system', 'lastpoll', datetime_convert());
 
-		//All done - clear the lockfile	
+		//All done - clear the lockfile
 
 		@unlink($lockfile);
 
diff --git a/Zotlabs/Daemon/Queue.php b/Zotlabs/Daemon/Queue.php
index e1f4b73de..41aaf45ed 100644
--- a/Zotlabs/Daemon/Queue.php
+++ b/Zotlabs/Daemon/Queue.php
@@ -2,8 +2,7 @@
 
 namespace Zotlabs\Daemon;
 
-require_once('include/queue_fn.php');
-require_once('include/zot.php');
+use Zotlabs\Lib\Queue as LibQueue;
 
 class Queue {
 
@@ -48,17 +47,17 @@ class Queue {
 		else {
 
 			// For the first 12 hours we'll try to deliver every 15 minutes
-			// After that, we'll only attempt delivery once per hour. 
-			// This currently only handles the default queue drivers ('zot' or '') which we will group by posturl 
+			// After that, we'll only attempt delivery once per hour.
+			// This currently only handles the default queue drivers ('zot' or '') which we will group by posturl
 			// so that we don't start off a thousand deliveries for a couple of dead hubs.
 			// The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made).
 			// Other drivers will have to do something different here and may need their own query.
 
-			// Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the 
+			// Note: this requires some tweaking as new posts to long dead hubs once a day will keep them in the
 			// "every 15 minutes" category. We probably need to prioritise them when inserted into the queue
 			// or just prior to this query based on recent and long-term delivery history. If we have good reason to believe
-			// the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once 
-			// or twice a day. 
+			// the site is permanently down, there's no reason to attempt delivery at all, or at most not more than once
+			// or twice a day.
 
 			$sqlrandfunc = db_getfunc('rand');
 
@@ -67,7 +66,7 @@ class Queue {
 			);
 			while ($r) {
 				foreach ($r as $rv) {
-					queue_deliver($rv);
+					LibQueue::deliver($rv);
 				}
 				$r = q("SELECT *,$sqlrandfunc as rn FROM outq WHERE outq_delivered = 0 and outq_scheduled < %s order by rn limit 1",
 					db_utcnow()
@@ -78,7 +77,7 @@ class Queue {
 			return;
 
 		foreach ($r as $rv) {
-			queue_deliver($rv);
+			LibQueue::deliver($rv);
 		}
 	}
 }
diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php
deleted file mode 100644
index 8afde2c4c..000000000
--- a/Zotlabs/Daemon/Ratenotif.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Zotlabs\Daemon;
-
-require_once('include/zot.php');
-require_once('include/queue_fn.php');
-
-
-class Ratenotif {
-
-	static public function run($argc,$argv) {
-
-
-		// Deprecated
-		return;
-
-
-		require_once("datetime.php");
-		require_once('include/items.php');
-
-		if($argc < 3)
-			return;
-
-
-		logger('ratenotif: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
-
-		$cmd = $argv[1];
-
-		$item_id = $argv[2];
-
-
-		if($cmd === 'rating') {
-			$r = q("select * from xlink where xlink_id = %d and xlink_static = 1 limit 1",
-				intval($item_id)
-			);
-			if(! $r) {
-				logger('rating not found');
-				return;
-			}
-
-			$encoded_item = array(
-				'type' => 'rating', 
-				'encoding' => 'zot',
-				'target' => $r[0]['xlink_link'],
-				'rating' => intval($r[0]['xlink_rating']),
-				'rating_text' => $r[0]['xlink_rating_text'],
-				'signature' => $r[0]['xlink_sig'],
-				'edited' => $r[0]['xlink_updated']
-			);
-		}
-
-		$channel = channelx_by_hash($r[0]['xlink_xchan']);
-		if(! $channel) {
-			logger('no channel');
-			return;
-		}
-
-
-		$primary = get_directory_primary();
-	
-		if(! $primary)
-			return;
-
-
-		$interval = ((get_config('system','delivery_interval') !== false) 
-			? intval(get_config('system','delivery_interval')) : 2 );
-
-		$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
-
-		if($deliveries_per_process <= 0)
-			$deliveries_per_process = 1;
-
-		$deliver = array();
-
-		$x = z_fetch_url($primary . '/regdir');
-		if($x['success']) {
-			$j = json_decode($x['body'],true);
-			if($j && $j['success'] && is_array($j['directories'])) {
-
-				foreach($j['directories'] as $h) {
-					if($h == z_root())
-						continue;
-
-					$hash = random_string();
-					$n = zot_build_packet($channel,'notify',null,null,'',$hash);
-
-					queue_insert(array(
-						'hash'       => $hash,
-						'account_id' => $channel['channel_account_id'],
-						'channel_id' => $channel['channel_id'],
-						'posturl'    => $h . '/post',
-						'notify'     => $n,
-						'msg'        => json_encode($encoded_item)
-					));
-
-
-					$x = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-					if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',300))) {
-						logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
-						update_queue_item($hash);
-						continue;
-					}
-
-					$deliver[] = $hash;
-	
-					if(count($deliver) >= $deliveries_per_process) {
-						Master::Summon(array('Deliver',$deliver));
-						$deliver = array();
-						if($interval)
-							@time_sleep_until(microtime(true) + (float) $interval);
-					}
-				}
-	
-				// catch any stragglers
-	
-				if(count($deliver)) {
-					Master::Summon(array('Deliver',$deliver));
-				}
-			}
-		}
-		
-		logger('ratenotif: complete.');
-		return;
-
-	}
-}
diff --git a/Zotlabs/Daemon/Thumbnail.php b/Zotlabs/Daemon/Thumbnail.php
index 72034b870..3688e8ae5 100644
--- a/Zotlabs/Daemon/Thumbnail.php
+++ b/Zotlabs/Daemon/Thumbnail.php
@@ -45,7 +45,6 @@ class Thumbnail {
 			return;
 		}
 
-
 		$default_controller = null;
 
 		$files = glob('Zotlabs/Thumbs/*.php');
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 6e8344def..784de3d2c 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -11,6 +11,7 @@ use Zotlabs\Web\HTTPSig;
 
 require_once('include/event.php');
 require_once('include/html2plain.php');
+require_once('include/items.php');
 
 class Activity {
 
@@ -41,9 +42,6 @@ class Activity {
 			if ($x['type'] === ACTIVITY_OBJ_EVENT) {
 				return self::fetch_event($x);
 			}
-			if ($x['type'] === ACTIVITY_OBJ_PHOTO) {
-				return self::fetch_image($x);
-			}
 
 			call_hooks('encode_object', $x);
 		}
@@ -193,6 +191,7 @@ class Activity {
 	}
 
 	static function fetch_image($x) {
+
 		$ret = [
 			'type'      => 'Image',
 			'id'        => $x['id'],
@@ -649,7 +648,7 @@ class Activity {
 			$atts = ((is_array($item['attach'])) ? $item['attach'] : json_decode($item['attach'], true));
 			if ($atts) {
 				foreach ($atts as $att) {
-					if (strpos($att['type'], 'image')) {
+					if (isset($att['type']) && strpos($att['type'], 'image')) {
 						$ret[] = ['type' => 'Image', 'url' => $att['href']];
 					}
 					else {
@@ -1534,8 +1533,9 @@ class Activity {
 
 	static function actor_store($url, $person_obj) {
 
-		if (!is_array($person_obj))
+		if (!is_array($person_obj)) {
 			return;
+		}
 
 		$inbox = $person_obj['inbox'];
 
@@ -1546,11 +1546,14 @@ class Activity {
 		}
 
 		$name = $person_obj['name'];
-		if (!$name)
+		if (!$name) {
 			$name = $person_obj['preferredUsername'];
-		if (!$name)
+		}
+		if (!$name) {
 			$name = t('Unknown');
+		}
 
+		$icon = z_root() . '/' . get_default_profile_photo(300);
 		if ($person_obj['icon']) {
 			if (is_array($person_obj['icon'])) {
 				if (array_key_exists('url', $person_obj['icon']))
@@ -1615,84 +1618,85 @@ class Activity {
 			}
 		}
 
-		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
+		$m = parse_url($url);
+		if($m) {
+			$hostname = $m['host'];
+			$baseurl = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
+			$site_url = $m['scheme'] . '://' . $m['host'];
+		}
+
+		$r = q("select * from xchan join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s'",
 			dbesc($url)
 		);
-		if (!$r) {
-			// create a new record
-
-			xchan_store_lowlevel(
-				[
-					'xchan_hash'      => $url,
-					'xchan_guid'      => $url,
-					'xchan_pubkey'    => $pubkey,
-					'xchan_addr'      => '',
-					'xchan_url'       => $profile,
-					'xchan_name'      => $name,
-					'xchan_name_date' => datetime_convert(),
-					'xchan_network'   => 'activitypub'
-				]
-			);
-		}
-		else {
 
+		if($r) {
 			// Record exists. Cache existing records for one week at most
 			// then refetch to catch updated profile photos, names, etc.
-
-			$d = datetime_convert('UTC', 'UTC', 'now - 1 week');
-			if ($r[0]['xchan_name_date'] > $d)
+			$d = datetime_convert('UTC', 'UTC', 'now - 3 days');
+			if($r[0]['hubloc_updated'] > $d) {
 				return;
+			}
 
-			// update existing record
-			q("update xchan set xchan_name = '%s', xchan_pubkey = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s'",
-				dbesc($name),
-				dbesc($pubkey),
-				dbesc('activitypub'),
+			q("UPDATE site SET site_update = '%s', site_dead = 0 WHERE site_url = '%s'",
 				dbesc(datetime_convert()),
+				dbesc($site_url)
+			);
+
+			// update existing xchan record
+			q("update xchan set xchan_name = '%s', xchan_guid = '%s', xchan_pubkey = '%s', xchan_network = 'activitypub', xchan_name_date = '%s' where xchan_hash = '%s'",
+				dbesc(escape_tags($name)),
+				dbesc(escape_tags($url)),
+				dbesc(escape_tags($pubkey)),
+				dbescdate(datetime_convert()),
 				dbesc($url)
 			);
-		}
 
-		if ($collections) {
-			set_xconfig($url, 'activitypub', 'collections', $collections);
+			// update existing hubloc record
+			q("update hubloc set hubloc_guid = '%s', hubloc_network = 'activitypub', hubloc_url = '%s', hubloc_host = '%s', hubloc_callback = '%s', hubloc_updated = '%s', hubloc_id_url = '%s' where hubloc_hash = '%s'",
+				dbesc(escape_tags($url)),
+				dbesc(escape_tags($baseurl)),
+				dbesc(escape_tags($hostname)),
+				dbesc(escape_tags($inbox)),
+				dbescdate(datetime_convert()),
+				dbesc(escape_tags($profile)),
+				dbesc($url)
+			);
 		}
+		else {
+			// create a new record
 
-		$r = q("select * from hubloc where hubloc_hash = '%s' limit 1",
-			dbesc($url)
-		);
-
-		$m = parse_url($url);
-		if ($m) {
-			$hostname = $m['host'];
-			$site_url  = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
-		}
+			xchan_store_lowlevel(
+				[
+					'xchan_hash'         => escape_tags($url),
+					'xchan_guid'         => escape_tags($url),
+					'xchan_pubkey'       => escape_tags($pubkey),
+					'xchan_addr'         => '',
+					'xchan_url'          => escape_tags($profile),
+					'xchan_name'         => escape_tags($name),
+					'xchan_name_date'    => datetime_convert(),
+					'xchan_network'      => 'activitypub'
+				]
+			);
 
-		if (!$r) {
 			hubloc_store_lowlevel(
 				[
-					'hubloc_guid'     => $url,
-					'hubloc_hash'     => $url,
+					'hubloc_guid'     => escape_tags($url),
+					'hubloc_hash'     => escape_tags($url),
 					'hubloc_addr'     => '',
 					'hubloc_network'  => 'activitypub',
-					'hubloc_url'      => $site_url,
-					'hubloc_host'     => $hostname,
-					'hubloc_callback' => $inbox,
+					'hubloc_url'      => escape_tags($baseurl),
+					'hubloc_host'     => escape_tags($hostname),
+					'hubloc_callback' => escape_tags($inbox),
 					'hubloc_updated'  => datetime_convert(),
 					'hubloc_primary'  => 1,
-					'hubloc_id_url'   => $profile
+					'hubloc_id_url'   => escape_tags($profile)
 				]
 			);
 		}
 
-		q("UPDATE site SET site_update = '%s', site_dead = 0 WHERE site_url = '%s' AND site_update < %s - INTERVAL %s",
-			dbesc(datetime_convert()),
-			dbesc($site_url),
-			db_utcnow(),
-			db_quoteinterval('1 DAY')
-		);
-
-		if (!$icon)
-			$icon = z_root() . '/' . get_default_profile_photo(300);
+		if ($collections) {
+			set_xconfig($url, 'activitypub', 'collections', $collections);
+		}
 
 		$photos = import_xchan_photo($icon, $url);
 		q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
@@ -1742,14 +1746,9 @@ class Activity {
 	static function create_note($channel, $observer_hash, $act) {
 
 		$s = [];
-
-		// Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field.
-		// They are hidden in the public timeline if the public inbox is listed in the 'cc' field.
-		// This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
-		$pubstream      = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false);
 		$is_sys_channel = is_sys_channel($channel['channel_id']);
-
 		$parent = ((array_key_exists('inReplyTo', $act->obj)) ? urldecode($act->obj['inReplyTo']) : '');
+
 		if ($parent) {
 
 			$r = q("select * from item where uid = %d and ( mid = '%s' or  mid = '%s' ) limit 1",
@@ -1764,7 +1763,7 @@ class Activity {
 			}
 
 			if ($r[0]['owner_xchan'] === $channel['channel_hash']) {
-				if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !($is_sys_channel && $pubstream)) {
+				if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !$is_sys_channel) {
 					logger('no comment permission.');
 					return;
 				}
@@ -1776,7 +1775,7 @@ class Activity {
 
 		}
 		else {
-			if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !($is_sys_channel && $pubstream)) {
+			if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !$is_sys_channel) {
 				logger('no permission');
 				return;
 			}
@@ -2268,7 +2267,6 @@ class Activity {
 			$s['app'] = escape_tags($generator['name']);
 		}
 
-
 		if (!$response_activity) {
 			$a = self::decode_taxonomy($act->obj);
 			if ($a) {
@@ -2403,7 +2401,7 @@ class Activity {
 
 			}
 
-			if ($act->obj['type'] === 'Image') {
+			if ($act->obj['type'] === 'Image' && strpos($s['body'],'zrl=') === false) {
 
 				$ptr = null;
 
@@ -2545,12 +2543,6 @@ class Activity {
 			return;
 		}*/
 
-		// Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field.
-		// They are hidden in the public timeline if the public inbox is listed in the 'cc' field.
-		// This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
-
-		$pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false);
-
 		// TODO: this his handled in pubcrawl atm.
 		// very unpleasant and imperfect way of determining a Mastodon DM
 		/*if ($act->raw_recips && array_key_exists('to',$act->raw_recips) && is_array($act->raw_recips['to']) && count($act->raw_recips['to']) === 1 && $act->raw_recips['to'][0] === channel_url($channel) && ! $act->raw_recips['cc']) {
@@ -2611,7 +2603,7 @@ class Activity {
 
 				$allowed = true;
 				// reject public stream comments that weren't sent by the conversation owner
-				if ($is_sys_channel && $pubstream && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) {
+				if ($is_sys_channel && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) {
 					$allowed = false;
 				}
 			}
@@ -2626,7 +2618,7 @@ class Activity {
 
 			// The $item['item_fetched'] flag is set in fetch_and_store_parents().
 			// In this case we should check against author permissions because sender is not owner.
-			if (perm_is_allowed($channel['channel_id'], (($item['item_fetched']) ? $item['author_xchan'] : $observer_hash), 'send_stream') || ($is_sys_channel && $pubstream)) {
+			if (perm_is_allowed($channel['channel_id'], (($item['item_fetched']) ? $item['author_xchan'] : $observer_hash), 'send_stream') || $is_sys_channel) {
 				$allowed = true;
 			}
 			// TODO: not implemented
@@ -2764,7 +2756,7 @@ class Activity {
 					$fetch = false;
 					// TODO: debug
 					// if (perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') && (PConfig::Get($channel['channel_id'],'system','hyperdrive',true) || $act->type === 'Announce')) {
-					if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || ($is_sys_channel && $pubstream)) {
+					if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || $is_sys_channel) {
 						$fetch = (($fetch_parents) ? self::fetch_and_store_parents($channel, $observer_hash, $item, $force) : false);
 					}
 					if ($fetch) {
@@ -3073,15 +3065,9 @@ class Activity {
 	static function announce_note($channel, $observer_hash, $act) {
 
 		$s = [];
-
 		$is_sys_channel = is_sys_channel($channel['channel_id']);
 
-		// Mastodon only allows visibility in public timelines if the public inbox is listed in the 'to' field.
-		// They are hidden in the public timeline if the public inbox is listed in the 'cc' field.
-		// This is not part of the activitypub protocol - we might change this to show all public posts in pubstream at some point.
-		$pubstream = ((is_array($act->obj) && array_key_exists('to', $act->obj) && in_array(ACTIVITY_PUBLIC_INBOX, $act->obj['to'])) ? true : false);
-
-		if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !($is_sys_channel && $pubstream)) {
+		if (!perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') && !$is_sys_channel) {
 			logger('no permission');
 			return;
 		}
@@ -3496,7 +3482,7 @@ class Activity {
 	static function find_best_identity($xchan) {
 
 		if (filter_var($xchan, FILTER_VALIDATE_URL)) {
-			$r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0",
+			$r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' and hubloc_deleted = 0",
 				dbesc($xchan)
 			);
 			if ($r) {
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 5ef4ecc8d..30c108cc1 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -76,7 +76,8 @@ class Apps {
 			'Directory',
 			'Search',
 			'Help',
-			'Profile Photo'
+			'Profile Photo',
+			'HQ'
 		]);
 
 		/**
@@ -374,7 +375,7 @@ class Apps {
 			'Permission Categories' => t('Permission Categories'),
 			'Public Stream' => t('Public Stream'),
 			'My Chatrooms' => t('My Chatrooms'),
-			'Channel Export' => t('Channel Export')
+			'Channel Export' => t('Channel Export'),
 		);
 
 		if(array_key_exists('name',$arr)) {
@@ -524,7 +525,7 @@ class Apps {
 		}
 		elseif(remote_channel()) {
 			$observer = \App::get_observer();
-			if($observer && in_array($observer['xchan_network'], ['zot6', 'zot'])) {
+			if($observer && $observer['xchan_network'] === 'zot6') {
 				// some folks might have xchan_url redirected offsite, use the connurl
 				$x = parse_url($observer['xchan_connurl']);
 				if($x) {
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php
index 21bec171b..38fe69995 100644
--- a/Zotlabs/Lib/Connect.php
+++ b/Zotlabs/Lib/Connect.php
@@ -146,7 +146,7 @@ class Connect {
 
 		}
 
-		$allowed = ((in_array($xchan['xchan_network'],['rss','zot','zot6'])) ? 1 : 0);
+		$allowed = ((in_array($xchan['xchan_network'],['rss', 'zot6'])) ? 1 : 0);
 
 		$hookdata = ['channel_id' => $uid, 'follow_address' => $url, 'xchan' => $xchan, 'allowed' => $allowed, 'singleton' => 0];
 		call_hooks('follow_allow',$hookdata);
diff --git a/Zotlabs/Lib/DReport.php b/Zotlabs/Lib/DReport.php
index 7515d3292..2263529b2 100644
--- a/Zotlabs/Lib/DReport.php
+++ b/Zotlabs/Lib/DReport.php
@@ -87,8 +87,7 @@ class DReport {
 
 		// Is the sender one of our channels?
 
-		$c = q("select channel_id from channel where channel_hash = '%s' or channel_portable_id = '%s' limit 1",
-			dbesc($dr['sender']),
+		$c = q("select channel_id from channel where channel_hash = '%s' limit 1",
 			dbesc($dr['sender'])
 		);
 
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 7e33f09b8..7d741edd8 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -69,24 +69,24 @@ class Enotify {
 		$sender_name = $product;
 		$hostname = \App::get_hostname();
 		if(strpos($hostname,':'))
-			$hostname = substr($hostname,0,strpos($hostname,':'));
+			$hostname = substr($hostname, 0, strpos($hostname,':'));
 
 		// Do not translate 'noreply' as it must be a legal 7-bit email address
 
-		$reply_email = get_config('system','reply_address');
+		$reply_email = get_config('system', 'reply_address');
 		if(! $reply_email)
 			$reply_email = 'noreply' . '@' . $hostname;
 
-		$sender_email = get_config('system','from_email');
+		$sender_email = get_config('system', 'from_email');
 		if(! $sender_email)
 			$sender_email = 'Administrator' . '@' . $hostname;
 
-		$sender_name = get_config('system','from_email_name');
+		$sender_name = get_config('system', 'from_email_name');
 		if(! $sender_name)
 			$sender_name = \Zotlabs\Lib\System::get_site_name();
 
 
-		$additional_mail_header = "";
+		$additional_mail_header = '';
 
 		if(array_key_exists('item', $params)) {
 			require_once('include/conversation.php');
@@ -114,27 +114,28 @@ class Enotify {
 		}
 
 
-	$always_show_in_notices = get_pconfig($recip['channel_id'],'system','always_show_in_notices');
-	$vnotify = get_pconfig($recip['channel_id'],'system','vnotify');
+	$always_show_in_notices = get_pconfig($recip['channel_id'], 'system', 'always_show_in_notices');
+	$vnotify = get_pconfig($recip['channel_id'], 'system', 'vnotify');
 
 	$salutation = $recip['channel_name'];
 
 	// e.g. "your post", "David's photo", etc.
 	$possess_desc = t('%s <!item_type!>');
 
+// @@TODO: consider using switch instead of those elseif
 	if ($params['type'] == NOTIFY_MAIL) {
 		logger('notification: mail');
-		$subject = 	sprintf( t('[$Projectname:Notify] New mail received at %s'),$sitename);
-
-		$preamble = sprintf( t('%1$s sent you a new private message at %2$s.'), $sender['xchan_name'],$sitename);
-		$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
-		$sitelink = t('Please visit %s to view and/or reply to your private messages.');
-		$tsitelink = sprintf( $sitelink, $siteurl . '/mail/' . $params['item']['id'] );
-		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/mail/' . $params['item']['id'] . '">' . $sitename . '</a>');
-		$itemlink = $siteurl . '/mail/' . $params['item']['id'];
+		$subject = 	sprintf( t('[$Projectname:Notify] New direct message received at %s'), $sitename);
+
+		$preamble = sprintf( t('%1$s sent you a new direct message at %2$s.'), $sender['xchan_name'], $sitename);
+		$epreamble = sprintf( t('%1$s sent you %2$s.'), '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a direct message') . '[/zrl]');
+		$sitelink = t('Please visit %s to view and/or reply to your direct messages.');
+		$tsitelink = sprintf( $sitelink, $siteurl . '/hq/' . gen_link_id($params['item']['mid']));
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/hq/' . gen_link_id($params['item']['mid']) . '">' . $sitename . '</a>');
+		$itemlink = $siteurl . '/hq/' . gen_link_id($params['item']['mid']);
 	}
 
-	if ($params['type'] == NOTIFY_COMMENT) {
+	elseif ($params['type'] === NOTIFY_COMMENT) {
 		//logger("notification: params = " . print_r($params, true), LOGGER_DEBUG);
 
 		$moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false);
@@ -171,7 +172,6 @@ class Enotify {
 		// Check to see if there was already a notify for this post.
 		// If so don't create a second notification
 
-		$p = null;
 		$p = q("select id from notify where link = '%s' and uid = %d limit 1",
 			dbesc($params['link']),
 			intval($recip['channel_id'])
@@ -196,6 +196,7 @@ class Enotify {
 
 		xchan_query($p);
 
+//@@FIXME $p can be null (line 188)
 		$item_post_type = item_post_type($p[0]);
 //		$private = $p[0]['item_private'];
 		$parent_id = $p[0]['id'];
@@ -250,7 +251,7 @@ class Enotify {
 
 	}
 
-	if ($params['type'] == NOTIFY_LIKE) {
+	elseif ($params['type'] === NOTIFY_LIKE) {
 //		logger("notification: params = " . print_r($params, true), LOGGER_DEBUG);
 
 		$itemlink =  $params['link'];
@@ -268,7 +269,6 @@ class Enotify {
 		// Check to see if there was already a notify for this post.
 		// If so don't create a second notification
 
-		$p = null;
 		$p = q("select id from notify where link = '%s' and uid = %d limit 1",
 			dbesc($params['link']),
 			intval($recip['channel_id'])
@@ -293,7 +293,7 @@ class Enotify {
 
 		xchan_query($p);
 
-
+//@@FIXME $p can be null (line 285)
 		$item_post_type = item_post_type($p[0]);
 //		$private = $p[0]['item_private'];
 		$parent_id = $p[0]['id'];
@@ -302,7 +302,7 @@ class Enotify {
 
 
 		// "your post"
-		if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall']))
+		if($p[0]['owner']['xchan_name'] === $p[0]['author']['xchan_name'] && intval($p[0]['item_wall']))
 			$dest_str = sprintf(t('%1$s liked [zrl=%2$s]your %3$s[/zrl]'),
 				'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
 				$itemlink,
@@ -328,7 +328,7 @@ class Enotify {
 
 
 
-	if($params['type'] == NOTIFY_WALL) {
+	elseif($params['type'] === NOTIFY_WALL) {
 		$subject = sprintf( t('[$Projectname:Notify] %s posted to your profile wall') , $sender['xchan_name']);
 
 		$preamble = sprintf( t('%1$s posted to your profile wall at %2$s') , $sender['xchan_name'], $sitename);
@@ -343,9 +343,8 @@ class Enotify {
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_TAGSELF) {
+	elseif ($params['type'] === NOTIFY_TAGSELF) {
 
-		$p = null;
 		$p = q("select id from notify where link = '%s' and uid = %d limit 1",
 			dbesc($params['link']),
 			intval($recip['channel_id'])
@@ -368,7 +367,7 @@ class Enotify {
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_POKE) {
+	elseif ($params['type'] === NOTIFY_POKE) {
 		$subject =	sprintf( t('[$Projectname:Notify] %1$s poked you') , $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s poked you at %2$s') , $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s [zrl=%2$s]poked you[/zrl].') ,
@@ -385,7 +384,7 @@ class Enotify {
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_TAGSHARE) {
+	elseif ($params['type'] === NOTIFY_TAGSHARE) {
 		$subject =	sprintf( t('[$Projectname:Notify] %s tagged your post') , $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s tagged your post at %2$s'),$sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s tagged [zrl=%2$s]your post[/zrl]') ,
@@ -398,7 +397,7 @@ class Enotify {
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_INTRO) {
+	elseif ($params['type'] === NOTIFY_INTRO) {
 		$subject = sprintf( t('[$Projectname:Notify] Introduction received'));
 		$preamble = sprintf( t('You\'ve received an new connection request from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('You\'ve received [zrl=%1$s]a new connection request[/zrl] from %2$s.'),
@@ -412,7 +411,7 @@ class Enotify {
 		$itemlink = $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_SUGGEST) {
+	elseif ($params['type'] === NOTIFY_SUGGEST) {
 		$subject = sprintf( t('[$Projectname:Notify] Friend suggestion received'));
 		$preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('You\'ve received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s.'),
@@ -430,11 +429,11 @@ class Enotify {
 		$itemlink =  $params['link'];
 	}
 
-	if ($params['type'] == NOTIFY_CONFIRM) {
+	elseif ($params['type'] === NOTIFY_CONFIRM) {
 		// ?
 	}
 
-	if ($params['type'] == NOTIFY_SYSTEM) {
+	elseif ($params['type'] === NOTIFY_SYSTEM) {
 		// ?
 	}
 
@@ -477,7 +476,7 @@ class Enotify {
 	} while ($dups === true);
 
 
-	$datarray = array();
+	$datarray = [];
 	$datarray['hash']   = $hash;
 	$datarray['sender_hash'] = $sender['xchan_hash'];
 	$datarray['xname']   = $sender['xchan_name'];
@@ -514,7 +513,7 @@ class Enotify {
 	// (probably would be better that way)
 
 	if (!$always_show_in_notices) {
-		if (($params['type'] == NOTIFY_WALL) || ($params['type'] == NOTIFY_MAIL) || ($params['type'] == NOTIFY_INTRO)) {
+		if (($params['type'] === NOTIFY_WALL) || ($params['type'] === NOTIFY_MAIL) || ($params['type'] === NOTIFY_INTRO)) {
 			$seen = 1;
 		}
 	}
@@ -550,12 +549,12 @@ class Enotify {
 	}
 
 	$itemlink = z_root() . '/notify/view/' . $notify_id;
-	$msg = str_replace('$itemlink',$itemlink,$epreamble);
+	$msg = str_replace('$itemlink', $itemlink, $epreamble);
 
 	// wretched hack, but we don't want to duplicate all the preamble variations and we also don't want to screw up a translation
 
 	if ((\App::$language === 'en' || (! \App::$language)) && strpos($msg,', '))
-		$msg = substr($msg,strpos($msg,', ')+1);
+		$msg = substr($msg, strpos($msg,', ')+1);
 
 	$datarray['id'] = $notify_id;
 	$datarray['msg'] = $msg;
@@ -575,7 +574,7 @@ class Enotify {
 
 		logger('notification: sending notification email');
 
-		$hn = get_pconfig($recip['channel_id'],'system','email_notify_host');
+		$hn = get_pconfig($recip['channel_id'], 'system', 'email_notify_host');
 		if($hn && (! stristr(\App::get_hostname(),$hn))) {
 			// this isn't the email notification host
 			pop_lang();
@@ -584,7 +583,7 @@ class Enotify {
 
 		$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))),ENT_QUOTES,'UTF-8'));
 
-		$htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$body)));
+		$htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array('',"<br />\n"),$body)));
 
 
 		// use $_SESSION['zid_override'] to force zid() to use
@@ -601,7 +600,7 @@ class Enotify {
 		unset($_SESSION['zid_override']);
 		unset($_SESSION['zrl_override']);
 
-		$datarray = array();
+		$datarray = [];
 		$datarray['banner']       = $banner;
 		$datarray['product']      = $product;
 		$datarray['preamble']     = $preamble;
@@ -758,9 +757,9 @@ class Enotify {
 		$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
 
 		// generate a mime boundary
-		$mimeBoundary = rand(0, 9) . "-"
-				.rand(100000000, 999999999) . "-"
-				.rand(100000000, 999999999) . "=:"
+		$mimeBoundary = rand(0, 9) . '-'
+				.rand(100000000, 999999999) . '-'
+				.rand(100000000, 999999999) . '=:'
 				.rand(10000, 99999);
 
 		// generate a multipart/alternative message header
@@ -768,7 +767,7 @@ class Enotify {
 			$params['additionalMailHeader'] .
 			"From: $fromName <{$params['fromEmail']}>" . PHP_EOL .
 			"Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL .
-			"MIME-Version: 1.0" . PHP_EOL .
+			'MIME-Version: 1.0' . PHP_EOL .
 			"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
 
 		// assemble the final multipart message body with the text and html types included
@@ -776,15 +775,15 @@ class Enotify {
 		$htmlBody = chunk_split(base64_encode($params['htmlVersion']));
 
 		$multipartMessageBody =
-			"--" . $mimeBoundary . PHP_EOL .					// plain text section
-			"Content-Type: text/plain; charset=UTF-8" . PHP_EOL .
-			"Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL .
+			'--' . $mimeBoundary . PHP_EOL .					// plain text section
+			'Content-Type: text/plain; charset=UTF-8' . PHP_EOL .
+			'Content-Transfer-Encoding: base64' . PHP_EOL . PHP_EOL .
 			$textBody . PHP_EOL .
-			"--" . $mimeBoundary . PHP_EOL .					// text/html section
-			"Content-Type: text/html; charset=UTF-8" . PHP_EOL .
-			"Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL .
+			'--' . $mimeBoundary . PHP_EOL .					// text/html section
+			'Content-Type: text/html; charset=UTF-8' . PHP_EOL .
+			'Content-Transfer-Encoding: base64' . PHP_EOL . PHP_EOL .
 			$htmlBody . PHP_EOL .
-			"--" . $mimeBoundary . "--" . PHP_EOL;					// message ending
+			'--' . $mimeBoundary . '--' . PHP_EOL;					// message ending
 
 		// send the message
 		$res = mail(
@@ -793,7 +792,7 @@ class Enotify {
 			$multipartMessageBody,							// message body
 			$messageHeader									// message headers
 		);
-		logger("notification: enotify::send returns " . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
+		logger('notification: enotify::send returns ' . (($res) ? 'success' : 'failure'), LOGGER_DEBUG);
 		return $res;
 	}
 
@@ -833,13 +832,12 @@ class Enotify {
 		$edit = false;
 
 		if($item['edited'] > $item['created']) {
+			$edit = true;
 			if($item['item_thread_top']) {
 				$itemem_text = sprintf( t('edited a post dated %s'), relative_date($item['created']));
-				$edit = true;
 			}
 			else {
 				$itemem_text = sprintf( t('edited a comment dated %s'), relative_date($item['created']));
-				$edit = true;
 			}
 		}
 
@@ -860,14 +858,14 @@ class Enotify {
 			//'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
 			'thread_top' => (($item['item_thread_top']) ? true : false),
 			'message' => bbcode(escape_tags($itemem_text)),
-			'body' =>  htmlentities(html2plain(bbcode($item['body']), 75, true), ENT_QUOTES, 'UTF-8', false),
+			'body' =>  htmlentities(html2plain(bbcode($item['body'], ['drop_media', true]), 75, true), ENT_QUOTES, 'UTF-8', false),
 			// these are for the superblock addon
 			'hash' => $item[$who]['xchan_hash'],
 			'uid' => $item['uid'],
 			'display' => true
 		);
 
-		call_hooks('enotify_format',$x);
+		call_hooks('enotify_format', $x);
 		if(! $x['display']) {
 			return [];
 		}
@@ -886,7 +884,7 @@ class Enotify {
 
 		$b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
 		$x = [
-			'notify_link' => z_root() . '/notify/view/' . $tt['id'],
+			'notify_link' => (($tt['ntype'] === NOTIFY_MAIL) ? $tt['link'] : z_root() . '/notify/view/' . $tt['id']),
 			'name' => $tt['xname'],
 			'url' => $tt['url'],
 			'photo' => $tt['photo'],
@@ -903,7 +901,7 @@ class Enotify {
 
 	static public function format_intros($rr) {
 
-		$x = [
+		return [
 			'notify_link' => z_root() . '/connections/ifpending',
 			'name' => $rr['xchan_name'],
 			'addr' => $rr['xchan_addr'],
@@ -912,15 +910,13 @@ class Enotify {
 			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['abook_created']),
 			'hclass' => ('notify-unseen'),
 			'message' => t('added your channel')
-		];
-
-		return $x;
+		];		
 
 	}
 
 	static public function format_files($rr) {
 
-		$x = [
+		return [
 			'notify_link' => z_root() . '/sharedwithme',
 			'name' => $rr['author']['xchan_name'],
 			'addr' => $rr['author']['xchan_addr'],
@@ -931,13 +927,11 @@ class Enotify {
 			'message' => t('shared a file with you')
 		];
 
-		return $x;
-
 	}
 
 	static public function format_mail($rr) {
 
-		$x = [
+		return [
 			'notify_link' => z_root() . '/mail/' . $rr['id'],
 			'name' => $rr['xchan_name'],
 			'addr' => $rr['xchan_addr'],
@@ -945,11 +939,9 @@ class Enotify {
 			'photo' => $rr['xchan_photo_s'],
 			'when' => datetime_convert('UTC', date_default_timezone_get(), $rr['created']),
 			'hclass' => (intval($rr['mail_seen']) ? 'notify-seen' : 'notify-unseen'),
-			'message' => t('sent you a private message'),
+			'message' => t('sent you a direct message'),
 		];
 
-		return $x;
-
 	}
 
 	static public function format_all_events($rr) {
@@ -959,7 +951,7 @@ class Enotify {
 		$today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
 		$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
 
-		$x = [
+		return [
 			'notify_link' => z_root() . '/cdav/calendar/' . $rr['event_hash'],
 			'name'        => $rr['xchan_name'],
 			'addr'        => $rr['xchan_addr'],
@@ -970,13 +962,12 @@ class Enotify {
 			'message'     => t('created an event')
 		];
 
-		return $x;
 
 	}
 
 	static public function format_register($rr) {
 
-		$x = [
+		return [
 			'notify_link' => z_root() . '/admin/accounts',
 			'name' => $rr['reg_did2'],
 			//'addr' => '',
@@ -986,7 +977,5 @@ class Enotify {
 			'message' => t('status verified')
 		];
 
-		return $x;
-
 	}
 }
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index 5455aa2ea..67603a0e3 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -255,9 +255,6 @@ class Libsync {
 			if (array_key_exists('chatroom', $arr) && $arr['chatroom'])
 				sync_chatrooms($channel, $arr['chatroom']);
 
-			if (array_key_exists('conv', $arr) && $arr['conv'])
-				import_conv($channel, $arr['conv']);
-
 			if (array_key_exists('mail', $arr) && $arr['mail'])
 				sync_mail($channel, $arr['mail']);
 
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index c7d001d21..ae8c725d7 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1142,6 +1142,7 @@ class Libzot {
 		}
 
 
+
 		$deliveries = null;
 
 		if (array_key_exists('recipients', $env) && count($env['recipients'])) {
@@ -1270,10 +1271,6 @@ class Libzot {
 
 				if ($AS->data['signed_data']) {
 					IConfig::Set($arr, 'activitypub', 'signed_data', $AS->data['signed_data'], false);
-					$j = json_decode($AS->data['signed_data'], true);
-					if ($j) {
-						IConfig::Set($arr, 'activitypub', 'rawmsg', json_encode(JSalmon::unpack($j['data'])), true);
-					}
 				}
 
 				logger('Activity received: ' . print_r($arr, true), LOGGER_DATA, LOG_DEBUG);
@@ -1377,8 +1374,6 @@ class Libzot {
 				$check_mentions = true;
 			}
 		}
-		elseif ($msg['type'] === 'mail')
-			$perm = 'post_mail';
 
 		$r = [];
 
@@ -2210,90 +2205,6 @@ class Libzot {
 		return $post_id;
 	}
 
-	static function process_mail_delivery($sender, $arr, $deliveries) {
-
-		$result = [];
-
-		if ($sender != $arr['from_xchan']) {
-			logger('process_mail_delivery: sender is not mail author');
-			return;
-		}
-
-		foreach ($deliveries as $d) {
-
-			$DR = new DReport(z_root(), $sender, $d, $arr['mid']);
-
-			$r = q("select * from channel where channel_hash = '%s' limit 1",
-				dbesc($d['hash'])
-			);
-
-			if (!$r) {
-				$DR->update('recipient not found');
-				$result[] = $DR->get();
-				continue;
-			}
-
-			$channel = $r[0];
-			$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
-
-
-			if (!perm_is_allowed($channel['channel_id'], $sender, 'post_mail')) {
-
-				/*
-				 * Always allow somebody to reply if you initiated the conversation. It's anti-social
-				 * and a bit rude to send a private message to somebody and block their ability to respond.
-				 * If you are being harrassed and want to put an end to it, delete the conversation.
-				 */
-
-				$return = false;
-				if ($arr['parent_mid']) {
-					$return = q("select * from mail where mid = '%s' and channel_id = %d limit 1",
-						dbesc($arr['parent_mid']),
-						intval($channel['channel_id'])
-					);
-				}
-				if (!$return) {
-					logger("permission denied for mail delivery {$channel['channel_id']}");
-					$DR->update('permission denied');
-					$result[] = $DR->get();
-					continue;
-				}
-			}
-
-
-			$r = q("select id from mail where mid = '%s' and channel_id = %d limit 1",
-				dbesc($arr['mid']),
-				intval($channel['channel_id'])
-			);
-			if ($r) {
-				if (intval($arr['mail_recalled'])) {
-					$x = q("delete from mail where id = %d and channel_id = %d",
-						intval($r[0]['id']),
-						intval($channel['channel_id'])
-					);
-					$DR->update('mail recalled');
-					$result[] = $DR->get();
-					logger('mail_recalled');
-				}
-				else {
-					$DR->update('duplicate mail received');
-					$result[] = $DR->get();
-					logger('duplicate mail received');
-				}
-				continue;
-			}
-			else {
-				$arr['account_id'] = $channel['channel_account_id'];
-				$arr['channel_id'] = $channel['channel_id'];
-				$item_id           = mail_store($arr);
-				$DR->update('mail delivered');
-				$result[] = $DR->get();
-			}
-		}
-
-		return $result;
-	}
-
 
 	/**
 	 * @brief Processes delivery of profile.
@@ -2664,9 +2575,9 @@ class Libzot {
 		// we may only end up with one; which results in posts with no author name or photo and are a bit
 		// of a hassle to repair. If either or both are missing, do a full discovery probe.
 
-		//if (!array_key_exists('id', $x)) {
-			//return import_author_activitypub($x);
-		//}
+		if(!isset($x['id']) && !isset($x['key']) && !isset($x['id_sig'])) {
+			return false;
+		}
 
 		$hash = self::make_xchan_hash($x['id'], $x['key']);
 
@@ -2927,7 +2838,7 @@ class Libzot {
 
 		$hookinfo = [
 			'channel_id' => $id,
-			'protocols' => ['zot6', 'zot']
+			'protocols' => ['zot6']
 		];
 		/**
 		 * @hooks channel_protocols
@@ -3231,11 +3142,6 @@ class Libzot {
 				return $v;
 			}
 		}
-		foreach ($arr as $v) {
-			if ($v[$check] === 'zot') {
-				return $v;
-			}
-		}
 
 		return $arr[0];
 
diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php
index 41c0a54e9..4f35a1b80 100644
--- a/Zotlabs/Lib/Libzotdir.php
+++ b/Zotlabs/Lib/Libzotdir.php
@@ -207,8 +207,6 @@ class Libzotdir {
 			);
 		}
 
-
-
 		// If there are no directory servers, setup the fallback master
 		/** @FIXME What to do if we're in a different realm? */
 
@@ -249,11 +247,12 @@ class Libzotdir {
 
 			$syncdate = (($rr['site_sync'] <= NULL_DATE) ? datetime_convert('UTC','UTC','now - 2 days') : $rr['site_sync']);
 			$x = z_fetch_url($rr['site_directory'] . '?f=&sync=' . urlencode($syncdate) . (($token) ? '&t=' . $token : ''));
+
 			if (! $x['success'])
 				continue;
 
 			$j = json_decode($x['body'],true);
-			if (!($j['transactions']) || ($j['ratings']))
+			if (!$j['transactions'])
 				continue;
 
 			q("update site set site_sync = '%s' where site_url = '%s'",
@@ -265,6 +264,11 @@ class Libzotdir {
 
 			if (is_array($j['transactions']) && count($j['transactions'])) {
 				foreach ($j['transactions'] as $t) {
+
+					if (empty($t['hash']) || empty($t['transaction_id']) || empty($t['address'])) {
+						continue;
+					}
+
 					$r = q("select * from updates where ud_guid = '%s' limit 1",
 						dbesc($t['transaction_id'])
 					);
@@ -319,6 +323,14 @@ class Libzotdir {
 			}
 			if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
 				$xc = Libzot::import_xchan($zf['data'], 0, $ud);
+				// This is a workaround for a missing xchan_updated column
+				// TODO: implement xchan_updated in the xchan table and update this column instead
+				if($zf['data']['primary_location']['address'] && $zf['data']['primary_location']['url']) {
+					q("UPDATE hubloc SET hubloc_updated = '%s' WHERE hubloc_id_url = '%s' AND hubloc_primary = 1",
+						dbesc(datetime_convert()),
+						dbesc($zf['data']['primary_location']['url'])
+					);
+				}
 			}
 			else {
 				q("update updates set ud_last = '%s' where ud_addr = '%s'",
@@ -345,7 +357,7 @@ class Libzotdir {
 
 		logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
 
-		$p = q("select channel.channel_hash, channel_address, channel_timezone, channel_portable_id, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
+		$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
 			intval($uid)
 		);
 
@@ -354,7 +366,6 @@ class Libzotdir {
 
 		if ($p) {
 			$hash = $p[0]['channel_hash'];
-			$legacy_hash = $p[0]['channel_portable_id'];
 
 			$profile['description'] = $p[0]['pdesc'];
 			$profile['birthday']    = $p[0]['dob'];
@@ -393,10 +404,9 @@ class Libzotdir {
 			);
 
 			if(intval($r[0]['xchan_hidden']) != $hidden) {
-				$r = q("update xchan set xchan_hidden = %d where xchan_hash in ('%s', '%s')",
+				$r = q("update xchan set xchan_hidden = %d where xchan_hash = '%s'",
 					intval($hidden),
-					dbesc($hash),
-					dbesc($legacy_hash)
+					dbesc($hash)
 				);
 			}
 
@@ -410,13 +420,11 @@ class Libzotdir {
 			}
 			else {
 				// they may have made it private
-				q("delete from xprof where xprof_hash in ('%s', '%s')",
-					dbesc($hash),
-					dbesc($legacy_hash)
+				q("delete from xprof where xprof_hash = '%s'",
+					dbesc($hash)
 				);
-				q("delete from xtag where xtag_hash in ('%s', '%s')",
-					dbesc($hash),
-					dbesc($legacy_hash)
+				q("delete from xtag where xtag_hash = '%s'",
+					dbesc($hash)
 				);
 			}
 
@@ -635,8 +643,13 @@ class Libzotdir {
 
 		$dirmode = intval(get_config('system', 'directory_mode'));
 
-		if($dirmode == DIRECTORY_MODE_NORMAL)
+		if($dirmode == DIRECTORY_MODE_NORMAL) {
 			return;
+		}
+
+		if (empty($hash) || empty($guid) || empty($addr)) {
+			return;
+		}
 
 		if($flags) {
 			q("insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )",
@@ -656,9 +669,4 @@ class Libzotdir {
 		}
 	}
 
-
-
-
-
-
 }
diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php
index 750d6d424..21e6ca26a 100644
--- a/Zotlabs/Lib/MessageFilter.php
+++ b/Zotlabs/Lib/MessageFilter.php
@@ -11,8 +11,6 @@ class MessageFilter {
 
 		require_once('include/html2plain.php');
 
-		unobscure($item);
-
 		$text = prepare_text($item['body'],$item['mimetype']);
 		$text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
 
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 373a7d304..35eb1e264 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -2,6 +2,9 @@
 
 namespace Zotlabs\Lib;
 
+use Zotlabs\Zot6\Receiver;
+use Zotlabs\Zot6\Zot6Handler;
+
 class Queue {
 
 	static function update($id, $add_priority = 0) {
@@ -28,19 +31,19 @@ class Queue {
 			$might_be_down = ((datetime_convert('UTC','UTC',$y[0]['earliest']) < datetime_convert('UTC','UTC','now - 2 days')) ? true : false);
 
 
-		// Set all other records for this destination way into the future. 
+		// Set all other records for this destination way into the future.
 		// The queue delivers by destination. We'll keep one queue item for
 		// this destination (this one) with a shorter delivery. If we succeed
 		// once, we'll try to deliver everything for that destination.
-		// The delivery will be set to at most once per hour, and if the 
+		// The delivery will be set to at most once per hour, and if the
 		// queue item is less than 12 hours old, we'll schedule for fifteen
-		// minutes. 
+		// minutes.
 
 		q("UPDATE outq SET outq_scheduled = '%s' WHERE outq_posturl = '%s'",
 			dbesc(datetime_convert('UTC','UTC','now + 5 days')),
 			dbesc($x[0]['outq_posturl'])
 		);
- 
+
 		$since = datetime_convert('UTC','UTC',$x[0]['outq_created']);
 
 		if(($might_be_down) || ($since < datetime_convert('UTC','UTC','now - 12 hour'))) {
@@ -50,9 +53,9 @@ class Queue {
 			$next = datetime_convert('UTC','UTC','now + ' . intval($add_priority) . ' minutes');
 		}
 
-		q("UPDATE outq SET outq_updated = '%s', 
-			outq_priority = outq_priority + %d, 
-			outq_scheduled = '%s' 
+		q("UPDATE outq SET outq_updated = '%s',
+			outq_priority = outq_priority + %d,
+			outq_scheduled = '%s'
 			WHERE outq_hash = '%s'",
 
 			dbesc(datetime_convert()),
@@ -66,7 +69,7 @@ class Queue {
 	static function remove($id,$channel_id = 0) {
 		logger('queue: remove queue item ' . $id,LOGGER_DEBUG);
 		$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
-		
+
 		q("DELETE FROM outq WHERE outq_hash = '%s' $sql_extra",
 			dbesc($id)
 		);
@@ -75,7 +78,7 @@ class Queue {
 
 	static function remove_by_posturl($posturl) {
 		logger('queue: remove queue posturl ' . $posturl,LOGGER_DEBUG);
-		
+
 		q("DELETE FROM outq WHERE outq_posturl = '%s' ",
 			dbesc($posturl)
 		);
@@ -88,7 +91,7 @@ class Queue {
 		$sql_extra = (($channel['channel_id']) ? " and outq_channel = " . intval($channel['channel_id']) . " " : '');
 
 		// Set the next scheduled run date so far in the future that it will be expired
-		// long before it ever makes it back into the delivery chain. 
+		// long before it ever makes it back into the delivery chain.
 
 		q("update outq set outq_delivered = 1, outq_updated = '%s', outq_scheduled = '%s' where outq_hash = '%s' $sql_extra ",
 			dbesc(datetime_convert()),
@@ -108,7 +111,7 @@ class Queue {
 		}
 
 		$x = q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_priority,
-			outq_created, outq_updated, outq_scheduled, outq_notify, outq_msg ) 
+			outq_created, outq_updated, outq_scheduled, outq_notify, outq_msg )
 			values ( '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s' )",
 			dbesc($arr['hash']),
 			intval($arr['account_id']),
@@ -133,7 +136,7 @@ class Queue {
 
 		$base = null;
 		$h = parse_url($outq['outq_posturl']);
-		if($h !== false) 
+		if($h !== false)
 			$base = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : '');
 
 		if(($base) && ($base !== z_root()) && ($immediate)) {
@@ -147,7 +150,7 @@ class Queue {
 					return;
 				}
 				if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
-					self::update($outq['outq_hash'],10);
+					self::update($outq['outq_hash'], 10);
 					logger('immediate delivery deferred for site ' . $base);
 					return;
 				}
@@ -158,12 +161,12 @@ class Queue {
 				// your site has existed. Since we don't know for sure what these sites are,
 				// call them unknown
 
-				site_store_lowlevel( 
+				site_store_lowlevel(
 					[
 						'site_url'    => $base,
 						'site_update' => datetime_convert(),
 						'site_dead'   => 0,
-						'site_type'   => intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
+						'site_type'   => SITE_TYPE_UNKNOWN,
 						'site_crypto' => ''
 					]
 				);
@@ -171,65 +174,17 @@ class Queue {
 		}
 
 		$arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
-		call_hooks('queue_deliver',$arr);
+		call_hooks('queue_deliver', $arr);
 		if($arr['handled'])
 			return;
 
-		// "post" queue driver - used for diaspora and friendica-over-diaspora communications.
-
-		if($outq['outq_driver'] === 'post') {
-			$result = z_post_url($outq['outq_posturl'],$outq['outq_msg']);
-			if($result['success'] && $result['return_code'] < 300) {
-				logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
-				if($base) {
-					q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-						dbesc(datetime_convert()),
-						dbesc($base)
-					);
-				}
-				q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-					dbesc('accepted for delivery'),
-					dbesc(datetime_convert()),
-					dbesc($outq['outq_hash'])
-				);
-				self::remove($outq['outq_hash']);
-
-				// server is responding - see if anything else is going to this destination and is piled up 
-				// and try to send some more. We're relying on the fact that do_delivery() results in an 
-				// immediate delivery otherwise we could get into a queue loop. 
-
-				if(! $immediate) {
-					$x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
-						dbesc($outq['outq_posturl'])
-					);
-	
-					$piled_up = array();
-					if($x) {
-						foreach($x as $xx) {
-							 $piled_up[] = $xx['outq_hash'];
-						}
-					}
-					if($piled_up) {
-						// call do_delivery() with the force flag
-						do_delivery($piled_up, true);
-					}
-				}
-			}
-			else {
-				logger('deliver: queue post returned ' . $result['return_code'] 
-					. ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
-					self::update($outq['outq_hash'],10);
-			}
-			return;
-		}
-
 		// normal zot delivery
 
 		logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
 
 		if($outq['outq_posturl'] === z_root() . '/zot') {
 			// local delivery
-			$zot = new \Zotlabs\Zot6\Receiver(new \Zotlabs\Zot6\Zot6Handler(),$outq['outq_notify']);
+			$zot = new Receiver(new Zot6Handler(), $outq['outq_notify']);
 			$result = $zot->run();
 			logger('returned_json: ' . json_encode($result,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA);
 			logger('deliver: local zot delivery succeeded to ' . $outq['outq_posturl']);
@@ -246,7 +201,8 @@ class Queue {
 			$host_crypto = null;
 
 			if($channel && $base) {
-				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_sitekey != '' order by hubloc_id desc limit 1",
+				$h = q("SELECT hubloc_sitekey, site_crypto FROM hubloc LEFT JOIN site ON hubloc_url = site_url
+					WHERE site_url = '%s' AND hubloc_network = 'zot6' ORDER BY hubloc_id DESC LIMIT 1",
 					dbesc($base)
 				);
 				if($h) {
@@ -256,7 +212,7 @@ class Queue {
 
 			$msg = $outq['outq_notify'];
 
-			$result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
+			$result = Libzot::zot($outq['outq_posturl'], $msg, $channel, $host_crypto);
 
 			if($result['success']) {
 				logger('deliver: remote zot delivery succeeded to ' . $outq['outq_posturl']);
@@ -265,7 +221,7 @@ class Queue {
 			else {
 				logger('deliver: remote zot delivery failed to ' . $outq['outq_posturl']);
 				logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
-				self::update($outq['outq_hash'],10);
+				self::update($outq['outq_hash'], 10);
 			}
 		}
 		return;
diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php
index b4cd5a194..81f378d0d 100644
--- a/Zotlabs/Lib/Share.php
+++ b/Zotlabs/Lib/Share.php
@@ -8,13 +8,13 @@ class Share {
 
 
 	public function __construct($post_id) {
-	
+
 		if(! $post_id)
 			return;
-	
+
 		if(! (local_channel() || remote_channel()))
 			return;
-	
+
 		$r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d  LIMIT 1",
 			intval($post_id)
 		);
@@ -23,26 +23,26 @@ class Share {
 
 		if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss'))
 			return;
-	
+
 		$sql_extra = item_permissions_sql($r[0]['uid']);
-	
+
 		$r = q("select * from item where id = %d $sql_extra",
 			intval($post_id)
 		);
 		if(! $r)
 			return;
-	
+
 		if($r[0]['mimetype'] !== 'text/bbcode')
 			return;
-	
+
 		/** @FIXME eventually we want to post remotely via rpost on your home site */
 		// When that works remove this next bit:
-	
+
 		if(! local_channel())
 			return;
 
 		xchan_query($r);
-	
+
 		$this->item = $r[0];
 		return;
 	}
@@ -66,14 +66,14 @@ class Share {
 			'address'  => $this->item['author']['xchan_addr'],
 			'network'  => $this->item['author']['xchan_network'],
 			'link'     => [
-				[ 
-					'rel'  => 'alternate', 
-					'type' => 'text/html', 
+				[
+					'rel'  => 'alternate',
+					'type' => 'text/html',
 					'href' => $this->item['author']['xchan_url']
 				],
 				[
-					'rel'  => 'photo', 
-					'type' => $this->item['author']['xchan_photo_mimetype'], 
+					'rel'  => 'photo',
+					'type' => $this->item['author']['xchan_photo_mimetype'],
 					'href' => $this->item['author']['xchan_photo_m']
 				]
 			]
@@ -84,14 +84,14 @@ class Share {
 			'address'  => $this->item['owner']['xchan_addr'],
 			'network'  => $this->item['owner']['xchan_network'],
 			'link'     => [
-				[ 
-					'rel'  => 'alternate', 
-					'type' => 'text/html', 
+				[
+					'rel'  => 'alternate',
+					'type' => 'text/html',
 					'href' => $this->item['owner']['xchan_url']
 				],
 				[
-					'rel'  => 'photo', 
-					'type' => $this->item['owner']['xchan_photo_mimetype'], 
+					'rel'  => 'photo',
+					'type' => $this->item['owner']['xchan_photo_mimetype'],
 					'href' => $this->item['owner']['xchan_photo_m']
 				]
 			]
@@ -117,7 +117,7 @@ class Share {
 			$object = json_decode($this->item['obj'],true);
 			$photo_bb = $object['body'];
 		}
-	
+
 		if (strpos($this->item['body'], "[/share]") !== false) {
 			$pos = strpos($this->item['body'], "[share");
 			$bb = substr($this->item['body'], $pos);
@@ -126,7 +126,7 @@ class Share {
 				"' profile='"    . $this->item['author']['xchan_url'] .
 				"' avatar='"     . $this->item['author']['xchan_photo_s'] .
 				"' link='"       . $this->item['plink'] .
-				"' auth='"       . ((in_array($this->item['author']['xchan_network'], ['zot6', 'zot'])) ? 'true' : 'false') .
+				"' auth='"       . (($this->item['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
 				"' posted='"     . $this->item['created'] .
 				"' message_id='" . $this->item['mid'] .
 			"']";
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index c0d5c001b..c9048cd4f 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -299,7 +299,7 @@ class ThreadItem {
 			);
 			*/
 
-			$settings = t('Conversation Tools');
+			$settings = t('Conversation Features');
 		}
 
 		$has_bookmarks = false;
@@ -367,7 +367,7 @@ class ThreadItem {
                 call_hooks('dropdown_extras',$dropdown_extras_arr);
                 $dropdown_extras = $dropdown_extras_arr['dropdown_extras'];
 
-		$midb64 = 'b64.' . base64url_encode($item['mid']);
+		$midb64 = gen_link_id($item['mid']);
 		$mids = [ $midb64 ];
 		$response_mids = [];
 		foreach($response_verbs as $v) {
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 68b2c70dd..7fe8fcc2e 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -77,7 +77,7 @@ class ThreadStream {
 				$this->reload = $_SESSION['return_url'];
 				break;
 			case 'display':
-				// in this mode we set profile_owner after initialisation (from conversation()) and then 
+				// in this mode we set profile_owner after initialisation (from conversation()) and then
 				// pull some trickery which allows us to re-invoke this function afterward
 				// it's an ugly hack so @FIXME
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
@@ -170,14 +170,14 @@ class ThreadStream {
 		 * Only add things that will be displayed
 		 */
 
-		
+
 		if(($item->get_data_value('id') != $item->get_data_value('parent')) && (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE))) {
 			return false;
 		}
 
 		$item->set_commentable(false);
 		$ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
-		
+
 		if(! comments_are_now_closed($item->get_data())) {
 			if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
 				$item->set_commentable(true);
@@ -194,7 +194,7 @@ class ThreadStream {
 		}
 		if($this->mode === 'pubstream' && (! local_channel())) {
 			$item->set_commentable(false);
-		} 
+		}
 
 
 		$item->set_conversation($this);
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index fb95b0504..aeb02eeaa 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -222,6 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
 					WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 					intval(local_channel())
 				);
+
 				if($r2)
 					$r = array_merge($r2,$r);
 
@@ -282,13 +283,12 @@ class Acl extends \Zotlabs\Web\Controller {
 			}
 		}
 		elseif($type == 'm') {
-
 			$r = array();
 			$z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d
 				and xchan_deleted = 0
-				and xchan_network IN ('zot', 'diaspora', 'friendica-over-diaspora')
+				and not xchan_network IN ('rss', 'anon', 'unknown')
 				$sql_extra3
 				ORDER BY xchan_name ASC ",
 				intval(local_channel())
@@ -371,7 +371,7 @@ class Acl extends \Zotlabs\Web\Controller {
 					);
 				}
 				if($type !== 'f') {
-					if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && ($g['net'] == 'zot6' || $g['net'] == 'zot'))) {
+					if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && $g['net'] == 'zot6')) {
 						$contacts[$x[$lkey]] = array(
 							"type"     => "c",
 							"photo"    => $g['micro'],
@@ -438,7 +438,6 @@ class Acl extends \Zotlabs\Web\Controller {
 		}
 
 		if(! $url) {
-			require_once("include/dir_fns.php");
 			$directory = Libzotdir::find_upstream_directory($dirmode);
 			$url = $directory['url'] . '/dirsearch';
 		}
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 44c10b339..59a9e22b2 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -8,7 +8,6 @@
 
 namespace Zotlabs\Module;
 
-require_once('include/queue_fn.php');
 require_once('include/account.php');
 
 /**
diff --git a/Zotlabs/Module/Admin/Queue.php b/Zotlabs/Module/Admin/Queue.php
index 5a47413ee..baa50591f 100644
--- a/Zotlabs/Module/Admin/Queue.php
+++ b/Zotlabs/Module/Admin/Queue.php
@@ -2,35 +2,35 @@
 
 namespace Zotlabs\Module\Admin;
 
-
+use Zotlabs\Lib\Queue as LibQueue;
 
 class Queue {
 
 
-	
+
 	function get() {
 
 		$o = '';
-	
+
 		$expert = ((array_key_exists('expert',$_REQUEST)) ? intval($_REQUEST['expert']) : 0);
-	
+
 		if($_REQUEST['drophub']) {
 			hubloc_mark_as_down($_REQUEST['drophub']);
-			remove_queue_by_posturl($_REQUEST['drophub']);
+			LibQueue::remove_by_posturl($_REQUEST['drophub']);
 		}
-	
+
 		if($_REQUEST['emptyhub']) {
-			remove_queue_by_posturl($_REQUEST['emptyhub']);
+			LibQueue::remove_by_posturl($_REQUEST['emptyhub']);
 		}
-	
-		$r = q("select count(outq_posturl) as total, max(outq_priority) as priority, outq_posturl from outq 
+
+		$r = q("select count(outq_posturl) as total, max(outq_priority) as priority, outq_posturl from outq
 			where outq_delivered = 0 group by outq_posturl order by total desc");
-	
+
 		for($x = 0; $x < count($r); $x ++) {
 			$r[$x]['eurl'] = urlencode($r[$x]['outq_posturl']);
 			$r[$x]['connected'] = datetime_convert('UTC',date_default_timezone_get(),$r[$x]['connected'],'Y-m-d');
 		}
-	
+
 		$o = replace_macros(get_markup_template('admin_queue.tpl'), array(
 			'$banner' => t('Queue Statistics'),
 			'$numentries' => t('Total Entries'),
@@ -43,11 +43,11 @@ class Queue {
 			'$entries' => $r,
 			'$expert' => $expert
 		));
-	
+
 		return $o;
 	}
-	
 
 
 
-}
\ No newline at end of file
+
+}
diff --git a/Zotlabs/Module/Authtest.php b/Zotlabs/Module/Authtest.php
index 239ae3bdb..d85af09dc 100644
--- a/Zotlabs/Module/Authtest.php
+++ b/Zotlabs/Module/Authtest.php
@@ -1,41 +1,38 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/zot.php');
-
-
 class Authtest extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
-	
+
+
 		$auth_success = false;
 		$o .= '<h3>Magic-Auth Diagnostic</h3>';
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return $o;
 		}
-	
+
 		$o .= '<form action="authtest" method="get">';
 		$o .= 'Target URL: <input type="text" style="width: 250px;" name="dest" value="' . $_GET['dest'] .'" />';
-		$o .= '<input type="submit" name="submit" value="Submit" /></form>'; 
-	
+		$o .= '<input type="submit" name="submit" value="Submit" /></form>';
+
 		$o .= '<br /><br />';
-	
+
 		if(x($_GET,'dest')) {
 			if(strpos($_GET['dest'],'@')) {
 				$_GET['dest'] = $_REQUEST['dest'] = 'https://' . substr($_GET['dest'],strpos($_GET['dest'],'@')+1) . '/channel/' . substr($_GET['dest'],0,strpos($_GET['dest'],'@'));
 			}
-	
+
 			$_REQUEST['test'] = 1;
 			$mod = new Magic();
 			$x = $mod->init($a);
 
 			$o .= 'Local Setup returns: ' . print_r($x,true);
-	
-	
-	
+
+
+
 			if($x['url']) {
 				$z = z_fetch_url($x['url'] . '&test=1');
 				if($z['success']) {
@@ -50,12 +47,12 @@ class Authtest extends \Zotlabs\Web\Controller {
 					$o .= 'fetch url failure.' . print_r($z,true);
 				}
 			}
-	
+
 			if(! $auth_success)
 				$o .= 'Authentication Failed!' . EOL;
 		}
-	
+
 		return str_replace("\n",'<br />',$o);
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index e26cdd072..e41772d38 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -1059,6 +1059,7 @@ class Cdav extends Controller {
 				'$cancel' => t('Cancel'),
 				'$create' => t('Create'),
 				'$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.'),
+				'$disabled_warning' => t('Could not fetch calendar resource. The selected calendar might be disabled.'),
 
 				'$channel_hash' => $channel['channel_hash'],
 				'$acl' => $acl,
diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
index 8ae4841b4..afeb2aacf 100644
--- a/Zotlabs/Module/Chanview.php
+++ b/Zotlabs/Module/Chanview.php
@@ -10,12 +10,12 @@ use Zotlabs\Lib\Zotfinger;
 class Chanview extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		$observer = App::get_observer();
 		$xchan = null;
-	
+
 		$r = null;
-	
+
 		if($_REQUEST['hash']) {
 			$r = q("select * from xchan where xchan_hash = '%s'",
 				dbesc($_REQUEST['hash'])
@@ -27,18 +27,18 @@ class Chanview extends \Zotlabs\Web\Controller {
 			);
 		}
 		elseif(local_channel() && intval($_REQUEST['cid'])) {
-			$r = q("SELECT abook.*, xchan.* 
+			$r = q("SELECT abook.*, xchan.*
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d and abook_id = %d",
 				intval(local_channel()),
 				intval($_REQUEST['cid'])
 			);
-		}	
+		}
 		elseif($_REQUEST['url']) {
-	
+
 			// if somebody re-installed they will have more than one xchan, use the most recent name date as this is
-			// the most useful consistently ascending table item we have. 
-	
+			// the most useful consistently ascending table item we have.
+
 			$r = q("select * from xchan where xchan_url = '%s' order by xchan_name_date desc",
 				dbesc($_REQUEST['url'])
 			);
@@ -46,13 +46,13 @@ class Chanview extends \Zotlabs\Web\Controller {
 		if($r) {
 			App::$poi = Libzot::zot_record_preferred($r, 'xchan_network');
 		}
-	
-	
+
+
 		// Here, let's see if we have an xchan. If we don't, how we proceed is determined by what
-		// info we do have. If it's a URL, we can offer to visit it directly. If it's a webbie or 
-		// address, we can and should try to import it. If it's just a hash, we can't continue, but we 
+		// info we do have. If it's a URL, we can offer to visit it directly. If it's a webbie or
+		// address, we can and should try to import it. If it's just a hash, we can't continue, but we
 		// probably wouldn't have a hash if we don't already have an xchan for this channel.
-	
+
 		if(! App::$poi) {
 			logger('mod_chanview: fallback');
 
@@ -90,7 +90,7 @@ class Chanview extends \Zotlabs\Web\Controller {
 				}
 			}
 		}
-	
+
 		if(! App::$poi) {
 			notice( t('Channel not found.') . EOL);
 			return;
@@ -98,9 +98,9 @@ class Chanview extends \Zotlabs\Web\Controller {
 
 		$is_zot = false;
 		$connected = false;
-	
+
 		$url = App::$poi['xchan_url'];
-		if(in_array(App::$poi['xchan_network'], ['zot', 'zot6'])) {
+		if(App::$poi['xchan_network'] === 'zot6') {
 			$is_zot = true;
 		}
 		if(local_channel()) {
@@ -111,29 +111,29 @@ class Chanview extends \Zotlabs\Web\Controller {
 			if($c)
 				$connected = true;
 		}
-		
-		// We will load the chanview template if it's a foreign network, 
+
+		// We will load the chanview template if it's a foreign network,
 		// just so that we can provide a connect button along with a profile
 		// photo. Chances are we can't load the remote profile into an iframe
 		// because of cross-domain security headers. So provide a link to
-		// the remote profile. 
+		// the remote profile.
 		// If we are already connected, just go to the profile.
 		// Zot channels will usually have a connect link.
-	
+
 		if($is_zot || $connected) {
 			if($is_zot && $observer) {
 				$url = zid($url);
 			}
 			goaway($url);
 		}
-		else {	
+		else {
 			$o = replace_macros(get_markup_template('chanview.tpl'),array(
 				'$url' => $url,
 				'$full' => t('toggle full screen mode')
 			));
-	
+
 			return $o;
 		}
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 44211c8b9..7fabf1224 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -40,12 +40,12 @@ class Connedit extends Controller {
 		if((argc() >= 2) && intval(argv(1))) {
 			$r = q("SELECT abook.*, xchan.*
 				FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_channel = %d and abook_id = %d LIMIT 1",
+				WHERE abook_channel = %d and abook_id = %d and xchan_deleted = 0 LIMIT 1",
 				intval(local_channel()),
 				intval(argv(1))
 			);
 			if($r) {
-				App::$poi = array_shift($r);
+				App::$poi = $r[0];
 			}
 		}
 
@@ -220,9 +220,6 @@ class Connedit extends Controller {
 				if($z)
 					$record = $z[0]['xlink_id'];
 			}
-			if($record) {
-				Master::Summon(array('Ratenotif','rating',$record));
-			}
 		}
 
 		if(($_REQUEST['pending']) && intval($orig_record[0]['abook_pending'])) {
@@ -426,7 +423,7 @@ class Connedit extends Controller {
 			$cmd = argv(2);
 
 			$orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1",
+				WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 and xchan_deleted = 0 LIMIT 1",
 				intval($contact_id),
 				intval(local_channel())
 			);
@@ -478,16 +475,11 @@ class Connedit extends Controller {
 			}
 
 			if($cmd === 'refresh') {
-				if($orig_record[0]['xchan_network'] === 'zot') {
-					if(! zot_refresh($orig_record[0],App::get_channel()))
-						notice( t('Refresh failed - channel is currently unavailable.') );
-				}
-				elseif($orig_record[0]['xchan_network'] === 'zot6') {
+				if($orig_record[0]['xchan_network'] === 'zot6') {
 					if(! Libzot::refresh($orig_record[0],App::get_channel()))
 						notice( t('Refresh failed - channel is currently unavailable.') );
 				}
 				else {
-
 					// if you are on a different network we'll force a refresh of the connection basic info
 					Master::Summon(array('Notifier','permission_update',$contact_id));
 				}
@@ -667,7 +659,7 @@ class Connedit extends Controller {
 			);
 
 
-			if(in_array($contact['xchan_network'], ['zot6', 'zot'])) {
+			if($contact['xchan_network'] === 'zot6') {
 				$tools['fetchvc'] = [
 					'label' => t('Fetch Vcard'),
 					'url'    => z_root() . '/connedit/' . $contact['abook_id'] . '/fetchvc',
@@ -841,7 +833,7 @@ class Connedit extends Controller {
 				$locstr = unpunify($contact['xchan_url']);
 
 			$clone_warn = '';
-			$clonable = (in_array($contact['xchan_network'],['zot', 'zot6', 'rss']) ? true : false);
+			$clonable = in_array($contact['xchan_network'], ['zot6', 'rss']);
 			if(! $clonable) {
 				$clone_warn = '<strong>';
 				$clone_warn .= ((intval($contact['abook_not_here']))
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index e1555fc2d..b39887c9e 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -8,7 +8,6 @@ use Zotlabs\Lib\Libzotdir;
 
 
 require_once('include/socgraph.php');
-require_once('include/dir_fns.php');
 require_once('include/bbcode.php');
 require_once('include/html2plain.php');
 
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
index 804d7af5c..78205a9fc 100644
--- a/Zotlabs/Module/Dirsearch.php
+++ b/Zotlabs/Module/Dirsearch.php
@@ -4,26 +4,22 @@ namespace Zotlabs\Module;
 use App;
 use Zotlabs\Web\Controller;
 
-require_once('include/dir_fns.php');
-
-
-
 class Dirsearch extends Controller {
 
 	function init() {
 		App::set_pager_itemspage(30);
-	
+
 	}
-	
+
 	function get() {
-	
+
 		$ret = array('success' => false);
-	
+
 	//	logger('request: ' . print_r($_REQUEST,true));
-	
-	
+
+
 		$dirmode = intval(get_config('system','directory_mode'));
-	
+
 		if($dirmode == DIRECTORY_MODE_NORMAL) {
 			$ret['message'] = t('This site is not a directory server');
 			json_return_and_die($ret);
@@ -31,24 +27,24 @@ class Dirsearch extends Controller {
 
 
 		$access_token = $_REQUEST['t'];
-	
+
 		$token = get_config('system','realm_token');
 		if($token && $access_token != $token) {
 			$ret['message'] = t('This directory server requires an access token');
 			json_return_and_die($ret);
 		}
-	
-	
+
+
 		if(argc() > 1 && argv(1) === 'sites') {
 			$ret = $this->list_public_sites();
 			json_return_and_die($ret);
 		}
-	
+
 		$sql_extra = '';
-	
-	
+
+
 		$tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords');
-	
+
 		if($_REQUEST['query']) {
 			$advanced = $this->dir_parse_query($_REQUEST['query']);
 			if($advanced) {
@@ -64,9 +60,9 @@ class Dirsearch extends Controller {
 				}
 			}
 		}
-	
+
 		$hash     = ((x($_REQUEST['hash']))    ? $_REQUEST['hash']     : '');
-	
+
 		$name     = ((x($_REQUEST,'name'))     ? $_REQUEST['name']     : '');
 		$hub      = ((x($_REQUEST,'hub'))      ? $_REQUEST['hub']      : '');
 		$address  = ((x($_REQUEST,'address'))  ? $_REQUEST['address']  : '');
@@ -82,16 +78,16 @@ class Dirsearch extends Controller {
 		$agele    = ((x($_REQUEST,'agele'))    ? intval($_REQUEST['agele']) : 0 );
 		$kw       = ((x($_REQUEST,'kw'))       ? intval($_REQUEST['kw'])    : 0 );
 		$forums   = ((array_key_exists('pubforums',$_REQUEST)) ? intval($_REQUEST['pubforums']) : 0);
-	
+
 		if(get_config('system','disable_directory_keywords'))
 			$kw = 0;
-	
-	
+
+
 		// by default use a safe search
 		$safe     = ((x($_REQUEST,'safe')));    // ? intval($_REQUEST['safe'])  : 1 );
 		if ($safe === false)
 				$safe = 1;
-			
+
 		if(array_key_exists('sync',$_REQUEST)) {
 			if($_REQUEST['sync'])
 				$sync = datetime_convert('UTC','UTC',$_REQUEST['sync']);
@@ -100,7 +96,7 @@ class Dirsearch extends Controller {
 		}
 		else
 			$sync = false;
-	
+
 		if(($dirmode == DIRECTORY_MODE_STANDALONE) && (! $hub)) {
 			$hub = \App::get_hostname();
 		}
@@ -109,13 +105,13 @@ class Dirsearch extends Controller {
 			$hub_query = " and xchan_hash in (select hubloc_hash from hubloc where hubloc_host =  '" . protect_sprintf(dbesc($hub)) . "') ";
 		else
 			$hub_query = '';
-	
+
 		$sort_order  = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : '');
-	
+
 		$joiner = ' OR ';
 		if($_REQUEST['and'])
 			$joiner = ' AND ';
-	
+
 		if($name)
 			$sql_extra .= $this->dir_query_build($joiner,'xchan_name',$name);
 		if($address)
@@ -136,58 +132,58 @@ class Dirsearch extends Controller {
 			$sql_extra .= $this->dir_query_build($joiner,'xprof_sexual',$sexual);
 		if($keywords)
 			$sql_extra .= $this->dir_query_build($joiner,'xprof_keywords',$keywords);
-	
-	
-		// we only support an age range currently. You must set both agege 
-		// (greater than or equal) and agele (less than or equal) 
-	
+
+
+		// we only support an age range currently. You must set both agege
+		// (greater than or equal) and agele (less than or equal)
+
 		if($agele && $agege) {
 			$sql_extra .= " $joiner ( xprof_age <= " . intval($agele) . " ";
 			$sql_extra .= " AND  xprof_age >= " . intval($agege) . ") ";
 		}
-	
-	
+
+
 		if($hash) {
 			$sql_extra = " AND xchan_hash like '" . dbesc($hash) . protect_sprintf('%') . "' ";
 		}
-	
-	
+
+
 	    $perpage      = (($_REQUEST['n'])              ? $_REQUEST['n']                    : 60);
 	    $page         = (($_REQUEST['p'])              ? intval($_REQUEST['p'] - 1)        : 0);
 	    $startrec     = (($page+1) * $perpage) - $perpage;
 		$limit        = (($_REQUEST['limit'])          ? intval($_REQUEST['limit'])        : 0);
 		$return_total = ((x($_REQUEST,'return_total')) ? intval($_REQUEST['return_total']) : 0);
-	
+
 		// mtime is not currently working
-	
+
 		$mtime        = ((x($_REQUEST,'mtime'))        ? datetime_convert('UTC','UTC',$_REQUEST['mtime']) : '');
-	
-		// ok a separate tag table won't work. 
+
+		// ok a separate tag table won't work.
 		// merge them into xprof
-	
+
 		$ret['success'] = true;
-	
+
 		// If &limit=n, return at most n entries
 		// If &return_total=1, we count matching entries and return that as 'total_items' for use in pagination.
 		// By default we return one page (default 80 items maximum) and do not count total entries
-	
+
 		$logic = ((strlen($sql_extra)) ? 'false' : 'true');
-	
+
 		if($hash)
 			$logic = 'true';
-	
+
 		if($dirmode == DIRECTORY_MODE_STANDALONE) {
 			$sql_extra .= " and xchan_addr like '%%" . \App::get_hostname() . "' ";
 		}
-	
+
 		$safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : '');
 		if($safe < 0)
 			$safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) ";
-	
+
 		if($forums)
 			$safesql .= " and xchan_pubforum = " . ((intval($forums)) ? '1 ' : '0 ');
-	
-		if($limit) 
+
+		if($limit)
 			$qlimit = " LIMIT $limit ";
 		else {
 			$qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec);
@@ -198,27 +194,27 @@ class Dirsearch extends Controller {
 				}
 			}
 		}
-	
+
 		if($sort_order == 'normal') {
 			$order = " order by xchan_name asc ";
-	
-			// Start the alphabetic search at 'A' 
+
+			// Start the alphabetic search at 'A'
 			// This will make a handful of channels whose names begin with
 			// punctuation un-searchable in this mode
-	
+
 			$safesql .= " and ascii(substring(xchan_name FROM 1 FOR 1)) > 64 ";
 		}
 		elseif($sort_order == 'reverse')
 			$order = " order by xchan_name desc ";
 		elseif($sort_order == 'reversedate')
 			$order = " order by xchan_name_date asc ";
-		else	
+		else
 			$order = " order by xchan_name_date desc ";
-	
-	
+
+
 		if($sync) {
 			$spkt = array('transactions' => array());
-			$r = q("select * from updates where ud_date >= '%s' and ud_guid != '' order by ud_date desc",
+			$r = q("select * from updates where ud_date >= '%s' and ud_guid != '' and ud_addr != '' order by ud_date desc",
 				dbesc($sync)
 			);
 			if($r) {
@@ -228,7 +224,7 @@ class Dirsearch extends Controller {
 						$flags[] = 'deleted';
 					if($rr['ud_flags'] & UPDATE_FLAGS_FORCED)
 						$flags[] = 'forced';
-	
+
 					$spkt['transactions'][] = array(
 						'hash' => $rr['ud_hash'],
 						'address' => $rr['ud_addr'],
@@ -238,87 +234,48 @@ class Dirsearch extends Controller {
 					);
 				}
 			}
-			$r = q("select * from xlink where xlink_static = 1 and xlink_updated >= '%s' ",
-				dbesc($sync)
-			);
-			if($r) {
-				$spkt['ratings'] = array();
-				foreach($r as $rr) {
-					$spkt['ratings'][] = array(
-						'type' => 'rating', 
-						'encoding' => 'zot',
-						'channel' => $rr['xlink_xchan'],
-						'target' => $rr['xlink_link'],
-						'rating' => intval($rr['xlink_rating']),
-						'rating_text' => $rr['xlink_rating_text'],
-						'signature' => $rr['xlink_sig'],
-						'edited' => $rr['xlink_updated']
-					);
-				}
-			}
 			json_return_and_die($spkt);
 		}
 		else {
-	
-			$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash 
-				where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot6' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 
-				$safesql $order $qlimit "
+
+			$r = q("SELECT
+				xchan.xchan_name as name,
+				xchan.xchan_hash as hash,
+				xchan.xchan_censored as censored,
+				xchan.xchan_selfcensored as selfcensored,
+				xchan.xchan_pubforum as public_forum,
+				xchan.xchan_url as url,
+				xchan.xchan_photo_l as photo_l,
+				xchan.xchan_photo_m as photo,
+				xchan.xchan_addr as address,
+				xprof.xprof_desc as description,
+				xprof.xprof_locale as locale,
+				xprof.xprof_region as region,
+				xprof.xprof_postcode as postcode,
+				xprof.xprof_country as country,
+				xprof.xprof_dob as birthday,
+				xprof.xprof_age as age,
+				xprof.xprof_gender as gender,
+				xprof.xprof_marital as marital,
+				xprof.xprof_sexual as sexual,
+				xprof.xprof_about as about,
+				xprof.xprof_homepage as homepage,
+				xprof.xprof_hometown as hometown,
+				xprof.xprof_keywords as keywords
+				from xchan left join xprof on xchan_hash = xprof_hash left join hubloc on hubloc_hash = xchan_hash
+				where hubloc_primary = 1 and hubloc_updated > %s - INTERVAL %s and ( $logic $sql_extra ) $hub_query and xchan_network = 'zot6' and xchan_system = 0 and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0
+				$safesql $order $qlimit",
+				db_utcnow(),
+				db_quoteinterval('30 DAY')
 			);
-	
-	
-	
-			$ret['page'] = $page + 1;
-			$ret['records'] = count($r);		
+
 		}
-	
-	
-	
+
 		if($r) {
-	
-			$entries = array();
-	
-			foreach($r as $rr) {
-	
-				$entry = array();
-	
-				$pc = q("select count(xlink_rating) as total_ratings from xlink where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 group by xlink_rating",
-					dbesc($rr['xchan_hash'])
-				);
-	
-				if($pc)
-					$entry['total_ratings'] = intval($pc[0]['total_ratings']);
-				else
-					$entry['total_ratings'] = 0;
-	
-				$entry['name']         = $rr['xchan_name'];
-				$entry['hash']         = $rr['xchan_hash'];
-				$entry['censored']     = $rr['xchan_censored'];
-				$entry['selfcensored'] = $rr['xchan_selfcensored'];
-				$entry['public_forum'] = (intval($rr['xchan_pubforum']) ? true : false);
-				$entry['url']          = $rr['xchan_url'];
-				$entry['photo_l']      = $rr['xchan_photo_l'];
-				$entry['photo']        = $rr['xchan_photo_m'];
-				$entry['address']      = $rr['xchan_addr'];
-				$entry['description']  = $rr['xprof_desc'];
-				$entry['locale']       = $rr['xprof_locale'];
-				$entry['region']       = $rr['xprof_region'];
-				$entry['postcode']     = $rr['xprof_postcode'];
-				$entry['country']      = $rr['xprof_country'];
-				$entry['birthday']     = $rr['xprof_dob'];
-				$entry['age']          = $rr['xprof_age'];
-				$entry['gender']       = $rr['xprof_gender'];
-				$entry['marital']      = $rr['xprof_marital'];
-				$entry['sexual']       = $rr['xprof_sexual'];
-				$entry['about']        = $rr['xprof_about'];
-				$entry['homepage']     = $rr['xprof_homepage'];
-				$entry['hometown']     = $rr['xprof_hometown'];
-				$entry['keywords']     = $rr['xprof_keywords'];
-	
-				$entries[] = $entry;
-	
-			}
-	
-			$ret['results'] = $entries;
+			$ret['results'] = $r;
+			$ret['page'] = $page + 1;
+			$ret['records'] = count($r);
+
 			if($kw) {
 				$k = dir_tagadelic($kw, $hub);
 				if($k) {
@@ -328,30 +285,30 @@ class Dirsearch extends Controller {
 					}
 				}
 			}
-		}		
-	
+		}
+
 		json_return_and_die($ret);
 	}
-	
+
 	function dir_query_build($joiner,$field,$s) {
 		$ret = '';
 		if(trim($s))
 			$ret .= dbesc($joiner) . " " . dbesc($field) . " like '" . protect_sprintf( '%' . dbesc($s) . '%' ) . "' ";
 		return $ret;
 	}
-	
+
 	function dir_flag_build($joiner,$field,$bit,$s) {
 		return dbesc($joiner) . " ( " . dbesc($field) . " & " . intval($bit) . " ) " . ((intval($s)) ? '>' : '=' ) . " 0 ";
 	}
-	
-	
+
+
 	function dir_parse_query($s) {
-	
+
 		$ret = array();
 		$curr = array();
 		$all = explode(' ',$s);
 		$quoted_string = false;
-	
+
 		if($all) {
 			foreach($all as $q) {
 				if($quoted_string === false) {
@@ -382,7 +339,7 @@ class Dirsearch extends Controller {
 							$ret[] = $curr;
 							$curr = array();
 							continue;
-						}	
+						}
 						else {
 							$ret[] = $curr;
 							$curr = array();
@@ -405,15 +362,15 @@ class Dirsearch extends Controller {
 		logger('dir_parse_query:' . print_r($ret,true),LOGGER_DATA);
 		return $ret;
 	}
-	
-		
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
 	function list_public_sites() {
-	
+
 		$rand = db_getfunc('rand');
 		$realm = get_directory_realm();
 		if($realm == DIRECTORY_REALM) {
@@ -428,16 +385,16 @@ class Dirsearch extends Controller {
 				intval(SITE_TYPE_ZOT)
 			);
 		}
-			
+
 		$ret = array('success' => false);
-	
+
 		if($r) {
 			$ret['success'] = true;
 			$ret['sites'] = array();
 			$insecure = array();
-	
+
 			foreach($r as $rr) {
-				
+
 				if($rr['site_access'] == ACCESS_FREE)
 					$access = 'free';
 				elseif($rr['site_access'] == ACCESS_PAID)
@@ -446,14 +403,14 @@ class Dirsearch extends Controller {
 					$access = 'tiered';
 				else
 					$access = 'private';
-	
+
 				if($rr['site_register'] == REGISTER_OPEN)
 					$register = 'open';
 				elseif($rr['site_register'] == REGISTER_APPROVE)
 					$register = 'approve';
 				else
 					$register = 'closed';
-	
+
 				if(strpos($rr['site_url'],'https://') !== false)
 					$ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project'], 'version' => $rr['site_version']);
 				else
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php
index 0fc36dc29..50d1647c8 100644
--- a/Zotlabs/Module/Dreport.php
+++ b/Zotlabs/Module/Dreport.php
@@ -5,16 +5,16 @@ namespace Zotlabs\Module;
 class Dreport extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied') . EOL);
 			return;
 		}
-	
+
 		$table = 'item';
-	
+
 		$channel = \App::get_channel();
-		
+
 		$mid = ((argc() > 1) ? argv(1) : '');
 		$encoded_mid = '';
 
@@ -31,7 +31,7 @@ class Dreport extends \Zotlabs\Web\Controller {
 				$mid = @base64url_decode(substr($mid,4));
 			}
 
-			if($mid) {	
+			if($mid) {
 				$i = q("select id from item where mid = '%s' and uid = %d and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
 					dbesc($mid),
 					intval($channel['channel_id']),
@@ -53,13 +53,13 @@ class Dreport extends \Zotlabs\Web\Controller {
 				$mid = @base64url_decode(substr($mid,4));
 
 		}
-	
-	
+
+
 		if(! $mid) {
 			notice( t('Invalid message') . EOL);
 			return;
 		}
-	
+
 		switch($table) {
 			case 'item':
 				$i = q("select id from item where mid = '%s' and ( author_xchan = '%s' or ( owner_xchan = '%s' and item_wall = 1 )) ",
@@ -77,30 +77,29 @@ class Dreport extends \Zotlabs\Web\Controller {
 			default:
 				break;
 		}
-	
+
 		if(! $i) {
 			notice( t('Permission denied') . EOL);
 			return;
 		}
-		
-		$r = q("select * from dreport where (dreport_xchan = '%s' or dreport_xchan = '%s') and dreport_mid = '%s'",
+
+		$r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'",
 			dbesc($channel['channel_hash']),
-			dbesc($channel['channel_portable_id']),
 			dbesc($mid)
 		);
-	
+
 		if(! $r) {
 			notice( t('no results') . EOL);
 //			return;
 		}
-		
+
 		for($x = 0; $x < count($r); $x++ ) {
-	
+
 			// This has two purposes: 1. make the delivery report strings translateable, and
 			// 2. assign an ordering to item delivery results so we can group them and provide
 			// a readable report with more interesting events listed toward the top and lesser
 			// interesting items towards the bottom
-	
+
 			switch($r[$x]['dreport_result']) {
 				case 'channel sync processed':
 					$r[$x]['gravity'] = 0;
@@ -146,13 +145,13 @@ class Dreport extends \Zotlabs\Web\Controller {
 					break;
 			}
 		}
-	
+
 		usort($r,'self::dreport_gravity_sort');
 
 		$entries = array();
 		foreach($r as $rr) {
-			$entries[] = [ 
-				'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),					
+			$entries[] = [
+				'name' => escape_tags($rr['dreport_name'] ?: $rr['dreport_recip']),
 				'result' => escape_tags($rr['dreport_result']),
 				'time' => escape_tags(datetime_convert('UTC',date_default_timezone_get(),$rr['dreport_time']))
 			];
@@ -167,14 +166,14 @@ class Dreport extends \Zotlabs\Web\Controller {
 			'$push' => t('Redeliver'),
 			'$entries' => $entries
 		));
-	
-	
+
+
 		return $o;
-	
-	
-	
+
+
+
 	}
-	
+
 	private static function dreport_gravity_sort($a,$b) {
 		if($a['gravity'] == $b['gravity']) {
 			if($a['dreport_name'] === $b['dreport_name'])
@@ -183,5 +182,5 @@ class Dreport extends \Zotlabs\Web\Controller {
 		}
 		return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
deleted file mode 100644
index 681d6887d..000000000
--- a/Zotlabs/Module/Events.php
+++ /dev/null
@@ -1,750 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/conversation.php');
-require_once('include/bbcode.php');
-require_once('include/datetime.php');
-require_once('include/event.php');
-require_once('include/items.php');
-require_once('include/html2plain.php');
-
-class Events extends \Zotlabs\Web\Controller {
-
-	function post() {
-
-		// this module is deprecated
-		return;
-	
-		logger('post: ' . print_r($_REQUEST,true), LOGGER_DATA);
-	
-		if(! local_channel())
-			return;
-	
-		if(($_FILES) && array_key_exists('userfile',$_FILES) && intval($_FILES['userfile']['size'])) {
-			$src = $_FILES['userfile']['tmp_name'];
-			if($src) {
-				$result = parse_ical_file($src,local_channel());
-				if($result)
-					info( t('Calendar entries imported.') . EOL);
-				else
-					notice( t('No calendar entries found.') . EOL);
-				@unlink($src);
-			}
-			goaway(z_root() . '/events');
-		}
-	
-	
-		$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
-		$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
-	
-		$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
-		$uid      = local_channel();
-	
-		$start_text = escape_tags($_REQUEST['start_text']);
-		$finish_text = escape_tags($_REQUEST['finish_text']);
-	
-		$adjust   = intval($_POST['adjust']);
-		$nofinish = intval($_POST['nofinish']);
-	
-		$timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select']))     : '');
-
-		$tz = (($timezone) ? $timezone : date_default_timezone_get());
-
-		$categories = escape_tags(trim($_POST['category']));
-	
-		// only allow editing your own events. 
-	
-		if(($xchan) && ($xchan !== get_observer_hash()))
-			return;
-	
-		if($start_text) {
-			$start = $start_text;
-		}
-		else {
-			$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
-		}
-	
-	
-		if($finish_text) {
-			$finish = $finish_text;
-		}
-		else {
-			$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
-		}
-
-		if($nofinish) {
-			$finish = NULL_DATE;
-		}
-
-	
-		if($adjust) {
-			$start = datetime_convert($tz,'UTC',$start);
-			if(! $nofinish)
-				$finish = datetime_convert($tz,'UTC',$finish);
-		}
-		else {
-			$start = datetime_convert('UTC','UTC',$start);
-			if(! $nofinish)
-				$finish = datetime_convert('UTC','UTC',$finish);
-		}
-	
-		// Don't allow the event to finish before it begins.
-		// It won't hurt anything, but somebody will file a bug report
-		// and we'll waste a bunch of time responding to it. Time that 
-		// could've been spent doing something else. 
-	
-	
-		$summary  = escape_tags(trim($_POST['summary']));
-		$desc     = escape_tags(trim($_POST['desc']));
-		$location = escape_tags(trim($_POST['location']));
-		$type     = escape_tags(trim($_POST['type']));
-	
-		require_once('include/text.php');
-		linkify_tags($desc, local_channel());
-		linkify_tags($location, local_channel());
-	
-		//$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;
-	
-		//fixme: this url gives a wsod if there is a linebreak detected in one of the variables ($desc or $location)
-		//$onerror_url = z_root() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish&type=$type";
-		$onerror_url = z_root() . "/events";
-	
-		if(strcmp($finish,$start) < 0 && !$nofinish) {
-			notice( t('Event can not end before it has started.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
-				killme();
-			}
-			goaway($onerror_url);
-		}
-	
-		if((! $summary) || (! $start)) {
-			notice( t('Event title and start time are required.') . EOL);
-			if(intval($_REQUEST['preview'])) {
-				echo( t('Unable to generate preview.'));
-				killme();
-			}
-			goaway($onerror_url);
-		}
-	
-		//		$share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0);
-
-		$share = 1;	
-
-		$channel = \App::get_channel();
-	
-		$acl = new \Zotlabs\Access\AccessList(false);
-	
-		if($event_id) {
-			$x = q("select * from event where id = %d and uid = %d limit 1",
-				intval($event_id),
-				intval(local_channel())
-			);
-			if(! $x) {
-				notice( t('Event not found.') . EOL);
-				if(intval($_REQUEST['preview'])) {
-					echo( t('Unable to generate preview.'));
-					killme();
-				}
-				return;
-			}
-	
-			$acl->set($x[0]);
-	
-			$created = $x[0]['created'];
-			$edited = datetime_convert();
-	
-			if($x[0]['allow_cid'] === '<' . $channel['channel_hash'] . '>' 
-				&& $x[0]['allow_gid'] === '' && $x[0]['deny_cid'] === '' && $x[0]['deny_gid'] === '') {
-				$share = false;
-			}
-			else {
-				$share = true;
-			}
-		}
-		else {
-			$created = $edited = datetime_convert();
-			if($share) {
-				$acl->set_from_array($_POST);
-			}
-			else {
-				$acl->set(array('allow_cid' => '<' . $channel['channel_hash'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''));
-			}
-		}
-	
-		$post_tags = array();
-		$channel = \App::get_channel();
-		$ac = $acl->get();
-	
-		if(strlen($categories)) {
-			$cats = explode(',',$categories);
-			foreach($cats as $cat) {
-				$post_tags[] = array(
-					'uid'   => $profile_uid, 
-					'ttype' => TERM_CATEGORY,
-					'otype' => TERM_OBJ_POST,
-					'term'  => trim($cat),
-					'url'   => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat))
-				);
-			}
-		}
-	
-		$datarray = array();
-		$datarray['dtstart'] = $start;
-		$datarray['dtend'] = $finish;
-		$datarray['summary'] = $summary;
-		$datarray['description'] = $desc;
-		$datarray['location'] = $location;
-		$datarray['etype'] = $type;
-		$datarray['adjust'] = $adjust;
-		$datarray['nofinish'] = $nofinish;
-		$datarray['uid'] = local_channel();
-		$datarray['account'] = get_account_id();
-		$datarray['event_xchan'] = $channel['channel_hash'];
-		$datarray['allow_cid'] = $ac['allow_cid'];
-		$datarray['allow_gid'] = $ac['allow_gid'];
-		$datarray['deny_cid'] = $ac['deny_cid'];
-		$datarray['deny_gid'] = $ac['deny_gid'];
-		$datarray['private'] = (($acl->is_private()) ? 1 : 0);
-		$datarray['id'] = $event_id;
-		$datarray['created'] = $created;
-		$datarray['edited'] = $edited;
-	
-		if(intval($_REQUEST['preview'])) {
-			$html = format_event_html($datarray);
-			echo $html;
-			killme();
-		}
-	
-		$event = event_store_event($datarray);
-	
-		if($post_tags)	
-			$datarray['term'] = $post_tags;
-	
-		$item_id = event_store_item($datarray,$event);
-	
-		if($item_id) {
-			$r = q("select * from item where id = %d",
-				intval($item_id)
-			);
-			if($r) {
-				xchan_query($r);
-				$sync_item = fetch_post_tags($r);
-				$z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
-					dbesc($r[0]['resource_id']),
-					intval($channel['channel_id'])
-				);
-				if($z) {
-					build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
-				}
-			}
-		}
-	
-		if($share)
-			\Zotlabs\Daemon\Master::Summon(array('Notifier','event',$item_id));
-	
-	}
-	
-	
-	
-	function get() {
-
-		// this module is deprecated
-		return;
-	
-		if(argc() > 2 && argv(1) == 'ical') {
-			$event_id = argv(2);
-	
-			require_once('include/security.php');
-			$sql_extra = permissions_sql(local_channel());
-	
-			$r = q("select * from event where event_hash = '%s' $sql_extra limit 1",
-				dbesc($event_id)
-			);
-			if($r) { 
-				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('event') . '-' . $event_id . '.ics"' );
-				echo ical_wrapper($r);
-				killme();
-			}
-			else {
-				notice( t('Event not found.') . EOL );
-				return;
-			}
-		}
-	
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		\App::$profile_uid = local_channel();
-		nav_set_selected('Events');
-
-	
-		if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 1 where id = %d and uid = %d",
-				intval(argv(2)),
-				intval(local_channel())
-			);
-		}
-	
-		if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) {
-			$r = q("update event set dismissed = 0 where id = %d and uid = %d",
-				intval(argv(2)),
-				intval(local_channel())
-			);
-		}
-	
-		$first_day = feature_enabled(local_channel(), 'events_cal_first_day');
-		$first_day = (($first_day) ? $first_day : 0);
-	
-		$htpl = get_markup_template('event_head.tpl');
-		\App::$page['htmlhead'] .= replace_macros($htpl,array(
-			'$baseurl' => z_root(),
-			'$module_url' => '/events',
-			'$modparams' => 1,
-			'$lang' => \App::$language,
-			'$first_day' => $first_day
-		));
-	
-		$o = '';
-	
-		$channel = \App::get_channel();
-	
-		$mode = 'view';
-		$y = 0;
-		$m = 0;
-		$ignored = ((x($_REQUEST,'ignored')) ? " and dismissed = " . intval($_REQUEST['ignored']) . " "  : '');
-	
-	
-		// logger('args: ' . print_r(\App::$argv,true));
-	
-	
-	
-		if(argc() > 1) {
-			if(argc() > 2 && argv(1) === 'add') {
-				$mode = 'add';
-				$item_id = intval(argv(2));
-			}
-			if(argc() > 2 && argv(1) === 'drop') {
-				$mode = 'drop';
-				$event_id = argv(2);
-			}
-			if(argc() > 2 && intval(argv(1)) && intval(argv(2))) {
-				$mode = 'view';
-				$y = intval(argv(1));
-				$m = intval(argv(2));
-			}
-			if(argc() <= 2) {
-				$mode = 'view';
-				$event_id = argv(1);
-			}
-		}
-	
-		if($mode === 'add') {
-			event_addtocal($item_id,local_channel());
-			killme();
-		}
-	
-		if($mode == 'view') {
-	
-			/* edit/create form */
-			if($event_id) {
-				$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-					dbesc($event_id),
-					intval(local_channel())
-				);
-				if(count($r))
-					$orig_event = $r[0];
-			}
-	
-			$channel = \App::get_channel();
-	
-			// Passed parameters overrides anything found in the DB
-			if(!x($orig_event))
-				$orig_event = array();
-	
-			// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
-			/*
-			if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
-			if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
-			if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
-			if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
-			if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
-			if(x($_REQUEST,'start')) $orig_event['dtstart'] = $_REQUEST['start'];
-			if(x($_REQUEST,'finish')) $orig_event['dtend'] = $_REQUEST['finish'];
-			if(x($_REQUEST,'type')) $orig_event['etype'] = $_REQUEST['type'];
-			*/
-	
-			$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
-			$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
-			$t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
-			$d_orig = ((x($orig_event)) ? $orig_event['description'] : '');
-			$l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
-			$eid = ((x($orig_event)) ? $orig_event['id'] : 0);
-			$event_xchan = ((x($orig_event)) ? $orig_event['event_xchan'] : $channel['channel_hash']);
-			$mid = ((x($orig_event)) ? $orig_event['mid'] : '');
-	
-			if(! x($orig_event)) {
-				$sh_checked = '';
-				$a_checked = ' checked="checked" ';
-			}
-			else {
-				$sh_checked = ((($orig_event['allow_cid'] === '<' . $channel['channel_hash'] . '>' || (! $orig_event['allow_cid'])) && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' );
-			}
-
-			if($orig_event['event_xchan'])
-				$sh_checked .= ' disabled="disabled" ';
-	
-			$sdt = ((x($orig_event)) ? $orig_event['dtstart'] : 'now');
-	
-			$fdt = ((x($orig_event)) ? $orig_event['dtend'] : '+1 hour');
-	
-			$tz = date_default_timezone_get();
-			if(x($orig_event))
-				$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
-	
-			$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
-			$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-			$sday = datetime_convert('UTC', $tz, $sdt, 'd');
-			$shour = datetime_convert('UTC', $tz, $sdt, 'H');
-			$sminute = datetime_convert('UTC', $tz, $sdt, 'i');
-	
-			$stext = datetime_convert('UTC',$tz,$sdt);
-			$stext = substr($stext,0,14) . "00:00";
-	
-			$fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
-			$fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-			$fday = datetime_convert('UTC', $tz, $fdt, 'd');
-			$fhour = datetime_convert('UTC', $tz, $fdt, 'H');
-			$fminute = datetime_convert('UTC', $tz, $fdt, 'i');
-	
-			$ftext = datetime_convert('UTC',$tz,$fdt);
-			$ftext = substr($ftext,0,14) . "00:00";
-	
-			$type = ((x($orig_event)) ? $orig_event['etype'] : 'event');
-	
-			$f = get_config('system','event_input_format');
-			if(! $f)
-				$f = 'ymd';
-	
-			$catsenabled = feature_enabled(local_channel(),'categories');
-	
-			$category = '';
-	
-			if($catsenabled && x($orig_event)){
-				$itm = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1",
-					dbesc($orig_event['event_hash']),
-					intval(local_channel())
-				);
-				$itm = fetch_post_tags($itm);
-				if($itm) {
-					$cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-					foreach ($cats as $cat) {
-						if(strlen($category))
-							$category .= ', ';
-						$category .= $cat['term'];
-	            			}
-				}
-			}
-	
-			require_once('include/acl_selectors.php');
-	
-			$acl = new \Zotlabs\Access\AccessList($channel);
-			$perm_defaults = $acl->get();
-
-			$permissions = ((x($orig_event)) ? $orig_event : $perm_defaults);
-
-			$tpl = get_markup_template('event_form.tpl');
-	
-			$form = replace_macros($tpl,array(
-				'$post' => z_root() . '/events',
-				'$eid' => $eid,
-				'$type' => $type,
-				'$xchan' => $event_xchan,
-				'$mid' => $mid,
-				'$event_hash' => $event_id,
-				'$summary' => array('summary', (($event_id) ? t('Edit event title') : t('Event title')), $t_orig, t('Required'), '*'),
-				'$catsenabled' => $catsenabled,
-				'$placeholdercategory' => t('Categories (comma-separated list)'),
-				'$c_text' => (($event_id) ? t('Edit Category') : t('Category')),
-				'$category' => $category,
-				'$required' => '<span class="required" title="' . t('Required') . '">*</span>',
-				'$s_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$syear+5),\DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"), (($event_id) ? t('Edit start date and time') : t('Start date and time')), 'start_text',true,true,'','',true,$first_day),
-				'$n_text' => t('Finish date and time are not known or not relevant'),
-				'$n_checked' => $n_checked,
-				'$f_dsel' => datetimesel($f,new \DateTime(),\DateTime::createFromFormat('Y',$fyear+5),\DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"), (($event_id) ? t('Edit finish date and time') : t('Finish date and time')),'finish_text',true,true,'start_text','',false,$first_day),
-				'$nofinish' => array('nofinish', t('Finish date and time are not known or not relevant'), $n_checked, '', array(t('No'),t('Yes')), 'onclick="enableDisableFinishDate();"'),
-				'$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked, t('Important for events that happen in a particular place. Not practical for global holidays.'), array(t('No'),t('Yes'))),
-				'$a_text' => t('Adjust for viewer timezone'),
-				'$d_text' => (($event_id) ? t('Edit Description') : t('Description')),
-				'$d_orig' => $d_orig,
-				'$l_text' => (($event_id) ? t('Edit Location') : t('Location')),
-				'$l_orig' => $l_orig,
-				'$t_orig' => $t_orig,
-				'$preview' => t('Preview'),
-				'$perms_label' => t('Permission settings'),
-				// populating the acl dialog was a permission description from view_stream because Cal.php, which
-				// displays events, says "since we don't currently have an event permission - use the stream permission"
-				'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))),
-
-				'$allow_cid' => acl2json($permissions['allow_cid']),
-				'$allow_gid' => acl2json($permissions['allow_gid']),
-				'$deny_cid' => acl2json($permissions['deny_cid']),
-				'$deny_gid' => acl2json($permissions['deny_gid']),
-				'$tz_choose' => feature_enabled(local_channel(),'event_tz_select'),
-				'$timezone' => array('timezone_select' , t('Timezone:'), date_default_timezone_get(), '', get_timezones()),
-
-				'$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
-
-				'$submit' => t('Submit'),
-				'$advanced' => t('Advanced Options')
-	
-			));
-			/* end edit/create form */
-	
-			$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
-			$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
-			if(! $y)
-				$y = intval($thisyear);
-			if(! $m)
-				$m = intval($thismonth);
-	
-			$export = false;
-			if(argc() === 4 && argv(3) === 'export')
-				$export = true;
-	
-			// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
-			// An upper limit was chosen to keep search engines from exploring links millions of years in the future. 
-	
-			if($y < 1901)
-				$y = 1900;
-			if($y > 2099)
-				$y = 2100;
-	
-			$nextyear = $y;
-			$nextmonth = $m + 1;
-			if($nextmonth > 12) {
-					$nextmonth = 1;
-				$nextyear ++;
-			}
-	
-			$prevyear = $y;
-			if($m > 1)
-				$prevmonth = $m - 1;
-			else {
-				$prevmonth = 12;
-				$prevyear --;
-			}
-				
-			$dim    = get_dim($y,$m);
-			$start  = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
-			$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
-	
-	
-			if (argv(1) === 'json'){
-				if (x($_GET,'start'))	$start = $_GET['start'];
-				if (x($_GET,'end'))	$finish = $_GET['end'];
-			}
-	
-			$start  = datetime_convert('UTC','UTC',$start);
-			$finish = datetime_convert('UTC','UTC',$finish);
-	
-			$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
-			$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
-	
-			if (x($_GET,'id')){
-			  	$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                                from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1",
-					intval(local_channel()),
-					intval($_GET['id'])
-				);
-			} elseif($export) {
-				$r = q("SELECT * from event where uid = %d
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
-					intval(local_channel()),
-					dbesc($start),
-					dbesc($finish),
-					dbesc($adjust_start),
-					dbesc($adjust_finish)
-				);
-			}
-			else {
-				// fixed an issue with "nofinish" events not showing up in the calendar.
-				// There's still an issue if the finish date crosses the end of month.
-				// Noting this for now - it will need to be fixed here and in Friendica.
-				// Ultimately the finish date shouldn't be involved in the query. 
-
-				$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan
-	                              from event left join item on event_hash = resource_id 
-					where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored 
-					AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' ) 
-					OR  (  adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
-					intval(local_channel()),
-					dbesc($start),
-					dbesc($finish),
-					dbesc($adjust_start),
-					dbesc($adjust_finish)
-				);
-			}
-	
-			$links = array();
-	
-			if($r && ! $export) {
-				xchan_query($r);
-				$r = fetch_post_tags($r,true);
-	
-				$r = sort_by_date($r);
-			}
-	
-			if($r) {
-				foreach($r as $rr) {
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
-					if(! x($links,$j)) 
-						$links[$j] = z_root() . '/' . \App::$cmd . '#link-' . $j;
-				}
-			}
-	
-			$events=array();
-	
-			$last_date = '';
-			$fmt = t('l, F j');
-	
-			if($r) {
-	
-				foreach($r as $rr) {
-					
-					$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'j') : datetime_convert('UTC','UTC',$rr['dtstart'],'j'));
-					$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], $fmt) : datetime_convert('UTC','UTC',$rr['dtstart'],$fmt));
-					$d = day_translate($d);
-					
-					$start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtstart'], 'c') : datetime_convert('UTC','UTC',$rr['dtstart'],'c'));
-					if ($rr['nofinish']){
-						$end = null;
-					} else {
-						$end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['dtend'], 'c') : datetime_convert('UTC','UTC',$rr['dtend'],'c'));
-
-						// give a fake end to birthdays so they get crammed into a 
-						// single day on the calendar
-
-						if($rr['etype'] === 'birthday')
-							$end = null;
-					}
-					
-					
-					$is_first = ($d !== $last_date);
-						
-					$last_date = $d;
-	
-					$edit = ((local_channel() && $rr['author_xchan'] == get_observer_hash()) ? array(z_root().'/events/'.$rr['event_hash'].'?expandform=1',t('Edit event'),'','') : false);
-	
-					$drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
-	
-					$title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8'));
-					if(! $title) {
-						list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-						$title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
-					}
-					$html = format_event_html($rr);
-					$rr['desc'] = zidify_links(smilies(bbcode($rr['desc'])));
-					$rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false);
-					$rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
-					$events[] = array(
-						'id'=>$rr['id'],
-						'hash' => $rr['event_hash'],
-						'start'=> $start,
-						'end' => $end,
-						'drop' => $drop,
-						'allDay' => false,
-						'title' => $title,
-						
-						'j' => $j,
-						'd' => $d,
-						'edit' => $edit,
-						'is_first'=>$is_first,
-						'item'=>$rr,
-						'html'=>$html,
-						'plink' => array($rr['plink'],t('Link to Source'),'',''),
-					);
-
-				}
-			}
-
-			if($export) {
-				header('Content-type: text/calendar');
-				header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' );
-				echo ical_wrapper($r);
-				killme();
-			}
-	
-			if (\App::$argv[1] === 'json'){
-				echo json_encode($events); killme();
-			}
-			
-			// links: array('href', 'text', 'extra css classes', 'title')
-			if (x($_GET,'id')){
-				$tpl =  get_markup_template("event.tpl");
-			} 
-			else {
-				$tpl = get_markup_template("events-js.tpl");
-			}
-	
-			$o = replace_macros($tpl, array(
-				'$baseurl'	=> z_root(),
-				'$new_event'	=> array(z_root().'/events',(($event_id) ? t('Edit Event') : t('Create Event')),'',''),
-				'$previus'	=> array(z_root()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-				'$next'		=> array(z_root()."/events/$nextyear/$nextmonth",t('Next'),'',''),
-				'$export'	=> array(z_root()."/events/$y/$m/export",t('Export'),'',''),
-				'$calendar'	=> cal($y,$m,$links, ' eventcal'),
-				'$events'	=> $events,
-				'$view_label'   => t('View'),
-				'$month'        => t('Month'),
-				'$week'         => t('Week'),
-				'$day'          => t('Day'),
-				'$prev'		=> t('Previous'),
-				'$next'		=> t('Next'),
-				'$today'	=> t('Today'),
-				'$form'		=> $form,
-				'$expandform'	=> ((x($_GET,'expandform')) ? true : false),
-			));
-			
-			if (x($_GET,'id')){ echo $o; killme(); }
-			
-			return $o;
-		}
-	
-		if($mode === 'drop' && $event_id) {
-			$r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-				dbesc($event_id),
-				intval(local_channel())
-			);
-	
-			$sync_event = $r[0];
-	
-			if($r) {
-				$r = q("delete from event where event_hash = '%s' and uid = %d",
-					dbesc($event_id),
-					intval(local_channel())
-				);
-				if($r) {
-					$r = q("update item set resource_type = '', resource_id = '' where resource_type = 'event' and resource_id = '%s' and uid = %d",
-						dbesc($event_id),
-						intval(local_channel())
-					);
-					$sync_event['event_deleted'] = 1;
-					build_sync_packet(0,array('event' => array($sync_event)));
-	
-					info( t('Event removed') . EOL);
-				}
-				else {
-					notice( t('Failed to remove event' ) . EOL);
-				}
-				goaway(z_root() . '/events');
-			}
-		}
-	
-	}
-	
-}
diff --git a/Zotlabs/Module/Fhublocs.php b/Zotlabs/Module/Fhublocs.php
index 42dac5b12..9dcece715 100644
--- a/Zotlabs/Module/Fhublocs.php
+++ b/Zotlabs/Module/Fhublocs.php
@@ -3,7 +3,6 @@ namespace Zotlabs\Module;
 
 use Zotlabs\Lib\Libzot;
 
-require_once('include/zot.php');
 require_once('include/crypto.php');
 
 /* fix missing or damaged hublocs */
@@ -59,23 +58,6 @@ class Fhublocs extends \Zotlabs\Web\Controller {
 
 				// Create a verified hub location pointing to this site.
 
-/*
-				$h = hubloc_store_lowlevel(
-					[
-						'hubloc_guid'     => $rr['channel_guid'],
-						'hubloc_guid_sig' => $rr['channel_guid_sig'],
-						'hubloc_hash'     => $rr['channel_hash'],
-						'hubloc_addr'     => channel_reddress($rr),
-						'hubloc_network'  => 'zot',
-						'hubloc_primary'  => $primary,
-						'hubloc_url'      => z_root(),
-						'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$rr['channel_prvkey'])),
-						'hubloc_host'     => \App::get_hostname(),
-						'hubloc_callback' => z_root() . '/post',
-						'hubloc_sitekey'  => $sitekey
-					]
-				);
-*/
 				$h = hubloc_store_lowlevel(
 					[
 						'hubloc_guid'     => $rr['channel_guid'],
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
index 2bfab986f..315d05af6 100644
--- a/Zotlabs/Module/Home.php
+++ b/Zotlabs/Module/Home.php
@@ -40,7 +40,7 @@ class Home extends Controller {
 			if (!$dest)
 				$dest = get_config('system', 'startpage');
 			if (!$dest)
-				$dest = z_root() . '/network';
+				$dest = z_root() . '/hq';
 
 			goaway($dest);
 		}
diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php
index a2c4100ad..8c126d154 100644
--- a/Zotlabs/Module/Hq.php
+++ b/Zotlabs/Module/Hq.php
@@ -1,6 +1,10 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Widget\Messages;
+
+
 require_once("include/bbcode.php");
 require_once('include/security.php');
 require_once('include/conversation.php');
@@ -14,23 +18,7 @@ class Hq extends \Zotlabs\Web\Controller {
 		if(! local_channel())
 			return;
 
-		\App::$profile_uid = local_channel();
-	}
-
-	function post() {
-
-		if(!local_channel())
-			return;
-
-		if($_REQUEST['notify_id']) {
-			q("update notify set seen = 1 where id = %d and uid = %d",
-				intval($_REQUEST['notify_id']),
-				intval(local_channel())
-			);
-		}
-
-		killme();
-
+		App::$profile_uid = local_channel();
 	}
 
 	function get($update = 0, $load = false) {
@@ -42,8 +30,9 @@ class Hq extends \Zotlabs\Web\Controller {
 			$item_hash = argv(1);
 		}
 
-		if($_REQUEST['mid'])
+		if(isset($_REQUEST['mid'])) {
 			$item_hash = $_REQUEST['mid'];
+		}
 
 		$item_normal = item_normal();
 		$item_normal_update = item_normal_update();
@@ -55,7 +44,6 @@ class Hq extends \Zotlabs\Web\Controller {
 				ORDER BY created DESC LIMIT 1",
 				intval(local_channel())
 			);
-
 			if($r[0]['mid']) {
 				$item_hash = 'b64.' . base64url_encode($r[0]['mid']);
 			}
@@ -96,7 +84,7 @@ class Hq extends \Zotlabs\Web\Controller {
 		}
 
 		if(! $update) {
-			$channel = \App::get_channel();
+			$channel = App::get_channel();
 
 			$channel_acl = [
 				'allow_cid' => $channel['channel_allow_cid'],
@@ -125,13 +113,7 @@ class Hq extends \Zotlabs\Web\Controller {
 				'reset'               => t('Reset form')
 			];
 
-			$o = replace_macros(get_markup_template("hq.tpl"),
-				[
-					'$no_messages' => (($target_item) ? false : true),
-					'$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen posts...') ],
-					'$editor' => status_editor($a,$x,false,'Hq')
-				]
-			);
+			$o = status_editor($a, $x, true);
 
 		}
 
@@ -153,9 +135,9 @@ class Hq extends \Zotlabs\Web\Controller {
 
 			$o .= '<div id="live-hq"></div>' . "\r\n";
 			$o .= "<script> var profile_uid = " . local_channel()
-				. "; var netargs = '?f='; var profile_page = " . \App::$pager['page'] . ";</script>\r\n";
+				. "; var netargs = '?f='; var profile_page = " . App::$pager['page'] . ";</script>\r\n";
 
-			\App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
+			App::$page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),[
 				'$baseurl' => z_root(),
 				'$pgtype'  => 'hq',
 				'$uid'     => local_channel(),
@@ -267,4 +249,17 @@ class Hq extends \Zotlabs\Web\Controller {
 
 	}
 
+	function post() {
+		if (!local_channel())
+			return;
+
+		$options['offset'] = $_REQUEST['offset'];
+		$options['dm'] = $_REQUEST['dm'];
+		$options['type'] = $_REQUEST['type'];
+
+		$ret = Messages::get_messages_page($options);
+
+		json_return_and_die($ret);
+	}
+
 }
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 4622a588d..77a9ec844 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -2,7 +2,6 @@
 
 namespace Zotlabs\Module;
 
-require_once('include/zot.php');
 require_once('include/channel.php');
 require_once('include/import.php');
 require_once('include/perm_upgrade.php');
@@ -212,35 +211,8 @@ class Import extends \Zotlabs\Web\Controller {
 		// create new hubloc for the new channel at this site
 
 		if(array_key_exists('channel',$data)) {
-			if($channel['channel_portable_id']) {
-				$r = hubloc_store_lowlevel(
-					[
-						'hubloc_guid'     => $channel['channel_guid'],
-						'hubloc_guid_sig' => $channel['channel_guid_sig'],
-						'hubloc_hash'     => $channel['channel_portable_id'],
-						'hubloc_addr'     => channel_reddress($channel),
-						'hubloc_network'  => 'zot',
-						'hubloc_primary'  => (($seize) ? 1 : 0),
-						'hubloc_url'      => z_root(),
-						'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'])),
-						'hubloc_host'     => \App::get_hostname(),
-						'hubloc_callback' => z_root() . '/post',
-						'hubloc_sitekey'  => get_config('system','pubkey'),
-						'hubloc_updated'  => datetime_convert(),
-						'hubloc_id_url'   => channel_url($channel)
-					]
-				);
-
-				// reset the original primary hubloc if it is being seized
-				if($seize) {
-					$r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
-						dbesc($channel['channel_portable_id']),
-						dbesc(z_root())
-					);
-				}
-			}
 
-			// create a new zot6 hubloc if we have got a channel_portable_id
+			// create a new zot6 hubloc
 
 			$r = hubloc_store_lowlevel(
 				[
@@ -280,33 +252,10 @@ class Import extends \Zotlabs\Web\Controller {
 
 			// replace any existing xchan we may have on this site if we're seizing control
 
-			$r = q("delete from xchan where ( xchan_hash = '%s' or xchan_hash = '%s' ) ",
-				dbesc($channel['channel_hash']),
-				dbesc($channel['channel_portable_id'])
+			$r = q("delete from xchan where xchan_hash = '%s'",
+				dbesc($channel['channel_hash'])
 			);
 
-			if($channel['channel_portable_id']) {
-				$r = xchan_store_lowlevel(
-					[
-						'xchan_hash'           => $channel['channel_portable_id'],
-						'xchan_guid'           => $channel['channel_guid'],
-						'xchan_guid_sig'       => $channel['channel_guid_sig'],
-						'xchan_pubkey'         => $channel['channel_pubkey'],
-						'xchan_photo_l'        => z_root() . "/photo/profile/l/" . $channel['channel_id'],
-						'xchan_photo_m'        => z_root() . "/photo/profile/m/" . $channel['channel_id'],
-						'xchan_photo_s'        => z_root() . "/photo/profile/s/" . $channel['channel_id'],
-						'xchan_addr'           => channel_reddress($channel),
-						'xchan_url'            => z_root() . '/channel/' . $channel['channel_address'],
-						'xchan_connurl'        => z_root() . '/poco/' . $channel['channel_address'],
-						'xchan_follow'         => z_root() . '/follow?f=&url=%s',
-						'xchan_name'           => $channel['channel_name'],
-						'xchan_network'        => 'zot',
-						'xchan_photo_date'     => datetime_convert(),
-						'xchan_name_date'      => datetime_convert()
-					]
-				);
-			}
-
 			$r = xchan_store_lowlevel(
 				[
 					'xchan_hash'           => $channel['channel_hash'],
@@ -336,14 +285,6 @@ class Import extends \Zotlabs\Web\Controller {
 		if($xchans) {
 			foreach($xchans as $xchan) {
 
-				if($xchan['xchan_network'] === 'zot') {
-					$hash = make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_guid_sig']);
-					if($hash !== $xchan['xchan_hash']) {
-						logger('forged xchan: ' . print_r($xchan,true));
-						continue;
-					}
-				}
-
 				if($xchan['xchan_network'] === 'zot6') {
 					$zhash = Libzot::make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_pubkey']);
 					if($zhash !== $xchan['xchan_hash']) {
@@ -553,12 +494,6 @@ class Import extends \Zotlabs\Web\Controller {
 		if(is_array($data['chatroom']))
 			import_chatrooms($channel,$data['chatroom']);
 
-		if(is_array($data['conv']))
-			import_conv($channel,$data['conv']);
-
-		if(is_array($data['mail']))
-			import_mail($channel,$data['mail']);
-
 		if(is_array($data['event']))
 			import_events($channel,$data['event']);
 
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 73a943039..518352667 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -822,6 +822,8 @@ class Item extends Controller {
 
 		$post_tags = [];
 
+
+
 		if($mimetype === 'text/bbcode') {
 
 			require_once('include/text.php');
diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php
index a32f933a6..1a2f1664e 100644
--- a/Zotlabs/Module/Lang.php
+++ b/Zotlabs/Module/Lang.php
@@ -7,6 +7,52 @@ use Zotlabs\Web\Controller;
 
 class Lang extends Controller {
 
+	const MYP = 	'ZIN';
+	const VERSION =	'2.0.0';
+
+	function post() {
+
+		$re = [];
+		$isajax = is_ajax();
+		$eol 	= $isajax ? "\n" : EOL;
+
+		if (! Apps::system_app_installed(local_channel(), 'Language')) {
+			$re['msg'] = 'ZIN0202E, ' . t('Language App') . ' (' . t('Not Installed') . ')' ;
+			notice( $re['msg'] . EOL);
+			if ($isajax) {
+				echo json_encode( $re );
+				killme();
+				exit;
+			} else {
+				return;
+			}
+		}
+
+		$lc = x($_POST['zinlc']) && preg_match('/^\?\?|[a-z]{2,2}[x_\-]{0,1}[a-zA-Z]{0,2}$/', $_POST['zinlc']) 
+			? $_POST['zinlc'] : '';
+		$lcs= x($_POST['zinlcs']) && preg_match('/^[a-z,_\-]{0,191}$/', $_POST['zinlcs']) 
+			? $_POST['zinlcs'] : '';
+
+		if ($isajax) {
+
+			if ($lc == '??') {
+				$re['lc'] = get_best_language();
+				$re['lcs'] = language_list();
+			} else {
+				$re['lc'] = $lc;
+				$re['alc'] = App::$language;
+				$re['slc'] = $_SESSION['language'];
+				$_SESSION['language'] = $lc;
+				App::$language = $lc;
+				load_translation_table($lc, true);
+			}
+
+			echo json_encode( $re );
+			killme();
+			exit;
+		}
+	}
+
 	function get() {
 
 		if(local_channel()) {
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
index 2dd359c95..59b872982 100644
--- a/Zotlabs/Module/Locs.php
+++ b/Zotlabs/Module/Locs.php
@@ -28,9 +28,8 @@ class Locs extends Controller {
 					return;
 				}
 
-				q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
-					dbesc($channel['channel_hash']),
-					dbesc($channel['channel_portable_id'])
+				q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND hubloc_hash = '%s'",
+					dbesc($channel['channel_hash'])
 				);
 
 				q("UPDATE hubloc SET hubloc_primary = 1 WHERE hubloc_id = %d AND hubloc_hash = '%s'",
@@ -81,10 +80,9 @@ class Locs extends Controller {
 					}
 				}
 
-				q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
+				q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND hubloc_hash = '%s'",
 					dbesc($r[0]['hubloc_id_url']),
-					dbesc($channel['channel_hash']),
-					dbesc($channel['channel_portable_id'])
+					dbesc($channel['channel_hash'])
 				);
 				Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
 				return;
diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php
index bc2034b95..d67b47437 100644
--- a/Zotlabs/Module/Manage.php
+++ b/Zotlabs/Module/Manage.php
@@ -84,16 +84,6 @@ class Manage extends \Zotlabs\Web\Controller {
 				if($intr)
 					$channels[$x]['intros'] = intval($intr[0]['total']);
 
-
-				$mails = q("SELECT count(id) as total from mail WHERE channel_id = %d AND mail_seen = 0 and from_xchan != '%s' ",
-					intval($channels[$x]['channel_id']),
-					dbesc($channels[$x]['channel_hash'])
-				);
-
-				if($mails)
-					$channels[$x]['mail'] = intval($mails[0]['total']);
-
-
 				$events = q("SELECT etype, dtstart, adjust FROM event
 					WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
 					ORDER BY dtstart ASC ",
@@ -175,7 +165,6 @@ class Manage extends \Zotlabs\Web\Controller {
 			'$msg_make_default' => t('Make Default'),
 			'$create'           => $create,
 			'$all_channels'     => $channels,
-			'$mail_format'      => t('%d new messages'),
 			'$intros_format'    => t('%d new introductions'),
 			'$channel_usage_message' => $channel_usage_message,
 			'$delegated_desc'   => t('Delegated Channel'),
diff --git a/Zotlabs/Module/Message.php b/Zotlabs/Module/Message.php
deleted file mode 100644
index 5856bfbdf..000000000
--- a/Zotlabs/Module/Message.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/acl_selectors.php');
-require_once('include/message.php');
-require_once('include/zot.php');
-require_once("include/bbcode.php");
-
-
-class Message extends \Zotlabs\Web\Controller {
-
-	function get() {
-	
-		$o = '';
-		nav_set_selected('messages');
-	
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
-			return login();
-		}
-	
-		$channel = \App::get_channel();
-		head_set_icon($channel['xchan_photo_s']);
-	
-		$cipher = get_pconfig(local_channel(),'system','default_cipher');
-		if(! $cipher)
-			$cipher = 'aes256';
-	
-	/*
-		if((argc() == 3) && (argv(1) === 'dropconv')) {
-			if(! intval(argv(2)))
-				return;
-			$cmd = argv(1);
-			$r = private_messages_drop(local_channel(), argv(2), true);
-			if($r)
-				info( t('Conversation removed.') . EOL );
-			goaway(z_root() . '/mail/combined' );
-		}
-	
-		if(argc() == 2) {
-	
-			switch(argv(1)) {
-				case 'combined':
-					$mailbox = 'combined';
-					$header = t('Conversations');
-					break;
-				case 'inbox':
-					$mailbox = 'inbox';
-					$header = t('Received Messages');
-					break;
-				case 'outbox':
-					$mailbox = 'outbox';
-					$header = t('Sent Messages');
-					break;
-				default:
-					break;
-			}
-	
-			// private_messages_list() can do other more complicated stuff, for now keep it simple
-	
-			$r = private_messages_list(local_channel(), $mailbox, \App::$pager['start'], \App::$pager['itemspage']);
-	
-			if(! $r) {
-				info( t('No messages.') . EOL);
-				return $o;
-			}
-	
-			$messages = array();
-	
-			foreach($r as $rr) {
-	
-				$messages[] = array(
-					'id'         => $rr['id'],
-					'from_name'  => $rr['from']['xchan_name'],
-					'from_url'   => chanlink_hash($rr['from_xchan']),
-					'from_photo' => $rr['from']['xchan_photo_s'],
-					'to_name'    => $rr['to']['xchan_name'],
-					'to_url'     => chanlink_hash($rr['to_xchan']),
-					'to_photo'   => $rr['to']['xchan_photo_s'],
-					'subject'    => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
-					'delete'     => t('Delete conversation'),
-					'body'       => zidify_links(smilies(bbcode($rr['body']))),
-					'date'       => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')),
-					'seen'       => $rr['seen']
-				);
-			}
-	
-	
-			$tpl = get_markup_template('mail_head.tpl');
-			$o = replace_macros($tpl, array(
-				'$header' => $header,
-				'$messages' => $messages
-			));
-	
-	
-			$o .= alt_pager(count($r));	
-	
-			return $o;
-	
-			return;
-	
-		}
-	*/
-	
-		return;
-	}
-	
-}
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index a21095940..03437d109 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -22,11 +22,11 @@ class Network extends \Zotlabs\Web\Controller {
 
 		$search = $_GET['search'] ?? '';
 
-		if(in_array(substr($search, 0, 1),[ '@', '!', '?']) || strpos($search, 'https://') === 0)
+		if(in_array(substr($search, 0, 1), [ '@', '!', '?']) || strpos($search, 'https://') === 0)
 			goaway(z_root() . '/search?f=&search=' . $search);
 
 		if(count($_GET) < 2) {
-			$network_options = get_pconfig(local_channel(),'system','network_page_default');
+			$network_options = get_pconfig(local_channel(), 'system', 'network_page_default');
 			if($network_options)
 				goaway(z_root() . '/network?f=&' . $network_options);
 		}
@@ -84,7 +84,7 @@ class Network extends \Zotlabs\Web\Controller {
 
 		$search = $_GET['search'] ?? '';
 		if($search) {
-			if(strpos($search,'#') === 0) {
+			if(strpos($search, '#') === 0) {
 				$hashtags = substr($search,1);
 				$search = '';
 			}
@@ -114,31 +114,31 @@ class Network extends \Zotlabs\Web\Controller {
 			$def_acl    = array('allow_gid' => '<' . $r[0]['hash'] . '>');
 		}
 
-		$default_cmin = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmin',0) : (-1));
-		$default_cmax = ((Apps::system_app_installed(local_channel(),'Affinity Tool')) ? get_pconfig(local_channel(),'affinity','cmax',99) : (-1));
-
-		$cid      = ((x($_GET,'cid'))   ? intval($_GET['cid'])   : 0);
-		$star     = ((x($_GET,'star'))  ? intval($_GET['star'])  : 0);
-		$liked    = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
-		$conv     = ((x($_GET,'conv'))  ? intval($_GET['conv'])  : 0);
-		$spam     = ((x($_GET,'spam'))  ? intval($_GET['spam'])  : 0);
-		$cmin     = ((array_key_exists('cmin',$_GET))  ? intval($_GET['cmin'])  : $default_cmin);
-		$cmax     = ((array_key_exists('cmax',$_GET))  ? intval($_GET['cmax'])  : $default_cmax);
-		$file     = ((x($_GET,'file'))  ? $_GET['file']          : '');
-		$xchan    = ((x($_GET,'xchan')) ? $_GET['xchan']         : '');
-		$net      = ((x($_GET,'net'))   ? $_GET['net']           : '');
-		$pf       = ((x($_GET,'pf'))    ? $_GET['pf']            : '');
-		$unseen   = ((x($_GET,'unseen'))    ? $_GET['unseen']            : '');
-
-		if (Apps::system_app_installed(local_channel(),'Affinity Tool')) {
-			$affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1));
+		$default_cmin = ((Apps::system_app_installed(local_channel(), 'Affinity Tool')) ? get_pconfig(local_channel(), 'affinity', 'cmin', 0) : (-1));
+		$default_cmax = ((Apps::system_app_installed(local_channel(), 'Affinity Tool')) ? get_pconfig(local_channel(), 'affinity', 'cmax', 99) : (-1));
+
+		$cid      = ((x($_GET, 'cid'))   ? intval($_GET['cid'])   : 0);
+		$star     = ((x($_GET, 'star'))  ? intval($_GET['star'])  : 0);
+		$liked    = ((x($_GET, 'liked')) ? intval($_GET['liked']) : 0);
+		$conv     = ((x($_GET, 'conv'))  ? intval($_GET['conv'])  : 0);
+		$spam     = ((x($_GET, 'spam'))  ? intval($_GET['spam'])  : 0);
+		$cmin     = ((array_key_exists('cmin', $_GET))  ? intval($_GET['cmin'])  : $default_cmin);
+		$cmax     = ((array_key_exists('cmax', $_GET))  ? intval($_GET['cmax'])  : $default_cmax);
+		$file     = ((x($_GET, 'file'))  ? $_GET['file']          : '');
+		$xchan    = ((x($_GET, 'xchan')) ? $_GET['xchan']         : '');
+		$net      = ((x($_GET, 'net'))   ? $_GET['net']           : '');
+		$pf       = ((x($_GET, 'pf'))    ? $_GET['pf']            : '');
+		$unseen   = ((x($_GET, 'unseen'))    ? $_GET['unseen']            : '');
+
+		if (Apps::system_app_installed(local_channel(), 'Affinity Tool')) {
+			$affinity_locked = intval(get_pconfig(local_channel(), 'affinity', 'lock', 1));
 			if ($affinity_locked) {
-				set_pconfig(local_channel(),'affinity','cmin',$cmin);
-				set_pconfig(local_channel(),'affinity','cmax',$cmax);
+				set_pconfig(local_channel(), 'affinity', 'cmin', $cmin);
+				set_pconfig(local_channel(), 'affinity', 'cmax', $cmax);
 			}
 		}
 
-		if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
+		if(x($_GET, 'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category || $conv || $unseen)
 			$nouveau = true;
 
 		$cid_r = [];
@@ -164,8 +164,8 @@ class Network extends \Zotlabs\Web\Controller {
 
 			// search terms header
 			if($search || $hashtags) {
-				$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-					'$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
+				$o .= replace_macros(get_markup_template('section_title.tpl'), array(
+					'$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT, 'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
 				));
 			}
 
@@ -193,7 +193,7 @@ class Network extends \Zotlabs\Web\Controller {
 
 			$x = array(
 				'is_owner'         => true,
-				'allow_location'   => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),
+				'allow_location'   => ((intval(get_pconfig($channel['channel_id'], 'system', 'use_browser_location'))) ? '1' : ''),
 				'default_location' => $channel['channel_location'],
 				'nickname'         => $channel['channel_address'],
 				'lockstate'        => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
@@ -209,7 +209,7 @@ class Network extends \Zotlabs\Web\Controller {
 				'reset' => t('Reset form')
 			);
 
-			$status_editor = status_editor($a,$x,false,'Network');
+			$status_editor = status_editor($a, $x, false, 'Network');
 			$o .= $status_editor;
 
 		}
@@ -221,7 +221,7 @@ class Network extends \Zotlabs\Web\Controller {
 
 
 		$sql_options  = (($star)
-			? " and item_starred = 1 "
+			? ' and item_starred = 1 '
 			: '');
 
 		$sql_nets = '';
@@ -235,7 +235,7 @@ class Network extends \Zotlabs\Web\Controller {
 			$contact_str = '';
 			$contacts = group_get_members($group);
 			if($contacts) {
-				$contact_str = ids_to_querystr($contacts,'xchan',true);
+				$contact_str = ids_to_querystr($contacts, 'xchan', true);
 			}
 			else {
 				$contact_str = " '0' ";
@@ -249,7 +249,7 @@ class Network extends \Zotlabs\Web\Controller {
 			$x = group_rec_byhash(local_channel(), $group_hash);
 
 			if($x) {
-				$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				$title = replace_macros(get_markup_template('section_title.tpl'), array(
 					'$title' => t('Privacy group: ') . $x['gname']
 				));
 			}
@@ -292,7 +292,7 @@ class Network extends \Zotlabs\Web\Controller {
 					$p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal ");
 					$p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
 
-					$p_str = ids_to_querystr(array_merge($p1,$p2),'parent');
+					$p_str = ids_to_querystr(array_merge($p1, $p2), 'parent');
 					if(! $p_str)
 						killme();
 
@@ -300,7 +300,7 @@ class Network extends \Zotlabs\Web\Controller {
 				}
 			}
 
-			$title = replace_macros(get_markup_template("section_title.tpl"),array(
+			$title = replace_macros(get_markup_template('section_title.tpl'), array(
 				'$title' => '<a href="' . zid($cid_r[0]['xchan_url']) . '" ><img src="' . zid($cid_r[0]['xchan_photo_s'])  . '" alt="' . urlencode($cid_r[0]['xchan_name']) . '" /></a> <a href="' . zid($cid_r[0]['xchan_url']) . '" >' . $cid_r[0]['xchan_name'] . '</a>'
 			));
 
@@ -314,7 +314,7 @@ class Network extends \Zotlabs\Web\Controller {
 			if($r) {
 				$item_thread_top = '';
 				$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
-				$title = replace_macros(get_markup_template("section_title.tpl"),array(
+				$title = replace_macros(get_markup_template("section_title.tpl"), array(
 					'$title' => '<a href="' . zid($r[0]['xchan_url']) . '" ><img src="' . zid($r[0]['xchan_photo_s'])  . '" alt="' . urlencode($r[0]['xchan_name']) . '" /></a> <a href="' . zid($r[0]['xchan_url']) . '" >' . $r[0]['xchan_name'] . '</a>'
 				));
 
@@ -345,13 +345,13 @@ class Network extends \Zotlabs\Web\Controller {
 			$sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
 		}
 
-		$sql_extra2 = (($nouveau) ? '' : " AND item.parent = item.id ");
+		$sql_extra2 = (($nouveau) ? '' : ' AND item.parent = item.id ');
 		$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
 
-		if(x($_GET,'search')) {
+		if(x($_GET, 'search')) {
 			$search = escape_tags($_GET['search']);
-			if(strpos($search,'#') === 0) {
-				$sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG);
+			if(strpos($search, '#') === 0) {
+				$sql_extra .= term_query('item', substr($search, 1), TERM_HASHTAG, TERM_COMMUNITYTAG);
 			}
 			else {
 				$sql_extra .= sprintf(" AND (item.body like '%s' OR item.title like '%s') ",
@@ -368,8 +368,8 @@ class Network extends \Zotlabs\Web\Controller {
 			// The name 'verb' is a holdover from the earlier XML
 			// ActivityStreams specification.
 
-			if (substr($verb,0,1) === '.') {
-				$verb = substr($verb,1);
+			if (substr($verb, 0, 1) === '.') {
+				$verb = substr($verb, 1);
 				$sql_extra .= sprintf(" AND item.obj_type like '%s' ",
 					dbesc(protect_sprintf('%' . $verb . '%'))
 				);
@@ -382,12 +382,16 @@ class Network extends \Zotlabs\Web\Controller {
 		}
 
 		if(strlen($file)) {
-			$sql_extra .= term_query('item',$file,TERM_FILE);
+			$sql_extra .= term_query('item', $file, TERM_FILE);
 		}
 
 		if ($dm) {
-			$sql_extra .= " AND item_private = 2 ";
+			$sql_extra .= ' AND item_private = 2 ';
 		}
+		else {
+			$sql_extra .= ' AND item_private IN (0, 1) ';
+		}
+
 
 		if($conv) {
 			$item_thread_top = '';
@@ -401,38 +405,38 @@ class Network extends \Zotlabs\Web\Controller {
 
 		}
 		else {
-			$itemspage = get_pconfig(local_channel(),'system','itemspage');
+			$itemspage = get_pconfig(local_channel(), 'system', 'itemspage');
 			App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 10));
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(App::$pager['itemspage']), intval(App::$pager['start']));
 		}
 
 		// cmin and cmax are both -1 when the affinity tool is disabled
 
-		if(($cmin != (-1)) || ($cmax != (-1))) {
+		if(($cmin !== (-1)) || ($cmax !== (-1))) {
 
 			// Not everybody who shows up in the network stream will be in your address book.
 			// By default those that aren't are assumed to have closeness = 99; but this isn't
 			// recorded anywhere. So if cmax is 99, we'll open the search up to anybody in
 			// the stream with a NULL address book entry.
 
-			$sql_nets .= " AND ";
+			$sql_nets .= ' AND ';
 
-			if($cmax == 99)
-				$sql_nets .= " ( ";
+			if($cmax === 99)
+				$sql_nets .= ' ( ';
 
-			$sql_nets .= "( abook.abook_closeness >= " . intval($cmin) . " ";
-			$sql_nets .= " AND abook.abook_closeness <= " . intval($cmax) . " ) ";
+			$sql_nets .= '( abook.abook_closeness >= ' . intval($cmin) . ' ';
+			$sql_nets .= ' AND abook.abook_closeness <= ' . intval($cmax) . ' ) ';
 
-			if($cmax == 99)
-				$sql_nets .= " OR abook.abook_closeness IS NULL ) ";
+			if($cmax === 99)
+				$sql_nets .= ' OR abook.abook_closeness IS NULL ) ';
 
 		}
 
-		$net_query = (($net) ? " left join xchan on xchan_hash = author_xchan " : '');
+		$net_query = (($net) ? ' left join xchan on xchan_hash = author_xchan ' : '');
 		$net_query2 = (($net) ? " and xchan_network = '" . protect_sprintf(dbesc($net)) . "' " : '');
 
-		$abook_uids = " and abook.abook_channel = " . local_channel() . " ";
-		$uids = " and item.uid = " . local_channel() . " ";
+		$abook_uids = ' and abook.abook_channel = ' . local_channel() . ' ';
+		$uids = ' and item.uid = ' . local_channel() . ' ';
 
 		if(feature_enabled(local_channel(), 'network_list_mode'))
 			$page_mode = 'list';
@@ -471,22 +475,22 @@ class Network extends \Zotlabs\Web\Controller {
 				ORDER BY item.created DESC $pager_sql "
 			);
 
-			$parents_str = ids_to_querystr($items,'item_id');
+			$parents_str = ids_to_querystr($items, 'item_id');
 
 			require_once('include/items.php');
 
 			xchan_query($items);
 
-			$items = fetch_post_tags($items,true);
+			$items = fetch_post_tags($items, true);
 		}
 		elseif($update) {
 
 			// Normal conversation view
 
 			if($order === 'post')
-				$ordering = "created";
+				$ordering = 'created';
 			else
-				$ordering = "commented";
+				$ordering = 'commented';
 
 			if($load) {
 				// Fetch a page full of parent items for this page
@@ -517,7 +521,7 @@ class Network extends \Zotlabs\Web\Controller {
 
 			if($r) {
 
-				$parents_str = ids_to_querystr($r,'item_id');
+				$parents_str = ids_to_querystr($r, 'item_id');
 
 				$items = q("SELECT item.*, item.id AS item_id FROM item
 					WHERE true $uids $item_normal
@@ -526,9 +530,9 @@ class Network extends \Zotlabs\Web\Controller {
 					dbesc($parents_str)
 				);
 
-				xchan_query($items,true);
-				$items = fetch_post_tags($items,true);
-				$items = conv_sort($items,$ordering);
+				xchan_query($items, true);
+				$items = fetch_post_tags($items, true);
+				$items = conv_sort($items, $ordering);
 			}
 			else {
 				$items = array();
@@ -546,7 +550,7 @@ class Network extends \Zotlabs\Web\Controller {
 			// We only launch liveUpdate if you aren't filtering in some incompatible
 			// way and also you aren't writing a comment (discovered in javascript).
 
-			$maxheight = get_pconfig(local_channel(),'system','network_divmore_height');
+			$maxheight = get_pconfig(local_channel(), 'system', 'network_divmore_height');
 			if(! $maxheight)
 				$maxheight = 400;
 
@@ -591,7 +595,7 @@ class Network extends \Zotlabs\Web\Controller {
 			));
 		}
 
-		$o .= conversation($items,$mode,$update,$page_mode);
+		$o .= conversation($items, $mode, $update, $page_mode);
 
 		if(($items) && (! $update))
 			$o .= alt_pager(count($items));
diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php
index b448cff83..452e3df60 100644
--- a/Zotlabs/Module/Notes.php
+++ b/Zotlabs/Module/Notes.php
@@ -38,7 +38,6 @@ class Notes extends Controller {
 		// push updates to channel clones
 
 		if((argc() > 1) && (argv(1) === 'sync')) {
-			require_once('include/zot.php');
 			Libsync::build_sync_packet();
 		}
 
diff --git a/Zotlabs/Module/Notifications.php b/Zotlabs/Module/Notifications.php
index 8ecf5760a..c08628b47 100644
--- a/Zotlabs/Module/Notifications.php
+++ b/Zotlabs/Module/Notifications.php
@@ -8,10 +8,58 @@ class Notifications extends \Zotlabs\Web\Controller {
 	function get() {
 
 		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
 			return;
 		}
 
+		// ajax mark all unseen items read
+		if(x($_REQUEST, 'markRead')) {
+			switch($_REQUEST['markRead']) {
+				case 'dm':
+					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_private = 2",
+						intval(local_channel())
+					);
+					break;
+				case 'network':
+					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_private IN (0, 1)",
+						intval(local_channel())
+					);
+					break;
+				case 'home':
+					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1 AND item_private IN (0, 1)",
+						intval(local_channel())
+					);
+					break;
+				case 'all_events':
+					$evdays = intval(get_pconfig(local_channel(), 'system', 'evdays', 3));
+					$r = q("UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ",
+						intval(local_channel()),
+						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
+						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+					);
+					break;
+				case 'notify':
+					$r = q("UPDATE notify SET seen = 1 WHERE seen = 0 AND uid = %d",
+						intval(local_channel())
+					);
+					break;
+				case 'pubs':
+					unset($_SESSION['static_loadtime']);
+					break;
+				default:
+					break;
+			}
+			killme();
+		}
+
+		// ajax mark all comments of a parent item read
+		if(x($_REQUEST, 'markItemRead') && local_channel()) {
+			$r = q("UPDATE item SET item_unseen = 0 WHERE  uid = %d AND parent = %d",
+				intval(local_channel()),
+				intval($_REQUEST['markItemRead'])
+			);
+			killme();
+		}
+
 		nav_set_selected('Notifications');
 
 		$o = '';
diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php
index cffcc8099..5bfcec4f7 100644
--- a/Zotlabs/Module/Notify.php
+++ b/Zotlabs/Module/Notify.php
@@ -8,7 +8,15 @@ class Notify extends \Zotlabs\Web\Controller {
 	function init() {
 		if(! local_channel())
 			return;
-	
+
+		if($_REQUEST['notify_id']) {
+			q("update notify set seen = 1 where id = %d and uid = %d",
+				intval($_REQUEST['notify_id']),
+				intval(local_channel())
+			);
+			killme();
+		}
+
 		if(argc() > 2 && argv(1) === 'view' && intval(argv(2))) {
 			$r = q("select * from notify where id = %d and uid = %d limit 1",
 				intval(argv(2)),
@@ -29,24 +37,24 @@ class Notify extends \Zotlabs\Web\Controller {
 			}
 			goaway(z_root());
 		}
-	
-	
+
+
 	}
-	
-	
+
+
 	function get() {
 		if(! local_channel())
 			return login();
-	
+
 		$notif_tpl = get_markup_template('notifications.tpl');
-			
+
 		$not_tpl = get_markup_template('notify.tpl');
 		require_once('include/bbcode.php');
-	
+
 		$r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc",
 			intval(local_channel())
 		);
-			
+
 		if($r) {
 			foreach ($r as $it) {
 				$notif_content .= replace_macros($not_tpl,array(
@@ -56,18 +64,18 @@ class Notify extends \Zotlabs\Web\Controller {
 					'$item_when' => relative_date($it['created'])
 				));
 			}
-		} 
+		}
 		else {
 			$notif_content .= t('No more system notifications.');
 		}
-			
+
 		$o .= replace_macros($notif_tpl,array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => '', // $tabs,
 			'$notif_content' => $notif_content,
 		));
-	
+
 		return $o;
-	
+
 	}
 }
diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php
index faad2fc52..346bef519 100644
--- a/Zotlabs/Module/Oep.php
+++ b/Zotlabs/Module/Oep.php
@@ -122,12 +122,12 @@ class Oep extends \Zotlabs\Web\Controller {
 
 
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
-            "' profile='".$p[0]['author']['xchan_url'] .
-            "' avatar='".$p[0]['author']['xchan_photo_s'].
-            "' link='".$p[0]['plink'].
-		"' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
-            "' posted='".$p[0]['created'].
-            "' message_id='".$p[0]['mid']."']";
+			"' profile='".$p[0]['author']['xchan_url'] .
+			"' avatar='".$p[0]['author']['xchan_photo_s'].
+			"' link='".$p[0]['plink'].
+			"' auth='".(($p[0]['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
+			"' posted='".$p[0]['created'].
+			"' message_id='".$p[0]['mid']."']";
 	    if($p[0]['title'])
             $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
@@ -210,13 +210,13 @@ class Oep extends \Zotlabs\Web\Controller {
 
 
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
-            "' profile='".$p[0]['author']['xchan_url'] .
-            "' avatar='".$p[0]['author']['xchan_photo_s'].
-            "' link='".$p[0]['plink'].
-			"' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
-            "' posted='".$p[0]['created'].
-            "' message_id='".$p[0]['mid']."']";
-	    if($p[0]['title'])
+			"' profile='".$p[0]['author']['xchan_url'] .
+			"' avatar='".$p[0]['author']['xchan_photo_s'].
+			"' link='".$p[0]['plink'].
+			"' auth='".(($p[0]['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
+			"' posted='".$p[0]['created'].
+			"' message_id='".$p[0]['mid']."']";
+		if($p[0]['title'])
             $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
 		$o .= $x;
@@ -296,14 +296,14 @@ class Oep extends \Zotlabs\Web\Controller {
 
 
 		$o = "[share author='".urlencode($p[0]['author']['xchan_name']).
-            "' profile='".$p[0]['author']['xchan_url'] .
-            "' avatar='".$p[0]['author']['xchan_photo_s'].
-            "' link='".$p[0]['plink'].
-			"' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
-            "' posted='".$p[0]['created'].
-            "' message_id='".$p[0]['mid']."']";
-	    if($p[0]['title'])
-            $o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
+			"' profile='".$p[0]['author']['xchan_url'] .
+			"' avatar='".$p[0]['author']['xchan_photo_s'].
+			"' link='".$p[0]['plink'].
+			"' auth='".(($p[0]['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
+			"' posted='".$p[0]['created'].
+			"' message_id='".$p[0]['mid']."']";
+		if($p[0]['title'])
+			$o .= '[b]'.$p[0]['title'].'[/b]'."\r\n";
 
 		$o .= $x;
 		$o .= "[/share]";
@@ -374,7 +374,7 @@ class Oep extends \Zotlabs\Web\Controller {
 			"' profile='".$p[0]['author']['xchan_url'] .
 			"' avatar='".$p[0]['author']['xchan_photo_s'].
 			"' link='".$p[0]['plink'].
-			"' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
+			"' auth='".(($p[0]['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
 			"' posted='".$p[0]['created'].
 			"' message_id='".$p[0]['mid']."']";
 		if($p[0]['title'])
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index e62accb06..3aad70d18 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -1178,10 +1178,8 @@ class Photos extends \Zotlabs\Web\Controller {
 						if($observer['xchan_hash'] === $item['author_xchan'] || $observer['xchan_hash'] === $item['owner_xchan'])
 							$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
-
 						$name_e = $profile_name;
 						$title_e = $item['title'];
-						unobscure($item);
 						$body_e = prepare_text($item['body'],$item['mimetype']);
 
 						$comments .= replace_macros($template,array(
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
deleted file mode 100644
index 6e8042eaf..000000000
--- a/Zotlabs/Module/Ping.php
+++ /dev/null
@@ -1,707 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-use Zotlabs\Lib\Apps;
-
-require_once('include/bbcode.php');
-
-/**
- * @brief Ping Controller.
- *
- */
-class Ping extends \Zotlabs\Web\Controller {
-
-	/**
-	 * @brief do several updates when pinged.
-	 *
-	 * This function does several tasks. Whenever called it checks for new messages,
-	 * introductions, notifications, etc. and returns a json with the results.
-	 *
-	 * @result JSON
-	 */
-	function init() {
-
-		$result = array();
-		$notifs = array();
-
-		$result['notify'] = 0;
-		$result['home'] = 0;
-		$result['network'] = 0;
-		$result['intros'] = 0;
-		$result['mail'] = 0;
-		$result['register'] = 0;
-		$result['events'] = 0;
-		$result['events_today'] = 0;
-		$result['birthdays'] = 0;
-		$result['birthdays_today'] = 0;
-		$result['all_events'] = 0;
-		$result['all_events_today'] = 0;
-		$result['notice'] = [];
-		$result['info'] = [];
-		$result['pubs'] = 0;
-		$result['files'] = 0;
-		$result['forums'] = 0;
-		$result['forums_sub'] = [];
-
-		if(! $_SESSION['static_loadtime'])
-			$_SESSION['static_loadtime'] = datetime_convert();
-
-		$t0 = dba_timer();
-
-		header("content-type: application/json");
-
-		$vnotify = false;
-
-		$item_normal = item_normal();
-
-		if(local_channel()) {
-			$vnotify = get_pconfig(local_channel(),'system','vnotify');
-			$evdays = intval(get_pconfig(local_channel(),'system','evdays'));
-			$ob_hash = get_observer_hash();
-		}
-
-		// if unset show all visual notification types
-		if($vnotify === false)
-			$vnotify = (-1);
-		if($evdays < 1)
-			$evdays = 3;
-
-		/**
-		 * If you have several windows open to this site and switch to a different channel
-		 * in one of them, the others may get into a confused state showing you a page or options
-		 * on that page which were only valid under the old identity. You session has changed.
-		 * Therefore we send a notification of this fact back to the browser where it is picked up
-		 * in javascript and which reloads the page it is on so that it is valid under the context
-		 * of the now current channel.
-		 */
-
-		$result['invalid'] = ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_channel()) ? 1 : 0);
-
-		/**
-		 * Send all system messages (alerts) to the browser.
-		 * Some are marked as informational and some represent
-		 * errors or serious notifications. These typically
-		 * will popup on the current page (no matter what page it is)
-		 */
-
-		if(x($_SESSION, 'sysmsg')){
-			foreach ($_SESSION['sysmsg'] as $m){
-				$result['notice'][] = array('message' => $m);
-			}
-			unset($_SESSION['sysmsg']);
-		}
-		if(x($_SESSION, 'sysmsg_info')){
-			foreach ($_SESSION['sysmsg_info'] as $m){
-				$result['info'][] = array('message' => $m);
-			}
-			unset($_SESSION['sysmsg_info']);
-		}
-		if(! ($vnotify & VNOTIFY_INFO))
-			$result['info'] = array();
-		if(! ($vnotify & VNOTIFY_ALERT))
-			$result['notice'] = array();
-
-		if(\App::$install) {
-			echo json_encode($result);
-			killme();
-		}
-
-		/**
-		 * Update chat presence indication (if applicable)
-		 */
-
-		if(get_observer_hash() && (! $result['invalid'])) {
-			$r = q("select cp_id, cp_room from chatpresence where cp_xchan = '%s' and cp_client = '%s' and cp_room = 0 limit 1",
-				dbesc(get_observer_hash()),
-				dbesc($_SERVER['REMOTE_ADDR'])
-			);
-			$basic_presence = false;
-			if($r) {
-				$basic_presence = true;
-				q("update chatpresence set cp_last = '%s' where cp_id = %d",
-					dbesc(datetime_convert()),
-					intval($r[0]['cp_id'])
-				);
-			}
-			if(! $basic_presence) {
-				q("insert into chatpresence ( cp_xchan, cp_last, cp_status, cp_client)
-					values( '%s', '%s', '%s', '%s' ) ",
-					dbesc(get_observer_hash()),
-					dbesc(datetime_convert()),
-					dbesc('online'),
-					dbesc($_SERVER['REMOTE_ADDR'])
-				);
-			}
-		}
-
-		/**
-		 * Chatpresence continued... if somebody hasn't pinged recently, they've most likely left the page
-		 * and shouldn't count as online anymore. We allow an expection for bots.
-		 */
-
-		q("delete from chatpresence where cp_last < %s - INTERVAL %s and cp_client != 'auto' ",
-			db_utcnow(), db_quoteinterval('3 MINUTE')
-		);
-
-
-		$sql_extra = '';
-		if(! ($vnotify & VNOTIFY_LIKE))
-			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
-
-		if(local_channel()) {
-			$notify_pubs = ($vnotify & VNOTIFY_PUBS) && can_view_public_stream() && Apps::system_app_installed(local_channel(), 'Public Stream');
-		}
-		else {
-			$notify_pubs = can_view_public_stream();
-		}
-
-		if($notify_pubs) {
-			$sys = get_sys_channel();
-
-			$pubs = q("SELECT count(id) as total from item
-				WHERE uid = %d
-				AND item_unseen = 1
-				AND author_xchan != '%s'
-				AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
-				$item_normal
-				$sql_extra",
-				intval($sys['channel_id']),
-				dbesc(get_observer_hash())
-			);
-
-			if($pubs)
-				$result['pubs'] = intval($pubs[0]['total']);
-		}
-
-
-
-		if((argc() > 1) && (argv(1) === 'pubs') && ($notify_pubs)) {
-			$sys = get_sys_channel();
-			$result = array();
-
-			$r = q("SELECT * FROM item
-				WHERE uid = %d
-				AND item_unseen = 1
-				AND author_xchan != '%s'
-				AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
-				$item_normal
-				$sql_extra
-				ORDER BY created DESC
-				LIMIT 300",
-				intval($sys['channel_id']),
-				dbesc(get_observer_hash())
-			);
-
-			if($r) {
-				xchan_query($r);
-				foreach($r as $rr) {
-					$rr['llink'] = str_replace('display/', 'pubstream/?f=&mid=', $rr['llink']);
-					$result[] = \Zotlabs\Lib\Enotify::format($rr);
-				}
-			}
-
-//			logger('ping (network||home): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		$t1 = dba_timer();
-
-		if((! local_channel()) || ($result['invalid'])) {
-			echo json_encode($result);
-			killme();
-		}
-
-		/**
-		 * Everything following is only permitted under the context of a locally authenticated site member.
-		 */
-
-		/**
-		 * Handle "mark all xyz notifications read" requests.
-		 */
-
-		// mark all items read
-		if(x($_REQUEST, 'markRead') && local_channel()) {
-			switch($_REQUEST['markRead']) {
-				case 'network':
-					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1",
-						intval(local_channel())
-					);
-					break;
-				case 'home':
-					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1",
-						intval(local_channel())
-					);
-					break;
-				case 'mail':
-					$r = q("UPDATE mail SET mail_seen = 1 WHERE channel_id = %d AND mail_seen = 0",
-						intval(local_channel())
-					);
-					break;
-				case 'all_events':
-					$r = q("UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ",
-						intval(local_channel()),
-						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-					);
-					break;
-				case 'notify':
-					$r = q("update notify set seen = 1 where uid = %d",
-						intval(local_channel())
-					);
-					break;
-				case 'pubs':
-					unset($_SESSION['static_loadtime']);
-					break;
-				default:
-					break;
-			}
-		}
-
-		if(x($_REQUEST, 'markItemRead') && local_channel()) {
-			$r = q("UPDATE item SET item_unseen = 0 WHERE  uid = %d AND parent = %d",
-				intval(local_channel()),
-				intval($_REQUEST['markItemRead'])
-			);
-		}
-
-		/**
-		 * URL ping/something will return detail for "something", e.g. a json list with which to populate a notification
-		 * dropdown menu.
-		 */
-		if(argc() > 1 && argv(1) === 'notify') {
-			$t = q("SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC",
-				intval(local_channel())
-			);
-
-			if($t) {
-				foreach($t as $tt) {
-					$message = trim(strip_tags(bbcode($tt['msg'])));
-
-					if(strpos($message, $tt['xname']) === 0)
-						$message = substr($message, strlen($tt['xname']) + 1);
-
-					$mid = basename($tt['link']);
-					$mid = ((strpos($mid, 'b64.') === 0) ? @base64url_decode(substr($mid, 4)) : $mid);
-
-					if(in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
-						// we need the thread parent
-						$r = q("select thr_parent from item where mid = '%s' and uid = %d limit 1",
-							dbesc($mid),
-							intval(local_channel())
-						);
-						$b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : 'b64.' . base64url_encode($r[0]['thr_parent']));
-					}
-					else {
-						$b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
-					}
-
-					$notifs[] = array(
-						'notify_link' => z_root() . '/notify/view/' . $tt['id'],
-						'name' => $tt['xname'],
-						'url' => $tt['url'],
-						'photo' => $tt['photo'],
-						'when' => relative_date($tt['created']),
-						'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
-						'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
-						'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
-						'message' => $message
-					);
-				}
-			}
-
-			echo json_encode(array('notify' => $notifs));
-			killme();
-		}
-
-		if(argc() > 1 && argv(1) === 'mail') {
-			$channel = \App::get_channel();
-			$t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan
-				where channel_id = %d and mail_seen = 0 and mail_deleted = 0
-				and from_xchan != '%s' order by created desc limit 50",
-				intval(local_channel()),
-				dbesc($channel['channel_hash'])
-			);
-
-			if($t) {
-				foreach($t as $zz) {
-					$notifs[] = array(
-						'notify_link' => z_root() . '/mail/' . $zz['id'],
-						'name' => $zz['xchan_name'],
-						'addr' => $zz['xchan_addr'],
-						'url' => $zz['xchan_url'],
-						'photo' => $zz['xchan_photo_s'],
-						'when' => relative_date($zz['created']),
-						'hclass' => (intval($zz['mail_seen']) ? 'notify-seen' : 'notify-unseen'),
-						'message' => t('sent you a private message'),
-					);
-				}
-			}
-
-			echo json_encode(array('notify' => $notifs));
-			killme();
-		}
-
-		if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) {
-			$result = array();
-
-			if(argv(1) === 'home') {
-				$sql_extra .= ' and item_wall = 1 ';
-			}
-
-			$r = q("SELECT * FROM item 
-				WHERE uid = %d
-				AND item_unseen = 1
-				AND author_xchan != '%s'
-				$item_normal
-				$sql_extra
-				ORDER BY created DESC
-				LIMIT 300",
-				intval(local_channel()),
-				dbesc($ob_hash)
-			);
-
-			if($r) {
-				xchan_query($r);
-				foreach($r as $item) {
-					$result[] = \Zotlabs\Lib\Enotify::format($item);
-				}
-			}
-//			logger('ping (network||home): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		if(argc() > 1 && (argv(1) === 'intros')) {
-			$result = array();
-
-			$r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ORDER BY abook_created DESC LIMIT 50",
-				intval(local_channel())
-			);
-
-			if($r) {
-				foreach($r as $rr) {
-					$result[] = array(
-						'notify_link' => z_root() . '/connections/ifpending',
-						'name' => $rr['xchan_name'],
-						'addr' => $rr['xchan_addr'],
-						'url' => $rr['xchan_url'],
-						'photo' => $rr['xchan_photo_s'],
-						'when' => relative_date($rr['abook_created']),
-						'hclass' => ('notify-unseen'),
-						'message' => t('added your channel')
-					);
-				}
-			}
-			logger('ping (intros): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		if((argc() > 1 && (argv(1) === 'register')) && is_site_admin()) {
-			$result = array();
-
-			$r = q("SELECT account_email, account_created from account where (account_flags & %d) > 0",
-				intval(ACCOUNT_PENDING)
-			);
-			if($r) {
-				foreach($r as $rr) {
-					$result[] = array(
-						'notify_link' => z_root() . '/admin/accounts',
-						'name' => $rr['account_email'],
-						'addr' => $rr['account_email'],
-						'url' => '',
-						'photo' => z_root() . '/' . get_default_profile_photo(48),
-						'when' => relative_date($rr['account_created']),
-						'hclass' => ('notify-unseen'),
-						'message' => t('requires approval')
-					);
-				}
-			}
-			logger('ping (register): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		if(argc() > 1 && (argv(1) === 'all_events')) {
-			$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-
-			$result = array();
-
-			$r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash
-				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-				and etype in ( 'event', 'birthday' )
-				ORDER BY dtstart DESC LIMIT 1000",
-				intval(local_channel()),
-				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-				dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-			);
-
-			if($r) {
-				foreach($r as $rr) {
-
-					$strt = datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart']);
-					$today = ((substr($strt, 0, 10) === datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d')) ? true : false);
-					$when = day_translate(datetime_convert('UTC', (($rr['adjust']) ? date_default_timezone_get() : 'UTC'), $rr['dtstart'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
-
-					$result[] = array(
-						'notify_link' => z_root() . '/cdav/calendar/' . $rr['event_hash'],
-						'name'        => $rr['xchan_name'],
-						'addr'        => $rr['xchan_addr'],
-						'url'         => $rr['xchan_url'],
-						'photo'       => $rr['xchan_photo_s'],
-						'when'        => $when,
-						'hclass'       => ('notify-unseen'),
-						'message'     => t('posted an event')
-					);
-				}
-			}
-			logger('ping (all_events): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		if(argc() > 1 && (argv(1) === 'files')) {
-			$result = array();
-
-			$r = q("SELECT item.created, xchan.xchan_name, xchan.xchan_addr, xchan.xchan_url, xchan.xchan_photo_s FROM item 
-				LEFT JOIN xchan on author_xchan = xchan_hash
-				WHERE item.verb = '%s'
-				AND item.obj_type = '%s'
-				AND item.uid = %d
-				AND item.owner_xchan != '%s'
-				AND item.item_unseen = 1",
-				dbesc(ACTIVITY_POST),
-				dbesc(ACTIVITY_OBJ_FILE),
-				intval(local_channel()),
-				dbesc($ob_hash)
-			);
-			if($r) {
-				foreach($r as $rr) {
-					$result[] = array(
-						'notify_link' => z_root() . '/sharedwithme',
-						'name' => $rr['xchan_name'],
-						'addr' => $rr['xchan_addr'],
-						'url' => $rr['xchan_url'],
-						'photo' => $rr['xchan_photo_s'],
-						'when' => relative_date($rr['created']),
-						'hclass' => ('notify-unseen'),
-						'message' => t('shared a file with you')
-					);
-				}
-			}
-			logger('ping (files): ' . print_r($result, true), LOGGER_DATA);
-			echo json_encode(array('notify' => $result));
-			killme();
-		}
-
-		/**
-		 * Normal ping - just the counts, no detail
-		 */
-		if($vnotify & VNOTIFY_SYSTEM) {
-			$t = q("select count(*) as total from notify where uid = %d and seen = 0",
-				intval(local_channel())
-			);
-			if($t)
-				$result['notify'] = intval($t[0]['total']);
-		}
-
-		$t2 = dba_timer();
-
-		if($vnotify & VNOTIFY_FILES) {
-			$files = q("SELECT count(id) as total FROM item
-				WHERE verb = '%s'
-				AND obj_type = '%s'
-				AND uid = %d
-				AND owner_xchan != '%s'
-				AND item_unseen = 1",
-				dbesc(ACTIVITY_POST),
-				dbesc(ACTIVITY_OBJ_FILE),
-				intval(local_channel()),
-				dbesc($ob_hash)
-			);
-			if($files)
-				$result['files'] = intval($files[0]['total']);
-		}
-
-		$t3 = dba_timer();
-
-		if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
-
-			$r = q("SELECT id, item_wall FROM item 
-				WHERE uid = %d and item_unseen = 1 
-				$item_normal
-				$sql_extra
-				AND author_xchan != '%s'",
-				intval(local_channel()),
-				dbesc($ob_hash)
-			);
-
-			if($r) {
-				$arr = array('items' => $r);
-				call_hooks('network_ping', $arr);
-
-				foreach ($r as $it) {
-					if(intval($it['item_wall']))
-						$result['home'] ++;
-					else
-						$result['network'] ++;
-				}
-			}
-		}
-		if(! ($vnotify & VNOTIFY_NETWORK))
-			$result['network'] = 0;
-		if(! ($vnotify & VNOTIFY_CHANNEL))
-			$result['home'] = 0;
-
-		$t4 = dba_timer();
-
-		if($vnotify & VNOTIFY_INTRO) {
-			$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
-				intval(local_channel())
-			);
-
-			$t5 = dba_timer();
-
-			if($intr)
-				$result['intros'] = intval($intr[0]['total']);
-		}
-
-		$t6 = dba_timer();
-		$channel = \App::get_channel();
-
-		if($vnotify & VNOTIFY_MAIL) {
-			$mails = q("SELECT count(id) as total from mail
-				WHERE channel_id = %d AND mail_seen = 0 and from_xchan != '%s' ",
-				intval(local_channel()),
-				dbesc($channel['channel_hash'])
-			);
-			if($mails)
-				$result['mail'] = intval($mails[0]['total']);
-		}
-
-		if($vnotify & VNOTIFY_REGISTER) {
-			if (\App::$config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
-				$regs = q("SELECT count(account_id) as total from account where (account_flags & %d) > 0",
-					intval(ACCOUNT_PENDING)
-				);
-				if($regs)
-					$result['register'] = intval($regs[0]['total']);
-			}
-		}
-
-		$t7 = dba_timer();
-
-		if($vnotify & (VNOTIFY_EVENT|VNOTIFY_EVENTTODAY|VNOTIFY_BIRTHDAY)) {
-			$events = q("SELECT etype, dtstart, adjust FROM event
-				WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-				and etype in ( 'event', 'birthday' )
-				ORDER BY dtstart ASC ",
-					intval(local_channel()),
-					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
-					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-			);
-
-			if($events) {
-				$result['all_events'] = count($events);
-
-				if($result['all_events']) {
-					$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
-					foreach($events as $x) {
-						$bd = false;
-						if($x['etype'] === 'birthday') {
-							$result['birthdays'] ++;
-							$bd = true;
-						}
-						else {
-							$result['events'] ++;
-						}
-						if(datetime_convert('UTC', ((intval($x['adjust'])) ? date_default_timezone_get() : 'UTC'), $x['dtstart'], 'Y-m-d') === $str_now) {
-							$result['all_events_today'] ++;
-							if($bd)
-								$result['birthdays_today'] ++;
-							else
-								$result['events_today'] ++;
-						}
-					}
-				}
-			}
-		}
-		if(! ($vnotify & VNOTIFY_EVENT))
-			$result['all_events'] = $result['events'] = 0;
-		if(! ($vnotify & VNOTIFY_EVENTTODAY))
-			$result['all_events_today'] = $result['events_today'] = 0;
-		if(! ($vnotify & VNOTIFY_BIRTHDAY))
-			$result['birthdays'] = 0;
-
-
-
-		if($vnotify & VNOTIFY_FORUMS) {
-			$forums = get_forum_channels(local_channel());
-
-			if($forums) {
-				$item_normal = item_normal();
-				$fcount = count($forums);
-				$forums['total'] = 0;
-
-				for($x = 0; $x < $fcount; $x ++) {
-					$p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
-						intval(local_channel()),
-						intval(TERM_FORUM),
-						dbesc($forums[$x]['xchan_name'])
-					);
-
-					$p_str = ids_to_querystr($p, 'parent');
-					$p_sql = (($p_str) ? "OR parent IN ( $p_str )" : '');
-
-					$r = q("select count(id) as unseen from item 
-						where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $item_normal $sql_extra",
-						intval(local_channel()),
-						dbesc($forums[$x]['xchan_hash']),
-						dbesc($forums[$x]['xchan_hash'])
-					);
-					if($r[0]['unseen']) {
-						$forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']);
-						$forums[$x]['name'] = $forums[$x]['xchan_name'];
-						$forums[$x]['addr'] = $forums[$x]['xchan_addr'];
-						$forums[$x]['url'] = $forums[$x]['xchan_url'];
-						$forums[$x]['photo'] = $forums[$x]['xchan_photo_s'];
-						$forums[$x]['unseen'] = $r[0]['unseen'];
-						$forums[$x]['private_forum'] = (($forums[$x]['private_forum']) ? 'lock' : '');
-						$forums[$x]['message'] = (($forums[$x]['private_forum']) ? t('Private forum') : t('Public forum'));
-
-						$forums['total'] = $forums['total'] + $r[0]['unseen'];
-
-						unset($forums[$x]['abook_id']);
-						unset($forums[$x]['xchan_hash']);
-						unset($forums[$x]['xchan_name']);
-						unset($forums[$x]['xchan_url']);
-						unset($forums[$x]['xchan_photo_s']);
-
-						//if($forums[$x]['private_forum'])
-						//	unset($forums[$x]['private_forum']);
-
-					}
-					else {
-						unset($forums[$x]);
-					}
-				}
-				$result['forums'] = $forums['total'];
-				unset($forums['total']);
-
-				$result['forums_sub'] = $forums;
-			}
-		}
-
-		$x = json_encode($result);
-
-		$t8 = dba_timer();
-
-//		logger('ping timer: ' . sprintf('%01.4f %01.4f %01.4f %01.4f %01.4f %01.4f %01.4f %01.4f',$t8 - $t7, $t7 - $t6, $t6 - $t5, $t5 - $t4, $t4 - $t3, $t3 - $t2, $t2 - $t1, $t1 - $t0));
-
-		echo $x;
-		killme();
-	}
-
-}
diff --git a/Zotlabs/Module/Post.php b/Zotlabs/Module/Post.php
deleted file mode 100644
index f67cbf020..000000000
--- a/Zotlabs/Module/Post.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @file Zotlabs/Module/Post.php
- *
- * @brief Zot endpoint.
- *
- */
-
-namespace Zotlabs\Module;
-
-require_once('include/zot.php');
-
-/**
- * @brief Post module.
- *
- */
-class Post extends \Zotlabs\Web\Controller {
-
-	function init() {
-		if(array_key_exists('auth', $_REQUEST)) {
-			$x = new \Zotlabs\Zot\Auth($_REQUEST);
-			exit;
-		}
-	}
-
-	function post() {
-		if(array_key_exists('data',$_REQUEST)) {
-			$z = new \Zotlabs\Zot\Receiver($_REQUEST['data'], get_config('system', 'prvkey'), new \Zotlabs\Zot\ZotHandler());
-			exit;
-		}
-
-	}
-
-}
diff --git a/Zotlabs/Module/Prate.php b/Zotlabs/Module/Prate.php
deleted file mode 100644
index 8b71657b8..000000000
--- a/Zotlabs/Module/Prate.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-use Zotlabs\Lib\Crypto;
-
-class Prate extends \Zotlabs\Web\Controller {
-
-	function init() {
-		if($_SERVER['REQUEST_METHOD'] === 'post')
-			return;
-
-		if(! local_channel())
-			return;
-
-		$channel = \App::get_channel();
-
-		$target = argv(1);
-		if(! $target)
-			return;
-
-		$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
-			dbesc($channel['channel_hash']),
-			dbesc($target)
-		);
-		if($r)
-			json_return_and_die(array('rating' => $r[0]['xlink_rating'],'rating_text' => $r[0]['xlink_rating_text']));
-		killme();
-	}
-
-		function post() {
-
-		if(! local_channel())
-			return;
-
-		$channel = \App::get_channel();
-
-		$target = trim($_REQUEST['target']);
-		if(! $target)
-			return;
-
-		if($target === $channel['channel_hash'])
-			return;
-
-		$rating = intval($_POST['rating']);
-		if($rating < (-10))
-			$rating = (-10);
-		if($rating > 10)
-			$rating = 10;
-
-		$rating_text = trim(escape_tags($_REQUEST['rating_text']));
-
-		$signed = $target . '.' . $rating . '.' . $rating_text;
-
-		$sig = base64url_encode(Crypto::sign($signed,$channel['channel_prvkey']));
-
-
-		$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
-			dbesc($channel['channel_hash']),
-			dbesc($target)
-		);
-		if($z) {
-			$record = $z[0]['xlink_id'];
-			$w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s'
-				where xlink_id = %d",
-				intval($rating),
-				dbesc($rating_text),
-				dbesc($sig),
-				dbesc(datetime_convert()),
-				intval($record)
-			);
-		}
-		else {
-			$w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
-				dbesc($channel['channel_hash']),
-				dbesc($target),
-				intval($rating),
-				dbesc($rating_text),
-				dbesc($sig),
-				dbesc(datetime_convert())
-			);
-			$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
-				dbesc($channel['channel_hash']),
-				dbesc($orig_record[0]['abook_xchan'])
-			);
-			if($z)
-				$record = $z[0]['xlink_id'];
-		}
-		if($record) {
-			\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
-		}
-
-		json_return_and_die(array('result' => true));;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/Zotlabs/Module/Probe.php b/Zotlabs/Module/Probe.php
deleted file mode 100644
index 3bc4dac72..000000000
--- a/Zotlabs/Module/Probe.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Lib\Crypto;
-
-require_once('include/zot.php');
-
-class Probe extends \Zotlabs\Web\Controller {
-
-	function get() {
-
-		if(local_channel()) {
-			if(! Apps::system_app_installed(local_channel(), 'Remote Diagnostics')) {
-				//Do not display any associated widgets at this point
-				App::$pdl = '';
-
-				$o = '<b>' . t('Remote Diagnostics App') . ' (' . t('Not Installed') . '):</b><br>';
-				$o .= t('Perform diagnostics on remote channels');
-				return $o;
-			}
-		}
-
-		nav_set_selected('Remote Diagnostics');
-
-		$o .= '<h3>Remote Diagnostics</h3>';
-
-		$o .= '<form action="probe" method="get">';
-		$o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
-		$o .= '<input type="submit" name="submit" value="Submit" /></form>';
-
-		$o .= '<br /><br />';
-
-		if(x($_GET,'addr')) {
-			$channel = App::get_channel();
-			$addr = trim($_GET['addr']);
-			$do_import = ((intval($_GET['import']) && is_site_admin()) ? true : false);
-
-			$j = \Zotlabs\Zot\Finger::run($addr,$channel,false);
-
-			$o .= '<pre>';
-			if(! $j['success']) {
-				$o .= "<strong>https connection failed. Trying again with auto failover to http.</strong>\r\n\r\n";
-				$j = \Zotlabs\Zot\Finger::run($addr,$channel,true);
-				if(! $j['success']) {
-					return $o;
-				}
-			}
-			if($do_import && $j)
-				$x = import_xchan($j);
-			if($j && $j['permissions'] && $j['permissions']['iv'])
-				$j['permissions'] = json_decode(Crypto::unencapsulate($j['permissions'],$channel['channel_prvkey']),true);
-			$o .= str_replace("\n",'<br />',print_r($j,true));
-			$o .= '</pre>';
-		}
-		return $o;
-	}
-
-}
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 9aa342223..452af4d78 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -600,7 +600,6 @@ class Profiles extends \Zotlabs\Web\Controller {
 				intval(local_channel())
 			);
 			if($r) {
-				require_once('include/zot.php');
 				Libsync::build_sync_packet(local_channel(),array('profile' => $r));
 			}
 
diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php
index 4b64d9af6..fd5aeaa72 100644
--- a/Zotlabs/Module/Pubsites.php
+++ b/Zotlabs/Module/Pubsites.php
@@ -6,7 +6,6 @@ use Zotlabs\Lib\Libzotdir;
 class Pubsites extends \Zotlabs\Web\Controller {
 
 	function get() {
-		require_once('include/dir_fns.php');
 		$dirmode = intval(get_config('system','directory_mode'));
 
 		if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php
deleted file mode 100644
index d29c370fc..000000000
--- a/Zotlabs/Module/Rate.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-
-use Zotlabs\Lib\Crypto;
-
-class Rate extends \Zotlabs\Web\Controller {
-
-	function init() {
-
-		if(! local_channel())
-			return;
-
-		$channel = \App::get_channel();
-
-		$target = $_REQUEST['target'];
-		if(! $target)
-			return;
-
-		\App::$data['target'] = $target;
-
-		if($target) {
-			$r = q("SELECT * FROM xchan where xchan_hash like '%s' LIMIT 1",
-				dbesc($target)
-			);
-			if($r) {
-				\App::$poi = $r[0];
-			}
-			else {
-				$r = q("select * from site where site_url like '%s' and site_type = %d",
-					dbesc('%' . $target),
-					intval(SITE_TYPE_ZOT)
-				);
-				if($r) {
-					\App::$data['site'] = $r[0];
-					\App::$data['site']['site_url'] = strtolower($r[0]['site_url']);
-				}
-			}
-		}
-
-
-		return;
-
-	}
-
-
-	function post() {
-
-		if(! local_channel())
-			return;
-
-		if(! \App::$data['target'])
-			return;
-
-		if(! $_REQUEST['execute'])
-			return;
-
-		$channel = \App::get_channel();
-
-		$rating = intval($_POST['rating']);
-		if($rating < (-10))
-			$rating = (-10);
-		if($rating > 10)
-			$rating = 10;
-
-		$rating_text = trim(escape_tags($_REQUEST['rating_text']));
-
-		$signed = \App::$data['target'] . '.' . $rating . '.' . $rating_text;
-
-		$sig = base64url_encode(Crypto::sign($signed,$channel['channel_prvkey']));
-
-		$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
-			dbesc($channel['channel_hash']),
-			dbesc(\App::$data['target'])
-		);
-
-		if($z) {
-			$record = $z[0]['xlink_id'];
-			$w = q("update xlink set xlink_rating = '%d', xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s'
-				where xlink_id = %d",
-				intval($rating),
-				dbesc($rating_text),
-				dbesc($sig),
-				dbesc(datetime_convert()),
-				intval($record)
-			);
-		}
-		else {
-			$w = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values ( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
-				dbesc($channel['channel_hash']),
-				dbesc(\App::$data['target']),
-				intval($rating),
-				dbesc($rating_text),
-				dbesc($sig),
-				dbesc(datetime_convert())
-			);
-			$z = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
-				dbesc($channel['channel_hash']),
-				dbesc(\App::$data['target'])
-			);
-			if($z)
-				$record = $z[0]['xlink_id'];
-		}
-
-		if($record) {
-			\Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record));
-		}
-
-	}
-
-	function get() {
-
-		if(! local_channel()) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-	//	if(! \App::$data['target']) {
-	//		notice( t('No recipients.') . EOL);
-	//		return;
-	//	}
-
-		$rating_enabled = get_config('system','rating_enabled');
-		if(! $rating_enabled) {
-			notice('Ratings are disabled on this site.');
-			return;
-		}
-
-		$channel = \App::get_channel();
-
-		$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
-			dbesc($channel['channel_hash']),
-			dbesc(\App::$data['target'])
-		);
-		if($r) {
-			\App::$data['xlink'] = $r[0];
-			$rating_val = $r[0]['xlink_rating'];
-			$rating_text = $r[0]['xlink_rating_text'];
-		}
-		else {
-			$rating_val = 0;
-			$rating_text = '';
-		}
-
-		if($rating_enabled) {
-			$rating = replace_macros(get_markup_template('rating_slider.tpl'),array(
-				'$min' => -10,
-				'$val' => $rating_val
-			));
-		}
-		else {
-			$rating = false;
-		}
-
-		$o = replace_macros(get_markup_template('rating_form.tpl'),array(
-			'$header' => t('Rating'),
-			'$website' => t('Website:'),
-			'$site' => ((\App::$data['site']) ? '<a href="' . \App::$data['site']['site_url'] . '" >' . \App::$data['site']['site_url'] . '</a>' : ''),
-			'target' => \App::$data['target'],
-			'$tgt_name' => ((\App::$poi && \App::$poi['xchan_name']) ? \App::$poi['xchan_name'] : sprintf( t('Remote Channel [%s] (not yet known on this site)'), substr(\App::$data['target'],0,16))),
-			'$lbl_rating'     => t('Rating (this information is public)'),
-			'$lbl_rating_txt' => t('Optionally explain your rating (this information is public)'),
-			'$rating_txt'     => $rating_text,
-			'$rating'         => $rating,
-			'$rating_val'     => $rating_val,
-			'$slide'          => $slide,
-			'$submit' => t('Submit')
-		));
-
-		return $o;
-
-	}
-}
diff --git a/Zotlabs/Module/Ratings.php b/Zotlabs/Module/Ratings.php
deleted file mode 100644
index 055b16ca3..000000000
--- a/Zotlabs/Module/Ratings.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/dir_fns.php');
-
-
-class Ratings extends \Zotlabs\Web\Controller {
-
-	function init() {
-	
-		if(observer_prohibited()) {
-			return;
-		}
-	
-		if(local_channel())
-			load_contact_links(local_channel());
-	
-		$dirmode = intval(get_config('system','directory_mode'));
-	
-		$x = find_upstream_directory($dirmode);
-		if($x)
-			$url = $x['url'];
-	
-		$rating_enabled = get_config('system','rating_enabled');
-	
-		if(! $rating_enabled)
-			return;
-	
-		if(argc() > 1)
-			$hash = argv(1);
-	
-		if(! $hash) {
-			notice('Must supply a channel identififier.');
-			return;
-		}
-	
-		$results = false;
-	
-		$x = z_fetch_url($url . '/ratingsearch/' . urlencode($hash));
-	
-	
-		if($x['success'])
-			$results = json_decode($x['body'],true);
-	
-	
-		if((! $results) || (! $results['success'])) {
-	
-			notice('No results.');
-			return;
-		} 
-	
-		if(array_key_exists('xchan_hash',$results['target']))
-			\App::$poi = $results['target'];
-		
-		$friends = array();
-		$others = array();
-	
-		if($results['ratings']) {
-			foreach($results['ratings'] as $n) {
-				if(is_array(\App::$contacts) && array_key_exists($n['xchan_hash'],\App::$contacts))
-					$friends[] = $n;
-				else
-					$others[] = $n;
-			}
-		}
-	
-		\App::$data = array('target' => $results['target'], 'results' => array_merge($friends,$others));
-	
-		if(! \App::$data['results']) {
-			notice( t('No ratings') . EOL);
-		}
-	
-		return;
-	}
-	
-	
-	
-	
-	
-	function get() {
-	
-		if(observer_prohibited()) {
-			notice( t('Public access denied.') . EOL);
-			return;
-		}
-	
-		$rating_enabled = get_config('system','rating_enabled');
-	
-		if(! $rating_enabled)
-			return;
-	
-		$site_target = ((array_key_exists('target',\App::$data) && array_key_exists('site_url',\App::$data['target'])) ?
-			'<a href="' . \App::$data['target']['site_url'] . '" >' . \App::$data['target']['site_url'] . '</a>' : '');
-	
-	
-		$o = replace_macros(get_markup_template('prep.tpl'),array(
-			'$header' => t('Ratings'),
-			'$rating_lbl' => t('Rating: ' ),
-			'$website' => t('Website: '),
-			'$site' => $site_target,
-			'$rating_text_lbl' => t('Description: '),
-			'$raters' => \App::$data['results']
-		));
-	
-		return $o;
-	}
-	
-				
-}
diff --git a/Zotlabs/Module/Ratingsearch.php b/Zotlabs/Module/Ratingsearch.php
deleted file mode 100644
index dcbfd6a9b..000000000
--- a/Zotlabs/Module/Ratingsearch.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-
-
-class Ratingsearch extends \Zotlabs\Web\Controller {
-
-	function init() {
-	
-		$ret = array('success' => false);
-	
-		$dirmode = intval(get_config('system','directory_mode'));
-	
-		if($dirmode == DIRECTORY_MODE_NORMAL) {
-			$ret['message'] = 'This site is not a directory server.';
-			json_return_and_die($ret);
-		}
-	
-		if(argc() > 1)
-			$hash = argv(1);
-	
-		if(! $hash) {
-			$ret['message'] = 'No channel identifier';
-			json_return_and_die($ret);
-		}
-	
-		if(strpos($hash,'@')) {
-			$r = q("select * from hubloc where hubloc_addr = '%s' limit 1",
-				dbesc($hash)
-			);
-			if($r)
-				$hash = $r[0]['hubloc_hash'];
-		} 
-	
-		$p = q("select * from xchan where xchan_hash like '%s'",
-			dbesc($hash . '%')
-		);
-	
-		if($p)
-			$target = $p[0]['xchan_hash'];
-		else {
-			$p = q("select * from site where site_url like '%s' and site_type = %d ",
-				dbesc('%' . $hash),
-				intval(SITE_TYPE_ZOT)
-			);
-			if($p) {
-				$target = strtolower($hash);
-			}
-			else {
-				$ret['message'] = 'Rating target not found';
-				json_return_and_die($ret);
-			}
-		}
-	
-		if($p)
-			$ret['target']  = $p[0];
-	
-		$ret['success'] = true;
-	
-		$r = q("select * from xlink left join xchan on xlink_xchan = xchan_hash 
-			where xlink_link = '%s' and xlink_rating != 0 and xlink_static = 1 
-			and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 
-			order by xchan_name asc",
-			dbesc($target)
-		);
-	
-		if($r) {
-			$ret['ratings'] = $r;
-		}
-		else
-			$ret['ratings'] = array();
-			
-		json_return_and_die($ret);
-	
-	}
-	
-	
-}
diff --git a/Zotlabs/Module/Rbmark.php b/Zotlabs/Module/Rbmark.php
index 226cef69e..87b774495 100644
--- a/Zotlabs/Module/Rbmark.php
+++ b/Zotlabs/Module/Rbmark.php
@@ -6,12 +6,11 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/taxonomy.php');
 require_once('include/conversation.php');
-require_once('include/zot.php');
 require_once('include/bookmarks.php');
 
 /**
  * remote bookmark
- * 
+ *
  * https://yoursite/rbmark?f=&title=&url=&private=&remote_return=
  *
  * This can be called via either GET or POST, use POST for long body content as suhosin often limits GET parameter length
@@ -31,45 +30,45 @@ class Rbmark extends \Zotlabs\Web\Controller {
 	function post() {
 		if($_POST['submit'] !== t('Save'))
 			return;
-	
+
 		logger('rbmark_post: ' . print_r($_REQUEST,true));
-	
+
 		$channel = \App::get_channel();
-	
+
 		$t = array('url' => escape_tags($_REQUEST['url']),'term' => escape_tags($_REQUEST['title']));
 		bookmark_add($channel,$channel,$t,((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0),
 			array('menu_id' => ((x($_REQUEST,'menu_id')) ? intval($_REQUEST['menu_id']) : 0),
 				'menu_name' => ((x($_REQUEST,'menu_name')) ? escape_tags($_REQUEST['menu_name']) : ''),
 				'ischat' => ((x($_REQUEST['ischat'])) ? intval($_REQUEST['ischat']) : 0)
 			));
-	
+
 		goaway(z_root() . '/bookmarks');
-	
+
 	}
-	
-	
+
+
 		function get() {
-	
+
 		$o = '';
-	
+
 		if(! local_channel()) {
-	
+
 			// The login procedure is going to bugger our $_REQUEST variables
 			// so save them in the session.
-	
+
 			if(array_key_exists('url',$_REQUEST)) {
 				$_SESSION['bookmark'] = $_REQUEST;
 			}
 			return login();
 		}
-	
+
 		// If we have saved rbmark session variables, but nothing in the current $_REQUEST, recover the saved variables
-	
+
 		if((! array_key_exists('url',$_REQUEST)) && (array_key_exists('bookmark',$_SESSION))) {
 			$_REQUEST = $_SESSION['bookmark'];
 			unset($_SESSION['bookmark']);
 		}
-	
+
 		if($_REQUEST['remote_return']) {
 			$_SESSION['remote_return'] = $_REQUEST['remote_return'];
 		}
@@ -78,12 +77,12 @@ class Rbmark extends \Zotlabs\Web\Controller {
 				goaway($_SESSION['remote_return']);
 			goaway(z_root() . '/bookmarks');
 		}
-	
+
 		$channel = \App::get_channel();
-	
-	
+
+
 		$m = menu_list($channel['channel_id'],'',MENU_BOOKMARK);
-	
+
 		$menus = array();
 		if($m) {
 			$menus = array(0 => '');
@@ -92,10 +91,10 @@ class Rbmark extends \Zotlabs\Web\Controller {
 			}
 		}
 		$menu_select = array('menu_id',t('Select a bookmark folder'),false,'',$menus);
-	
-	
+
+
 		$o .= replace_macros(get_markup_template('rbmark.tpl'), array(
-	
+
 			'$header' => t('Save Bookmark'),
 			'$url' => array('url',t('URL of bookmark'),escape_tags($_REQUEST['url'])),
 			'$title' => array('title',t('Description'),escape_tags($_REQUEST['title'])),
@@ -104,18 +103,18 @@ class Rbmark extends \Zotlabs\Web\Controller {
 			'$submit' => t('Save'),
 			'$menu_name' => array('menu_name',t('Or enter new bookmark folder name'),'',''),
 			'$menus' => $menu_select
-	
+
 		));
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
 		return $o;
-	
+
 	}
-	
-	
-	
+
+
+
 }
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index 031270845..80ad289b2 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -1,12 +1,13 @@
 <?php
 namespace Zotlabs\Module; /** @file */
 
+use Zotlabs\Lib\Libzot;
+
 require_once('include/acl_selectors.php');
 require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/taxonomy.php');
 require_once('include/conversation.php');
-require_once('include/zot.php');
 
 /**
  * remote post
@@ -42,7 +43,7 @@ class Rpost extends \Zotlabs\Web\Controller {
 				// by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin
 				// blocks them.
 
-				$url = get_rpost_path(\App::get_observer());
+				$url = Libzot::get_rpost_path(\App::get_observer());
 				// make sure we're not looping to our own hub
 				if(($url) && (! stristr($url, \App::get_hostname()))) {
 					foreach($_GET as $key => $arg) {
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 2ad79e3f6..274b02321 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -25,10 +25,11 @@ class Search extends Controller {
 
 		nav_set_selected('Search');
 
-		require_once("include/bbcode.php");
-		require_once('include/security.php');
+		require_once('include/bbcode.php');
 		require_once('include/conversation.php');
 		require_once('include/items.php');
+		require_once('include/security.php');
+
 
 		$format = (($_REQUEST['format']) ? $_REQUEST['format'] : '');
 		if ($format !== '') {
@@ -38,11 +39,9 @@ class Search extends Controller {
 		$observer      = App::get_observer();
 		$observer_hash = (($observer) ? $observer['xchan_hash'] : '');
 
-		$o = '<div id="live-search"></div>' . "\r\n";
-
-		$o .= '<div class="generic-content-wrapper-styled">' . "\r\n";
+		$o = '<div class="generic-content-wrapper-styled">' . "\r\n";
 
-		$o .= '<h3>' . t('Search') . '</h3>';
+		$o .= '<h2>' . t('Search') . '</h2>';
 
 		if (x(App::$data, 'search'))
 			$search = trim(App::$data['search']);
@@ -87,21 +86,21 @@ class Search extends Controller {
 			$tag    = true;
 			$search = substr($search, 1);
 		}
-		if (strpos($search, '@') === 0) {
+		elseif(strpos($search, '@') === 0) {
 			$search = substr($search, 1);
 			goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
 		}
-		if (strpos($search, '!') === 0) {
+		elseif(strpos($search, '!') === 0) {
 			$search = substr($search, 1);
 			goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
 		}
-		if (strpos($search, '?') === 0) {
+		elseif(strpos($search, '?') === 0) {
 			$search = substr($search, 1);
 			goaway(z_root() . '/help' . '?f=1&navsearch=1&search=' . $search);
 		}
 
 		// look for a naked webbie
-		if (strpos($search,'@') !== false && strpos($search,'http') !== 0) {
+		if (strpos($search, '@') !== false && strpos($search, 'http') !== 0) {
 			goaway(z_root() . '/directory' . '?f=1&navsearch=1&search=' . $search);
 		}
 
@@ -234,7 +233,7 @@ class Search extends Controller {
 			$items = [];
 		}
 
-		if ($format == 'json') {
+		if ($format === 'json') {
 			$result = [];
 			require_once('include/conversation.php');
 			foreach ($items as $item) {
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 79031c98f..624cbb0c1 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -1,7 +1,6 @@
 <?php
 namespace Zotlabs\Module; /** @file */
 
-require_once('include/zot.php');
 require_once('include/security.php');
 
 class Settings extends \Zotlabs\Web\Controller {
@@ -11,68 +10,68 @@ class Settings extends \Zotlabs\Web\Controller {
 	function init() {
 		if(! local_channel())
 			return;
-	
+
 		if($_SESSION['delegate'])
 			return;
-	
+
 		\App::$profile_uid = local_channel();
-	
+
 		// default is channel settings in the absence of other arguments
-	
+
 		if(argc() == 1) {
 			// We are setting these values - don't use the argc(), argv() functions here
 			\App::$argc = 2;
 			\App::$argv[] = 'channel';
-		}	
+		}
 
 		$this->sm = new \Zotlabs\Web\SubModule();
 	}
-	
-	
+
+
 	function post() {
-	
+
 		if(! local_channel())
 			return;
-	
+
 		if($_SESSION['delegate'])
 			return;
-	
+
 		// logger('mod_settings: ' . print_r($_REQUEST,true));
-	
+
 		if(argc() > 1) {
 			if($this->sm->call('post') !== false) {
 				return;
 			}
 		}
-	
+
 		goaway(z_root() . '/settings' );
 		return; // NOTREACHED
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		nav_set_selected('Settings');
-	
+
 		if((! local_channel()) || ($_SESSION['delegate'])) {
 			notice( t('Permission denied.') . EOL );
 			return login();
 		}
-	
-	
+
+
 		$channel = \App::get_channel();
 		if($channel)
 			head_set_icon($channel['xchan_photo_s']);
-	
+
 		$o = $this->sm->call('get');
 		if($o !== false)
 			return $o;
 
 		$o = '';
 
-	
-	}	
+
+	}
 }
 
 
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 2eed1efc9..5732d2628 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -16,11 +16,11 @@ class Channel {
 		$channel = \App::get_channel();
 
 		check_form_security_token_redirectOnErr('/settings', 'settings');
-		
+
 		call_hooks('settings_post', $_POST);
-	
+
 		$set_perms = '';
-	
+
 		$role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : '');
 		$oldrole = get_pconfig(local_channel(),'system','permissions_role');
 
@@ -28,9 +28,9 @@ class Channel {
 		if($oldrole === 'social_party') {
 			$oldrole = 'social_federation';
 		}
-	
+
 		if(($role != $oldrole) || ($role === 'custom')) {
-	
+
 			if($role === 'custom') {
 				$hide_presence    = (((x($_POST,'hide_presence')) && (intval($_POST['hide_presence']) == 1)) ? 1: 0);
 				$publish          = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
@@ -38,18 +38,18 @@ class Channel {
 				$r = q("update channel set channel_default_group = '%s' where channel_id = %d",
 					dbesc($def_group),
 					intval(local_channel())
-				);	
-	
+				);
+
 				$global_perms = \Zotlabs\Access\Permissions::Perms();
-	
+
 				foreach($global_perms as $k => $v) {
 					\Zotlabs\Access\PermissionLimits::Set(local_channel(),$k,intval($_POST[$k]));
 				}
 				$acl = new \Zotlabs\Access\AccessList($channel);
 				$acl->set_from_array($_POST);
 				$x = $acl->get();
-	
-				$r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s', 
+
+				$r = q("update channel set channel_allow_cid = '%s', channel_allow_gid = '%s',
 					channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d",
 					dbesc($x['allow_cid']),
 					dbesc($x['allow_gid']),
@@ -93,13 +93,13 @@ class Channel {
 				}
 				// no default collection
 				else {
-					q("update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', 
+					q("update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '',
 						channel_deny_cid = '' where channel_id = %d",
 							intval(local_channel())
 					);
 				}
 
-				if($role_permissions['perms_connect']) {	
+				if($role_permissions['perms_connect']) {
 					$x = \Zotlabs\Access\Permissions::FilledPerms($role_permissions['perms_connect']);
 					foreach($x as $k => $v) {
 						set_abconfig(local_channel(),$channel['channel_hash'],'my_perms',$k, $v);
@@ -110,7 +110,7 @@ class Channel {
 							del_pconfig(local_channel(),'autoperms',$k);
 						}
 					}
-				}	
+				}
 
 				if($role_permissions['limits']) {
 					foreach($role_permissions['limits'] as $k => $v) {
@@ -121,11 +121,11 @@ class Channel {
 					$publish = intval($role_permissions['directory_publish']);
 				}
 			}
-	
+
 			set_pconfig(local_channel(),'system','hide_online_status',$hide_presence);
 			set_pconfig(local_channel(),'system','permissions_role',$role);
 		}
-	
+
 		$username         = ((x($_POST,'username'))   ? notags(trim($_POST['username']))     : '');
 		$timezone         = ((x($_POST,'timezone_select'))   ? notags(trim($_POST['timezone_select']))     : '');
 		$defloc           = ((x($_POST,'defloc'))     ? notags(trim($_POST['defloc']))       : '');
@@ -135,36 +135,36 @@ class Channel {
 		$evdays           = ((x($_POST,'evdays'))     ? intval($_POST['evdays'])             : 3);
 		$photo_path       = ((x($_POST,'photo_path')) ? escape_tags(trim($_POST['photo_path'])) : '');
 		$attach_path      = ((x($_POST,'attach_path')) ? escape_tags(trim($_POST['attach_path'])) : '');
-	
+
 		$expire_items     = ((x($_POST,'expire_items')) ? intval($_POST['expire_items'])	 : 0);
 		$expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
 		$expire_photos    = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos'])	 : 0);
 		$expire_network_only    = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only'])	 : 0);
-	
+
 		$allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
-	
+
 		$blocktags        = (((x($_POST,'blocktags')) && (intval($_POST['blocktags']) == 1)) ? 0: 1); // this setting is inverted!
 		$unkmail          = (((x($_POST,'unkmail')) && (intval($_POST['unkmail']) == 1)) ? 1: 0);
 		$cntunkmail       = ((x($_POST,'cntunkmail')) ? intval($_POST['cntunkmail']) : 0);
-		$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);  
-		$autoperms        = ((x($_POST,'autoperms')) ? intval($_POST['autoperms'])  : 0);  
-	
+		$suggestme        = ((x($_POST,'suggestme')) ? intval($_POST['suggestme'])  : 0);
+		$autoperms        = ((x($_POST,'autoperms')) ? intval($_POST['autoperms'])  : 0);
+
 		$post_newfriend   = (($_POST['post_newfriend'] == 1) ? 1: 0);
 		$post_joingroup   = (($_POST['post_joingroup'] == 1) ? 1: 0);
 		$post_profilechange   = (($_POST['post_profilechange'] == 1) ? 1: 0);
 		$adult            = (($_POST['adult'] == 1) ? 1 : 0);
 		$defpermcat       = ((x($_POST,'defpermcat')) ? notags(trim($_POST['defpermcat'])) : 'default');
-	
+
 		$mailhost        = ((array_key_exists('mailhost',$_POST)) ? notags(trim($_POST['mailhost'])) : '');
-	
+
 		$pageflags = $channel['channel_pageflags'];
 		$existing_adult = (($pageflags & PAGE_ADULT) ? 1 : 0);
 		if($adult != $existing_adult)
 			$pageflags = ($pageflags ^ PAGE_ADULT);
-	
-	
+
+
 		$notify = 0;
-	
+
 		if(x($_POST,'notify1'))
 			$notify += intval($_POST['notify1']);
 		if(x($_POST,'notify2'))
@@ -181,10 +181,10 @@ class Channel {
 			$notify += intval($_POST['notify7']);
 		if(x($_POST,'notify8'))
 			$notify += intval($_POST['notify8']);
-	
-	
+
+
 		$vnotify = 0;
-	
+
 		if(x($_POST,'vnotify1'))
 			$vnotify += intval($_POST['vnotify1']);
 		if(x($_POST,'vnotify2'))
@@ -215,13 +215,13 @@ class Channel {
 			$vnotify += intval($_POST['vnotify14']);
 		if(x($_POST,'vnotify15'))
 			$vnotify += intval($_POST['vnotify15']);
-	
+
 		$always_show_in_notices = x($_POST,'always_show_in_notices') ? 1 : 0;
-		
+
 		$err = '';
-	
+
 		$name_change = false;
-	
+
 		if($username != $channel['channel_name']) {
 			$name_change = true;
 			require_once('include/channel.php');
@@ -231,12 +231,12 @@ class Channel {
 				return;
 			}
 		}
-	
+
 		if($timezone != $channel['channel_timezone']) {
 			if(strlen($timezone))
 				date_default_timezone_set($timezone);
 		}
-	
+
 		set_pconfig(local_channel(),'system','use_browser_location',$allow_location);
 		set_pconfig(local_channel(),'system','suggestme', $suggestme);
 		set_pconfig(local_channel(),'system','post_newfriend', $post_newfriend);
@@ -251,7 +251,7 @@ class Channel {
 		set_pconfig(local_channel(),'system','default_permcat',$defpermcat);
 		set_pconfig(local_channel(),'system','email_notify_host',$mailhost);
 		set_pconfig(local_channel(),'system','autoperms',$autoperms);
-	
+
 		$r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d",
 			dbesc($username),
 			intval($pageflags),
@@ -262,17 +262,17 @@ class Channel {
 			intval($maxreq),
 			intval($expire),
 			intval(local_channel())
-		);   
+		);
 		if($r)
 			info( t('Settings updated.') . EOL);
-	
+
 		if(! is_null($publish)) {
 			$r = q("UPDATE profile SET publish = %d WHERE is_default = 1 AND uid = %d",
 				intval($publish),
 				intval(local_channel())
 			);
 		}
-	
+
 		if($name_change) {
 			// change name on all associated xchans by matching the url
 			$r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'",
@@ -285,49 +285,49 @@ class Channel {
 				intval($channel['channel_id'])
 			);
 		}
-	
+
 		\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
-	
+
 		Libsync::build_sync_packet();
-	
-	
+
+
 		if($email_changed && \App::$config['system']['register_policy'] == REGISTER_VERIFY) {
-	
+
 			// FIXME - set to un-verified, blocked and redirect to logout
 			// Q: Why? Are we verifying people or email addresses?
 			// A: the policy is to verify email addresses
 		}
-	
+
 		goaway(z_root() . '/settings' );
 		return; // NOTREACHED
 	}
-			
+
 	function get() {
-	
+
 		require_once('include/acl_selectors.php');
 		require_once('include/permissions.php');
 
 
 		$yes_no = array(t('No'),t('Yes'));
-	
-	
+
+
 		$p = q("SELECT * FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1",
 			intval(local_channel())
 		);
 		if(count($p))
 			$profile = $p[0];
-	
+
 		load_pconfig(local_channel(),'expire');
-	
+
 		$channel = \App::get_channel();
-	
+
 		$global_perms = \Zotlabs\Access\Permissions::Perms();
 
 		$permiss = array();
-	
+
 		$perm_opts = array(
 			array( t('Nobody except yourself'), 0),
-			array( t('Only those you specifically allow'), PERMS_SPECIFIC), 
+			array( t('Only those you specifically allow'), PERMS_SPECIFIC),
 			array( t('Approved connections'), PERMS_CONTACTS),
 			array( t('Any connections'), PERMS_PENDING),
 			array( t('Anybody on this website'), PERMS_SITE),
@@ -335,10 +335,10 @@ class Channel {
 			array( t('Anybody authenticated'), PERMS_AUTHED),
 			array( t('Anybody on the internet'), PERMS_PUBLIC)
 		);
-	
+
 		$limits = \Zotlabs\Access\PermissionLimits::Get(local_channel());
 		$anon_comments = get_config('system','anonymous_comments',true);
-	
+
 		foreach($global_perms as $k => $perm) {
 			$options = array();
 			$can_be_public = ((strstr($k,'view') || ($k === 'post_comments' && $anon_comments)) ? true : false);
@@ -347,61 +347,61 @@ class Channel {
 					continue;
 				$options[$opt[1]] = $opt[0];
 			}
-			$permiss[] = array($k,$perm,$limits[$k],'',$options);			
+			$permiss[] = array($k,$perm,$limits[$k],'',$options);
 		}
-		
+
 		//		logger('permiss: ' . print_r($permiss,true));
-	
+
 		$username   = $channel['channel_name'];
 		$nickname   = $channel['channel_address'];
 		$timezone   = $channel['channel_timezone'];
 		$notify     = $channel['channel_notifyflags'];
 		$defloc     = $channel['channel_location'];
-	
+
 		$maxreq     = $channel['channel_max_friend_req'];
 		$expire     = $channel['channel_expire_days'];
 		$adult_flag = intval($channel['channel_pageflags'] & PAGE_ADULT);
 		$sys_expire = get_config('system','default_expire_days');
-	
+
 //		$unkmail    = \App::$user['unkmail'];
 //		$cntunkmail = \App::$user['cntunkmail'];
-	
+
 		$hide_presence = intval(get_pconfig(local_channel(), 'system','hide_online_status'));
-	
-	
+
+
 		$expire_items = get_pconfig(local_channel(), 'expire','items');
 		$expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1
-		
+
 		$expire_notes = get_pconfig(local_channel(), 'expire','notes');
 		$expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1
-	
+
 		$expire_starred = get_pconfig(local_channel(), 'expire','starred');
 		$expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1
-		
+
 		$expire_photos = get_pconfig(local_channel(), 'expire','photos');
 		$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
-	
+
 		$expire_network_only = get_pconfig(local_channel(), 'expire','network_only');
 		$expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
-	
-	
+
+
 		$suggestme = get_pconfig(local_channel(), 'system','suggestme');
 		$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
-	
+
 		$post_newfriend = get_pconfig(local_channel(), 'system','post_newfriend');
 		$post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0
-	
+
 		$post_joingroup = get_pconfig(local_channel(), 'system','post_joingroup');
 		$post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0
-	
+
 		$post_profilechange = get_pconfig(local_channel(), 'system','post_profilechange');
 		$post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0
-	
+
 		$blocktags  = get_pconfig(local_channel(),'system','blocktags');
 		$blocktags = (($blocktags===false) ? '0' : $blocktags);
-		
+
 		$timezone = date_default_timezone_get();
-	
+
 		$opt_tpl = get_markup_template("field_checkbox.tpl");
 		if(get_config('system','publish_all')) {
 			$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
@@ -411,20 +411,20 @@ class Channel {
 				'$field' 	=> array('profile_in_directory', t('Publish your default profile in the network directory'), $profile['publish'], '', $yes_no),
 			));
 		}
-	
+
 		$suggestme = replace_macros($opt_tpl,array(
 				'$field' 	=> array('suggestme',  t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', $yes_no),
-	
+
 		));
-	
+
 		$subdir = ((strlen(\App::get_path())) ? '<br />' . t('or') . ' ' . z_root() . '/channel/' . $nickname : '');
 
 		$webbie = $nickname . '@' . \App::get_hostname();
 		$intl_nickname = unpunify($nickname) . '@' . unpunify(\App::get_hostname());
-	
+
 
 		$tpl_addr = get_markup_template("settings_nick_set.tpl");
-	
+
 		$prof_addr = replace_macros($tpl_addr,array(
 			'$desc' => t('Your channel address is'),
 			'$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . '&nbsp;(' . $webbie . ')'),
@@ -447,27 +447,27 @@ class Channel {
 
 		$default_permcat = get_pconfig(local_channel(),'system','default_permcat','default');
 
-	
+
 		$stpl = get_markup_template('settings.tpl');
-	
+
 		$acl = new \Zotlabs\Access\AccessList($channel);
 		$perm_defaults = $acl->get();
-	
+
 		require_once('include/group.php');
 		$group_select = mini_group_select(local_channel(),$channel['channel_default_group']);
-	
+
 		$evdays = get_pconfig(local_channel(),'system','evdays');
 		if(! $evdays)
 			$evdays = 3;
-	
+
 		$permissions_role = get_pconfig(local_channel(),'system','permissions_role');
 		if(! $permissions_role)
 			$permissions_role = 'custom';
 		// compatibility mapping - can be removed after 3.4 release
-		if($permissions_role === 'social_party') 
+		if($permissions_role === 'social_party')
 			$permissions_role = 'social_federation';
 
-		if(in_array($permissions_role,['forum','repository'])) 	
+		if(in_array($permissions_role,['forum','repository']))
 			$autoperms = replace_macros(get_markup_template('field_checkbox.tpl'), [
 				'$field' =>  [ 'autoperms',t('Automatic membership approval'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no ]]);
 		else
@@ -491,7 +491,7 @@ class Channel {
 
 		$o .= replace_macros($stpl,array(
 			'$ptitle' 	=> t('Channel Settings'),
-	
+
 			'$submit' 	=> t('Submit'),
 			'$baseurl' => z_root(),
 			'$uid' => local_channel(),
@@ -503,15 +503,15 @@ class Channel {
 			'$timezone' => array('timezone_select' , t('Your Timezone:'), $timezone, '', get_timezones()),
 			'$defloc'	=> array('defloc', t('Default Post Location:'), $defloc, t('Geographical location to display on your posts')),
 			'$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_channel(),'system','use_browser_location')) ? 1 : ''), '', $yes_no),
-			
+
 			'$adult'    => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)'), $yes_no),
-	
+
 			'$h_prv' 	=> t('Security and Privacy Settings'),
 			'$permissions_set' => $permissions_set,
 			'$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
-	
+
 			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),
-	
+
 			'$lbl_pmacro' => t('Simple Privacy Settings:'),
 			'$pmacro3'    => t('Very Public - <em>extremely permissive (should be used with caution)</em>'),
 			'$pmacro2'    => t('Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>'),
@@ -519,9 +519,9 @@ class Channel {
 			'$pmacro0'    => t('Blocked - <em>default blocked to/from everybody</em>'),
 			'$permiss_arr' => $permiss,
 			'$blocktags' => array('blocktags',t('Allow others to tag your posts'), 1-$blocktags, t('Often used by the community to retro-actively flag inappropriate content'), $yes_no),
-	
+
 			'$lbl_p2macro' => t('Channel Permission Limits'),
-	
+
 			'$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')),
 			'$maxreq' 	=> array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
 			'$permissions' => t('Default Privacy Group'),
@@ -540,10 +540,10 @@ class Channel {
 			'$profile_in_dir' => $profile_in_dir,
 			'$hide_friends' => $hide_friends,
 			'$hide_wall' => $hide_wall,
-			'$unkmail' => $unkmail,		
+			'$unkmail' => $unkmail,
 			'$cntunkmail' 	=> array('cntunkmail', t('Maximum private messages per day from unknown people:'), intval($channel['channel_max_anon_mail']) ,t("Useful to reduce spamming")),
-			
-			'$autoperms' => $autoperms,			
+
+			'$autoperms' => $autoperms,
 			'$h_not' 	=> t('Notification Settings'),
 			'$activity_options' => t('By default post a status message when:'),
 			'$post_newfriend' => array('post_newfriend',  t('accepting a friend request'), $post_newfriend, '', $yes_no),
@@ -558,12 +558,12 @@ class Channel {
 			'$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, '', $yes_no),
 			'$notify7'  => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, '', $yes_no),
 			'$notify8'  => array('notify8', t('You are poked/prodded/etc. in a post'), ($notify & NOTIFY_POKE), NOTIFY_POKE, '', $yes_no),
-			
+
 			'$notify9'  => array('notify9', t('Someone likes your post/comment'), ($notify & NOTIFY_LIKE), NOTIFY_LIKE, '', $yes_no),
-			
-	
+
+
 			'$lbl_vnot' 	=> t('Show visual notifications including:'),
-	
+
 			'$vnotify1'	=> array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
 			'$vnotify2'	=> array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
 			'$vnotify3'	=> array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
@@ -581,12 +581,13 @@ class Channel {
 			'$vnotify15'	=> array('vnotify15', t('Unseen forum posts'), ($vnotify & VNOTIFY_FORUMS), VNOTIFY_FORUMS, '', $yes_no),
 			'$mailhost' => [ 'mailhost', t('Email notification hub (hostname)'), get_pconfig(local_channel(),'system','email_notify_host',\App::get_hostname()), sprintf( t('If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s'),\App::get_hostname()) ],
 			'$always_show_in_notices'  => array('always_show_in_notices', t('Show new wall posts, private messages and connections under Notices'), $always_show_in_notices, 1, '', $yes_no),
-	
-			'$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')),			
+			'$desktop_notifications_info' => t('Desktop notifications are unavailable because the required browser permission has not been granted'),
+			'$desktop_notifications_request' => t('Grant permission'),
+			'$evdays' => array('evdays', t('Notify me of events this many days in advance'), $evdays, t('Must be greater than 0')),
 			'$basic_addon' => $plugin['basic'],
 			'$sec_addon'  => $plugin['security'],
 			'$notify_addon' => $plugin['notify'],
-	
+
 			'$h_advn' => t('Advanced Account/Page Type Settings'),
 			'$h_descadvn' => t('Change the behaviour of this account for special situations'),
 			'$pagetype' => $pagetype,
@@ -596,11 +597,11 @@ class Channel {
 			'$removeme' => t('Remove Channel'),
 			'$removechannel' => t('Remove this channel.'),
 		));
-	
+
 		call_hooks('settings_form',$o);
-	
+
 		//$o .= '</form>' . "\r\n";
-	
+
 		return $o;
 	}
 }
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 109b043ad..ca86f4f1f 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -37,7 +37,7 @@ class Sse_bs extends Controller {
 
 		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify', -1);
 		self::$evdays = intval(get_pconfig(self::$uid, 'system', 'evdays'));
-		self::$limit = 50;
+		self::$limit = 30;
 		self::$offset = 0;
 		self::$xchans = '';
 
@@ -57,8 +57,6 @@ class Sse_bs extends Controller {
 
 		if(intval(argv(2)) > 0)
 			self::$offset = argv(2);
-		else
-			$_SESSION['sse_loadtime'] = datetime_convert();
 
 		$network = false;
 		$dm = false;
@@ -100,7 +98,6 @@ class Sse_bs extends Controller {
 			self::bs_forums(),
 			self::bs_pubs($pubs),
 			self::bs_files(),
-			self::bs_mail(),
 			self::bs_all_events(),
 			self::bs_register(),
 			self::bs_info_notice()
@@ -179,7 +176,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -255,7 +252,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -331,7 +328,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval(self::$uid),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash)
 			);
 
@@ -418,7 +415,7 @@ class Sse_bs extends Controller {
 				$sql_extra2
 				ORDER BY created DESC LIMIT $limit OFFSET $offset",
 				intval($sys['channel_id']),
-				dbescdate($_SESSION['sse_loadtime']),
+				dbescdate($_SESSION['page_loadtime']),
 				dbesc(self::$ob_hash),
 				dbescdate($_SESSION['static_loadtime'])
 			);
@@ -634,36 +631,6 @@ class Sse_bs extends Controller {
 
 	}
 
-	function bs_mail() {
-
-		$result['mail']['notifications'] = [];
-		$result['mail']['count'] = 0;
-		$result['mail']['offset'] = -1;
-
-		if(! self::$uid)
-			return $result;
-
-		if(! (self::$vnotify & VNOTIFY_MAIL))
-			return $result;
-
-		$r = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan
-			where channel_id = %d and mail_seen = 0 and mail_deleted = 0
-			and from_xchan != '%s' order by created desc",
-			intval(self::$uid),
-			dbesc(self::$ob_hash)
-		);
-
-		if($r) {
-			foreach($r as $rr) {
-				$result['mail']['notifications'][] = Enotify::format_mail($rr);
-			}
-			$result['mail']['count'] = count($r);
-		}
-
-		return $result;
-
-	}
-
 	function bs_all_events() {
 
 		$result['all_events']['notifications'] = [];
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index 787ed5850..72deba305 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -15,26 +15,26 @@ require_once('include/acl_selectors.php');
 class Webpages extends Controller {
 
 	function init() {
-	
+
 		if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
 				App::$is_sys = true;
 			}
 		}
-	
+
 		if(argc() > 1)
 			$which = argv(1);
 		else
 			return;
-	
+
 		profile_load($which);
-	
+
 	}
-	
-	
+
+
 	function get() {
-	
+
 		if(! App::$profile) {
 			notice( t('Requested profile is not available.') . EOL );
 			App::$error = 404;
@@ -53,13 +53,13 @@ class Webpages extends Controller {
 		nav_set_selected('Webpages');
 
 		$which = argv(1);
-		
+
 		$_SESSION['return_url'] = App::$query_string;
-	
+
 		$uid = local_channel();
 		$owner = 0;
 		$observer = App::get_observer();
-	
+
 		$channel = App::get_channel();
 
 		switch ($_SESSION['action']) {
@@ -74,7 +74,7 @@ class Webpages extends Controller {
 							'$blocks' => $_SESSION['blocks'],
 						));
 						return $o;
-				
+
         case 'importselected':
 						$_SESSION['action'] = null;
 						break;
@@ -85,7 +85,7 @@ class Webpages extends Controller {
 								break;
 						}
 						require_once('include/import.php');
-						
+
 						$pages = get_webpage_elements($channel, 'pages');
 						$layouts = get_webpage_elements($channel, 'layouts');
 						$blocks = get_webpage_elements($channel, 'blocks');
@@ -99,13 +99,13 @@ class Webpages extends Controller {
 						));
 						$_SESSION['export'] = null;
 						return $o;
-				
+
 				default :
 						$_SESSION['action'] = null;
 						break;
 		}
-		
-		
+
+
 		if(App::$is_sys && is_site_admin()) {
 			$sys = get_sys_channel();
 			if($sys && intval($sys['channel_id'])) {
@@ -114,7 +114,7 @@ class Webpages extends Controller {
 				$observer = $sys;
 			}
 		}
-	
+
 		if(! $owner) {
 			// Figure out who the page owner is.
 			$r = q("select channel_id from channel where channel_address = '%s'",
@@ -124,24 +124,24 @@ class Webpages extends Controller {
 				$owner = intval($r[0]['channel_id']);
 			}
 		}
-	
+
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		$perms = get_all_perms($owner,$ob_hash);
-	
+
 		if(! $perms['write_pages']) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
-	
+
 		$mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype'));
-	
+
 		$layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout'));
-	
+
 		// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
-		// Nickname is set to the observers xchan, and profile_uid to the owner's.  
+		// Nickname is set to the observers xchan, and profile_uid to the owner's.
 		// This lets you post pages at other people's channels.
-	
+
 		if((! $channel) && ($uid) && ($uid == App::$profile_uid)) {
 			$channel = App::get_channel();
 		}
@@ -156,12 +156,12 @@ class Webpages extends Controller {
 		else {
 			$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
 		}
-	
+
 
 		$is_owner = ($uid && $uid == $owner);
 
 		$o = '';
-	
+
 		$x = array(
 			'webpage' => ITEM_TYPE_WEBPAGE,
 			'is_owner' => true,
@@ -183,23 +183,23 @@ class Webpages extends Controller {
 			'bbco_autocomplete' => 'bbcode',
 			'bbcode' => true
 		);
-		
+
 		if($_REQUEST['title'])
 			$x['title'] = $_REQUEST['title'];
 		if($_REQUEST['body'])
 			$x['body'] = $_REQUEST['body'];
 		if($_REQUEST['pagetitle'])
 			$x['pagetitle'] = $_REQUEST['pagetitle'];
-	
-	
-		// Get a list of webpages.  We can't display all them because endless scroll makes that unusable, 
+
+
+		// Get a list of webpages.  We can't display all them because endless scroll makes that unusable,
 		// so just list titles and an edit link.
-	
-	
+
+
 		$sql_extra = item_permissions_sql($owner);
-	
-		$r = q("select * from iconfig left join item on iconfig.iid = item.id 
-			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d 
+
+		$r = q("select * from iconfig left join item on iconfig.iid = item.id
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d
 			$sql_extra order by item.created desc",
 			intval($owner),
 			intval(ITEM_TYPE_WEBPAGE)
@@ -211,14 +211,13 @@ class Webpages extends Controller {
 		$editor = status_editor($a,$x,false,'Webpages');
 
 		$pages = null;
-	
+
 		if($r) {
 			$pages = array();
 			foreach($r as $rr) {
-				unobscure($rr);
-	
+
 				$lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock');
-	
+
 				$element_arr = array(
 					'type'		=> 'webpage',
 					'title'		=> $rr['title'],
@@ -243,11 +242,11 @@ class Webpages extends Controller {
 				);
 			}
 		}
-	
-	
+
+
 		//Build the base URL for edit links
 		$url = z_root() . '/editwebpage/' . $which;
-		
+
 		$o .= replace_macros(get_markup_template('webpagelist.tpl'), array(
 			'$listtitle'    => t('Webpages'),
 			'$baseurl'      => $url,
@@ -266,19 +265,19 @@ class Webpages extends Controller {
 			'$created_txt'  => t('Created'),
 			'$edited_txt'   => t('Edited')
 		));
-	
+
 		return $o;
 	}
-	
+
 	function post() {
     $action = $_REQUEST['action'];
 		if( $action ){
 			switch ($action) {
         case 'scan':
-					
+
 					// the state of this variable tracks whether website files have been scanned (null, true, false)
-					$cloud = null;	
-					
+					$cloud = null;
+
 					// Website files are to be imported from an uploaded zip file
 					if(($_FILES) && array_key_exists('zip_file',$_FILES) && isset($_POST['w_upload'])) {
 						$source = $_FILES["zip_file"]["tmp_name"];
@@ -306,8 +305,8 @@ class Webpages extends Controller {
 						} else {
 							notice( t('Error opening zip file') . EOL);
 							return null;
-						}	
-					} 
+						}
+					}
 
 					// Website files are to be imported from the channel cloud files
 					if (($_POST) && array_key_exists('path',$_POST) && isset($_POST['cloudsubmit'])) {
@@ -321,7 +320,7 @@ class Webpages extends Controller {
 						$cloud = true;
 
 					}
-					
+
 					// If the website files were uploaded or specified in the cloud files, then $cloud
 					// should be either true or false
 					if ($cloud !== null) {
@@ -345,24 +344,24 @@ class Webpages extends Controller {
 							notice( t('No webpage elements detected.') . EOL);
 							$_SESSION['action'] = null;
 						}
-						
+
 					}
-					
+
 					// If the website elements were imported from a zip file, delete the temporary decompressed files
 					if ($cloud === false && $website && $elements) {
 						$_SESSION['tempimportpath'] = $website;
 						//rrmdir($website);	// Delete the temporary decompressed files
 					}
-					
+
 					break;
-					
+
 				case 'importselected':
 						require_once('include/import.php');
 						$channel = App::get_channel();
-						
+
 						// Import layout first so that pages that reference new layouts will find
-						// the mid of layout items in the database						
-						
+						// the mid of layout items in the database
+
             // Obtain the user-selected layouts to import and import them
             $checkedlayouts = $_POST['layout'];
             $layouts = [];
@@ -380,7 +379,7 @@ class Webpages extends Controller {
 								}
             }
             $_SESSION['import_layouts'] = $layouts;
-            
+
             // Obtain the user-selected blocks to import and import them
             $checkedblocks = $_POST['block'];
             $blocks = [];
@@ -398,7 +397,7 @@ class Webpages extends Controller {
 								}
             }
             $_SESSION['import_blocks'] = $blocks;
-            
+
             // Obtain the user-selected pages to import and import them
             $checkedpages = $_POST['page'];
             $pages = [];
@@ -424,9 +423,9 @@ class Webpages extends Controller {
 								unset($_SESSION['tempimportpath']);
 						}
 						break;
-				
+
 				case 'exportzipfile':
-						
+
 						if(isset($_POST['w_download'])) {
 								$_SESSION['action'] = 'export_select_list';
 								$_SESSION['export'] = 'zipfile';
@@ -436,45 +435,45 @@ class Webpages extends Controller {
 										$filename = 'website.zip';
 								}
 								$_SESSION['zipfilename'] = $filename;
-								
+
 						}
-						
+
 						break;
-				
+
 				case 'exportcloud':
 						if(isset($_POST['exportcloudpath']) && $_POST['exportcloudpath'] !== '') {
 								$_SESSION['action'] = 'export_select_list';
 								$_SESSION['export'] = 'cloud';
 								$_SESSION['exportcloudpath'] = filter_var($_POST['exportcloudpath'], FILTER_SANITIZE_ENCODED);
 						}
-						
+
 						break;
-				
+
 				case 'cloud':
 				case 'zipfile':
-						
+
 						$channel = App::get_channel();
-						
+
 						$tmp_folder_name = random_string(10);
 						$zip_folder_name = random_string(10);
 						$zip_filename = $_SESSION['zipfilename'];
 						$tmp_folderpath = '/tmp/' . $tmp_folder_name;
 						$zip_folderpath = '/tmp/' . $zip_folder_name;
-						if (!mkdir($zip_folderpath, 0770, false)) {	
+						if (!mkdir($zip_folderpath, 0770, false)) {
 								logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL);
 								json_return_and_die(array('message' => 'Error creating zip file export folder'));
 						}
 						$zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
-						
+
 						$checkedblocks = $_POST['block'];
             $blocks = [];
             if (!empty($checkedblocks)) {
                 foreach ($checkedblocks as $mid) {
-										$b = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-												left join item on item.id = iconfig.iid 
+										$b = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig
+												left join item on item.id = iconfig.iid
 												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' order by iconfig.v asc limit 1",
 												dbesc($mid),
-												intval($channel['channel_id'])																	
+												intval($channel['channel_id'])
 										);
 										if($b) {
 												$b = $b[0];
@@ -514,25 +513,25 @@ class Webpages extends Controller {
 												$block_filepath = $tmp_blockfolder . '/' . $block_filename;
 												$blockinfo['json']['contentfile'] = $block_filename;
 												$block_jsonpath = $tmp_blockfolder . '/block.json';
-												if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) {	
+												if (!is_dir($tmp_blockfolder) && !mkdir($tmp_blockfolder, 0770, true)) {
 														logger('Error creating temp export folder: ' . $tmp_blockfolder, LOGGER_NORMAL);
 														json_return_and_die(array('message' => 'Error creating temp export folder'));
 												}
 												file_put_contents($block_filepath, $blockinfo['body']);
-												file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES));																		
+												file_put_contents($block_jsonpath, json_encode($blockinfo['json'], JSON_UNESCAPED_SLASHES));
 										}
 								}
 						}
-						
+
 						$checkedlayouts = $_POST['layout'];
             $layouts = [];
             if (!empty($checkedlayouts)) {
                 foreach ($checkedlayouts as $mid) {
-										$l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-												left join item on item.id = iconfig.iid 
+										$l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig
+												left join item on item.id = iconfig.iid
 												where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
 												dbesc($mid),
-												intval($channel['channel_id'])																	
+												intval($channel['channel_id'])
 										);
 										if($l) {
 												$l = $l[0];
@@ -558,38 +557,38 @@ class Webpages extends Controller {
 												$layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
 												$layoutinfo['json']['contentfile'] = $layout_filename;
 												$layout_jsonpath = $tmp_layoutfolder . '/layout.json';
-												if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {	
+												if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
 														logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
 														json_return_and_die(array('message' => 'Error creating temp export folder'));
 												}
 												file_put_contents($layout_filepath, $layoutinfo['body']);
-												file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));																		
+												file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
 										}
 								}
 						}
-						
+
 						$checkedpages = $_POST['page'];
             $pages = [];
             if (!empty($checkedpages)) {
                 foreach ($checkedpages as $mid) {
-										
-										$p = q("select * from iconfig left join item on iconfig.iid = item.id 
+
+										$p = q("select * from iconfig left join item on iconfig.iid = item.id
 												where item.uid = %d and item.mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d",
 												intval($channel['channel_id']),
 												dbesc($mid),
 												intval(ITEM_TYPE_WEBPAGE)
 											);
-										
+
 										if($p) {
 												foreach ($p as $pp) {
 														// Get the associated layout
 														$layoutinfo = array();
 														if($pp['layout_mid']) {
-																$l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
-																		left join item on item.id = iconfig.iid 
+																$l = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig
+																		left join item on item.id = iconfig.iid
 																		where mid = '%s' and item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc limit 1",
 																		dbesc($pp['layout_mid']),
-																		intval($channel['channel_id'])																	
+																		intval($channel['channel_id'])
 																);
 																if($l) {
 																		$l = $l[0];
@@ -614,12 +613,12 @@ class Webpages extends Controller {
 																		$layout_filepath = $tmp_layoutfolder . '/' . $layout_filename;
 																		$layoutinfo['json']['contentfile'] = $layout_filename;
 																		$layout_jsonpath = $tmp_layoutfolder . '/layout.json';
-																		if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {	
+																		if (!is_dir($tmp_layoutfolder) && !mkdir($tmp_layoutfolder, 0770, true)) {
 																				logger('Error creating temp export folder: ' . $tmp_layoutfolder, LOGGER_NORMAL);
 																				json_return_and_die(array('message' => 'Error creating temp export folder'));
 																		}
 																		file_put_contents($layout_filepath, $layoutinfo['body']);
-																		file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));																		
+																		file_put_contents($layout_jsonpath, json_encode($layoutinfo['json'], JSON_UNESCAPED_SLASHES));
 																}
 														}
 														switch ($pp['mimetype']) {
@@ -660,14 +659,14 @@ class Webpages extends Controller {
 														$page_filepath = $tmp_pagefolder . '/' . $page_filename;
 														$page_jsonpath = $tmp_pagefolder . '/page.json';
 														$pageinfo['json']['contentfile'] = $page_filename;
-														if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) {	
+														if (!is_dir($tmp_pagefolder) && !mkdir($tmp_pagefolder, 0770, true)) {
 																logger('Error creating temp export folder: ' . $tmp_pagefolder, LOGGER_NORMAL);
 																json_return_and_die(array('message' => 'Error creating temp export folder'));
 														}
 														file_put_contents($page_filepath, $pageinfo['body']);
 														file_put_contents($page_jsonpath, json_encode($pageinfo['json'], JSON_UNESCAPED_SLASHES));
 												}
-										}										
+										}
                 }
             }
 						if($action === 'zipfile') {
@@ -686,23 +685,23 @@ class Webpages extends Controller {
 										if(!$dirpath) {
 												$x = attach_mkdirp($channel, $channel['channel_hash'], array('pathname' => $cloudpath));
 												$folder_hash = (($x['success']) ? $x['data']['hash'] : '');
-												
+
 												if (!$x['success']) {
 														logger('Failed to create cloud file folder', LOGGER_NORMAL);
 												}
 												$dirpath = get_dirpath_by_cloudpath($channel, $cloudpath);
 												if (!is_dir($dirpath)) {
 														logger('Failed to create cloud file folder', LOGGER_NORMAL);
-												} 
+												}
 										}
-										
+
 										$success = copy_folder_to_cloudfiles($channel, $channel['channel_hash'], $tmp_folderpath, $cloudpath);
 								}
 						}
 						if(!$success) {
 								logger('Error exporting webpage elements', LOGGER_NORMAL);
 						}
-						
+
 						rrmdir($zip_folderpath); rrmdir($tmp_folderpath);		// delete temporary files
 						killme();
 
@@ -710,9 +709,9 @@ class Webpages extends Controller {
 				default :
 					break;
 			}
-			
+
 		}
-		
+
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Well_known.php b/Zotlabs/Module/Well_known.php
index 0d7b222b8..af59b76e0 100644
--- a/Zotlabs/Module/Well_known.php
+++ b/Zotlabs/Module/Well_known.php
@@ -5,36 +5,28 @@ namespace Zotlabs\Module;
 class Well_known extends \Zotlabs\Web\Controller {
 
 	function init(){
-	
+
 		if(argc() > 1) {
-	
+
 			$arr = array('server' => $_SERVER, 'request' => $_REQUEST);
 			call_hooks('well_known', $arr);
-	
-	
+
+
 			if(! check_siteallowed($_SERVER['REMOTE_ADDR'])) {
 				logger('well_known: site not allowed. ' . $_SERVER['REMOTE_ADDR']);
 				killme();
 			}
-	
+
 			// from php.net re: REMOTE_HOST:
-			//     Note: Your web server must be configured to create this variable. For example in Apache 
-			// you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr(). 
-	
+			//     Note: Your web server must be configured to create this variable. For example in Apache
+			// you'll need HostnameLookups On inside httpd.conf for it to exist. See also gethostbyaddr().
+
 			if(get_config('system','siteallowed_remote_host') && (! check_siteallowed($_SERVER['REMOTE_HOST']))) {
 				logger('well_known: site not allowed. ' . $_SERVER['REMOTE_HOST']);
 				killme();
 			}
-	
+
 			switch(argv(1)) {
-				case 'zot-info':
-					\App::$argc -= 1;
-					array_shift(\App::$argv);
-					\App::$argv[0] = 'zfinger';
-					$module = new \Zotlabs\Module\Zfinger();
-					$module->init();
-					break;
-	
 				case 'webfinger':
 					\App::$argc -= 1;
 					array_shift(\App::$argv);
@@ -42,7 +34,7 @@ class Well_known extends \Zotlabs\Web\Controller {
 					$module = new \Zotlabs\Module\Wfinger();
 					$module->init();
 					break;
-	
+
 				case 'host-meta':
 					\App::$argc -= 1;
 					array_shift(\App::$argv);
@@ -63,7 +55,7 @@ class Well_known extends \Zotlabs\Web\Controller {
 				case 'dnt-policy.txt':
 					echo file_get_contents('doc/dnt-policy.txt');
 					killme();
-					
+
 				case 'caldav':
 				case 'carddav':
 				    if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
@@ -73,16 +65,16 @@ class Well_known extends \Zotlabs\Web\Controller {
 
 				default:
 					if(file_exists(\App::$cmd)) {
-						echo file_get_contents(\App::$cmd); 
+						echo file_get_contents(\App::$cmd);
 						killme();
 					}
 					elseif(file_exists(\App::$cmd . '.php'))
 						require_once(\App::$cmd . '.php');
 					break;
-	
+
 			}
 		}
-	
+
 		http_status_exit(404);
 	}
 }
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 46da7f007..6dedc1ef1 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -1,8 +1,6 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/zot.php');
-
 use Zotlabs\Lib\Keyutils;
 use Zotlabs\Lib\Libzot;
 
@@ -21,7 +19,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
 			$scheme = 'https';
 		elseif(x($_SERVER,'HTTP_X_FORWARDED_PROTO') && ($_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'))
-			$scheme = 'https';			
+			$scheme = 'https';
 
 		$zot = intval($_REQUEST['zot']);
 
@@ -69,7 +67,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 				$channel = substr($channel,1);
 				$channel = substr($channel,0,-1);
 				$pchan = true;
-				$r = q("select * from pchan left join xchan on pchan_hash = xchan_hash 
+				$r = q("select * from pchan left join xchan on pchan_hash = xchan_hash
 					where pchan_guid = '%s' limit 1",
 					dbesc($channel)
 				);
@@ -78,7 +76,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 				}
 			}
 			else {
-				$r = q("select * from channel left join xchan on channel_hash = xchan_hash 
+				$r = q("select * from channel left join xchan on channel_hash = xchan_hash
 					where channel_address = '%s' limit 1",
 					dbesc($channel)
 				);
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 04c1dbeaa..da6e9dda6 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -68,7 +68,7 @@ class Wiki extends Controller {
 		$pageHistory = array();
 		$local_observer = null;
 		$resource_id = '';
-		
+
 		// init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1
 
 		$nick = argv(1);
@@ -98,9 +98,9 @@ class Wiki extends Controller {
 			// Initialize the ACL to the channel default permissions
 
 			$x = array(
-					'lockstate' => (( $owner['channel_allow_cid'] || 
-						$owner['channel_allow_gid'] || 
-						$owner['channel_deny_cid'] || 
+					'lockstate' => (( $owner['channel_allow_cid'] ||
+						$owner['channel_allow_gid'] ||
+						$owner['channel_deny_cid'] ||
 						$owner['channel_deny_gid'])
 						? 'lock' : 'unlock'
 					),
@@ -113,7 +113,7 @@ class Wiki extends Controller {
 			);
 		}
 		else {
-			// Not the channel owner 
+			// Not the channel owner
 			$owner_acl = $x = array();
 		}
 
@@ -272,10 +272,10 @@ class Wiki extends Controller {
 				if(! $w['resource_id']) {
 					notice(t('Wiki not found') . EOL);
 					goaway(z_root() . '/' . argv(0) . '/' . argv(1));
-				}				
+				}
 
 				$resource_id = $w['resource_id'];
-				
+
 				if(! $wiki_owner) {
 					// Check for observer permissions
 					$observer_hash = get_observer_hash();
@@ -316,7 +316,7 @@ class Wiki extends Controller {
 				                'channel_address' => $owner['channel_address'],
 				                'refresh' => true
 			                ]);
-			                //json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));					
+			                //json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));
 					notice( t('Error retrieving page content') . EOL);
 					//goaway(z_root() . '/' . argv(0) . '/' . argv(1) );
 				        $renderedContent = NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName));
@@ -334,7 +334,7 @@ class Wiki extends Controller {
 				    $hookinfo = ['content' => $content, 'mimetype' => $mimeType];
 				    call_hooks('wiki_preprocess',$hookinfo);
 				    $content = $hookinfo['content'];
-    
+
 				    // Render the Markdown-formatted page content in HTML
 				    if($mimeType == 'text/bbcode') {
 					$renderedContent = zidify_links(smilies(bbcode($content)));
@@ -356,7 +356,7 @@ class Wiki extends Controller {
 //			default:	// Strip the extraneous URL components
 //				goaway('/' . argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . $pageUrlName);
 		}
-		
+
 
 		$wikiModalID = random_string(3);
 
@@ -458,18 +458,18 @@ class Wiki extends Controller {
 			}
 			json_return_and_die(array('html' => $html, 'success' => true));
 		}
-		
+
 		// Create a new wiki
 		// /wiki/channel/create/wiki
 		if ((argc() > 3) && (argv(2) === 'create') && (argv(3) === 'wiki')) {
 
-			// Only the channel owner can create a wiki, at least until we create a 
+			// Only the channel owner can create a wiki, at least until we create a
 			// more detail permissions framework
 
 			if (local_channel() !== intval($owner['channel_id'])) {
 				goaway('/' . argv(0) . '/' . $nick . '/');
-			} 
-			$wiki = array(); 
+			}
+			$wiki = array();
 
 			// backslashes won't work well in the javascript functions
 			$name = str_replace('\\','',$_POST['wikiName']);
@@ -478,12 +478,12 @@ class Wiki extends Controller {
 			$wiki['postVisible'] = ((intval($_POST['postVisible'])) ? 1 : 0);
 			$wiki['rawName']     = $name;
 			$wiki['htmlName']    = escape_tags($name);
-			//$wiki['urlName']     = urlencode(urlencode($name)); 
+			//$wiki['urlName']     = urlencode(urlencode($name));
 			$wiki['urlName']     = NativeWiki::name_encode($name);
 			$wiki['mimeType']    = $_POST['mimeType'];
 			$wiki['typelock']    = $_POST['typelock'];
 
-			if($wiki['urlName'] === '') {				
+			if($wiki['urlName'] === '') {
 				notice( t('Error creating wiki. Invalid name.') . EOL);
 				goaway('/wiki');
 				return; //not reached
@@ -519,7 +519,7 @@ class Wiki extends Controller {
 		// Update a wiki
 		// /wiki/channel/update/wiki
 		if ((argc() > 3) && (argv(2) === 'update') && (argv(3) === 'wiki')) {
-			// Only the channel owner can update a wiki, at least until we create a 
+			// Only the channel owner can update a wiki, at least until we create a
 			// more detail permissions framework
 
 			if (local_channel() !== intval($owner['channel_id'])) {
@@ -544,7 +544,7 @@ class Wiki extends Controller {
 			if($wiki['resource_id']) {
 
 				$arr['resource_id'] = $wiki['resource_id'];
-				
+
 				$acl = new \Zotlabs\Access\AccessList($owner);
 				$acl->set_from_array($_POST);
 
@@ -565,18 +565,18 @@ class Wiki extends Controller {
 		// Delete a wiki
 		if ((argc() > 3) && (argv(2) === 'delete') && (argv(3) === 'wiki')) {
 
-			// Only the channel owner can delete a wiki, at least until we create a 
+			// Only the channel owner can delete a wiki, at least until we create a
 			// more detail permissions framework
 			if (local_channel() !== intval($owner['channel_id'])) {
 				logger('Wiki delete permission denied.');
 				json_return_and_die(array('message' => t('Wiki delete permission denied.'), 'success' => false));
-			} 
-			$resource_id = $_POST['resource_id']; 
+			}
+			$resource_id = $_POST['resource_id'];
 			$deleted = NativeWiki::delete_wiki($owner['channel_id'],$observer_hash,$resource_id);
 			if ($deleted['success']) {
 				NativeWiki::sync_a_wiki_item($owner['channel_id'], 0, $resource_id);
 				json_return_and_die(array('message' => '', 'success' => true));
-			} 
+			}
 			else {
 				logger('Error deleting wiki: ' . $resource_id . ' ' . $deleted['message']);
 				json_return_and_die(array('message' => t('Error deleting wiki'), 'success' => false));
@@ -589,14 +589,14 @@ class Wiki extends Controller {
 
 			$mimetype = $_POST['mimetype'];
 
-			$resource_id = $_POST['resource_id']; 
+			$resource_id = $_POST['resource_id'];
 			// Determine if observer has permission to create a page
-			
 
-			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash, $mimetype);
+
+			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$name = isset($_POST['pageName']) ? $_POST['pageName'] : $_POST['missingPageName']; //Get new page name
@@ -612,8 +612,8 @@ class Wiki extends Controller {
 			if($page['item_id']) {
 
 				$commit = NativeWikiPage::commit([
-					'commit_msg'    => t('New page created'), 
-					'resource_id'   => $resource_id, 
+					'commit_msg'    => t('New page created'),
+					'resource_id'   => $resource_id,
 					'channel_id'    => $owner['channel_id'],
 					'observer_hash' => $observer_hash,
 					'pageUrlName'   => $name
@@ -622,10 +622,10 @@ class Wiki extends Controller {
 					NativeWiki::sync_a_wiki_item($owner['channel_id'], $commit['item_id'], $resource_id);
 					//json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . urlencode($page['wiki']['urlName']) . '/' . urlencode($page['page']['urlName']), 'success' => true));
 					json_return_and_die(array('url' => '/' . argv(0) . '/' . argv(1) . '/' . $page['wiki']['urlName'] . '/' . $page['page']['urlName'], 'success' => true));
-				} 
+				}
 				else {
 					json_return_and_die(array('message' => 'Error making git commit','url' => '/' . argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($page['wiki']['urlName']) . '/' . NativeWiki::name_encode($page['page']['urlName']),'success' => false));
-				}				
+				}
 
 
 			}
@@ -633,8 +633,8 @@ class Wiki extends Controller {
 				logger('Error creating page');
 				json_return_and_die(array('message' => 'Error creating page.', 'success' => false));
 			}
-		}		
-		
+		}
+
 		// Fetch page list for a wiki
 		if((argc() === 5) && (argv(2) === 'get') && (argv(3) === 'page') && (argv(4) === 'list')) {
 			$resource_id = $_POST['resource_id']; // resource_id for wiki in db
@@ -642,7 +642,7 @@ class Wiki extends Controller {
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(!$perms['read']) {
 				logger('Wiki read permission denied.' . EOL);
-				json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false));					
+				json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false));
 			}
 
 			// @FIXME - we shouldn't invoke this if it isn't in the PDL or has been over-ridden
@@ -655,17 +655,17 @@ class Wiki extends Controller {
 				'channel_address' => $owner['channel_address'],
 				'refresh' => true
 			]);
-			json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));					
+			json_return_and_die(array('pages' => $page_list_html, 'message' => '', 'success' => true));
 		}
-		
+
 		// Save a page
 		if ((argc() === 4) && (argv(2) === 'save') && (argv(3) === 'page')) {
-			
-			$resource_id = $_POST['resource_id']; 
+
+			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
 			$pageHtmlName = escape_tags($_POST['name']);
 			$content = $_POST['content']; //Get new content
-			$commitMsg = $_POST['commitMsg']; 
+			$commitMsg = $_POST['commitMsg'];
 			if ($commitMsg === '') {
 				$commitMsg = 'Updated ' . $pageHtmlName;
 			}
@@ -674,7 +674,7 @@ class Wiki extends Controller {
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$saved = NativeWikiPage::save_page([
@@ -687,9 +687,9 @@ class Wiki extends Controller {
 			if($saved['success']) {
 
 				$commit = NativeWikiPage::commit([
-					'commit_msg' => $commitMsg, 
+					'commit_msg' => $commitMsg,
 					'pageUrlName' => $pageUrlName,
-					'resource_id' => $resource_id, 
+					'resource_id' => $resource_id,
 					'channel_id'    => $owner['channel_id'],
 					'observer_hash' => $observer_hash,
 					'revision' => (-1)
@@ -699,21 +699,21 @@ class Wiki extends Controller {
 					json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true , 'content' => $content));
 				}
 				else {
-					json_return_and_die(array('message' => 'Error making git commit','success' => false));					
+					json_return_and_die(array('message' => 'Error making git commit','success' => false));
 				}
 			}
 			else {
-				json_return_and_die(array('message' => 'Error saving page', 'success' => false));					
+				json_return_and_die(array('message' => 'Error saving page', 'success' => false));
 			}
 		}
-		
+
 		// Update page history
 		// /wiki/channel/history/page
 		if ((argc() === 4) && (argv(2) === 'history') && (argv(3) === 'page')) {
-			
+
 			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
-			
+
 			// Determine if observer has permission to read content
 
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
@@ -734,7 +734,7 @@ class Wiki extends Controller {
 		// Delete a page
 		if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) {
 
-			$resource_id = $_POST['resource_id']; 
+			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
 
 			if ($pageUrlName === 'Home') {
@@ -745,13 +745,13 @@ class Wiki extends Controller {
 			// currently just allow page owner
 			if((! local_channel()) || (local_channel() != $owner['channel_id'])) {
 				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$deleted = NativeWikiPage::delete_page([
@@ -765,14 +765,14 @@ class Wiki extends Controller {
 				json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
 			}
 			else {
-				json_return_and_die(array('message' => 'Error deleting page', 'success' => false));					
+				json_return_and_die(array('message' => 'Error deleting page', 'success' => false));
 			}
 		}
-		
+
 		// Revert a page
 		if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) {
 
-			$resource_id = $_POST['resource_id']; 
+			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
 			$commitHash = $_POST['commitHash'];
 
@@ -780,7 +780,7 @@ class Wiki extends Controller {
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied.' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$reverted = NativeWikiPage::revert_page([
@@ -791,16 +791,16 @@ class Wiki extends Controller {
 				'pageUrlName' => $pageUrlName
 			]);
 			if($reverted['success']) {
-				json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));					
+				json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));
 			}
 			else {
-				json_return_and_die(array('content' => '', 'message' => 'Error reverting page', 'success' => false));					
+				json_return_and_die(array('content' => '', 'message' => 'Error reverting page', 'success' => false));
 			}
 		}
-		
+
 		// Compare page revisions
 		if ((argc() === 4) && (argv(2) === 'compare') && (argv(3) === 'page')) {
-			$resource_id = $_POST['resource_id']; 
+			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
 			$compareCommit = $_POST['compareCommit'];
 			$currentCommit = $_POST['currentCommit'];
@@ -809,21 +809,21 @@ class Wiki extends Controller {
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(!$perms['read']) {
 				logger('Wiki read permission denied.' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$compare = NativeWikiPage::compare_page(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'currentCommit' => $currentCommit, 'compareCommit' => $compareCommit, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
 			if($compare['success']) {
 				$diffHTML = '<table class="text-center" width="100%"><tr><td class="lead" width="50%">' . t('Current Revision') . '</td><td class="lead" width="50%">' . t('Selected Revision') . '</td></tr></table>' . $compare['diff'];
-				json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true));					
+				json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true));
 			} else {
-				json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false));					
+				json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false));
 			}
 		}
-		
+
 		// Rename a page
 		if ((argc() === 4) && (argv(2) === 'rename') && (argv(3) === 'page')) {
-			$resource_id = $_POST['resource_id']; 
+			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['oldName'];
 			$pageNewName = str_replace('\\','',$_POST['newName']);
 			if ($pageUrlName === 'Home') {
@@ -837,7 +837,7 @@ class Wiki extends Controller {
 			$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));					
+				json_return_and_die(array('success' => false));
 			}
 
 			$renamed = NativeWikiPage::rename_page([
@@ -850,8 +850,8 @@ class Wiki extends Controller {
 			if($renamed['success']) {
 				$commit = NativeWikiPage::commit([
 					'channel_id' => $owner['channel_id'],
-					'commit_msg' => 'Renamed ' . NativeWiki::name_decode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], 
-					'resource_id' => $resource_id, 
+					'commit_msg' => 'Renamed ' . NativeWiki::name_decode($pageUrlName) . ' to ' . $renamed['page']['htmlName'],
+					'resource_id' => $resource_id,
 					'observer_hash' => $observer_hash,
 					'pageUrlName' => $pageNewName
 				]);
@@ -860,16 +860,16 @@ class Wiki extends Controller {
 					json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true));
 				}
 				else {
-					json_return_and_die(array('message' => 'Error making git commit','success' => false));					
+					json_return_and_die(array('message' => 'Error making git commit','success' => false));
 				}
 			}
 			else {
-				json_return_and_die(array('message' => 'Error renaming page', 'success' => false));					
+				json_return_and_die(array('message' => 'Error renaming page', 'success' => false));
 			}
 		}
 
 		//notice( t('You must be authenticated.'));
 		json_return_and_die(array('message' => t('You must be authenticated.'), 'success' => false));
-		
+
 	}
 }
diff --git a/Zotlabs/Module/Zfinger.php b/Zotlabs/Module/Zfinger.php
deleted file mode 100644
index ce7117ad8..000000000
--- a/Zotlabs/Module/Zfinger.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use Zotlabs\Web\HTTPSig;
-use Zotlabs\Lib\Libzot;
-
-class Zfinger extends \Zotlabs\Web\Controller {
-
-	function init() {
-
-		require_once('include/zot.php');
-		require_once('include/crypto.php');
-
-		$x = zotinfo($_REQUEST);
-
-		if($x && $x['guid'] && $x['guid_sig']) {
-			$chan_hash = make_xchan_hash($x['guid'],$x['guid_sig']);
-			if($chan_hash) {
-				$chan = channelx_by_hash($chan_hash);
-			}
-		}
-
-		$headers = [];
-		$headers['Content-Type'] = 'application/json' ;
-		$ret = json_encode($x);
-
-		if($chan) {
-			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
-			$h = HTTPSig::create_sig($headers,$chan['channel_prvkey'], channel_url($chan));
-			HTTPSig::set_headers($h);
-		}
-		else {
-			foreach($headers as $k => $v) {
-				header($k . ': ' . $v);
-			}
-		}
-
-		echo $ret;
-		killme();
-
-	}
-
-}
diff --git a/Zotlabs/Module/Zping.php b/Zotlabs/Module/Zping.php
deleted file mode 100644
index d6128fa66..000000000
--- a/Zotlabs/Module/Zping.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace Zotlabs\Module; /** @file */
-
-require_once('include/zot.php');
-
-
-class Zping extends \Zotlabs\Web\Controller {
-
-	function get() {
-	
-		// This is just a test utility function and may go away once we build these tools into
-		// the address book and directory to do dead site discovery.
-	
-		// The response packet include the current URL and key so we can discover if the server 
-		// has been re-installed and clean up (e.g. get rid of) any old hublocs and xchans. 
-	
-		// Remember to add '/post' to the url
-	
-		if(! local_channel())
-			return;
-	
-		$url = $_REQUEST['url'];
-	
-		if(! $url)
-			return;
-	
-	
-		$m = zot_build_packet(\App::get_channel(),'ping');
-		$r = zot_zot($url,$m);
-		return print_r($r,true);
-	
-	}
-}
diff --git a/Zotlabs/Update/_1246.php b/Zotlabs/Update/_1246.php
new file mode 100644
index 000000000..3023c45dd
--- /dev/null
+++ b/Zotlabs/Update/_1246.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1246 {
+
+	function run() {
+
+		q("START TRANSACTION");
+
+		$r1 = dbq("UPDATE xchan SET xchan_deleted = 2 WHERE xchan_network = 'zot' AND xchan_deleted = 0");
+		$r2 = dbq("UPDATE hubloc SET hubloc_deleted = 2 WHERE hubloc_network = 'zot' AND hubloc_deleted = 0");
+
+		if($r1 && $r2) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
diff --git a/Zotlabs/Update/_1247.php b/Zotlabs/Update/_1247.php
new file mode 100644
index 000000000..e776a52f4
--- /dev/null
+++ b/Zotlabs/Update/_1247.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1247 {
+
+	function run() {
+
+		q("START TRANSACTION");
+
+		$r = dbq("DELETE FROM updates WHERE ud_addr = '' OR ud_hash = '' OR ud_guid = ''");
+
+		if($r) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index de0d5a883..685f75897 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -39,6 +39,8 @@ class WebServer {
 			register_shutdown_function('session_write_close');
   		}
 
+		$_SESSION['page_loadtime'] = datetime_convert();
+
 		/**
 		 * Language was set earlier, but we can over-ride it in the session.
 		 * We have to do it here because the session was just now opened.
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index 267d50fa0..3dc260b50 100644
--- a/Zotlabs/Widget/Conversations.php
+++ b/Zotlabs/Widget/Conversations.php
@@ -9,67 +9,154 @@ class Conversations {
 		if (! local_channel())
 			return;
 
-		if(argc() > 1) {
+		switch(argv(1)) {
+			case 'inbox':
+				$mailbox = 'inbox';
+				$header = t('Received Messages');
+				break;
+			case 'outbox':
+				$mailbox = 'outbox';
+				$header = t('Sent Messages');
+				break;
+			default:
+				$mailbox = 'combined';
+				$header = t('Conversations');
+				break;
+		}
+
+		$o = '';
+
+		// private_messages_list() can do other more complicated stuff, for now keep it simple
+		$r = self::private_messages_list(local_channel(), $mailbox, \App::$pager['start'], \App::$pager['itemspage']);
+
+		if(! $r) {
+			info( t('No messages.') . EOL);
+			return $o;
+		}
+
+		$messages = [];
+
+		foreach($r as $rr) {
+
+			$selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']);
+
+			$messages[] = [
+				'mailbox'      => $mailbox,
+				'id'           => $rr['id'],
+				'from_name'    => $rr['from']['xchan_name'],
+				'from_url'     => chanlink_hash($rr['from_xchan']),
+				'from_photo'   => $rr['from']['xchan_photo_s'],
+				'to_name'      => $rr['to']['xchan_name'],
+				'to_url'       => chanlink_hash($rr['to_xchan']),
+				'to_photo'     => $rr['to']['xchan_photo_s'],
+				'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+				'delete'       => t('Delete conversation'),
+				'body'         => $rr['body'],
+				'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
+				'seen'         => $rr['seen'],
+				'selected'     => ((argv(1) != 'new') ? $selected : '')
+			];
+		}
+
+		$tpl = get_markup_template('mail_head.tpl');
+		$o .= replace_macros($tpl, [
+			'$header' => $header,
+			'$messages' => $messages
+		]);
+
+		return $o;
+	}
+
+	function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
+
+		$where = '';
+		$limit = '';
+
+		$t0 = dba_timer();
+
+		if($numitems)
+			$limit = " LIMIT " . intval($numitems) . " OFFSET " . intval($start);
+
+		if($mailbox !== '') {
+			$x = q("select channel_hash from channel where channel_id = %d limit 1",
+				intval($uid)
+			);
+
+			if(! $x)
+				return array();
+
+			$channel_hash = dbesc($x[0]['channel_hash']);
+			$local_channel = intval(local_channel());
+
+			switch($mailbox) {
 
-			switch(argv(1)) {
 				case 'inbox':
-					$mailbox = 'inbox';
-					$header = t('Received Messages');
+					$sql = "SELECT * FROM mail WHERE channel_id = $local_channel AND from_xchan != '$channel_hash' ORDER BY created DESC $limit";
 					break;
+
 				case 'outbox':
-					$mailbox = 'outbox';
-					$header = t('Sent Messages');
+					$sql = "SELECT * FROM mail WHERE channel_id = $local_channel AND from_xchan = '$channel_hash' ORDER BY created DESC $limit";
 					break;
+
+				case 'combined':
 				default:
-					$mailbox = 'combined';
-					$header = t('Conversations');
+					$parents = q("SELECT mail.parent_mid FROM mail LEFT JOIN conv ON mail.conv_guid = conv.guid WHERE mail.mid = mail.parent_mid AND mail.channel_id = %d ORDER BY conv.updated DESC $limit",
+						intval($local_channel)
+					);
 					break;
 			}
 
-			require_once('include/message.php');
+		}
 
-			$o = '';
+		$r = null;
 
-			// private_messages_list() can do other more complicated stuff, for now keep it simple
-			$r = private_messages_list(local_channel(), $mailbox, \App::$pager['start'], \App::$pager['itemspage']);
+		if($parents) {
+			foreach($parents as $parent) {
+				$all = q("SELECT * FROM mail WHERE parent_mid = '%s' AND channel_id = %d ORDER BY created DESC limit 1",
+					dbesc($parent['parent_mid']),
+					intval($local_channel)
+				);
 
-			if(! $r) {
-				info( t('No messages.') . EOL);
-				return $o;
+				if($all) {
+					foreach($all as $single) {
+						$r[] = $single;
+					}
+				}
 			}
+		}
+		elseif($sql) {
+			$r = q($sql);
+		}
 
-			$messages = [];
-
-			foreach($r as $rr) {
-
-				$selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']);
-
-				$messages[] = [
-					'mailbox'      => $mailbox,
-					'id'           => $rr['id'],
-					'from_name'    => $rr['from']['xchan_name'],
-					'from_url'     => chanlink_hash($rr['from_xchan']),
-					'from_photo'   => $rr['from']['xchan_photo_s'],
-					'to_name'      => $rr['to']['xchan_name'],
-					'to_url'       => chanlink_hash($rr['to_xchan']),
-					'to_photo'     => $rr['to']['xchan_photo_s'],
-					'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
-					'delete'       => t('Delete conversation'),
-					'body'         => $rr['body'],
-					'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
-					'seen'         => $rr['seen'],
-					'selected'     => ((argv(1) != 'new') ? $selected : '')
-				];
-			}
+		if(! $r) {
+			return array();
+		}
 
-			$tpl = get_markup_template('mail_head.tpl');
-			$o .= replace_macros($tpl, [
-				'$header' => $header,
-				'$messages' => $messages
-			]);
+		$chans = array();
+		foreach($r as $rr) {
+			$s = "'" . dbesc(trim($rr['from_xchan'])) . "'";
+			if(! in_array($s,$chans))
+				$chans[] = $s;
+			$s = "'" . dbesc(trim($rr['to_xchan'])) . "'";
+			if(! in_array($s,$chans))
+				$chans[] = $s;
+		}
 
+		$c = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$chans)) . ")");
+
+		foreach($r as $k => $rr) {
+			$r[$k]['from'] = find_xchan_in_array($rr['from_xchan'],$c);
+			$r[$k]['to']   = find_xchan_in_array($rr['to_xchan'],$c);
+			$r[$k]['seen'] = intval($rr['mail_seen']);
+			if(intval($r[$k]['mail_obscured'])) {
+				if($r[$k]['title'])
+					$r[$k]['title'] = base64url_decode(str_rot47($r[$k]['title']));
+				if($r[$k]['body'])
+					$r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
+			}
 		}
-		return $o;
+
+		return $r;
 	}
 
 }
diff --git a/Zotlabs/Widget/Dirtags.php b/Zotlabs/Widget/Dirtags.php
index f211d5942..246c47dde 100644
--- a/Zotlabs/Widget/Dirtags.php
+++ b/Zotlabs/Widget/Dirtags.php
@@ -2,8 +2,6 @@
 
 namespace Zotlabs\Widget;
 
-require_once('include/dir_fns.php');
-
 class Dirtags {
 
 	function widget($arr) {
diff --git a/Zotlabs/Widget/Hq_controls.php b/Zotlabs/Widget/Hq_controls.php
index 0caa54a1a..91335fd76 100644
--- a/Zotlabs/Widget/Hq_controls.php
+++ b/Zotlabs/Widget/Hq_controls.php
@@ -2,24 +2,43 @@
 
 namespace Zotlabs\Widget;
 
+use Zotlabs\Lib\Apps;
+
+
 class Hq_controls {
 
-	function widget($arr) {
+	function widget($options) {
 
 		if (! local_channel())
 			return;
 
+		$entries = [
+			'toggle_editor' => [
+				'label' => t('Toggle post editor'),
+				'href' => '#',
+				'class' => 'btn jot-toggle',
+				'type' => 'button',
+				'icon' => 'pencil',
+				'extra' => 'data-toggle="button"'
+			]
+		];
+
+		if(Apps::system_app_installed(local_channel(), 'Notes')) {
+			$entries['toggle_notes'] = [
+				'label' => t('Toggle personal notes'),
+				'href' => '#',
+				'class' => 'btn notes-toggle',
+				'type' => 'button',
+				'icon' => 'sticky-note-o',
+				'extra' => 'data-toggle="button"'
+			];
+		}
+
 		return replace_macros(get_markup_template('hq_controls.tpl'),
 			[
-				'$title' => t('HQ Control Panel'),
-				'$menu' => [
-					'create' => [
-						'label' => t('Create a new post'),
-						'id' => 'jot-toggle',
-						'href' => '#',
-						'class' => ''
-					]
-				]
+				'$entries' => $entries,
+				'$wrapper_class' => $options['wrapper_class'],
+				'$entry_class' => $options['entry_class']
 			]
 		);
 	}
diff --git a/Zotlabs/Widget/Mailmenu.php b/Zotlabs/Widget/Mailmenu.php
index 512f7d9c0..ca022c807 100644
--- a/Zotlabs/Widget/Mailmenu.php
+++ b/Zotlabs/Widget/Mailmenu.php
@@ -14,7 +14,7 @@ class Mailmenu {
 			'$combined' => array(
 				'label' => t('Combined View'),
 				'url' => z_root() . '/mail/combined',
-				'sel' => (argv(1) == 'combined'),
+				'sel' => (argv(1) == 'combined' || argc() == 1),
 			),
 			'$inbox' => array(
 				'label' => t('Inbox'),
@@ -26,11 +26,13 @@ class Mailmenu {
 				'url' => z_root() . '/mail/outbox',
 				'sel' => (argv(1) == 'outbox'),
 			),
+/*
 			'$new' => array(
 				'label' => t('New Message'),
 				'url' => z_root() . '/mail/new',
 				'sel'=> (argv(1) == 'new'),
 			)
+*/
 		));
 	}
 }
diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php
new file mode 100644
index 000000000..269d669dc
--- /dev/null
+++ b/Zotlabs/Widget/Messages.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+use App;
+use Zotlabs\Lib\IConfig;
+
+class Messages {
+
+	public static function widget($arr) {
+		if (!local_channel())
+			return EMPTY_STR;
+
+		$page = self::get_messages_page($options);
+
+		$tpl = get_markup_template('messages_widget.tpl');
+		$o = replace_macros($tpl, [
+			'$entries' => $page['entries'],
+			'$offset' => $page['offset'],
+			'$feature_star' => feature_enabled(local_channel(), 'star_posts'),
+			'$strings' => [
+				'messages_title' => t('Public and restricted messages'),
+				'direct_messages_title' => t('Direct messages'),
+				'starred_messages_title' => t('Starred messages'),
+				'loading' => t('Loading'),
+				'empty' => t('No messages')
+			]
+		]);
+
+		return $o;
+	}
+
+	public static function get_messages_page($options) {
+		if (!local_channel())
+			return;
+
+		if ($options['offset'] == -1) {
+			return;
+		}
+
+		$channel = App::get_channel();
+		$item_normal = item_normal();
+		$entries = [];
+		$limit = 30;
+		$dummy_order_sql = '';
+
+		$offset = 0;
+		if ($options['offset']) {
+			$offset = intval($options['offset']);
+		}
+
+		$loadtime = (($offset) ? $_SESSION['page_loadtime'] : datetime_convert());
+
+		switch($options['type']) {
+			case 'direct':
+				$type_sql = ' AND item_private = 2 ';
+				// $dummy_order_sql has no other meaning but to trick
+				// some mysql backends into using the right index.
+				$dummy_order_sql = ', received DESC ';
+				break;
+			case 'starred':
+				$type_sql = ' AND item_starred = 1 ';
+				break;
+			default:
+				$type_sql = ' AND item_private IN (0, 1) ';
+		}
+
+		$items = q("SELECT * FROM item WHERE uid = %d
+			AND created <= '%s'
+			$type_sql
+			AND item_thread_top = 1
+			$item_normal
+			ORDER BY created DESC $dummy_order_sql
+			LIMIT $limit OFFSET $offset",
+			intval(local_channel()),
+			dbescdate($loadtime)
+		);
+
+		xchan_query($items, false);
+
+		$i = 0;
+
+		foreach($items as $item) {
+
+			$info = '';
+			if ($options['type'] == 'direct') {
+				$info .= self::get_dm_recipients($channel, $item);
+			}
+
+			if($item['owner_xchan'] !== $item['author_xchan']) {
+				$info .= t('via') . ' ' . $item['owner']['xchan_name'];
+			}
+
+			$summary = $item['title'];
+			if (!$summary) {
+				$summary = $item['summary'];
+			}
+			if (!$summary) {
+				$summary = htmlentities(html2plain(bbcode($item['body'], ['drop_media' => true]), 75, true), ENT_QUOTES, 'UTF-8', false);
+			}
+			if (!$summary) {
+				$summary = '...';
+			}
+			$summary = substr_words($summary, 68);
+
+			switch(intval($item['item_private'])) {
+				case 1:
+					$icon = '<i class="fa fa-lock"></i>';
+					break;
+				case 2:
+					$icon = '<i class="fa fa-envelope-o"></i>';
+					break;
+				default:
+					$icon = '';
+			}
+
+			$entries[$i]['author_name'] = $item['author']['xchan_name'];
+			$entries[$i]['author_addr'] = (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']);
+			$entries[$i]['info'] = $info;
+			$entries[$i]['created'] = datetime_convert('UTC', date_default_timezone_get(), $item['created']);
+			$entries[$i]['summary'] = $summary;
+			$entries[$i]['b64mid'] = gen_link_id($item['mid']);
+			$entries[$i]['href'] = z_root() . '/hq/' . gen_link_id($item['mid']);
+			$entries[$i]['icon'] = $icon;
+
+			$i++;
+		}
+
+		$result = [
+			'offset' => ((count($entries) < $limit) ? -1 : intval($offset + $limit)),
+			'entries' => $entries
+		];
+
+		return $result;
+	}
+
+	public static function get_dm_recipients($channel, $item) {
+
+		if($channel['channel_hash'] === $item['owner']['xchan_hash']) {
+			// we are the owner, get the recipients from the item
+			$recips = expand_acl($item['allow_cid']);
+			if (is_array($recips)) {
+				array_unshift($recips, $item['owner']['xchan_hash']);
+				$column = 'xchan_hash';
+			}
+		}
+		else {
+			$recips = IConfig::Get($item, 'activitypub', 'recips');
+			if (isset($recips['to']) && is_array($recips['to'])) {
+				$recips = $recips['to'];
+				array_unshift($recips, $item['owner']['xchan_url']);
+				$column = 'xchan_url';
+			}
+			else {
+				$hookinfo = [
+					'item' => $item,
+					'recips' => null,
+					'column' => ''
+				];
+
+				call_hooks('direct_message_recipients', $hookinfo);
+
+				$recips = $hookinfo['recips'];
+				$column = $hookinfo['column'];
+			}
+		}
+
+		if(is_array($recips)) {
+			stringify_array_elms($recips, true);
+
+			$query_str = implode(',', $recips);
+			$xchans = dbq("SELECT DISTINCT xchan_name FROM xchan WHERE $column IN ($query_str)");
+
+			foreach($xchans as $xchan) {
+				$recipients .= $xchan['xchan_name'] . ', ';
+			}
+		}
+
+		return trim($recipients, ', ');
+	}
+
+}
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 238008d81..05c1a0292 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -21,7 +21,8 @@ class Notes {
 			'$banner' => t('Notes'),
 			'$text' => $text,
 			'$save' => t('Save'),
-			'$app' => ((isset($arr['app'])) ? true : false)
+			'$app' => ((isset($arr['app'])) ? true : false),
+			'$hidden' => ((isset($arr['hidden'])) ? true : false)
 		));
 
 		return $o;
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index dd5a6cd46..a818ae40a 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -13,11 +13,11 @@ class Notifications {
 				'type' => 'network',
 				'icon' => 'th',
 				'severity' => 'secondary',
-				'label' => t('New Network Activity'),
-				'title' => t('New Network Activity Notifications'),
+				'label' => t('Network'),
+				'title' => t('New network activity notifications'),
 				'viewall' => [
 					'url' => 'network',
-					'label' => t('View your network activity')
+					'label' => t('Network stream')
 				],
 				'markall' => [
 					'label' => t('Mark all notifications read')
@@ -33,11 +33,11 @@ class Notifications {
 				'type' => 'home',
 				'icon' => 'home',
 				'severity' => 'danger',
-				'label' => t('New Home Activity'),
-				'title' => t('New Home Activity Notifications'),
+				'label' => t('Home'),
+				'title' => t('New home activity notifications'),
 				'viewall' => [
 					'url' => 'channel/' . $channel['channel_address'],
-					'label' => t('View your home activity')
+					'label' => t('Home stream')
 				],
 				'markall' => [
 					'label' => t('Mark all notifications seen')
@@ -52,11 +52,11 @@ class Notifications {
 				'type' => 'dm',
 				'icon' => 'envelope',
 				'severity' => 'danger',
-				'label' => t('New Direct Messages'),
-				'title' => t('New Direct Messages Notifications'),
+				'label' => t('Direct Messages'),
+				'title' => t('New direct messages notifications'),
 				'viewall' => [
 					'url' => 'network/?dm=1',
-					'label' => t('View your direct messages')
+					'label' => t('Direct messages stream')
 				],
 				'markall' => [
 					'label' => t('Mark all notifications read')
@@ -68,26 +68,11 @@ class Notifications {
 			];
 
 			$notifications[] = [
-				'type' => 'mail',
-				'icon' => 'envelope',
-				'severity' => 'danger',
-				'label' => t('New Mails'),
-				'title' => t('New Mails Notifications'),
-				'viewall' => [
-					'url' => 'mail/combined',
-					'label' => t('View your private mails')
-				],
-				'markall' => [
-					'label' => t('Mark all messages seen')
-				]
-			];
-
-			$notifications[] = [
 				'type' => 'all_events',
 				'icon' => 'calendar',
 				'severity' => 'secondary',
-				'label' => t('New Events'),
-				'title' => t('New Events Notifications'),
+				'label' => t('Events'),
+				'title' => t('New events notifications'),
 				'viewall' => [
 					'url' => 'cdav/calendar',
 					'label' => t('View events')
@@ -102,7 +87,7 @@ class Notifications {
 				'icon' => 'users',
 				'severity' => 'danger',
 				'label' => t('New Connections'),
-				'title' => t('New Connections Notifications'),
+				'title' => t('New connections notifications'),
 				'viewall' => [
 					'url' => 'connections',
 					'label' => t('View all connections')
@@ -113,8 +98,8 @@ class Notifications {
 				'type' => 'files',
 				'icon' => 'folder',
 				'severity' => 'danger',
-				'label' => t('New Files'),
-				'title' => t('New Files Notifications'),
+				'label' => t('Files'),
+				'title' => t('New files notifications'),
 			];
 
 			$notifications[] = [
@@ -149,8 +134,8 @@ class Notifications {
 				'type' => 'register',
 				'icon' => 'user-o',
 				'severity' => 'danger',
-				'label' => t('New Registrations'),
-				'title' => t('New Registrations Notifications'),
+				'label' => t('Registrations'),
+				'title' => t('New registrations notifications'),
 			];
 		}
 
@@ -160,10 +145,10 @@ class Notifications {
 				'icon' => 'globe',
 				'severity' => 'secondary',
 				'label' => t('Public Stream'),
-				'title' => t('Public Stream Notifications'),
+				'title' => t('New public stream notifications'),
 				'viewall' => [
 					'url' => 'pubstream',
-					'label' => t('View the public stream')
+					'label' => t('Public stream')
 				],
 				'markall' => [
 					'label' => t('Mark all notifications seen')
@@ -176,15 +161,13 @@ class Notifications {
 		}
 
 		$o = replace_macros(get_markup_template('notifications_widget.tpl'), [
-			'$module' => \App::$module,
 			'$notifications' => $notifications,
 			'$no_notifications' => t('Sorry, you have got no notifications at the moment'),
 			'$loading' => t('Loading'),
-			'$startpage' => ($channel ? $channel['channel_startpage'] : '')
 		]);
 
 		return $o;
 
 	}
 }
- 
+
diff --git a/Zotlabs/Zot/Auth.php b/Zotlabs/Zot/Auth.php
deleted file mode 100644
index 6ce2174f7..000000000
--- a/Zotlabs/Zot/Auth.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot;
-
-use Zotlabs\Lib\Crypto;
-
-class Auth {
-
-	protected $test;
-	protected $test_results;
-	protected $debug_msg;
-
-	protected $address;
-	protected $desturl;
-	protected $sec;
-	protected $version;
-	protected $delegate;
-	protected $success;
-	protected $delegate_success;
-
-	protected $remote;
-	protected $remote_service_class;
-	protected $remote_level;
-	protected $remote_hub;
-	protected $dnt;
-
-	function __construct($req) {
-
-
-		$this->test         = ((array_key_exists('test',$req)) ? intval($req['test']) : 0);
-		$this->test_results = array('success' => false);
-		$this->debug_msg    = '';
-
-		$this->success   = false;
-		$this->address   = $req['auth'];
-		$this->desturl   = $req['dest'];
-		$this->sec       = $req['sec'];
-		$this->version   = $req['version'];
-		$this->delegate  = $req['delegate'];
-
-		$c = get_sys_channel();
-		if(! $c) {
-			logger('unable to obtain response (sys) channel');
-			$this->Debug('no local channels found.');
-			$this->Finalise();
-		}
-
-		if(strpbrk($this->sec,'.:')) {
-			logger('illegal security context');
-			$this->Debug('illegal security context.');
-			$this->Finalise();
-		}
-
-		$x = $this->GetHublocs($this->address);
-
-		if($x) {
-			foreach($x as $xx) {
-				if($this->Verify($c,$xx))
-					break;
-			}
-		}
-
-		/**
-		 * @FIXME we really want to save the return_url in the session before we
-		 * visit rmagic. This does however prevent a recursion if you visit
-		 * rmagic directly, as it would otherwise send you back here again.
-		 * But z_root() probably isn't where you really want to go.
-		 */
-
-		if(strstr($this->desturl,z_root() . '/rmagic'))
-			goaway(z_root());
-
-		$this->Finalise();
-
-	}
-
-	function GetHublocs($address) {
-
-		// Try and find a hubloc for the person attempting to auth.
-		// Since we're matching by address, we have to return all entries
-		// some of which may be from re-installed hubs; and we'll need to
-		// try each sequentially to see if one can pass the test
-
-		$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash 
-			where hubloc_addr = '%s' order by hubloc_id desc",
-			dbesc($address)
-		);
-
-		if(! $x) {
-			// finger them if they can't be found.
-			$j = Finger::run($address, null);
-			if ($j['success']) {
-				import_xchan($j);
-				$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash 
-					where hubloc_addr = '%s' order by hubloc_id desc",
-					dbesc($address)
-				);
-			}
-		}
-		if(! $x) {
-			logger('mod_zot: auth: unable to finger ' . $address);
-			$this->Debug('no hubloc found for ' . $address . ' and probing failed.');
-			$this->Finalise();
-		}
-
-		return $x;
-	}
-
-
-	function Verify($channel,$hubloc) {
-
-		logger('auth request received from ' . $hubloc['hubloc_addr'] );
-
-		$this->remote               = remote_channel();
-		$this->remote_service_class = '';
-		$this->remote_level         = 0;
-		$this->remote_hub           = $hubloc['hubloc_url'];
-		$this->dnt                  = 0;
-
-		if(! $this->sec) {
-			logger('missing security context.');
-			if($this->test)
-				$this->Debug('missing security context.');
-			return false;
-		}
-
-
-		// check credentials and access
-
-		// If they are already authenticated and haven't changed credentials,
-		// we can save an expensive network round trip and improve performance.
-
-		// Also check that they are coming from the same site as they authenticated with originally.
-
-		$already_authed = (((remote_channel()) && ($hubloc['hubloc_hash'] == remote_channel())
-			&& ($hubloc['hubloc_url'] === $_SESSION['remote_hub'])) ? true : false);
-
-		if($this->delegate && $this->delegate !== $_SESSION['delegate_channel'])
-			$already_authed = false;
-
-		if($already_authed)
-			return true;
-
-		if(local_channel()) {
-
-			// tell them to logout if they're logged in locally as anything but the target remote account
-			// in which case just shut up because they don't need to be doing this at all.
-
-			if (\App::$channel['channel_hash'] == $hubloc['xchan_hash']) {
-				return true;
-			}
-			else {
-				logger('already authenticated locally as somebody else.');
-				notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL);
-				if($this->test) {
-					$this->Debug('already logged in locally with a conflicting identity.');
-					return false;
-				}
-			}
-			return false;
-		}
-
-		// Auth packets MUST use ultra top-secret hush-hush mode - e.g. the entire packet is encrypted using the
-		// site private key
-		// The actual channel sending the packet ($c[0]) is not important, but this provides a
-		// generic zot packet with a sender which can be verified
-
-		$x = q("select site_crypto from site where site_url = '%s' limit 1",
-			dbesc($hubloc['hubloc_url'])
-		);
-
-		$p = zot_build_packet($channel,$type = 'auth_check',
-			array(array('guid' => $hubloc['hubloc_guid'],'guid_sig' => $hubloc['hubloc_guid_sig'])),
-			$hubloc['hubloc_sitekey'], (($x) ? $x[0]['site_crypto'] : ''), $this->sec);
-
-		$this->Debug('auth check packet created using sitekey ' . $hubloc['hubloc_sitekey']);
-		$this->Debug('packet contents: ' . $p);
-
-		$result = zot_zot($hubloc['hubloc_callback'],$p);
-		if(! $result['success']) {
-			logger('auth_check callback failed.');
-			if($this->test)
-				$this->Debug('auth check request to your site returned .' . print_r($result, true));
-			return false;
-		}
-
-		$j = json_decode($result['body'], true);
-		if(! $j) {
-			logger('auth_check json data malformed.');
-			if($this->test)
-				$this->Debug('json malformed: ' . $result['body']);
-			return false;
-		}
-
-		$this->Debug('auth check request returned ' . print_r($j, true));
-
-		if(! $j['success'])
-			return false;
-
-		// legit response, but we do need to check that this wasn't answered by a man-in-middle
-
-		if (! Crypto::verify($this->sec . $hubloc['xchan_hash'],base64url_decode($j['confirm']),$hubloc['xchan_pubkey'])) {
-			logger('final confirmation failed.');
-			if($this->test)
-				$this->Debug('final confirmation failed. ' . $sec . print_r($j,true) . print_r($hubloc,true));
-			return false;
-		}
-
-		if (array_key_exists('service_class',$j))
-			$this->remote_service_class = $j['service_class'];
-		if (array_key_exists('level',$j))
-			$this->remote_level = $j['level'];
-		if (array_key_exists('DNT',$j))
-			$this->dnt = $j['DNT'];
-
-
-		// log them in
-
-		if ($this->test) {
-			// testing only - return the success result
-			$this->test_results['success'] = true;
-			$this->Debug('Authentication Success!');
-			$this->Finalise();
-		}
-
-		$_SESSION['authenticated'] = 1;
-
-		// check for delegation and if all is well, log them in locally with delegation restrictions
-
-		$this->delegate_success = false;
-
-		if($this->delegate) {
-			$r = q("select * from channel left join xchan on channel_hash = xchan_hash where xchan_addr = '%s' limit 1",
-				dbesc($this->delegate)
-			);
-			if ($r && intval($r[0]['channel_id'])) {
-				$allowed = perm_is_allowed($r[0]['channel_id'],$hubloc['xchan_hash'],'delegate');
-				if($allowed) {
-					$_SESSION['delegate_channel'] = $r[0]['channel_id'];
-					$_SESSION['delegate'] = $hubloc['xchan_hash'];
-					$_SESSION['account_id'] = intval($r[0]['channel_account_id']);
-					require_once('include/security.php');
-					// this will set the local_channel authentication in the session
-					change_channel($r[0]['channel_id']);
-					$this->delegate_success = true;
-				}
-			}
-		}
-
-		if (! $this->delegate_success) {
-			// normal visitor (remote_channel) login session credentials
-			$_SESSION['visitor_id'] = $hubloc['xchan_hash'];
-			$_SESSION['my_url'] = $hubloc['xchan_url'];
-			$_SESSION['my_address'] = $this->address;
-			$_SESSION['remote_service_class'] = $this->remote_service_class;
-			$_SESSION['remote_level'] = $this->remote_level;
-			$_SESSION['remote_hub'] = $this->remote_hub;
-			$_SESSION['DNT'] = $this->dnt;
-		}
-
-		$arr = array('xchan' => $hubloc, 'url' => $this->desturl, 'session' => $_SESSION);
-		call_hooks('magic_auth_success',$arr);
-		\App::set_observer($hubloc);
-		require_once('include/security.php');
-		\App::set_groups(init_groups_visitor($_SESSION['visitor_id']));
-		info(sprintf( t('Welcome %s. Remote authentication successful.'),$hubloc['xchan_name']));
-		logger('mod_zot: auth success from ' . $hubloc['xchan_addr']);
-		$this->success = true;
-		return true;
-	}
-
-	function Debug($msg) {
-		$this->debug_msg .= $msg . EOL;
-	}
-
-
-	function Finalise() {
-
-		if($this->test) {
-			$this->test_results['message'] = $this->debug_msg;
-			json_return_and_die($this->test_results);
-		}
-
-		goaway($this->desturl);
-	}
-
-}
-
-
-/**
- *
- * Magic Auth
- * ==========
- *
- * So-called "magic auth" takes place by a special exchange. On the site where the "channel to be authenticated" lives (e.g. $mysite),
- * a redirection is made via $mysite/magic to the zot endpoint of the remote site ($remotesite) with special GET parameters.
- *
- * The endpoint is typically  https://$remotesite/post - or whatever was specified as the callback url in prior communications
- * (we will bootstrap an address and fetch a zot info packet if possible where no prior communications exist)
- *
- * Five GET parameters are supplied:
- * * auth => the urlencoded webbie (channel@host.domain) of the channel requesting access
- * * dest => the desired destination URL (urlencoded)
- * * sec  => a random string which is also stored on $mysite for use during the verification phase.
- * * version => the zot revision
- * * delegate => optional urlencoded webbie of a local channel to invoke delegation rights for
- *
- * * test => (optional 1 or 0 - debugs the authentication exchange and returns a json response instead of redirecting the browser session)
- *
- * When this packet is received, an "auth-check" zot message is sent to $mysite.
- * (e.g. if $_GET['auth'] is foobar@podunk.edu, a zot packet is sent to the podunk.edu zot endpoint, which is typically /post)
- * If no information has been recorded about the requesting identity a zot information packet will be retrieved before
- * continuing.
- *
- * The sender of this packet is an arbitrary/random site channel. The recipients will be a single recipient corresponding
- * to the guid and guid_sig we have associated with the requesting auth identity
- *
- * \code{.json}
- * {
- *   "type":"auth_check",
- *   "sender":{
- *     "guid":"kgVFf_...",
- *     "guid_sig":"PT9-TApz...",
- *     "url":"http:\/\/podunk.edu",
- *     "url_sig":"T8Bp7j...",
- *     "sitekey":"aMtgKTiirXrICP..."
- *   },
- *   "recipients":{
- *     {
- *       "guid":"ZHSqb...",
- *       "guid_sig":"JsAAXi..."
- *     }
- *   }
- *   "callback":"\/post",
- *   "version":1,
- *   "secret":"1eaa661",
- *   "secret_sig":"eKV968b1..."
- * }
- * \endcode
- *
- * auth_check messages MUST use encapsulated encryption. This message is sent to the origination site, which checks the 'secret' to see
- * if it is the same as the 'sec' which it passed originally. It also checks the secret_sig which is the secret signed by the
- * destination channel's private key and base64url encoded. If everything checks out, a json packet is returned:
- *
- * \code{.json}
- * {
- *   "success":1,
- *   "confirm":"q0Ysovd1u...",
- *   "service_class":(optional)
- *   "level":(optional)
- *   "DNT": (optional do-not-track - 1 or 0)
- * }
- * \endcode
- *
- * 'confirm' in this case is the base64url encoded RSA signature of the concatenation of 'secret' with the
- * base64url encoded whirlpool hash of the requestor's guid and guid_sig; signed with the source channel private key.
- * This prevents a man-in-the-middle from inserting a rogue success packet. Upon receipt and successful
- * verification of this packet, the destination site will redirect to the original destination URL and indicate a successful remote login.
- * Service_class can be used by cooperating sites to provide different access rights based on account rights and subscription plans. It is
- * a string whose contents are not defined by protocol. Example: "basic" or "gold".
- *
- * @param[in,out] \App &$a
- */
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
deleted file mode 100644
index cadde5415..000000000
--- a/Zotlabs/Zot/Finger.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot;
-
-use Zotlabs\Lib\Crypto;
-use Zotlabs\Web\HTTPSig;
-
-/**
- * @brief Finger
- *
- */
-class Finger {
-
-	static private $token;
-
-	/**
-	 * @brief Look up information about channel.
-	 *
-	 * @param string $webbie
-	 *   does not have to be host qualified e.g. 'foo' is treated as 'foo\@thishub'
-	 * @param array $channel
-	 *   (optional), if supplied permissions will be enumerated specifically for $channel
-	 * @param boolean $autofallback
-	 *   fallback/failover to http if https connection cannot be established. Default is true.
-	 *
-	 * @return zotinfo array (with 'success' => true) or array('success' => false);
-	 */
-
-	static public function run($webbie, $channel = null, $autofallback = true) {
-
-		$ret = array('success' => false);
-
-		self::$token = random_string();
-
-		if (strpos($webbie, '@') === false) {
-			$address = $webbie;
-			$host = \App::get_hostname();
-		} else {
-			$address = substr($webbie,0,strpos($webbie,'@'));
-			$host = substr($webbie,strpos($webbie,'@')+1);
-			if(strpos($host,'/'))
-				$host = substr($host,0,strpos($host,'/'));
-		}
-
-		$xchan_addr = $address . '@' . $host;
-
-		if ((! $address) || (! $xchan_addr)) {
-			logger('zot_finger: no address :' . $webbie);
-
-			return $ret;
-		}
-
-		logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA, LOG_DEBUG);
-
-		// potential issue here; the xchan_addr points to the primary hub.
-		// The webbie we were called with may not, so it might not be found
-		// unless we query for hubloc_addr instead of xchan_addr
-
-		$r = q("select xchan.*, hubloc.* from xchan
-			left join hubloc on xchan_hash = hubloc_hash
-			where xchan_addr = '%s' and hubloc_primary = 1 and hubloc_deleted = 0 and hubloc_network = 'zot' limit 1",
-			dbesc($xchan_addr)
-		);
-
-		if($r) {
-			$url = $r[0]['hubloc_url'];
-
-			if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
-				logger('zot_finger: alternate network: ' . $webbie);
-				logger('url: ' . $url . ', net: ' . var_export($r[0]['hubloc_network'],true), LOGGER_DATA, LOG_DEBUG);
-				return $ret;
-			}
-		} else {
-			$url = 'https://' . $host;
-		}
-
-		$m = parse_url($url);
-		if($m) {
-			$parsed_host = strtolower($m['host']);
-		}
-
-		$rhs = '/.well-known/zot-info';
-		$https = ((strpos($url,'https://') === 0) ? true : false);
-
-		logger('zot_finger: ' . $address . ' at ' . $url, LOGGER_DEBUG);
-
-		if ($channel) {
-			$postvars = array(
-				'address'    => $address,
-				'target'     => $channel['channel_guid'],
-				'target_sig' => $channel['channel_guid_sig'],
-				'key'        => $channel['channel_pubkey'],
-				'token'      => self::$token
-			);
-
-			$headers = [];
-			$headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname();
-			$headers['X-Zot-Nonce']   = random_string();
-			$headers['Host']          = $parsed_host;
-
-			$xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel));
-
-			$retries = 0;
-
-			$result = z_post_url($url . $rhs,$postvars,$retries, [ 'headers' => $xhead ]);
-
-			if ((! $result['success']) && ($autofallback)) {
-				if ($https) {
-					logger('zot_finger: https failed. falling back to http');
-					$result = z_post_url('http://' . $host . $rhs,$postvars, $retries, [ 'headers' => $xhead ]);
-				}
-			}
-		}
-		else {
-			$rhs .= '?f=&address=' . urlencode($address) . '&token=' . self::$token;
-
-			$result = z_fetch_url($url . $rhs);
-			if((! $result['success']) && ($autofallback)) {
-				if($https) {
-					logger('zot_finger: https failed. falling back to http');
-					$result = z_fetch_url('http://' . $host . $rhs);
-				}
-			}
-		}
-
-		if(! $result['success']) {
-			logger('zot_finger: no results');
-
-			return $ret;
-		}
-
-		$x = json_decode($result['body'], true);
-
-		$verify = HTTPSig::verify($result,(($x) ? $x['key'] : ''));
-
-		if($x && (! $verify['header_valid'])) {
-			$signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null);
-			if($signed_token) {
-				$valid = Crypto::verify('token.' . self::$token, base64url_decode($signed_token), $x['key']);
-				if(! $valid) {
-					logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR);
-
-					return $ret;
-				}
-			}
-			else {
-				logger('No signed token from '  . $url . $rhs, LOGGER_NORMAL, LOG_WARNING);
-				return $ret;
-			}
-		}
-
-		return $x;
-	}
-
-}
diff --git a/Zotlabs/Zot/IHandler.php b/Zotlabs/Zot/IHandler.php
deleted file mode 100644
index dd82f5be6..000000000
--- a/Zotlabs/Zot/IHandler.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot;
-
-interface IHandler {
-
-	function Ping();
-
-	function Pickup($data);
-
-	function Notify($data);
-
-	function Request($data);
-
-	function Rekey($sender,$data);
-
-	function AuthCheck($data,$encrypted);
-
-	function Purge($sender,$recipients);
-
-	function Refresh($sender,$recipients);
-
-}
-
diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
deleted file mode 100644
index f0378b650..000000000
--- a/Zotlabs/Zot/Receiver.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot;
-
-use Zotlabs\Lib\Crypto;
-
-class Receiver {
-
-	protected $data;
-	protected $encrypted;
-	protected $error;
-	protected $messagetype;
-	protected $sender;
-	protected $validated;
-	protected $recipients;
-	protected $response;
-	protected $handler;
-
-	function __construct($data,$prvkey,$handler) {
-
-		$this->error       = false;
-		$this->validated   = false;
-		$this->messagetype = '';
-		$this->response    = array('success' => false);
-
-		$this->handler = $handler;
-
-		if(! is_array($data))
-			$data = json_decode($data,true);
-
-		if($data && is_array($data)) {
-			$this->encrypted = ((array_key_exists('iv',$data)) ? true : false);
-
-			if($this->encrypted) {
-				$data['encrypted'] = true;
-				$this->data = @json_decode(@Crypto::unencapsulate($data,$prvkey),true);
-			}
-			if(! $this->data)
-				$this->data = $data;
-
-			if($this->data && is_array($this->data) && array_key_exists('type',$this->data))
-				$this->messagetype = $this->data['type'];
-		}
-		if(! $this->messagetype)
-			$this->error = true;
-
-		if($this->data) {
-			$this->sender     = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null);
-			$this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null);
-		}
-
-		if($this->sender)
-			$this->ValidateSender();
-
-		$this->Dispatch();
-	}
-
-	function ValidateSender() {
-		$hubs = zot_gethub($this->sender,true);
-		if (! $hubs) {
-
-			/* Have never seen this guid or this guid coming from this location. Check it and register it. */
-			/* (!!) this will validate the sender. */
-
-        	$result = zot_register_hub($this->sender);
-
-        	if ((! $result['success']) || (! ($hubs = zot_gethub($this->sender,true)))) {
-            	$this->response['message'] = 'Hub not available.';
-	            json_return_and_die($this->response);
-    	    }
-		}
-		foreach($hubs as $hub) {
-			update_hub_connected($hub,((array_key_exists('sitekey',$this->sender)) ? $this->sender['sitekey'] : ''));
-		}
-		$this->validated = true;
-    }
-
-
-	function Dispatch() {
-
-		/* Handle tasks which don't require sender validation */
-
-		switch($this->messagetype) {
-			case 'ping':
-				/* no validation needed */
-				$this->handler->Ping();
-				break;
-			case 'pickup':
-				/* perform site validation, as opposed to sender validation */
-				$this->handler->Pickup($this->data);
-				break;
-
-			default:
-				if(! $this->validated) {
-					$this->response['message'] = 'Sender not valid';
-					json_return_and_die($this->response);
-				}
-				break;
-		}
-
-		/* Now handle tasks which require sender validation */
-
-		switch($this->messagetype) {
-
-			case 'auth_check':
-				$this->handler->AuthCheck($this->data,$this->encrypted);
-				break;
-
-			case 'request':
-				$this->handler->Request($this->data);
-				break;
-
-			case 'purge':
-				$this->handler->Purge($this->sender,$this->recipients);
-				break;
-
-			case 'refresh':
-			case 'force_refresh':
-				$this->handler->Refresh($this->sender,$this->recipients);
-				break;
-
-			case 'notify':
-				$this->handler->Notify($this->data);
-				break;
-
-			case 'rekey':
-				$this->handler->Rekey($this->sender, $this->data);
-				break;
-
-			default:
-				$this->response['message'] = 'Not implemented';
-				json_return_and_die($this->response);
-				break;
-		}
-
-	}
-}
-
-
-
-/**
- * @brief zot communications and messaging.
- *
- * Sender HTTP posts to this endpoint ($site/post typically) with 'data' parameter set to json zot message packet.
- * This packet is optionally encrypted, which we will discover if the json has an 'iv' element.
- * $contents => array( 'alg' => 'aes256cbc', 'iv' => initialisation vector, 'key' => decryption key, 'data' => encrypted data);
- * $contents->iv and $contents->key are random strings encrypted with this site's RSA public key and then base64url encoded.
- *
- * Once decrypted, one will find the normal json_encoded zot message packet.
- *
- * Defined packet types are: notify, purge, refresh, force_refresh, auth_check, ping, and pickup
- *
- * Standard packet: (used by notify, purge, refresh, force_refresh, and auth_check)
- * \code{.json}
- * {
- *   "type": "notify",
- *   "sender":{
- *     "guid":"kgVFf_1...",
- *     "guid_sig":"PT9-TApzp...",
- *     "url":"http:\/\/podunk.edu",
- *     "url_sig":"T8Bp7j5...",
- *   },
- *   "recipients": { optional recipient array },
- *   "callback":"\/post",
- *   "version":"1.2",
- *   "encryption":["aes256cbc"],
- *   "secret":"1eaa...",
- *   "secret_sig": "df89025470fac8..."
- * }
- * \endcode
- *
- * Signature fields are all signed with the sender channel private key and base64url encoded.
- * Recipients are arrays of guid and guid_sig, which were previously signed with the recipients private
- * key and base64url encoded and later obtained via channel discovery. Absence of recipients indicates
- * a public message or visible to all potential listeners on this site.
- *
- * "pickup" packet:
- * The pickup packet is sent in response to a notify packet from another site
- * \code{.json}
- * {
- *   "type":"pickup",
- *   "url":"http:\/\/example.com",
- *   "callback":"http:\/\/example.com\/post",
- *   "callback_sig":"teE1_fLI...",
- *   "secret":"1eaa...",
- *   "secret_sig":"O7nB4_..."
- * }
- * \endcode
- *
- * In the pickup packet, the sig fields correspond to the respective data
- * element signed with this site's system private key and then base64url encoded.
- * The "secret" is the same as the original secret from the notify packet.
- *
- * If verification is successful, a json structure is returned containing a
- * success indicator and an array of type 'pickup'.
- * Each pickup element contains the original notify request and a message field
- * whose contents are dependent on the message type.
- *
- * This JSON array is AES encapsulated using the site public key of the site
- * that sent the initial zot pickup packet.
- * Using the above example, this would be example.com.
- *
- * \code{.json}
- * {
- *   "success":1,
- *   "pickup":{
- *     "notify":{
- *       "type":"notify",
- *       "sender":{
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TApz...",
- *         "url":"http:\/\/z.podunk.edu",
- *         "url_sig":"T8Bp7j5D..."
- *       },
- *       "callback":"\/post",
- *       "version":1,
- *       "secret":"1eaa661..."
- *     },
- *     "message":{
- *       "type":"activity",
- *       "message_id":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "message_top":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "message_parent":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu",
- *       "created":"2012-11-20 04:04:16",
- *       "edited":"2012-11-20 04:04:16",
- *       "title":"",
- *       "body":"Hi Nickordo",
- *       "app":"",
- *       "verb":"post",
- *       "object_type":"",
- *       "target_type":"",
- *       "permalink":"",
- *       "location":"",
- *       "longlat":"",
- *       "owner":{
- *         "name":"Indigo",
- *         "address":"indigo@podunk.edu",
- *         "url":"http:\/\/podunk.edu",
- *         "photo":{
- *           "mimetype":"image\/jpeg",
- *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
- *         },
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TAp...",
- *       },
- *       "author":{
- *         "name":"Indigo",
- *         "address":"indigo@podunk.edu",
- *         "url":"http:\/\/podunk.edu",
- *         "photo":{
- *           "mimetype":"image\/jpeg",
- *           "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5"
- *         },
- *         "guid":"kgVFf_...",
- *         "guid_sig":"PT9-TAp..."
- *       }
- *     }
- *   }
- * }
- * \endcode
- *
- * Currently defined message types are 'activity', 'mail', 'profile', 'location'
- * and 'channel_sync', which each have different content schemas.
- *
- * Ping packet:
- * A ping packet does not require any parameters except the type. It may or may
- * not be encrypted.
- *
- * \code{.json}
- * {
- *   "type": "ping"
- * }
- * \endcode
- *
- * On receipt of a ping packet a ping response will be returned:
- *
- * \code{.json}
- * {
- *   "success" : 1,
- *   "site" {
- *     "url": "http:\/\/podunk.edu",
- *     "url_sig": "T8Bp7j5...",
- *     "sitekey": "-----BEGIN PUBLIC KEY-----
- *                 MIICIjANBgkqhkiG9w0BAQE..."
- *   }
- * }
- * \endcode
- *
- * The ping packet can be used to verify that a site has not been re-installed, and to
- * initiate corrective action if it has. The url_sig is signed with the site private key
- * and base64url encoded - and this should verify with the enclosed sitekey. Failure to
- * verify indicates the site is corrupt or otherwise unable to communicate using zot.
- * This return packet is not otherwise verified, so should be compared with other
- * results obtained from this site which were verified prior to taking action. For instance
- * if you have one verified result with this signature and key, and other records for this
- * url which have different signatures and keys, it indicates that the site was re-installed
- * and corrective action may commence (remove or mark invalid any entries with different
- * signatures).
- * If you have no records which match this url_sig and key - no corrective action should
- * be taken as this packet may have been returned by an imposter.
- *
- * @param[in,out] App &$a
- */
-
diff --git a/Zotlabs/Zot/ZotHandler.php b/Zotlabs/Zot/ZotHandler.php
deleted file mode 100644
index ab8815b3d..000000000
--- a/Zotlabs/Zot/ZotHandler.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot;
-
-class ZotHandler implements IHandler {
-
-	function Ping() {
-		zot_reply_ping();
-	}
-
-	function Pickup($data) {
-		zot_reply_pickup($data);
-	}
-
-	function Notify($data) {
-		zot_reply_notify($data);
-	}
-
-	function Request($data) {
-		zot_reply_message_request($data);
-	}
-
-	function Rekey($sender,$data) {
-		zot_rekey_request($sender,$data);
-	}
-
-	function AuthCheck($data,$encrypted) {
-		zot_reply_auth_check($data,$encrypted);
-	}
-
-	function Purge($sender,$recipients) {
-		zot_reply_purge($sender,$recipients);
-	}
-
-	function Refresh($sender,$recipients) {
-		zot_reply_refresh($sender,$recipients);
-	}
-
-}
diff --git a/Zotlabs/Zot6/Finger.php b/Zotlabs/Zot6/Finger.php
deleted file mode 100644
index cec3f98ab..000000000
--- a/Zotlabs/Zot6/Finger.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-namespace Zotlabs\Zot6;
-
-/**
- * @brief Finger
- *
- */
-class Finger {
-
-	static private $token;
-
-	/**
-	 * @brief Look up information about channel.
-	 *
-	 * @param string $webbie
-	 *   does not have to be host qualified e.g. 'foo' is treated as 'foo\@thishub'
-	 * @param array $channel
-	 *   (optional), if supplied permissions will be enumerated specifically for $channel
-	 * @param boolean $autofallback
-	 *   fallback/failover to http if https connection cannot be established. Default is true.
-	 *
-	 * @return zotinfo array (with 'success' => true) or array('success' => false);
-	 */
-
-	static public function run($webbie, $channel = null, $autofallback = true) {
-
-		$ret = array('success' => false);
-
-		self::$token = random_string();
-
-		if (strpos($webbie, '@') === false) {
-			$address = $webbie;
-			$host = \App::get_hostname();
-		} else {
-			$address = substr($webbie,0,strpos($webbie,'@'));
-			$host = substr($webbie,strpos($webbie,'@')+1);
-			if(strpos($host,'/'))
-				$host = substr($host,0,strpos($host,'/'));
-		}
-
-		$xchan_addr = $address . '@' . $host;
-
-		if ((! $address) || (! $xchan_addr)) {
-			logger('zot_finger: no address :' . $webbie);
-
-			return $ret;
-		}
-
-		logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA, LOG_DEBUG);
-
-		// potential issue here; the xchan_addr points to the primary hub.
-		// The webbie we were called with may not, so it might not be found
-		// unless we query for hubloc_addr instead of xchan_addr
-
-		$r = q("select xchan.*, hubloc.* from xchan
-			left join hubloc on xchan_hash = hubloc_hash
-			where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
-			dbesc($xchan_addr)
-		);
-
-		if($r) {
-			$url = $r[0]['hubloc_url'];
-
-			if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
-				logger('zot_finger: alternate network: ' . $webbie);
-				logger('url: ' . $url . ', net: ' . var_export($r[0]['hubloc_network'],true), LOGGER_DATA, LOG_DEBUG);
-				return $ret;
-			}
-		} else {
-			$url = 'https://' . $host;
-		}
-
-		$rhs = '/.well-known/zot-info';
-		$https = ((strpos($url,'https://') === 0) ? true : false);
-
-		logger('zot_finger: ' . $address . ' at ' . $url, LOGGER_DEBUG);
-
-		if ($channel) {
-			$postvars = array(
-				'address'    => $address,
-				'target'     => $channel['channel_guid'],
-				'target_sig' => $channel['channel_guid_sig'],
-				'key'        => $channel['channel_pubkey'],
-				'token'      => self::$token
-			);
-
-			$headers = [];
-			$headers['X-Zot-Channel'] = $channel['channel_address'] . '@' . \App::get_hostname();
-			$headers['X-Zot-Nonce']   = random_string();
-			$xhead = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel));
-
-			$retries = 0;
-
-			$result = z_post_url($url . $rhs,$postvars,$retries, [ 'headers' => $xhead ]);
-
-			if ((! $result['success']) && ($autofallback)) {
-				if ($https) {
-					logger('zot_finger: https failed. falling back to http');
-					$result = z_post_url('http://' . $host . $rhs,$postvars, $retries, [ 'headers' => $xhead ]);
-				}
-			}
-		}
-		else {
-			$rhs .= '?f=&address=' . urlencode($address) . '&token=' . self::$token;
-
-			$result = z_fetch_url($url . $rhs);
-			if((! $result['success']) && ($autofallback)) {
-				if($https) {
-					logger('zot_finger: https failed. falling back to http');
-					$result = z_fetch_url('http://' . $host . $rhs);
-				}
-			}
-		}
-
-		if(! $result['success']) {
-			logger('zot_finger: no results');
-
-			return $ret;
-		}
-
-		$x = json_decode($result['body'], true);
-
-		$verify = HTTPSig::verify($result,(($x) ? $x['key'] : ''));
-
-		if($x && (! $verify['header_valid'])) {
-			$signed_token = ((is_array($x) && array_key_exists('signed_token', $x)) ? $x['signed_token'] : null);
-			if($signed_token) {
-				$valid = zot_verify('token.' . self::$token, base64url_decode($signed_token), $x['key']);
-				if(! $valid) {
-					logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR);
-
-					return $ret;
-				}
-			}
-			else {
-				logger('No signed token from '  . $url . $rhs, LOGGER_NORMAL, LOG_WARNING);
-				return $ret;
-			}
-		}
-
-		return $x;
-	}
-
-}
diff --git a/Zotlabs/Zot6/IHandler.php b/Zotlabs/Zot6/IHandler.php
index 53b6caa89..4e7738926 100644
--- a/Zotlabs/Zot6/IHandler.php
+++ b/Zotlabs/Zot6/IHandler.php
@@ -4,15 +4,13 @@ namespace Zotlabs\Zot6;
 
 interface IHandler {
 
-	function Notify($data,$hub);
+	function Notify($data, $hub);
 
-	function Request($data,$hub);
+	function Rekey($sender, $data, $hub);
 
-	function Rekey($sender,$data,$hub);
+	function Refresh($sender, $recipients, $hub, $force);
 
-	function Refresh($sender,$recipients,$hub);
-
-	function Purge($sender,$recipients,$hub);
+	function Purge($sender, $recipients, $hub);
 
 }
 
diff --git a/Zotlabs/Zot6/Receiver.php b/Zotlabs/Zot6/Receiver.php
index 6440c5da5..964c61651 100644
--- a/Zotlabs/Zot6/Receiver.php
+++ b/Zotlabs/Zot6/Receiver.php
@@ -7,7 +7,6 @@ use Zotlabs\Lib\Crypto;
 use Zotlabs\Lib\Libzot;
 use Zotlabs\Web\HTTPSig;
 
-
 class Receiver {
 
 	protected $data;
@@ -174,21 +173,20 @@ class Receiver {
 	function Dispatch() {
 
 		switch ($this->messagetype) {
-
-			case 'request':
-				$this->response = $this->handler->Request($this->data,$this->hub);
-				break;
-
 			case 'purge':
-				$this->response = $this->handler->Purge($this->sender,$this->recipients,$this->hub);
+				$this->response = $this->handler->Purge($this->sender, $this->recipients, $this->hub);
 				break;
 
 			case 'refresh':
-				$this->response = $this->handler->Refresh($this->sender,$this->recipients,$this->hub);
+				$this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, false);
+				break;
+
+			case 'force_refresh':
+				$this->response = $this->handler->Refresh($this->sender, $this->recipients, $this->hub, true);
 				break;
 
 			case 'rekey':
-				$this->response = $this->handler->Rekey($this->sender, $this->data,$this->hub);
+				$this->response = $this->handler->Rekey($this->sender, $this->data, $this->hub);
 				break;
 
 			case 'activity':
@@ -196,7 +194,7 @@ class Receiver {
 			case 'sync':
 			default:
 				if ($this->sender) {
-					$this->response = $this->handler->Notify($this->data,$this->hub);
+					$this->response = $this->handler->Notify($this->data, $this->hub);
 				}
 				break;
 
diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php
index bd321c4b1..779944bf0 100644
--- a/Zotlabs/Zot6/Zot6Handler.php
+++ b/Zotlabs/Zot6/Zot6Handler.php
@@ -7,24 +7,20 @@ use Zotlabs\Lib\Queue;
 
 class Zot6Handler implements IHandler {
 
-	function Notify($data,$hub) {
-		return self::reply_notify($data,$hub);
+	function Notify($data, $hub) {
+		return self::reply_notify($data, $hub);
 	}
 
-	function Request($data,$hub) {
-		return self::reply_message_request($data,$hub);
+	function Rekey($sender, $data, $hub) {
+		return self::reply_rekey_request($sender, $data, $hub);
 	}
 
-	function Rekey($sender,$data,$hub) {
-		return self::reply_rekey_request($sender,$data,$hub);
+	function Refresh($sender, $recipients, $hub, $force) {
+		return self::reply_refresh($sender, $recipients, $hub, $force);
 	}
 
-	function Refresh($sender,$recipients,$hub) {
-		return self::reply_refresh($sender,$recipients,$hub);
-	}
-
-	function Purge($sender,$recipients,$hub) {
-		return self::reply_purge($sender,$recipients,$hub);
+	function Purge($sender, $recipients, $hub) {
+		return self::reply_purge($sender, $recipients, $hub);
 	}
 
 
@@ -38,7 +34,7 @@ class Zot6Handler implements IHandler {
 
 		logger('notify received from ' . $hub['hubloc_url']);
 
-		$x = Libzot::fetch($data);
+		$x = Libzot::fetch($data, $hub);
 		$ret['delivery_report'] = $x;
 
 
@@ -62,7 +58,7 @@ class Zot6Handler implements IHandler {
 	 *
 	 * @return array
 	 */
-	static function reply_refresh($sender, $recipients, $hub) {
+	static function reply_refresh($sender, $recipients, $hub, $force) {
 		$ret = array('success' => false);
 
 		if($recipients) {
@@ -76,86 +72,19 @@ class Zot6Handler implements IHandler {
 					dbesc($recip)
 				);
 				/// @FIXME $msgtype is undefined
-				$x = Libzot::refresh( [ 'hubloc_id_url' => $hub['hubloc_id_url'] ], $r[0], (($msgtype === 'force_refresh') ? true : false));
+				$x = Libzot::refresh([ 'hubloc_id_url' => $hub['hubloc_id_url']], $r[0], $force);
 			}
 		}
 		else {
 			// system wide refresh
 			/// @FIXME $msgtype is undefined
-			$x = Libzot::refresh( [ 'hubloc_id_url' => $hub['hubloc_id_url'] ], null, (($msgtype === 'force_refresh') ? true : false));
+			$x = Libzot::refresh(['hubloc_id_url' => $hub['hubloc_id_url']], null, $force);
 		}
 
 		$ret['success'] = true;
 		return $ret;
 	}
 
-
-
-	/**
-	 * @brief Process a message request.
-	 *
-	 * If a site receives a comment to a post but finds they have no parent to attach it with, they
-	 * may send a 'request' packet containing the message_id of the missing parent. This is the handler
-	 * for that packet. We will create a message_list array of the entire conversation starting with
-	 * the missing parent and invoke delivery to the sender of the packet.
-	 *
-	 * Zotlabs/Daemon/Deliver.php (for local delivery) and
-	 * mod/post.php???? @fixme (for web delivery) detect the existence of
-	 * this 'message_list' at the destination and split it into individual messages which are
-	 * processed/delivered in order.
-	 *
-	 * @param array $data
-	 * @param array $hub
-	 * @return array
-	 */
-	static function reply_message_request($data, $hub) {
-		$ret = [ 'success' => false ];
-
-		$message_id = EMPTY_STR;
-
-		if(array_key_exists('data',$data))
-		$ptr = $data['data'];
-		if(is_array($ptr) && array_key_exists(0,$ptr)) {
-			$ptr = $ptr[0];
-		}
-		if(is_string($ptr)) {
-			$message_id = $ptr;
-		}
-		if(is_array($ptr) && array_key_exists('id',$ptr)) {
-			$message_id = $ptr['id'];
-		}
-
-		if (! $message_id) {
-			$ret['message'] = 'no message_id';
-			logger('no message_id');
-			return $ret;
-		}
-
-		$sender = $hub['hubloc_hash'];
-
-		/*
-		 * Find the local channel in charge of this post (the first and only recipient of the request packet)
-		 */
-
-		$arr = $data['recipients'][0];
-
-		$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
-			dbesc($arr['portable_id'])
-		);
-		if (! $c) {
-			logger('recipient channel not found.');
-			$ret['message'] .= 'recipient not found.' . EOL;
-			return $ret;
-		}
-
-		/*
-		 * fetch the requested conversation
-		 */
-		$messages = zot_feed($c[0]['channel_id'], $sender, [ 'message_id' => $data['message_id'], 'encoding' => 'activitystreams' ]);
-
-		return (($messages) ? : [] );
-	}
-
 	static function rekey_request($sender,$data,$hub) {
 
 		$ret = array('success' => false);
@@ -174,7 +103,7 @@ class Zot6Handler implements IHandler {
 		$old = null;
 
 		if(Libzot::verify($data['old_guid'],$data['old_guid_sig'],$data['old_key'])) {
-			$oldhash = make_xchan_hash($data['old_guid'],$data['old_key']);
+			$oldhash = Libzot::make_xchan_hash($data['old_guid'],$data['old_key']);
 			$old = q("select * from xchan where xchan_hash = '%s' limit 1",
 				dbesc($oldhash)
 			);
diff --git a/app/hq.apd b/app/hq.apd
new file mode 100644
index 000000000..b9e9f806f
--- /dev/null
+++ b/app/hq.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/hq
+requires: local_channel
+name: HQ
+photo: icon:user-circle-o
+categories: nav_pinned_app
diff --git a/app/lang.apd b/app/lang.apd
index 65495dd5b..1856336ef 100644
--- a/app/lang.apd
+++ b/app/lang.apd
@@ -1,4 +1,4 @@
-version: 2
+version: 5.6
 url: $baseurl/lang
 name: Language
 photo: icon:language
diff --git a/boot.php b/boot.php
index acac02d7a..8bbe092b2 100644
--- a/boot.php
+++ b/boot.php
@@ -50,12 +50,13 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');
 require_once('include/attach.php');
 require_once('include/bbcode.php');
+require_once('include/items.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '5.6.1' );
+define ( 'STD_VERSION',             '6.0RC1' );
 define ( 'ZOT_REVISION',            '6.0' );
 
-define ( 'DB_UPDATE_VERSION',       1245 );
+define ( 'DB_UPDATE_VERSION',       1247 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
@@ -1231,7 +1232,8 @@ class App {
 				'$js_strings'      => js_strings(),
 				'$zid'             => get_my_address(),
 				'$channel_id'      => self::$profile['uid'] ?? 0,
-				'$auto_save_draft' => ((isset(self::$profile['uid']) && feature_enabled(self::$profile['uid'], 'auto_save_draft')) ? "true" : "false")
+				'$auto_save_draft' => ((isset(self::$profile['uid']) && feature_enabled(self::$profile['uid'], 'auto_save_draft')) ? "true" : "false"),
+				'$module'          => App::$module
 			]
 		) . ((isset(self::$page['htmlhead'])) ? self::$page['htmlhead'] : '');
 
@@ -2116,7 +2118,7 @@ function load_contact_links($uid) {
 
 //	logger('load_contact_links');
 
-	$r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d ",
+	$r = q("SELECT abook_id, abook_flags, abook_my_perms, abook_their_perms, xchan_hash, xchan_photo_m, xchan_name, xchan_url, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and xchan_deleted = 0",
 		intval($uid)
 	);
 	if($r) {
diff --git a/composer.json b/composer.json
index f5654858d..4fb336d64 100644
--- a/composer.json
+++ b/composer.json
@@ -37,9 +37,9 @@
         "bshaffer/oauth2-server-php": "^1.9",
         "ezyang/htmlpurifier": "^4.9",
         "simplepie/simplepie": "~1.5",
-        "league/html-to-markdown": "^4.4",
+        "league/html-to-markdown": "^5.0",
         "pear/text_languagedetect": "^1.0",
-        "commerceguys/intl": "~1.0.5",
+        "commerceguys/intl": "~1.1.0",
         "lukasreschke/id3parser": "^0.0.3",
         "smarty/smarty": "~3.1",
         "ramsey/uuid": "^4.1",
diff --git a/composer.lock b/composer.lock
index 8275ea0d5..e0e5cb1bf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bc4a925533b7fe89fd5c8e94075835c6",
+    "content-hash": "1cd80abc165d494582f4ef17e3ca6fdc",
     "packages": [
         {
             "name": "blueimp/jquery-file-upload",
@@ -191,24 +191,24 @@
         },
         {
             "name": "commerceguys/intl",
-            "version": "v1.0.7",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/commerceguys/intl.git",
-                "reference": "0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1"
+                "reference": "90b4f75c4917927a1960c0dcaa002a91ab97f5d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/commerceguys/intl/zipball/0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1",
-                "reference": "0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1",
+                "url": "https://api.github.com/repos/commerceguys/intl/zipball/90b4f75c4917927a1960c0dcaa002a91ab97f5d5",
+                "reference": "90b4f75c4917927a1960c0dcaa002a91ab97f5d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.8"
+                "php": ">=7.1.3"
             },
             "require-dev": {
                 "mikey179/vfsstream": "1.*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^7.5"
             },
             "type": "library",
             "extra": {
@@ -233,9 +233,9 @@
             "description": "Internationalization library powered by CLDR data.",
             "support": {
                 "issues": "https://github.com/commerceguys/intl/issues",
-                "source": "https://github.com/commerceguys/intl/tree/v1.0.7"
+                "source": "https://github.com/commerceguys/intl/tree/v1.1.0"
             },
-            "time": "2020-10-04T20:58:22+00:00"
+            "time": "2021-05-17T08:25:58+00:00"
         },
         {
             "name": "desandro/imagesloaded",
@@ -336,27 +336,30 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "4.10.0",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "0868ae7a552e809e5cd8f93ba022071640408e88"
+                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0868ae7a552e809e5cd8f93ba022071640408e88",
-                "reference": "0868ae7a552e809e5cd8f93ba022071640408e88",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
+                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xml": "*",
-                "php": ">=5.3.3"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "mikehaertl/php-shellcommand": "~1.1.0",
-                "phpunit/phpunit": "^4.8|^5.7",
-                "scrutinizer/ocular": "~1.1"
+                "mikehaertl/php-shellcommand": "^1.1.0",
+                "phpstan/phpstan": "^0.12.82",
+                "phpunit/phpunit": "^8.5 || ^9.2",
+                "scrutinizer/ocular": "^1.6",
+                "unleashedtech/php-coding-standard": "^2.7",
+                "vimeo/psalm": "^4.6"
             },
             "bin": [
                 "bin/html-to-markdown"
@@ -364,7 +367,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.10-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -398,7 +401,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/html-to-markdown/issues",
-                "source": "https://github.com/thephpleague/html-to-markdown/tree/4.10.0"
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.0"
             },
             "funding": [
                 {
@@ -418,7 +421,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2020-07-01T00:34:03+00:00"
+            "time": "2021-03-29T01:29:08+00:00"
         },
         {
             "name": "lukasreschke/id3parser",
@@ -672,16 +675,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -705,7 +708,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -716,9 +719,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "ramsey/collection",
@@ -1411,16 +1414,16 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.38",
+            "version": "v3.1.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "63b3c0aed0f614880cda21a5c08c606e97b489bb"
+                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/63b3c0aed0f614880cda21a5c08c606e97b489bb",
-                "reference": "63b3c0aed0f614880cda21a5c08c606e97b489bb",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
+                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
                 "shasum": ""
             },
             "require": {
@@ -1468,22 +1471,22 @@
                 "forum": "http://www.smarty.net/forums/",
                 "irc": "irc://irc.freenode.org/smarty",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.38"
+                "source": "https://github.com/smarty-php/smarty/tree/v3.1.39"
             },
-            "time": "2021-01-08T14:05:42+00:00"
+            "time": "2021-02-17T21:57:51+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
@@ -1495,7 +1498,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1533,7 +1536,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -1549,7 +1552,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "twbs/bootstrap",
diff --git a/doc/context/pl/register/help.html b/doc/context/pl/register/help.html
new file mode 100644
index 000000000..c5c879e36
--- /dev/null
+++ b/doc/context/pl/register/help.html
@@ -0,0 +1,54 @@
+<dl class="dl-horizontal">
+  <dt>Ogólne</dt>
+  <dd>
+  Na tej stronie odwiedzający mogą zarejestrować się, aby uzyskać dostęp do
+  portalu za pomocą identyfikatora logowania. Zalogowani użytkownicy nie tylko
+  widzą treści publiczne, ale mogą je sami publikować, komunikować się w sieciach
+  społecznościowych i nie tylko.
+  </dd>
+  <dt>Tryby rejestracji</dt>
+  <dd>
+  Rejestracja jest możliwa na adres e-mail lub anonimowo, jeśli regulamin portalu
+  to dopuszcza (wówczas nie wypełniaj pola e-mail). Możliwe, że masz również
+  kod zaproszenia, który trzeba wprowadzić wraz z adresem e-mail. Link nad polem
+  e-mail umożliwia wprowadzenie kodu zaproszenia. Ustaw też swoje hasło logowania.
+  Musisz podać go dwukrotnie. Nie jest ono jawnie wyświetlane w formularzu, więc
+  uważaj przy jego wprowadzaniu.
+  </dd>
+  <dt>Procedura rejestracji</dt>
+  <dd>
+  Aby zalogować się po udanej rejestracji, należy ustawić osobne hasło.
+  Ze względów bezpieczeństwa wprowadź je dwukrotnie z identycznymi wartościami.
+  Zarejestrowani anonimowo użytkownicy otrzymują automatycznie przypisywany identyfikator
+  i nie powinni zapomnieć własnego hasła, ponieważ w przeciwieństwie do rejestracji
+  adresem e-mail początkowo nie ma funkcji resetowania. W zależności od konfiguracji
+  portalu może być wymagana funkcja potwierdzenia. Użytkownicy rejestracji
+  przy użyciu adresu e-mail otrzymają odpowiednią wiadomość. W przypadku rejestracji
+  anonimowych zostanie wyświetlone inne okno dialogowe zawierające identyfikator
+  dostępu i kod PIN. Dane z tej strony powinny być przechowywana bezpiecznie i przez
+  długi czas (np. przez wydruk, zrzut ekranu, zdjęcie), ponieważ dane muszą zostać
+  ponownie potwierdzone w późniejszym czasie.
+  </dd>
+  <dt>Tożsamość cyfrowa</dt>
+  <dd>
+  W zależności od portalu, wyświetlaną nazwę (imię i nazwisko) oraz pseudonim można
+  wprowadzić już podczas rejestracji (alternatywnie również podczas pierwszego logowania).
+  Pseudonim ma bardzo ważne znaczenie i nie można go później zmienić. Jest to unikalna
+  tożsamość cyfrowa (Digital Identity, DID), która jest, będzie i pozostanie powiązana
+  ze wszystkimi naszymi działaniami. Ten DID nadaje się nie tylko do logowania na
+  tym portalu, ale także do wszystkich połączonych portali sieci federacyjnej.
+  W języku sieci federacyjnych ta tożsamość cyfrowa jest "kanałem".
+  Jest to porównywalne z numerem telefonu w sieci telefonicznej. DID ma format
+  kanał@portal.tld = pseudonim@portal.tld i jak wspomniano, nie można go później
+  zmienić. Chociaż format wygląda jak adres e-mail, tak nie jest.
+  </dd>
+  <dt>Nim rozpoczniesz rejestracjÄ™ ...</dt>
+  <dd>
+  ... należy wybrać preferowany język (na przykład polski, angielski, hiszpański,
+  niemiecki) (w prawym górnym rogu menu hamburgera <span class = "fa fa-fw fa-bars"> </span>).
+  Aktualny język jest używany w kolejnych krokach, a także podczas logowania i po
+  zalogowaniu. Można to jednak zmienić w dowolnym momencie i w razie potrzeby.
+  Należy również zauważyć, że ten portal nie jest jedyny. Przegląd innych portali
+  można znaleźć <a href="./pubsites"> tutaj </a>.
+  </dd>
+</dl>
diff --git a/doc/pl/.gitignore b/doc/pl/.gitignore
new file mode 100644
index 000000000..e4d2dfa59
--- /dev/null
+++ b/doc/pl/.gitignore
@@ -0,0 +1,2 @@
+/gdpr.md
+/SiteTOS.md
diff --git a/doc/pl/about/about.bb b/doc/pl/about/about.bb
index 1700d3250..0a5c3620a 100644
--- a/doc/pl/about/about.bb
+++ b/doc/pl/about/about.bb
@@ -174,7 +174,7 @@ Wpisy i komentarze można przeglądać przed wysłaniem i edytować po wysłaniu
 [h4]GÅ‚osowanie i konsensus[/h4]
 Wpisy mogą być przekształcane w elementy "konsensusu", które pozwalają czytelnikom oferować opinie, które są zestawiane w liczniki "zgadzam się", "nie zgadzam się" i "wstrzymuję się". Pozwala to ocenić zainteresowanie pomysłami i tworzyć nieformalne ankiety. 
 
-[h4]Rozszerzaie $Projectname[/h4]
+[h4]Rozszerzanie $Projectname[/h4]
 
 $Projectname może zostać rozszerzona na wiele sposobów, poprzez dostosowanie witryny, personalizację, ustawienia opcji, motywy i dodatki - wtyczki. 
 
diff --git a/doc/pl/about/about_hub.bb b/doc/pl/about/about_hub.bb
index d338a563c..ce9aac5fd 100644
--- a/doc/pl/about/about_hub.bb
+++ b/doc/pl/about/about_hub.bb
@@ -1,6 +1,6 @@
-[h3]Informacja o serwisie[/h3]
-[list][*][url=[baseurl]/siteinfo]Informacja o serwisie[/url]
-[*][url=[baseurl]/siteinfo/json]Informacja o serwisie (format JSON)[/url][/list]
+[h3]Informacja o tym portalu[/h3]
+[list][*][url=[baseurl]/siteinfo]Informacja o portalu[/url]
+[*][url=[baseurl]/siteinfo/json]Informacja o portalu (format JSON)[/url][/list]
 [h3]Regulamin serwisu[/h3]
 [list][*][url=[baseurl]/help/TermsOfService]Warunki świadczenia usług[/url][/list]
 #include doc/pl/SiteTOS.md;
diff --git a/doc/pl/comanche.md b/doc/pl/comanche.md
new file mode 100644
index 000000000..fab2c134d
--- /dev/null
+++ b/doc/pl/comanche.md
@@ -0,0 +1,272 @@
+Język opisu stron internetowych Comanche
+========================================
+
+Comanche to język znaczników podobny do bbcode, za pomocą którego można tworzyć rozbudowane i złożone strony internetowe, składając je z szeregu komponentów - z których niektóre są wstępnie skonstruowane, a inne można zdefiniować w locie. Firmalnie, Comanche jest językiem opisu stron, umozliwiajacym konstruowanie statycznych stron internetowych.
+
+Comanche przede wszystkim wybiera, jakie treści pojawią się w różnych regionach strony. Różne regiony mają nazwy i te nazwy mogą się zmieniać w zależności od wybranego szablonu układu.
+
+<a name="templates"></a>
+
+## Szablony stron
+Obecnie istnieje pięć szablonów układu, ale portal może zapewniać dodatkowe układy
+
+**default**
+
+Szablon *default* definuje region 'nav' u góry strony, 'aside' jako pasek boczny o stałej szerokości, 'content' dla głównego obszaru treści i 'footer' dla stopki strony. Jest to szablon domyślny, jak wskazuje na to nazwa.
+
+**full**
+
+Szablon *full* definiuje to samo, co szablon "default", z tym wyjątkiem, że nie ma obszaru 'aside'.
+
+**choklet**
+
+Szablon *choklet* zapewnia szereg płynnych stylów układu, które można określać według odmiany:
+
+* (odmiana domyślna) - układ dwukolumnowy, podobny do szablonu domyślnego, ale bardziej płynny;
+* bannertwo - układ dwukolumnowy z regionem bannera, zgodny z szablonem "default" na małych wyświetlaczach;
+* three - układ trzykolumnowy (dodano region 'right_aside' do szablonu domyślnego);
+* edgestwo - układ dwukolumnowy ze stałymi marginesami bocznymi;
+* edgesthree - układ trzykolumnowy ze stałymi marginesami bocznymi;
+* full - układ trzykolumnowy ze stałymi marginesami bocznymi i dodatkowym obszarem "header" poniżej paska nawigacji
+
+**redable** (sic)
+
+Szablon do czytania dłuższych tekstów na pełnym ekranie (czyli bez paska nawigacyjnego). Trzy kolumny: 'aside', 'content' i 'right_aside'. Aby zapewnić maksymalną czytelność, zaleca się używanie tylko środkowej kolumny treści.
+
+**zen**
+
+Daje swobodę robienia wszystkiego samemu. Po prostu pusta strona z obszarem zawartości.
+
+Użyj znacznika `template`, aby wybrać szablon układu (w tym przypadku "full"):
+
+```
+	[template]full[/template]
+```
+
+W celu wyboru szablonu "choklet" w odmianie "three" użyj:
+
+```
+	[template=three]choklet[/template]
+```
+
+Jeśli nie określono innego szablonu, zostanie użyty szablon domyślny. Szablon może używać dowolnych nazw dla regionów zawartości. Używa się znaczników `region`, aby zdecydować, jakie treści umieścić w odpowiednich regionach.
+
+Zostały też zdefiniowne trzy "makra", które można wykorzystać"
+
+```
+	$htmlhead - zastępowane treścią nagłówka witryny.
+	$nav - zastępowane zawartością paska nawigacyjnego witryny.
+	$content - zastępowane główną zawartością strony.
+```
+
+Domyślnie, `$nav` jest umieszczne w regionie "nav" a `$content` w regionie "content". Makra te są potrzebne tylko wtedy, gdy chcesz zmienić rozmieszczenie tych elementów, tak aby zmienić kolejność lub przenieść je do innych regionów strony.
+
+W celu wybrania motywu dla swojej strony, trzeba użyć znacznika 'theme'.
+
+```
+	[theme]suckerberg[/theme]
+```
+
+Polecenie to wybierze motyw o nazwie "suckerberg". Domyślnie zostanie użyty preferowany motyw Twojego kanału.
+
+```
+	[theme=passion]suckerberg[/theme]
+```
+
+W tym przypadku, wybrany zostanie motywu o nazwie "suckerberg" i schemat "passion" (wariant motywu). Alternatywnie można użyć do tego skondensowanej notacji motywu.
+
+```
+	[theme]suckerberg:passion[/theme]
+```
+
+Notacja skondensowana nie jest częścią samego Comanche, ale jest rozpoznawana przez platformę Hubzilla jako specyfikator motywu.
+
+<a name="regions"></a>
+
+## Regiony
+
+Jak wspomniano powyżej, każdy region ma nazwę. Konkretny region określa się za pomocą tagu "region", który zawiera jego nazwę. Jakakolwiek treść, którą chce się umieścić w tym regionie, powinna być umieszczona pomiędzy tagiem otwierającym a zamykającym region.
+
+```
+	[region=htmlhead]....content goes here....[/region]
+	[region=aside]....content goes here....[/region]
+	[region=nav]....content goes here....[/region]
+	[region=content]....content goes here....[/region]
+```
+
+<a name="assets"></a>
+
+## CSS i Javascript
+
+Jest możliwość włączenia bibliotek Javascript i CSS do regionu htmlhead. Obecnie wykorzystujemy bibliteki jQuery (js), Bootstrap (css/js) oraz Foundation (css/js).
+
+Poniży kod spowoduje nadpisanie wybranych motywów htmlhead.
+
+```
+	[region=htmlhead]
+		[css]bootstrap[/css]
+		[js]jquery[/js]
+		[js]bootstrap[/js]
+	[/region]
+
+```
+
+<a name="menus-blocs"></a>
+
+## Menu i bloki
+
+Nasze narzędzia do tworzenia stron internetowych umożliwiają tworzenie również menu i bloków treści. Zapewniają one wyrenderowanie jakichś fragmentów treści strony, które można umieścić w dowolnych regionach i w dowolnej kolejności. Każdy z nich ma nazwę, którą określa się podczas tworzenia menu lub bloku.
+
+```
+	[menu]mymenu[/menu]
+```
+
+Powyższy kod umieszcza menu o nazwie "mymenu" na stronie, ale musi ono znajdować się w jakimś regionie strony. 
+
+```
+	[menu=horizontal]mymenu[/menu]
+```
+
+Ten kod umieszcza menu o nazwie "mymenu" na stronie, tak jak kod poprzedni, ale dodatkowo zastosowano tu klasę CSS "horizontal" dla bloku menu. Klasa "horizontal" została zdefiniowana w motywie redbasic. Może, ale nie musi być dostępna w innych motywach. 
+
+```
+	[menu][var=wrap]none[/var]mymenu[/menu]
+```
+
+Zmienna [var=wrap]none[/var] w umieszczona w powyższym bloku usuwa otaczający menu element div.
+
+W poniższym przykładzie, w jakimś regionie umieszcza się blok o nazwie "contributors":
+
+```
+	[block]contributors[/block]
+```
+
+Nastęþny przykład pokazuje blok o nazwie "contributors", podobnie jak powyżej, ale z zastosowaniem klasy "someclass". Zastępuje to domyślną klasę bloków "bblock widget":
+
+```
+	[block=someclass]contributors[/block]
+```
+
+W poniższym przykładzie, zmienna [var=wrap]none[/var] umieszczona w bloku "contributors" usuwa z bloku otaczający go element div.
+
+```
+	[block][var=wrap]none[/var]contributors[/block]
+```
+
+## Widżety
+
+Widgety to wykonywalne aplikacje dostarczane przez system, które możesz umieścić na swojej stronie. Niektóre widżety przyjmują argumenty, które pozwalają dostosować widżet do własnych potrzeb.
+
+Podstawowy system dostarcza:
+
+* profile - widżet, który powiela pasek boczny profilu na stronie kanału. Ten widżet nie wymaga żadnych argumentów;
+
+* tagcloud - udostępnia chmurę tagów kategorii; argumenty  
+
+	* count - maksymalna liczba tagów na liście
+
+Widżety i argumenty są określane za pomocą znaczników 'widget' i 'var'.
+
+```
+	[widget=recent_visitors][var=count]24[/var][/widget]
+```
+
+Spowoduje to załadowanie widżetu "recent_visitors" i dostarczenie go z argumentem "count" ustawionym na "24".
+ 
+## Komentarze
+
+Znacznik 'comment' służy do wydzielenia komentarzy. Komentarze te nie pojawią się na wyrenderowanej stronie.
+
+```
+	[comment]This is a comment[/comment]
+```
+
+## Instrukcje warunkowe
+
+Do wyboru rozwiązań można używać konstrukcji 'if'. Są one obecnie oparte systemowej zmiennej konfiguracyjnej lub bieżącym obserwatorze.
+
+```
+	[if $config.system.foo]
+		... zmienna konfiguracyjna system.foo przyjmuje wartość 'true'.
+	[else]
+		... zmienna konfiguracyjna system.foo przyjmuje wartość 'false'.
+ 	[/if]
+
+	[if $observer]
+		... ta treść będzie wyświetlana tylko uwierzytelnionym odwiedzającym
+	[/if]
+```
+
+Klauzula 'else' jest opcjonalna. 
+
+Oprócz oceny logicznej obsługiwanych jest kilka testów.
+
+```
+	[if $config.system.foo == bar]
+		... zmienna konfiguracyjna system.foo jest równa łańcuchowi 'bar'
+	[/if]
+	[if $config.system.foo != bar]
+		... zmienna konfiguracyjna system.foo nie jest równa łańcuchowi 'bar'
+	[/if]
+	[if $config.system.foo {} bar ]
+		... zmienna konfiguracyjna system.foo jest prostą tablicą zawierającą wartość 'bar'
+	[/if]
+	[if $config.system.foo {*} bar]
+		... zmienna konfiguracyjna system.foo jest prostÄ… tablicÄ… zawierajÄ…cÄ… klucz o nazwie 'bar'
+	[/if]
+```
+
+## Złożony przykład
+
+```
+	[comment]Użycie istniejącego szablonu strony, który zapewnia region banera a pod nim 3 kolumny[/comment]
+
+	[template]3-column-with-header[/template]
+
+	[comment]Użycie motywu "darknight"[/comment]
+
+	[theme]darkknight[/theme]
+
+	[comment]Użycie istniejącego menu nawigacyjnego witryny[/comment]
+
+	[region=nav]$nav[/region]
+
+	[region=side]
+
+		[comment]Użycie wybranego przeze mnie menu i kilku widżetów[/comment]
+
+		[menu]myfavouritemenu[/menu]
+
+		[widget=recent_visitors]
+			[var=count]24[/var]
+			[var=names_only]1[/var]
+		[/widget]
+
+		[widget=tagcloud][/widget]
+		[block]donate[/block]
+
+	[/region]
+
+
+
+	[region=middle]
+
+		[comment]Show the normal page content[/comment]
+
+		$content
+
+	[/region]
+
+
+
+	[region=right]
+
+		[comment]Show my condensed channel "wall" feed and allow interaction if the observer is allowed to interact[/comment]
+
+		[widget]channel[/widget]
+
+	[/region]
+
+```
+
+#include doc/macros/main_footer.bb;
diff --git a/doc/pl/general.bb b/doc/pl/general.bb
index 9370678c3..b5be73665 100644
--- a/doc/pl/general.bb
+++ b/doc/pl/general.bb
@@ -1,4 +1,4 @@
-[h2]Informacja o projekcie i serwisie[/h2]
+[h2]Informacja o projekcie i portalu[/h2]
 [h3]$Projectname[/h3]
 [zrl=[baseurl]/help/Privacy]Polityka prywatności[/zrl]
 [zrl=[baseurl]/help/project/governance]ZarzÄ…dzanie projektem[/zrl]
@@ -7,11 +7,11 @@
 [h3]Źródła zewnętrzne[/h3]
 [zrl=[baseurl]/help/external-resource-links]Wykaz zasobów zewnętrznych[/zrl]
 [url=https://framagit.org/hubzilla/core/]Główna witryna internetowa[/url]
-[url=https://framagit.org/hubzilla/addons]Witryna dodatków[/url]
+[url=https://framagit.org/hubzilla/addons]Strona dodatków[/url]
 [url=[baseurl]/help/credits]Podziękowania od $Projectname[/url]
-[h3]O tym węźle $Projectname[/h3]
+[h3]O tym portalu $Projectname[/h3]
 [zrl=[baseurl]/help/TermsOfService]Warunki świadczenia usług dla tego portalu[/zrl]
-[zrl=[baseurl]/siteinfo]Inormacja o węźle (/siteinfo)[/zrl]
+[zrl=[baseurl]/siteinfo]Inormacja o portalu (/siteinfo)[/zrl]
 [zrl=[baseurl]/siteinfo/json]Szczegółowe informacje techniczne w formacie JSON(/siteinfo/json)[/zrl]
 
 #include doc/macros/main_footer.bb;
diff --git a/doc/pl/toc.html b/doc/pl/toc.html
index f478fcf15..2d1aa674f 100644
--- a/doc/pl/toc.html
+++ b/doc/pl/toc.html
@@ -20,8 +20,9 @@
         <div id="members" class="doco-section">
             <div class="flex-column">
                <a class="nav-link" href="/help/member/member_guide">Przewodnik</a>
-               <a class="nav-link" href="/help/member/bbcode">Informator o BBcode</a>
                <a class="nav-link" href="/help/feature/additional/overview">Dodatkowe możliwości</a>
+               <a class="nav-link" href="/help/member/bbcode">Informator o BBcode</a>
+               <a class="nav-link" href="/help/feature/additional/overview">Język opisu stron internetowych Comanche</a>
                <a class="nav-link" href="/help/bugs">Zgłaszanie błędów</a>
                <a class="nav-link" href="/help/member/member_faq">FAQ</a>
             </div>
@@ -66,8 +67,8 @@
         </div>
         <div id="about" class="doco-section">
             <div class="flex-column">
-                <a class="nav-link" href="/help/about/about">Platforma</a>
-                <a class="nav-link" href="/help/about/project">Projekt</a>
+                <a class="nav-link" href="/help/about/about">Platforma Hubzilla</a>
+                <a class="nav-link" href="/help/about/project">Projekt Hubzilla</a>
                 <a class="nav-link" href="/help/about/about_hub">Serwis HUBZILLA.PL</a>
             </div>
         </div>
diff --git a/include/api_auth.php b/include/api_auth.php
index 9235bd28c..4928e6a85 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -27,7 +27,7 @@ function api_login(&$a){
 		if ($server->verifyResourceRequest($request)) {
 			$token = $server->getAccessTokenData($request);
 			$uid = $token['user_id'];
-			$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1", 
+			$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1",
 				intval($uid)
 			);
 			if (count($r)) {
@@ -41,7 +41,7 @@ function api_login(&$a){
 			$_SESSION['uid'] = $record['channel_id'];
 			$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-			$x = q("select * from account where account_id = %d LIMIT 1", 
+			$x = q("select * from account where account_id = %d LIMIT 1",
 				intval($record['channel_account_id'])
 			);
 			if ($x) {
@@ -102,9 +102,6 @@ function api_login(&$a){
 					);
 					if($r) {
 						$c = channelx_by_hash($r[0]['hubloc_hash']);
-						if (! $c) {
-							$c = channelx_by_portid($r[0]['hubloc_hash']);
-						}
 						if($c) {
 							$a = q("select * from account where account_id = %d limit 1",
 								intval($c['channel_account_id'])
@@ -116,7 +113,7 @@ function api_login(&$a){
 						}
 					}
 
-					if($record) {					
+					if($record) {
 						$verified = \Zotlabs\Web\HTTPSig::verify('',$record['channel']['channel_pubkey']);
 						if(! ($verified && $verified['header_signed'] && $verified['header_valid'])) {
 							$record = null;
@@ -164,4 +161,4 @@ function retry_basic_auth($method = 'Basic') {
 	header('HTTP/1.0 401 Unauthorized');
 	echo('This api requires login');
 	killme();
-}
\ No newline at end of file
+}
diff --git a/include/attach.php b/include/attach.php
index db7046ef0..09d4005e8 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -668,8 +668,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 			$def_extension =  '.jpg';
 		if($gis[2] === IMAGETYPE_PNG)
 			$def_extension =  '.png';
-                if($gis[2] === IMAGETYPE_WEBP)
-                        $def_extension =  '.webp';
+		if($gis[2] === IMAGETYPE_WEBP)
+			$def_extension =  '.webp';
 	}
 
 	// If we know it's a photo, over-ride the type in case the source system could not determine what it was
diff --git a/include/bbcode.php b/include/bbcode.php
index 228af7faa..87a7e6af6 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -5,10 +5,10 @@
  */
 
 use Zotlabs\Lib\SvgSanitizer;
+use Zotlabs\Lib\Libzot;
 
 require_once('include/oembed.php');
 require_once('include/event.php');
-require_once('include/zot.php');
 require_once('include/html2plain.php');
 
 function get_bb_tag_pos($s, $name, $occurance = 1) {
@@ -616,9 +616,9 @@ function bb_ShareAttributesSimple($match) {
 
 function rpost_callback($match) {
 	if ($match[2]) {
-		return str_replace($match[0], get_rpost_path(App::get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]);
+		return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&title=' . urlencode($match[2]) . '&body=' . urlencode($match[3]), $match[0]);
 	} else {
-		return str_replace($match[0], get_rpost_path(App::get_observer()) . '&body=' . urlencode($match[3]), $match[0]);
+		return str_replace($match[0], Libzot::get_rpost_path(App::get_observer()) . '&body=' . urlencode($match[3]), $match[0]);
 	}
 }
 
@@ -1099,6 +1099,27 @@ function bbcode($Text, $options = []) {
 
 	call_hooks('bbcode_filter', $Text);
 
+	if(isset($options['drop_media'])) {
+		if (strpos($Text,'[/img]') !== false) {
+			$Text = preg_replace('/\[img(.*?)\[\/(img)\]/ism', '', $Text);
+		}
+		if (strpos($Text,'[/audio]') !== false) {
+			$Text = preg_replace('/\[audio(.*?)\[\/(audio)\]/ism', '', $Text);
+		}
+		if (strpos($Text,'[/video]') !== false) {
+			$Text = preg_replace('/\[video(.*?)\[\/(video)\]/ism', '', $Text);
+		}
+		if (strpos($Text,'[/zmg]') !== false) {
+			$Text = preg_replace('/\[zmg(.*?)\[\/(zmg)\]/ism', '', $Text);
+		}
+		if (strpos($Text,'[/zaudio]') !== false) {
+			$Text = preg_replace('/\[zaudio(.*?)\[\/(zaudio)\]/ism', '', $Text);
+		}
+		if (strpos($Text,'[/zvideo]') !== false) {
+			$Text = preg_replace('/\[zvideo(.*?)\[\/(zvideo)\]/ism', '', $Text);
+		}
+	}
+
 	// Hide all [noparse] contained bbtags by spacefying them
 	if (strpos($Text,'[noparse]') !== false) {
 		$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
diff --git a/include/bookmarks.php b/include/bookmarks.php
index 207cf5a33..95043ae89 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -68,7 +68,7 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) {
 
 function get_bookmark_link($observer) {
 
-	if((! $observer) || !in_array($observer['xchan_network'], ['zot6', 'zot']))
+	if(!$observer || $observer['xchan_network'] !== 'zot6')
 		return '';
 
 	$h = @parse_url($observer['xchan_url']);
diff --git a/include/channel.php b/include/channel.php
index 5684f7a6b..c9391c0d0 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -16,7 +16,6 @@ use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Connect;
 use Zotlabs\Lib\Libsync;
 
-require_once('include/zot.php');
 require_once('include/crypto.php');
 require_once('include/menu.php');
 require_once('include/perm_upgrade.php');
@@ -235,10 +234,6 @@ function create_identity($arr) {
 	$guid = Libzot::new_uid($nick);
 	$key = Crypto::new_keypair(4096);
 
-	// legacy zot
-	$zsig = base64url_encode(Crypto::sign($guid,$key['prvkey']));
-	$zhash = make_xchan_hash($guid,$zsig);
-
 	// zot6
 	$sig = Libzot::sign($guid,$key['prvkey']);
 	$hash = Libzot::make_xchan_hash($guid,$key['pubkey']);
@@ -275,7 +270,7 @@ function create_identity($arr) {
 			'channel_guid'        => $guid,
 			'channel_guid_sig'    => $sig,
 			'channel_hash'        => $hash,
-			'channel_portable_id' => $zhash,
+			'channel_portable_id' => '',
 			'channel_prvkey'      => $key['prvkey'],
 			'channel_pubkey'      => $key['pubkey'],
 			'channel_pageflags'   => intval($pageflags),
@@ -340,26 +335,6 @@ function create_identity($arr) {
 	$r = hubloc_store_lowlevel(
 		[
 			'hubloc_guid'     => $guid,
-			'hubloc_guid_sig' => $zsig,
-			'hubloc_hash'     => $zhash,
-			'hubloc_id_url'   => channel_url($ret['channel']),
-			'hubloc_addr'     => channel_reddress($ret['channel']),
-			'hubloc_primary'  => intval($primary),
-			'hubloc_url'      => z_root(),
-			'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$ret['channel']['channel_prvkey'])),
-			'hubloc_host'     => App::get_hostname(),
-			'hubloc_callback' => z_root() . '/post',
-			'hubloc_sitekey'  => get_config('system','pubkey'),
-			'hubloc_network'  => 'zot',
-			'hubloc_updated'  => datetime_convert()
-		]
-	);
-	if(! $r)
-		logger('Unable to store hub location (zot)');
-
-	$r = hubloc_store_lowlevel(
-		[
-			'hubloc_guid'     => $guid,
 			'hubloc_guid_sig' => $sig,
 			'hubloc_hash'     => $hash,
 			'hubloc_id_url'   => channel_url($ret['channel']),
@@ -383,30 +358,6 @@ function create_identity($arr) {
 
 	$r = xchan_store_lowlevel(
 		[
-			'xchan_hash'        => $zhash,
-			'xchan_guid'        => $guid,
-			'xchan_guid_sig'    => $zsig,
-			'xchan_pubkey'      => $key['pubkey'],
-			'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'),
-			'xchan_photo_l'     => z_root() . "/photo/profile/l/{$newuid}",
-			'xchan_photo_m'     => z_root() . "/photo/profile/m/{$newuid}",
-			'xchan_photo_s'     => z_root() . "/photo/profile/s/{$newuid}",
-			'xchan_addr'        => channel_reddress($ret['channel']),
-			'xchan_url'         => z_root() . '/channel/' . $ret['channel']['channel_address'],
-			'xchan_follow'      => z_root() . '/follow?f=&url=%s',
-			'xchan_connurl'     => z_root() . '/poco/' . $ret['channel']['channel_address'],
-			'xchan_name'        => $ret['channel']['channel_name'],
-			'xchan_network'     => 'zot',
-			'xchan_photo_date'  => datetime_convert(),
-			'xchan_name_date'   => datetime_convert(),
-			'xchan_system'      => $system
-		]
-	);
-	if(! $r)
-		logger('Unable to store xchan (zot)');
-
-	$r = xchan_store_lowlevel(
-		[
 			'xchan_hash'        => $hash,
 			'xchan_guid'        => $guid,
 			'xchan_guid_sig'    => $sig,
@@ -819,7 +770,6 @@ function get_default_export_sections() {
 			'chatrooms',
 			'events',
 			'webpages',
-			'mail',
 			'wikis'
 	];
 
@@ -981,12 +931,6 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals
 
 			}
 
-			// pick up the zot xchan and hublocs also
-
-			if($ret['channel']['channel_portable_id'] && ! $zot_compat) {
-				$xchans[] = $ret['channel']['channel_portable_id'];
-			}
-
 			stringify_array_elms($xchans);
 		}
 
@@ -1146,30 +1090,6 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals
 		}
 	}
 
-	if(in_array('mail',$sections)) {
-		$r = q("select * from conv where uid = %d",
-			intval($channel_id)
-		);
-		if($r) {
-			for($x = 0; $x < count($r); $x ++) {
-				$r[$x]['subject'] = base64url_decode(str_rot47($r[$x]['subject']));
-			}
-			$ret['conv'] = $r;
-		}
-
-		$r = q("select * from mail where channel_id = %d",
-			intval($channel_id)
-		);
-		if($r) {
-			$m = array();
-			foreach($r as $rr) {
-				xchan_mail_query($rr);
-				$m[] = encode_mail($rr,true);
-			}
-			$ret['mail'] = $m;
-		}
-	}
-
 	if(in_array('wikis',$sections)) {
 		$r = q("select * from item where resource_type like 'nwiki%%' and uid = %d order by created",
 			intval($channel_id)
@@ -2844,15 +2764,12 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 
 		logger('deleting hublocs',LOGGER_DEBUG);
 
-		$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s' OR hubloc_hash = '%s'",
-			dbesc($channel['channel_hash']),
-			dbesc($channel['channel_portable_id'])
-
+		$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s'",
+			dbesc($channel['channel_hash'])
 		);
 
-		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s' OR xchan_hash = '%s'",
-			dbesc($channel['channel_hash']),
-			dbesc($channel['channel_portable_id'])
+		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s'",
+			dbesc($channel['channel_hash'])
 		);
 
 		Master::Summon(array('Notifier','purge_all',$channel_id));
@@ -2936,9 +2853,8 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 
 	logger('deleting hublocs',LOGGER_DEBUG);
 
-	$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE (hubloc_hash = '%s' OR hubloc_hash = '%s') AND hubloc_url = '%s' ",
+	$r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s' AND hubloc_url = '%s' ",
 		dbesc($channel['channel_hash']),
-		dbesc($channel['channel_portable_id']),
 		dbesc(z_root())
 	);
 
@@ -2953,9 +2869,8 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
 		$hublocs = count($r);
 
 	if(! $hublocs) {
-		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s' OR xchan_hash = '%s'",
-			dbesc($channel['channel_hash']),
-			dbesc($channel['channel_portable_id'])
+		$r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s'",
+			dbesc($channel['channel_hash'])
 		);
 	}
 
diff --git a/include/connections.php b/include/connections.php
index 87db7faa9..a1b27e301 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -212,7 +212,7 @@ function mark_orphan_hubsxchans() {
 		return;
 
 	$r = q("UPDATE hubloc SET hubloc_error = 1 WHERE hubloc_error = 0
-		AND hubloc_network IN ('zot6', 'zot') AND hubloc_connected < %s - INTERVAL %s",
+		AND hubloc_network = 'zot6' AND hubloc_connected < %s - INTERVAL %s",
 		db_utcnow(), db_quoteinterval('36 day')
 	);
 
diff --git a/include/conversation.php b/include/conversation.php
index 04aa1ef5a..c5a0df79a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -730,10 +730,13 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					'delete' => t('Delete'),
 				);
 
-				$star = array(
-					'toggle' => t("Toggle Star Status"),
-					'isstarred' => ((intval($item['item_starred'])) ? true : false),
-				);
+				$star = [];
+				if ((local_channel() && local_channel() === intval($item['uid'])) && intval($item['item_thread_top']) && feature_enabled(local_channel(), 'star_posts')) {
+					$star = [
+						'toggle' => t("Toggle Star Status"),
+						'isstarred' => ((intval($item['item_starred'])) ? true : false),
+					];
+				}
 
 				$lock = (($item['item_private'] || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
 					? t('Private Message')
@@ -765,8 +768,12 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 
 				$conv_link_mid = (($mode == 'moderate') ? $item['parent_mid'] : $item['mid']);
 
-				$conv_link = ((in_array($item['item_type'],[ ITEM_TYPE_CARD, ITEM_TYPE_ARTICLE] )) ? $item['plink'] : z_root() . '/display/' . gen_link_id($conv_link_mid));
+				$conv_link_module = 'display';
+				if(local_channel()) {
+					$conv_link_module = 'hq';
+				}
 
+				$conv_link = ((in_array($item['item_type'],[ ITEM_TYPE_CARD, ITEM_TYPE_ARTICLE] )) ? $item['plink'] : z_root() . '/' . $conv_link_module . '/' . gen_link_id($conv_link_mid));
 
 				$tmp_item = array(
 					'template' => $tpl,
@@ -777,7 +784,8 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					'delete' => t('Delete'),
 					'preview_lbl' => $preview_lbl,
 					'id' => (($preview) ? 'P0' : $item['item_id']),
-					'mids' => json_encode(['b64.' . base64url_encode($item['mid'])]),
+					'mid' => gen_link_id($item['mid']),
+					'mids' => json_encode([gen_link_id($item['mid'])]),
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url),
 					'profile_url' => $profile_link,
 					'thread_action_menu' => thread_action_menu($item,$mode),
@@ -819,7 +827,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					'owner_photo' => $owner_photo,
 					'plink' => get_plink($item,false),
 					'edpost' => false,
-					'star' => ((feature_enabled(local_channel(),'star_posts')) ? $star : ''),
+					'star' => $star,
 					'drop' => $drop,
 					'vote' => $likebuttons,
 					'like' => '',
@@ -932,7 +940,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 		'$user' => App::$user,
 		'$threads' => $threads,
 		'$wait' => t('Loading...'),
-		'$conversation_tools' => t('Conversation Tools'),
+		'$conversation_tools' => t('Conversation Features'),
 		'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
 		'$preview' => $preview
 	));
@@ -1022,8 +1030,6 @@ function author_is_pmable($xchan, $abook) {
 	if($x['result'] !== 'unset')
 		return $x['result'];
 
-	if($xchan['xchan_network'] === 'zot' && get_observer_hash())
-		return true;
 	return false;
 
 }
@@ -1055,13 +1061,10 @@ function thread_author_menu($item, $mode = '') {
 		}
 		else {
 			$url = (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']);
-			if($local_channel && $url && (! in_array($item['author']['xchan_network'],[ 'rss', 'anon','unknown' ]))) {
+			if($local_channel && $url && (! in_array($item['author']['xchan_network'],[ 'rss', 'anon','unknown', 'zot' ]))) {
 				$follow_url = z_root() . '/follow/?f=&url=' . urlencode($url) . '&interactive=0';
 			}
 		}
-		if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
-			$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
-		}
 	}
 
 	if($contact) {
@@ -1393,7 +1396,8 @@ function hz_status_editor($a, $x, $popup = false) {
 		'$nocomment_enabled' => t('Comments enabled'),
 		'$nocomment_disabled' => t('Comments disabled'),
 		'$auto_save_draft' => $feature_auto_save_draft,
-		'$reset' => $reset
+		'$reset' => $reset,
+		'$popup' => $popup
 	];
 
 	call_hooks('jot_header_tpl_filter',$tplmacros);
@@ -1693,10 +1697,8 @@ function prepare_page($item) {
 		// ... other possible options
 	}
 
-	// prepare_body calls unobscure() as a side effect. Do it here so that
-	// the template will get passed an unobscured title.
+	$body = prepare_body($item, true, [ 'newwin' => false ]);
 
-	$body = prepare_body($item, [ 'newwin' => false ]);
 	if(App::$page['template'] == 'none') {
 		$tpl = 'page_display_empty.tpl';
 
diff --git a/include/dir_fns.php b/include/dir_fns.php
deleted file mode 100644
index 8326415ed..000000000
--- a/include/dir_fns.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-/**
- * @file include/dir_fns.php
- */
-
-use Zotlabs\Lib\Crypto;
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\Webfinger;
-use Zotlabs\Lib\Zotfinger;
-
-require_once('include/permissions.php');
-
-/**
- * @brief
- *
- * @param int $dirmode
- * @return array
- */
-function find_upstream_directory($dirmode) {
-
-	$preferred = get_config('system','directory_server');
-
-	// Thwart attempts to use a private directory
-
-	if(($preferred) && ($preferred != z_root())) {
-		$r = q("select * from site where site_url = '%s' limit 1",
-			dbesc($preferred)
-		);
-		if(($r) && ($r[0]['site_flags'] & DIRECTORY_MODE_STANDALONE)) {
-			$preferred = '';
-		}
-	}
-
-
-	if (! $preferred) {
-
-		/*
-		 * No directory has yet been set. For most sites, pick one at random
-		 * from our list of directory servers. However, if we're a directory
-		 * server ourself, point at the local instance
-		 * We will then set this value so this should only ever happen once.
-		 * Ideally there will be an admin setting to change to a different
-		 * directory server if you don't like our choice or if circumstances change.
-		 */
-
-		$directory_fallback_servers = get_directory_fallback_servers();
-
-		$dirmode = intval(get_config('system','directory_mode'));
-		if ($dirmode == DIRECTORY_MODE_NORMAL) {
-			$toss = mt_rand(0,count($directory_fallback_servers));
-			$preferred = $directory_fallback_servers[$toss];
-			set_config('system','directory_server',$preferred);
-		} else{
-			set_config('system','directory_server',z_root());
-		}
-	}
-
-	return array('url' => $preferred);
-}
-
-/**
- * Directories may come and go over time. We will need to check that our
- * directory server is still valid occasionally, and reset to something that
- * is if our directory has gone offline for any reason
- */
-function check_upstream_directory() {
-
-	$directory = get_config('system', 'directory_server');
-
-	// it's possible there is no directory server configured and the local hub is being used.
-	// If so, default to preserving the absence of a specific server setting.
-
-	$isadir = true;
-
-	if ($directory) {
-		$j = Zotfinger::exec($directory);
-		if (array_path_exists('data/directory_mode',$j)) {
-			if ($j['data']['directory_mode'] === 'normal') {
-				$isadir = false;
-			}
-		}
-	}
-
-	if (! $isadir)
-		set_config('system', 'directory_server', '');
-}
-
-function get_directory_setting($observer, $setting) {
-
-	if ($observer)
-		$ret = get_xconfig($observer, 'directory', $setting);
-	else
-		$ret = ((array_key_exists($setting,$_SESSION)) ? intval($_SESSION[$setting]) : false);
-
-	if($ret === false)
-		$ret = get_config('directory', $setting);
-
-
-	// 'safemode' is the default if there is no observer or no established preference.
-
-	if($setting == 'safemode' && $ret === false)
-		$ret = 1;
-
-	return $ret;
-}
-
-/**
- * @brief Called by the directory_sort widget.
- */
-function dir_sort_links() {
-
-	$safe_mode = 1;
-
-	$observer = get_observer_hash();
-
-	$safe_mode = get_directory_setting($observer, 'safemode');
-	$globaldir = get_directory_setting($observer, 'globaldir');
-	$pubforums = get_directory_setting($observer, 'pubforums');
-
-	// Build urls without order and pubforums so it's easy to tack on the changed value
-	// Probably there's an easier way to do this
-
-	$directory_sort_order = get_config('system','directory_sort_order');
-	if(! $directory_sort_order)
-		$directory_sort_order = 'date';
-
-	$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : $directory_sort_order);
-	$suggest = (($_REQUEST['suggest']) ? '&suggest=' . $_REQUEST['suggest'] : '');
-
-	$url = 'directory?f=';
-
-	$tmp = array_merge($_GET,$_POST);
-	unset($tmp['suggest']);
-	unset($tmp['pubforums']);
-	unset($tmp['global']);
-	unset($tmp['safe']);
-	unset($tmp['q']);
-	unset($tmp['f']);
-	$forumsurl = $url . http_build_query($tmp) . $suggest;
-
-	$o = replace_macros(get_markup_template('dir_sort_links.tpl'), array(
-		'$header' => t('Directory Options'),
-		'$forumsurl' => $forumsurl,
-		'$safemode' => array('safemode', t('Safe Mode'),$safe_mode,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&safe="+(this.checked ? 1 : 0)\''),
-		'$pubforums' => array('pubforums', t('Public Forums Only'),$pubforums,'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&pubforums="+(this.checked ? 1 : 0)\''),
-		'$globaldir' => array('globaldir', t('This Website Only'), 1-intval($globaldir),'',array(t('No'), t('Yes')),' onchange=\'window.location.href="' . $forumsurl . '&global="+(this.checked ? 0 : 1)\''),
-	));
-
-	return $o;
-}
-
-/**
- * @brief Checks the directory mode of this hub.
- *
- * Checks the directory mode of this hub to see if it is some form of directory server. If it is,
- * get the directory realm of this hub. Fetch a list of all other directory servers in this realm and request
- * a directory sync packet. This will contain both directory updates and new ratings. Store these all in the DB.
- * In the case of updates, we will query each of them asynchronously from a poller task. Ratings are stored
- * directly if the rater's signature matches.
- *
- * @param int $dirmode;
- */
-function sync_directories($dirmode) {
-
-	if ($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL)
-		return;
-
-	$realm = get_directory_realm();
-	if ($realm == DIRECTORY_REALM) {
-		$r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_type = %d and ( site_realm = '%s' or site_realm = '') ",
-			intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY),
-			dbesc(z_root()),
-			intval(SITE_TYPE_ZOT),
-			dbesc($realm)
-		);
-	} else {
-		$r = q("select * from site where (site_flags & %d) > 0 and site_url != '%s' and site_realm like '%s' and site_type = %d ",
-			intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY),
-			dbesc(z_root()),
-			dbesc(protect_sprintf('%' . $realm . '%')),
-			intval(SITE_TYPE_ZOT)
-		);
-	}
-
-	// If there are no directory servers, setup the fallback master
-	/** @FIXME What to do if we're in a different realm? */
-
-	if ((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) {
-
-		$x = site_store_lowlevel(
-			[
-				'site_url'       => DIRECTORY_FALLBACK_MASTER,
-				'site_flags'     => DIRECTORY_MODE_PRIMARY,
-				'site_update'    => NULL_DATE,
-				'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
-				'site_realm'     => DIRECTORY_REALM,
-				'site_valid'     => 1,
-				'site_crypto'    => 'aes256cbc'
-			]
-		);
-
-		$r = q("select * from site where site_flags in (%d, %d) and site_url != '%s' and site_type = %d ",
-			intval(DIRECTORY_MODE_PRIMARY),
-			intval(DIRECTORY_MODE_SECONDARY),
-			dbesc(z_root()),
-			intval(SITE_TYPE_ZOT)
-		);
-	}
-	if (! $r)
-		return;
-
-	foreach ($r as $rr) {
-		if (! $rr['site_directory'])
-			continue;
-
-		logger('sync directories: ' . $rr['site_directory']);
-
-		// for brand new directory servers, only load the last couple of days.
-		// It will take about a month for a new directory to obtain the full current repertoire of channels.
-		/** @FIXME Go back and pick up earlier ratings if this is a new directory server. These do not get refreshed. */
-
-		$token = get_config('system','realm_token');
-
-		$syncdate = (($rr['site_sync'] <= NULL_DATE) ? datetime_convert('UTC','UTC','now - 2 days') : $rr['site_sync']);
-		$x = z_fetch_url($rr['site_directory'] . '?f=&sync=' . urlencode($syncdate) . (($token) ? '&t=' . $token : ''));
-
-		if (! $x['success'])
-			continue;
-
-		$j = json_decode($x['body'],true);
-		if (!($j['transactions']) || ($j['ratings']))
-			continue;
-
-		q("update site set site_sync = '%s' where site_url = '%s'",
-			dbesc(datetime_convert()),
-			dbesc($rr['site_url'])
-		);
-
-		logger('sync_directories: ' . $rr['site_url'] . ': ' . print_r($j,true), LOGGER_DATA);
-
-		if (is_array($j['transactions']) && count($j['transactions'])) {
-			foreach ($j['transactions'] as $t) {
-				$r = q("select * from updates where ud_guid = '%s' limit 1",
-					dbesc($t['transaction_id'])
-				);
-				if($r)
-					continue;
-
-				$ud_flags = 0;
-				if (is_array($t['flags']) && in_array('deleted',$t['flags']))
-					$ud_flags |= UPDATE_FLAGS_DELETED;
-				if (is_array($t['flags']) && in_array('forced',$t['flags']))
-					$ud_flags |= UPDATE_FLAGS_FORCED;
-
-				$z = q("insert into updates ( ud_hash, ud_guid, ud_date, ud_flags, ud_addr )
-					values ( '%s', '%s', '%s', %d, '%s' ) ",
-					dbesc($t['hash']),
-					dbesc($t['transaction_id']),
-					dbesc($t['timestamp']),
-					intval($ud_flags),
-					dbesc($t['address'])
-				);
-			}
-		}
-		if (is_array($j['ratings']) && count($j['ratings'])) {
-			foreach ($j['ratings'] as $rr) {
-				$x = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1",
-					dbesc($rr['channel']),
-					dbesc($rr['target'])
-				);
-				if ($x && $x[0]['xlink_updated'] >= $rr['edited'])
-					continue;
-
-				// Ratings are signed by the rater. We need to verify before we can accept it.
-				/** @TODO Queue or defer if the xchan is not yet present on our site */
-
-				$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
-					dbesc($rr['channel'])
-				);
-				if (! $y) {
-					logger('key unavailable on this site for ' . $rr['channel']);
-					continue;
-				}
-				if (! Crypto::verify($rr['target'] . '.' . $rr['rating'] . '.' . $rr['rating_text'], base64url_decode($rr['signature']),$y[0]['xchan_pubkey'])) {
-					logger('failed to verify rating');
-					continue;
-				}
-
-				if ($x) {
-					$z = q("update xlink set xlink_rating = %d, xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' where xlink_id = %d",
-						intval($rr['rating']),
-						dbesc($rr['rating_text']),
-						dbesc($rr['signature']),
-						dbesc(datetime_convert()),
-						intval($x[0]['xlink_id'])
-					);
-					logger('rating updated');
-				} else {
-					$z = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static ) values( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
-						dbesc($rr['channel']),
-						dbesc($rr['target']),
-						intval($rr['rating']),
-						dbesc($rr['rating_text']),
-						dbesc($rr['signature']),
-						dbesc(datetime_convert())
-					);
-					logger('rating created');
-				}
-			}
-		}
-	}
-}
-
-
-/**
- * @brief
- *
- * Given an update record, probe the channel, grab a zot-info packet and refresh/sync the data.
- *
- * Ignore updating records marked as deleted.
- *
- * If successful, sets ud_last in the DB to the current datetime for this
- * reddress/webbie.
- *
- * @param array $ud Entry from update table
- */
-function update_directory_entry($ud) {
-
-	logger('update_directory_entry: ' . print_r($ud,true), LOGGER_DATA);
-
-	if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
-		$success = false;
-
-		// directory migration phase 1 (Macgirvin - 29-JUNE-2019)
-		// fetch zot6 info (if available) as well as historical zot info (if available)
-		// Once this has been running for > 1 month on the primary directory we can deprecate the historical info and
-		// modify the directory search to only return zot6 entries, and also modify this function
-		// to *only* fetch the zot6 entries.
-		// Otherwise we'll be showing duplicates or have a mostly empty directory for a good chunk of
-		// the transition period. Directory server load will likely increase "moderately" during this transition.
-		// The one month counter begins when the primary directory has upgraded to a release which uses this code.
-		// Hubzilla channels running traditional zot which have not upgraded can or will be dropped from the directory or
-		// "not found" at the end of the transition period as the directory will only serve zot6 entries at that time.
-
-		$uri = Webfinger::zot_url($ud['ud_addr']);
-		if($uri) {
-			$record = Zotfinger::exec($uri);
-
-			// Check the HTTP signature
-
-			$hsig = $record['signature'];
-			if($hsig && $hsig['signer'] === $uri && $hsig['header_valid'] === true && $hsig['content_valid'] === true) {
-				$x = Libzot::import_xchan($record['data'], 0, $ud);
-				if($x['success']) {
-					$success = true;
-				}
-			}
-		}
-		$x = \Zotlabs\Zot\Finger::run($ud['ud_addr'], '');
-		if ($x['success']) {
-			import_xchan($x, 0, $ud);
-			$success = true;
-		}
-		if (! $success) {
-			q("update updates set ud_last = '%s' where ud_addr = '%s'",
-				dbesc(datetime_convert()),
-				dbesc($ud['ud_addr'])
-			);
-		}
-	}
-}
-
-
-/**
- * @brief Push local channel updates to a local directory server.
- *
- * This is called from include/directory.php if a profile is to be pushed to the
- * directory and the local hub in this case is any kind of directory server.
- *
- * @param int $uid
- * @param boolean $force
- */
-function local_dir_update($uid, $force) {
-
-	logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG);
-
-	$p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1",
-		intval($uid)
-	);
-
-	$profile = array();
-	$profile['encoding'] = 'zot';
-
-	if ($p) {
-		$hash = $p[0]['channel_hash'];
-
-		$profile['description'] = $p[0]['pdesc'];
-		$profile['birthday']    = $p[0]['dob'];
-		if ($age = age($p[0]['dob'],$p[0]['channel_timezone'],''))
-			$profile['age'] = $age;
-
-		$profile['gender']      = $p[0]['gender'];
-		$profile['marital']     = $p[0]['marital'];
-		$profile['sexual']      = $p[0]['sexual'];
-		$profile['locale']      = $p[0]['locality'];
-		$profile['region']      = $p[0]['region'];
-		$profile['postcode']    = $p[0]['postal_code'];
-		$profile['country']     = $p[0]['country_name'];
-		$profile['about']       = $p[0]['about'];
-		$profile['homepage']    = $p[0]['homepage'];
-		$profile['hometown']    = $p[0]['hometown'];
-
-		if ($p[0]['keywords']) {
-			$tags = array();
-			$k = explode(' ', $p[0]['keywords']);
-			if ($k)
-				foreach ($k as $kk)
-					if (trim($kk))
-						$tags[] = trim($kk);
-
-			if ($tags)
-				$profile['keywords'] = $tags;
-		}
-
-		$hidden = (1 - intval($p[0]['publish']));
-
-		logger('hidden: ' . $hidden);
-
-		$r = q("select xchan_hidden from xchan where xchan_hash = '%s' limit 1",
-			dbesc($p[0]['channel_hash'])
-		);
-
-		if(intval($r[0]['xchan_hidden']) != $hidden) {
-			$r = q("update xchan set xchan_hidden = %d where xchan_hash = '%s'",
-				intval($hidden),
-				dbesc($p[0]['channel_hash'])
-			);
-		}
-
-		$arr = array('channel_id' => $uid, 'hash' => $hash, 'profile' => $profile);
-		call_hooks('local_dir_update', $arr);
-
-		$address = channel_reddress($p[0]);
-
-		if (perm_is_allowed($uid, '', 'view_profile')) {
-			import_directory_profile($hash, $arr['profile'], $address, 0);
-		} else {
-			// they may have made it private
-			$r = q("delete from xprof where xprof_hash = '%s'",
-				dbesc($hash)
-			);
-			$r = q("delete from xtag where xtag_hash = '%s'",
-				dbesc($hash)
-			);
-		}
-	}
-
-	$ud_hash = random_string() . '@' . App::get_hostname();
-	update_modtime($hash, $ud_hash, channel_reddress($p[0]),(($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
-}
diff --git a/include/feedutils.php b/include/feedutils.php
index f489030b6..d31836983 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -14,6 +14,8 @@
  * @return string with an atom feed
  */
 
+require_once('include/items.php');
+
 function get_public_feed($channel, $params) {
 
 	if(! $params)
diff --git a/include/follow.php b/include/follow.php
deleted file mode 100644
index 64ae8f7f1..000000000
--- a/include/follow.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php /** @file */
-
-
-//
-// Takes a $uid and the channel associated with the uid, and a url/handle and adds a new channel
-
-// Returns an array
-//  $return['success'] boolean true if successful
-//  $return['abook'] Address book entry joined with xchan if successful
-//  $return['message'] error text if success is false.
-
-use Zotlabs\Lib\Crypto;
-
-require_once('include/zot.php');
-
-function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) {
-
-	$result = [ 'success' => false, 'message' => '' ];
-
-	$my_perms = false;
-	$is_zot   = false;
-	$protocol = '';
-
-
-	if(substr($url,0,1) === '[') {
-		$x = strpos($url,']');
-		if($x) {
-			$protocol = substr($url,1,$x-1);
-			$url = substr($url,$x+1);
-		}
-	}
-
-	$is_http  = ((strpos($url,'://') !== false) ? true : false);
-
-	if($is_http && substr($url,-1,1) === '/')
-		$url = substr($url,0,-1);
-
-	if(! allowed_url($url)) {
-		$result['message'] = t('Channel is blocked on this site.');
-		return $result;
-	}
-
-	if(! $url) {
-		$result['message'] = t('Channel location missing.');
-		return $result;
-	}
-
-
-	// check service class limits
-
-	$r = q("select count(*) as total from abook where abook_channel = %d and abook_self = 0 ",
-		intval($uid)
-	);
-	if($r)
-		$total_channels = $r[0]['total'];
-
-	if(! service_class_allows($uid,'total_channels',$total_channels)) {
-		$result['message'] = upgrade_message();
-		return $result;
-	}
-
-
-	$arr = array('url' => $url, 'protocol', 'channel' => array());
-
-	call_hooks('follow_init', $arr);
-
-	if($arr['channel']['success'])
-		$ret = $arr['channel'];
-	elseif((! $is_http) && ((! $protocol) || (strtolower($protocol) === 'zot')))
-		$ret = Zotlabs\Zot\Finger::run($url,$channel);
-
-	if($ret && is_array($ret) && $ret['success']) {
-		$is_zot = true;
-		$j = $ret;
-	}
-
-	$p = \Zotlabs\Access\Permissions::connect_perms($uid);
-	$my_perms = $p['perms'];
-
-	if($is_zot && $j) {
-
-		logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG);
-
-
-		if(! ($j['success'] && $j['guid'])) {
-			$result['message'] = t('Response from remote channel was incomplete.');
-			logger('mod_follow: ' . $result['message']);
-			return $result;
-		}
-
-		// Premium channel, set confirm before callback to avoid recursion
-
-		if(array_key_exists('connect_url',$j) && (! $confirm)) {
-			if($interactive) {
-				goaway(zid($j['connect_url']));
-			}
-			else {
-				$result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']);
-				logger('mod_follow: ' . $result['message']);
-				return $result;
-			}
-		}
-
-
-
-		// do we have an xchan and hubloc?
-		// If not, create them.
-
-		$x = import_xchan($j);
-
-		if(array_key_exists('deleted',$j) && intval($j['deleted'])) {
-			$result['message'] = t('Channel was deleted and no longer exists.');
-			return $result;
-		}
-
-		if(! $x['success'])
-			return $x;
-
-		$xchan_hash = $x['hash'];
-
-		if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) {
-			$permissions = Crypto::unencapsulate(array(
-				'data' => $j['permissions']['data'],
-				'alg'  => $j['permissions']['alg'],
-				'key'  => $j['permissions']['key'],
-				'iv'   => $j['permissions']['iv']),
-				$channel['channel_prvkey']);
-			if($permissions)
-				$permissions = json_decode($permissions,true);
-			logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
-		}
-		else
-			$permissions = $j['permissions'];
-
-		if(is_array($permissions) && $permissions) {
-			foreach($permissions as $k => $v) {
-				set_abconfig($channel['channel_uid'],$xchan_hash,'their_perms',$k,intval($v));
-			}
-		}
-	}
-	else {
-
-		$xchan_hash = '';
-		$sql_options = (($protocol) ? " and xchan_network = '" . dbesc($protocol) . "' " : '');
-
-
-		$r = q("select * from xchan where (xchan_addr = '%s' or xchan_url = '%s') $sql_options ",
-			dbesc($url),
-			dbesc($url)
-		);
-
-		if(! $r) {
-
-			// attempt network auto-discovery
-
-			$wf = discover_by_webbie($url,$protocol);
-
-			if((! $wf) && ($is_http)) {
-
-				// try RSS discovery
-
-				$feeds = get_config('system','feed_contacts');
-
-				if(($feeds) && ($protocol === '' || $protocol === 'feed' || $protocol === 'rss')) {
-					$d = discover_by_url($url);
-				}
-				else {
-					$result['message'] = t('Remote channel or protocol unavailable.');
-					return $result;
-				}
-			}
-
-			if($wf || $d) {
-				$r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s'",
-					dbesc(($wf) ? $wf : $url),
-					dbesc($url)
-				);
-			}
-		}
-
-		$xchan = zot_record_preferred($r,'xchan_network');
-
-		// if discovery was a success we should have an xchan record in $r
-
-		if($xchan) {
-			$xchan_hash = $xchan['xchan_hash'];
-			$their_perms = 0;
-		}
-	}
-
-	if(! $xchan_hash) {
-		$result['message'] = t('Channel discovery failed.');
-		logger('follow: ' . $result['message']);
-		return $result;
-	}
-
-	$allowed = (($is_zot || in_array($xchan['xchan_network'],['rss','zot6'])) ? 1 : 0);
-
-	$x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $xchan, 'allowed' => $allowed, 'singleton' => 0);
-
-	call_hooks('follow_allow',$x);
-
-	if(! $x['allowed']) {
-		$result['message'] = t('Protocol disabled.');
-		return $result;
-	}
-
-	$singleton = intval($x['singleton']);
-
-	$aid = $channel['channel_account_id'];
-	$hash = $channel['channel_hash'];
-	$default_group = $channel['channel_default_group'];
-
-	if($hash == $xchan_hash) {
-		$result['message'] = t('Cannot connect to yourself.');
-		return $result;
-	}
-
-	if($xchan['xchan_network'] === 'rss') {
-
-		// check service class feed limits
-
-		$r = q("select count(*) as total from abook where abook_account = %d and abook_feed = 1 ",
-			intval($aid)
-		);
-		if($r)
-			$total_feeds = $r[0]['total'];
-
-		if(! service_class_allows($uid,'total_feeds',$total_feeds)) {
-			$result['message'] = upgrade_message();
-			return $result;
-		}
-
-		// Always set these "remote" permissions for feeds since we cannot interact with them
-		// to negotiate a suitable permission response
-
-		set_abconfig($uid,$xchan_hash,'their_perms','view_stream',1);
-		set_abconfig($uid,$xchan_hash,'their_perms','republish',1);
-
-	}
-
-	$profile_assign = get_pconfig($uid,'system','profile_assign','');
-
-
-	$r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook 
-		where abook_xchan = '%s' and abook_channel = %d limit 1",
-		dbesc($xchan_hash),
-		intval($uid)
-	);
-
-	if($r) {
-
-		$abook_instance = $r[0]['abook_instance'];
-
-		if(($singleton) && strpos($abook_instance,z_root()) === false) {
-			if($abook_instance)
-				$abook_instance .= ',';
-			$abook_instance .= z_root();
-
-			$x = q("update abook set abook_instance = '%s', abook_not_here = 0 where abook_id = %d",
-				dbesc($abook_instance),
-				intval($r[0]['abook_id'])
-			);
-		}
-
-		if(intval($r[0]['abook_pending'])) {
-			$x = q("update abook set abook_pending = 0 where abook_id = %d",
-				intval($r[0]['abook_id'])
-			);
-		}
-	}
-	else {
-		$closeness = get_pconfig($uid,'system','new_abook_closeness',80);
-
-		$r = abook_store_lowlevel(
-			[
-				'abook_account'   => intval($aid),
-				'abook_channel'   => intval($uid),
-				'abook_closeness' => intval($closeness),
-				'abook_xchan'     => $xchan_hash,
-				'abook_profile'   => $profile_assign,
-				'abook_feed'      => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0),
-				'abook_created'   => datetime_convert(),
-				'abook_updated'   => datetime_convert(),
-				'abook_instance'  => (($singleton) ? z_root() : '')
-			]
-		);
-	}
-
-	if(! $r)
-		logger('mod_follow: abook creation failed');
-
-	if($my_perms) {
-		foreach($my_perms as $k => $v) {
-			set_abconfig($uid,$xchan_hash,'my_perms',$k,$v);
-		}
-	}
-
-	$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash 
-		where abook_xchan = '%s' and abook_channel = %d limit 1",
-		dbesc($xchan_hash),
-		intval($uid)
-	);
-
-	if($r) {
-		$result['abook'] = $r[0];
-		Zotlabs\Daemon\Master::Summon(array('Notifier', 'permission_create', $result['abook']['abook_id']));
-	}
-
-	$arr = array('channel_id' => $uid, 'channel' => $channel, 'abook' => $result['abook']);
-
-	call_hooks('follow', $arr);
-
-	/** If there is a default group for this channel, add this connection to it */
-
-	if($default_group) {
-		require_once('include/group.php');
-		$g = group_rec_byhash($uid,$default_group);
-		if($g)
-			group_add_member($uid,'',$xchan_hash,$g['id']);
-	}
-
-	$result['success'] = true;
-	return $result;
-}
diff --git a/include/help.php b/include/help.php
index 38facb04a..6daf81b8e 100644
--- a/include/help.php
+++ b/include/help.php
@@ -2,6 +2,7 @@
 
 use \Michelf\MarkdownExtra;
 
+require_once('include/items.php');
 
 /**
  * @brief
diff --git a/include/html2plain.php b/include/html2plain.php
index bf8581bdb..48bbe3d9e 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -78,10 +78,10 @@ function quotelevel($message, $wraplength = 75)
 
 
 function collecturls($message) {
-	
+
 	$pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
 	preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
-	
+
 	$urls = [];
 	if ($result) {
 		$ignore = false;
@@ -104,15 +104,15 @@ function collecturls($message) {
 			foreach ($list as $listitem)
 				if (strpos($treffer[1], $listitem) !== false)
 					$ignore = true;
-						
+
 			if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
 				$ignore = false;
-					
+
 			if (! $ignore)
 				$urls[$treffer[1]] = $treffer[1];
 		}
 	}
-	
+
 	return($urls);
 }
 
diff --git a/include/import.php b/include/import.php
index 379789109..ae7b2787a 100644
--- a/include/import.php
+++ b/include/import.php
@@ -778,7 +778,7 @@ function sync_items($channel, $items, $relocate = null) {
         // to avoid confusing with cloned channels
         $size = count($items);
         for($i = 0; $i < $size; $i++) {
-                if(($items[$i]['owner']['network'] != 'zot') && ($items[$i]['owner']['network'] != 'zot6')) {
+                if($items[$i]['owner']['network'] !== 'zot6') {
                         $r = q("SELECT * FROM abook WHERE abook_channel = %d
                                         AND abook_xchan = ( SELECT xchan_hash FROM xchan WHERE xchan_guid = '%s' LIMIT 1 )
                                         AND abook_not_here = 0 AND abook_ignored = 0 AND abook_blocked = 0",
@@ -1089,85 +1089,6 @@ function import_likes($channel, $likes) {
 	}
 }
 
-function import_conv($channel,$convs) {
-	if($channel && $convs) {
-		foreach($convs as $conv) {
-			if($conv['deleted']) {
-				q("delete from conv where guid = '%s' and uid = %d",
-					dbesc($conv['guid']),
-					intval($channel['channel_id'])
-				);
-				continue;
-			}
-
-			unset($conv['id']);
-
-			$conv['uid'] = $channel['channel_id'];
-			$conv['subject'] = str_rot47(base64url_encode($conv['subject']));
-
-			$r = q("select id from conv where guid = '%s' and uid = %d limit 1",
-				dbesc($conv['guid']),
-				intval($channel['channel_id'])
-			);
-			if($r)
-				continue;
-
-			create_table_from_array('conv',$conv);
-		}
-	}
-}
-
-/**
- * @brief Import mails.
- *
- * @param array $channel
- * @param array $mails
- * @param boolean $sync (optional) default false
- */
-function import_mail($channel, $mails, $sync = false) {
-	if($channel && $mails) {
-		foreach($mails as $mail) {
-			if(array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) {
-				q("delete from mail where mid = '%s' and uid = %d",
-					dbesc($mail['message_id']),
-					intval($channel['channel_id'])
-				);
-				continue;
-			}
-			if(array_key_exists('flags',$mail) && in_array('recalled',$mail['flags'])) {
-				q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d",
-					dbesc($mail['message_id']),
-					intval($channel['channel_id'])
-				);
-				continue;
-			}
-
-			$m = get_mail_elements($mail);
-			if(! $m)
-				continue;
-
-			$m['account_id'] = $channel['channel_account_id'];
-			$m['channel_id'] = $channel['channel_id'];
-
-			$mail_id = mail_store($m);
-			if($sync && $mail_id) {
-				Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));
-			}
- 		}
-	}
-}
-
-/**
- * @brief Synchronise mails.
- *
- * @see import_mail()
- * @param array $channel
- * @param array $mails
- */
-function sync_mail($channel, $mails) {
-	import_mail($channel, $mails, true);
-}
-
 /**
  * @brief Synchronise files.
  *
@@ -1925,7 +1846,6 @@ function get_webpage_elements($channel, $type = 'all') {
 				$elements['pages'] = array();
 				$pages = array();
 				foreach($r as $rr) {
-					unobscure($rr);
 
 					//$lockstate = (($rr['allow_cid'] || $rr['allow_gid'] || $rr['deny_cid'] || $rr['deny_gid']) ? 'lock' : 'unlock');
 
@@ -1973,8 +1893,6 @@ function get_webpage_elements($channel, $type = 'all') {
 				$elements['layouts'] = array();
 
 				foreach($r as $rr) {
-					unobscure($rr);
-
 					$elements['layouts'][] = array(
 						'type'        => 'layout',
 						'description' => $rr['title'],		// description of the layout
@@ -2010,8 +1928,6 @@ function get_webpage_elements($channel, $type = 'all') {
 				$elements['blocks'] = array();
 
 				foreach($r as $rr) {
-					unobscure($rr);
-
 					$elements['blocks'][] = array(
 						'type'      => 'block',
 						'title'     => $rr['title'],
diff --git a/include/items.php b/include/items.php
index d6dd517ba..f451358f8 100644
--- a/include/items.php
+++ b/include/items.php
@@ -21,7 +21,6 @@ use Zotlabs\Daemon\Master;
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/crypto.php');
-require_once('include/message.php');
 require_once('include/feedutils.php');
 require_once('include/photo/photo_driver.php');
 require_once('include/permissions.php');
@@ -132,7 +131,7 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) {
 						case 'sit':
 						case 'any':
 						case 'con':
-							if(!in_array($rr['xchan_network'], ['zot6', 'zot']))
+							if($rr['xchan_network'] !== 'zot6')
 								break;
 						case 'pub':
 						case '':
@@ -758,35 +757,17 @@ function get_item_elements($x,$allow_code = false) {
 	// and not enough info to be able to look you up from your hash - which is the only thing stored with the post.
 
 	$xchan_hash = import_author_xchan($x['author']);
-	if($xchan_hash) {
+	if($xchan_hash)
 		$arr['author_xchan'] = $xchan_hash;
-	}
-	else {
+	else
 		return [];
-	}
-
-	// save a potentially expensive lookup if author == owner
-	$legacy_sig = false;
-	$owner_hash = '';
-	if(isset($x['owner']['id']) && isset($x['owner']['key']) && isset($x['owner']['network']) && $x['owner']['network'] === 'zot6') {
-		$owner_hash = Libzot::make_xchan_hash($x['owner']['id'], $x['owner']['key']);
-	}
-	else {
-		$owner_hash = make_xchan_hash($x['owner']['guid'],$x['owner']['guid_sig']);
-		$legacy_sig = true;
-	}
 
-	if($arr['author_xchan'] === $owner_hash) {
-		$arr['owner_xchan'] = $arr['author_xchan'];
+	$xchan_hash = import_author_xchan($x['owner']);
+	if($xchan_hash) {
+		$arr['owner_xchan'] = $xchan_hash;
 	}
 	else {
-		$xchan_hash = import_author_xchan($x['owner']);
-		if($xchan_hash) {
-			$arr['owner_xchan'] = $xchan_hash;
-		}
-		else {
-			return [];
-		}
+		return [];
 	}
 
 	// Check signature on the body text received.
@@ -800,20 +781,12 @@ function get_item_elements($x,$allow_code = false) {
 		// check the supplied signature against the supplied content.
 		// Note that we will purify the content which could change it.
 
-		$r = q("select xchan_pubkey, xchan_network from xchan where xchan_hash = '%s' limit 1",
+		$r = q("SELECT xchan_pubkey FROM xchan WHERE xchan_hash = '%s' LIMIT 1",
 			dbesc($arr['author_xchan'])
 		);
-		if($r) {
-			if($r[0]['xchan_pubkey'] && $r[0]['xchan_network'] === 'zot6') {
-				$item_verified = false;
-				if($legacy_sig) {
-					$item_verified = Crypto::verify($x['body'], base64url_decode($arr['sig']), $r[0]['xchan_pubkey']);
-				}
-				else {
-					$item_verified = Libzot::verify($x['body'], $arr['sig'], $r[0]['xchan_pubkey']);
-				}
-
-				if($item_verified) {
+		if ($r) {
+			if ($r[0]['xchan_pubkey']) {
+				if (Libzot::verify($x['body'], $arr['sig'], $r[0]['xchan_pubkey'])) {
 					$arr['item_verified'] = 1;
 				}
 				else {
@@ -935,71 +908,37 @@ function get_item_elements($x,$allow_code = false) {
 
 function import_author_xchan($x) {
 
-	$arr = [
-			'xchan' => $x,
-			'xchan_hash' => ''
-	];
-	/**
-	 * @hooks import_author_xchan
-	 *   Called when looking up an author of a post by xchan_hash to ensure they have an xchan record on our site.
-	 *   * \e array \b xchan
-	 *   * \e string \b xchan_hash - Thre returned value
-	 */
-	call_hooks('import_author_xchan', $arr);
-	if($arr['xchan_hash']) {
-		return $arr['xchan_hash'];
+	if (!$x) {
+		return false;
 	}
 
 	$y = false;
 
-	if((isset($x['id']) && isset($x['key'])) && (!isset($x['network']) || $x['network'] === 'zot6')) {
+	if (!array_key_exists('network', $x) || $x['network'] === 'zot6') {
 		$y = Libzot::import_author_zot($x);
 	}
 
-	if(!$y && isset($x['url']) && isset($x['network']) && $x['network'] === 'zot6') {
-		$r = q("SELECT xchan_hash FROM xchan WHERE xchan_url = '%s' AND xchan_network = 'zot6'",
-			dbesc($x['url'])
-		);
-		if($r)
-			$y = $r[0]['xchan_hash'];
-		else
-			$y = discover_by_webbie($x['url'], 'zot6');
-	}
-
-	// if we were told that it's a zot6 connection, don't probe/import anything else
-
-	if($y)
+	// if we were told that it's a zot connection, don't probe/import anything else
+	if (array_key_exists('network', $x) && $x['network'] === 'zot6')
 		return $y;
 
-	if(!isset($x['network']) || $x['network'] === 'zot') {
-		$y = import_author_zot($x);
-	}
-
-	if(isset($x['network']) || $x['network'] === 'zot') {
-		if($x['url']) {
-			// check if we already have the zot6 xchan of this xchan_url. if not import it.
-			$r = q("SELECT xchan_hash FROM xchan WHERE xchan_url = '%s' AND xchan_network = 'zot6'",
-				dbesc($x['url'])
-			);
-			// TODO: fix dupplicate with line 960
-			if(!$r)
-				discover_by_webbie($x['url'], 'zot6');
-		}
-
-		if($y)
-			return $y;
-
-	}
+	$hookinfo = [
+		'xchan' => $x,
+		'xchan_hash' => ''
+	];
 
-	// perform zot6 discovery
-	if($x['url']) {
-		$y = discover_by_webbie($x['url'], 'zot6');
- 		if($y) {
-			return $y;
-		}
+	/**
+	 * @hooks import_author_xchan
+	 *   Called when looking up an author of a post by xchan_hash to ensure they have an xchan record on our site.
+	 *   * \e array \b xchan
+	 *   * \e string \b xchan_hash - Thre returned value
+	 */
+	call_hooks('import_author_xchan', $hookinfo);
+	if($hookinfo['xchan_hash']) {
+		return $hookinfo['xchan_hash'];
 	}
 
-	if($x['network'] === 'rss') {
+	if(!$y && array_key_exists('network', $x) && $x['network'] === 'rss') {
 		$y = import_author_rss($x);
 	}
 
@@ -1325,16 +1264,13 @@ function translate_scope($scope) {
  * @return array an associative array
  */
 function encode_item_xchan($xchan) {
-	$ret = array();
+	$ret = [];
 
 	$ret['name']     = $xchan['xchan_name'];
 	$ret['address']  = $xchan['xchan_addr'];
 	$ret['url']      = $xchan['xchan_url'];
 	$ret['network']  = $xchan['xchan_network'];
 	$ret['photo']    = [ 'mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m'] ];
-	$ret['guid']     = $xchan['xchan_guid'];
-	$ret['guid_sig'] = $xchan['xchan_guid_sig'];
-
 	$ret['id']       = $xchan['xchan_guid'];
 	$ret['id_sig']   = $xchan['xchan_guid_sig'];
 	$ret['key']      = $xchan['xchan_pubkey'];
@@ -1566,143 +1502,6 @@ function encode_item_flags($item) {
 	return $ret;
 }
 
-function encode_mail($item,$extended = false) {
-	$x = [];
-	$x['type'] = 'mail';
-	$x['encoding'] = 'zot';
-
-	if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) {
-		if($item['title'])
-			$item['title'] = base64url_decode(str_rot47($item['title']));
-		if($item['body'])
-			$item['body'] = base64url_decode(str_rot47($item['body']));
-	}
-
-	$x['message_id']     = $item['mid'];
-	$x['message_parent'] = $item['parent_mid'];
-	$x['created']        = $item['created'];
-	$x['expires']        = $item['expires'];
-	$x['title']          = $item['title'];
-	$x['body']           = $item['body'];
-	$x['from']           = encode_item_xchan($item['from']);
-	$x['to']             = encode_item_xchan($item['to']);
-	$x['raw']            = $item['mail_raw'];
-	$x['mimetype']       = $item['mail_mimetype'];
-	$x['sig']            = $item['sig'];
-
-	if($item['attach'])
-		$x['attach']     = json_decode($item['attach'],true);
-
-	$x['flags'] = array();
-
-	if(intval($item['mail_recalled'])) {
-		$x['flags'][] = 'recalled';
-		$x['title'] = '';
-		$x['body']  = '';
-	}
-
-	if($extended) {
-		$x['conv_guid'] = $item['conv_guid'];
-		if(intval($item['mail_deleted']))
-			$x['flags'][] = 'deleted';
-		if(intval($item['mail_replied']))
-			$x['flags'][] = 'replied';
-		if(intval($item['mail_isreply']))
-			$x['flags'][] = 'isreply';
-		if(intval($item['mail_seen']))
-			$x['flags'][] = 'seen';
-	}
-
-	return $x;
-}
-
-
-
-function get_mail_elements($x) {
-
-	$arr = array();
-
-	if(intval($x['raw'])) {
-		$arr['mail_raw'] = intval($x['raw']);
-		$arr['body']     = $x['body'];
-	}
-	else {
-		$arr['body']         = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
-
-		$maxlen = get_max_import_size();
-
-		if($maxlen && mb_strlen($arr['body']) > $maxlen) {
-			$arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8');
-			logger('message length exceeds max_import_size: truncated');
-		}
-	}
-
-	$arr['title']        = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');
-	$arr['mail_mimetype'] = (($x['mimetype']) ? htmlspecialchars($x['mimetype'],ENT_COMPAT,'UTF-8',false) : 'text/bbcode');
-	$arr['conv_guid']    = (($x['conv_guid'])? htmlspecialchars($x['conv_guid'],ENT_COMPAT,'UTF-8',false) : '');
-
-	$arr['created']      = datetime_convert('UTC','UTC',$x['created']);
-	if((! array_key_exists('expires',$x)) || ($x['expires'] <= NULL_DATE))
-		$arr['expires'] = NULL_DATE;
-	else
-		$arr['expires']      = datetime_convert('UTC','UTC',$x['expires']);
-
-	$arr['mail_flags'] = 0;
-
-	if(array_key_exists('sig',$x))
-		$arr['sig'] = $x['sig'];
-
-	if($x['flags'] && is_array($x['flags'])) {
-		if(in_array('recalled',$x['flags'])) {
-			$arr['mail_recalled'] = 1;
-		}
-		if(in_array('replied',$x['flags'])) {
-			$arr['mail_replied'] = 1;
-		}
-		if(in_array('isreply',$x['flags'])) {
-			$arr['mail_isreply'] = 1;
-		}
-		if(in_array('seen',$x['flags'])) {
-			$arr['mail_seen'] = 1;
-		}
-		if(in_array('deleted',$x['flags'])) {
-			$arr['mail_deleted'] = 1;
-		}
-	}
-
-	$key = get_config('system','pubkey');
-	$arr['mail_obscured'] = 1;
-	if($arr['body']) {
-		$arr['body']  = str_rot47(base64url_encode($arr['body']));
-	}
-
-	if($arr['title']) {
-		$arr['title'] = str_rot47(base64url_encode($arr['title']));
-	}
-	if($arr['created'] > datetime_convert())
-		$arr['created']  = datetime_convert();
-
-
-	$arr['mid']          = (($x['message_id'])     ? htmlspecialchars($x['message_id'],     ENT_COMPAT,'UTF-8',false) : '');
-	$arr['parent_mid']   = (($x['message_parent']) ? htmlspecialchars($x['message_parent'], ENT_COMPAT,'UTF-8',false) : '');
-
-	if($x['attach'])
-		$arr['attach'] = activity_sanitise($x['attach']);
-
-	if(($xchan_hash = import_author_xchan($x['from'])) !== false)
-		$arr['from_xchan'] = $xchan_hash;
-	else
-		return array();
-
-	if(($xchan_hash = import_author_xchan($x['to'])) !== false)
-		$arr['to_xchan'] = $xchan_hash;
-	else
-		return array();
-
-	return $arr;
-}
-
-
 function get_profile_elements($x) {
 
 	$arr = array();
@@ -2695,7 +2494,7 @@ function send_status_notifications($post_id,$item) {
 
 
 	Enotify::submit(array(
-		'type'         => NOTIFY_COMMENT,
+		'type'         => ((intval($item['item_private']) === 2) ? NOTIFY_MAIL : NOTIFY_COMMENT),
 		'from_xchan'   => $item['author_xchan'],
 		'to_xchan'     => $r[0]['channel_hash'],
 		'item'         => $item,
@@ -2912,7 +2711,6 @@ function tag_deliver($uid, $item_id) {
 
 			// At this point we've determined that the person receiving this post was mentioned in it or it is a union.
 			// Now let's check if this mention was inside a reshare so we don't spam a forum
-			// If it's private we may have to unobscure it momentarily so that we can parse it.
 
 			$body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']);
 
@@ -3379,7 +3177,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
 			"' portable_id='"   . $item['author']['xchan_hash'] .
 			"' avatar='"        . $item['author']['xchan_photo_s'] .
 			"' link='"          . $item['plink'] .
-			"' auth='"          . ((in_array($item['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') .
+			"' auth='"          . (($item['author']['xchan_network'] === 'zot6') ? 'true' : 'false') .
 			"' posted='"        . $item['created'] .
 			"' message_id='"    . $item['mid'] .
 		"']";
@@ -3577,158 +3375,6 @@ function post_is_importable($item,$abook) {
 
 }
 
-
-function mail_store($arr) {
-
-	if(! $arr['channel_id']) {
-		logger('mail_store: no uid');
-		return 0;
-	}
-
-	$channel = channelx_by_n($arr['channel_id']);
-
-	if(! $arr['mail_obscured']) {
-		if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
-			$arr['body'] = escape_tags($arr['body']);
-	}
-
-	if(array_key_exists('attach',$arr)) {
-		if(is_array($arr['attach'])) {
-			$arr['attach'] = json_encode($arr['attach']);
-		}
-	}
-	else {
-		$arr['attach'] = '';
-	}
-
-	$arr['account_id']    = ((x($arr,'account_id'))           ? intval($arr['account_id'])                 : 0);
-	$arr['mid']           = ((x($arr,'mid'))           ? notags(trim($arr['mid']))           : random_string());
-	$arr['from_xchan']    = ((x($arr,'from_xchan'))  ? notags(trim($arr['from_xchan']))  : '');
-	$arr['to_xchan']      = ((x($arr,'to_xchan'))   ? notags(trim($arr['to_xchan']))   : '');
-	$arr['created']       = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert());
-	$arr['expires']       = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : NULL_DATE);
-	$arr['title']         = ((x($arr,'title'))         ? trim($arr['title'])         : '');
-	$arr['parent_mid']    = ((x($arr,'parent_mid'))    ? notags(trim($arr['parent_mid']))    : '');
-	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
-	$arr['sig']           = ((x($arr,'sig'))           ? trim($arr['sig'])                   : '');
-	$arr['conv_guid']     = ((x($arr,'conv_guid'))     ? trim($arr['conv_guid'])             : '');
-	$arr['mail_mimetype'] = ((x($arr,'mail_mimetype')) ? trim($arr['mail_mimetype'])         : 'text/bbcode');
-
-	$arr['mail_flags']    = ((x($arr,'mail_flags'))    ? intval($arr['mail_flags'])          : 0 );
-	$arr['mail_raw']      = ((x($arr,'mail_raw'))      ? intval($arr['mail_raw'])            : 0 );
-
-
-	if($arr['parent_mid']) {
-		$parent_item = q("select * from mail where mid = '%s' and channel_id = %d limit 1",
-			dbesc($arr['parent_mid']),
-			intval($arr['channel_id'])
-		);
-		if(($parent_item) && (! $arr['conv_guid'])) {
-			$arr['conv_guid'] = $parent_item[0]['conv_guid'];
-		}
-	}
-	else {
-		logger('mail_store: missing parent');
-		$arr['parent_mid'] = $arr['mid'];
-	}
-
-	if($arr['from_xchan'] === $channel['channel_hash'])
-		$conversant = $arr['to_xchan'];
-	else
-		$conversant = $arr['from_xchan'];
-
-
-	if(! $arr['conv_guid']) {
-		$x = create_conversation($channel,$conversant,(($arr['title']) ? base64url_decode(str_rot47($arr['title'])) : ''));
-		$arr['conv_guid'] = (($x) ? $x['guid'] : '');
-	}
-
-
-	$r = q("SELECT id FROM mail WHERE mid = '%s' AND channel_id = %d LIMIT 1",
-		dbesc($arr['mid']),
-		intval($arr['channel_id'])
-	);
-
-	if($r) {
-		logger('Duplicate item ignored. ' . print_r($arr,true));
-		return 0;
-	}
-
-	if(! $r && $arr['mail_recalled'] == 1) {
-		logger('Recalled item not found. ' . print_r($arr,true));
-		return 0;
-	}
-
-	/**
-	 * @hooks post_mail
-	 *   Called when a mail message has been composed.
-	 */
-	call_hooks('post_mail', $arr);
-
-	if(x($arr,'cancel')) {
-		logger('Post cancelled by plugin.');
-		return 0;
-	}
-
-	logger('mail_store: ' . print_r($arr,true), LOGGER_DATA);
-
-	create_table_from_array('mail', $arr);
-
-	// find the item we just created
-
-	$r = q("SELECT id FROM mail WHERE mid = '%s' AND channel_id = %d ORDER BY id ASC ",
-		$arr['mid'],           // already dbesc'd
-		intval($arr['channel_id'])
-	);
-
-	if($r) {
-		$current_post = $r[0]['id'];
-		logger('Created item ' . $current_post, LOGGER_DEBUG);
-		$arr['id'] = $current_post; // for notification
-	}
-	else {
-		logger('Could not locate created item');
-		return 0;
-	}
-	if(count($r) > 1) {
-		logger('Duplicated post occurred. Removing duplicates.');
-		q("DELETE FROM mail WHERE mid = '%s' AND channel_id = %d AND id != %d ",
-			$arr['mid'],
-			intval($arr['channel_id']),
-			intval($current_post)
-		);
-	}
-	else {
-
-		$notif_params = array(
-			'from_xchan' => $arr['from_xchan'],
-			'to_xchan'   => $arr['to_xchan'],
-			'type'       => NOTIFY_MAIL,
-			'item'       => $arr,
-			'verb'       => ACTIVITY_POST,
-			'otype'      => 'mail'
-		);
-
-		Enotify::submit($notif_params);
-	}
-
-	if($arr['conv_guid']) {
-		$c = q("update conv set updated = '%s' where guid = '%s' and uid = %d",
-			dbesc(datetime_convert()),
-			dbesc($arr['conv_guid']),
-			intval($arr['channel_id'])
-		);
-	}
-
-	/**
-	 * @hooks post_mail_end
-	 *   Called when a mail message has been delivered.
-	 */
-	call_hooks('post_mail_end', $arr);
-	return $current_post;
-}
-
-
 function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 
 	logger('fix_private_photos', LOGGER_DEBUG);
diff --git a/include/markdown.php b/include/markdown.php
index 013d57c29..a0e07ba68 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -9,6 +9,7 @@ use Michelf\MarkdownExtra;
 use League\HTMLToMarkdown\HtmlConverter;
 use League\HTMLToMarkdown\Environment;
 use League\HTMLToMarkdown\Converter\ConverterInterface;
+use League\HTMLToMarkdown\Converter\TableConverter;
 use League\HTMLToMarkdown\ElementInterface;
 
 require_once("include/oembed.php");
@@ -250,7 +251,7 @@ function bb_to_markdown($Text, $options = []) {
 	call_hooks('bb_to_markdown_bb', $x);
 
 	$Text = $x['bbcode'];
-	
+
 	// Replace spoiler tag before BBcode conversion
 	$Text = preg_replace("/\[\/?spoiler\]/is", "\n--- " .t('spoiler') . " ---\n", $Text);
 
@@ -271,7 +272,7 @@ function bb_to_markdown($Text, $options = []) {
 
 	// Remove empty zrl links
 	$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
-	
+
 	// Replace unprocessed <br> in code
 	$Text = str_replace("<br></br>", "\n", $Text);
 
@@ -325,73 +326,3 @@ function html2markdown($html, $options = []) {
 
 	return $markdown;
 }
-
-// Tables are not an official part of the markdown specification.
-// This interface was suggested as a workaround.
-// author: Mark Hamstra
-// https://github.com/Mark-H/Docs
-
-
-class TableConverter implements ConverterInterface
-{
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
-    {
-        switch ($element->getTagName()) {
-            case 'tr':
-                $line = [];
-                $i = 1;
-                foreach ($element->getChildren() as $td) {
-                    $i++;
-                    $v = $td->getValue();
-                    $v = trim($v);
-                    if ($i % 2 === 0 || $v !== '') {
-                        $line[] = $v;
-                    }
-                }
-                return '| ' . implode(' | ', $line) . " |\n";
-            case 'td':
-            case 'th':
-                return trim($element->getValue());
-            case 'tbody':
-                return trim($element->getValue());
-            case 'thead':
-                $headerLine = reset($element->getChildren())->getValue();
-                $headers = explode(' | ', trim(trim($headerLine, "\n"), '|'));
-                $hr = [];
-                foreach ($headers as $td) {
-                    $length = strlen(trim($td)) + 2;
-                    $hr[] = str_repeat('-', $length > 3 ? $length : 3);
-                }
-                $hr = '|' . implode('|', $hr) . '|';
-                return $headerLine . $hr . "\n";
-            case 'table':
-                $inner = $element->getValue();
-                if (strpos($inner, '-----') === false) {
-                    $inner = explode("\n", $inner);
-                    $single = explode(' | ', trim($inner[0], '|'));
-                    $hr = [];
-                    foreach ($single as $td) {
-                        $length = strlen(trim($td)) + 2;
-                        $hr[] = str_repeat('-', $length > 3 ? $length : 3);
-                    }
-                    $hr = '|' . implode('|', $hr) . '|';
-                    array_splice($inner, 1, 0, $hr);
-                    $inner = implode("\n", $inner);
-                }
-                return trim($inner) . "\n\n";
-        }
-        return $element->getValue();
-    }
-    /**
-     * @return string[]
-     */
-    public function getSupportedTags()
-    {
-        return array('table', 'tr', 'thead', 'td', 'tbody');
-    }
-}
diff --git a/include/message.php b/include/message.php
deleted file mode 100644
index e6c9ed8ee..000000000
--- a/include/message.php
+++ /dev/null
@@ -1,566 +0,0 @@
-<?php /** @file */
-
-/* Private Message backend API */
-
-require_once('include/crypto.php');
-require_once('include/attach.php');
-require_once('include/msglib.php');
-
-
-function mail_prepare_binary($item) {
-
-	return replace_macros(get_markup_template('item_binary.tpl'), [
-		'$download'  => t('Download binary/encrypted content'),
-		'$url'       => z_root() . '/mail/' . $item['id'] . '/download'
-	]);
-}
-
-
-// send a private message
-
-
-function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $replyto = '', $expires = NULL_DATE, $mimetype = 'text/bbcode', $raw = false, $sig = '') {
-
-	$ret = array('success' => false);
-	$is_reply = false;
-
-	$observer_hash = get_observer_hash();
-
-	if($uid) {
-		$r = q("select * from channel where channel_id = %d limit 1",
-			intval($uid)
-		);
-		if($r)
-			$channel = $r[0];
-	}
-	else {
-		$channel = App::get_channel();
-	}
-
-	if(! $channel) {
-		$ret['message'] = t('Unable to determine sender.');
-		return $ret;
-	}
-
-
-	$body = cleanup_bbcode($body);
-	$results = linkify_tags($body, $uid);
-
-	if(! $raw) {
-		if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) {
-			$attaches = $match[1];
-		}
-	}
-
-	$attachments = '';
-
-	if((! $raw) && preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
-		$attachments = array();
-		foreach($match[2] as $mtch) {
-			$hash = substr($mtch,0,strpos($mtch,','));
-			$rev = intval(substr($mtch,strpos($mtch,',')));
-			$r = attach_by_hash_nodata($hash,get_observer_hash(),$rev);
-			if($r['success']) {
-				$attachments[] = array(
-					'href'     => z_root() . '/attach/' . $r['data']['hash'],
-					'length'   =>  $r['data']['filesize'],
-					'type'     => $r['data']['filetype'],
-					'title'    => urlencode($r['data']['filename']),
-					'revision' => $r['data']['revision']
-				);
-			}
-			$body = trim(str_replace($match[1],'',$body));
-		}
-	}
-
-	$jattach = (($attachments) ? json_encode($attachments) : '');
-
-
-	if(! $recipient) {
-		$ret['message'] = t('No recipient provided.');
-		return $ret;
-	}
-
-	if(! strlen($subject))
-		$subject = t('[no subject]');
-
-
-	// look for any existing conversation structure
-
-	$conv_guid = '';
-
-	if(strlen($replyto)) {
-		$is_reply = true;
-		$r = q("select conv_guid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
-			intval(local_channel()),
-			dbesc($replyto),
-			dbesc($replyto)
-		);
-		if($r) {
-			$conv_guid = $r[0]['conv_guid'];
-		}
-	}
-
-	if(! $conv_guid) {
-
-		// create a new conversation
-
-		$retconv = create_conversation($channel,$recipient,$subject);
-		if($retconv) {
-			$conv_guid = $retconv['guid'];
-		}
-	}
-
-	if(! $retconv) {
-		$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
-			dbesc($conv_guid),
-			intval(local_channel())
-		);
-		if($r) {
-			$retconv = $r[0];
-		}
-	}
-
-	if(! $retconv) {
-		$ret['message'] = 'conversation not found';
-		return $ret;
-	}
-
-	$c = q("update conv set updated = '%s' where guid = '%s' and uid = %d",
-		dbesc(datetime_convert()),
-		dbesc($conv_guid),
-		intval(local_channel())
-	);
-
-	// generate a unique message_id
-
-	do {
-		$dups = false;
-		$hash = random_string();
-
-		$mid = $hash . '@' . App::get_hostname();
-
-		$r = q("SELECT id FROM mail WHERE mid = '%s' LIMIT 1",
-			dbesc($mid));
-		if(count($r))
-			$dups = true;
-	} while($dups == true);
-
-
-	if(! strlen($replyto)) {
-		$replyto = $mid;
-	}
-
-	/**
-	 *
-	 * When a photo was uploaded into the message using the (profile wall) ajax
-	 * uploader, The permissions are initially set to disallow anybody but the
-	 * owner from seeing it. This is because the permissions may not yet have been
-	 * set for the post. If it's private, the photo permissions should be set
-	 * appropriately. But we didn't know the final permissions on the post until
-	 * now. So now we'll look for links of uploaded messages that are in the
-	 * post and set them to the same permissions as the post itself.
-	 *
-	 */
-
-	$match = null;
-	$images = null;
-	if(preg_match_all("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
-		$images = $match[3];
-
-	$match = false;
-
-
-	if($subject)
-		$subject = str_rot47(base64url_encode($subject));
-	if(($body )&& (! $raw))
-		$body  = str_rot47(base64url_encode($body));
-
-	$mimetype = ''; //placeholder
-
-	$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply, mail_raw )
-		VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
-		intval($channel['channel_account_id']),
-		dbesc($conv_guid),
-		intval(1),
-		intval($channel['channel_id']),
-		dbesc($channel['channel_hash']),
-		dbesc($recipient),
-		dbesc(($mimetype)? $mimetype : 'text/bbcode'),
-		dbesc($subject),
-		dbesc($body),
-		dbesc($sig),
-		dbesc($jattach),
-		dbesc($mid),
-		dbesc($replyto),
-		dbesc(datetime_convert()),
-		dbescdate($expires),
-		intval($is_reply),
-		intval($raw)
-	);
-
-	// verify the save
-
-	$r = q("SELECT * FROM mail WHERE mid = '%s' and channel_id = %d LIMIT 1",
-		dbesc($mid),
-		intval($channel['channel_id'])
-	);
-	if($r) {
-		$post_id = $r[0]['id'];
-		$retmail = $r[0];
-		xchan_mail_query($retmail);
-	}
-	else {
-		$ret['message'] = t('Stored post could not be verified.');
-		return $ret;
-	}
-
-	if($images) {
-		foreach($images as $image) {
-			if(! stristr($image,z_root() . '/photo/'))
-				continue;
-			$image_uri = substr($image, strrpos($image, '/') + 1);
-			$image_uri = substr($image_uri, 0, strpos($image_uri, '.') - 2);
-			$r = q("UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d and allow_cid = '%s'",
-				dbesc('<' . $recipient . '>'),
-				dbesc($image_uri),
-				intval($channel['channel_id']),
-				dbesc('<' . $channel['channel_hash'] . '>')
-			);
-			$r = q("UPDATE attach SET allow_cid = '%s' WHERE hash = '%s' AND is_photo = 1 and uid = %d and allow_cid = '%s'",
-				dbesc('<' . $recipient . '>'),
-				dbesc($image_uri),
-				intval($channel['channel_id']),
-				dbesc('<' . $channel['channel_hash'] . '>')
-			);
-		}
-	}
-
-	if($attaches) {
-		foreach($attaches as $attach) {
-			$hash = substr($attach,0,strpos($attach,','));
-			$rev = intval(substr($attach,strpos($attach,',')));
-			attach_store($channel,$observer_hash,$options = 'update', array(
-				'hash'      => $hash,
-				'revision'  => $rev,
-				'allow_cid' => '<' . $recipient . '>',
-
-			));
-		}
-	}
-
-	Zotlabs\Daemon\Master::Summon(array('Notifier','mail',$post_id));
-
-	$ret['success'] = true;
-	$ret['message_item'] = intval($post_id);
-	$ret['conv'] = $retconv;
-	$ret['mail'] = $retmail;
-
-	return $ret;
-
-}
-
-function create_conversation($channel,$recipient,$subject) {
-
-	// create a new conversation
-
-	$conv_guid = random_string();
-
-	$recip = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($recipient)
-	);
-	if($recip)
-		$recip_handle = $recip[0]['xchan_addr'];
-
-	$sender_handle = channel_reddress($channel);
-
-	$handles = $recip_handle . ';' . $sender_handle;
-
-	if($subject)
-		$nsubject = str_rot47(base64url_encode($subject));
-
-	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
-		intval($channel['channel_id']),
-		dbesc($conv_guid),
-		dbesc($sender_handle),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc($nsubject),
-		dbesc($handles)
-	);
-
-	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
-		dbesc($conv_guid),
-		intval($channel['channel_id'])
-	);
-
-	return $r[0];
-
-}
-
-
-function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
-
-	$where = '';
-	$limit = '';
-
-	$t0 = dba_timer();
-
-	if($numitems)
-		$limit = " LIMIT " . intval($numitems) . " OFFSET " . intval($start);
-
-	if($mailbox !== '') {
-		$x = q("select channel_hash from channel where channel_id = %d limit 1",
-			intval($uid)
-		);
-
-		if(! $x)
-			return array();
-
-		$channel_hash = dbesc($x[0]['channel_hash']);
-		$local_channel = intval(local_channel());
-
-		switch($mailbox) {
-
-			case 'inbox':
-				$sql = "SELECT * FROM mail WHERE channel_id = $local_channel AND from_xchan != '$channel_hash' ORDER BY created DESC $limit";
-				break;
-
-			case 'outbox':
-				$sql = "SELECT * FROM mail WHERE channel_id = $local_channel AND from_xchan = '$channel_hash' ORDER BY created DESC $limit";
-				break;
-
-			case 'combined':
-			default:
-				$parents = q("SELECT mail.parent_mid FROM mail LEFT JOIN conv ON mail.conv_guid = conv.guid WHERE mail.mid = mail.parent_mid AND mail.channel_id = %d ORDER BY conv.updated DESC $limit",
-					intval($local_channel)
-				);
-				break;
-		}
-
-	}
-
-	$r = null;
-
-	if($parents) {
-		foreach($parents as $parent) {
-			$all = q("SELECT * FROM mail WHERE parent_mid = '%s' AND channel_id = %d ORDER BY created DESC limit 1",
-				dbesc($parent['parent_mid']),
-				intval($local_channel)
-			);
-
-			if($all) {
-				foreach($all as $single) {
-					$r[] = $single;
-				}
-			}
-		}
-	}
-	elseif($sql) {
-		$r = q($sql);
-	}
-
-	if(! $r) {
-		return array();
-	}
-
-	$chans = array();
-	foreach($r as $rr) {
-		$s = "'" . dbesc(trim($rr['from_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
-		$s = "'" . dbesc(trim($rr['to_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
- 	}
-
-	$c = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$chans)) . ")");
-
-	foreach($r as $k => $rr) {
-		$r[$k]['from'] = find_xchan_in_array($rr['from_xchan'],$c);
-		$r[$k]['to']   = find_xchan_in_array($rr['to_xchan'],$c);
-		$r[$k]['seen'] = intval($rr['mail_seen']);
-		if(intval($r[$k]['mail_obscured'])) {
-			if($r[$k]['title'])
-				$r[$k]['title'] = base64url_decode(str_rot47($r[$k]['title']));
-			if($r[$k]['body'])
-				$r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
-		}
-	}
-
-	return $r;
-}
-
-
-
-function private_messages_fetch_message($channel_id, $messageitem_id, $updateseen = false) {
-
-	$messages = q("select * from mail where id = %d and channel_id = %d order by created asc",
-		dbesc($messageitem_id),
-		intval($channel_id)
-	);
-
-	if(! $messages)
-		return array();
-
-	$chans = array();
-	foreach($messages as $rr) {
-		$s = "'" . dbesc(trim($rr['from_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
-		$s = "'" . dbesc(trim($rr['to_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
-	}
-
-	$c = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$chans)) . ")");
-
-	foreach($messages as $k => $message) {
-		$messages[$k]['from'] = find_xchan_in_array($message['from_xchan'],$c);
-		$messages[$k]['to']   = find_xchan_in_array($message['to_xchan'],$c);
-		if(intval($messages[$k]['mail_obscured'])) {
-			if($messages[$k]['title'])
-				$messages[$k]['title'] = base64url_decode(str_rot47($messages[$k]['title']));
-			if($messages[$k]['body'])
-				$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
-		}
-	}
-
-
-	if($updateseen) {
-		$r = q("UPDATE mail SET mail_seen = 1 where mail_seen = 0 and id = %d AND channel_id = %d",
-			dbesc($messageitem_id),
-			intval($channel_id)
-		);
-	}
-
-	return $messages;
-
-}
-
-
-function private_messages_drop($channel_id, $messageitem_id, $drop_conversation = false) {
-
-
-	$x = q("select * from mail where id = %d and channel_id = %d limit 1",
-		intval($messageitem_id),
-		intval($channel_id)
-	);
-	if(! $x)
-		return false;
-
-	$conversation = null;
-
-	if($x[0]['conv_guid']) {
-		$y = q("select * from conv where guid = '%s' and uid = %d limit 1",
-			dbesc($x[0]['conv_guid']),
-			intval($channel_id)
-		);
-		if($y) {
-			$conversation = $y[0];
-			$conversation['subject'] = base64url_decode(str_rot47($conversation['subject']));
-		}
-	}
-
-	if($drop_conversation) {
-		$m = array();
-		$m['conv'] = array($conversation);
-		$m['conv'][0]['deleted'] = 1;
-
-		$z = q("select * from mail where parent_mid = '%s' and channel_id = %d",
-			dbesc($x[0]['parent_mid']),
-			intval($channel_id)
-		);
-		if($z) {
-			if($x[0]['conv_guid']) {
-				q("delete from conv where guid = '%s' and uid = %d",
-					dbesc($x[0]['conv_guid']),
-					intval($channel_id)
-				);
-			}
-			$m['mail'] = array();
-			foreach($z as $zz) {
-				xchan_mail_query($zz);
-				$zz['mail_deleted'] = 1;
-				$m['mail'][] = encode_mail($zz,true);
-			}
-			q("DELETE FROM mail WHERE parent_mid = '%s' AND channel_id = %d ",
-				dbesc($x[0]['parent_mid']),
-				intval($channel_id)
-			);
-		}
-		build_sync_packet($channel_id,$m);
-		return true;
-	}
-	else {
-		xchan_mail_query($x[0]);
-		$x[0]['mail_deleted'] = true;
-		msg_drop($messageitem_id, $channel_id, $x[0]['conv_guid']);
-		build_sync_packet($channel_id,array('mail' => array(encode_mail($x,true))));
-		return true;
-	}
-	return false;
-
-}
-
-
-function private_messages_fetch_conversation($channel_id, $messageitem_id, $updateseen = false) {
-
-	// find the parent_mid of the message being requested
-
-	$r = q("SELECT parent_mid from mail WHERE channel_id = %d and id = %d limit 1",
-		intval($channel_id),
-		intval($messageitem_id)
-	);
-
-	if(! $r)
-		return array();
-
-	$messages = q("select * from mail where parent_mid = '%s' and channel_id = %d order by created asc",
-		dbesc($r[0]['parent_mid']),
-		intval($channel_id)
-	);
-
-	if(! $messages)
-		return array();
-
-	$chans = array();
-	foreach($messages as $rr) {
-		$s = "'" . dbesc(trim($rr['from_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
-		$s = "'" . dbesc(trim($rr['to_xchan'])) . "'";
-		if(! in_array($s,$chans))
-			$chans[] = $s;
-	}
-
-
-	$c = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$chans)) . ")");
-
-	foreach($messages as $k => $message) {
-		$messages[$k]['from'] = find_xchan_in_array($message['from_xchan'],$c);
-		$messages[$k]['to']   = find_xchan_in_array($message['to_xchan'],$c);
-		if(intval($messages[$k]['mail_obscured'])) {
-			if($messages[$k]['title'])
-				$messages[$k]['title'] = base64url_decode(str_rot47($messages[$k]['title']));
-			if($messages[$k]['body'])
-				$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
-		}
-		if($messages[$k]['mail_raw'])
-			$messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
-
-	}
-
-
-
-	if($updateseen) {
-		$r = q("UPDATE mail SET mail_seen = 1 where mail_seen = 0 and parent_mid = '%s' AND channel_id = %d",
-			dbesc($r[0]['parent_mid']),
-			intval($channel_id)
-		);
-	}
-
-	return $messages;
-
-}
-
diff --git a/include/msglib.php b/include/msglib.php
deleted file mode 100644
index f0bf523de..000000000
--- a/include/msglib.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/* Common private message processing functions */
-
-function msg_drop($message_id, $channel_id, $conv_guid) {
-
-    // Delete message
-    $r = q("DELETE FROM mail WHERE id = %d AND channel_id = %d",
-        intval($message_id),
-        intval($channel_id)
-    );
-
-    // Get new first message...
-    $r = q("SELECT mid, parent_mid FROM mail WHERE conv_guid = '%s' AND channel_id = %d ORDER BY id ASC LIMIT 1",
-        dbesc($conv_guid),
-        intval($channel_id)
-    );
-    // ...and if wasn't first before...
-    if ($r[0]['mid'] != $r[0]['parent_mid']) {
-        // ...refer whole thread to it
-        q("UPDATE mail SET parent_mid = '%s', mail_isreply = abs(mail_isreply - 1) WHERE conv_guid = '%s' AND channel_id = %d",
-            dbesc($r[0]['mid']),
-            dbesc($conv_guid),
-            intval($channel_id)
-        );
-    }
-
-}
diff --git a/include/network.php b/include/network.php
index 77b7c49d6..194b50885 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1159,31 +1159,6 @@ function discover_by_webbie($webbie, $protocol = '') {
 				}
 			}
 		}
-
-		foreach($x['links'] as $link) {
-			if(array_key_exists('rel',$link)) {
-
-				// If we discover zot - don't search further; grab the info and get out of
-				// here.
-
-				if($link['rel'] === PROTOCOL_ZOT && ((! $protocol) || (strtolower($protocol) === 'zot'))) {
-					logger('zot found for ' . $webbie, LOGGER_DEBUG);
-					if(array_key_exists('zot',$x) && $x['zot']['success']) {
-						$i = import_xchan($x['zot']);
-						return true;
-					}
-					else {
-						$z = z_fetch_url($link['href']);
-						if($z['success']) {
-							$j = json_decode($z['body'],true);
-							$i = import_xchan($j);
-							return true;
-						}
-					}
-				}
-			}
-		}
-
 	}
 
 	logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO);
diff --git a/include/permissions.php b/include/permissions.php
index 9dd503132..33b385490 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -157,7 +157,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		// If we're still here, we have an observer, check the network.
 
 		if($channel_perm & PERMS_NETWORK) {
-			if($x && in_array($x[0]['xchan_network'],[ 'zot','zot6'])) {
+			if($x && $x[0]['xchan_network'] === 'zot6') {
 				$ret[$perm_name] = true;
 				continue;
 			}
@@ -366,7 +366,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock =
 	// If we're still here, we have an observer, check the network.
 
 	if($channel_perm & PERMS_NETWORK) {
-		if ($x && in_array($x[0]['xchan_network'], ['zot','zot6']))
+		if ($x && $x[0]['xchan_network'] === 'zot6')
 			return true;
 	}
 
diff --git a/include/photos.php b/include/photos.php
index 11dd07586..967acf955 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -4,6 +4,9 @@
  * @brief Functions related to photo handling.
  */
 
+use Zotlabs\Lib\Activity;
+
+
 require_once('include/permissions.php');
 require_once('include/items.php');
 require_once('include/photo/photo_driver.php');
@@ -256,10 +259,10 @@ function photo_upload($channel, $observer, $args) {
 	if($args['description'])
 		$p['description'] = $args['description'];
 
-	$link   = array();
+	$url = [];
 
 	$r0 = $ph->save($p);
-	$link[0] = array(
+	$url[0] = array(
 		'rel'  => 'alternate',
 		'type' => $type,
 		'href' => z_root() . '/photo/' . $photo_hash . '-0.' . $ph->getExt(),
@@ -278,7 +281,7 @@ function photo_upload($channel, $observer, $args) {
 		$ph->scaleImage(1024);
 
 	$r1 = $ph->storeThumbnail($p, PHOTO_RES_1024);
-	$link[1] = array(
+	$url[1] = array(
 		'rel'  => 'alternate',
 		'type' => $type,
 		'href' => z_root() . '/photo/' . $photo_hash . '-1.' . $ph->getExt(),
@@ -292,7 +295,7 @@ function photo_upload($channel, $observer, $args) {
 		$ph->scaleImage(640);
 
 	$r2 = $ph->storeThumbnail($p, PHOTO_RES_640);
-	$link[2] = array(
+	$url[2] = array(
 		'rel'  => 'alternate',
 		'type' => $type,
 		'href' => z_root() . '/photo/' . $photo_hash . '-2.' . $ph->getExt(),
@@ -306,7 +309,7 @@ function photo_upload($channel, $observer, $args) {
 		$ph->scaleImage(320);
 
 	$r3 = $ph->storeThumbnail($p, PHOTO_RES_320);
-	$link[3] = array(
+	$url[3] = array(
 		'rel'  => 'alternate',
 		'type' => $type,
 		'href' => z_root() . '/photo/' . $photo_hash . '-3.' . $ph->getExt(),
@@ -353,18 +356,18 @@ function photo_upload($channel, $observer, $args) {
 
 	$large_photos = feature_enabled($channel['channel_id'], 'large_photos');
 
-	linkify_tags($args['body'], $channel_id);
+	$found_tags = linkify_tags($args['body'], $channel_id);
 
 	if($large_photos) {
 		$scale = 1;
-		$width = $link[1]['width'];
-		$height = $link[1]['height'];
+		$width = $url[1]['width'];
+		$height = $url[1]['height'];
 		$tag = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
 	}
 	else {
 		$scale = 2;
-		$width = $link[2]['width'];
-		$height = $link[2]['height'];
+		$width = $url[2]['width'];
+		$height = $url[2]['height'];
 		$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
 	}
 
@@ -382,22 +385,61 @@ function photo_upload($channel, $observer, $args) {
 		. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
 		. '[/zrl]';
 
-	// Create item object
-	$object = array(
-		'type'    => ACTIVITY_OBJ_PHOTO,
-		'title'   => $title,
-		'created' => $p['created'],
-		'edited'  => $p['edited'],
-		'id'      => z_root() . '/item/' . $photo_hash,
-		'link'    => $link,
-		'body'    => $summary
-	);
+	$url[] = [
+		'type'      => 'Link',
+		'mediaType' => 'text/html',
+		'href'      => z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash
+	];
+
+	$post_tags = [];
+
+	if($found_tags) {
+		foreach($found_tags as $result) {
+			$success = $result['success'];
+			if($success['replaced']) {
+				$post_tags[] = array(
+					'uid'   => $channel['channel_id'],
+					'ttype' => $success['termtype'],
+					'otype' => TERM_OBJ_POST,
+					'term'  => $success['term'],
+					'url'   => $success['url']
+				);
+			}
+		}
+	}
 
-	$target = array(
-		'type'    => ACTIVITY_OBJ_ALBUM,
-		'title'   => (($album) ? $album : '/'),
-		'id'      => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album)
-	);
+	//// Create item object
+	$object = [
+		'type'      => 'Image',
+		'name'      => $title,
+		'published' => datetime_convert('UTC','UTC',$p['created'],ATOM_TIME),
+		'updated'   => datetime_convert('UTC','UTC',$p['edited'],ATOM_TIME),
+		// This is a placeholder and will get over-ridden by the item mid, which is critical for sharing as a conversational item over activitypub
+		'id'        => z_root() . '/photo/' . $photo_hash,
+		'url'       => $url,
+		'source'    => [ 'content' => $summary, 'mediaType' => 'text/bbcode' ],
+		'content'   => bbcode($summary)
+	];
+
+	if ($post_tags) {
+		$object['tag'] = Activity::encode_taxonomy(['term' => $post_tags]);
+	}
+
+	$public = (($ac['allow_cid'] || $ac['allow_gid'] || $ac['deny_cid'] || $ac['deny_gid']) ? false : true);
+
+	if ($public) {
+		$object['to'] = [ ACTIVITY_PUBLIC_INBOX ];
+		$object['cc'] = [ z_root() . '/followers/' . $channel['channel_address'] ];
+	}
+	else {
+		$object['to'] = Activity::map_acl(array_merge($ac, ['item_private' => 1 - intval($public) ]));
+	}
+
+	$target = [
+		'type'    => 'orderedCollection',
+		'name'    => ((strlen($album)) ? $album : '/'),
+		'id'      => z_root() . '/album/' . $channel['channel_address'] . ((isset($args['folder'])) ? '/' . $args['folder'] : EMPTY_STR)
+	];
 
 	// Create item container
 	if($args['item']) {
@@ -415,7 +457,9 @@ function photo_upload($channel, $observer, $args) {
 
 				$item['tgt_type'] = ACTIVITY_OBJ_ALBUM;
 				$item['target']	= json_encode($target);
-
+				if ($post_tags) {
+					$arr['term'] = $post_tags;
+				}
 				$force = true;
 			}
 			$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
@@ -469,6 +513,10 @@ function photo_upload($channel, $observer, $args) {
 			'body'            => $summary
 		];
 
+		if ($post_tags) {
+			$arr['term'] = $post_tags;
+		}
+
 		$arr['plink'] = $mid;
 
 		if($lat && $lon)
diff --git a/include/queue_fn.php b/include/queue_fn.php
deleted file mode 100644
index 1e8171b1d..000000000
--- a/include/queue_fn.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php /** @file */
-
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Zot6\Receiver;
-use Zotlabs\Zot6\Zot6Handler;
-
-function update_queue_item($id, $add_priority = 0) {
-	logger('queue: requeue item ' . $id,LOGGER_DEBUG);
-	$x = q("select outq_created, outq_posturl from outq where outq_hash = '%s' limit 1",
-		dbesc($id)
-	);
-	if(! $x)
-		return;
-
-
-	$y = q("select outq_created as earliest from outq where outq_posturl = '%s' order by earliest limit 1",
-		dbesc($x[0]['outq_posturl'])
-	);
-
-	// look for the oldest queue entry with this destination URL. If it's older than a couple of days,
-	// the destination is considered to be down and only scheduled once an hour, regardless of the
-	// age of the current queue item.
-
-	$might_be_down = false;
-
-	if($y)
-		$might_be_down = ((datetime_convert('UTC','UTC',$y[0]['earliest']) < datetime_convert('UTC','UTC','now - 2 days')) ? true : false);
-
-
-	// Set all other records for this destination way into the future. 
-	// The queue delivers by destination. We'll keep one queue item for
-	// this destination (this one) with a shorter delivery. If we succeed
-	// once, we'll try to deliver everything for that destination.
-	// The delivery will be set to at most once per hour, and if the 
-	// queue item is less than 12 hours old, we'll schedule for fifteen
-	// minutes. 
-
-	$r = q("UPDATE outq SET outq_scheduled = '%s' WHERE outq_posturl = '%s'",
-		dbesc(datetime_convert('UTC','UTC','now + 5 days')),
-		dbesc($x[0]['outq_posturl'])
-	);
- 
-	$since = datetime_convert('UTC','UTC',$x[0]['outq_created']);
-
-	if(($might_be_down) || ($since < datetime_convert('UTC','UTC','now - 12 hour'))) {
-		$next = datetime_convert('UTC','UTC','now + 1 hour');
-	}
-	else {
-		$next = datetime_convert('UTC','UTC','now + ' . intval($add_priority) . ' minutes');
-	}
-
-	q("UPDATE outq SET outq_updated = '%s', 
-		outq_priority = outq_priority + %d, 
-		outq_scheduled = '%s' 
-		WHERE outq_hash = '%s'",
-
-		dbesc(datetime_convert()),
-		intval($add_priority),
-		dbesc($next),
-		dbesc($id)
-	);
-}
-
-function remove_queue_item($id,$channel_id = 0) {
-	logger('queue: remove queue item ' . $id,LOGGER_DEBUG);
-	$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
-		
-	q("DELETE FROM outq WHERE outq_hash = '%s' $sql_extra",
-		dbesc($id)
-	);
-}
-
-
-function remove_queue_by_posturl($posturl) {
-	logger('queue: remove queue posturl ' . $posturl,LOGGER_DEBUG);
-		
-	q("DELETE FROM outq WHERE outq_posturl = '%s' ",
-		dbesc($posturl)
-	);
-}
-
-
-
-function queue_set_delivered($id,$channel = 0) {
-	logger('queue: set delivered ' . $id,LOGGER_DEBUG);
-	$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
-
-	// Set the next scheduled run date so far in the future that it will be expired
-	// long before it ever makes it back into the delivery chain. 
-
-	q("update outq set outq_delivered = 1, outq_updated = '%s', outq_scheduled = '%s' where outq_hash = '%s' $sql_extra ",
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert('UTC','UTC','now + 5 days')),
-		dbesc($id)
-	);
-}
-
-
-
-function queue_insert($arr) {
-
-	// do not queue anything with no destination
-
-	if(! (array_key_exists('posturl',$arr) && trim($arr['posturl']))) {
-		return false;
-	}
-
-	$x = q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_priority,
-		outq_created, outq_updated, outq_scheduled, outq_notify, outq_msg ) 
-		values ( '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s' )",
-		dbesc($arr['hash']),
-		intval($arr['account_id']),
-		intval($arr['channel_id']),
-		dbesc(($arr['driver']) ? $arr['driver'] : 'zot'),
-		dbesc($arr['posturl']),
-		intval(1),
-		intval(($arr['priority']) ? $arr['priority'] : 0),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
-		dbesc($arr['notify']),
-		dbesc(($arr['msg']) ? $arr['msg'] : '')
-	);
-	return $x;
-
-}
-
-
-
-function queue_deliver($outq, $immediate = false) {
-
-	$base = null;
-	$h = parse_url($outq['outq_posturl']);
-	if($h !== false) 
-		$base = $h['scheme'] . '://' . $h['host'] . (isset($h['port']) ? ':' . $h['port'] : '');
-
-	if(($base) && ($base !== z_root()) && ($immediate)) {
-		$y = q("select site_update, site_dead from site where site_url = '%s' ",
-			dbesc($base)
-		);
-		if($y) {
-			if(intval($y[0]['site_dead'])) {
-				remove_queue_by_posturl($outq['outq_posturl']);
-				logger('dead site ignored ' . $base);
-				return;
-			}
-			if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
-				update_queue_item($outq['outq_hash'],10);
-				logger('immediate delivery deferred for site ' . $base);
-				return;
-			}
-		}
-		else {
-
-			// zot sites should all have a site record, unless they've been dead for as long as
-			// your site has existed. Since we don't know for sure what these sites are,
-			// call them unknown
-
-			site_store_lowlevel( 
-				[
-					'site_url'    => $base,
-					'site_update' => datetime_convert(),
-					'site_dead'   => 0,
-					'site_type'   => intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
-					'site_crypto' => ''
-				]
-			);
-		}
-	}
-
-
-
-	
-
-
-	$arr = array('outq' => $outq, 'base' => $base, 'handled' => false, 'immediate' => $immediate);
-	call_hooks('queue_deliver',$arr);
-	if($arr['handled'])
-		return;
-
-	// "post" queue driver - used for diaspora and friendica-over-diaspora communications.
-
-	if($outq['outq_driver'] === 'post') {
-		$result = z_post_url($outq['outq_posturl'],$outq['outq_msg']);
-		if($result['success'] && $result['return_code'] < 300) {
-			logger('deliver: queue post success to ' . $outq['outq_posturl'], LOGGER_DEBUG);
-			if($base) {
-				q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
-					dbesc(datetime_convert()),
-					dbesc($base)
-				);
-			}
-			q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-				dbesc('accepted for delivery'),
-				dbesc(datetime_convert()),
-				dbesc($outq['outq_hash'])
-			);
-			remove_queue_item($outq['outq_hash']);
-
-			// server is responding - see if anything else is going to this destination and is piled up 
-			// and try to send some more. We're relying on the fact that do_delivery() results in an 
-			// immediate delivery otherwise we could get into a queue loop. 
-
-			if(! $immediate) {
-				$x = q("select outq_hash from outq where outq_posturl = '%s' and outq_delivered = 0",
-					dbesc($outq['outq_posturl'])
-				);
-
-				$piled_up = array();
-				if($x) {
-					foreach($x as $xx) {
-						 $piled_up[] = $xx['outq_hash'];
-					}
-				}
-				if($piled_up) {
-					// call do_delivery() with the force flag
-					do_delivery($piled_up, true);
-				}
-			}
-		}
-		else {
-			logger('deliver: queue post returned ' . $result['return_code'] 
-				. ' from ' . $outq['outq_posturl'],LOGGER_DEBUG);
-				update_queue_item($outq['outq_hash'],10);
-		}
-		return;
-	}
-
-	// normal zot delivery
-
-	logger('deliver: dest: ' . $outq['outq_posturl'] . ' driver: ' . $outq['outq_driver'], LOGGER_DEBUG);
-
-	if($outq['outq_driver'] === 'zot6') {
-
-		if($outq['outq_posturl'] === z_root() . '/zot') {
-			// local delivery
-			$zot = new Receiver(new Zot6Handler(),$outq['outq_notify']);
-			$result = $zot->run(true);
-			logger('returned_json: ' . json_encode($result,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES), LOGGER_DATA);
-			logger('deliver: local zot6 delivery succeeded to ' . $outq['outq_posturl']);
-			Libzot::process_response($outq['outq_posturl'],[ 'success' => true, 'body' => json_encode($result) ], $outq);
-		}
-		else {
-			logger('remote');
-			$channel = null;
-
-			if($outq['outq_channel']) {
-				$channel = channelx_by_n($outq['outq_channel']);
-			}
-
-			$host_crypto = null;
-			if($channel && $base) {
-				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
-					dbesc($base)
-				);
-				if($h) {
-					$host_crypto = $h[0];
-				}
-			}
-
-			$msg = $outq['outq_notify'];
-
-			$result = Libzot::zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
-
-			if($result['success']) {
-				logger('deliver: remote zot6 delivery succeeded to ' . $outq['outq_posturl']);
-				Libzot::process_response($outq['outq_posturl'],$result, $outq);
-			}
-			else {
-				logger('deliver: remote zot6 delivery failed to ' . $outq['outq_posturl']);
-				logger('deliver: remote zot6 delivery fail data: ' . print_r($result,true), LOGGER_DATA);
-				update_queue_item($outq['outq_hash'],10);
-			}
-
-		}
-		return;
-	}
-	else {
-
-		$channel = null;
-
-		if($outq['outq_msg'] && $outq['outq_channel']) {
-			$channel = channelx_by_n($outq['outq_channel']);
-		}
-
-		$host_crypto = null;
-
-		if($channel && $base) {
-			$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_sitekey != ''  order by hubloc_id desc limit 1",
-				dbesc($base)
-			);
-			if($h) {
-				$host_crypto = $h[0];
-			}
-		}
-
-		$msg = $outq['outq_notify'];
-
-		$result = zot_zot($outq['outq_posturl'],$msg,$channel,$host_crypto);
-
-
-		if($result['success']) {
-			logger('deliver: remote zot delivery succeeded to ' . $outq['outq_posturl']);
-			zot_process_response($outq['outq_posturl'],$result, $outq);
-		}
-		else {
-			logger('deliver: remote zot delivery failed to ' . $outq['outq_posturl']);
-			logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
-			update_queue_item($outq['outq_hash'],10);
-		}
-		return;
-	}
-
-}
diff --git a/include/security.php b/include/security.php
index f433f8094..b6c0f1511 100644
--- a/include/security.php
+++ b/include/security.php
@@ -681,12 +681,11 @@ function get_security_ids($channel_id, $ob_hash) {
 	];
 
 	if ($channel_id) {
-		$ch = q("select channel_hash, channel_portable_id from channel where channel_id = %d",
+		$ch = q("select channel_hash from channel where channel_id = %d",
 			intval($channel_id)
 		);
 		if ($ch) {
 			$ret['channel_id'][] = $ch[0]['channel_hash'];
-			$ret['channel_id'][] = $ch[0]['channel_portable_id'];
 		}
 	}
 
diff --git a/include/socgraph.php b/include/socgraph.php
index aaea4550c..5b913dcfd 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -5,8 +5,6 @@ use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\Libzotdir;
 use Zotlabs\Lib\Zotfinger;
 
-require_once('include/dir_fns.php');
-require_once('include/zot.php');
 
 /**
  * poco_load
@@ -24,7 +22,7 @@ require_once('include/zot.php');
  *
  * Once the global contact is stored add (if necessary) the contact linkage which associates
  * the given uid, cid to the global contact entry. There can be many uid/cid combinations
- * pointing to the same global contact id. 
+ * pointing to the same global contact id.
  *
  * @param string $xchan
  * @param string $url
@@ -127,14 +125,14 @@ function poco_load($xchan = '', $url = null) {
 					$profile_url = $url['value'];
 					continue;
 				}
-				if(in_array($url['type'], ['zot','zot6'] )) {
+				if($url['type'] === 'zot6') {
 					$network = $url['type'];
 					$address = str_replace('acct:' , '', $url['value']);
 					continue;
 				}
 			}
 		}
-		if(x($entry,'photos') && is_array($entry['photos'])) { 
+		if(x($entry,'photos') && is_array($entry['photos'])) {
 			foreach($entry['photos'] as $photo) {
 				if($photo['type'] == 'profile') {
 					$profile_photo = $photo['value'];
@@ -145,7 +143,7 @@ function poco_load($xchan = '', $url = null) {
 
 		if((! $name) || (! $profile_url) || (! $profile_photo) || (! $hash) || (! $address)) {
 			logger('poco_load: missing data');
-			continue; 
+			continue;
 		}
 
 		$x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
@@ -168,18 +166,6 @@ function poco_load($xchan = '', $url = null) {
 						continue;
 					}
 				}
-				if($network === 'zot') {
-					$j = Zotlabs\Zot\Finger::run($address,null);
-					if($j['success']) {
-						import_xchan($j);
-					}
-					$x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
-						dbesc($hash)
-					);
-					if(! $x) {
-						continue;
-					}
-				}
 			}
 			else {
 				continue;
@@ -242,7 +228,7 @@ function common_friends($uid,$xchan,$start = 0,$limit=100000000,$shuffle = false
 	if($shuffle)
 		$sql_extra = " order by $rand ";
 	else
-		$sql_extra = " order by xchan_name asc "; 
+		$sql_extra = " order by xchan_name asc ";
 
 	$r = q("SELECT * from xchan left join xlink on xlink_link = xchan_hash where xlink_xchan = '%s' and xlink_static = 0 and xlink_link in
 		(select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_self = 0 ) $sql_extra limit %d offset %d",
@@ -318,7 +304,7 @@ function update_suggestions() {
 		$url = z_root() . '/sitelist';
 	}
 	else {
-		$directory = find_upstream_directory($dirmode);
+		$directory = Libzotdir::find_upstream_directory($dirmode);
 		$url = $directory['url'] . '/sitelist';
 	}
 	if(! $url)
@@ -329,8 +315,8 @@ function update_suggestions() {
 	if($ret['success']) {
 
 		// We will grab fresh data once a day via the poller. Remove anything over a week old because
-		// the targets may have changed their preferences and don't want to be suggested - and they 
-		// may have simply gone away. 
+		// the targets may have changed their preferences and don't want to be suggested - and they
+		// may have simply gone away.
 
 		$r = q("delete from xlink where xlink_xchan = '' and xlink_updated < %s - INTERVAL %s and xlink_static = 0",
 			db_utcnow(), db_quoteinterval('7 DAY')
@@ -413,11 +399,11 @@ function poco($a,$extended = false) {
 		$sql_extra = sprintf(" and abook_id = %d and abook_hidden = 0 and abook_pending = 0 ",intval($cid));
 
 	if($system_mode) {
-		$r = q("SELECT count(*) as total from abook where abook_self = 1 
+		$r = q("SELECT count(*) as total from abook where abook_self = 1
 			and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') ");
 	}
 	else {
-		$r = q("SELECT count(*) as total from abook where abook_channel = %d 
+		$r = q("SELECT count(*) as total from abook where abook_channel = %d
 			$sql_extra ",
 			intval($channel_id)
 		);
@@ -437,14 +423,14 @@ function poco($a,$extended = false) {
 	$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
 	if($system_mode) {
-		$r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_self = 1 
-			and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1') 
+		$r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_self = 1
+			and abook_channel in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = '1')
 			limit %d offset %d ",
 			intval($itemsPerPage),
 			intval($startIndex)
 		);
 	} else {
-		$r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d 
+		$r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d
 			$sql_extra LIMIT %d OFFSET %d",
 			intval($channel_id),
 			intval($itemsPerPage),
@@ -513,7 +499,7 @@ function poco($a,$extended = false) {
 					$entry['urls'] = array(array('value' => $rr['xchan_url'], 'type' => 'profile'));
 					$network = $rr['xchan_network'];
 					if($rr['xchan_addr'])
-						$entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network);  
+						$entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network);
 				}
 				if($fields_ret['preferredUsername'])
 					$entry['preferredUsername'] = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@'));
@@ -536,7 +522,7 @@ function poco($a,$extended = false) {
 	if($format === 'json') {
 		header('Content-type: application/json');
 		echo json_encode($ret);
-		killme();	
+		killme();
 	}
 	else
 		http_status_exit(500);
diff --git a/include/text.php b/include/text.php
index 622c44f14..841abdbd3 100644
--- a/include/text.php
+++ b/include/text.php
@@ -11,6 +11,7 @@ use Ramsey\Uuid\Exception\UnableToBuildUuidException;
 
 use Zotlabs\Lib\Crypto;
 use Zotlabs\Lib\SvgSanitizer;
+use Zotlabs\Lib\Libzot;
 
 require_once("include/bbcode.php");
 
@@ -1515,24 +1516,6 @@ function link_compare($a, $b) {
 	return false;
 }
 
-// Given an item array, convert the body element from bbcode to html and add smilie icons.
-// If attach is true, also add icons for item attachments
-
-
-function unobscure(&$item) {
-	return;
-}
-
-function unobscure_mail(&$item) {
-	if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) {
-		if($item['title'])
-			$item['title'] = base64url_decode(str_rot47($item['title']));
-		if($item['body'])
-			$item['body'] = base64url_decode(str_rot47($item['body']));
-	}
-}
-
-
 function theme_attachments(&$item) {
 
 	$s = '';
@@ -1732,19 +1715,33 @@ function prepare_body(&$item,$attach = false,$opts = false) {
 	$photo = '';
 	$is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false);
 
-	if($is_photo) {
-
+	if ($is_photo) {
 		$object = json_decode($item['obj'],true);
+		$ptr = null;
+		if (array_key_exists('url',$object) && is_array($object['url'])) {
+			if (array_key_exists(0,$object['url'])) {
+				foreach ($object['url'] as $link) {
+					if(array_key_exists('width',$link) && $link['width'] >= 640 && $link['width'] <= 1024) {
+						$ptr = $link;
+					}
+				}
+				if (! $ptr) {
+					$ptr = $object['url'][0];
+				}
+			}
+			else {
+				$ptr = $object['url'];
+			}
 
-		// if original photo width is <= 640px prepend it to item body
-		if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) {
-			$s .= '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener" ><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
-		}
-
-		// if original photo width is > 640px make it a cover photo
-		if($object['link'][0]['width'] && $object['link'][0]['width'] > 640) {
-			$scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0);
-			$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>';
+			// if original photo width is > 640px make it a cover photo
+			if ($ptr) {
+				if (array_key_exists('width',$ptr) && $ptr['width'] > 640) {
+				$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener"><img style="max-width:' . $ptr['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($ptr['href'])) . '"></a>';
+				}
+				else {
+					$item['body'] = '[zmg]' . $ptr['href'] . '[/zmg]' . "\n\n" . $item['body'];
+				}
+			}
 		}
 	}
 
@@ -2067,7 +2064,7 @@ function get_plink($item,$conversation_mode = true) {
 
 	$zidify = true;
 
-	if(array_key_exists('author',$item) && in_array($item['author']['xchan_network'], ['zot6', 'zot']) === false)
+	if(array_key_exists('author',$item) && $item['author']['xchan_network'] !== 'zot6')
 		$zidify = false;
 
 	if(x($item,$key)) {
@@ -2555,27 +2552,6 @@ function xchan_query(&$items, $abook = true, $effective_uid = 0) {
 	}
 }
 
-function xchan_mail_query(&$item) {
-	$arr = array();
-	$chans = null;
-	if($item) {
-		if($item['from_xchan'] && (! in_array("'" . dbesc($item['from_xchan']) . "'",$arr)))
-			$arr[] = "'" . dbesc($item['from_xchan']) . "'";
-		if($item['to_xchan'] && (! in_array("'" . dbesc($item['to_xchan']) . "'",$arr)))
-			$arr[] = "'" . dbesc($item['to_xchan']) . "'";
-	}
-
-	if(count($arr)) {
-		$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
-			where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1");
-	}
-	if($chans) {
-		$item['from'] = find_xchan_in_array($item['from_xchan'],$chans);
-		$item['to']  = find_xchan_in_array($item['to_xchan'],$chans);
-	}
-}
-
-
 function find_xchan_in_array($xchan,$arr) {
 	if(count($arr)) {
 		foreach($arr as $x) {
@@ -2876,7 +2852,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 
 	// BEGIN mentions
 
-	if ( in_array($termtype, [ TERM_MENTION, TERM_FORUM ] )) {
+	if ($termtype === TERM_MENTION) {
 
 		// The @! tag will alter permissions
 
@@ -2903,14 +2879,13 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 			$newname = substr($name,1);
 			$newname = substr($newname,0,-1);
 
-			$r = q("select * from xchan where xchan_addr = '%s' or xchan_url = '%s'",
+			$r = q("SELECT * FROM xchan WHERE ( xchan_addr = '%s' OR xchan_url = '%s' ) AND xchan_deleted = 0",
 				dbesc($newname),
 				dbesc($newname)
 			);
 		}
 
 		if(! $r) {
-
 			// look for matching names in the address book
 
 			// Double quote the entire mentioned term to include special characters
@@ -2929,18 +2904,18 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 
 			// select someone from this user's contacts by name
 
-			$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
-				WHERE xchan_name = '%s' AND abook_channel = %d ",
-					dbesc($newname),
-					intval($profile_uid)
+			$r = q("SELECT * FROM abook LEFT JOIN xchan ON abook_xchan = xchan_hash
+				WHERE xchan_name = '%s' AND abook_channel = %d AND xchan_deleted = 0",
+				dbesc($newname),
+				intval($profile_uid)
 			);
 
 			// select anybody by full hubloc_addr
 
 			if((! $r) && strpos($newname,'@')) {
-				$r = q("SELECT * FROM xchan left join hubloc on xchan_hash = hubloc_hash
-					WHERE hubloc_addr = '%s' ",
-						dbesc($newname)
+				$r = q("SELECT * FROM xchan LEFT JOIN hubloc ON xchan_hash = hubloc_hash
+					WHERE hubloc_addr = '%s' AND xchan_deleted = 0 ",
+					dbesc($newname)
 				);
 			}
 
@@ -2950,10 +2925,10 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 				// strip user-supplied wildcards before running a wildcard search
 				$newname = str_replace('%','',$newname);
 
-				$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
-					WHERE xchan_addr like ('%s') AND abook_channel = %d ",
-						dbesc(((strpos($newname,'@')) ? $newname : $newname . '@%')),
-						intval($profile_uid)
+				$r = q("SELECT * FROM abook LEFT JOIN xchan ON abook_xchan = xchan_hash
+					WHERE xchan_addr LIKE ('%s') AND abook_channel = %d AND xchan_deleted = 0",
+					dbesc(((strpos($newname,'@')) ? $newname : $newname . '@%')),
+					intval($profile_uid)
 				);
 			}
 
@@ -2965,7 +2940,10 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 		// $r is set if we found something
 
 		if($r) {
-			foreach($r as $xc) {
+
+			$xchan[0] = Libzot::zot_record_preferred($r, 'xchan_network');
+
+			foreach($xchan as $xc) {
 				$profile = $xc['xchan_url'];
 				$newname = $xc['xchan_name'];
 				// add the channel's xchan_hash to $access_tag if exclusive
@@ -2980,16 +2958,9 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true)
 					//create profile link
 					$profile = str_replace(',','%2c',$profile);
 					$url = $profile;
-/*
-					if($termtype === TERM_FORUM) {
-						$newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname	. '[/zrl]';
-						$body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
-					}
-*/
-					if ($termtype === TERM_MENTION) {
-						$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname	. '[/zrl]';
-						$body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
-					}
+
+					$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname	. '[/zrl]';
+					$body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
 
 					// append tag to str_tags
 					if(! stristr($str_tags,$newtag)) {
@@ -3919,3 +3890,30 @@ function sanitize_text_field($str) {
 	return preg_replace('/\s+/S', ' ', $str);
 }
 
+/**
+ * @brief shortens a string to $max_length without cutting off words
+ * @param string $str
+ * @param intval $max_length
+ * @param string $suffix (optional)
+
+ * @return string
+ */
+function substr_words($str, $max_length, $suffix = '...') {
+
+	if (strlen($str) > $max_length) {
+		$words = preg_split('/\s/', $str);
+		$ret = '';
+		$i = 0;
+		while (true) {
+			$length = (strlen($ret) + strlen($words[$i]));
+			if ($length > $max_length) {
+				break;
+			}
+			$ret .= " " . $words[$i];
+			++$i;
+		}
+		$ret .= $suffix;
+	}
+
+	return (($ret) ? $ret : $str);
+}
diff --git a/include/xchan.php b/include/xchan.php
index 07fdb8b47..a32064303 100644
--- a/include/xchan.php
+++ b/include/xchan.php
@@ -85,13 +85,6 @@ function xchan_store($arr) {
 			}
 		}
 
-		if($arr['network'] === 'zot') {
-			if((! $arr['key']) || (! Crypto::verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key']))) {
-				logger('Unable to verify signature for ' . $arr['hash']);
-				return false;
-			}
-		}
-
 		$columns = db_columns('xchan');
 
 		$x = [];
diff --git a/include/zid.php b/include/zid.php
index 0a33280ee..422683c95 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -14,7 +14,7 @@ function is_matrix_url($url) {
 		if(array_key_exists($m['host'],$remembered))
 			return $remembered[$m['host']];
 
-		$r = q("select hubloc_url from hubloc where hubloc_host = '%s' and hubloc_network in ('zot', 'zot6') limit 1",
+		$r = q("select hubloc_url from hubloc where hubloc_host = '%s' and hubloc_network = 'zot6' limit 1",
 			dbesc($m['host'])
 		);
 		if($r) {
diff --git a/include/zot.php b/include/zot.php
deleted file mode 100644
index 634561fa3..000000000
--- a/include/zot.php
+++ /dev/null
@@ -1,5400 +0,0 @@
-<?php
-/**
- * @file include/zot.php
- * @brief Hubzilla implementation of zot protocol.
- *
- * https://github.com/friendica/red/wiki/zot
- * https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview
- *
- */
-
-use Zotlabs\Lib\Crypto;
-use Zotlabs\Lib\DReport;
-use Zotlabs\Lib\Libzot;
-use Zotlabs\Lib\Activity;
-
-require_once('include/crypto.php');
-require_once('include/items.php');
-require_once('include/queue_fn.php');
-require_once('include/perm_upgrade.php');
-require_once('include/msglib.php');
-
-
-/**
- * @brief Generates a unique string for use as a zot guid.
- *
- * Generates a unique string for use as a zot guid using our DNS-based url, the
- * channel nickname and some entropy.
- * The entropy ensures uniqueness against re-installs where the same URL and
- * nickname are chosen.
- *
- * @note zot doesn't require this to be unique. Internally we use a whirlpool
- * hash of this guid and the signature of this guid signed with the channel
- * private key. This can be verified and should make the probability of
- * collision of the verified result negligible within the constraints of our
- * immediate universe.
- *
- * @param string $channel_nick a unique nickname of controlling entity
- * @returns string
- */
-function zot_new_uid($channel_nick) {
-	$rawstr = z_root() . '/' . $channel_nick . '.' . mt_rand();
-	return(base64url_encode(hash('whirlpool', $rawstr, true), true));
-}
-
-/**
- * @brief Generates a portable hash identifier for a channel.
- *
- * Generates a portable hash identifier for the channel identified by $guid and
- * signed with $guid_sig.
- *
- * @note This ID is portable across the network but MUST be calculated locally
- * by verifying the signature and can not be trusted as an identity.
- *
- * @param string $guid
- * @param string $guid_sig
- */
-function make_xchan_hash($guid, $guid_sig) {
-	return base64url_encode(hash('whirlpool', $guid . $guid_sig, true));
-}
-
-/**
- * @brief Given a zot hash, return all distinct hubs.
- *
- * This function is used in building the zot discovery packet and therefore
- * should only be used by channels which are defined on this hub.
- *
- * @param string $hash - xchan_hash
- * @returns array of hubloc (hub location structures)
- *  * \b hubloc_id          int
- *  * \b hubloc_guid        char(191)
- *  * \b hubloc_guid_sig    text
- *  * \b hubloc_hash        char(191)
- *  * \b hubloc_addr        char(191)
- *  * \b hubloc_flags       int
- *  * \b hubloc_status      int
- *  * \b hubloc_url         char(191)
- *  * \b hubloc_url_sig     text
- *  * \b hubloc_host        char(191)
- *  * \b hubloc_callback    char(191)
- *  * \b hubloc_connect     char(191)
- *  * \b hubloc_sitekey     text
- *  * \b hubloc_updated     datetime
- *  * \b hubloc_connected   datetime
- */
-function zot_get_hublocs($hash) {
-
-	/* Only search for active hublocs - e.g. those that haven't been marked deleted */
-
-	$ret = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 and hubloc_network = 'zot' order by hubloc_url ",
-		dbesc($hash)
-	);
-
-	return $ret;
-}
-
-/**
- * @brief Builds a zot notification packet.
- *
- * Builds a zot notification packet that you can either store in the queue with
- * a message array or call zot_zot to immediately zot it to the other side.
- *
- * @param array $channel
- *   sender channel structure
- * @param string $type
- *   packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'keychange', 'force_refresh', 'notify', 'auth_check'
- * @param array $recipients
- *   envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
- * @param string $remote_key
- *   optional public site key of target hub used to encrypt entire packet
- *   NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others
- * @param string $methods
- *   optional comma separated list of encryption methods @ref zot_best_algorithm()
- * @param string $secret
- *   random string, required for packets which require verification/callback
- *   e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
- * @param string $extra
- * @returns string json encoded zot packet
- */
-function zot_build_packet($channel, $type = 'notify', $recipients = null, $remote_key = null, $methods = '', $secret = null, $extra = null) {
-
-	$sig_method = get_config('system','signature_algorithm','sha256');
-
-	$data = [
-		'type' => $type,
-		'sender' => [
-			'guid' => $channel['channel_guid'],
-			'guid_sig' => base64url_encode(Crypto::sign($channel['channel_guid'],$channel['channel_prvkey'],$sig_method)),
-			'url' => z_root(),
-			'url_sig' => base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'],$sig_method)),
-			'sitekey' => get_config('system','pubkey')
-		],
-		'callback' => '/post',
-		'version' => Zotlabs\Lib\System::get_zot_revision(),
-		'encryption' => Crypto::methods(),
-		'signing' => Crypto::signing_methods()
-	];
-
-	if ($recipients) {
-		for ($x = 0; $x < count($recipients); $x ++)
-			unset($recipients[$x]['hash']);
-
-		$data['recipients'] = $recipients;
-	}
-
-	if ($secret) {
-		$data['secret'] = preg_replace('/[^0-9a-fA-F]/','',$secret);
-		$data['secret_sig'] = base64url_encode(Crypto::sign($secret,$channel['channel_prvkey'],$sig_method));
-	}
-
-	if ($extra) {
-		foreach ($extra as $k => $v)
-			$data[$k] = $v;
-	}
-
-	logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA, LOG_DEBUG);
-
-	// Hush-hush ultra top-secret mode
-
-	if($remote_key) {
-		$algorithm = zot_best_algorithm($methods);
-		$data = Crypto::encapsulate(json_encode($data),$remote_key, $algorithm);
-	}
-
-	return json_encode($data);
-}
-
-
-/**
- * @brief Builds a zot6 notification packet.
- *
- * Builds a zot6 notification packet that you can either store in the queue with
- * a message array or call zot_zot to immediately zot it to the other side.
- *
- * @param array $channel
- *   sender channel structure
- * @param string $type
- *   packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'keychange', 'force_refresh', 'notify', 'auth_check'
- * @param array $recipients
- *   envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
- * @param string $msg
- *   optional message
- * @param string $remote_key
- *   optional public site key of target hub used to encrypt entire packet
- *   NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others
- * @param string $methods
- *   optional comma separated list of encryption methods @ref zot_best_algorithm()
- * @param string $secret
- *   random string, required for packets which require verification/callback
- *   e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
- * @param string $extra
- * @returns string json encoded zot packet
- */
-function zot6_build_packet($channel, $type = 'notify', $recipients = null, $msg = '', $remote_key = null, $methods = '', $secret = null, $extra = null) {
-
-	$sig_method = get_config('system','signature_algorithm','sha256');
-
-	$data = [
-		'type' => $type,
-		'sender' => [
-			'guid' => $channel['channel_guid'],
-			'guid_sig' => base64url_encode(Crypto::sign($channel['channel_guid'],$channel['channel_prvkey'],$sig_method)),
-			'url' => z_root(),
-			'url_sig' => base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'],$sig_method)),
-			'sitekey' => get_config('system','pubkey')
-		],
-		'callback' => '/post',
-		'version' => Zotlabs\Lib\System::get_zot_revision(),
-		'encryption' => Crypto::methods(),
-		'signing' => Crypto::signing_methods()
-	];
-
-	if ($recipients) {
-		for ($x = 0; $x < count($recipients); $x ++)
-			unset($recipients[$x]['hash']);
-
-		$data['recipients'] = $recipients;
-	}
-
-	if($msg) {
-		$data['msg'] = $msg;
-	}
-
-	if ($secret) {
-		$data['secret'] = preg_replace('/[^0-9a-fA-F]/','',$secret);
-		$data['secret_sig'] = base64url_encode(Crypto::sign($secret,$channel['channel_prvkey'],$sig_method));
-	}
-
-	if ($extra) {
-		foreach ($extra as $k => $v)
-			$data[$k] = $v;
-	}
-
-	logger('zot6_build_packet: ' . print_r($data,true), LOGGER_DATA, LOG_DEBUG);
-
-	// Hush-hush ultra top-secret mode
-
-	if($remote_key) {
-		$algorithm = zot_best_algorithm($methods);
-		$data = Crypto::encapsulate(json_encode($data),$remote_key, $algorithm);
-	}
-
-	return json_encode($data);
-}
-
-
-
-
-/**
- * @brief Choose best encryption function from those available on both sites.
- *
- * @param string $methods
- *   comma separated list of encryption methods
- * @return string first match from our site method preferences Crypto::methods() array
- * of a method which is common to both sites; or 'aes256cbc' if no matches are found.
- */
-function zot_best_algorithm($methods) {
-
-	$x = [
-			'methods' => $methods,
-			'result' => ''
-	];
-	/**
-	 * @hooks zot_best_algorithm
-	 *   Called when negotiating crypto algorithms with remote sites.
-	 *   * \e string \b methods - comma separated list of encryption methods
-	 *   * \e string \b result - the algorithm to return
-	 */
-	call_hooks('zot_best_algorithm', $x);
-
-	if($x['result'])
-		return $x['result'];
-
-	if($methods) {
-		$x = explode(',', $methods);
-		if($x) {
-			$y = Crypto::methods();
-			if($y) {
-				foreach($y as $yv) {
-					$yv = trim($yv);
-					if(in_array($yv, $x)) {
-						return($yv);
-					}
-				}
-			}
-		}
-	}
-
-	return 'aes256cbc';
-}
-
-
-/**
- * @brief
- *
- * @see z_post_url()
- *
- * @param string $url
- * @param array $data
- * @param array $channel (optional if using zot6 delivery)
- * @param array $crypto (optional if encrypted httpsig, requires hubloc_sitekey and site_crypto elements)
- * @return array see z_post_url() for returned data format
- */
-function zot_zot($url, $data, $channel = null,$crypto = null) {
-
-	$headers = [];
-
-	if($channel) {
-		$headers['X-Zot-Token'] = random_string();
-		$headers['X-Zot-Digest'] = \Zotlabs\Web\HTTPSig::generate_digest_header($data);
-		$h = \Zotlabs\Web\HTTPSig::create_sig($headers,$channel['channel_prvkey'],'acct:' . channel_reddress($channel),false,'sha512',(($crypto) ? [ 'key' => $crypto['hubloc_sitekey'], 'algorithm' => $crypto['site_crypto'] ] : false));
-	}
-
-	$redirects = 0;
-	return z_post_url($url, array('data' => $data),$redirects,((empty($h)) ? [] : [ 'headers' => $h ]));
-}
-
-/**
- * @brief Refreshes after permission changed or friending, etc.
- *
- * The top half of this function is similar to \\Zotlabs\\Zot\\Finger::run() and could potentially be
- * consolidated.
- *
- * zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified
- * to fetch new permissions via a finger/discovery operation. This may result in a new connection
- * (abook entry) being added to a local channel and it may result in auto-permissions being granted.
- *
- * Friending in zot is accomplished by sending a refresh packet to a specific channel which indicates a
- * permission change has been made by the sender which affects the target channel. The hub controlling
- * the target channel does targetted discovery (a zot-finger request requesting permissions for the local
- * channel). These are decoded here, and if necessary and abook structure (addressbook) is created to store
- * the permissions assigned to this channel.
- *
- * Initially these abook structures are created with a 'pending' flag, so that no reverse permissions are
- * implied until this is approved by the owner channel. A channel can also auto-populate permissions in
- * return and send back a refresh packet of its own. This is used by forum and group communication channels
- * so that friending and membership in the channel's "club" is automatic.
- *
- * @param array $them => xchan structure of sender
- * @param array $channel => local channel structure of target recipient, required for "friending" operations
- * @param array $force (optional) default false
- *
- * @return boolean
- *   * \b true if successful
- *   * otherwise \b false
- */
-function zot_refresh($them, $channel = null, $force = false) {
-
-	if (array_key_exists('xchan_network', $them) && ($them['xchan_network'] !== 'zot')) {
-		logger('not got zot. ' . $them['xchan_name']);
-		return true;
-	}
-
-	logger('them: ' . print_r($them,true), LOGGER_DATA, LOG_DEBUG);
-	if ($channel)
-		logger('channel: ' . print_r($channel,true), LOGGER_DATA, LOG_DEBUG);
-
-	$url = null;
-
-	if ($them['hubloc_url']) {
-		$url = $them['hubloc_url'];
-	}
-	else {
-		$r = null;
-
-		// if they re-installed the server we could end up with the wrong record - pointing to the old install.
-		// We'll order by reverse id to try and pick off the newest one first and hopefully end up with the
-		// correct hubloc. If this doesn't work we may have to re-write this section to try them all.
-
-		if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s' order by hubloc_id desc",
-				dbesc($them['xchan_addr'])
-			);
-		}
-		if(! $r) {
-			$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s' order by hubloc_id desc",
-				dbesc($them['xchan_hash'])
-			);
-		}
-
-		if ($r) {
-			foreach ($r as $rr) {
-				if (intval($rr['hubloc_primary'])) {
-					$url = $rr['hubloc_url'];
-					break;
-				}
-			}
-			if (! $url)
-				$url = $r[0]['hubloc_url'];
-		}
-	}
-	if (! $url) {
-		logger('zot_refresh: no url');
-		return false;
-	}
-
-	$s = q("select site_dead from site where site_url = '%s' limit 1",
-		dbesc($url)
-	);
-
-	if($s && intval($s[0]['site_dead']) && (! $force)) {
-		logger('zot_refresh: site ' . $url . ' is marked dead and force flag is not set. Cancelling operation.');
-		return false;
-	}
-
-
-	$token = random_string();
-
-	$postvars = [];
-
-	$postvars['token'] = $token;
-
-	if($channel) {
-		$postvars['target']     = $channel['xchan_guid'];
-		$postvars['target_sig'] = str_replace('sha256.', '', $channel['xchan_guid_sig']);
-		$postvars['key']        = $channel['channel_pubkey'];
-	}
-
-	if (array_key_exists('xchan_addr',$them) && $them['xchan_addr'])
-		$postvars['address'] = $them['xchan_addr'];
-	if (array_key_exists('xchan_hash',$them) && $them['xchan_hash'])
-		$postvars['guid_hash'] = $them['xchan_hash'];
-	if (array_key_exists('xchan_guid',$them) && $them['xchan_guid']
-		&& array_key_exists('xchan_guid_sig',$them) && $them['xchan_guid_sig']) {
-		$postvars['guid'] = $them['xchan_guid'];
-		$postvars['guid_sig'] = $them['xchan_guid_sig'];
-	}
-
-	$rhs = '/.well-known/zot-info';
-
-	logger('zot_refresh: ' . $url, LOGGER_DATA, LOG_INFO);
-
-	$result = z_post_url($url . $rhs,$postvars);
-
-	if ($result['success']) {
-
-		$j = json_decode($result['body'],true);
-
-		if (! (($j) && ($j['success']))) {
-			logger('Result not decodable');
-			return false;
-		}
-
-		logger('zot-info: ' . print_r($result,true), LOGGER_DATA, LOG_DEBUG);
-
-		$signed_token = ((is_array($j) && array_key_exists('signed_token',$j)) ? $j['signed_token'] : null);
-		if($signed_token) {
-			$valid = Crypto::verify('token.' . $token,base64url_decode($signed_token),$j['key']);
-			if(! $valid) {
-				logger('invalid signed token: ' . $url . $rhs, LOGGER_NORMAL, LOG_ERR);
-				return false;
-			}
-		}
-		else {
-			logger('No signed token from '  . $url . $rhs, LOGGER_NORMAL, LOG_WARNING);
-			return false;
-		}
-
-		$x = import_xchan($j, (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
-
-		if(! $x['success'])
-			return false;
-
-		if($channel) {
-			if($j['permissions']['data']) {
-				$permissions = Crypto::unencapsulate(
-					[
-					'encrypted' => true,
-					'data' => $j['permissions']['data'],
-					'key'  => $j['permissions']['key'],
-					'iv'   => $j['permissions']['iv'],
-					'alg'  => $j['permissions']['alg']
-					],
-					$channel['channel_prvkey']);
-				if($permissions) {
-					$permissions = json_decode($permissions,true);
-				}
-				logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA, LOG_DEBUG);
-			}
-			else
-				$permissions = $j['permissions'];
-
-			if($permissions && is_array($permissions)) {
-				$old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream');
-
-				foreach($permissions as $k => $v) {
-					set_abconfig($channel['channel_id'],$x['hash'],'their_perms',$k,$v);
-				}
-			}
-
-			if(array_key_exists('profile',$j) && array_key_exists('next_birthday',$j['profile'])) {
-				$next_birthday = datetime_convert('UTC','UTC',$j['profile']['next_birthday']);
-			}
-			else {
-				$next_birthday = NULL_DATE;
-			}
-
-			$profile_assign = get_pconfig($channel['channel_id'],'system','profile_assign','');
-
-			// Keep original perms to check if we need to notify them
-			$previous_perms = get_all_perms($channel['channel_id'],$x['hash'],false);
-
-			$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
-				dbesc($x['hash']),
-				intval($channel['channel_id'])
-			);
-
-			if($r) {
-
-				// connection exists
-
-				// if the dob is the same as what we have stored (disregarding the year), keep the one
-				// we have as we may have updated the year after sending a notification; and resetting
-				// to the one we just received would cause us to create duplicated events.
-
-				if(substr($r[0]['abook_dob'],5) == substr($next_birthday,5))
-					$next_birthday = $r[0]['abook_dob'];
-
-				$y = q("update abook set abook_dob = '%s'
-					where abook_xchan = '%s' and abook_channel = %d
-					and abook_self = 0 ",
-					dbescdate($next_birthday),
-					dbesc($x['hash']),
-					intval($channel['channel_id'])
-				);
-
-				if(! $y)
-					logger('abook update failed');
-				else {
-					// if we were just granted read stream permission and didn't have it before, try to pull in some posts
-					if((! $old_read_stream_perm) && (intval($permissions['view_stream'])))
-						Zotlabs\Daemon\Master::Summon(array('Onepoll',$r[0]['abook_id']));
-				}
-			}
-			else {
-
-				$p = \Zotlabs\Access\Permissions::connect_perms($channel['channel_id']);
-
-				$my_perms  = $p['perms'];
-				$automatic = $p['automatic'];
-
-				// new connection
-
-				if($my_perms) {
-					foreach($my_perms as $k => $v) {
-						set_abconfig($channel['channel_id'],$x['hash'],'my_perms',$k,$v);
-					}
-				}
-
-				$closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness');
-				if($closeness === false)
-					$closeness = 80;
-
-				$y = abook_store_lowlevel(
-					[
-						'abook_account'   => intval($channel['channel_account_id']),
-						'abook_channel'   => intval($channel['channel_id']),
-						'abook_closeness' => intval($closeness),
-						'abook_xchan'     => $x['hash'],
-						'abook_profile'   => $profile_assign,
-						'abook_created'   => datetime_convert(),
-						'abook_updated'   => datetime_convert(),
-						'abook_dob'       => $next_birthday,
-						'abook_pending'   => intval(($automatic) ? 0 : 1)
-					]
-				);
-
-				if($y) {
-					logger("New introduction received for {$channel['channel_name']}");
-					$new_perms = get_all_perms($channel['channel_id'],$x['hash'],false);
-
-					// Send a clone sync packet and a permissions update if permissions have changed
-
-					$new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
-						dbesc($x['hash']),
-						intval($channel['channel_id'])
-					);
-
-					if($new_connection) {
-						if(! \Zotlabs\Access\Permissions::PermsCompare($new_perms,$previous_perms))
-							Zotlabs\Daemon\Master::Summon(array('Notifier','permission_create',$new_connection[0]['abook_id']));
-						Zotlabs\Lib\Enotify::submit(
-							[
-							'type'       => NOTIFY_INTRO,
-							'from_xchan' => $x['hash'],
-							'to_xchan'   => $channel['channel_portable_id'],
-							'link'       => z_root() . '/connedit/' . $new_connection[0]['abook_id']
-							]
-						);
-
-						if(intval($permissions['view_stream'])) {
-							if(intval(get_pconfig($channel['channel_id'],'perm_limits','send_stream') & PERMS_PENDING)
-								|| (! intval($new_connection[0]['abook_pending'])))
-								Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
-						}
-
-
-						// If there is a default group for this channel, add this connection to it
-						// for pending connections this will happens at acceptance time.
-
-						if(! intval($new_connection[0]['abook_pending'])) {
-							$default_group = $channel['channel_default_group'];
-							if($default_group) {
-								require_once('include/group.php');
-								$g = group_rec_byhash($channel['channel_id'],$default_group);
-								if($g)
-									group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
-							}
-						}
-
-						unset($new_connection[0]['abook_id']);
-						unset($new_connection[0]['abook_account']);
-						unset($new_connection[0]['abook_channel']);
-
-						$abconfig = load_abconfig($channel['channel_id'],$new_connection['abook_xchan']);
-						if($abconfig)
-							$new_connection['abconfig'] = $abconfig;
-
-						build_sync_packet($channel['channel_id'], array('abook' => $new_connection));
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	return false;
-}
-
-/**
- * @brief Look up if channel is known and previously verified.
- *
- * A guid and a url, both signed by the sender, distinguish a known sender at a
- * known location.
- * This function looks these up to see if the channel is known and therefore
- * previously verified. If not, we will need to verify it.
- *
- * @param array $arr an associative array which must contain:
- *  * \e string \b guid => guid of conversant
- *  * \e string \b guid_sig => guid signed with conversant's private key
- *  * \e string \b url => URL of the origination hub of this communication
- *  * \e string \b url_sig => URL signed with conversant's private key
- * @param boolean $multiple (optional) default false
- *
- * @return array|null
- *   * null if site is blacklisted or not found
- *   * otherwise an array with an hubloc record
- */
-function zot_gethub($arr, $multiple = false) {
-
-	if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) {
-
-		if(! check_siteallowed($arr['url'])) {
-			logger('blacklisted site: ' . $arr['url']);
-			return null;
-		}
-
-		$limit = (($multiple) ? '' : ' limit 1 ');
-		$sitekey = ((array_key_exists('sitekey',$arr) && $arr['sitekey']) ? " and hubloc_sitekey = '" . dbesc(protect_sprintf($arr['sitekey'])) . "' " : '');
-
-		$r = q("select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url
-				where hubloc_guid = '%s' and hubloc_guid_sig = '%s'
-				and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_network = 'zot'
-				$sitekey $limit",
-			dbesc($arr['guid']),
-			dbesc($arr['guid_sig']),
-			dbesc($arr['url']),
-			dbesc($arr['url_sig'])
-		);
-		if($r) {
-			logger('Found', LOGGER_DEBUG);
-			return (($multiple) ? $r : $r[0]);
-		}
-	}
-	logger('Not found: ' . print_r($arr,true), LOGGER_DEBUG);
-
-	return false;
-}
-
-/**
- * @brief Registers an unknown hub.
- *
- * A communication has been received which has an unknown (to us) sender.
- * Perform discovery based on our calculated hash of the sender at the
- * origination address. This will fetch the discovery packet of the sender,
- * which contains the public key we need to verify our guid and url signatures.
- *
- * @param array $arr an associative array which must contain:
- *  * \e string \b guid => guid of conversant
- *  * \e string \b guid_sig => guid signed with conversant's private key
- *  * \e string \b url => URL of the origination hub of this communication
- *  * \e string \b url_sig => URL signed with conversant's private key
- *
- * @return array An associative array with
- *  * \b success boolean true or false
- *  * \b message (optional) error string only if success is false
- */
-function zot_register_hub($arr) {
-
-	$result = [ 'success' => false ];
-
-	if($arr['url'] && $arr['url_sig'] && $arr['guid'] && $arr['guid_sig']) {
-
-		$sig_methods = ((array_key_exists('signing',$arr) && is_array($arr['signing'])) ? $arr['signing'] : [ 'sha256' ]);
-
-		$guid_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-
-		$url = $arr['url'] . '/.well-known/zot-info/?f=&guid_hash=' . $guid_hash;
-
-		logger('zot_register_hub: ' . $url, LOGGER_DEBUG);
-
-		$x = z_fetch_url($url);
-
-		logger('zot_register_hub: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG);
-
-		if($x['success']) {
-			$record = json_decode($x['body'],true);
-
-			/*
-			 * We now have a key - only continue registration if our signatures are valid
-			 * AND the guid and guid sig in the returned packet match those provided in
-			 * our current communication.
-			 */
-
-			foreach($sig_methods as $method) {
-				if((Crypto::verify($arr['guid'],base64url_decode($arr['guid_sig']),$record['key'],$method))
-				&& (Crypto::verify($arr['url'],base64url_decode($arr['url_sig']),$record['key'],$method))
-				&& ($arr['guid'] === $record['guid'])
-				&& ($arr['guid_sig'] === $record['guid_sig'])) {
-					$c = import_xchan($record);
-					if($c['success'])
-						$result['success'] = true;
-				}
-				else {
-					logger('Failure to verify returned packet using ' . $method);
-				}
-			}
-		}
-	}
-
-	return $result;
-}
-
-/**
- * @brief Takes an associative array of a fetched discovery packet and updates
- *   all internal data structures which need to be updated as a result.
- *
- * @param array $arr => json_decoded discovery packet
- * @param int $ud_flags
- *    Determines whether to create a directory update record if any changes occur, default is UPDATE_FLAGS_UPDATED
- *    $ud_flags = UPDATE_FLAGS_FORCED indicates a forced refresh where we unconditionally create a directory update record
- *      this typically occurs once a month for each channel as part of a scheduled ping to notify the directory
- *      that the channel still exists
- * @param array $ud_arr
- *    If set [typically by update_directory_entry()] indicates a specific update table row and more particularly
- *    contains a particular address (ud_addr) which needs to be updated in that table.
- *
- * @return array An associative array with:
- *   * \e boolean \b success boolean true or false
- *   * \e string \b message (optional) error string only if success is false
- */
-function import_xchan($arr, $ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
-
-	/**
-	 * @hooks import_xchan
-	 *   Called when processing the result of zot_finger() to store the result
-	 *   * \e array
-	 */
-	call_hooks('import_xchan', $arr);
-
-	$ret = array('success' => false);
-	$dirmode = intval(get_config('system','directory_mode'));
-
-	$changed = false;
-	$what = '';
-
-	if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) {
-		logger('Invalid data packet: ' . print_r($arr,true));
-		$ret['message'] = t('Invalid data packet');
-		return $ret;
-	}
-
-	if(! ($arr['guid'] && $arr['guid_sig'])) {
-		logger('No identity information provided. ' . print_r($arr,true));
-		return $ret;
-	}
-
-	$xchan_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-	$arr['hash'] = $xchan_hash;
-
-	$import_photos = false;
-
-	$sig_methods = ((array_key_exists('signing',$arr) && is_array($arr['signing'])) ? $arr['signing'] : [ 'sha256' ]);
-	$verified = false;
-
-	foreach($sig_methods as $method) {
-		if(! Crypto::verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'],$method)) {
-			logger('Unable to verify channel signature for ' . $arr['address'] . ' using ' . $method);
-			continue;
-		}
-		else {
-			$verified = true;
-		}
-	}
-	if(! $verified) {
-		$ret['message'] = t('Unable to verify channel signature');
-		return $ret;
-	}
-
-	logger('import_xchan: ' . $xchan_hash, LOGGER_DEBUG);
-
-	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($xchan_hash)
-	);
-
-	if(! array_key_exists('connect_url', $arr))
-		$arr['connect_url'] = '';
-
-	if(strpos($arr['address'],'/') !== false)
-		$arr['address'] = substr($arr['address'],0,strpos($arr['address'],'/'));
-
-	if($r) {
-		if($r[0]['xchan_photo_date'] != $arr['photo_updated'])
-			$import_photos = true;
-
-		// if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry.
-		/** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */
-
-		$dirmode = get_config('system','directory_mode');
-
-		if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root()))
-			$arr['searchable'] = false;
-
-		$hidden = (1 - intval($arr['searchable']));
-
-		$hidden_changed = $adult_changed = $deleted_changed = $pubforum_changed = 0;
-
-		if(intval($r[0]['xchan_hidden']) != (1 - intval($arr['searchable'])))
-			$hidden_changed = 1;
-		if(intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content']))
-			$adult_changed = 1;
-		if(intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
-			$deleted_changed = 1;
-		if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum']))
-			$pubforum_changed = 1;
-
-		if($arr['protocols']) {
-			$protocols = implode(',',$arr['protocols']);
-			if($protocols !== 'zot') {
-				set_xconfig($xchan_hash,'system','protocols',$protocols);
-			}
-			else {
-				del_xconfig($xchan_hash,'system','protocols');
-			}
-		}
-
-		if(($r[0]['xchan_name_date'] != $arr['name_updated'])
-			|| ($r[0]['xchan_connurl'] != $arr['connections_url'])
-			|| ($r[0]['xchan_addr'] != $arr['address'])
-			|| ($r[0]['xchan_follow'] != $arr['follow_url'])
-			|| ($r[0]['xchan_connpage'] != $arr['connect_url'])
-			|| ($r[0]['xchan_url'] != $arr['url'])
-			|| $hidden_changed || $adult_changed || $deleted_changed || $pubforum_changed ) {
-			$rup = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s',
-				xchan_connpage = '%s', xchan_hidden = %d, xchan_selfcensored = %d, xchan_deleted = %d, xchan_pubforum = %d,
-				xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'",
-				dbesc(($arr['name']) ? $arr['name'] : '-'),
-				dbesc($arr['name_updated']),
-				dbesc($arr['connections_url']),
-				dbesc($arr['follow_url']),
-				dbesc($arr['connect_url']),
-				intval(1 - intval($arr['searchable'])),
-				intval($arr['adult_content']),
-				intval($arr['deleted']),
-				intval($arr['public_forum']),
-				dbesc($arr['address']),
-				dbesc($arr['url']),
-				dbesc($xchan_hash)
-			);
-
-			logger('Update: existing: ' . print_r($r[0],true), LOGGER_DATA, LOG_DEBUG);
-			logger('Update: new: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-			$what .= 'xchan ';
-			$changed = true;
-		}
-	}
-	else {
-		$import_photos = true;
-
-		if((($arr['site']['directory_mode'] === 'standalone')
-				|| ($dirmode & DIRECTORY_MODE_STANDALONE))
-				&& ($arr['site']['url'] != z_root()))
-			$arr['searchable'] = false;
-
-		$x = xchan_store_lowlevel(
-			[
-				'xchan_hash'           => $xchan_hash,
-				'xchan_guid'           => $arr['guid'],
-				'xchan_guid_sig'       => $arr['guid_sig'],
-				'xchan_pubkey'         => $arr['key'],
-				'xchan_photo_mimetype' => $arr['photo_mimetype'],
-				'xchan_photo_l'        => $arr['photo'],
-				'xchan_addr'           => $arr['address'],
-				'xchan_url'            => $arr['url'],
-				'xchan_connurl'        => $arr['connections_url'],
-				'xchan_follow'         => $arr['follow_url'],
-				'xchan_connpage'       => $arr['connect_url'],
-				'xchan_name'           => (($arr['name']) ? $arr['name'] : '-'),
-				'xchan_network'        => 'zot',
-				'xchan_photo_date'     => $arr['photo_updated'],
-				'xchan_name_date'      => $arr['name_updated'],
-				'xchan_hidden'         => intval(1 - intval($arr['searchable'])),
-				'xchan_selfcensored'   => $arr['adult_content'],
-				'xchan_deleted'        => $arr['deleted'],
-				'xchan_pubforum'       => $arr['public_forum']
-			]
-		);
-
-		$what .= 'new_xchan';
-		$changed = true;
-	}
-
-	if($import_photos) {
-
-		require_once('include/photo/photo_driver.php');
-
-		// see if this is a channel clone that's hosted locally - which we treat different from other xchans/connections
-
-		$local = q("select channel_account_id, channel_id from channel where channel_portable_id = '%s' limit 1",
-			dbesc($xchan_hash)
-		);
-
-		if($local) {
-			// @FIXME This should be removed in future when profile photo update by file sync procedure will be applied
-			// on most hubs in the network
-			// <---
-			$ph = z_fetch_url($arr['photo'], true);
-
-			if($ph['success']) {
-
-				// Do not fetch already received thumbnails
-				$x = q("SELECT resource_id FROM photo WHERE uid = %d AND imgscale = %d AND filesize = %d LIMIT 1",
-					intval($local[0]['channel_id']),
-					intval(PHOTO_RES_PROFILE_300),
-					strlen($ph['body'])
-				);
-
-				if($x)
-					$hash = $x[0]['resource_id'];
-				else
-					$hash = import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'], $local[0]['channel_id']);
-			}
-
-			if($hash) {
-				// unless proven otherwise
-				$is_default_profile = 1;
-
-				$profile = q("select is_default from profile where aid = %d and uid = %d limit 1",
-					intval($local[0]['channel_account_id']),
-					intval($local[0]['channel_id'])
-				);
-				if($profile) {
-					if(! intval($profile[0]['is_default']))
-						$is_default_profile = 0;
-				}
-
-				// If setting for the default profile, unset the profile photo flag from any other photos I own
-				if($is_default_profile) {
-					q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND resource_id != '%s' AND aid = %d AND uid = %d",
-						intval(PHOTO_NORMAL),
-						intval(PHOTO_PROFILE),
-						dbesc($hash),
-						intval($local[0]['channel_account_id']),
-						intval($local[0]['channel_id'])
-					);
-				}
-			}
-			// --->
-
-			// reset the names in case they got messed up when we had a bug in this function
-			$photos = array(
-				z_root() . '/photo/profile/l/' . $local[0]['channel_id'],
-				z_root() . '/photo/profile/m/' . $local[0]['channel_id'],
-				z_root() . '/photo/profile/s/' . $local[0]['channel_id'],
-				$arr['photo_mimetype'],
-				false
-			);
-		}
-		else {
-			$photos = import_xchan_photo($arr['photo'], $xchan_hash);
-		}
-		if($photos) {
-			if($photos[4]) {
-				// importing the photo failed somehow. Leave the photo_date alone so we can try again at a later date.
-				// This often happens when somebody joins the matrix with a bad cert.
-				$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-					where xchan_hash = '%s'",
-					dbesc($photos[0]),
-					dbesc($photos[1]),
-					dbesc($photos[2]),
-					dbesc($photos[3]),
-					dbesc($xchan_hash)
-				);
-			}
-			else {
-				$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-					where xchan_hash = '%s'",
-					dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])),
-					dbesc($photos[0]),
-					dbesc($photos[1]),
-					dbesc($photos[2]),
-					dbesc($photos[3]),
-					dbesc($xchan_hash)
-				);
-			}
-			$what .= 'photo ';
-			$changed = true;
-		}
-	}
-
-	// what we are missing for true hub independence is for any changes in the primary hub to
-	// get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan
-
-	$s = sync_locations($arr, $arr);
-
-	if($s) {
-		if($s['change_message'])
-			$what .= $s['change_message'];
-		if($s['changed'])
-			$changed = $s['changed'];
-		if($s['message'])
-			$ret['message'] .= $s['message'];
-	}
-
-	// Which entries in the update table are we interested in updating?
-
-	$address = (($ud_arr && $ud_arr['ud_addr']) ? $ud_arr['ud_addr'] : $arr['address']);
-
-
-	// Are we a directory server of some kind?
-
-	$other_realm = false;
-	$realm = get_directory_realm();
-	if(array_key_exists('site',$arr)
-		&& array_key_exists('realm',$arr['site'])
-		&& (strpos($arr['site']['realm'],$realm) === false))
-		$other_realm = true;
-
-	if($dirmode != DIRECTORY_MODE_NORMAL) {
-
-		// We're some kind of directory server. However we can only add directory information
-		// if the entry is in the same realm (or is a sub-realm). Sub-realms are denoted by
-		// including the parent realm in the name. e.g. 'RED_GLOBAL:foo' would allow an entry to
-		// be in directories for the local realm (foo) and also the RED_GLOBAL realm.
-
-		if(array_key_exists('profile',$arr) && is_array($arr['profile']) && (! $other_realm)) {
-			$profile_changed = import_directory_profile($xchan_hash,$arr['profile'],$address,$ud_flags, 1);
-			if($profile_changed) {
-				$what .= 'profile ';
-				$changed = true;
-			}
-		}
-		else {
-			logger('Profile not available - hiding');
-			// they may have made it private
-			$r = q("delete from xprof where xprof_hash = '%s'",
-				dbesc($xchan_hash)
-			);
-			$r = q("delete from xtag where xtag_hash = '%s' and xtag_flags = 0",
-				dbesc($xchan_hash)
-			);
-		}
-	}
-
-	if(array_key_exists('site',$arr) && is_array($arr['site'])) {
-		$profile_changed = import_site($arr['site'],$arr['key']);
-		if($profile_changed) {
-			$what .= 'site ';
-			$changed = true;
-		}
-	}
-
-	if(($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) {
-		$guid = random_string() . '@' . App::get_hostname();
-		update_modtime($xchan_hash,$guid,$address,$ud_flags);
-		logger('Changed: ' . $what,LOGGER_DEBUG);
-	}
-	elseif(! $ud_flags) {
-		// nothing changed but we still need to update the updates record
-		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) > 0 ",
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc($address),
-			intval(UPDATE_FLAGS_UPDATED)
-		);
-	}
-
-	if(! x($ret,'message')) {
-		$ret['success'] = true;
-		$ret['hash'] = $xchan_hash;
-	}
-
-	logger('Result: ' . print_r($ret,true), LOGGER_DATA, LOG_DEBUG);
-	return $ret;
-}
-
-/**
- * @brief Called immediately after sending a zot message which is using queue processing.
- *
- * Updates the queue item according to the response result and logs any information
- * returned to aid communications troubleshooting.
- *
- * @param string $hub - url of site we just contacted
- * @param array $arr - output of z_post_url()
- * @param array $outq - The queue structure attached to this request
- */
-function zot_process_response($hub, $arr, $outq) {
-
-	if(! $arr['success']) {
-		logger('Failed: ' . $hub);
-		return;
-	}
-
-	$dreport = true;
-
-	$x = json_decode($arr['body'], true);
-
-	if(! $x) {
-		logger('No json from ' . $hub);
-		logger('Headers: ' . print_r($arr['header'], true), LOGGER_DATA, LOG_DEBUG);
-	}
-
-	if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) {
-
-		if(array_key_exists('iv',$x['delivery_report'])) {
-			$x['delivery_report']['encrypted'] = true;
-			$j = Crypto::unencapsulate($x['delivery_report'],get_config('system','prvkey'));
-			if($j) {
-				$x['delivery_report'] = json_decode($j,true);
-			}
-			if(! (is_array($x['delivery_report']) && count($x['delivery_report']))) {
-				logger('encrypted delivery report could not be decrypted');
-				$dreport = false;
-			}
-		}
-
-		if($dreport) {
-			foreach($x['delivery_report'] as $xx) {
-				call_hooks('dreport_process',$xx);
-				if(is_array($xx) && array_key_exists('message_id',$xx) && DReport::is_storable($xx)) {
-
-					// legacy zot recipients add a space and their name to the xchan. split those if true.
-					$legacy_recipient = strpos($xx['recipient'], ' ');
-					if($legacy_recipient !== false) {
-						$legacy_recipient_parts = explode(' ', $xx['recipient'], 2);
-						$xx['recipient'] = $legacy_recipient_parts[0];
-						$xx['name'] = $legacy_recipient_parts[1];
-					}
-
-					q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s','%s' ) ",
-						dbesc($xx['message_id']),
-						dbesc($xx['location']),
-						dbesc($xx['recipient']),
-						dbesc($xx['name']),
-						dbesc($xx['status']),
-						dbesc(datetime_convert('UTC','UTC',$xx['date'])),
-						dbesc($xx['sender'])
-					);
-				}
-			}
-		}
-	}
-
-
-	if($dreport) {
-		// we have a more descriptive delivery report, so discard the per hub 'queued' report.
-		q("delete from dreport where dreport_queue = '%s' ",
-			dbesc($outq['outq_hash'])
-		);
-	}
-
-	// update the timestamp for this site
-
-	q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
-		dbesc(datetime_convert()),
-		dbesc(dirname($hub))
-	);
-
-	// synchronous message types are handled immediately
-	// async messages remain in the queue until processed.
-
-	if(intval($outq['outq_async']))
-		remove_queue_item($outq['outq_hash'],$outq['outq_channel']);
-
-	logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG);
-}
-
-/**
- * @brief
- *
- * We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender.
- * Check if the site is using zot6 delivery and includes a verified HTTP Signature, signed content, and a 'msg' field,
- * and also that the signer and the sender match.
- * If that happens, we do not need to fetch/pickup the message - we have it already and it is verified.
- * Translate it into the form we need for zot_import() and import it.
- *
- * Otherwise send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site
- * private key.
- * The entire pickup message is encrypted with the remote site's public key.
- * If everything checks out on the remote end, we will receive back a packet containing one or more messages,
- * which will be processed and delivered before this function ultimately returns.
- *
- * @see zot_import()
- *
- * @param array $arr
- *     decrypted and json decoded notify packet from remote site
- * @return array from zot_import()
- */
-function zot_fetch($arr) {
-
-	logger('zot_fetch: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-
-	$url = $arr['sender']['url'] . $arr['callback'];
-
-	$import = null;
-	$hubs   = null;
-
-	$zret = zot6_check_sig();
-
-	if($zret['success'] && $zret['hubloc'] && $zret['hubloc']['hubloc_guid'] === $arr['sender']['guid'] && $arr['msg']) {
-
-		logger('zot6_delivery',LOGGER_DEBUG);
-		logger('zot6_data: ' . print_r($arr,true),LOGGER_DATA);
-
-		$ret['collected'] = true;
-
-		$import = [ 'success' => true, 'body' => json_encode( [ 'success' => true, 'pickup' => [ [ 'notify' => $arr, 'message' => json_decode($arr['msg'],true) ] ] ] ) ];
-		$hubs = [ $zret['hubloc'] ] ;
-	}
-
-	if(! $hubs) {
-		// set $multiple param on zot_gethub() to return all matching hubs
-		// This allows us to recover from re-installs when a redundant (but invalid) hubloc for
-		// this identity is widely dispersed throughout the network.
-
-		$hubs = zot_gethub($arr['sender'],true);
-	}
-
-	if(! $hubs) {
-		logger('No hub: ' . print_r($arr['sender'],true));
-		return;
-	}
-
-	foreach($hubs as $hub) {
-
-		if(! $import) {
-			$secret = substr(preg_replace('/[^0-9a-fA-F]/','',$arr['secret']),0,64);
-
-			$data = [
-				'type'         => 'pickup',
-				'url'          => z_root(),
-				'callback_sig' => base64url_encode(Crypto::sign(z_root() . '/post', get_config('system','prvkey'))),
-				'callback'     => z_root() . '/post',
-				'secret'       => $secret,
-				'secret_sig'   => base64url_encode(Crypto::sign($secret, get_config('system','prvkey')))
-			];
-
-			$algorithm = zot_best_algorithm($hub['site_crypto']);
-			$datatosend = json_encode(Crypto::encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm));
-
-			$import = zot_zot($url,$datatosend);
-
-		}
-		else {
-			$algorithm = zot_best_algorithm($hub['site_crypto']);
-		}
-
-		$result = zot_import($import, $arr['sender']['url']);
-
-		if($result) {
-			$result = Crypto::encapsulate(json_encode($result),$hub['hubloc_sitekey'], $algorithm);
-			return $result;
-		}
-
-	}
-
-	return;
-}
-
-/**
- * @brief Process incoming array of messages.
- *
- * Process an incoming array of messages which were obtained via pickup, and
- * import, update, delete as directed.
- *
- * The message types handled here are 'activity' (e.g. posts), 'mail',
- * 'profile', 'location' and 'channel_sync'.
- *
- * @param array $arr
- *  'pickup' structure returned from remote site
- * @param string $sender_url
- *  the url specified by the sender in the initial communication.
- *  We will verify the sender and url in each returned message structure and
- *  also verify that all the messages returned match the site url that we are
- *  currently processing.
- *
- * @returns array
- *   Suitable for logging remotely, enumerating the processing results of each message/recipient combination
- *   * [0] => \e string $channel_portable_id
- *   * [1] => \e string $delivery_status
- *   * [2] => \e string $address
- */
-function zot_import($arr, $sender_url) {
-
-	$data = json_decode($arr['body'], true);
-
-	if(! $data) {
-		logger('Empty body');
-		return array();
-	}
-
-	if(array_key_exists('iv', $data)) {
-		$data['encrypted'] = true;
-		$data = json_decode(Crypto::unencapsulate($data,get_config('system','prvkey')),true);
-	}
-
-	if(! is_array($data)) {
-		logger('decode error');
-		return array();
-	}
-
-	if(! $data['success']) {
-		if($data['message'])
-			logger('remote pickup failed: ' . $data['message']);
-		return false;
-	}
-
-	$incoming = $data['pickup'];
-
-	$return = array();
-
-	if(is_array($incoming)) {
-		foreach($incoming as $i) {
-			if(! is_array($i)) {
-				logger('incoming is not an array');
-				continue;
-			}
-
-			$result = null;
-
-			if(array_key_exists('iv',$i['notify'])) {
-				$i['notify']['encrypted'] = true;
-				$i['notify'] = json_decode(Crypto::unencapsulate($i['notify'],get_config('system','prvkey')),true);
-			}
-
-			logger('Notify: ' . print_r($i['notify'],true), LOGGER_DATA, LOG_DEBUG);
-
-			if(! is_array($i['notify'])) {
-				logger('decode error');
-				continue;
-			}
-
-
-			$hub = zot_gethub($i['notify']['sender']);
-			if((! $hub) || ($hub['hubloc_url'] != $sender_url)) {
-				logger('Potential forgery: wrong site for sender: ' . $sender_url . ' != ' . print_r($i['notify'],true));
-				continue;
-			}
-
-			$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
-			if($message_request)
-				logger('processing message request');
-
-			$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
-			$deliveries = null;
-
-			if(array_key_exists('message',$i) && array_key_exists('type',$i['message']) && $i['message']['type'] === 'rating') {
-				// rating messages are processed only by directory servers
-				logger('Rating received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-				$result = process_rating_delivery($i['notify']['sender'],$i['message']);
-				continue;
-			}
-
-			if(array_key_exists('recipients',$i['notify']) && count($i['notify']['recipients'])) {
-				logger('specific recipients');
-				$recip_arr = array();
-				foreach($i['notify']['recipients'] as $recip) {
-					if(is_array($recip)) {
-						$recip_arr[] =  make_xchan_hash($recip['guid'],$recip['guid_sig']);
-					}
-				}
-
-				$r = false;
-				if($recip_arr) {
-					stringify_array_elms($recip_arr);
-					$recips = implode(',',$recip_arr);
-					$r = q("select channel_portable_id as hash from channel where channel_portable_id in ( " . $recips . " )
-						and channel_removed = 0 ");
-				}
-
-				if(! $r) {
-					logger('recips: no recipients on this site');
-					continue;
-				}
-
-				// It's a specifically targetted post. If we were sent a public_scope hint (likely),
-				// get rid of it so that it doesn't get stored and cause trouble.
-
-				if(($i) && is_array($i) && array_key_exists('message',$i) && is_array($i['message'])
-					&& $i['message']['type'] === 'activity' && array_key_exists('public_scope',$i['message']))
-					unset($i['message']['public_scope']);
-
-				$deliveries = $r;
-
-				// We found somebody on this site that's in the recipient list.
-
-			}
-			else {
-				if(($i['message']) && (array_key_exists('flags',$i['message'])) && (in_array('private',$i['message']['flags'])) && $i['message']['type'] === 'activity') {
-					if(array_key_exists('public_scope',$i['message']) && $i['message']['public_scope'] === 'public') {
-						// This should not happen but until we can stop it...
-						logger('private message was delivered with no recipients.');
-						continue;
-					}
-				}
-
-				logger('public post');
-
-				// Public post. look for any site members who are or may be accepting posts from this sender
-				// and who are allowed to see them based on the sender's permissions
-
-				$deliveries = allowed_public_recips($i);
-
-				if($i['message'] && array_key_exists('type',$i['message']) && $i['message']['type'] === 'location') {
-					$sys = get_sys_channel();
-					$deliveries = array(array('hash' => $sys['xchan_hash']));
-				}
-
-				// if the scope is anything but 'public' we're going to store it as private regardless
-				// of the private flag on the post.
-
-				if($i['message'] && array_key_exists('public_scope',$i['message'])
-					&& $i['message']['public_scope'] !== 'public') {
-
-					if(! array_key_exists('flags',$i['message']))
-						$i['message']['flags'] = array();
-					if(! in_array('private',$i['message']['flags']))
-						$i['message']['flags'][] = 'private';
-				}
-			}
-
-			// Go through the hash array and remove duplicates. array_unique() won't do this because the array is more than one level.
-
-			$no_dups = array();
-			if($deliveries) {
-				foreach($deliveries as $d) {
-					if(! is_array($d)) {
-						logger('Delivery hash array is not an array: ' . print_r($d,true));
-						continue;
-					}
-					if(! in_array($d['hash'],$no_dups))
-						$no_dups[] = $d['hash'];
-				}
-
-				if($no_dups) {
-					$deliveries = array();
-					foreach($no_dups as $n) {
-						$deliveries[] = array('hash' => $n);
-					}
-				}
-			}
-
-			if(! $deliveries) {
-				logger('No deliveries on this site');
-				continue;
-			}
-
-			if($i['message']) {
-				if($i['message']['type'] === 'activity') {
-					$arr = get_item_elements($i['message']);
-
-					$v = validate_item_elements($i['message'],$arr);
-
-					if(! $v['success']) {
-						logger('Activity rejected: ' . $v['message'] . ' ' . print_r($i['message'],true));
-						continue;
-					}
-
-					logger('Activity received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-					logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
-
-					$relay = ((array_key_exists('flags',$i['message']) && in_array('relay',$i['message']['flags'])) ? true : false);
-					$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay,false,$message_request);
-				}
-				elseif($i['message']['type'] === 'mail') {
-					$arr = get_mail_elements($i['message']);
-
-					logger('Mail received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-					logger('Mail recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
-
-					$result = process_mail_delivery($i['notify']['sender'],$arr,$deliveries);
-				}
-				elseif($i['message']['type'] === 'profile') {
-					$arr = get_profile_elements($i['message']);
-
-					logger('Profile received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-					logger('Profile recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
-
-					$result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries);
-				}
-				elseif($i['message']['type'] === 'channel_sync') {
-					// $arr = get_channelsync_elements($i['message']);
-
-					$arr = $i['message'];
-
-					logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-					logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
-
-					$result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries);
-				}
-				elseif($i['message']['type'] === 'location') {
-					$arr = $i['message'];
-
-					logger('Location message received: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG);
-					logger('Location message recipients: ' . print_r($deliveries,true), LOGGER_DATA, LOG_DEBUG);
-
-					$result = process_location_delivery($i['notify']['sender'],$arr,$deliveries);
-				}
-			}
-			if($result){
-				$return = array_merge($return, $result);
-			}
-		}
-	}
-
-	return $return;
-}
-
-/**
- * @brief
- *
- * A public message with no listed recipients can be delivered to anybody who
- * has PERMS_NETWORK for that type of post, PERMS_AUTHED (in-network senders are
- * by definition authenticated) or PERMS_SITE and is one the same site,
- * or PERMS_SPECIFIC and the sender is a contact who is granted permissions via
- * their connection permissions in the address book.
- * Here we take a given message and construct a list of hashes of everybody
- * on the site that we should try and deliver to.
- * Some of these will be rejected, but this gives us a place to start.
- *
- * @param array $msg
- * @return NULL|array
- */
-function public_recips($msg) {
-
-	require_once('include/channel.php');
-
-	$check_mentions = false;
-	$include_sys = false;
-
-	if($msg['message']['type'] === 'activity') {
-		$disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false;
-		if(! $disable_discover_tab)
-			$include_sys = true;
-
-		$perm = 'send_stream';
-
-		if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {
-			// check mention recipient permissions on top level posts only
-			$check_mentions = true;
-		}
-		else {
-
-			// This doesn't look like it works so I have to explain what happened. These are my
-			// notes (below) from when I got this section of code working. You would think that
-			// we only have to find those with the requisite stream or comment permissions,
-			// depending on whether this is a top-level post or a comment - but you would be wrong.
-
-			// ... so public_recips and allowed_public_recips is working so much better
-			// than before, but was still not quite right. We seem to be getting all the right
-			// results for top-level posts now, but comments aren't getting through on channels
-			// for which we've allowed them to send us their stream, but not comment on our posts.
-			// The reason is we were seeing if they could comment - and we only need to do that if
-			// we own the post. If they own the post, we only need to check if they can send us their stream.
-
-			// if this is a comment and it wasn't sent by the post owner, check to see who is allowing them to comment.
-			// We should have one specific recipient and this step shouldn't be needed unless somebody stuffed up
-			// their software. We may need this step to protect us from bad guys intentionally stuffing up their software.
-			// If it is sent by the post owner, we don't need to do this. We only need to see who is receiving the
-			// owner's stream (which was already set above) - as they control the comment permissions, not us.
-
-			// Note that by doing this we introduce another bug because some public forums have channel_w_stream
-			// permissions set to themselves only. We also need in this function to add these public forums to the
-			// public recipient list based on if they are tagged or not and have tag permissions. This is complicated
-			// by the fact that this activity doesn't have the public forum tag. It's the parent activity that
-			// contains the tag. we'll solve that further below.
-
-			if($msg['notify']['sender']['guid_sig'] != $msg['message']['owner']['guid_sig']) {
-				$perm = 'post_comments';
-			}
-		}
-	}
-	elseif($msg['message']['type'] === 'mail')
-		$perm = 'post_mail';
-
-	$r = array();
-
-	$c = q("select channel_id, channel_portable_id from channel where channel_removed = 0");
-	if($c) {
-		foreach($c as $cc) {
-			if(perm_is_allowed($cc['channel_id'],$msg['notify']['sender']['hash'],$perm)) {
-				$r[] = [ 'hash' => $cc['channel_portable_id'] ];
-			}
-		}
-	}
-
-	// logger('message: ' . print_r($msg['message'],true));
-
-	if($include_sys && array_key_exists('public_scope',$msg['message']) && $msg['message']['public_scope'] === 'public') {
-		$sys = get_sys_channel();
-		if($sys)
-			$r[] = [ 'hash' => $sys['channel_portable_id'] ];
-	}
-
-	// look for any public mentions on this site
-	// They will get filtered by tgroup_check() so we don't need to check permissions now
-
-	if($check_mentions) {
-		// It's a top level post. Look at the tags. See if any of them are mentions and are on this hub.
-		if($msg['message']['tags']) {
-			if(is_array($msg['message']['tags']) && $msg['message']['tags']) {
-				foreach($msg['message']['tags'] as $tag) {
-					if(($tag['type'] === 'mention' || $tag['type'] === 'forum') && (strpos($tag['url'],z_root()) !== false)) {
-						$address = basename($tag['url']);
-						if($address) {
-							$z = q("select channel_portable_id as hash from channel where channel_address = '%s'
-								and channel_removed = 0 limit 1",
-								dbesc($address)
-							);
-							if($z)
-								$r = array_merge($r,$z);
-						}
-					}
-				}
-			}
-		}
-	}
-	else {
-		// This is a comment. We need to find any parent with ITEM_UPLINK set. But in fact, let's just return
-		// everybody that stored a copy of the parent. This way we know we're covered. We'll check the
-		// comment permissions when we deliver them.
-
-		if($msg['message']['message_top']) {
-			$z = q("select owner_xchan as hash from item where parent_mid = '%s' ",
-				dbesc($msg['message']['message_top'])
-			);
-			if($z)
-				$r = array_merge($r,$z);
-		}
-	}
-
-	// There are probably a lot of duplicates in $r at this point. We need to filter those out.
-	// It's a bit of work since it's a multi-dimensional array
-
-	if($r) {
-		$uniq = array();
-
-		foreach($r as $rr) {
-			if(! in_array($rr['hash'],$uniq))
-				$uniq[] = $rr['hash'];
-		}
-		$r = array();
-		foreach($uniq as $rr) {
-			$r[] = array('hash' => $rr);
-		}
-	}
-
-	logger('public_recips: ' . print_r($r,true), LOGGER_DATA, LOG_DEBUG);
-	return $r;
-}
-
-/**
- * @brief This is the second part of public_recips().
- *
- * We'll find all the channels willing to accept public posts from us, then
- * match them against the sender privacy scope and see who in that list that
- * the sender is allowing.
- *
- * @see public_recipes()
- * @param array $msg
- * @return array
- */
-function allowed_public_recips($msg) {
-
-	logger('allowed_public_recips: ' . print_r($msg,true),LOGGER_DATA, LOG_DEBUG);
-
-	if(array_key_exists('public_scope',$msg['message']))
-		$scope = $msg['message']['public_scope'];
-
-	// Mail won't have a public scope.
-	// in fact, it's doubtful mail will ever get here since it almost universally
-	// has a recipient, but in fact we don't require this, so it's technically
-	// possible to send mail to anybody that's listening.
-
-	$recips = public_recips($msg);
-
-	if(! $recips)
-		return $recips;
-
-	if($msg['message']['type'] === 'mail')
-		return $recips;
-
-	if($scope === 'public' || $scope === 'network: red' || $scope === 'authenticated')
-		return $recips;
-
-	if(strpos($scope,'site:') === 0) {
-		if(($scope === 'site: ' . App::get_hostname()) && ($msg['notify']['sender']['url'] === z_root()))
-			return $recips;
-		else
-			return array();
-	}
-
-	$hash = make_xchan_hash($msg['notify']['sender']['guid'],$msg['notify']['sender']['guid_sig']);
-
-	if($scope === 'self') {
-		foreach($recips as $r)
-			if($r['hash'] === $hash)
-				return array('hash' => $hash);
-	}
-
-	// note: we shouldn't ever see $scope === 'specific' in this function, but handle it anyway
-
-	if($scope === 'contacts' || $scope === 'any connections' || $scope === 'specific') {
-		$condensed_recips = array();
-		foreach($recips as $rr)
-			$condensed_recips[] = $rr['hash'];
-
-		$results = array();
-		$r = q("select channel_portable_id as hash, channel_id from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ",
-			dbesc($hash)
-		);
-		if($r) {
-			foreach($r as $rr) {
-				$cfg = get_abconfig($rr['channel_id'],$rr['hash'],'their_perms','view_stream');
-				if((! $cfg) && $scope !== 'any connections')
-					continue;
-				if(in_array($rr['hash'],$condensed_recips))
-					$results[] = array('hash' => $rr['hash']);
-			}
-		}
-		return $results;
-	}
-
-	return array();
-}
-
-/**
- * @brief
- *
- * @param array $sender
- * @param array $arr
- * @param array $deliveries
- * @param boolean $relay
- * @param boolean $public (optional) default false
- * @param boolean $request (optional) default false
- * @return array
- */
-function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $request = false) {
-
-	$result = array();
-
-	$result['site'] = z_root();
-
-	// We've validated the sender. Now make sure that the sender is the owner or author
-
-	if(! $public) {
-		if($sender['hash'] != $arr['owner_xchan'] && $sender['hash'] != $arr['author_xchan']) {
-			logger("Sender {$sender['hash']} is not owner {$arr['owner_xchan']} or author {$arr['author_xchan']} - mid {$arr['mid']}");
-			return;
-		}
-	}
-
-	foreach($deliveries as $d) {
-		$local_public = $public;
-
-		$DR = new Zotlabs\Lib\DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']);
-
-		$channel = channelx_by_portid($d['hash']);
-
-		if(! $channel) {
-			$DR->update('recipient not found');
-			$result[] = $DR->get();
-			continue;
-		}
-
-		$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
-
-		/* blacklisted channels get a permission denied, no special message to tip them off */
-
-		if(! check_channelallowed($sender['hash'])) {
-			$DR->update('permission denied');
-			$result[] = $DR->get();
-			continue;
-		}
-
-		/**
-		 * @FIXME: Somehow we need to block normal message delivery from our clones, as the delivered
-		 * message doesn't have ACL information in it as the cloned copy does. That copy
-		 * will normally arrive first via sync delivery, but this isn't guaranteed.
-		 * There's a chance the current delivery could take place before the cloned copy arrives
-		 * hence the item could have the wrong ACL and *could* be used in subsequent deliveries or
-		 * access checks. So far all attempts at identifying this situation precisely
-		 * have caused issues with delivery of relayed comments.
-		 */
-
-//		if(($d['hash'] === $sender['hash']) && ($sender['url'] !== z_root()) && (! $relay)) {
-//			$DR->update('self delivery ignored');
-//			$result[] = $DR->get();
-//			continue;
-//		}
-
-		// allow public postings to the sys channel regardless of permissions, but not
-		// for comments travelling upstream. Wait and catch them on the way down.
-		// They may have been blocked by the owner.
-
-		if(intval($channel['channel_system']) && (! $arr['item_private']) && (! $relay)) {
-			$local_public = true;
-
-			$r = q("select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1",
-				dbesc($sender['hash'])
-			);
-			// don't import sys channel posts from selfcensored authors
-			if($r && (intval($r[0]['xchan_selfcensored']))) {
-				$local_public = false;
-				continue;
-			}
-			if(! \Zotlabs\Lib\MessageFilter::evaluate($arr,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) {
-				$local_public = false;
-				continue;
-			}
-		}
-
-		$tag_delivery = tgroup_check($channel['channel_id'],$arr);
-
-		$perm = 'send_stream';
-		if(($arr['mid'] !== $arr['parent_mid']) && ($relay))
-			$perm = 'post_comments';
-
-		// This is our own post, possibly coming from a channel clone
-
-		if($arr['owner_xchan'] == $d['hash']) {
-			$arr['item_wall'] = 1;
-		}
-		else {
-			$arr['item_wall'] = 0;
-		}
-
-
-                if ((! $tag_delivery) && (! $local_public)) {
-                        $allowed = (perm_is_allowed($channel['channel_id'],$sender['hash'],$perm));
-
-		        if((! $allowed) && $perm == 'post_comments') {
-                                $parent = q("select * from item where mid = '%s' and uid = %d limit 1",
-                                        dbesc($arr['parent_mid']),
-                                        intval($channel['channel_id'])
-                                );
-                                if ($parent) {
-                                        $allowed = can_comment_on_post($sender['hash'],$parent[0]);
-                                }
-                        }
-
-                        if (! $allowed) {
-			        logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
-			        $DR->update('permission denied');
-			        $result[] = $DR->get();
-			        continue;
-		        }
-                }
-
-		if($arr['mid'] != $arr['parent_mid']) {
-
-			// check source route.
-			// We are only going to accept comments from this sender if the comment has the same route as the top-level-post,
-			// this is so that permissions mismatches between senders apply to the entire conversation
-			// As a side effect we will also do a preliminary check that we have the top-level-post, otherwise
-			// processing it is pointless.
-
-			$r = q("select route, id from item where mid = '%s' and uid = %d limit 1",
-				dbesc($arr['parent_mid']),
-				intval($channel['channel_id'])
-			);
-			if(! $r) {
-				$DR->update('comment parent not found');
-				$result[] = $DR->get();
-
-				// We don't seem to have a copy of this conversation or at least the parent
-				// - so request a copy of the entire conversation to date.
-				// Don't do this if it's a relay post as we're the ones who are supposed to
-				// have the copy and we don't want the request to loop.
-				// Also don't do this if this comment came from a conversation request packet.
-				// It's possible that comments are allowed but posting isn't and that could
-				// cause a conversation fetch loop. We can detect these packets since they are
-				// delivered via a 'notify' packet type that has a message_id element in the
-				// initial zot packet (just like the corresponding 'request' packet type which
-				// makes the request).
-				// We'll also check the send_stream permission - because if it isn't allowed,
-				// the top level post is unlikely to be imported and
-				// this is just an exercise in futility.
-
-				if((! $relay) && (! $request) && (! $local_public)
-					&& perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
-					Zotlabs\Daemon\Master::Summon(array('Notifier', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']));
-				}
-				continue;
-			}
-			if($relay) {
-				// reset the route in case it travelled a great distance upstream
-				// use our parent's route so when we go back downstream we'll match
-				// with whatever route our parent has.
-				$arr['route'] = $r[0]['route'];
-			}
-			else {
-
-				// going downstream check that we have the same upstream provider that
-				// sent it to us originally. Ignore it if it came from another source
-				// (with potentially different permissions).
-				// only compare the last hop since it could have arrived at the last location any number of ways.
-				// Always accept empty routes and firehose items (route contains 'undefined') .
-
-				$existing_route = explode(',', $r[0]['route']);
-				$routes = count($existing_route);
-				if($routes) {
-					$last_hop = array_pop($existing_route);
-					$last_prior_route = implode(',',$existing_route);
-				}
-				else {
-					$last_hop = '';
-					$last_prior_route = '';
-				}
-
-				if(in_array('undefined',$existing_route) || $last_hop == 'undefined' || $sender['hash'] == 'undefined')
-					$last_hop = '';
-
-				$current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash'];
-
-				if($last_hop && $last_hop != $sender['hash']) {
-					logger('comment route mismatch: parent route = ' . $r[0]['route'] . ' expected = ' . $current_route, LOGGER_DEBUG);
-					logger('comment route mismatch: parent msg = ' . $r[0]['id'],LOGGER_DEBUG);
-					$DR->update('comment route mismatch');
-					$result[] = $DR->get();
-					continue;
-				}
-
-				// we'll add sender['hash'] onto this when we deliver it. $last_prior_route now has the previously stored route
-				// *except* for the sender['hash'] which would've been the last hop before it got to us.
-
-				$arr['route'] = $last_prior_route;
-			}
-		}
-
-		$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
-			intval($channel['channel_id']),
-			dbesc($arr['owner_xchan'])
-		);
-
-		if(! $ab) {
-
-			$best_owner_xchan = find_best_zot_identity($arr['owner_xchan']);
-
-			$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
-				intval($channel['channel_id']),
-				dbesc($best_owner_xchan)
-			);
-
-			if($ab) {
-				logger('rewrite owner: ' . $arr['owner_xchan'] . ' > ' . $best_owner_xchan);
-				$arr['owner_xchan'] = $best_owner_xchan;
-			}
-		}
-
-		$best_author_xchan = find_best_zot_identity($arr['author_xchan']);
-
-		$ab_author = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
-			intval($channel['channel_id']),
-			dbesc($best_author_xchan)
-		);
-
-		if($ab_author) {
-			logger('rewrite author: ' . $arr['author_xchan'] . ' > ' . $best_author_xchan);
-			$arr['author_xchan'] = $best_author_xchan;
-		}
-
-		$abook = (($ab) ? $ab[0] : null);
-
-		if(intval($arr['item_deleted'])) {
-
-			// remove_community_tag is a no-op if this isn't a community tag activity
-			remove_community_tag($sender,$arr,$channel['channel_id']);
-
-			// set these just in case we need to store a fresh copy of the deleted post.
-			// This could happen if the delete got here before the original post did.
-
-			$arr['aid'] = $channel['channel_account_id'];
-			$arr['uid'] = $channel['channel_id'];
-
-			$item_id = delete_imported_item($sender,$arr,$channel['channel_id'],$relay);
-			$DR->update(($item_id) ? 'deleted' : 'delete_failed');
-			$result[] = $DR->get();
-
-			if($relay && $item_id) {
-				logger('process_delivery: invoking relay');
-				Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
-				$DR->update('relayed');
-				$result[] = $DR->get();
-			}
-
-			continue;
-		}
-
-
-		$r = q("select * from item where mid = '%s' and uid = %d limit 1",
-			dbesc($arr['mid']),
-			intval($channel['channel_id'])
-		);
-		if($r) {
-			// We already have this post.
-			$item_id = $r[0]['id'];
-
-			if(intval($r[0]['item_deleted'])) {
-				// It was deleted locally.
-				$DR->update('update ignored');
-				$result[] = $DR->get();
-
-				continue;
-			}
-			// Maybe it has been edited?
-			elseif($arr['edited'] > $r[0]['edited']) {
-				$arr['id'] = $r[0]['id'];
-				$arr['uid'] = $channel['channel_id'];
-				if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) {
-					$DR->update('update ignored');
-					$result[] = $DR->get();
-				}
-				else {
-					$item_result = update_imported_item($sender,$arr,$r[0],$channel['channel_id'],$tag_delivery);
-					$DR->update('updated');
-					$result[] = $DR->get();
-					if(! $relay)
-						add_source_route($item_id,$sender['hash']);
-				}
-			}
-			else {
-				$DR->update('update ignored');
-				$result[] = $DR->get();
-
-				// We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
-				// and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
-				if(! intval($r[0]['item_origin']))
-					continue;
-			}
-		}
-		else {
-			$arr['aid'] = $channel['channel_account_id'];
-			$arr['uid'] = $channel['channel_id'];
-
-			// if it's a sourced post, call the post_local hooks as if it were
-			// posted locally so that crosspost connectors will be triggered.
-
-			if(check_item_source($arr['uid'], $arr) || ($channel['xchan_pubforum'] == 1)) {
-				/**
-				 * @hooks post_local
-				 *   Called when an item has been posted on this machine via mod/item.php (also via API).
-				 *   * \e array with an item
-				 */
-				call_hooks('post_local', $arr);
-			}
-
-			$item_id = 0;
-
-			if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) {
-				$DR->update('post ignored');
-				$result[] = $DR->get();
-			}
-			else {
-				$item_result = item_store($arr);
-				if($item_result['success']) {
-					$item_id = $item_result['item_id'];
-					$parr = [
-							'item_id' => $item_id,
-							'item' => $arr,
-							'sender' => $sender,
-							'channel' => $channel
-					];
-					/**
-					 * @hooks activity_received
-					 *   Called when an activity (post, comment, like, etc.) has been received from a zot source.
-					 *   * \e int \b item_id
-					 *   * \e array \b item
-					 *   * \e array \b sender
-					 *   * \e array \b channel
-					 */
-					call_hooks('activity_received', $parr);
-					// don't add a source route if it's a relay or later recipients will get a route mismatch
-					if(! $relay)
-						add_source_route($item_id,$sender['hash']);
-				}
-				$DR->update(($item_id) ? 'posted' : 'storage failed: ' . $item_result['message']);
-				$result[] = $DR->get();
-			}
-		}
-
-		// preserve conversations with which you are involved from expiration
-
-		$stored = (($item_result && $item_result['item']) ? $item_result['item'] : false);
-		if((is_array($stored)) && ($stored['id'] != $stored['parent'])
-			&& ($stored['author_xchan'] === $channel['channel_portable_id'])) {
-			retain_item($stored['item']['parent']);
-		}
-
-		if($relay && $item_id) {
-			logger('Invoking relay');
-			Zotlabs\Daemon\Master::Summon(array('Notifier','relay',intval($item_id)));
-			$DR->addto_update('relayed');
-			$result[] = $DR->get();
-		}
-	}
-
-	if(! $deliveries)
-		$result[] = array('', 'no recipients', '', $arr['mid']);
-
-	logger('Local results: ' . print_r($result, true), LOGGER_DEBUG);
-
-	return $result;
-}
-
-/**
- * @brief Remove community tag.
- *
- * @param array $sender an associative array with
- *   * \e string \b hash a xchan_hash
- * @param array $arr an associative array
- *   * \e int \b verb
- *   * \e int \b obj_type
- *   * \e int \b mid
- * @param int $uid
- */
-function remove_community_tag($sender, $arr, $uid) {
-
-	if(! (activity_match($arr['verb'], ACTIVITY_TAG) && ($arr['obj_type'] == ACTIVITY_OBJ_TAGTERM)))
-		return;
-
-	logger('remove_community_tag: invoked');
-
-	if(! get_pconfig($uid,'system','blocktags')) {
-		logger('Permission denied.');
-		return;
-	}
-
-	$r = q("select * from item where mid = '%s' and uid = %d limit 1",
-		dbesc($arr['mid']),
-		intval($uid)
-	);
-	if(! $r) {
-		logger('No item');
-		return;
-	}
-
-	if(($sender['hash'] != $r[0]['owner_xchan']) && ($sender['hash'] != $r[0]['author_xchan'])) {
-		logger('Sender not authorised.');
-		return;
-	}
-
-	$i = $r[0];
-
-	if($i['target'])
-		$i['target'] = json_decode($i['target'],true);
-	if($i['object'])
-		$i['object'] = json_decode($i['object'],true);
-
-	if(! ($i['target'] && $i['object'])) {
-		logger('No target/object');
-		return;
-	}
-
-	$message_id = $i['target']['id'];
-
-	$r = q("select id from item where mid = '%s' and uid = %d limit 1",
-		dbesc($message_id),
-		intval($uid)
-	);
-	if(! $r) {
-		logger('No parent message');
-		return;
-	}
-
-	q("delete from term where uid = %d and oid = %d and otype = %d and ttype in  ( %d, %d ) and term = '%s' and url = '%s'",
-		intval($uid),
-		intval($r[0]['id']),
-		intval(TERM_OBJ_POST),
-		intval(TERM_HASHTAG),
-		intval(TERM_COMMUNITYTAG),
-		dbesc($i['object']['title']),
-		dbesc(get_rel_link($i['object']['link'],'alternate'))
-	);
-}
-
-/**
- * @brief Updates an imported item.
- *
- * @see item_store_update()
- *
- * @param array $sender
- * @param array $item
- * @param array $orig
- * @param int $uid
- * @param boolean $tag_delivery
- */
-function update_imported_item($sender, $item, $orig, $uid, $tag_delivery) {
-
-	// If this is a comment being updated, remove any privacy information
-	// so that item_store_update will set it from the original.
-
-	if($item['mid'] !== $item['parent_mid']) {
-		unset($item['allow_cid']);
-		unset($item['allow_gid']);
-		unset($item['deny_cid']);
-		unset($item['deny_gid']);
-		unset($item['item_private']);
-	}
-
-	// we need the tag_delivery check for downstream flowing posts as the stored post
-	// may have a different owner than the one being transmitted.
-
-	if(($sender['hash'] != $orig['owner_xchan'] && $sender['hash'] != $orig['author_xchan']) && (! $tag_delivery)) {
-		logger('sender is not owner or author');
-		return;
-	}
-
-
-	$x = item_store_update($item);
-
-	// If we're updating an event that we've saved locally, we store the item info first
-	// because event_addtocal will parse the body to get the 'new' event details
-
-	if($orig['resource_type'] === 'event') {
-		$res = event_addtocal($orig['id'], $uid);
-		if(! $res)
-			logger('update event: failed');
-	}
-
-	if(! $x['item_id'])
-		logger('update_imported_item: failed: ' . $x['message']);
-	else
-		logger('update_imported_item');
-
-	return $x;
-}
-
-/**
- * @brief Deletes an imported item.
- *
- * @param array $sender
- *   * \e string \b hash a xchan_hash
- * @param array $item
- * @param int $uid
- * @param boolean $relay
- * @return boolean|int post_id
- */
-function delete_imported_item($sender, $item, $uid, $relay) {
-
-	logger('invoked', LOGGER_DEBUG);
-
-	$ownership_valid = false;
-	$item_found = false;
-	$post_id = 0;
-
-	$r = q("select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
-		and mid = '%s' and uid = %d limit 1",
-		dbesc($sender['hash']),
-		dbesc($sender['hash']),
-		dbesc($sender['hash']),
-		dbesc($item['mid']),
-		intval($uid)
-	);
-
-	if($r) {
-
-		$stored = $r[0];
-
-		if($stored['author_xchan'] === $sender['hash'] || $stored['owner_xchan'] === $sender['hash'] || $stored['source_xchan'] === $sender['hash'])
-			$ownership_valid = true;
-
-		$post_id = $stored['id'];
-		$item_found = true;
-	}
-	else {
-
-		// perhaps the item is still in transit and the delete notification got here before the actual item did. Store it with the deleted flag set.
-		// item_store() won't try to deliver any notifications or start delivery chains if this flag is set.
-		// This means we won't end up with potentially even more delivery threads trying to push this delete notification.
-		// But this will ensure that if the (undeleted) original post comes in at a later date, we'll reject it because it will have an older timestamp.
-
-		logger('delete received for non-existent item - storing item data.');
-
-		if($item['author_xchan'] === $sender['hash'] || $item['owner_xchan'] === $sender['hash'] || $item['source_xchan'] === $sender['hash']) {
-			$ownership_valid = true;
-			$item_result = item_store($item);
-			$post_id = $item_result['item_id'];
-		}
-	}
-
-	if($ownership_valid === false) {
-		logger('delete_imported_item: failed: ownership issue');
-		return false;
-	}
-
-	if ($stored['resource_type'] === 'event') {
-		$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
-			dbesc($stored['resource_id']),
-			intval($uid)
-		);
-		if ($i) {
-			if ($i[0]['event_xchan'] === $sender['hash']) {
-				q("delete from event where event_hash = '%s' and uid = %d",
-					dbesc($stored['resource_id']),
-					intval($uid)
-				);
-			}
-			else {
-				logger('delete linked event: not owner');
-				return;
-			}
-		}
-	}
-
-	require_once('include/items.php');
-
-	if($item_found) {
-		if(intval($stored['item_deleted'])) {
-			logger('delete_imported_item: item was already deleted');
-			if(! $relay)
-				return false;
-
-			// This is a bit hackish, but may have to suffice until the notification/delivery loop is optimised
-			// a bit further. We're going to strip the ITEM_ORIGIN on this item if it's a comment, because
-			// it was already deleted, and we're already relaying, and this ensures that no other process or
-			// code path downstream can relay it again (causing a loop). Since it's already gone it's not coming
-			// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
-			// this information from the metadata should have no other discernible impact.
-
-			if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) {
-				q("update item set item_origin = 0 where id = %d and uid = %d",
-					intval($stored['id']),
-					intval($stored['uid'])
-				);
-			}
-		}
-
-		require_once('include/items.php');
-
-		// Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels
-		// and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2).
-
-		drop_item($post_id, false, DROPITEM_PHASE1);
-		tag_deliver($uid, $post_id);
-	}
-
-	return $post_id;
-}
-
-function process_mail_delivery($sender, $arr, $deliveries) {
-
-	$result = array();
-
-	if($sender['hash'] != $arr['from_xchan']) {
-		logger('process_mail_delivery: sender is not mail author');
-		return;
-	}
-
-	foreach($deliveries as $d) {
-
-		$DR = new Zotlabs\Lib\DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']);
-
-		$r = q("select * from channel where channel_portable_id = '%s' limit 1",
-			dbesc($d['hash'])
-		);
-
-		if(! $r) {
-			$DR->update('recipient not found');
-			$result[] = $DR->get();
-			continue;
-		}
-
-		$channel = $r[0];
-		$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
-
-		/* blacklisted channels get a permission denied, no special message to tip them off */
-
-		if(! check_channelallowed($sender['hash'])) {
-			$DR->update('permission denied');
-			$result[] = $DR->get();
-			continue;
-		}
-
-
-		if(! perm_is_allowed($channel['channel_id'],$sender['hash'],'post_mail')) {
-
-			/*
-			 * Always allow somebody to reply if you initiated the conversation. It's anti-social
-			 * and a bit rude to send a private message to somebody and block their ability to respond.
-			 * If you are being harrassed and want to put an end to it, delete the conversation.
-			 */
-
-			$return = false;
-			if($arr['parent_mid']) {
-				$return = q("select * from mail where mid = '%s' and channel_id = %d limit 1",
-					dbesc($arr['parent_mid']),
-					intval($channel['channel_id'])
-				);
-			}
-			if(! $return) {
-				logger("permission denied for mail delivery {$channel['channel_id']}");
-				$DR->update('permission denied');
-				$result[] = $DR->get();
-				continue;
-			}
-		}
-
-		$r = q("select id, conv_guid from mail where mid = '%s' and channel_id = %d limit 1",
-			dbesc($arr['mid']),
-			intval($channel['channel_id'])
-		);
-		if($r) {
-			if(intval($arr['mail_recalled'])) {
-				msg_drop($r[0]['id'], $channel['channel_id'], $r[0]['conv_guid']);
-				$DR->update('mail recalled');
-				$result[] = $DR->get();
-				logger('mail_recalled');
-			}
-			else {
-				$DR->update('duplicate mail received');
-				$result[] = $DR->get();
-				logger('duplicate mail received');
-			}
-			continue;
-		}
-		else {
-			$arr['account_id'] = $channel['channel_account_id'];
-			$arr['channel_id'] = $channel['channel_id'];
-			$item_id = mail_store($arr);
-			$DR->update('mail delivered');
-			$result[] = $DR->get();
-		}
-	}
-
-	return $result;
-}
-
-/**
- * @brief Processes delivery of rating.
- *
- * @param array $sender
- *   * \e string \b hash a xchan_hash
- * @param array $arr
- */
-function process_rating_delivery($sender, $arr) {
-
-	logger('process_rating_delivery: ' . print_r($arr,true));
-
-	if(! $arr['target'])
-		return;
-
-	$z = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
-		dbesc($sender['hash'])
-	);
-
-	if((! $z) || (! Crypto::verify($arr['target'] . '.' . $arr['rating'] . '.' . $arr['rating_text'], base64url_decode($arr['signature']),$z[0]['xchan_pubkey']))) {
-		logger('failed to verify rating');
-		return;
-	}
-
-	$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
-		dbesc($sender['hash']),
-		dbesc($arr['target'])
-	);
-
-	if($r) {
-		if($r[0]['xlink_updated'] >= $arr['edited']) {
-			logger('rating message duplicate');
-			return;
-		}
-
-		$x = q("update xlink set xlink_rating = %d, xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' where xlink_id = %d",
-			intval($arr['rating']),
-			dbesc($arr['rating_text']),
-			dbesc($arr['signature']),
-			dbesc(datetime_convert()),
-			intval($r[0]['xlink_id'])
-		);
-		logger('rating updated');
-	}
-	else {
-		$x = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static )
-			values( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
-			dbesc($sender['hash']),
-			dbesc($arr['target']),
-			intval($arr['rating']),
-			dbesc($arr['rating_text']),
-			dbesc($arr['signature']),
-			dbesc(datetime_convert())
-		);
-		logger('rating created');
-	}
-}
-
-/**
- * @brief Processes delivery of profile.
- *
- * @see import_directory_profile()
- * @param array $sender an associative array
- *   * \e string \b hash a xchan_hash
- * @param array $arr
- * @param array $deliveries (unused)
- */
-function process_profile_delivery($sender, $arr, $deliveries) {
-
-	logger('process_profile_delivery', LOGGER_DEBUG);
-
-	$r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
-			dbesc($sender['hash'])
-	);
-	if($r)
-		import_directory_profile($sender['hash'], $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0);
-}
-
-
-/**
- * @brief
- *
- * @param array $sender an associative array
- *   * \e string \b hash a xchan_hash
- * @param array $arr
- * @param array $deliveries (unused) deliveries is irrelevant
- */
-function process_location_delivery($sender, $arr, $deliveries) {
-
-	// deliveries is irrelevant
-	logger('process_location_delivery', LOGGER_DEBUG);
-
-	$r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
-			dbesc($sender['hash'])
-	);
-	if($r)
-		$sender['key'] = $r[0]['xchan_pubkey'];
-
-	if(array_key_exists('locations',$arr) && $arr['locations']) {
-		$x = sync_locations($sender,$arr,true);
-		logger('results: ' . print_r($x,true), LOGGER_DEBUG);
-		if($x['changed']) {
-			$guid = random_string() . '@' . App::get_hostname();
-			update_modtime($sender['hash'],$sender['guid'],$arr['locations'][0]['address'],UPDATE_FLAGS_UPDATED);
-		}
-	}
-}
-
-/**
- * @brief Checks for a moved UNO channel and sets the channel_moved flag.
- *
- * Currently the effect of this flag is to turn the channel into 'read-only' mode.
- * New content will not be processed (there was still an issue with blocking the
- * ability to post comments as of 10-Mar-2016).
- * We do not physically remove the channel at this time. The hub admin may choose
- * to do so, but is encouraged to allow a grace period of several days in case there
- * are any issues migrating content. This packet will generally be received by the
- * original site when the basic channel import has been processed.
- *
- * This will only be executed on the UNO system which is the old location
- * if a new location is reported and there is only one location record.
- * The rest of the hubloc syncronisation will be handled within
- * sync_locations
- *
- * @param string $sender_hash A channel hash
- * @param array $locations
- */
-function check_location_move($sender_hash, $locations) {
-
-	if(! $locations)
-		return;
-
-	if(count($locations) != 1)
-		return;
-
-	$loc = $locations[0];
-
-	$r = q("select * from channel where channel_portable_id = '%s' limit 1",
-		dbesc($sender_hash)
-	);
-
-	if(! $r)
-		return;
-
-	if($loc['url'] !== z_root()) {
-		$x = q("update channel set channel_moved = '%s' where channel_portable_id = '%s' limit 1",
-			dbesc($loc['url']),
-			dbesc($sender_hash)
-		);
-
-		// federation plugins may wish to notify connections
-		// of the move on singleton networks
-
-		$arr = [
-				'channel' => $r[0],
-				'locations' => $locations
-		];
-		/**
-		 * @hooks location_move
-		 *   Called when a new location has been provided to a UNO channel (indicating a move rather than a clone).
-		 *   * \e array \b channel
-		 *   * \e array \b locations
-		 */
-		call_hooks('location_move', $arr);
-	}
-}
-
-
-/**
- * @brief Synchronises locations.
- *
- * @param array $sender
- * @param array $arr
- * @param boolean $absolute (optional) default false
- * @return array
- */
-function sync_locations($sender, $arr, $absolute = false) {
-
-	$ret = array();
-
-	if($arr['locations']) {
-
-		if($absolute)
-			check_location_move($sender['hash'],$arr['locations']);
-
-		$xisting = q("select hubloc_id, hubloc_url, hubloc_sitekey from hubloc where hubloc_hash = '%s'",
-			dbesc($sender['hash'])
-		);
-
-		// See if a primary is specified
-
-		$has_primary = false;
-		foreach($arr['locations'] as $location) {
-			if($location['primary']) {
-				$has_primary = true;
-				break;
-			}
-		}
-
-		// Ensure that they have one primary hub
-
-		if(! $has_primary)
-			$arr['locations'][0]['primary'] = true;
-
-		foreach($arr['locations'] as $location) {
-			if(! Crypto::verify($location['url'],base64url_decode($location['url_sig']),$sender['key'])) {
-				logger('Unable to verify site signature for ' . $location['url']);
-				$ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL;
-				continue;
-			}
-
-			for($x = 0; $x < count($xisting); $x ++) {
-				if(($xisting[$x]['hubloc_url'] === $location['url'])
-					&& ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) {
-					$xisting[$x]['updated'] = true;
-				}
-			}
-
-			if(! $location['sitekey']) {
-				logger('Empty hubloc sitekey. ' . print_r($location,true));
-				continue;
-			}
-
-			// Catch some malformed entries from the past which still exist
-
-			if(strpos($location['address'],'/') !== false)
-				$location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
-
-			// match as many fields as possible in case anything at all changed.
-
-			$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
-				dbesc($sender['hash']),
-				dbesc($sender['guid']),
-				dbesc($sender['guid_sig']),
-				dbesc($location['url']),
-				dbesc($location['url_sig']),
-				dbesc($location['host']),
-				dbesc($location['address']),
-				dbesc($location['callback']),
-				dbesc($location['sitekey'])
-			);
-			if($r) {
-				logger('Hub exists: ' . $location['url'], LOGGER_DEBUG);
-
-				// update connection timestamp if this is the site we're talking to
-				// This only happens when called from import_xchan
-
-				$current_site = false;
-
-				$t = datetime_convert('UTC','UTC','now - 15 minutes');
-
-				if(array_key_exists('site',$arr) && $location['url'] == $arr['site']['url']) {
-					q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d and hubloc_connected < '%s'",
-						dbesc(datetime_convert()),
-						dbesc(datetime_convert()),
-						intval($r[0]['hubloc_id']),
-						dbesc($t)
-					);
-					$current_site = true;
-				}
-
-				if($current_site && intval($r[0]['hubloc_error'])) {
-					q("update hubloc set hubloc_error = 0 where hubloc_id = %d",
-						intval($r[0]['hubloc_id'])
-					);
-					if(intval($r[0]['hubloc_orphancheck'])) {
-						q("update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d",
-							intval($r[0]['hubloc_id'])
-						);
-					}
-					q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
-						dbesc($sender['hash'])
-					);
-				}
-
-				// Remove pure duplicates
-				if(count($r) > 1) {
-					for($h = 1; $h < count($r); $h ++) {
-						q("delete from hubloc where hubloc_id = %d",
-							intval($r[$h]['hubloc_id'])
-						);
-						$what .= 'duplicate_hubloc_removed ';
-						$changed = true;
-					}
-				}
-
-				if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) {
-					$m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d",
-						dbesc(datetime_convert()),
-						intval($r[0]['hubloc_id'])
-					);
-					$r[0]['hubloc_primary'] = intval($location['primary']);
-					hubloc_change_primary($r[0]);
-					$what .= 'primary_hub ';
-					$changed = true;
-				}
-				elseif((! intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
-					$m = q("update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
-						dbesc(datetime_convert()),
-						intval($r[0]['hubloc_id'])
-					);
-					// make sure hubloc_change_primary() has current data
-					$r[0]['hubloc_primary'] = intval($location['primary']);
-					hubloc_change_primary($r[0]);
-					$what .= 'primary_hub ';
-					$changed = true;
-				}
-				elseif($absolute) {
-					// Absolute sync - make sure the current primary is correctly reflected in the xchan
-					$pr = hubloc_change_primary($r[0]);
-					if($pr) {
-						$what .= 'xchan_primary ';
-						$changed = true;
-					}
-				}
-				if(intval($r[0]['hubloc_deleted']) && (! intval($location['deleted']))) {
-					$n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d",
-						dbesc(datetime_convert()),
-						intval($r[0]['hubloc_id'])
-					);
-					$what .= 'undelete_hub ';
-					$changed = true;
-				}
-				elseif((! intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) {
-					logger('deleting hubloc: ' . $r[0]['hubloc_addr']);
-					$n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
-						dbesc(datetime_convert()),
-						intval($r[0]['hubloc_id'])
-					);
-					$what .= 'delete_hub ';
-					$changed = true;
-				}
-				continue;
-			}
-
-			// Existing hubs are dealt with. Now let's process any new ones.
-			// New hub claiming to be primary. Make it so by removing any existing primaries.
-
-			if(intval($location['primary'])) {
-				$r = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
-					dbesc(datetime_convert()),
-					dbesc($sender['hash'])
-				);
-			}
-			logger('New hub: ' . $location['url']);
-
-			$addr_arr = explode('@', $location['address']);
-
-			$r = hubloc_store_lowlevel(
-				[
-					'hubloc_guid'      => $sender['guid'],
-					'hubloc_guid_sig'  => $sender['guid_sig'],
-					'hubloc_hash'      => $sender['hash'],
-					'hubloc_addr'      => $location['address'],
-					'hubloc_network'   => 'zot',
-					'hubloc_primary'   => intval($location['primary']),
-					'hubloc_url'       => $location['url'],
-					'hubloc_url_sig'   => $location['url_sig'],
-					'hubloc_host'      => $location['host'],
-					'hubloc_callback'  => $location['callback'],
-					'hubloc_sitekey'   => $location['sitekey'],
-					'hubloc_updated'   => datetime_convert(),
-					'hubloc_connected' => datetime_convert(),
-					'hubloc_id_url'    => $location['url'] . '/channel/' . $addr_arr[0]
-				]
-			);
-
-			$what .= 'newhub ';
-			$changed = true;
-
-			if($location['primary']) {
-				$r = q("select * from hubloc where hubloc_addr = '%s' and hubloc_sitekey = '%s' limit 1",
-					dbesc($location['address']),
-					dbesc($location['sitekey'])
-				);
-				if($r)
-					hubloc_change_primary($r[0]);
-			}
-		}
-
-		// get rid of any hubs we have for this channel which weren't reported.
-
-		if($absolute && $xisting) {
-			foreach($xisting as $x) {
-				if(! array_key_exists('updated',$x)) {
-					logger('Deleting unreferenced hub location ' . $x['hubloc_addr']);
-					$r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
-						dbesc(datetime_convert()),
-						intval($x['hubloc_id'])
-					);
-					$what .= 'removed_hub ';
-					$changed = true;
-				}
-			}
-		}
-	}
-	else {
-		logger('No locations to sync!');
-	}
-
-	$ret['change_message'] = $what;
-	$ret['changed'] = $changed;
-
-	return $ret;
-}
-
-/**
- * @brief Returns an array with all known distinct hubs for this channel.
- *
- * @see zot_get_hublocs()
- * @param array $channel an associative array which must contain
- *  * \e string \b channel_portable_id the hash of the channel
- * @return array an array with associative arrays
- */
-function zot_encode_locations($channel) {
-	$ret = array();
-
-	$x = zot_get_hublocs($channel['channel_portable_id']);
-
-	if($x && count($x)) {
-		foreach($x as $hub) {
-
-			// if this is a local channel that has been deleted, the hubloc is no good - make sure it is marked deleted
-			// so that nobody tries to use it.
-
-			if(intval($channel['channel_removed']) && $hub['hubloc_url'] === z_root())
-				$hub['hubloc_deleted'] = 1;
-
-			$ret[] = [
-				'host'     => $hub['hubloc_host'],
-				'address'  => $hub['hubloc_addr'],
-				'primary'  => (intval($hub['hubloc_primary']) ? true : false),
-				'url'      => $hub['hubloc_url'],
-				'url_sig'  => $hub['hubloc_url_sig'],
-				'callback' => $hub['hubloc_callback'],
-				'sitekey'  => $hub['hubloc_sitekey'],
-				'deleted'  => (intval($hub['hubloc_deleted']) ? true : false)
-			];
-		}
-	}
-
-	return $ret;
-}
-
-/**
- * @brief Imports a directory profile.
- *
- * @param string $hash
- * @param array $profile
- * @param string $addr
- * @param number $ud_flags (optional) UPDATE_FLAGS_UPDATED
- * @param number $suppress_update (optional) default 0
- * @return boolean $updated if something changed
- */
-function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLAGS_UPDATED, $suppress_update = 0) {
-
-	logger('import_directory_profile', LOGGER_DEBUG);
-	if (! $hash)
-		return false;
-
-	$arr = array();
-
-	$arr['xprof_hash']         = $hash;
-	$arr['xprof_dob']          = (($profile['birthday'] === '0000-00-00') ? $profile['birthday'] : datetime_convert('','',$profile['birthday'],'Y-m-d')); // !!!! check this for 0000 year
-	$arr['xprof_age']          = (($profile['age'])         ? intval($profile['age']) : 0);
-	$arr['xprof_desc']         = (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_gender']       = (($profile['gender'])      ? htmlspecialchars($profile['gender'],      ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_marital']      = (($profile['marital'])     ? htmlspecialchars($profile['marital'],     ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_sexual']       = (($profile['sexual'])      ? htmlspecialchars($profile['sexual'],      ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_locale']       = (($profile['locale'])      ? htmlspecialchars($profile['locale'],      ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_region']       = (($profile['region'])      ? htmlspecialchars($profile['region'],      ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_postcode']     = (($profile['postcode'])    ? htmlspecialchars($profile['postcode'],    ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_country']      = (($profile['country'])     ? htmlspecialchars($profile['country'],     ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_about']        = (($profile['about'])       ? htmlspecialchars($profile['about'],       ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_homepage']     = (($profile['homepage'])    ? htmlspecialchars($profile['homepage'],    ENT_COMPAT,'UTF-8',false) : '');
-	$arr['xprof_hometown']     = (($profile['hometown'])    ? htmlspecialchars($profile['hometown'],    ENT_COMPAT,'UTF-8',false) : '');
-
-	$clean = array();
-	if (array_key_exists('keywords', $profile) and is_array($profile['keywords'])) {
-		import_directory_keywords($hash,$profile['keywords']);
-		foreach ($profile['keywords'] as $kw) {
-			$kw = trim(htmlspecialchars($kw,ENT_COMPAT, 'UTF-8', false));
-			$kw = trim($kw, ',');
-			$clean[] = $kw;
-		}
-	}
-
-	$arr['xprof_keywords'] = implode(' ',$clean);
-
-	// Self censored, make it so
-	// These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult".
-
-
-	if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) {
-		q("update xchan set xchan_selfcensored = 1 where xchan_hash = '%s'",
-			dbesc($hash)
-		);
-	}
-
-	$r = q("select * from xprof where xprof_hash = '%s' limit 1",
-		dbesc($hash)
-	);
-
-	if ($arr['xprof_age'] > 150)
-		$arr['xprof_age'] = 150;
-	if ($arr['xprof_age'] < 0)
-		$arr['xprof_age'] = 0;
-
-	if ($r) {
-		$update = false;
-		foreach ($r[0] as $k => $v) {
-			if ((array_key_exists($k,$arr)) && ($arr[$k] != $v)) {
-				logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]);
-				$update = true;
-				break;
-			}
-		}
-		if ($update) {
-			q("update xprof set
-				xprof_desc = '%s',
-				xprof_dob = '%s',
-				xprof_age = %d,
-				xprof_gender = '%s',
-				xprof_marital = '%s',
-				xprof_sexual = '%s',
-				xprof_locale = '%s',
-				xprof_region = '%s',
-				xprof_postcode = '%s',
-				xprof_country = '%s',
-				xprof_about = '%s',
-				xprof_homepage = '%s',
-				xprof_hometown = '%s',
-				xprof_keywords = '%s'
-				where xprof_hash = '%s'",
-				dbesc($arr['xprof_desc']),
-				dbesc($arr['xprof_dob']),
-				intval($arr['xprof_age']),
-				dbesc($arr['xprof_gender']),
-				dbesc($arr['xprof_marital']),
-				dbesc($arr['xprof_sexual']),
-				dbesc($arr['xprof_locale']),
-				dbesc($arr['xprof_region']),
-				dbesc($arr['xprof_postcode']),
-				dbesc($arr['xprof_country']),
-				dbesc($arr['xprof_about']),
-				dbesc($arr['xprof_homepage']),
-				dbesc($arr['xprof_hometown']),
-				dbesc($arr['xprof_keywords']),
-				dbesc($arr['xprof_hash'])
-			);
-		}
-	} else {
-		$update = true;
-		logger('New profile');
-		q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
-			dbesc($arr['xprof_hash']),
-			dbesc($arr['xprof_desc']),
-			dbesc($arr['xprof_dob']),
-			intval($arr['xprof_age']),
-			dbesc($arr['xprof_gender']),
-			dbesc($arr['xprof_marital']),
-			dbesc($arr['xprof_sexual']),
-			dbesc($arr['xprof_locale']),
-			dbesc($arr['xprof_region']),
-			dbesc($arr['xprof_postcode']),
-			dbesc($arr['xprof_country']),
-			dbesc($arr['xprof_about']),
-			dbesc($arr['xprof_homepage']),
-			dbesc($arr['xprof_hometown']),
-			dbesc($arr['xprof_keywords'])
-		);
-	}
-
-	$d = [
-			'xprof' => $arr,
-			'profile' => $profile,
-			'update' => $update
-	];
-	/**
-	 * @hooks import_directory_profile
-	 *   Called when processing delivery of a profile structure from an external source (usually for directory storage).
-	 *   * \e array \b xprof
-	 *   * \e array \b profile
-	 *   * \e boolean \b update
-	 */
-	call_hooks('import_directory_profile', $d);
-
-	if (($d['update']) && (! $suppress_update))
-		update_modtime($arr['xprof_hash'],random_string() . '@' . App::get_hostname(), $addr, $ud_flags);
-
-	return $d['update'];
-}
-
-/**
- * @brief
- *
- * @param string $hash An xtag_hash
- * @param array $keywords
- */
-function import_directory_keywords($hash, $keywords) {
-
-	$existing = array();
-	$r = q("select * from xtag where xtag_hash = '%s' and xtag_flags = 0",
-		dbesc($hash)
-	);
-
-	if($r) {
-		foreach($r as $rr)
-			$existing[] = $rr['xtag_term'];
-	}
-
-	$clean = array();
-	foreach($keywords as $kw) {
-		$kw = trim(htmlspecialchars($kw,ENT_COMPAT, 'UTF-8', false));
-		$kw = trim($kw, ',');
-		$clean[] = $kw;
-	}
-
-	foreach($existing as $x) {
-		if(! in_array($x, $clean))
-			$r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s' and xtag_flags = 0",
-				dbesc($hash),
-				dbesc($x)
-			);
-	}
-	foreach($clean as $x) {
-		if(! in_array($x, $existing)) {
-			$r = q("insert into xtag ( xtag_hash, xtag_term, xtag_flags) values ( '%s' ,'%s', 0 )",
-				dbesc($hash),
-				dbesc($x)
-			);
-		}
-	}
-}
-
-/**
- * @brief
- *
- * @param string $hash
- * @param string $guid
- * @param string $addr
- * @param int $flags (optional) default 0
- */
-function update_modtime($hash, $guid, $addr, $flags = 0) {
-
-	$dirmode = intval(get_config('system', 'directory_mode'));
-
-	if($dirmode == DIRECTORY_MODE_NORMAL)
-		return;
-
-	if($flags) {
-		q("insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )",
-			dbesc($hash),
-			dbesc($guid),
-			dbesc(datetime_convert()),
-			intval($flags),
-			dbesc($addr)
-		);
-	}
-	else {
-		q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ",
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc($addr),
-			intval(UPDATE_FLAGS_UPDATED)
-		);
-	}
-}
-
-/**
- * @brief
- *
- * @param array $arr
- * @param string $pubkey
- * @return boolean true if updated or inserted
- */
-function import_site($arr, $pubkey) {
-	if( (! is_array($arr)) || (! $arr['url']) || (! $arr['url_sig']))
-		return false;
-
-	if(! Crypto::verify($arr['url'], base64url_decode($arr['url_sig']), $pubkey)) {
-		logger('Bad url_sig');
-		return false;
-	}
-
-	$update = false;
-	$exists = false;
-
-	$r = q("select * from site where site_url = '%s' limit 1",
-		dbesc($arr['url'])
-	);
-	if($r) {
-		$exists = true;
-		$siterecord = $r[0];
-	}
-
-	$site_directory = 0;
-	if($arr['directory_mode'] == 'normal')
-		$site_directory = DIRECTORY_MODE_NORMAL;
-	if($arr['directory_mode'] == 'primary')
-		$site_directory = DIRECTORY_MODE_PRIMARY;
-	if($arr['directory_mode'] == 'secondary')
-		$site_directory = DIRECTORY_MODE_SECONDARY;
-	if($arr['directory_mode'] == 'standalone')
-		$site_directory = DIRECTORY_MODE_STANDALONE;
-
-	$register_policy = 0;
-	if($arr['register_policy'] == 'closed')
-		$register_policy = REGISTER_CLOSED;
-	if($arr['register_policy'] == 'open')
-		$register_policy = REGISTER_OPEN;
-	if($arr['register_policy'] == 'approve')
-		$register_policy = REGISTER_APPROVE;
-
-	$access_policy = 0;
-	if(array_key_exists('access_policy',$arr)) {
-		if($arr['access_policy'] === 'private')
-			$access_policy = ACCESS_PRIVATE;
-		if($arr['access_policy'] === 'paid')
-			$access_policy = ACCESS_PAID;
-		if($arr['access_policy'] === 'free')
-			$access_policy = ACCESS_FREE;
-		if($arr['access_policy'] === 'tiered')
-			$access_policy = ACCESS_TIERED;
-	}
-
-	// don't let insecure sites register as public hubs
-
-	if(strpos($arr['url'],'https://') === false)
-		$access_policy = ACCESS_PRIVATE;
-
-	if($access_policy != ACCESS_PRIVATE) {
-		$x = z_fetch_url($arr['url'] . '/siteinfo.json');
-		if(! $x['success'])
-			$access_policy = ACCESS_PRIVATE;
-	}
-
-	$directory_url = htmlspecialchars($arr['directory_url'],ENT_COMPAT,'UTF-8',false);
-	$url = htmlspecialchars(strtolower($arr['url']),ENT_COMPAT,'UTF-8',false);
-	$sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false);
-	$site_location = htmlspecialchars($arr['location'],ENT_COMPAT,'UTF-8',false);
-	$site_realm = htmlspecialchars($arr['realm'],ENT_COMPAT,'UTF-8',false);
-	$site_project = htmlspecialchars($arr['project'],ENT_COMPAT,'UTF-8',false);
-	$site_crypto = ((array_key_exists('encryption',$arr) && is_array($arr['encryption'])) ? htmlspecialchars(implode(',',$arr['encryption']),ENT_COMPAT,'UTF-8',false) : '');
-	$site_version = ((array_key_exists('version',$arr)) ? htmlspecialchars($arr['version'],ENT_COMPAT,'UTF-8',false) : '');
-
-	// You can have one and only one primary directory per realm.
-	// Downgrade any others claiming to be primary. As they have
-	// flubbed up this badly already, don't let them be directory servers at all.
-
-	if(($site_directory === DIRECTORY_MODE_PRIMARY)
-			&& ($site_realm === get_directory_realm())
-			&& ($arr['url'] != get_directory_primary())) {
-		$site_directory = DIRECTORY_MODE_NORMAL;
-	}
-
-	$site_flags = $site_directory;
-
-	if(array_key_exists('zot',$arr)) {
-		set_sconfig($arr['url'],'system','zot_version',$arr['zot']);
-	}
-
-	if($exists) {
-		if(($siterecord['site_flags'] != $site_flags)
-			|| ($siterecord['site_access'] != $access_policy)
-			|| ($siterecord['site_directory'] != $directory_url)
-			|| ($siterecord['site_sellpage'] != $sellpage)
-			|| ($siterecord['site_location'] != $site_location)
-			|| ($siterecord['site_register'] != $register_policy)
-			|| ($siterecord['site_project'] != $site_project)
-			|| ($siterecord['site_realm'] != $site_realm)
-			|| ($siterecord['site_crypto'] != $site_crypto)
-			|| ($siterecord['site_version'] != $site_version)   ) {
-
-			$update = true;
-
-//			logger('import_site: input: ' . print_r($arr,true));
-//			logger('import_site: stored: ' . print_r($siterecord,true));
-
-			$r = q("update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d, site_project = '%s', site_version = '%s', site_crypto = '%s'
-				where site_url = '%s'",
-				dbesc($site_location),
-				intval($site_flags),
-				intval($access_policy),
-				dbesc($directory_url),
-				intval($register_policy),
-				dbesc(datetime_convert()),
-				dbesc($sellpage),
-				dbesc($site_realm),
-				intval(SITE_TYPE_ZOT),
-				dbesc($site_project),
-				dbesc($site_version),
-				dbesc($site_crypto),
-				dbesc($url)
-			);
-			if(! $r) {
-				logger('Update failed. ' . print_r($arr,true));
-			}
-		}
-		else {
-			// update the timestamp to indicate we communicated with this site
-			q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
-				dbesc(datetime_convert()),
-				dbesc($url)
-			);
-		}
-	}
-	else {
-		$update = true;
-
-		$r = site_store_lowlevel(
-			[
-				'site_location'  => $site_location,
-				'site_url'       => $url,
-				'site_access'    => intval($access_policy),
-				'site_flags'     => intval($site_flags),
-				'site_update'    => datetime_convert(),
-				'site_directory' => $directory_url,
-				'site_register'  => intval($register_policy),
-				'site_sellpage'  => $sellpage,
-				'site_realm'     => $site_realm,
-				'site_type'      => intval(SITE_TYPE_ZOT),
-				'site_project'   => $site_project,
-				'site_version'   => $site_version,
-				'site_crypto'    => $site_crypto
-			]
-		);
-
-		if(! $r) {
-			logger('Record create failed. ' . print_r($arr,true));
-		}
-	}
-
-	return $update;
-}
-
-
-/**
- * @brief Builds and sends a sync packet.
- *
- * Send a zot packet to all hubs where this channel is duplicated, refreshing
- * such things as personal settings, channel permissions, address book updates, etc.
- *
- * @param int $uid (optional) default 0
- * @param array $packet (optional) default null
- * @param boolean $groups_changed (optional) default false
- */
-function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
-
-	logger('build_sync_packet');
-
-	$keychange = (($packet && array_key_exists('keychange',$packet)) ? true : false);
-	if($keychange) {
-		logger('keychange sync');
-	}
-
-	if(! $uid)
-		$uid = local_channel();
-
-	if(! $uid)
-		return;
-
-	$r = q("select * from channel where channel_id = %d limit 1",
-		intval($uid)
-	);
-	if(! $r)
-		return;
-
-	$channel = $r[0];
-
-	// don't provide these in the export
-
-	unset($channel['channel_active']);
-	unset($channel['channel_password']);
-	unset($channel['channel_salt']);
-
-	translate_channel_perms_outbound($channel);
-	if($packet && array_key_exists('abook',$packet) && $packet['abook']) {
-		for($x = 0; $x < count($packet['abook']); $x ++) {
-			translate_abook_perms_outbound($packet['abook'][$x]);
-		}
-	}
-
-	if(intval($channel['channel_removed']))
-		return;
-
-	$h = q("select hubloc.*, site.site_crypto, site.site_version, site.site_project from hubloc left join site on site_url = hubloc_url where hubloc_hash = '%s' and hubloc_deleted = 0",
-		dbesc(($keychange) ? $packet['keychange']['old_hash'] : $channel['channel_portable_id'])
-	);
-
-	if(! $h)
-		return;
-
-	$synchubs = array();
-
-	foreach($h as $x) {
-		if($x['hubloc_host'] == App::get_hostname())
-			continue;
-
-		if(stripos($x['site_project'], 'hubzilla') !== false && version_compare($x['site_version'], '4.7.3', '<=')) {
-
-			logger('Dismiss sync due to incompatible version.');
-			// logger(print_r($x,true));
-			continue;
-
-		}
-
-		$y = q("select site_dead from site where site_url = '%s' limit 1",
-			dbesc($x['hubloc_url'])
-		);
-
-		if((! $y) || ($y[0]['site_dead'] == 0))
-			$synchubs[] = $x;
-	}
-
-	if(! $synchubs)
-		return;
-
-	$r = q("select xchan_guid, xchan_guid_sig from xchan where xchan_hash  = '%s' limit 1",
-		dbesc($channel['channel_portable_id'])
-	);
-
-	if(! $r)
-		return;
-
-	$env_recips = array();
-	$env_recips[] = array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig']);
-
-	if($packet)
-		logger('packet: ' . print_r($packet, true),LOGGER_DATA, LOG_DEBUG);
-
-	$info = (($packet) ? $packet : array());
-	$info['type'] = 'channel_sync';
-	$info['encoding'] = 'red'; // note: not zot, this packet is very platform specific
-	$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ];
-
-	if(array_key_exists($uid,App::$config) && array_key_exists('transient',App::$config[$uid])) {
-		$settings = App::$config[$uid]['transient'];
-		if($settings) {
-			$info['config'] = $settings;
-		}
-	}
-
-	if($channel) {
-		$info['channel'] = array();
-		foreach($channel as $k => $v) {
-
-			// filter out any joined tables like xchan
-
-			if(strpos($k,'channel_') !== 0)
-				continue;
-
-			// don't pass these elements, they should not be synchronised
-
-
-			$disallowed = [
-				'channel_id','channel_account_id','channel_primary','channel_address',
-				'channel_deleted','channel_removed','channel_system'
-			];
-
-			if(! $keychange) {
-				$disallowed[] = 'channel_prvkey';
-			}
-
-			if(in_array($k,$disallowed))
-				continue;
-
-			$info['channel'][$k] = $v;
-		}
-	}
-
-	if($groups_changed) {
-		$r = q("select hash as collection, visible, deleted, gname as name from pgrp where uid = %d",
-			intval($uid)
-		);
-		if($r)
-			$info['collections'] = $r;
-
-		$r = q("select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid where pgrp_member.uid = %d",
-			intval($uid)
-		);
-		if($r)
-			$info['collection_members'] = $r;
-	}
-
-	$interval = ((get_config('system','delivery_interval') !== false)
-			? intval(get_config('system','delivery_interval')) : 2 );
-
-	logger('Packet: ' . print_r($info,true), LOGGER_DATA, LOG_DEBUG);
-
-	$total = count($synchubs);
-
-	foreach($synchubs as $hub) {
-		$hash = random_string();
-		$n = zot_build_packet($channel,'notify',$env_recips,$hub['hubloc_sitekey'],$hub['site_crypto'],$hash);
-		queue_insert(array(
-			'hash'       => $hash,
-			'account_id' => $channel['channel_account_id'],
-			'channel_id' => $channel['channel_id'],
-			'posturl'    => $hub['hubloc_callback'],
-			'notify'     => $n,
-			'msg'        => json_encode($info)
-		));
-
-
-		$x = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-		if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000))) {
-			logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
-			update_queue_item($hash);
-			continue;
-		}
-
-
-		Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
-		$total = $total - 1;
-
-		if($interval && $total)
-			@time_sleep_until(microtime(true) + (float) $interval);
-	}
-}
-
-/**
- * @brief
- *
- * @param array $sender
- * @param array $arr
- * @param array $deliveries
- * @return array
- */
-function process_channel_sync_delivery($sender, $arr, $deliveries) {
-
-	require_once('include/import.php');
-
-	/** @FIXME this will sync red structures (channel, pconfig and abook).
-		Eventually we need to make this application agnostic. */
-
-	$result = [];
-
-	$keychange = ((array_key_exists('keychange',$arr)) ? true : false);
-
-	foreach ($deliveries as $d) {
-		$r = q("select * from channel where channel_hash = '%s' limit 1",
-			dbesc(($keychange) ? $arr['keychange']['old_hash'] : $d['hash'])
-		);
-
-		if (! $r) {
-			$result[] = array($d['hash'],'not found');
-			continue;
-		}
-
-		$channel = $r[0];
-
-		$max_friends = service_class_fetch($channel['channel_id'],'total_channels');
-		$max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds');
-
-		if($channel['channel_hash'] != $sender['hash']) {
-			logger('Possible forgery. Sender ' . $sender['hash'] . ' is not ' . $channel['channel_hash']);
-			$result[] = array($d['hash'],'channel mismatch',$channel['channel_name'],'');
-			continue;
-		}
-
-		if($keychange) {
-			// verify the keychange operation
-			if(! Crypto::verify($arr['channel']['channel_pubkey'],base64url_decode($arr['keychange']['new_sig']),$channel['channel_prvkey'])) {
-				logger('sync keychange: verification failed');
-				continue;
-			}
-
-			$sig = base64url_encode(Crypto::sign($channel['channel_guid'],$arr['channel']['channel_prvkey']));
-			$hash = make_xchan_hash($channel['channel_guid'],$sig);
-
-
-			$r = q("update channel set channel_prvkey = '%s', channel_pubkey = '%s', channel_guid_sig = '%s',
-				channel_hash = '%s' where channel_id = %d",
-				dbesc($arr['channel']['channel_prvkey']),
-				dbesc($arr['channel']['channel_pubkey']),
-				dbesc($sig),
-				dbesc($hash),
-				intval($channel['channel_id'])
-			);
-			if(! $r) {
-				logger('keychange sync: channel update failed');
-				continue;
- 			}
-
-			$r = q("select * from channel where channel_id = %d",
-				intval($channel['channel_id'])
-			);
-
-			if(! $r) {
-				logger('keychange sync: channel retrieve failed');
-				continue;
-			}
-
-			$channel = $r[0];
-
-			$h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' ",
-				dbesc($arr['keychange']['old_hash']),
-				dbesc(z_root())
-			);
-
-			if($h) {
-				foreach($h as $hv) {
-					$hv['hubloc_guid_sig'] = $sig;
-					$hv['hubloc_hash']     = $hash;
-					$hv['hubloc_url_sig']  = base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey']));
-					hubloc_store_lowlevel($hv);
-				}
-			}
-
-			$x = q("select * from xchan where xchan_hash = '%s' ",
-				dbesc($arr['keychange']['old_hash'])
-			);
-
-			$check = q("select * from xchan where xchan_hash = '%s'",
-				dbesc($hash)
-			);
-
-			if(($x) && (! $check)) {
-				$oldxchan = $x[0];
-				foreach($x as $xv) {
-					$xv['xchan_guid_sig']  = $sig;
-					$xv['xchan_hash']      = $hash;
-					$xv['xchan_pubkey']    = $channel['channel_pubkey'];
-					xchan_store_lowlevel($xv);
-					$newxchan = $xv;
-				}
-			}
-
-			$a = q("select * from abook where abook_xchan = '%s' and abook_self = 1",
-				dbesc($arr['keychange']['old_hash'])
-			);
-
-			if($a) {
-				q("update abook set abook_xchan = '%s' where abook_id = %d",
-					dbesc($hash),
-					intval($a[0]['abook_id'])
-				);
-			}
-
-			xchan_change_key($oldxchan,$newxchan,$arr['keychange']);
-
-			// keychange operations can end up in a confused state if you try and sync anything else
-			// besides the channel keys, so ignore any other packets.
-
-			continue;
-		}
-
-		// if the clone is active, so are we
-
-		if(substr($channel['channel_active'],0,10) !== substr(datetime_convert(),0,10)) {
-			q("UPDATE channel set channel_active = '%s' where channel_id = %d",
-				dbesc(datetime_convert()),
-				intval($channel['channel_id'])
-			);
-		}
-
-		if(array_key_exists('config',$arr) && is_array($arr['config']) && count($arr['config'])) {
-			foreach($arr['config'] as $cat => $k) {
-
-				$pconfig_updated = [];
-				$pconfig_del = [];
-
-				foreach($arr['config'][$cat] as $k => $v) {
-
-					if (strpos($k,'pcfgud:')===0) {
-
-						$realk = substr($k,7);
-						$pconfig_updated[$realk] = $v;
-						unset($arr['config'][$cat][$k]);
-
-					}
-
-					if (strpos($k,'pcfgdel:')===0) {
-						$realk = substr($k,8);
-						$pconfig_del[$realk] = datetime_convert();
-						unset($arr['config'][$cat][$k]);
-					}
-				}
-
-				foreach($arr['config'][$cat] as $k => $v) {
-
-					if (!isset($pconfig_updated[$k])) {
-						$pconfig_updated[$k] = NULL;
-					}
-
-					set_pconfig($channel['channel_id'],$cat,$k,$v,$pconfig_updated[$k]);
-
-				}
-
-				foreach($pconfig_del as $k => $updated) {
-					del_pconfig($channel['channel_id'],$cat,$k,$updated);
-				}
-
-			}
-		}
-
-		if(array_key_exists('obj',$arr) && $arr['obj'])
-			sync_objs($channel,$arr['obj']);
-
-		if(array_key_exists('likes',$arr) && $arr['likes'])
-			import_likes($channel,$arr['likes']);
-
-		if(array_key_exists('app',$arr) && $arr['app'])
-			sync_apps($channel,$arr['app']);
-
-		if(array_key_exists('addressbook',$arr) && $arr['addressbook'])
-			sync_addressbook($channel,$arr['addressbook']);
-
-		if(array_key_exists('calendar',$arr) && $arr['calendar'])
-			sync_calendar($channel,$arr['calendar']);
-
-		if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
-			sync_chatrooms($channel,$arr['chatroom']);
-
-		if(array_key_exists('conv',$arr) && $arr['conv'])
-			import_conv($channel,$arr['conv']);
-
-		if(array_key_exists('mail',$arr) && $arr['mail'])
-			sync_mail($channel,$arr['mail']);
-
-		if(array_key_exists('event',$arr) && $arr['event'])
-			sync_events($channel,$arr['event']);
-
-		if(array_key_exists('event_item',$arr) && $arr['event_item'])
-			sync_items($channel,$arr['event_item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
-
-		if(array_key_exists('item',$arr) && $arr['item'])
-			sync_items($channel,$arr['item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
-
-		// deprecated, maintaining for a few months for upward compatibility
-		// this should sync webpages, but the logic is a bit subtle
-
-		if(array_key_exists('item_id',$arr) && $arr['item_id'])
-			sync_items($channel,$arr['item_id']);
-
-		if(array_key_exists('menu',$arr) && $arr['menu'])
-			sync_menus($channel,$arr['menu']);
-
-		if(array_key_exists('file',$arr) && $arr['file'])
-			sync_files($channel,$arr['file']);
-
-		if(array_key_exists('wiki',$arr) && $arr['wiki'])
-			sync_items($channel,$arr['wiki'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
-
-		if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
-
-			$remote_channel = $arr['channel'];
-			$remote_channel['channel_id'] = $channel['channel_id'];
-			translate_channel_perms_inbound($remote_channel);
-
-
-			if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
-				// Several pageflags are site-specific and cannot be sync'd.
-				// Only allow those bits which are shareable from the remote and then
-				// logically OR with the local flags
-
-				$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] & (PAGE_HIDDEN|PAGE_AUTOCONNECT|PAGE_APPLICATION|PAGE_PREMIUM|PAGE_ADULT);
-				$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] | $channel['channel_pageflags'];
-			}
-
-			$disallowed = [
-				'channel_id',         'channel_account_id',  'channel_primary',   'channel_prvkey',
-				'channel_address',    'channel_notifyflags', 'channel_removed',   'channel_deleted',
-				'channel_system',     'channel_r_stream',    'channel_r_profile', 'channel_r_abook',
-				'channel_r_storage',  'channel_r_pages',     'channel_w_stream',  'channel_w_wall',
-				'channel_w_comment',  'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
-				'channel_w_chat',     'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
-				'channel_a_delegate', 'channel_moved',       'channel_r_photos',  'channel_w_photos'
-			];
-
-			$clean = array();
-			foreach($arr['channel'] as $k => $v) {
-				if(in_array($k,$disallowed))
-					continue;
-				$clean[$k] = $v;
-			}
-			if(count($clean)) {
-				foreach($clean as $k => $v) {
-					$r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v)
-						. "' where channel_id = " . intval($channel['channel_id']) );
-				}
-			}
-		}
-
-		if(array_key_exists('abook',$arr) && is_array($arr['abook']) && count($arr['abook'])) {
-			$total_friends = 0;
-			$total_feeds = 0;
-
-			$r = q("select abook_id, abook_feed from abook where abook_channel = %d",
-				intval($channel['channel_id'])
-			);
-			if($r) {
-				// don't count yourself
-				$total_friends = ((count($r) > 0) ? count($r) - 1 : 0);
-				foreach($r as $rr)
-					if(intval($rr['abook_feed']))
-						$total_feeds ++;
-			}
-
-
-			$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text','abook_not_here');
-
-			foreach($arr['abook'] as $abook) {
-
-				$abconfig = null;
-
-				if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig']))
-					$abconfig = $abook['abconfig'];
-
-				if(! array_key_exists('abook_blocked',$abook)) {
-					// convert from redmatrix
-					$abook['abook_blocked']     = (($abook['abook_flags'] & 0x0001) ? 1 : 0);
-					$abook['abook_ignored']     = (($abook['abook_flags'] & 0x0002) ? 1 : 0);
-					$abook['abook_hidden']      = (($abook['abook_flags'] & 0x0004) ? 1 : 0);
-					$abook['abook_archived']    = (($abook['abook_flags'] & 0x0008) ? 1 : 0);
-					$abook['abook_pending']     = (($abook['abook_flags'] & 0x0010) ? 1 : 0);
-					$abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020) ? 1 : 0);
-					$abook['abook_self']        = (($abook['abook_flags'] & 0x0080) ? 1 : 0);
-					$abook['abook_feed']        = (($abook['abook_flags'] & 0x0100) ? 1 : 0);
-				}
-
-				$clean = array();
-				if($abook['abook_xchan'] && $abook['entry_deleted']) {
-					logger('Removing abook entry for ' . $abook['abook_xchan']);
-
-					$r = q("select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
-						dbesc($abook['abook_xchan']),
-						intval($channel['channel_id'])
-					);
-					if($r) {
-						contact_remove($channel['channel_id'],$r[0]['abook_id']);
-						if($total_friends)
-							$total_friends --;
-						if(intval($r[0]['abook_feed']))
-							$total_feeds --;
-					}
-					continue;
-				}
-
-				// Perform discovery if the referenced xchan hasn't ever been seen on this hub.
-				// This relies on the undocumented behaviour that red sites send xchan info with the abook
-				// and import_author_xchan will look them up on all federated networks
-
-				if($abook['abook_xchan'] && $abook['xchan_addr']) {
-					$h = zot_get_hublocs($abook['abook_xchan']);
-					if(! $h) {
-						$xhash = import_author_xchan(encode_item_xchan($abook));
-						if(! $xhash) {
-							logger('Import of ' . $abook['xchan_addr'] . ' failed.');
-							continue;
-						}
-					}
-				}
-
-				foreach($abook as $k => $v) {
-					if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0))
-						continue;
-					$clean[$k] = $v;
-				}
-
-				if(! array_key_exists('abook_xchan',$clean))
-					continue;
-
-				if(array_key_exists('abook_instance',$clean) && $clean['abook_instance'] && strpos($clean['abook_instance'],z_root()) === false) {
-					$clean['abook_not_here'] = 1;
-				}
-
-
-				$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-					dbesc($clean['abook_xchan']),
-					intval($channel['channel_id'])
-				);
-
-				// make sure we have an abook entry for this xchan on this system
-
-				if(! $r) {
-					if($max_friends !== false && $total_friends > $max_friends) {
-						logger('total_channels service class limit exceeded');
-						continue;
-					}
-					if($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) {
-						logger('total_feeds service class limit exceeded');
-						continue;
-					}
-					abook_store_lowlevel(
-						[
-							'abook_xchan'   => $clean['abook_xchan'],
-							'abook_account' => $channel['channel_account_id'],
-							'abook_channel' => $channel['channel_id']
-						]
-					);
-					$total_friends ++;
-					if(intval($clean['abook_feed']))
-						$total_feeds ++;
-				}
-
-				if(count($clean)) {
-					foreach($clean as $k => $v) {
-						if($k == 'abook_dob')
-							$v = dbescdate($v);
-
-						$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
-						. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
-					}
-				}
-
-				// This will set abconfig vars if the sender is using old-style fixed permissions
-				// using the raw abook record as passed to us. New-style permissions will fall through
-				// and be set using abconfig
-
-				translate_abook_perms_inbound($channel,$abook);
-
-				if($abconfig) {
-					/// @fixme does not handle sync of del_abconfig
-					foreach($abconfig as $abc) {
-						set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
-					}
-				}
-			}
-		}
-
-		// sync collections (privacy groups) oh joy...
-
-		if(array_key_exists('collections',$arr) && is_array($arr['collections']) && count($arr['collections'])) {
-			$x = q("select * from pgrp where uid = %d",
-				intval($channel['channel_id'])
-			);
-			foreach($arr['collections'] as $cl) {
-				$found = false;
-				if($x) {
-					foreach($x as $y) {
-						if($cl['collection'] == $y['hash']) {
-							$found = true;
-							break;
-						}
-					}
-					if($found) {
-						if(($y['gname'] != $cl['name'])
-							|| ($y['visible'] != $cl['visible'])
-							|| ($y['deleted'] != $cl['deleted'])) {
-							q("update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d",
-								dbesc($cl['name']),
-								intval($cl['visible']),
-								intval($cl['deleted']),
-								dbesc($cl['collection']),
-								intval($channel['channel_id'])
-							);
-						}
-						if(intval($cl['deleted']) && (! intval($y['deleted']))) {
-							q("delete from pgrp_member where gid = %d",
-								intval($y['id'])
-							);
-						}
-					}
-				}
-				if(! $found) {
-					$r = q("INSERT INTO pgrp ( hash, uid, visible, deleted, gname )
-						VALUES( '%s', %d, %d, %d, '%s' ) ",
-						dbesc($cl['collection']),
-						intval($channel['channel_id']),
-						intval($cl['visible']),
-						intval($cl['deleted']),
-						dbesc($cl['name'])
-					);
-				}
-
-				// now look for any collections locally which weren't in the list we just received.
-				// They need to be removed by marking deleted and removing the members.
-				// This shouldn't happen except for clones created before this function was written.
-
-				if($x) {
-					$found_local = false;
-					foreach($x as $y) {
-						foreach($arr['collections'] as $cl) {
-							if($cl['collection'] == $y['hash']) {
-								$found_local = true;
-								break;
-							}
-						}
-						if(! $found_local) {
-							q("delete from pgrp_member where gid = %d",
-								intval($y['id'])
-							);
-							q("update pgrp set deleted = 1 where id = %d and uid = %d",
-								intval($y['id']),
-								intval($channel['channel_id'])
-							);
-						}
-					}
-				}
-			}
-
-			// reload the group list with any updates
-			$x = q("select * from pgrp where uid = %d",
-				intval($channel['channel_id'])
-			);
-
-			// now sync the members
-
-			if(array_key_exists('collection_members', $arr)
-					&& is_array($arr['collection_members'])
-					&& count($arr['collection_members'])) {
-
-				// first sort into groups keyed by the group hash
-				$members = array();
-				foreach($arr['collection_members'] as $cm) {
-					if(! array_key_exists($cm['collection'],$members))
-						$members[$cm['collection']] = array();
-
-					$members[$cm['collection']][] = $cm['member'];
-				}
-
-				// our group list is already synchronised
-				if($x) {
-					foreach($x as $y) {
-
-						// for each group, loop on members list we just received
-						if(isset($y['hash']) && isset($members[$y['hash']])) {
-							foreach($members[$y['hash']] as $member) {
-								$found = false;
-								$z = q("select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1",
-									intval($y['id']),
-									intval($channel['channel_id']),
-									dbesc($member)
-								);
-								if($z)
-									$found = true;
-
-								// if somebody is in the group that wasn't before - add them
-
-								if(! $found) {
-									q("INSERT INTO pgrp_member (uid, gid, xchan)
-										VALUES( %d, %d, '%s' ) ",
-										intval($channel['channel_id']),
-										intval($y['id']),
-										dbesc($member)
-									);
-								}
-							}
-						}
-
-						// now retrieve a list of members we have on this site
-						$m = q("select xchan from pgrp_member where gid = %d and uid = %d",
-							intval($y['id']),
-							intval($channel['channel_id'])
-						);
-						if($m) {
-							foreach($m as $mm) {
-								// if the local existing member isn't in the list we just received - remove them
-								if(! in_array($mm['xchan'],$members[$y['hash']])) {
-									q("delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d",
-										dbesc($mm['xchan']),
-										intval($y['id']),
-										intval($channel['channel_id'])
-									);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if(array_key_exists('profile',$arr) && is_array($arr['profile']) && count($arr['profile'])) {
-
-			$disallowed = array('id','aid','uid','guid');
-
-			foreach($arr['profile'] as $profile) {
-
-				$x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1",
-					dbesc($profile['profile_guid']),
-					intval($channel['channel_id'])
-				);
-				if(! $x) {
-					profile_store_lowlevel(
-						[
-							'aid'          => $channel['channel_account_id'],
-							'uid'          => $channel['channel_id'],
-							'profile_guid' => $profile['profile_guid'],
-						]
-					);
-
-					$x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1",
-						dbesc($profile['profile_guid']),
-						intval($channel['channel_id'])
-					);
-					if(! $x)
-						continue;
-				}
-				$clean = array();
-				foreach($profile as $k => $v) {
-					if(in_array($k,$disallowed))
-						continue;
-
-					if($profile['is_default'] && in_array($k,['photo','thumb']))
-						continue;
-
-					if($k === 'name')
-						$clean['fullname'] = $v;
-					elseif($k === 'with')
-						$clean['partner'] = $v;
-					elseif($k === 'work')
-						$clean['employment'] = $v;
-					elseif(array_key_exists($k,$x[0]))
-						$clean[$k] = $v;
-
-					/**
-					 * @TODO
-					 * We also need to import local photos if a custom photo is selected
-					 */
-
-					if((strpos($profile['thumb'],'/photo/profile/l/') !== false) || intval($profile['is_default'])) {
-						$profile['photo'] = z_root() . '/photo/profile/l/' . $channel['channel_id'];
-						$profile['thumb'] = z_root() . '/photo/profile/m/' . $channel['channel_id'];
-					}
-					else {
-						$profile['photo'] = z_root() . '/photo/' . basename($profile['photo']);
-						$profile['thumb'] = z_root() . '/photo/' . basename($profile['thumb']);
-					}
-				}
-
-				if(count($clean)) {
-					foreach($clean as $k => $v) {
-						$r = dbq("UPDATE profile set " . TQUOT . dbesc($k) . TQUOT . " = '" . dbesc($v)
-						. "' where profile_guid = '" . dbesc($profile['profile_guid'])
-						. "' and uid = " . intval($channel['channel_id']));
-					}
-				}
-			}
-		}
-
-		$addon = ['channel' => $channel, 'data' => $arr];
-		/**
-		 * @hooks process_channel_sync_delivery
-		 *   Called when accepting delivery of a 'sync packet' containing structure and table updates from a channel clone.
-		 *   * \e array \b channel
-		 *   * \e array \b data
-		 */
-		call_hooks('process_channel_sync_delivery', $addon);
-
-		// we should probably do this for all items, but usually we only send one.
-
-		if(array_key_exists('item',$arr) && is_array($arr['item'][0])) {
-			$DR = new Zotlabs\Lib\DReport(z_root(),$d['hash'],$d['hash'],$arr['item'][0]['message_id'],'channel sync processed');
-			$DR->set_name($channel['channel_name'] . ' <' . channel_reddress($channel) . '>');
-		}
-		else
-			$DR = new Zotlabs\Lib\DReport(z_root(),$d['hash'],$d['hash'],'sync packet','channel sync delivered');
-
-		$result[] = $DR->get();
-	}
-
-	return $result;
-}
-
-/**
- * @brief Returns path to /rpost
- *
- * @todo We probably should make rpost discoverable.
- *
- * @param array $observer
- *   * \e string \b xchan_url
- * @return string
- */
-function get_rpost_path($observer) {
-	if(! $observer)
-		return '';
-
-	$parsed = parse_url($observer['xchan_url']);
-
-	return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f=';
-}
-
-/**
- * @brief
- *
- * @param array $x
- * @return boolean|string return false or a hash
- */
-function import_author_zot($x) {
-
-	// Check that we have both a hubloc and xchan record - as occasionally storage calls will fail and
-	// we may only end up with one; which results in posts with no author name or photo and are a bit
-	// of a hassle to repair. If either or both are missing, do a full discovery probe.
-
-	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
-
-	// also - this function may get passed a profile url as 'url' and zot_refresh wants a hubloc_url (site baseurl),
-	// so deconstruct the url (if we have one) and rebuild it with just the baseurl components.
-
-	if(array_key_exists('url',$x)) {
-		$m = parse_url($x['url']);
-		$desturl = $m['scheme'] . '://' . $m['host'];
-	}
-
-	$r1 = q("select hubloc_url, hubloc_updated, site_dead from hubloc left join site on
-		hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
-		dbesc($x['guid']),
-		dbesc($x['guid_sig'])
-	);
-
-	$r2 = q("select xchan_hash from xchan where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1",
-		dbesc($x['guid']),
-		dbesc($x['guid_sig'])
-	);
-
-	$site_dead = false;
-
-	if($r1 && intval($r1[0]['site_dead'])) {
-		$site_dead = true;
-	}
-
-	// We have valid and somewhat fresh information.
-
-	if($r1 && $r2 && $r1[0]['hubloc_updated'] > datetime_convert('UTC','UTC','now - 1 week')) {
-		logger('in cache', LOGGER_DEBUG);
-		return $hash;
-	}
-
-	logger('not in cache or cache stale - probing: ' . print_r($x,true), LOGGER_DEBUG,LOG_INFO);
-
-	// The primary hub may be dead. Try to find another one associated with this identity that is
-	// still alive. If we find one, use that url for the discovery/refresh probe. Otherwise, the dead site
-	// is all we have and there is no point probing it. Just return the hash indicating we have a
-	// cached entry and the identity is valid. It's just unreachable until they bring back their
-	// server from the grave or create another clone elsewhere.
-
-	if($site_dead) {
-		logger('dead site - ignoring', LOGGER_DEBUG,LOG_INFO);
-
-		$r = q("select hubloc_url from hubloc left join site on hubloc_url = site_url
-			where hubloc_hash = '%s' and site_dead = 0",
-			dbesc($hash)
-		);
-		if($r) {
-			logger('found another site that is not dead: ' . $r[0]['hubloc_url'], LOGGER_DEBUG,LOG_INFO);
-			$desturl = $r[0]['hubloc_url'];
-		}
-		else {
-			return $hash;
-		}
-	}
-
-
-	$them = array('hubloc_url' => $desturl, 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
-	if(zot_refresh($them))
-		return $hash;
-
-	return false;
-}
-
-/**
- * @brief Process a message request.
- *
- * If a site receives a comment to a post but finds they have no parent to attach it with, they
- * may send a 'request' packet containing the message_id of the missing parent. This is the handler
- * for that packet. We will create a message_list array of the entire conversation starting with
- * the missing parent and invoke delivery to the sender of the packet.
- *
- * include/deliver.php (for local delivery) and mod/post.php (for web delivery) detect the existence of
- * this 'message_list' at the destination and split it into individual messages which are
- * processed/delivered in order.
- *
- * Called from mod/post.php
- *
- * @param array $data
- * @return array
- */
-function zot_reply_message_request($data) {
-	$ret = array('success' => false);
-
-	if (! $data['message_id']) {
-		$ret['message'] = 'no message_id';
-		logger('no message_id');
-		json_return_and_die($ret);
-	}
-
-	$sender = $data['sender'];
-	$sender_hash = make_xchan_hash($sender['guid'], $sender['guid_sig']);
-
-	/*
-	 * Find the local channel in charge of this post (the first and only recipient of the request packet)
-	 */
-
-	$arr = $data['recipients'][0];
-	$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-	$c = q("select * from channel left join xchan on channel_portable_id = xchan_hash where channel_portable_id = '%s' limit 1",
-		dbesc($recip_hash)
-	);
-	if (! $c) {
-		logger('recipient channel not found.');
-		$ret['message'] .= 'recipient not found.' . EOL;
-		json_return_and_die($ret);
-	}
-
-	/*
-	 * fetch the requested conversation
-	 */
-
-	$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
-
-	if ($messages) {
-		$env_recips = null;
-
-		$r = q("select hubloc.*, site.site_crypto from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_error = 0 and hubloc_deleted = 0 and site.site_dead = 0 ",
-			dbesc($sender_hash)
-		);
-		if (! $r) {
-			logger('no hubs');
-			json_return_and_die($ret);
-		}
-		$hubs = $r;
-
-		$private = ((array_key_exists('flags', $messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
-		if($private)
-			$env_recips = array('guid' => $sender['guid'], 'guid_sig' => $sender['guid_sig'], 'hash' => $sender_hash);
-
-		$data_packet = json_encode(array('message_list' => $messages));
-
-		foreach($hubs as $hub) {
-			$hash = random_string();
-
-			/*
-			 * create a notify packet and drop the actual message packet in the queue for pickup
-			 */
-
-			$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hub['site_crypto'],$hash,array('message_id' => $data['message_id']));
-
-			queue_insert(array(
-				'hash'       => $hash,
-				'account_id' => $c[0]['channel_account_id'],
-				'channel_id' => $c[0]['channel_id'],
-				'posturl'    => $hub['hubloc_callback'],
-				'notify'     => $n,
-				'msg'        => $data_packet
-			));
-
-
-			$x = q("select count(outq_hash) as total from outq where outq_delivered = 0");
-			if(intval($x[0]['total']) > intval(get_config('system','force_queue_threshold',3000))) {
-				logger('immediate delivery deferred.', LOGGER_DEBUG, LOG_INFO);
-				update_queue_item($hash);
-				continue;
-			}
-
-			/*
-			 * invoke delivery to send out the notify packet
-			 */
-
-			Zotlabs\Daemon\Master::Summon(array('Deliver', $hash));
-		}
-	}
-	$ret['success'] = true;
-	json_return_and_die($ret);
-}
-
-function zot_rekey_request($sender,$data) {
-
-	$ret = array('success' => false);
-
-	//	newsig is newkey signed with oldkey
-
-	// The original xchan will remain. In Zot/Receiver we will have imported the new xchan and hubloc to verify
-	// the packet authenticity. What we will do now is verify that the keychange operation was signed by the
-	// oldkey, and if so change all the abook, abconfig, group, and permission elements which reference the
-	// old xchan_hash.
-
-	if((! $data['old_key']) && (! $data['new_key']) && (! $data['new_sig']))
-		json_return_and_die($ret);
-
-	$oldhash = make_xchan_hash($data['old_guid'],$data['old_guid_sig']);
-
-	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($oldhash)
-	);
-
-	if(! $r) {
-		json_return_and_die($ret);
-	}
-
-	$xchan = $r[0];
-
-	if(! Crypto::verify($data['new_key'],base64url_decode($data['new_sig']),$xchan['xchan_pubkey'])) {
-		json_return_and_die($ret);
-	}
-
-	$newhash = make_xchan_hash($sender['guid'],$sender['guid_sig']);
-
-	$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-		dbesc($newhash)
-	);
-
-	$newxchan = $r[0];
-
-	xchan_change_key($xchan,$newxchan,$data);
-
-	$ret['success'] = true;
-	json_return_and_die($ret);
-}
-
-
-function zotinfo($arr) {
-
-	$ret = array('success' => false);
-
-	$sig_method = get_config('system','signature_algorithm','sha256');
-
-	$zhash     = ((x($arr,'guid_hash'))  ? $arr['guid_hash']   : '');
-	$zguid     = ((x($arr,'guid'))       ? $arr['guid']        : '');
-	$zguid_sig = ((x($arr,'guid_sig'))   ? $arr['guid_sig']    : '');
-	$zaddr     = ((x($arr,'address'))    ? $arr['address']     : '');
-	$ztarget   = ((x($arr,'target'))     ? $arr['target']      : '');
-	$zsig      = ((x($arr,'target_sig')) ? $arr['target_sig']  : '');
-	$zkey      = ((x($arr,'key'))        ? $arr['key']         : '');
-	$mindate   = ((x($arr,'mindate'))    ? $arr['mindate']     : '');
-	$token     = ((x($arr,'token'))      ? $arr['token']   : '');
-
-	$feed      = ((x($arr,'feed'))       ? intval($arr['feed']) : 0);
-
-	if($ztarget) {
-		if((! $zkey) || (! $zsig) || (! Crypto::verify($ztarget,base64url_decode($zsig),$zkey))) {
-			logger('zfinger: invalid target signature');
-			$ret['message'] = t("invalid target signature");
-			return($ret);
-		}
-	}
-
-	$ztarget_hash = (($ztarget && $zsig) ? make_xchan_hash($ztarget,$zsig) : '' );
-
-	$r = null;
-
-	if(strlen($zhash)) {
-		$r = q("select channel.*, xchan.* from channel left join xchan on channel_portable_id = xchan_hash
-			where channel_portable_id = '%s' limit 1",
-			dbesc($zhash)
-		);
-	}
-	elseif(strlen($zguid) && strlen($zguid_sig)) {
-		$r = q("select channel.*, xchan.* from channel left join xchan on channel_portable_id = xchan_hash
-			where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
-			dbesc($zguid),
-			dbesc('sha256.' . $zguid_sig)
-		);
-	}
-	elseif(strlen($zaddr)) {
-		if(strpos($zaddr,'[system]') === false) {       /* normal address lookup */
-			$r = q("select channel.*, xchan.* from channel left join xchan on channel_portable_id = xchan_hash
-				where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1",
-				dbesc($zaddr),
-				dbesc($zaddr)
-			);
-		}
-
-		else {
-
-			/**
-			 * The special address '[system]' will return a system channel if one has been defined,
-			 * Or the first valid channel we find if there are no system channels.
-			 *
-			 * This is used by magic-auth if we have no prior communications with this site - and
-			 * returns an identity on this site which we can use to create a valid hub record so that
-			 * we can exchange signed messages. The precise identity is irrelevant. It's the hub
-			 * information that we really need at the other end - and this will return it.
-			 *
-			 */
-
-			$r = q("select channel.*, xchan.* from channel left join xchan on channel_portable_id = xchan_hash
-				where channel_system = 1 order by channel_id limit 1");
-			if(! $r) {
-				$r = q("select channel.*, xchan.* from channel left join xchan on channel_portable_id = xchan_hash
-					where channel_removed = 0 order by channel_id limit 1");
-			}
-		}
-	}
-	else {
-		$ret['message'] = 'Invalid request';
-		return($ret);
-	}
-
-	if(! $r) {
-		$ret['message'] = 'Item not found.';
-		return($ret);
-	}
-
-	$e = $r[0];
-
-	$id = $e['channel_id'];
-
-	$x = [
-			'channel_id' => $id,
-			'protocols' => ['zot']
-	];
-	/**
-	 * @hooks channel_protocols
-	 *   * \e int \b channel_id
-	 *   * \e array \b protocols
-	 */
-	call_hooks('channel_protocols', $x);
-
-	$protocols = $x['protocols'];
-
-	$sys_channel     = (intval($e['channel_system'])   ? true : false);
-	$special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM)  ? true : false);
-	$adult_channel   = (($e['channel_pageflags'] & PAGE_ADULT)    ? true : false);
-	$censored        = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
-	$searchable      = (($e['channel_pageflags'] & PAGE_HIDDEN)   ? false : true);
-	$deleted         = (intval($e['xchan_deleted']) ? true : false);
-
-	if($deleted || $censored || $sys_channel)
-		$searchable = false;
-
-	$public_forum = false;
-
-	$role = get_pconfig($e['channel_id'],'system','permissions_role');
-	if($role === 'forum' || $role === 'repository') {
-		$public_forum = true;
-	}
-	else {
-		// check if it has characteristics of a public forum based on custom permissions.
-		$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
-		if($m) {
-			foreach($m as $k => $v) {
-				if($k == 'tag_deliver' && intval($v) == 1)
-					$ch ++;
-				if($k == 'send_stream' && intval($v) == 0)
-					$ch ++;
-			}
-			if($ch == 2)
-				$public_forum = true;
-		}
-	}
-
-
-	//  This is for birthdays and keywords, but must check access permissions
-	$p = q("select * from profile where uid = %d and is_default = 1",
-		intval($e['channel_id'])
-	);
-
-	$profile = array();
-
-	if($p) {
-
-		if(! intval($p[0]['publish']))
-			$searchable = false;
-
-		$profile['description']   = $p[0]['pdesc'];
-		$profile['birthday']      = $p[0]['dob'];
-		if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],'UTC')) !== ''))
-			$profile['next_birthday'] = $bd;
-
-		if($age = age($p[0]['dob'],$e['channel_timezone'],''))
-			$profile['age'] = $age;
-
-		$profile['gender']        = $p[0]['gender'];
-		$profile['marital']       = $p[0]['marital'];
-		$profile['sexual']        = $p[0]['sexual'];
-		$profile['locale']        = $p[0]['locality'];
-		$profile['region']        = $p[0]['region'];
-		$profile['postcode']      = $p[0]['postal_code'];
-		$profile['country']       = $p[0]['country_name'];
-		$profile['about']         = $p[0]['about'];
-		$profile['homepage']      = $p[0]['homepage'];
-		$profile['hometown']      = $p[0]['hometown'];
-
-		if($p[0]['keywords']) {
-			$tags = array();
-			$k = explode(' ',$p[0]['keywords']);
-			if($k) {
-				foreach($k as $kk) {
-					if(trim($kk," \t\n\r\0\x0B,")) {
-						$tags[] = trim($kk," \t\n\r\0\x0B,");
-					}
-				}
-			}
-			if($tags)
-				$profile['keywords'] = $tags;
-		}
-	}
-
-	$ret['success'] = true;
-
-	// Communication details
-
-	if($token)
-		$ret['signed_token'] = base64url_encode(Crypto::sign('token.' . $token,$e['channel_prvkey'],$sig_method));
-
-
-	$ret['guid']           = $e['xchan_guid'];
-	$ret['guid_sig']       = $e['xchan_guid_sig'];
-	$ret['key']            = $e['xchan_pubkey'];
-	$ret['name']           = $e['xchan_name'];
-	$ret['name_updated']   = $e['xchan_name_date'];
-	$ret['address']        = $e['xchan_addr'];
-	$ret['photo_mimetype'] = $e['xchan_photo_mimetype'];
-	$ret['photo']          = $e['xchan_photo_l'];
-	$ret['photo_updated']  = $e['xchan_photo_date'];
-	$ret['url']            = $e['xchan_url'];
-	$ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']);
-	$ret['follow_url']     = $e['xchan_follow'];
-	$ret['target']         = $ztarget;
-	$ret['target_sig']     = $zsig;
-	$ret['searchable']     = $searchable;
-	$ret['protocols']      = $protocols;
-	$ret['adult_content']  = $adult_channel;
-	$ret['public_forum']   = $public_forum;
-	if($deleted)
-		$ret['deleted']        = $deleted;
-
-	if(intval($e['channel_removed']))
-		$ret['deleted_locally'] = true;
-
-
-	// premium or other channel desiring some contact with potential followers before connecting.
-	// This is a template - %s will be replaced with the follow_url we discover for the return channel.
-
-	if($special_channel) {
-		$ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']);
-	}
-	// This is a template for our follow url, %s will be replaced with a webbie
-
-	if(! $ret['follow_url'])
-		$ret['follow_url'] = z_root() . '/follow?f=&url=%s';
-
-	$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false,false);
-
-	if($ztarget_hash) {
-		$permissions['connected'] = false;
-		$b = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_pending = 0 limit 1",
-			dbesc($ztarget_hash),
-			intval($e['channel_id'])
-		);
-		if($b)
-			$permissions['connected'] = true;
-	}
-
-	// encrypt this with the default aes256cbc since we cannot be sure at this point which
-	// algorithms are preferred for communications with the remote site; notably
-	// because ztarget refers to an xchan and we don't necessarily know the origination
-	// location.
-
-	$ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey,) : $permissions);
-
-	if($permissions['view_profile'])
-		$ret['profile']  = $profile;
-
-	// array of (verified) hubs this channel uses
-
-	$x = zot_encode_locations($e);
-	if($x)
-		$ret['locations'] = $x;
-
-	$ret['site'] = zot_site_info($e['channel_prvkey']);
-
-	check_zotinfo($e,$x,$ret);
-
-	/**
-	 * @hooks zot_finger
-	 *   Called when a zot-info packet has been requested (this is our webfinger discovery mechanism).
-	 *   * \e array The final return array
-	 */
-	call_hooks('zot_finger', $ret);
-
-	return($ret);
-}
-
-
-function zot_site_info($channel_key = '') {
-
-	$signing_key = get_config('system','prvkey');
-	$sig_method  = get_config('system','signature_algorithm','sha256');
-
-	$ret = [];
-	$ret['site'] = [];
-	$ret['site']['url'] = z_root();
-	if($channel_key) {
-		$ret['site']['url_sig'] = base64url_encode(Crypto::sign(z_root(),$channel_key,$sig_method));
-	}
-	$ret['site']['url_site_sig'] = base64url_encode(Crypto::sign(z_root(),$signing_key,$sig_method));
-	$ret['site']['post'] = z_root() . '/post';
-	$ret['site']['openWebAuth']  = z_root() . '/owa';
-	$ret['site']['authRedirect'] = z_root() . '/magic';
-	$ret['site']['key'] = get_config('system','pubkey');
-
-	$dirmode = get_config('system','directory_mode');
-	if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL))
-		$ret['site']['directory_mode'] = 'normal';
-
-	if($dirmode == DIRECTORY_MODE_PRIMARY)
-		$ret['site']['directory_mode'] = 'primary';
-	elseif($dirmode == DIRECTORY_MODE_SECONDARY)
-		$ret['site']['directory_mode'] = 'secondary';
-	elseif($dirmode == DIRECTORY_MODE_STANDALONE)
-		$ret['site']['directory_mode'] = 'standalone';
-	if($dirmode != DIRECTORY_MODE_NORMAL)
-		$ret['site']['directory_url'] = z_root() . '/dirsearch';
-
-
-	$ret['site']['encryption'] = Crypto::methods();
-	$ret['site']['signing'] = Crypto::signing_methods();
-	$ret['site']['zot'] = Zotlabs\Lib\System::get_zot_revision();
-
-	// hide detailed site information if you're off the grid
-
-	if($dirmode != DIRECTORY_MODE_STANDALONE) {
-
-		$register_policy = intval(get_config('system','register_policy'));
-
-		if($register_policy == REGISTER_CLOSED)
-			$ret['site']['register_policy'] = 'closed';
-		if($register_policy == REGISTER_APPROVE)
-			$ret['site']['register_policy'] = 'approve';
-		if($register_policy == REGISTER_OPEN)
-			$ret['site']['register_policy'] = 'open';
-
-
-		$access_policy = intval(get_config('system','access_policy'));
-
-		if($access_policy == ACCESS_PRIVATE)
-			$ret['site']['access_policy'] = 'private';
-		if($access_policy == ACCESS_PAID)
-			$ret['site']['access_policy'] = 'paid';
-		if($access_policy == ACCESS_FREE)
-			$ret['site']['access_policy'] = 'free';
-		if($access_policy == ACCESS_TIERED)
-			$ret['site']['access_policy'] = 'tiered';
-
-		$ret['site']['accounts'] = account_total();
-
-		require_once('include/channel.php');
-		$ret['site']['channels'] = channel_total();
-
-		$ret['site']['admin'] = get_config('system','admin_email');
-
-		$visible_plugins = array();
-		if(is_array(App::$plugins) && count(App::$plugins)) {
-			$r = q("select * from addon where hidden = 0");
-			if($r)
-				foreach($r as $rr)
-					$visible_plugins[] = $rr['aname'];
-		}
-
-		$ret['site']['plugins']    = $visible_plugins;
-		$ret['site']['sitehash']   = get_config('system','location_hash');
-		$ret['site']['sitename']   = get_config('system','sitename');
-		$ret['site']['sellpage']   = get_config('system','sellpage');
-		$ret['site']['location']   = get_config('system','site_location');
-		$ret['site']['realm']      = get_directory_realm();
-		$ret['site']['project']    = Zotlabs\Lib\System::get_platform_name() . ' ' . Zotlabs\Lib\System::get_server_role();
-		$ret['site']['version']    = Zotlabs\Lib\System::get_project_version();
-
-	}
-
-	return $ret['site'];
-}
-
-/**
- * @brief
- *
- * @param array $channel
- * @param array $locations
- * @param[out] array $ret
- *   \e array \b locations result of zot_encode_locations()
- */
-function check_zotinfo($channel, $locations, &$ret) {
-
-//	logger('locations: ' . print_r($locations,true),LOGGER_DATA, LOG_DEBUG);
-
-	// This function will likely expand as we find more things to detect and fix.
-	// 1. Because magic-auth is reliant on it, ensure that the system channel has a valid hubloc
-	//    Force this to be the case if anything is found to be wrong with it.
-
-	/// @FIXME ensure that the system channel exists in the first place and has an xchan
-
-	if($channel['channel_system']) {
-		// the sys channel must have a location (hubloc)
-		$valid_location = false;
-		if((count($locations) === 1) && ($locations[0]['primary']) && (! $locations[0]['deleted'])) {
-			if((Crypto::verify($locations[0]['url'],base64url_decode($locations[0]['url_sig']),$channel['channel_pubkey']))
-				&& ($locations[0]['sitekey'] === get_config('system','pubkey'))
-				&& ($locations[0]['url'] === z_root()))
-				$valid_location = true;
-			else
-				logger('sys channel: invalid url signature');
-		}
-
-		if((! $locations) || (! $valid_location)) {
-
-			logger('System channel locations are not valid. Attempting repair.');
-
-			// Don't trust any existing records. Just get rid of them, but only do this
-			// for the sys channel as normal channels will be trickier.
-
-			q("delete from hubloc where hubloc_hash = '%s'",
-				dbesc($channel['channel_portable_id'])
-			);
-
-			$r = hubloc_store_lowlevel(
-				[
-					'hubloc_guid'     => $channel['channel_guid'],
-					'hubloc_guid_sig' => $channel['channel_guid_sig'],
-					'hubloc_hash'     => $channel['channel_portable_id'],
-					'hubloc_addr'     => channel_reddress($channel),
-					'hubloc_network'  => 'zot',
-					'hubloc_primary'  => 1,
-					'hubloc_url'      => z_root(),
-					'hubloc_url_sig'  => base64url_encode(Crypto::sign(z_root(),$channel['channel_prvkey'])),
-					'hubloc_host'     => App::get_hostname(),
-					'hubloc_callback' => z_root() . '/post',
-					'hubloc_sitekey'  => get_config('system','pubkey'),
-					'hubloc_updated'  => datetime_convert(),
-				]
-			);
-
-			if($r) {
-				$x = zot_encode_locations($channel);
-				if($x) {
-					$ret['locations'] = $x;
-				}
-			}
-			else {
-				logger('Unable to store sys hub location');
-			}
-		}
-	}
-}
-
-/**
- * @brief
- *
- * @param array $dr
- * @return boolean
- */
-function delivery_report_is_storable($dr) {
-
-	if(get_config('system', 'disable_dreport'))
-		return false;
-
-	/**
-	 * @hooks dreport_is_storable
-	 *   Called before storing a dreport record to determine whether to store it.
-	 *   * \e array
-	 */
-	call_hooks('dreport_is_storable', $dr);
-
-	// let plugins accept or reject - if neither, continue on
-	if(array_key_exists('accept',$dr) && intval($dr['accept']))
-		return true;
-	if(array_key_exists('reject',$dr) && intval($dr['reject']))
-		return false;
-
-	if(! ($dr['sender']))
-		return false;
-
-	// Is the sender one of our channels?
-
-	$c = q("select channel_id from channel where channel_portable_id = '%s' limit 1",
-		dbesc($dr['sender'])
-	);
-	if(! $c)
-		return false;
-
-
-	// is the recipient one of our connections, or do we want to store every report?
-
-	$r = explode(' ', $dr['recipient']);
-	$rxchan = $r[0];
-	$pcf = get_pconfig($c[0]['channel_id'],'system','dreport_store_all');
-	if($pcf)
-		return true;
-
-	// We always add ourself as a recipient to private and relayed posts
-	// So if a remote site says they can't find us, that's no big surprise
-	// and just creates a lot of extra report noise
-
-	if(($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient_not_found'))
-		return false;
-
-	// If you have a private post with a recipient list, every single site is going to report
-	// back a failed delivery for anybody on that list that isn't local to them. We're only
-	// concerned about this if we have a local hubloc record which says we expected them to
-	// have a channel on that site.
-
-	$r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_url = '%s'",
-		dbesc($rxchan),
-		dbesc($dr['location'])
-	);
-	if((! $r) && ($dr['status'] === 'recipient_not_found'))
-		return false;
-
-	$r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
-		dbesc($rxchan),
-		intval($c[0]['channel_id'])
-	);
-	if($r)
-		return true;
-
-	return false;
-}
-
-
-/**
- * @brief
- *
- * @param array $hub
- * @param string $sitekey (optional, default empty)
- *
- * @return string hubloc_url
- */
-function update_hub_connected($hub, $sitekey = '') {
-
-	if($sitekey) {
-
-		/*
-		 * This hub has now been proven to be valid.
-		 * Any hub with the same URL and a different sitekey cannot be valid.
-		 * Get rid of them (mark them deleted). There's a good chance they were re-installs.
-		 */
-
-		q("update hubloc set hubloc_deleted = 1, hubloc_error = 1 where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
-			dbesc($hub['hubloc_url']),
-			dbesc($sitekey)
-		);
-
-	}
-	else {
-		$sitekey = $hub['sitekey'];
-	}
-
-	// $sender['sitekey'] is a new addition to the protocol to distinguish
-	// hublocs coming from re-installed sites. Older sites will not provide
-	// this field and we have to still mark them valid, since we can't tell
-	// if this hubloc has the same sitekey as the packet we received.
-
-
-	// Update our DB to show when we last communicated successfully with this hub
-	// This will allow us to prune dead hubs from using up resources
-
-	$t = datetime_convert('UTC', 'UTC', 'now - 15 minutes');
-
-	$r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d and hubloc_sitekey = '%s' and hubloc_connected < '%s' ",
-		dbesc(datetime_convert()),
-		intval($hub['hubloc_id']),
-		dbesc($sitekey),
-		dbesc($t)
-	);
-
-	// a dead hub came back to life - reset any tombstones we might have
-
-	if(intval($hub['hubloc_error'])) {
-		q("update hubloc set hubloc_error = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
-			intval($hub['hubloc_id']),
-			dbesc($sitekey)
-		);
-		if(intval($hub['hubloc_orphancheck'])) {
-			q("update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d and hubloc_sitekey = '%s' ",
-				intval($hub['hubloc_id']),
-				dbesc($sitekey)
-			);
-		}
-		q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
-			dbesc($hub['hubloc_hash'])
-		);
-	}
-
-	return $hub['hubloc_url'];
-}
-
-/**
- * @brief Useful to get a health check on a remote site.
- *
- * This will let us know if any important communication details
- * that we may have stored are no longer valid, regardless of xchan details.
- *
- * @return json_return_and_die()
- */
-function zot_reply_ping() {
-
-	$ret = array('success'=> false);
-
-	logger('POST: got ping send pong now back: ' . z_root() , LOGGER_DEBUG );
-
-	$ret['success'] = true;
-	$ret['site'] = array();
-	$ret['site']['url'] = z_root();
-	$ret['site']['url_sig'] = base64url_encode(Crypto::sign(z_root(),get_config('system','prvkey')));
-	$ret['site']['sitekey'] = get_config('system','pubkey');
-
-	json_return_and_die($ret);
-}
-
-function zot_reply_pickup($data) {
-
-	$ret = array('success'=> false);
-
-	/*
-	 * The 'pickup' message arrives with a tracking ID which is associated with a particular outq_hash
-	 * First verify that that the returned signatures verify, then check that we have an outbound queue item
-	 * with the correct hash.
-	 * If everything verifies, find any/all outbound messages in the queue for this hubloc and send them back
-	 */
-
-	if((! $data['secret']) || (! $data['secret_sig'])) {
-		$ret['message'] = 'no verification signature';
-		logger('mod_zot: pickup: ' . $ret['message'], LOGGER_DEBUG);
-
-		json_return_and_die($ret);
-	}
-
-	$r = q("select distinct hubloc_sitekey from hubloc where hubloc_url = '%s' and hubloc_callback = '%s' and hubloc_sitekey != '' group by hubloc_sitekey ",
-		dbesc($data['url']),
-		dbesc($data['callback'])
-	);
-	if(! $r) {
-		$ret['message'] = 'site not found';
-		logger('mod_zot: pickup: ' . $ret['message']);
-
-		json_return_and_die($ret);
-	}
-
-	foreach ($r as $hubsite) {
-
-		// verify the url_sig
-		// If the server was re-installed at some point, there could be multiple hubs with the same url and callback.
-		// Only one will have a valid key.
-
-		$forgery = true;
-		$secret_fail = true;
-
-		$sitekey = $hubsite['hubloc_sitekey'];
-
-		logger('mod_zot: Checking sitekey: ' . $sitekey, LOGGER_DATA, LOG_DEBUG);
-
-		if(Crypto::verify($data['callback'],base64url_decode($data['callback_sig']),$sitekey)) {
-			$forgery = false;
-		}
-		if(Crypto::verify($data['secret'],base64url_decode($data['secret_sig']),$sitekey)) {
-			$secret_fail = false;
-		}
-		if((! $forgery) && (! $secret_fail))
-			break;
-	}
-
-	if($forgery) {
-		$ret['message'] = 'possible site forgery';
-		logger('mod_zot: pickup: ' . $ret['message']);
-
-		json_return_and_die($ret);
-	}
-
-	if($secret_fail) {
-		$ret['message'] = 'secret validation failed';
-		logger('mod_zot: pickup: ' . $ret['message']);
-
-		json_return_and_die($ret);
-	}
-
-	/*
-	 * If we made it to here, the signatures verify, but we still don't know if the tracking ID is valid.
-	 * It wouldn't be an error if the tracking ID isn't found, because we may have sent this particular
-	 * queue item with another pickup (after the tracking ID for the other pickup  was verified).
-	 */
-
-	$r = q("select outq_posturl from outq where outq_hash = '%s' and outq_posturl = '%s' limit 1",
-		dbesc($data['secret']),
-		dbesc($data['callback'])
-	);
-
-	if(! $r) {
-		$ret['message'] = 'nothing to pick up';
-		logger('mod_zot: pickup: ' . $ret['message']);
-
-		json_return_and_die($ret);
-	}
-
-	/*
-	 * Everything is good if we made it here, so find all messages that are going to this location
-	 * and send them all - or a reasonable number if there are a lot so we don't overflow memory.
-	 */
-
-	$r = q("select * from outq where outq_posturl = '%s' limit 100",
-		dbesc($data['callback'])
-	);
-
-	if($r) {
-		logger('mod_zot: successful pickup message received from ' . $data['callback'] . ' ' . count($r) . ' message(s) picked up', LOGGER_DEBUG);
-
-		$ret['success'] = true;
-		$ret['pickup'] = array();
-		foreach($r as $rr) {
-			if($rr['outq_msg']) {
-				$x = json_decode($rr['outq_msg'],true);
-
-				if(! $x)
-					continue;
-
-				if(is_array($x) && array_key_exists('message_list',$x)) {
-					foreach($x['message_list'] as $xx) {
-						$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $xx);
-					}
-				}
-				else
-					$ret['pickup'][] = array('notify' => json_decode($rr['outq_notify'],true),'message' => $x);
-
-				remove_queue_item($rr['outq_hash']);
-			}
-		}
-	}
-
-	// It's possible that we have more than 100 messages waiting to be sent.
-
-	// See if there are any more messages in the queue.
-	$x = q("select * from outq where outq_posturl = '%s' order by outq_created limit 1",
-			dbesc($data['callback'])
-	);
-
-	// If so, kick off a new delivery notification for the next batch
-	if ($x) {
-		logger("Send additional pickup request.", LOGGER_DEBUG);
-		queue_deliver($x[0],true);
-	}
-
-	// this is a bit of a hack because we don't have the hubloc_url here, only the callback url.
-	// worst case is we'll end up using aes256cbc if they've got a different post endpoint
-
-	$x = q("select site_crypto from site where site_url = '%s' limit 1",
-		dbesc(str_replace('/post','',$data['callback']))
-	);
-	$algorithm = zot_best_algorithm(($x) ? $x[0]['site_crypto'] : '');
-
-	$encrypted = Crypto::encapsulate(json_encode($ret),$sitekey,$algorithm);
-
-	json_return_and_die($encrypted);
-	// @FIXME:  There is a possibility that the transmission will get interrupted
-	//          and fail - in which case this packet of messages will be lost.
-	/* pickup: end */
-}
-
-
-
-function zot_reply_auth_check($data,$encrypted_packet) {
-
-	$ret = array('success' => false);
-
-	/*
-	 * Requestor visits /magic/?dest=somewhere on their own site with a browser
-	 * magic redirects them to $destsite/post [with auth args....]
-	 * $destsite sends an auth_check packet to originator site
-	 * The auth_check packet is handled here by the originator's site
-	 * - the browser session is still waiting
-	 * inside $destsite/post for everything to verify
-	 * If everything checks out we'll return a token to $destsite
-	 * and then $destsite will verify the token, authenticate the browser
-	 * session and then redirect to the original destination.
-	 * If authentication fails, the redirection to the original destination
-	 * will still take place but without authentication.
-	 */
-	logger('mod_zot: auth_check', LOGGER_DEBUG);
-
-	if (! $encrypted_packet) {
-		logger('mod_zot: auth_check packet was not encrypted.');
-		$ret['message'] .= 'no packet encryption' . EOL;
-
-		json_return_and_die($ret);
-	}
-
-	$arr = $data['sender'];
-	$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-
-	// garbage collect any old unused notifications
-
-	/**
-	 * @TODO This was and should be 10 minutes but my hosting provider has time lag between the DB and
-	 * the web server. We should probably convert this to webserver time rather than DB time so
-	 * that the different clocks won't affect it and allow us to keep the time short.
-	 */
-	Zotlabs\Lib\Verify::purge('auth', '30 MINUTE');
-
-	$y = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
-		dbesc($sender_hash)
-	);
-
-	// We created a unique hash in mod/magic.php when we invoked remote auth, and stored it in
-	// the verify table. It is now coming back to us as 'secret' and is signed by a channel at the other end.
-	// First verify their signature. We will have obtained a zot-info packet from them as part of the sender
-	// verification.
-
-	if ((! $y) || (! Crypto::verify($data['secret'], base64url_decode($data['secret_sig']),$y[0]['xchan_pubkey']))) {
-		logger('mod_zot: auth_check: sender not found or secret_sig invalid.');
-		$ret['message'] .= 'sender not found or sig invalid ' . print_r($y,true) . EOL;
-
-		json_return_and_die($ret);
-	}
-
-	// There should be exactly one recipient, the original auth requestor
-	/// @FIXME $recipients is undefined here.
-	$ret['message'] .= 'recipients ' . print_r($recipients,true) . EOL;
-
-	if ($data['recipients']) {
-
-		$arr = $data['recipients'][0];
-		$recip_hash = make_xchan_hash($arr['guid'], $arr['guid_sig']);
-		$c = q("select channel_id, channel_account_id, channel_prvkey from channel where channel_portable_id = '%s' limit 1",
-			dbesc($recip_hash)
-		);
-		if (! $c) {
-			logger('mod_zot: auth_check: recipient channel not found.');
-			$ret['message'] .= 'recipient not found.' . EOL;
-
-			json_return_and_die($ret);
-		}
-
-		$confirm = base64url_encode(Crypto::sign($data['secret'] . $recip_hash,$c[0]['channel_prvkey']));
-
-		// This additionally checks for forged sites since we already stored the expected result in meta
-		// and we've already verified that this is them via zot_gethub() and that their key signed our token
-
-		$z = Zotlabs\Lib\Verify::match('auth',$c[0]['channel_id'],$data['secret'],$data['sender']['url']);
-		if (! $z) {
-			logger('mod_zot: auth_check: verification key not found.');
-			$ret['message'] .= 'verification key not found' . EOL;
-
-			json_return_and_die($ret);
-		}
-
-		$u = q("select account_service_class from account where account_id = %d limit 1",
-			intval($c[0]['channel_account_id'])
-		);
-
-		logger('mod_zot: auth_check: success', LOGGER_DEBUG);
-		$ret['success'] = true;
-		$ret['confirm'] = $confirm;
-		if ($u && $u[0]['account_service_class'])
-			$ret['service_class'] = $u[0]['account_service_class'];
-
-		// Set "do not track" flag if this site or this channel's profile is restricted
-		// in some way
-
-		if (intval(get_config('system','block_public')))
-			$ret['DNT'] = true;
-		if (! perm_is_allowed($c[0]['channel_id'],'','view_profile'))
-			$ret['DNT'] = true;
-		if (get_pconfig($c[0]['channel_id'],'system','do_not_track'))
-			$ret['DNT'] = true;
-		if (get_pconfig($c[0]['channel_id'],'system','hide_online_status'))
-			$ret['DNT'] = true;
-
-		json_return_and_die($ret);
-	}
-
-	json_return_and_die($ret);
-}
-
-/**
- * @brief
- *
- * @param array $sender
- * @param array $recipients
- *
- * return json_return_and_die()
- */
-function zot_reply_purge($sender, $recipients) {
-
-	$ret = array('success' => false);
-
-	if ($recipients) {
-		// basically this means "unfriend"
-		foreach ($recipients as $recip) {
-			$r = q("select channel.*,xchan.* from channel
-				left join xchan on channel_portable_id = xchan_hash
-				where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
-				dbesc($recip['guid']),
-				dbesc($recip['guid_sig'])
-			);
-			if ($r) {
-				$r = q("select abook_id from abook where uid = %d and abook_xchan = '%s' limit 1",
-					intval($r[0]['channel_id']),
-					dbesc(make_xchan_hash($sender['guid'],$sender['guid_sig']))
-				);
-				if ($r) {
-					contact_remove($r[0]['channel_id'],$r[0]['abook_id']);
-				}
-			}
-		}
-		$ret['success'] = true;
-	}
-	else {
-		// Unfriend everybody - basically this means the channel has committed suicide
-		$arr = $sender;
-		$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
-
-		remove_all_xchan_resources($sender_hash);
-
-		$ret['success'] = true;
-	}
-
-	json_return_and_die($ret);
-}
-
-/**
- * @brief Remote channel info (such as permissions or photo or something)
- * has been updated. Grab a fresh copy and sync it.
- *
- * The difference between refresh and force_refresh is that force_refresh
- * unconditionally creates a directory update record, even if no changes were
- * detected upon processing.
- *
- * @param array $sender
- * @param array $recipients
- *
- * @return json_return_and_die()
- */
-function zot_reply_refresh($sender, $recipients) {
-
-	$ret = array('success' => false);
-
-	if($recipients) {
-
-		// This would be a permissions update, typically for one connection
-
-		foreach ($recipients as $recip) {
-			$r = q("select channel.*,xchan.* from channel
-				left join xchan on channel_portable_id = xchan_hash
-				where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1",
-				dbesc($recip['guid']),
-				dbesc($recip['guid_sig'])
-			);
-			$x = zot_refresh(array(
-					'xchan_guid'     => $sender['guid'],
-					'xchan_guid_sig' => $sender['guid_sig'],
-					'hubloc_url'     => $sender['url']
-			), $r[0], (($msgtype === 'force_refresh') ? true : false));
-		}
-	}
-	else {
-		// system wide refresh
-
-		$x = zot_refresh(array(
-			'xchan_guid'     => $sender['guid'],
-			'xchan_guid_sig' => $sender['guid_sig'],
-			'hubloc_url'     => $sender['url']
-		), null, (($msgtype === 'force_refresh') ? true : false));
-	}
-
-	$ret['success'] = true;
-	json_return_and_die($ret);
-}
-
-
-function zot6_check_sig() {
-
-	$ret = [ 'success' => false ];
-
-	logger('server: ' . print_r($_SERVER,true), LOGGER_DATA);
-
-	if(array_key_exists('HTTP_SIGNATURE',$_SERVER)) {
-		$sigblock = \Zotlabs\Web\HTTPSig::parse_sigheader($_SERVER['HTTP_SIGNATURE']);
-		if($sigblock) {
-			$keyId = $sigblock['keyId'];
-			logger('keyID: ' . $keyId);
-			if($keyId) {
-				$r = q("select hubloc.*, site_crypto from hubloc left join site on hubloc_url = site_url
-					where hubloc_addr = '%s' ",
-					dbesc(str_replace('acct:','',$keyId))
-				);
-				if($r) {
-					foreach($r as $hubloc) {
-						$verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']);
-						if($verified && $verified['header_signed'] && $verified['header_valid'] && $verified['content_signed'] && $verified['content_valid']) {
-							logger('zot6 verified');
-							$ret['hubloc'] = $hubloc;
-							$ret['success'] = true;
-							return $ret;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return $ret;
-}
-
-function zot_reply_notify($data) {
-
-	$ret = array('success' => false);
-
-	logger('notify received from ' . $data['sender']['url']);
-
-	$async = get_config('system','queued_fetch');
-
-	if($async) {
-		// add to receive queue
-		// qreceive_add($data);
-	}
-	else {
-		$x = zot_fetch($data);
-		$ret['delivery_report'] = $x;
-	}
-
-	$ret['success'] = true;
-	json_return_and_die($ret);
-}
-
-
-function zot_record_preferred($arr, $check = 'hubloc_network') {
-
-	if(! $arr) {
-		return $arr;
-	}
-
-	foreach($arr as $v) {
-		if($v[$check] === 'zot') {
-			return $v;
-		}
-	}
-	foreach($arr as $v) {
-		if($v[$check] === 'zot6') {
-			return $v;
-		}
-	}
-
-	return $arr[0];
-
-}
-
-function find_best_zot_identity($xchan) {
-
-	$r = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0",
-		dbesc($xchan)
-	);
-
-	if ($r) {
-
-		$r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0",
-			dbesc($r[0]['hubloc_addr'])
-		);
-		if ($r) {
-			$r = Libzot::zot_record_preferred($r);
-			logger('find_best_zot_identity: ' . $xchan . ' > ' . $r['hubloc_hash']);
-			return $r['hubloc_hash'];
-		}
-	}
-
-	return $xchan;
-}
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 17ad1767e..8267d17f7 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -366,20 +366,6 @@ CREATE TABLE IF NOT EXISTS `config` (
   UNIQUE KEY `access` (`cat`,`k`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE IF NOT EXISTS `conv` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `guid` char(191) NOT NULL DEFAULT '',
-  `recips` mediumtext NOT NULL,
-  `uid` int(11) NOT NULL DEFAULT 0 ,
-  `creator` char(191) NOT NULL DEFAULT '',
-  `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `subject` mediumtext NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `created` (`created`),
-  KEY `updated` (`updated`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE IF NOT EXISTS `dreport` (
   `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
   `dreport_channel` int(11) NOT NULL DEFAULT 0 ,
@@ -730,51 +716,6 @@ CREATE TABLE IF NOT EXISTS listeners (
   KEY ltype (ltype)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE IF NOT EXISTS `mail` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `convid` int(10) unsigned NOT NULL DEFAULT 0 ,
-  `conv_guid` char(191) NOT NULL DEFAULT '',
-  `mail_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
-  `from_xchan` char(191) NOT NULL DEFAULT '',
-  `to_xchan` char(191) NOT NULL DEFAULT '',
-  `account_id` int(10) unsigned NOT NULL DEFAULT 0 ,
-  `channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
-  `mail_mimetype` char(64) NOT NULL DEFAULT 'text/bbcode',
-  `title` text NOT NULL,
-  `body` mediumtext NOT NULL,
-  `sig` text NOT NULL,
-  `attach` mediumtext NOT NULL,
-  `mid` char(191) NOT NULL DEFAULT '',
-  `parent_mid` char(191) NOT NULL DEFAULT '',
-  `mail_deleted` tinyint(4) NOT NULL DEFAULT 0 ,
-  `mail_replied` tinyint(4) NOT NULL DEFAULT 0 ,
-  `mail_isreply` tinyint(4) NOT NULL DEFAULT 0 ,
-  `mail_seen` tinyint(4) NOT NULL DEFAULT 0 ,
-  `mail_recalled` tinyint(4) NOT NULL DEFAULT 0 ,
-  `mail_obscured` smallint(6) NOT NULL DEFAULT 0 ,
-  `mail_raw` tinyint(4) NOT NULL DEFAULT 0 ,
-  `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  PRIMARY KEY (`id`),
-  KEY `created` (`created`),
-  KEY `mail_flags` (`mail_flags`),
-  KEY `account_id` (`account_id`),
-  KEY `channel_id` (`channel_id`),
-  KEY `from_xchan` (`from_xchan`),
-  KEY `to_xchan` (`to_xchan`),
-  KEY `mid` (`mid`),
-  KEY `parent_mid` (`parent_mid`),
-  KEY `expires` (`expires`),
-  KEY `convid` (`convid`),
-  KEY `conv_guid` (`conv_guid`),
-  KEY `mail_deleted` (`mail_deleted`),
-  KEY `mail_replied` (`mail_replied`),
-  KEY `mail_isreply` (`mail_isreply`),
-  KEY `mail_seen` (`mail_seen`),
-  KEY `mail_recalled` (`mail_recalled`),
-  KEY `mail_obscured` (`mail_obscured`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `menu_channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index c18cc087b..f3fe28f93 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -356,19 +356,6 @@ CREATE TABLE "config" (
   PRIMARY KEY ("id"),
   UNIQUE ("cat","k")
 );
-CREATE TABLE "conv" (
-  "id" serial  NOT NULL,
-  "guid" text NOT NULL,
-  "recips" text NOT NULL,
-  "uid" bigint NOT NULL,
-  "creator" text NOT NULL,
-  "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "subject" text NOT NULL,
-  PRIMARY KEY ("id")
-);
-create index "conv_created_idx" on conv ("created");
-create index "conv_updated_idx" on conv ("updated");
 
 CREATE TABLE IF NOT EXISTS "dreport" (
   "dreport_id" serial NOT NULL,
@@ -729,50 +716,6 @@ create index "target_id_idx" on listeners ("target_id");
 create index "portable_id_idx" on listeners ("portable_id");
 create index "ltype_idx" on listeners ("ltype");
 
-CREATE TABLE "mail" (
-  "id" serial  NOT NULL,
-  "convid" bigint  NOT NULL DEFAULT '0',
-  "conv_guid" text NOT NULL,
-  "mail_flags" bigint  NOT NULL DEFAULT '0',
-  "from_xchan" text NOT NULL DEFAULT '',
-  "to_xchan" text NOT NULL DEFAULT '',
-  "account_id" bigint  NOT NULL DEFAULT '0',
-  "channel_id" bigint  NOT NULL DEFAULT '0',
-  "mail_mimetype" varchar(64) NOT NULL DEFAULT '0',
-  "title" text NOT NULL,
-  "body" text NOT NULL,
-  "sig" text NOT NULL,
-  "attach" text NOT NULL DEFAULT '',
-  "mid" text NOT NULL,
-  "parent_mid" text NOT NULL,
-  "mail_deleted" smallint NOT NULL DEFAULT '0',
-  "mail_replied" smallint NOT NULL DEFAULT '0',
-  "mail_isreply" smallint NOT NULL DEFAULT '0',
-  "mail_seen" smallint NOT NULL DEFAULT '0',
-  "mail_recalled" smallint NOT NULL DEFAULT '0',
-  "mail_obscured" smallint NOT NULL DEFAULT '0',
-  "mail_raw" smallint NOT NULL DEFAULT '0',
-  "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  PRIMARY KEY ("id")
-);
-create index "mail_convid" on mail ("convid");
-create index "mail_conv_guid" on mail ("conv_guid");
-create index "mail_created" on mail ("created");
-create index "mail_flags" on mail ("mail_flags");
-create index "mail_account_id" on mail ("account_id");
-create index "mail_channel_id" on mail ("channel_id");
-create index "mail_from_xchan" on mail ("from_xchan");
-create index "mail_to_xchan" on mail ("to_xchan");
-create index "mail_mid" on mail ("mid");
-create index "mail_parent_mid" on mail ("parent_mid");
-create index "mail_expires" on mail ("expires");
-create index "mail_deleted" on mail ("mail_deleted");
-create index "mail_replied" on mail ("mail_replied");
-create index "mail_isreply" on mail ("mail_isreply");
-create index "mail_seen" on mail ("mail_seen");
-create index "mail_recalled" on mail ("mail_recalled");
-create index "mail_obscured" on mail ("mail_obscured");
 CREATE TABLE "menu" (
   "menu_id" serial  NOT NULL,
   "menu_channel_id" bigint  NOT NULL DEFAULT '0',
diff --git a/tests/unit/includes/FeedutilsTest.php b/tests/unit/includes/FeedutilsTest.php
index e9826a73d..bda0bf425 100644
--- a/tests/unit/includes/FeedutilsTest.php
+++ b/tests/unit/includes/FeedutilsTest.php
@@ -4,6 +4,8 @@ namespace Zotlabs\Tests\Unit\includes;
 
 use Zotlabs\Tests\Unit\UnitTestCase;
 
+require_once('include/feedutils.php');
+
 /**
  * @brief Unit Test case for include/feedutils.php file.
  */
diff --git a/tests/unit/includes/LanguageTest.php b/tests/unit/includes/LanguageTest.php
index 0ca9eacd0..9f1af2b50 100644
--- a/tests/unit/includes/LanguageTest.php
+++ b/tests/unit/includes/LanguageTest.php
@@ -155,7 +155,7 @@ class LanguageTest extends UnitTestCase {
 						'nb',
 						'Norwegian Bokmål',
 						[
-								'de' => 'Norwegisch Bokmål',
+								'de' => 'Norwegisch (Bokmål)',
 								'nb' => 'norsk bokmål'
 						]
 				]
diff --git a/util/fresh b/util/fresh
index 0482d1215..6e2c6f897 100755
--- a/util/fresh
+++ b/util/fresh
@@ -4,7 +4,6 @@
 // Red cli interpreter
 
 require_once('include/cli_startup.php');
-require_once('include/zot.php');
 
 cli_startup();
 
@@ -23,7 +22,7 @@ function fresh_main($argc,$argv) {
 			$line = fgets(STDIN);
 		}
 
-	
+
 		if($line === FALSE) {
 			if(feof(STDIN)) {
 				break;
@@ -34,7 +33,7 @@ function fresh_main($argc,$argv) {
 		$line = trim($line);
  		if($line == 'quit' || $line == 'exit')
 			exit();
-		
+
 		process_command($line);
 	}
 
@@ -62,8 +61,8 @@ function process_command($line) {
 		case '?':
 		case 'help':
 			fresh_help();
-			break;	
-
+			break;
+/*
 		case 'finger':
 			if(argv(1)) {
 				$x = Zotlabs\Zot\Finger::run(argv(1),$channel);
@@ -71,7 +70,7 @@ function process_command($line) {
 					echo jindent($x);
 			}
 			break;
-
+*/
 		case 'login':
 			if(argv(1)) {
 				echo 'Password: ';
@@ -92,13 +91,13 @@ function process_command($line) {
 					echo 'logged in';
 					$channel = App::get_channel();
 					if($channel)
-						echo ' as ' . $channel['channel_name'];					
+						echo ' as ' . $channel['channel_name'];
 				}
 				else
 					echo 'login failed.';
 
 			}
-			break;				
+			break;
 		case 'channel':
 			if(! local_channel())
 					echo 'Permission denied.';
@@ -115,19 +114,19 @@ function process_command($line) {
 				else
 					echo 'Channel not found.';
 			}
-			break;	
+			break;
 		case 'conn':
 			if(! local_channel()) {
 				echo "Permission denied.";
 				break;
 			}
 			if(argc() > 1) {
-				for($x = 1; $x < argc(); $x ++) { 
+				for($x = 1; $x < argc(); $x ++) {
 					$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d",
 						intval(argv($x)),
 						intval(local_channel())
 					);
-					if($r) echo jindent(json_encode($r[0])) . "\n";	
+					if($r) echo jindent(json_encode($r[0])) . "\n";
 				}
 			}
 			else {
@@ -144,21 +143,21 @@ function process_command($line) {
 		default:
 			break;
 
-	}	
+	}
 
 
 }
 
-	
+
 function fresh_help() {
 
 	if(argc() == 1) {
 		echo "help - this text\n";
 		echo "login email_address - login with email_address, prompts for password\n";
-		echo "finger channel_address - lookup channel_address remotely\n";
+//		echo "finger channel_address - lookup channel_address remotely\n";
 		echo "channel new_channel - change active channel to new_channel (nickname)\n";
 		echo "conn [id1] [id2...] - without args list connections, or report detail of connection id1 (etc.)\n";
 		echo "quit|exit - terminate fresh\n";
 
 	}
-}
\ No newline at end of file
+}
diff --git a/util/hmessages.po b/util/hmessages.po
index a51bab69a..5cc7db7c6 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -1,14 +1,14 @@
-# PLATFORM_NAME
-# Copyright (C) 2012-2016 PLATFORM_NAME
-# This file is distributed under the same license as the PLATFORM_NAME package.
+# hubzilla
+# Copyright (C) 2012-2016 hubzilla
+# This file is distributed under the same license as the hubzilla package.
 # Mike Macgirvin, 2012
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: STD_VERSION\n"
+"Project-Id-Version: 6.0RC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 21:08+0200\n"
+"POT-Creation-Date: 2021-06-30 07:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,16099 +17,15711 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../Zotlabs/Access/Permissions.php:56
-msgid "Can view my channel stream and posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:57
-msgid "Can send me their channel stream and posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:58
-msgid "Can view my default channel profile"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:59
-msgid "Can view my connections"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:60
-msgid "Can view my file storage and photos"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:61
-msgid "Can upload/modify my file storage and photos"
+#: ../../view/theme/redbasic/php/config.php:15
+#: ../../addon/cart/submodules/orderoptions.php:335
+#: ../../addon/cart/submodules/orderoptions.php:359
+#: ../../addon/cart/submodules/orderoptions.php:435
+#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3369
+#: ../../Zotlabs/Module/Admin/Site.php:251
+msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:62
-msgid "Can view my channel webpages"
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
+msgid "Focus (Hubzilla default)"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:63
-msgid "Can view my wiki pages"
+#: ../../view/theme/redbasic/php/config.php:94
+#: ../../addon/channelreputation/channelreputation.php:143
+#: ../../addon/openclipatar/openclipatar.php:54
+#: ../../addon/photocache/Mod_Photocache.php:67
+#: ../../addon/redred/Mod_Redred.php:90 ../../addon/redphotos/redphotos.php:136
+#: ../../addon/statusnet/Mod_Statusnet.php:193
+#: ../../addon/statusnet/Mod_Statusnet.php:251
+#: ../../addon/statusnet/Mod_Statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:72
+#: ../../addon/wppost/Mod_Wppost.php:109
+#: ../../addon/content_import/Mod_content_import.php:142
+#: ../../addon/openstreetmap/openstreetmap.php:155
+#: ../../addon/ijpost/Mod_Ijpost.php:72
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:65
+#: ../../addon/dwpost/Mod_Dwpost.php:80
+#: ../../addon/startpage/Mod_Startpage.php:73 ../../addon/mail/Mod_Mail.php:206
+#: ../../addon/twitter/Mod_Twitter.php:184
+#: ../../addon/pumpio/Mod_Pumpio.php:115
+#: ../../addon/cart/submodules/subscriptions.php:410
+#: ../../addon/cart/submodules/hzservices.php:644
+#: ../../addon/cart/submodules/orderoptions.php:312
+#: ../../addon/cart/submodules/orderoptions.php:412
+#: ../../addon/cart/submodules/manualcat.php:248
+#: ../../addon/cart/Settings/Cart.php:132
+#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1376
+#: ../../addon/nofed/Mod_Nofed.php:53
+#: ../../addon/smileybutton/Mod_Smileybutton.php:55
+#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:84
+#: ../../addon/diaspora/Mod_Diaspora.php:102 ../../addon/piwik/piwik.php:95
+#: ../../addon/workflow/workflow.php:1461
+#: ../../addon/workflow/workflow.php:1520
+#: ../../addon/workflow/workflow.php:1639
+#: ../../addon/workflow/workflow.php:2742
+#: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94
+#: ../../addon/likebanner/likebanner.php:57
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/hubwall/hubwall.php:95
+#: ../../addon/flashcards/Mod_Flashcards.php:262
+#: ../../addon/libertree/Mod_Libertree.php:70 ../../addon/logrot/logrot.php:35
+#: ../../addon/skeleton/Mod_Skeleton.php:51
+#: ../../addon/socialauth/Mod_SocialAuth.php:330
+#: ../../addon/nsfw/Mod_Nsfw.php:61 ../../addon/mailtest/mailtest.php:100
+#: ../../addon/ljpost/Mod_Ljpost.php:82 ../../addon/hzfiles/hzfiles.php:86
+#: ../../addon/pageheader/Mod_Pageheader.php:54 ../../addon/irc/irc.php:45
+#: ../../addon/xmpp/Mod_Xmpp.php:70 ../../include/js_strings.php:22
+#: ../../Zotlabs/Widget/Wiki_pages.php:42
+#: ../../Zotlabs/Widget/Wiki_pages.php:99
+#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:188
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Import.php:582 ../../Zotlabs/Module/Setup.php:306
+#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:151
+#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111
+#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259
+#: ../../Zotlabs/Module/Filestorage.php:208
+#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Security.php:120
+#: ../../Zotlabs/Module/Admin/Accounts.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:412
+#: ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:178
+#: ../../Zotlabs/Module/Admin/Addons.php:442
+#: ../../Zotlabs/Module/Regate.php:387 ../../Zotlabs/Module/Permcats.php:129
+#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Appman.php:155
+#: ../../Zotlabs/Module/Email_validation.php:40
+#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
+#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Module/Affinity.php:87
+#: ../../Zotlabs/Module/Settings/Network.php:62
+#: ../../Zotlabs/Module/Settings/Features.php:48
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Account.php:107
+#: ../../Zotlabs/Module/Settings/Events.php:42
+#: ../../Zotlabs/Module/Settings/Manage.php:43
+#: ../../Zotlabs/Module/Settings/Channel_home.php:91
+#: ../../Zotlabs/Module/Settings/Calendar.php:42
+#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Zotlabs/Module/Settings/Directory.php:42
+#: ../../Zotlabs/Module/Settings/Editor.php:42
+#: ../../Zotlabs/Module/Settings/Connections.php:42
+#: ../../Zotlabs/Module/Settings/Photos.php:42
+#: ../../Zotlabs/Module/Settings/Profiles.php:52
+#: ../../Zotlabs/Module/Settings/Conversation.php:49
+#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116
+#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328
+#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Locs.php:130 ../../Zotlabs/Module/Sources.php:125
+#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:827
+#: ../../Zotlabs/Storage/Browser.php:382
+msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:64
-msgid "Can create/edit my channel webpages"
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Theme settings"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:65
-msgid "Can write to my wiki pages"
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Narrow navbar"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:66
-msgid "Can post on my channel (wall) page"
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/redred/Mod_Redred.php:63
+#: ../../addon/statusnet/Mod_Statusnet.php:260
+#: ../../addon/statusnet/Mod_Statusnet.php:282
+#: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49
+#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90
+#: ../../addon/wppost/Mod_Wppost.php:94
+#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/ijpost/Mod_Ijpost.php:61
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
+#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65
+#: ../../addon/twitter/Mod_Twitter.php:162
+#: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94
+#: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102
+#: ../../addon/cart/submodules/subscriptions.php:153
+#: ../../addon/cart/submodules/subscriptions.php:425
+#: ../../addon/cart/submodules/hzservices.php:66
+#: ../../addon/cart/submodules/hzservices.php:650
+#: ../../addon/cart/submodules/hzservices.php:654
+#: ../../addon/cart/submodules/orderoptions.php:72
+#: ../../addon/cart/submodules/orderoptions.php:338
+#: ../../addon/cart/submodules/orderoptions.php:362
+#: ../../addon/cart/submodules/orderoptions.php:438
+#: ../../addon/cart/submodules/orderoptions.php:462
+#: ../../addon/cart/submodules/paypalbutton.php:87
+#: ../../addon/cart/submodules/paypalbutton.php:95
+#: ../../addon/cart/submodules/paypalbuttonV2.php:88
+#: ../../addon/cart/submodules/paypalbuttonV2.php:96
+#: ../../addon/cart/submodules/manualcat.php:63
+#: ../../addon/cart/submodules/manualcat.php:254
+#: ../../addon/cart/submodules/manualcat.php:258
+#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73
+#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42
+#: ../../addon/smileybutton/Mod_Smileybutton.php:44
+#: ../../addon/diaspora/Mod_Diaspora.php:72
+#: ../../addon/libertree/Mod_Libertree.php:59
+#: ../../addon/socialauth/Mod_SocialAuth.php:214
+#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67
+#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1472
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
+#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Api.php:99
+#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Settings/Channel.php:311
+#: ../../Zotlabs/Module/Settings/Display.php:88
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Sources.php:124
+#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
+#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
+#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
+#: ../../boot.php:1726
+msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:67
-msgid "Can comment on or like my posts"
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/redred/Mod_Redred.php:63
+#: ../../addon/statusnet/Mod_Statusnet.php:260
+#: ../../addon/statusnet/Mod_Statusnet.php:282
+#: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49
+#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90
+#: ../../addon/wppost/Mod_Wppost.php:94
+#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/ijpost/Mod_Ijpost.php:61
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
+#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65
+#: ../../addon/twitter/Mod_Twitter.php:162
+#: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94
+#: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102
+#: ../../addon/cart/submodules/subscriptions.php:153
+#: ../../addon/cart/submodules/subscriptions.php:425
+#: ../../addon/cart/submodules/hzservices.php:66
+#: ../../addon/cart/submodules/hzservices.php:650
+#: ../../addon/cart/submodules/hzservices.php:654
+#: ../../addon/cart/submodules/orderoptions.php:72
+#: ../../addon/cart/submodules/orderoptions.php:337
+#: ../../addon/cart/submodules/orderoptions.php:361
+#: ../../addon/cart/submodules/orderoptions.php:437
+#: ../../addon/cart/submodules/orderoptions.php:461
+#: ../../addon/cart/submodules/paypalbutton.php:87
+#: ../../addon/cart/submodules/paypalbutton.php:95
+#: ../../addon/cart/submodules/paypalbuttonV2.php:88
+#: ../../addon/cart/submodules/paypalbuttonV2.php:96
+#: ../../addon/cart/submodules/manualcat.php:63
+#: ../../addon/cart/submodules/manualcat.php:254
+#: ../../addon/cart/submodules/manualcat.php:258
+#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73
+#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42
+#: ../../addon/smileybutton/Mod_Smileybutton.php:44
+#: ../../addon/diaspora/Mod_Diaspora.php:72
+#: ../../addon/libertree/Mod_Libertree.php:59
+#: ../../addon/socialauth/Mod_SocialAuth.php:214
+#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67
+#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1472
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
+#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Module/Admin/Site.php:321 ../../Zotlabs/Module/Api.php:98
+#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Settings/Channel.php:311
+#: ../../Zotlabs/Module/Settings/Display.php:88
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310
+#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312
+#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
+#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1726
+msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:68
-msgid "Can send me private mail messages"
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Navigation bar background color"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:69
-msgid "Can like/dislike profiles and profile things"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Navigation bar icon color "
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can forward to all my channel connections via ! mentions in posts"
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Navigation bar active icon color "
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:71
-msgid "Can chat with me"
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Link color"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:72
-msgid "Can source my public posts in derived channels"
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Set font-color for banner"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:73
-msgid "Can administer my channel"
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set the background color"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
-msgid "Social Networking"
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set the background image"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:288
-msgid "Social - Federation"
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Set the background color of items"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:289
-msgid "Social - Mostly Public"
+#: ../../view/theme/redbasic/php/config.php:108
+msgid "Set the background color of comments"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
-msgid "Social - Restricted"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Set font-size for the entire application"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
-msgid "Social - Private"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Examples: 1rem, 100%, 16px"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:294
-msgid "Community Forum"
+#: ../../view/theme/redbasic/php/config.php:110
+msgid "Set font-color for posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:295
-msgid "Forum - Mostly Public"
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Set radius of corners"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
-msgid "Forum - Restricted"
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Example: 4px"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
-msgid "Forum - Private"
+#: ../../view/theme/redbasic/php/config.php:112
+msgid "Set shadow depth of photos"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:300
-msgid "Feed Republish"
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Set maximum width of content region in pixel"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
-msgid "Feed - Mostly Public"
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Leave empty for default width"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
-msgid "Feed - Restricted"
+#: ../../view/theme/redbasic/php/config.php:114
+msgid "Set size of conversation author photo"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:305
-msgid "Special Purpose"
+#: ../../view/theme/redbasic/php/config.php:115
+msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-msgid "Special - Celebrity/Soapbox"
+#: ../../view/theme/redbasic/php/config.php:116
+msgid "Show advanced settings"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
-msgid "Special - Group Repository"
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:310
-#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:797
-#: ../../Zotlabs/Module/Connedit.php:928 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/selectors.php:115
-#: ../../include/selectors.php:151 ../../include/connections.php:741
-#: ../../include/connections.php:748 ../../include/event.php:1429
-#: ../../include/event.php:1436
-msgid "Other"
+#: ../../addon/channelreputation/channelreputation.php:101
+#: ../../addon/channelreputation/channelreputation.php:102
+#: ../../addon/cart/myshop.php:144 ../../addon/cart/myshop.php:180
+#: ../../addon/cart/myshop.php:214 ../../addon/cart/myshop.php:261
+#: ../../addon/cart/myshop.php:296 ../../addon/cart/myshop.php:319
+msgid "Access Denied"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:311
-msgid "Custom/Expert Mode"
+#: ../../addon/channelreputation/channelreputation.php:109
+msgid "Enable Community Moderation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Pdledit.php:35
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Events.php:277
-#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Webpages.php:133
-#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637
-#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Defperms.php:182
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:15
-#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Appman.php:87
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Moderate.php:15
-#: ../../Zotlabs/Module/New_channel.php:105
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Filestorage.php:20
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:96
-#: ../../Zotlabs/Module/Filestorage.php:119
-#: ../../Zotlabs/Module/Filestorage.php:165
-#: ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33 ../../Zotlabs/Module/Wiki.php:59
-#: ../../Zotlabs/Module/Wiki.php:284 ../../Zotlabs/Module/Wiki.php:427
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Locs.php:100 ../../Zotlabs/Module/Connedit.php:397
-#: ../../Zotlabs/Module/Profile_photo.php:338
-#: ../../Zotlabs/Module/Profile_photo.php:351
-#: ../../Zotlabs/Module/Sharedwithme.php:19
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525
-#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1444
-#: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Regmod.php:20 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Chat.php:113 ../../Zotlabs/Module/Chat.php:118
-#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Display.php:420
-#: ../../Zotlabs/Module/Photos.php:71 ../../Zotlabs/Module/Channel.php:209
-#: ../../Zotlabs/Module/Channel.php:365 ../../Zotlabs/Module/Channel.php:404
-#: ../../Zotlabs/Module/Cards.php:86 ../../Zotlabs/Module/Connections.php:32
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Block.php:24
-#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Profile.php:99
-#: ../../Zotlabs/Module/Profile.php:114
-#: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Thing.php:282
-#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
-#: ../../Zotlabs/Module/Suggest.php:32
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Setup.php:208
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Mood.php:126
-#: ../../Zotlabs/Module/Register.php:200
-#: ../../Zotlabs/Module/Channel_calendar.php:232
-#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
-#: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Cover_photo.php:341
-#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Menu.php:130
-#: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Sources.php:80
-#: ../../Zotlabs/Module/Poke.php:157 ../../Zotlabs/Module/Network.php:19
-#: ../../Zotlabs/Module/Attach_edit.php:90
-#: ../../Zotlabs/Module/Attach_edit.php:99
-#: ../../Zotlabs/Module/Attach_edit.php:106
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Viewsrc.php:19
-#: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135
-#: ../../include/photos.php:27 ../../include/attach.php:156
-#: ../../include/attach.php:205 ../../include/attach.php:278
-#: ../../include/attach.php:329 ../../include/attach.php:424
-#: ../../include/attach.php:438 ../../include/attach.php:445
-#: ../../include/attach.php:527 ../../include/attach.php:1091
-#: ../../include/attach.php:1164 ../../include/attach.php:1327
-#: ../../include/items.php:4088
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:53
-#: ../../extend/addon/hubzilla-addons/keepout/keepout.php:36
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:26
-#: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:44
-msgid "Permission denied."
+#: ../../addon/channelreputation/channelreputation.php:117
+msgid "Reputation automatically given to new members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:27
-msgid "Layout updated."
+#: ../../addon/channelreputation/channelreputation.php:118
+msgid "Reputation will never fall below this value"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:43
-msgid "PDL Editor App"
+#: ../../addon/channelreputation/channelreputation.php:119
+msgid "Minimum reputation before posting is allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:43 ../../Zotlabs/Module/Cdav.php:877
-#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Webpages.php:48
-#: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Pubstream.php:20
-#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100
-#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Wiki.php:52
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Uexport.php:62
-#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Affinity.php:52
-#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Suggest.php:40
-#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Tokens.php:99
-#: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Mood.php:134
-#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Probe.php:19
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
-#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Sources.php:88
-#: ../../Zotlabs/Module/Poke.php:165
-#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:50
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:58
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:23
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:38
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:35
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:21
-#: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:20
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:33
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:42
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:35
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:146
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:40
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:35
-#: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:20
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:78
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:39
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:33
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:21
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:34
-#: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:58
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:35
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:36
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:43
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:28
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:53
-#: ../../extend/addon/hubzilla-addons/nsabait/Mod_Nsabait.php:20
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:21
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:34
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:50
-msgid "Not Installed"
+#: ../../addon/channelreputation/channelreputation.php:120
+msgid "Minimum reputation before commenting is allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:44
-msgid "Provides the ability to edit system page layouts"
+#: ../../addon/channelreputation/channelreputation.php:121
+msgid "Minimum reputation before a member is able to moderate other posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100
-msgid "Edit System Page Description"
+#: ../../addon/channelreputation/channelreputation.php:122
+msgid ""
+"Max ratio of moderator's reputation that can be added to/deducted from "
+"reputation of person being moderated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:78
-msgid "(modified)"
+#: ../../addon/channelreputation/channelreputation.php:123
+msgid "Reputation \"cost\" to post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:78 ../../Zotlabs/Module/Lostpass.php:133
-msgid "Reset"
+#: ../../addon/channelreputation/channelreputation.php:124
+msgid "Reputation \"cost\" to comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:95
-msgid "Layout not found."
+#: ../../addon/channelreputation/channelreputation.php:125
+msgid ""
+"Reputation automatically recovers at this rate per hour until it reaches "
+"minimum_to_post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:101
-msgid "Module Name:"
+#: ../../addon/channelreputation/channelreputation.php:126
+msgid ""
+"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
+"at this rate per hour"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:102
-msgid "Layout Help"
+#: ../../addon/channelreputation/channelreputation.php:140
+msgid "Community Moderation Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:103
-msgid "Edit another layout"
+#: ../../addon/channelreputation/channelreputation.php:232
+msgid "Channel Reputation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:104
-msgid "System layout"
+#: ../../addon/channelreputation/channelreputation.php:233
+#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:158
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:497
+#: ../../Zotlabs/Storage/Browser.php:411
+msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Events.php:501
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Import.php:647
-#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Group.php:151
-#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Appman.php:155
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Connect.php:107
-#: ../../Zotlabs/Module/Filestorage.php:208 ../../Zotlabs/Module/Oauth2.php:116
-#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Locs.php:132
-#: ../../Zotlabs/Module/Connedit.php:897 ../../Zotlabs/Module/Regate.php:387
-#: ../../Zotlabs/Module/Rate.php:168 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248
-#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
-#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Editpost.php:86
-#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Pconfig.php:116
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Security.php:120
-#: ../../Zotlabs/Module/Admin/Accounts.php:309
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
-#: ../../Zotlabs/Module/Admin/Addons.php:442
-#: ../../Zotlabs/Module/Admin/Site.php:412
-#: ../../Zotlabs/Module/Admin/Profs.php:178 ../../Zotlabs/Module/Thing.php:328
-#: ../../Zotlabs/Module/Thing.php:381
-#: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Setup.php:306
-#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Mitem.php:259
-#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Permcats.php:129
-#: ../../Zotlabs/Module/Settings/Account.php:107
-#: ../../Zotlabs/Module/Settings/Events.php:42
-#: ../../Zotlabs/Module/Settings/Profiles.php:52
-#: ../../Zotlabs/Module/Settings/Editor.php:42
-#: ../../Zotlabs/Module/Settings/Features.php:48
-#: ../../Zotlabs/Module/Settings/Manage.php:43
-#: ../../Zotlabs/Module/Settings/Display.php:188
-#: ../../Zotlabs/Module/Settings/Photos.php:42
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../Zotlabs/Module/Settings/Connections.php:42
-#: ../../Zotlabs/Module/Settings/Calendar.php:42
-#: ../../Zotlabs/Module/Settings/Directory.php:42
-#: ../../Zotlabs/Module/Settings/Channel_home.php:91
-#: ../../Zotlabs/Module/Settings/Network.php:62
-#: ../../Zotlabs/Module/Settings/Conversation.php:49
-#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Sources.php:125
-#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Poke.php:217
-#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Lib/ThreadItem.php:827
-#: ../../Zotlabs/Widget/Wiki_pages.php:42
-#: ../../Zotlabs/Widget/Wiki_pages.php:99
-#: ../../Zotlabs/Widget/Eventstools.php:16 ../../include/js_strings.php:22
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:45
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:95
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:57
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:95
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:143
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:51
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:90
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1376
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:312
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:412
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:643
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:410
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:248
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:132
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:142
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:86
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:102
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:79
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:155
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:82
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1461
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1520
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1639
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2742
-#: ../../extend/addon/hubzilla-addons/workflow/Settings/Mod_WorkflowSettings.php:94
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:70
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:61
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:67
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:70
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:602
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:193
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:251
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:306
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:65
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:72
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:262
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:330
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:136
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:184
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:80
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:53
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:142
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:54
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:311
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:53
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:55
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:72
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:35
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:109
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:115
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:100
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:124
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:56
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:73
-#: ../../view/theme/redbasic/php/config.php:94
-msgid "Submit"
+#: ../../addon/channelreputation/channelreputation.php:236
+msgid "An Error has occurred."
 msgstr ""
 
-#: ../../Zotlabs/Module/Z6trans.php:19
-msgid "Update to Hubzilla 5.0 step 2"
+#: ../../addon/channelreputation/channelreputation.php:254
+msgid "Upvote"
 msgstr ""
 
-#: ../../Zotlabs/Module/Z6trans.php:21
-msgid "To complete the update please run"
+#: ../../addon/channelreputation/channelreputation.php:255
+msgid "Downvote"
 msgstr ""
 
-#: ../../Zotlabs/Module/Z6trans.php:23
-msgid "php util/z6convert.php"
+#: ../../addon/channelreputation/channelreputation.php:414
+msgid "Can moderate reputation on my channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Z6trans.php:25
-msgid "from the terminal."
+#: ../../addon/superblock/superblock.php:337
+msgid "Block Completely"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Cloud.php:123
-#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Group.php:99
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Share.php:72
-#: ../../Zotlabs/Web/WebServer.php:115 ../../include/items.php:441
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:75
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:119
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:109
-msgid "Permission denied"
+#: ../../addon/superblock/Mod_Superblock.php:21
+msgid "Superblock App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:59
-msgid "Invalid message"
+#: ../../addon/superblock/Mod_Superblock.php:21
+#: ../../addon/nsabait/Mod_Nsabait.php:20
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
+#: ../../addon/photocache/Mod_Photocache.php:42
+#: ../../addon/gallery/Mod_Gallery.php:58
+#: ../../addon/planets/Mod_Planets.php:20 ../../addon/redred/Mod_Redred.php:50
+#: ../../addon/statusnet/Mod_Statusnet.php:146 ../../addon/rtof/Mod_Rtof.php:36
+#: ../../addon/wppost/Mod_Wppost.php:43 ../../addon/hsse/Mod_Hsse.php:21
+#: ../../addon/ijpost/Mod_Ijpost.php:35
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:40
+#: ../../addon/dwpost/Mod_Dwpost.php:39
+#: ../../addon/startpage/Mod_Startpage.php:50
+#: ../../addon/twitter/Mod_Twitter.php:78 ../../addon/pumpio/Mod_Pumpio.php:53
+#: ../../addon/sendzid/Mod_Sendzid.php:20 ../../addon/nofed/Mod_Nofed.php:33
+#: ../../addon/smileybutton/Mod_Smileybutton.php:35
+#: ../../addon/diaspora/Mod_Diaspora.php:58
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:34
+#: ../../addon/libertree/Mod_Libertree.php:35
+#: ../../addon/hideaside/Mod_Hideaside.php:23
+#: ../../addon/skeleton/Mod_Skeleton.php:32 ../../addon/nsfw/Mod_Nsfw.php:33
+#: ../../addon/ljpost/Mod_Ljpost.php:38
+#: ../../addon/authchoose/Mod_Authchoose.php:28
+#: ../../addon/pageheader/Mod_Pageheader.php:34
+#: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99
+#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100
+#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165
+#: ../../Zotlabs/Module/Cdav.php:877 ../../Zotlabs/Module/Webpages.php:48
+#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
+#: ../../Zotlabs/Module/Uexport.php:62 ../../Zotlabs/Module/Mood.php:134
+#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Articles.php:52
+#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Invite.php:56
+#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Notes.php:56
+#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:190
+#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29
+#: ../../Zotlabs/Module/Pdledit.php:43 ../../Zotlabs/Module/Wiki.php:52
+#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Sources.php:88
+msgid "Not Installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "no results"
+#: ../../addon/superblock/Mod_Superblock.php:22
+msgid "Block channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "channel sync processed"
+#: ../../addon/superblock/Mod_Superblock.php:64
+msgid "superblock settings updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:111
-msgid "queued"
+#: ../../addon/superblock/Mod_Superblock.php:88
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "posted"
+#: ../../addon/superblock/Mod_Superblock.php:90
+msgid "No channels currently blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "accepted for delivery"
+#: ../../addon/superblock/Mod_Superblock.php:92
+#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459
+#: ../../Zotlabs/Module/Profile_photo.php:501
+#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:996
+msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:123
-msgid "updated"
+#: ../../addon/nsabait/Mod_Nsabait.php:20
+#: ../../addon/nsabait/Mod_Nsabait.php:24
+msgid "NSA Bait App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:126
-msgid "update ignored"
+#: ../../addon/nsabait/Mod_Nsabait.php:24
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:26
+#: ../../addon/planets/Mod_Planets.php:23 ../../addon/hsse/Mod_Hsse.php:26
+#: ../../addon/hideaside/Mod_Hideaside.php:27
+#: ../../addon/authchoose/Mod_Authchoose.php:33
+msgid "Installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:129
-msgid "permission denied"
+#: ../../addon/nsabait/Mod_Nsabait.php:26
+msgid "Make yourself a political target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:133
-msgid "recipient not found"
+#: ../../addon/visage/Mod_Visage.php:21
+msgid "Who viewed my channel/profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:136
-msgid "mail recalled"
+#: ../../addon/visage/Mod_Visage.php:25
+msgid "Recent Channel/Profile Viewers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:139
-msgid "duplicate mail received"
+#: ../../addon/visage/Mod_Visage.php:36
+msgid "No entries."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:142
-msgid "mail delivered"
+#: ../../addon/openclipatar/openclipatar.php:51
+#: ../../addon/openclipatar/openclipatar.php:129
+msgid "System defaults:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:162
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../addon/openclipatar/openclipatar.php:55
+msgid "Preferred Clipart IDs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:166 ../../Zotlabs/Widget/Wiki_pages.php:41
-#: ../../Zotlabs/Widget/Wiki_pages.php:98
-msgid "Options"
+#: ../../addon/openclipatar/openclipatar.php:55
+msgid "List of preferred clipart ids. These will be shown first."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:167
-msgid "Redeliver"
+#: ../../addon/openclipatar/openclipatar.php:56
+msgid "Default Search Term"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../addon/openclipatar/openclipatar.php:56
+msgid "The default search term. These will be shown second."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
+#: ../../addon/openclipatar/openclipatar.php:57
+msgid "Return After"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:362
-#: ../../include/channel.php:1914
-msgid "Profile"
+#: ../../addon/openclipatar/openclipatar.php:57
+msgid "Page to load after image selection."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:115
+#: ../../include/conversation.php:1086 ../../Zotlabs/Module/Connedit.php:593
+#: ../../Zotlabs/Lib/Apps.php:345
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
+#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:120
+#: ../../include/channel.php:1490
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:218
-msgid "All Connections"
+#: ../../addon/openclipatar/openclipatar.php:60
+msgid "Profile List"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cloud.php:120
-msgid "Not found"
+#: ../../addon/openclipatar/openclipatar.php:62
+msgid "Order of Preferred"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cloud.php:130
-msgid "Unknown error"
+#: ../../addon/openclipatar/openclipatar.php:62
+msgid "Sort order of preferred clipart ids."
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:17
-msgid "Unknown App"
+#: ../../addon/openclipatar/openclipatar.php:63
+#: ../../addon/openclipatar/openclipatar.php:69
+msgid "Newest first"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:29
-msgid "Authorize"
+#: ../../addon/openclipatar/openclipatar.php:66
+msgid "As entered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:30
-#, php-format
-msgid "Do you authorize the app %s to access your channel data?"
+#: ../../addon/openclipatar/openclipatar.php:68
+msgid "Order of other"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:32 ../../include/acl_selectors.php:147
-msgid "Allow"
+#: ../../addon/openclipatar/openclipatar.php:68
+msgid "Sort order of other clipart ids."
 msgstr ""
 
-#: ../../Zotlabs/Module/Authorize.php:33
-#: ../../Zotlabs/Module/Admin/Accounts.php:319
-msgid "Deny"
+#: ../../addon/openclipatar/openclipatar.php:70
+msgid "Most downloaded first"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28
-msgid "Calendar entries imported."
+#: ../../addon/openclipatar/openclipatar.php:71
+msgid "Most liked first"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30
-msgid "No calendar entries found."
+#: ../../addon/openclipatar/openclipatar.php:73
+msgid "Preferred IDs Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:877
-msgid "CardDAV App"
+#: ../../addon/openclipatar/openclipatar.php:73
+msgid "Message to display above preferred results."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:878
-msgid "CalDAV capable addressbook"
+#: ../../addon/openclipatar/openclipatar.php:79
+msgid "Uploaded by: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165
-#: ../../Zotlabs/Module/Channel_calendar.php:392
-msgid "Link to source"
+#: ../../addon/openclipatar/openclipatar.php:79
+msgid "Drawn by: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468
-msgid "Event title"
+#: ../../addon/openclipatar/openclipatar.php:183
+#: ../../addon/openclipatar/openclipatar.php:195
+msgid "Use this image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474
-msgid "Start date and time"
+#: ../../addon/openclipatar/openclipatar.php:193
+msgid "Or select from a free OpenClipart.org image:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1012
-msgid "End date and time"
+#: ../../addon/openclipatar/openclipatar.php:196
+msgid "Search Term"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497
-msgid "Timezone:"
+#: ../../addon/openclipatar/openclipatar.php:233
+msgid "Unknown error. Please try again later."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:481
-#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:173
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:655
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:260
-msgid "Description"
+#: ../../addon/openclipatar/openclipatar.php:299
+#: ../../Zotlabs/Module/Profile_photo.php:254
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:483
-#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736
-#: ../../Zotlabs/Module/Locs.php:128 ../../Zotlabs/Module/Pubsites.php:53
-#: ../../include/js_strings.php:25
-msgid "Location"
+#: ../../addon/openclipatar/openclipatar.php:309
+msgid "Profile photo updated successfully."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:697
-#: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Photos.php:947
-#: ../../Zotlabs/Module/Cal.php:203
-msgid "Previous"
+#: ../../addon/bookmarker/bookmarker.php:38
+#: ../../Zotlabs/Lib/ThreadItem.php:474
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Events.php:707 ../../Zotlabs/Module/Photos.php:956
-#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:262
-msgid "Next"
+#: ../../addon/queueworker/Mod_Queueworker.php:77
+msgid "Max queueworker threads"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708
-#: ../../Zotlabs/Module/Cal.php:205
-msgid "Today"
+#: ../../addon/queueworker/Mod_Queueworker.php:79
+msgid "Minimum 4, default 4"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703
-msgid "Month"
+#: ../../addon/queueworker/Mod_Queueworker.php:90
+msgid "Assume workers dead after"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704
-msgid "Week"
+#: ../../addon/queueworker/Mod_Queueworker.php:92
+msgid "Minimum 120, default 300 seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705
-msgid "Day"
+#: ../../addon/queueworker/Mod_Queueworker.php:103
+msgid "Pause before starting next task"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1042
-msgid "List month"
+#: ../../addon/queueworker/Mod_Queueworker.php:105
+msgid "Minimum 100, default 100 microseconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1043
-msgid "List week"
+#: ../../addon/queueworker/Mod_Queueworker.php:113
+msgid "Queueworker Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1044
-msgid "List day"
+#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1145
+#: ../../include/text.php:1157 ../../Zotlabs/Widget/Notes.php:23
+#: ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:113
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:117
+#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103
+msgid "Save"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1052
-msgid "More"
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:15
+msgid "Add some colour to tag clouds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1053
-msgid "Less"
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:26
+msgid "Rainbow Tag App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth.php:53
-#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58
-#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:932
-#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:536
-msgid "Update"
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:34
+msgid "Rainbow Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1055
-msgid "Select calendar"
+#: ../../addon/photocache/Mod_Photocache.php:27
+msgid "Photo Cache settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1056 ../../Zotlabs/Widget/Cdav.php:143
-msgid "Channel Calendars"
+#: ../../addon/photocache/Mod_Photocache.php:36
+msgid ""
+"Photo Cache addon saves a copy of images from external sites locally to "
+"increase your anonymity in the web."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1056 ../../Zotlabs/Widget/Cdav.php:129
-#: ../../Zotlabs/Widget/Cdav.php:143
-msgid "CalDAV Calendars"
+#: ../../addon/photocache/Mod_Photocache.php:42
+msgid "Photo Cache App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
-#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Card_edit.php:130
-#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Module/Connections.php:329
-#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Admin/Accounts.php:320
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:269
-#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:558
-#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../include/conversation.php:730
-#: ../../include/conversation.php:777
-msgid "Delete"
+#: ../../addon/photocache/Mod_Photocache.php:53
+msgid "Minimal photo size for caching"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1058
-msgid "Delete all"
+#: ../../addon/photocache/Mod_Photocache.php:55
+msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391
-#: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:803
-#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
-#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth2.php:117
-#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367
-#: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Module/Profile_photo.php:507
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Editpost.php:111
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Article_edit.php:131
-#: ../../Zotlabs/Module/Admin/Addons.php:427
-#: ../../Zotlabs/Module/Cover_photo.php:428
-#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1460
-#: ../../include/conversation.php:1515
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:209
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:258
-msgid "Cancel"
+#: ../../addon/photocache/Mod_Photocache.php:64
+msgid "Photo Cache"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388
-#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Layouts.php:185
-#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Menu.php:182
-#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
-#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
-msgid "Create"
+#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:136
+msgid "Gallery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1061
-msgid "Sorry! Editing of recurrent events is not yet implemented."
+#: ../../addon/gallery/gallery.php:46
+msgid "Photo Gallery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1071 ../../Zotlabs/Storage/Browser.php:293
-#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
-#: ../../Zotlabs/Widget/Appcategories.php:43
-#: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156
-#: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236
-#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
-#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
-msgid "Categories"
+#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1384
+#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32
+#: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Webpages.php:39
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17
+#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Cards.php:42
+#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editblock.php:31
+#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Articles.php:43
+#: ../../Zotlabs/Module/Menu.php:92 ../../Zotlabs/Module/Layouts.php:31
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Group.php:155
-#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
-#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
-#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Module/Sharedwithme.php:106 ../../Zotlabs/Module/Chat.php:257
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Storage/Browser.php:377
-#: ../../Zotlabs/Lib/NativeWikiPage.php:576
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:172
-msgid "Name"
+#: ../../addon/gallery/Mod_Gallery.php:58
+msgid "Gallery App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917
-msgid "Organisation"
+#: ../../addon/gallery/Mod_Gallery.php:59
+msgid "A simple gallery for your photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:918
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2617
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2678
-msgid "Title"
+#: ../../addon/planets/Mod_Planets.php:20
+#: ../../addon/planets/Mod_Planets.php:23
+msgid "Random Planet App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:919
-msgid "Phone"
+#: ../../addon/planets/Mod_Planets.php:25
+msgid ""
+"Set a random planet from the Star Wars Empire as your location when posting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:789
-#: ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-#: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1768
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:71
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:56
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:57
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:57
-msgid "Email"
+#: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:22
+#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36
+#: ../../include/photos.php:30 ../../include/items.php:3744
+#: ../../include/attach.php:156 ../../include/attach.php:205
+#: ../../include/attach.php:278 ../../include/attach.php:329
+#: ../../include/attach.php:424 ../../include/attach.php:438
+#: ../../include/attach.php:445 ../../include/attach.php:527
+#: ../../include/attach.php:1091 ../../include/attach.php:1164
+#: ../../include/attach.php:1327 ../../Zotlabs/Module/Article_edit.php:51
+#: ../../Zotlabs/Module/Attach_edit.php:90
+#: ../../Zotlabs/Module/Attach_edit.php:99
+#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:19
+#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:208
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:378
+#: ../../Zotlabs/Module/Channel.php:417 ../../Zotlabs/Module/Group.php:15
+#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:113
+#: ../../Zotlabs/Module/Chat.php:118
+#: ../../Zotlabs/Module/Channel_calendar.php:232
+#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Poke.php:157
+#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525
+#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1446
+#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99
+#: ../../Zotlabs/Module/Profile.php:114
+#: ../../Zotlabs/Module/Sharedwithme.php:19
+#: ../../Zotlabs/Module/Webpages.php:133
+#: ../../Zotlabs/Module/Filestorage.php:20
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:96
+#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Authtest.php:13 ../../Zotlabs/Module/Viewsrc.php:19
+#: ../../Zotlabs/Module/Moderate.php:15 ../../Zotlabs/Module/Display.php:420
+#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/New_channel.php:105
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126
+#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Cards.php:86
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Regmod.php:20
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Profile_photo.php:338
+#: ../../Zotlabs/Module/Profile_photo.php:351
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:58
+#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Editlayout.php:90
+#: ../../Zotlabs/Module/Connections.php:32
+#: ../../Zotlabs/Module/Cover_photo.php:341
+#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Photos.php:71
+#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133
+#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:636
+#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70
+#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
+#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
+#: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141
+#: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Thing.php:282
+#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
+#: ../../Zotlabs/Module/Pdledit.php:35 ../../Zotlabs/Module/Wiki.php:59
+#: ../../Zotlabs/Module/Wiki.php:284 ../../Zotlabs/Module/Wiki.php:427
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:394
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:98
+#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135
+#: ../../Zotlabs/Web/WebServer.php:118
+msgid "Permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:921
-msgid "Instant messenger"
+#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/channel.php:1670
+msgid "Male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:922
-msgid "Website"
+#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/channel.php:1668
+msgid "Female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:504
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:129
-#: ../../Zotlabs/Module/Connedit.php:923
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-msgid "Address"
+#: ../../addon/openid/Mod_Openid.php:30
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:924
-msgid "Note"
+#: ../../addon/openid/Mod_Openid.php:76 ../../addon/openid/Mod_Openid.php:178
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:925 ../../include/connections.php:734
-#: ../../include/event.php:1422
-msgid "Mobile"
+#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:320
+msgid "Login failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:926 ../../include/connections.php:735
-#: ../../include/event.php:1423
-msgid "Home"
+#: ../../addon/openid/openid.php:49
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:927 ../../include/connections.php:738
-#: ../../include/event.php:1426
-msgid "Work"
+#: ../../addon/openid/openid.php:49
+msgid "The error message was:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:929
-msgid "Add Contact"
+#: ../../addon/openid/MysqlProvider.php:52
+msgid "First Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:930
-msgid "Add Field"
+#: ../../addon/openid/MysqlProvider.php:53
+msgid "Last Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935
-msgid "P.O. Box"
+#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:75
+#: ../../boot.php:1715
+msgid "Nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936
-msgid "Additional"
+#: ../../addon/openid/MysqlProvider.php:55
+msgid "Full Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937
-msgid "Street"
+#: ../../addon/openid/MysqlProvider.php:56
+#: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:71
+#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1743
+#: ../../Zotlabs/Module/Cdav.php:1378
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+#: ../../Zotlabs/Module/Admin/Accounts.php:330
+#: ../../Zotlabs/Module/Profiles.php:788 ../../Zotlabs/Module/Connedit.php:912
+msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938
-msgid "Locality"
+#: ../../addon/openid/MysqlProvider.php:58
+#: ../../addon/openid/MysqlProvider.php:59
+#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:362
+msgid "Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939
-msgid "Region"
+#: ../../addon/openid/MysqlProvider.php:61
+msgid "Profile Photo 16px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940
-msgid "ZIP Code"
+#: ../../addon/openid/MysqlProvider.php:62
+msgid "Profile Photo 32px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759
-#: ../../Zotlabs/Module/Connedit.php:941
-msgid "Country"
+#: ../../addon/openid/MysqlProvider.php:63
+msgid "Profile Photo 48px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1457
-msgid "Default Calendar"
+#: ../../addon/openid/MysqlProvider.php:64
+msgid "Profile Photo 64px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1468
-msgid "Default Addressbook"
+#: ../../addon/openid/MysqlProvider.php:65
+msgid "Profile Photo 80px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
-msgid "Authorize application connection"
+#: ../../addon/openid/MysqlProvider.php:66
+msgid "Profile Photo 128px"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:75
-msgid "Return to your app and insert this Security Code:"
+#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123
+msgid "Timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:85
-msgid "Please login to continue."
+#: ../../addon/openid/MysqlProvider.php:68
+#: ../../Zotlabs/Module/Profiles.php:768
+msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:97
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:360
+msgid "Language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
-#: ../../Zotlabs/Module/Filestorage.php:203
-#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
-#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:321
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Register.php:512
-#: ../../Zotlabs/Module/Settings/Display.php:88
-#: ../../Zotlabs/Module/Settings/Channel.php:311
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
-#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
-#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1468
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/dir_fns.php:146
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1370
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:72
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:337
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:361
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:437
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:461
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:96
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:87
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:95
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:63
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:254
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:258
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:61
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:73
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:72
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:63
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:67
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:71
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:59
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:260
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:291
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:45
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:61
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:214
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:162
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:171
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:61
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:65
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:42
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:137
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:138
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:44
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:49
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:86
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:90
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:94
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:94
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
-#: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
-msgid "Yes"
+#: ../../addon/openid/MysqlProvider.php:70
+msgid "Birth Year"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
-#: ../../Zotlabs/Module/Filestorage.php:203
-#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
-#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Photos.php:673
-#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Mitem.php:176
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
-#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Register.php:512
-#: ../../Zotlabs/Module/Settings/Display.php:88
-#: ../../Zotlabs/Module/Settings/Channel.php:311
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
-#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
-#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1468
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/dir_fns.php:146
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1370
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:72
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:338
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:362
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:438
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:462
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:96
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:87
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:95
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:63
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:254
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:258
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:61
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:73
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:72
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:63
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:67
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:71
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:59
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:260
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:291
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:45
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:61
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:214
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:162
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:171
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:61
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:65
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:42
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:137
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:138
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:44
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:49
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:86
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:90
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:94
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:94
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
-#: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
-msgid "No"
+#: ../../addon/openid/MysqlProvider.php:71
+msgid "Birth Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:52
-msgid "This site is not a directory server"
+#: ../../addon/openid/MysqlProvider.php:72
+msgid "Birth Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:37
-msgid "This directory server requires an access token"
+#: ../../addon/openid/MysqlProvider.php:73
+msgid "Birthdate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "Enter a folder name"
+#: ../../addon/openid/MysqlProvider.php:74
+#: ../../Zotlabs/Module/Profiles.php:488
+msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "or select an existing folder (doubleclick)"
+#: ../../addon/moremoods/moremoods.php:19
+msgid "lonely"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Cards.php:113
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114
-#: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:23
-#: ../../include/text.php:1145 ../../include/text.php:1157
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:116
-msgid "Save"
+#: ../../addon/moremoods/moremoods.php:20
+msgid "drunk"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
-msgid "Save to Folder"
+#: ../../addon/moremoods/moremoods.php:21
+msgid "horny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:113
-#: ../../Zotlabs/Module/Channel_calendar.php:62
-msgid "Event can not end before it has started."
+#: ../../addon/moremoods/moremoods.php:22
+msgid "stoned"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124
-#: ../../Zotlabs/Module/Events.php:146
-#: ../../Zotlabs/Module/Channel_calendar.php:64
-#: ../../Zotlabs/Module/Channel_calendar.php:72
-#: ../../Zotlabs/Module/Channel_calendar.php:87
-msgid "Unable to generate preview."
+#: ../../addon/moremoods/moremoods.php:23
+msgid "fucked up"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:122
-#: ../../Zotlabs/Module/Channel_calendar.php:70
-msgid "Event title and start time are required."
+#: ../../addon/moremoods/moremoods.php:24
+msgid "clusterfucked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Channel_calendar.php:85
-#: ../../Zotlabs/Module/Channel_calendar.php:226
-msgid "Event not found."
+#: ../../addon/moremoods/moremoods.php:25
+msgid "crazy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:266 ../../Zotlabs/Module/Like.php:441
-#: ../../Zotlabs/Module/Tagger.php:75
-#: ../../Zotlabs/Module/Channel_calendar.php:221
-#: ../../include/conversation.php:132 ../../include/text.php:2257
-#: ../../include/event.php:1259
-msgid "event"
+#: ../../addon/moremoods/moremoods.php:26
+msgid "hurt"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit event title"
+#: ../../addon/moremoods/moremoods.php:27
+msgid "sleepy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Profiles.php:747 ../../Zotlabs/Module/Profiles.php:751
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
-#: ../../Zotlabs/Module/Register.php:498 ../../include/js_strings.php:123
-#: ../../include/datetime.php:211
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:334
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:358
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:434
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:458
-msgid "Required"
+#: ../../addon/moremoods/moremoods.php:28
+msgid "grumpy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:470
-msgid "Categories (comma-separated list)"
+#: ../../addon/moremoods/moremoods.php:29
+msgid "high"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Edit Category"
+#: ../../addon/moremoods/moremoods.php:30
+msgid "semi-conscious"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Category"
+#: ../../addon/moremoods/moremoods.php:31
+msgid "in love"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:474
-msgid "Edit start date and time"
+#: ../../addon/moremoods/moremoods.php:32
+msgid "in lust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
-msgid "Finish date and time are not known or not relevant"
+#: ../../addon/moremoods/moremoods.php:33
+msgid "naked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Edit finish date and time"
+#: ../../addon/moremoods/moremoods.php:34
+msgid "stinky"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Finish date and time"
+#: ../../addon/moremoods/moremoods.php:35
+msgid "sweaty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
-msgid "Adjust for viewer timezone"
+#: ../../addon/moremoods/moremoods.php:36
+msgid "bleeding out"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:479
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+#: ../../addon/moremoods/moremoods.php:37
+msgid "victorious"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:481
-msgid "Edit Description"
+#: ../../addon/moremoods/moremoods.php:38
+msgid "defeated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:483
-msgid "Edit Location"
+#: ../../addon/moremoods/moremoods.php:39
+msgid "envious"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Webpages.php:262
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:837
-#: ../../include/conversation.php:1404
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153
-msgid "Preview"
+#: ../../addon/moremoods/moremoods.php:40
+msgid "jealous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:487 ../../include/conversation.php:1482
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225
-msgid "Permission settings"
+#: ../../addon/dirstats/dirstats.php:94
+msgid "Hubzilla Directory Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:502
-msgid "Advanced Options"
+#: ../../addon/dirstats/dirstats.php:95
+msgid "Total Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:613
-msgid "l, F j"
+#: ../../addon/dirstats/dirstats.php:97
+msgid "Hubzilla Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:641
-#: ../../Zotlabs/Module/Channel_calendar.php:370
-msgid "Edit event"
+#: ../../addon/dirstats/dirstats.php:99
+msgid "Friendica Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:643
-#: ../../Zotlabs/Module/Channel_calendar.php:372
-msgid "Delete event"
+#: ../../addon/dirstats/dirstats.php:101
+msgid "Diaspora Pods"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:669 ../../include/text.php:2076
-msgid "Link to Source"
+#: ../../addon/dirstats/dirstats.php:103
+msgid "Hubzilla Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:677
-#: ../../Zotlabs/Module/Channel_calendar.php:406
-msgid "calendar"
+#: ../../addon/dirstats/dirstats.php:105
+msgid "Friendica Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Edit Event"
+#: ../../addon/dirstats/dirstats.php:107
+msgid "Diaspora Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Create Event"
+#: ../../addon/dirstats/dirstats.php:109
+msgid "Aged 35 and above"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:699 ../../include/channel.php:1917
-msgid "Export"
+#: ../../addon/dirstats/dirstats.php:111
+msgid "Aged 34 and under"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:702 ../../Zotlabs/Module/Webpages.php:261
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:212
-#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Pubsites.php:61
-msgid "View"
+#: ../../addon/dirstats/dirstats.php:113
+msgid "Average Age"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:739
-msgid "Event removed"
+#: ../../addon/dirstats/dirstats.php:115
+msgid "Known Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:742
-#: ../../Zotlabs/Module/Channel_calendar.php:493
-msgid "Failed to remove event"
+#: ../../addon/dirstats/dirstats.php:117
+msgid "Known Tags"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../addon/dirstats/dirstats.php:119
+msgid ""
+"Please note Diaspora and Friendica statistics are merely those **this "
+"directory** is aware of, and not all those known in the network.  This also "
+"applies to chatrooms,"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:434
-msgid "About"
+#: ../../addon/redred/Mod_Redred.php:24
+msgid "Channel is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:84 ../../Zotlabs/Module/Group.php:156
-msgid "Members"
+#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326
+msgid "Invalid channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:85
-msgid "Administrators"
+#: ../../addon/redred/Mod_Redred.php:38
+msgid "Hubzilla Crosspost Connector Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:86
-msgid "Developers"
+#: ../../addon/redred/Mod_Redred.php:50
+#: ../../addon/statusnet/Mod_Statusnet.php:146
+msgid "Hubzilla Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:87
-msgid "Tutorials"
+#: ../../addon/redred/Mod_Redred.php:51
+msgid "Relay public postings to another Hubzilla channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:98
-msgid "$Projectname Documentation"
+#: ../../addon/redred/Mod_Redred.php:63
+msgid "Send public postings to Hubzilla channel by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:99
-msgid "Contents"
+#: ../../addon/redred/Mod_Redred.php:67
+msgid "Hubzilla API Path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:62
-msgid "Bookmark added"
+#: ../../addon/redred/Mod_Redred.php:67 ../../addon/rtof/Mod_Rtof.php:53
+msgid "https://{sitename}/api"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:78
-msgid "Bookmarks App"
+#: ../../addon/redred/Mod_Redred.php:71
+msgid "Hubzilla login name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
-msgid "Bookmark links from posts and manage them"
+#: ../../addon/redred/Mod_Redred.php:75
+msgid "Hubzilla channel name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:92
-msgid "My Bookmarks"
+#: ../../addon/redred/Mod_Redred.php:79
+msgid "Hubzilla password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:103
-msgid "My Connections Bookmarks"
+#: ../../addon/redred/Mod_Redred.php:87
+msgid "Hubzilla Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Filestorage.php:59
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Cards.php:42
-#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Profile.php:27
-#: ../../Zotlabs/Module/Articles.php:43 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Menu.php:92 ../../include/channel.php:1464
-#: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:49
-msgid "Requested profile is not available."
+#: ../../addon/redred/redred.php:50
+msgid "Post to Hubzilla"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:48
-msgid "Webpages App"
+#: ../../addon/redphotos/redphotos.php:106
+msgid "Photos imported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:49
-msgid "Provide managed web pages on your channel"
+#: ../../addon/redphotos/redphotos.php:119
+#: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75
+#: ../../include/items.php:440 ../../Zotlabs/Module/Import_items.php:120
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99
+#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Cloud.php:123
+#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
+#: ../../Zotlabs/Web/WebServer.php:117
+msgid "Permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:69
-msgid "Import Webpage Elements"
+#: ../../addon/redphotos/redphotos.php:129
+msgid "Redmatrix Photo Album Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:70
-msgid "Import selected"
+#: ../../addon/redphotos/redphotos.php:130
+msgid "This will import all your Redmatrix photo albums to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:93
-msgid "Export Webpage Elements"
+#: ../../addon/redphotos/redphotos.php:131
+#: ../../addon/redfiles/redfiles.php:121
+msgid "Redmatrix Server base URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:94
-msgid "Export selected"
+#: ../../addon/redphotos/redphotos.php:132
+#: ../../addon/redfiles/redfiles.php:122
+msgid "Redmatrix Login Username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:341
-#: ../../include/nav.php:524
-msgid "Webpages"
+#: ../../addon/redphotos/redphotos.php:133
+#: ../../addon/redfiles/redfiles.php:123
+msgid "Redmatrix Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Oauth.php:173
-#: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Module/Oauth2.php:194
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Connections.php:321
-#: ../../Zotlabs/Module/Connections.php:363
-#: ../../Zotlabs/Module/Connections.php:383
-#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Article_edit.php:98
-#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:268
-#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:557
-#: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Widget/Cdav.php:138
-#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1566
-#: ../../include/channel.php:1570 ../../include/menu.php:120
-msgid "Edit"
+#: ../../addon/redphotos/redphotos.php:134
+msgid "Import just this album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Widget/Cdav.php:136
-#: ../../include/conversation.php:1437
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:186
-msgid "Share"
+#: ../../addon/redphotos/redphotos.php:134
+msgid "Leave blank to import all albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:263
-msgid "Actions"
+#: ../../addon/redphotos/redphotos.php:135
+msgid "Maximum count to import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:264
-msgid "Page Link"
+#: ../../addon/redphotos/redphotos.php:135
+msgid "0 or blank to import all available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:265
-msgid "Page Title"
+#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:2128
+#: ../../addon/diaspora/Receiver.php:1621 ../../include/text.php:2250
+#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:439
+#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115
+#: ../../Zotlabs/Lib/Activity.php:3245
+msgid "photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:178
-msgid "Created"
+#: ../../addon/statusnet/Mod_Statusnet.php:61
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Layouts.php:192
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:179
-msgid "Edited"
+#: ../../addon/statusnet/Mod_Statusnet.php:98
+msgid "We could not contact the GNU social API with the Path you entered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:295
-msgid "Invalid file type."
+#: ../../addon/statusnet/Mod_Statusnet.php:130
+msgid "GNU social settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Error opening zip file"
+#: ../../addon/statusnet/Mod_Statusnet.php:147
+msgid ""
+"Relay public postings to a connected GNU social account (formerly StatusNet)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:318
-msgid "Invalid folder path."
+#: ../../addon/statusnet/Mod_Statusnet.php:181
+msgid "Globally Available GNU social OAuthKeys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:345
-msgid "No webpage elements detected."
+#: ../../addon/statusnet/Mod_Statusnet.php:183
+msgid ""
+"There are preconfigured OAuth key pairs for some GNU social servers "
+"available. If you are using one of them, please use these credentials.<br /"
+">If not feel free to connect to any other GNU social instance (see below)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:420
-msgid "Import complete."
+#: ../../addon/statusnet/Mod_Statusnet.php:198
+msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
-msgid "Profile not found."
+#: ../../addon/statusnet/Mod_Statusnet.php:200
+msgid ""
+"No consumer key pair for GNU social found. Register your Hubzilla Account as "
+"an desktop client on your GNU social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Hubzilla installation at your favourite GNU social installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:46
-msgid "Profile deleted."
+#: ../../addon/statusnet/Mod_Statusnet.php:204
+msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
-msgid "Profile-"
+#: ../../addon/statusnet/Mod_Statusnet.php:208
+msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
-msgid "New profile created."
+#: ../../addon/statusnet/Mod_Statusnet.php:212
+msgid "Base API Path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:113
-msgid "Profile unavailable to clone."
+#: ../../addon/statusnet/Mod_Statusnet.php:212
+msgid "Remember the trailing /"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:148
-msgid "Profile unavailable to export."
+#: ../../addon/statusnet/Mod_Statusnet.php:216
+msgid "GNU social application name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:254
-msgid "Profile Name is required."
+#: ../../addon/statusnet/Mod_Statusnet.php:239
+msgid ""
+"To connect to your GNU social account click the button below to get a "
+"security code from GNU social which you have to copy into the input box "
+"below and submit the form. Only your <strong>public</strong> posts will be "
+"posted to GNU social."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:461
-msgid "Marital Status"
+#: ../../addon/statusnet/Mod_Statusnet.php:241
+msgid "Log in with GNU social"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:465
-msgid "Romantic Partner"
+#: ../../addon/statusnet/Mod_Statusnet.php:244
+msgid "Copy the security code from GNU social here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
-msgid "Likes"
+#: ../../addon/statusnet/Mod_Statusnet.php:254
+msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
-msgid "Dislikes"
+#: ../../addon/statusnet/Mod_Statusnet.php:256
+msgid "Current GNU social API is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
-msgid "Work/Employment"
+#: ../../addon/statusnet/Mod_Statusnet.php:260
+msgid "Cancel GNU social Connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:480
-msgid "Religion"
+#: ../../addon/statusnet/Mod_Statusnet.php:272
+#: ../../addon/twitter/Mod_Twitter.php:147
+msgid "Currently connected to: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:484
-msgid "Political Views"
+#: ../../addon/statusnet/Mod_Statusnet.php:277
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:488
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:74
-msgid "Gender"
+#: ../../addon/statusnet/Mod_Statusnet.php:282
+msgid "Post to GNU social by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:492
-msgid "Sexual Preference"
+#: ../../addon/statusnet/Mod_Statusnet.php:282
+msgid ""
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:496
-msgid "Homepage"
+#: ../../addon/statusnet/Mod_Statusnet.php:291
+#: ../../addon/twitter/Mod_Twitter.php:171
+msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:500
-msgid "Interests"
+#: ../../addon/statusnet/Mod_Statusnet.php:303
+msgid "GNU-Social Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:596
-msgid "Profile updated."
+#: ../../addon/statusnet/statusnet.php:145
+msgid "Post to GNU social"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Hide your connections list from viewers of this profile"
+#: ../../addon/statusnet/statusnet.php:593
+#: ../../Zotlabs/Module/Admin/Site.php:420
+msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:724
-msgid "Edit Profile Details"
+#: ../../addon/statusnet/statusnet.php:594
+msgid "API URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "View this profile"
+#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:499
+#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:727 ../../Zotlabs/Module/Profiles.php:826
-#: ../../include/channel.php:1589
-msgid "Edit visibility"
+#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:498
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Profile Tools"
+#: ../../addon/statusnet/statusnet.php:597
+msgid "Application name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Change cover photo"
+#: ../../addon/rtof/Mod_Rtof.php:24
+msgid "Friendica Crosspost Connector Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730 ../../include/channel.php:1559
-msgid "Change profile photo"
+#: ../../addon/rtof/Mod_Rtof.php:36
+msgid "Friendica Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731
-msgid "Create a new profile using these settings"
+#: ../../addon/rtof/Mod_Rtof.php:37
+msgid "Relay public postings to a connected Friendica account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Clone this profile"
+#: ../../addon/rtof/Mod_Rtof.php:49
+msgid "Send public postings to Friendica by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Delete this profile"
+#: ../../addon/rtof/Mod_Rtof.php:53
+msgid "Friendica API Path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Add profile things"
+#: ../../addon/rtof/Mod_Rtof.php:57
+msgid "Friendica login name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Personal"
+#: ../../addon/rtof/Mod_Rtof.php:61
+msgid "Friendica password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Relationship"
+#: ../../addon/rtof/Mod_Rtof.php:69
+msgid "Friendica Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738 ../../Zotlabs/Widget/Newmember.php:51
-#: ../../include/datetime.php:58
-msgid "Miscellaneous"
+#: ../../addon/rtof/rtof.php:51
+msgid "Post to Friendica"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Import profile from file"
+#: ../../addon/wppost/wppost.php:47
+msgid "Post to WordPress"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Export profile to file"
+#: ../../addon/wppost/wppost.php:174 ../../addon/wppost/Mod_Wppost.php:98
+#: ../../addon/dwpost/Mod_Dwpost.php:69 ../../addon/dwpost/dwpost.php:134
+#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:383
+msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Your gender"
+#: ../../addon/wppost/Mod_Wppost.php:30
+msgid "Wordpress Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Marital status"
+#: ../../addon/wppost/Mod_Wppost.php:43
+msgid "Wordpress Post App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Sexual preference"
+#: ../../addon/wppost/Mod_Wppost.php:44
+msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "Profile name"
+#: ../../addon/wppost/Mod_Wppost.php:69
+msgid "WordPress username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:749
-msgid "This is your default profile."
+#: ../../addon/wppost/Mod_Wppost.php:73
+msgid "WordPress password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:751
-msgid "Your full name"
+#: ../../addon/wppost/Mod_Wppost.php:77
+msgid "WordPress API URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Short title/description"
+#: ../../addon/wppost/Mod_Wppost.php:78
+msgid "Typically https://your-blog.tld/xmlrpc.php"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Maximal 190 characters"
+#: ../../addon/wppost/Mod_Wppost.php:81
+msgid "WordPress blogid"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:755
-msgid "Street address"
+#: ../../addon/wppost/Mod_Wppost.php:82
+msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Locality/City"
+#: ../../addon/wppost/Mod_Wppost.php:86
+msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Region/State"
+#: ../../addon/wppost/Mod_Wppost.php:90
+msgid "Forward comments (requires hubzilla_wp plugin)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Postal/Zip code"
+#: ../../addon/wppost/Mod_Wppost.php:94 ../../addon/dwpost/Mod_Dwpost.php:65
+#: ../../addon/ljpost/Mod_Ljpost.php:71
+msgid "Add link to original post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:764
-msgid "Who (if applicable)"
+#: ../../addon/wppost/Mod_Wppost.php:98 ../../addon/dwpost/Mod_Dwpost.php:69
+msgid "Link description (default:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:764
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../addon/wppost/Mod_Wppost.php:106
+msgid "Wordpress Post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Since (date)"
+#: ../../addon/content_import/Mod_content_import.php:27
+msgid "No server specified"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:768
-msgid "Tell us about yourself"
+#: ../../addon/content_import/Mod_content_import.php:73
+msgid "Posts imported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:769
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:68
-msgid "Homepage URL"
+#: ../../addon/content_import/Mod_content_import.php:113
+msgid "Files imported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:770
-msgid "Hometown"
+#: ../../addon/content_import/Mod_content_import.php:122
+msgid ""
+"This addon app copies existing content and file storage to a cloned/copied "
+"channel. Once the app is installed, visit the newly installed app. This will "
+"allow you to set the location of your original channel and an optional date "
+"range of files/conversations to copy."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Political views"
+#: ../../addon/content_import/Mod_content_import.php:135
+#: ../../Zotlabs/Lib/Apps.php:333
+msgid "Content Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Religious views"
+#: ../../addon/content_import/Mod_content_import.php:136
+msgid ""
+"This will import all your conversations and cloud files from a cloned "
+"channel on another server. This may take a while if you have lots of posts "
+"and or files."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Keywords used in directory listings"
+#: ../../addon/content_import/Mod_content_import.php:137
+msgid "Include posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Example: fishing photography software"
+#: ../../addon/content_import/Mod_content_import.php:137
+msgid "Conversations, Articles, Cards, and other posted content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:776
-msgid "Musical interests"
+#: ../../addon/content_import/Mod_content_import.php:138
+msgid "Include files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Books, literature"
+#: ../../addon/content_import/Mod_content_import.php:138
+msgid "Files, Photos and other cloud storage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Television"
+#: ../../addon/content_import/Mod_content_import.php:139
+msgid "Original Server base URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../addon/content_import/Mod_content_import.php:140
+#: ../../addon/hzfiles/hzfiles.php:84
+msgid "Since modified date yyyy-mm-dd"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Hobbies/Interests"
+#: ../../addon/content_import/Mod_content_import.php:141
+#: ../../addon/hzfiles/hzfiles.php:85
+msgid "Until modified date yyyy-mm-dd"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Love/Romance"
+#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1335
+msgid "Set your location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:783
-msgid "School/Education"
+#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1336
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "Contact information and social networks"
+#: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:205
+#: ../../include/conversation.php:1348 ../../Zotlabs/Module/Article_edit.php:99
+#: ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220
+#: ../../Zotlabs/Module/Editblock.php:116
+msgid "Insert web link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "My other channels"
+#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1352
+msgid "Embed (existing) photo from your photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:787
-msgid "Communications"
+#: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:135
+#: ../../include/conversation.php:1385 ../../Zotlabs/Module/Chat.php:218
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:822 ../../include/channel.php:1585
-msgid "Profile Image"
+#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1386
+msgid "Tag term:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:832 ../../include/channel.php:1566
-#: ../../include/nav.php:118
-msgid "Edit Profiles"
+#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1387
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213
-#: ../../Zotlabs/Module/Manage.php:145 ../../Zotlabs/Module/Chat.php:262
-msgid "Create New"
+#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1390
+#: ../../Zotlabs/Module/Profile_photo.php:509
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:402
+msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:69 ../../Zotlabs/Module/Import_items.php:48
-msgid "Nothing to import."
+#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1391
+#: ../../Zotlabs/Module/Profile_photo.php:510
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:403
+msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:84 ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Unable to download data from old server"
+#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1392
+msgid "Choose a different album..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:107 ../../Zotlabs/Module/Import_items.php:77
-msgid "Imported file is empty."
+#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1393
+#: ../../Zotlabs/Module/Profile_photo.php:512
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:405
+msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:163
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1394
+#: ../../Zotlabs/Module/Profile_photo.php:513
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:406
+msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:190
-msgid "No channel. Import failed."
+#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1395
+#: ../../Zotlabs/Module/Profile_photo.php:514
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:407
+msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:595
-#: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:142
-msgid "Import completed."
+#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1396
+msgid "Comments enabled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:623
-msgid "You must be logged in to use this feature."
+#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1397
+msgid "Comments disabled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:628
-msgid "Import Channel"
+#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1408
+#: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Photos.php:1099
+#: ../../Zotlabs/Lib/ThreadItem.php:837
+msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:629
-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."
+#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1441
+#: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:255
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1078
+#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Layouts.php:194
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:630
-#: ../../Zotlabs/Module/Import_items.php:127
-msgid "File to Upload"
+#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1450
+msgid "Page link name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:631
-msgid "Or provide the old server/hub details"
+#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1453
+msgid "Post as"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:633
-msgid "Your old identity address (xyz@example.com)"
+#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1455
+#: ../../Zotlabs/Lib/ThreadItem.php:828
+msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:634
-msgid "Your old login email address"
+#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1456
+#: ../../Zotlabs/Lib/ThreadItem.php:829
+msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:635
-msgid "Your old login password"
+#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1457
+#: ../../Zotlabs/Lib/ThreadItem.php:830
+msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:636
-msgid "Import a few months of posts if possible (limited by available memory"
+#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1458
+#: ../../Zotlabs/Lib/ThreadItem.php:831
+msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:638
-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."
+#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1459
+#: ../../Zotlabs/Lib/ThreadItem.php:832
+msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:640
-msgid "Make this hub my primary location"
+#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1460
+#: ../../Zotlabs/Lib/ThreadItem.php:834
+msgid "Attach/Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:641
-msgid "Move this channel (disable all previous locations)"
+#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1463
+#: ../../Zotlabs/Module/Wiki.php:399
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:642
-msgid "Use this channel nickname instead of the one provided"
+#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
+#: ../../include/conversation.php:1464 ../../include/conversation.php:1519
+#: ../../Zotlabs/Module/Article_edit.php:130
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth.php:112
+#: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1392
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../Zotlabs/Module/Editpost.php:111
+#: ../../Zotlabs/Module/Admin/Addons.php:427
+#: ../../Zotlabs/Module/Profile_photo.php:507
+#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56
+#: ../../Zotlabs/Module/Editlayout.php:140
+#: ../../Zotlabs/Module/Cover_photo.php:428
+#: ../../Zotlabs/Module/Profiles.php:802 ../../Zotlabs/Module/Oauth2.php:117
+#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367
+#: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Storage/Browser.php:383
+msgid "Cancel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:642
-msgid ""
-"Leave blank to keep your existing channel nickname. You will be randomly "
-"assigned a similar nickname if either name is already allocated on this site."
+#: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257
+#: ../../include/conversation.php:1465 ../../include/conversation.php:1518
+#: ../../Zotlabs/Module/Profile_photo.php:508
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:401
+msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:644
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1467
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:106
-msgid "Like/Dislike"
+#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1474
+msgid "Disable comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:112
-msgid "This action is restricted to members."
+#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1475
+msgid "Toggle comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:113
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
+#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1481
+#: ../../Zotlabs/Module/Article_edit.php:116
+#: ../../Zotlabs/Module/Card_edit.php:118
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674
+#: ../../Zotlabs/Module/Photos.php:1044
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
-#: ../../Zotlabs/Module/Like.php:230
-msgid "Invalid request."
+#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1485
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:178 ../../include/conversation.php:135
-msgid "channel"
+#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1486
+msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:207
-msgid "thing"
+#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1508
+msgid "Other networks and post services"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:253
-msgid "Channel unavailable."
+#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:209
+#: ../../include/conversation.php:1511
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:289
-msgid "Previous action reversed."
+#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1514
+msgid "Set publish date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Tagger.php:71
-#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:128 ../../include/text.php:2254
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotohelper.php:71
-msgid "photo"
+#: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:211
+#: ../../include/conversation.php:1516 ../../Zotlabs/Module/Chat.php:219
+#: ../../Zotlabs/Lib/ThreadItem.php:841
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
-msgid "status"
+#: ../../addon/hsse/Mod_Hsse.php:15
+msgid "WYSIWYG status editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3297
-#: ../../include/conversation.php:174
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1595
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2138
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../addon/hsse/Mod_Hsse.php:21 ../../addon/hsse/Mod_Hsse.php:26
+msgid "WYSIWYG Status App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299
-#: ../../include/conversation.php:177
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2140
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../addon/hsse/Mod_Hsse.php:34
+msgid "WYSIWYG Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:475
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:133
+msgid "View Larger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:477
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:156
+msgid "Tile Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:479
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:156
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:481
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2226
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:157
+msgid "Nominatim (reverse geocoding) Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:483
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2228
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:157
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\">Nominatim servers</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:485
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2230
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../addon/openstreetmap/openstreetmap.php:158
+msgid "Default zoom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:586
-msgid "Action completed."
+#: ../../addon/openstreetmap/openstreetmap.php:158
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:587
-msgid "Thank you."
+#: ../../addon/openstreetmap/openstreetmap.php:159
+msgid "Include marker on map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
-msgid "Could not access contact record."
+#: ../../addon/openstreetmap/openstreetmap.php:159
+msgid "Include a marker on the map."
 msgstr ""
 
+#: ../../addon/openstreetmap/openstreetmap.php:171
+#: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:487
+#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/diaspora/diaspora.php:102
+#: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54
+#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:267
 #: ../../Zotlabs/Module/Defperms.php:112
-#: ../../Zotlabs/Module/Settings/Channel.php:267
-#: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:54
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:116
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:82
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:97
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:171
-#: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:54
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:494
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:54
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:190
-msgid "Default Permissions App"
+#: ../../addon/ijpost/Mod_Ijpost.php:23
+msgid "Insane Journal Crosspost Connector Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:191
-msgid "Set custom default permissions for new connections"
+#: ../../addon/ijpost/Mod_Ijpost.php:35
+msgid "Insane Journal Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:860
-msgid "Connection Default Permissions"
+#: ../../addon/ijpost/Mod_Ijpost.php:36
+msgid "Relay public postings to Insane Journal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:861
-msgid "Apply these permissions automatically"
+#: ../../addon/ijpost/Mod_Ijpost.php:53
+msgid "InsaneJournal username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:256
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-msgid ""
-"If enabled, connection requests will be approved without your interaction"
+#: ../../addon/ijpost/Mod_Ijpost.php:57
+msgid "InsaneJournal password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
-msgid "Permission role"
+#: ../../addon/ijpost/Mod_Ijpost.php:61
+msgid "Post to InsaneJournal by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:257
-#: ../../Zotlabs/Module/New_channel.php:157
-#: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Connedit.php:862
-#: ../../Zotlabs/Widget/Notifications.php:182 ../../include/nav.php:324
-msgid "Loading"
+#: ../../addon/ijpost/Mod_Ijpost.php:69
+msgid "Insane Journal Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:863
-msgid "Add permission role"
+#: ../../addon/ijpost/ijpost.php:44
+msgid "Post to Insane Journal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:876
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
+#: ../../addon/wholikesme/wholikesme.php:29
+msgid "Who likes me?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:263
-msgid "Automatic approval settings"
+#: ../../addon/qrator/qrator.php:48
+msgid "QR code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:896
-#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
-msgid "inherited"
+#: ../../addon/qrator/qrator.php:63
+msgid "QR Generator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:901
-#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
-msgid "My Settings"
+#: ../../addon/qrator/qrator.php:64
+msgid "Enter some text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:903
-#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
-msgid "Individual Permissions"
+#: ../../addon/pubcrawl/as.php:1197 ../../include/cdav.php:158
+#: ../../include/cdav.php:159 ../../include/cdav.php:167
+#: ../../include/conversation.php:1217 ../../Zotlabs/Widget/Album.php:84
+#: ../../Zotlabs/Widget/Pinned.php:268 ../../Zotlabs/Widget/Portfolio.php:95
+#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:793
+#: ../../Zotlabs/Module/Photos.php:1253 ../../Zotlabs/Lib/Activity.php:1551
+#: ../../Zotlabs/Lib/Apps.php:1113 ../../Zotlabs/Lib/Apps.php:1197
+msgid "Unknown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:271
-msgid ""
-"Some individual permissions may have been preset or locked based on your "
-"channel type and privacy settings."
+#: ../../addon/pubcrawl/as.php:1494 ../../addon/pubcrawl/as.php:1966
+#: ../../addon/pubcrawl/as.php:2174 ../../include/network.php:1742
+#: ../../Zotlabs/Lib/Activity.php:3095 ../../Zotlabs/Lib/Activity.php:3287
+msgid "ActivityPub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
-#: ../../Zotlabs/Module/Editlayout.php:128
-msgid "Layout Name"
+#: ../../addon/pubcrawl/as.php:2128 ../../addon/diaspora/Receiver.php:1621
+#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
+msgid "status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:132 ../../Zotlabs/Module/Editlayout.php:129
-msgid "Layout Description (Optional)"
+#: ../../addon/pubcrawl/as.php:2165 ../../addon/diaspora/Receiver.php:1567
+#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:471
+#: ../../Zotlabs/Lib/Activity.php:3278
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2714
-msgid "Layouts"
+#: ../../addon/pubcrawl/as.php:2167 ../../include/conversation.php:177
+#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3280
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348
-#: ../../include/nav.php:180 ../../include/nav.php:320
-#: ../../include/help.php:117 ../../include/help.php:125
-msgid "Help"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25
+msgid "ActivityPub Protocol Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:34
+msgid ""
+"The activitypub protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:40
+msgid "Activitypub Protocol App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
+msgid "Deliver to ActivityPub recipients in privacy groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubstream.php:20
-msgid "Public Stream App"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
+msgid ""
+"May result in a large number of mentions and expose all the members of your "
+"privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubstream.php:21
-msgid "The unmoderated public stream of this hub"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
+msgid "Send multi-media HTML articles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76
-#: ../../Zotlabs/Module/Channel.php:256 ../../Zotlabs/Module/Hq.php:125
-#: ../../Zotlabs/Module/Network.php:209
-msgid "Reset form"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
+msgid "Not supported by some microblog services such as Mastodon"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375
-#: ../../Zotlabs/Widget/Notifications.php:162
-msgid "Public Stream"
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62
+msgid "Activitypub Protocol"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
-msgid "Private forum"
+#: ../../addon/ldapauth/ldapauth.php:101
+msgid "An account has been created for you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
-msgid "Public forum"
+#: ../../addon/ldapauth/ldapauth.php:108
+msgid "Authentication successful but rejected: account creation is disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:46
-msgid "Privacy group created."
+#: ../../addon/dwpost/Mod_Dwpost.php:26
+msgid "Dreamwidth Crosspost Connector Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:49
-msgid "Could not create privacy group."
+#: ../../addon/dwpost/Mod_Dwpost.php:39
+msgid "Dreamwidth Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:214
-#: ../../include/items.php:4585
-msgid "Privacy group not found."
+#: ../../addon/dwpost/Mod_Dwpost.php:40
+msgid "Relay public posts to Dreamwidth"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:81
-msgid "Privacy group updated."
+#: ../../addon/dwpost/Mod_Dwpost.php:53
+msgid "Dreamwidth username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:107
-msgid "Privacy Groups App"
+#: ../../addon/dwpost/Mod_Dwpost.php:57
+msgid "Dreamwidth password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:108
-msgid "Management of privacy groups"
+#: ../../addon/dwpost/Mod_Dwpost.php:61
+msgid "Post to Dreamwidth by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154
-#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364
-#: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327
-#: ../../include/acl_selectors.php:87 ../../include/nav.php:104
-msgid "Privacy Groups"
+#: ../../addon/dwpost/Mod_Dwpost.php:77
+msgid "Dreamwidth Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:143
-msgid "Add Group"
+#: ../../addon/dwpost/dwpost.php:49
+msgid "Post to Dreamwidth"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:147
-msgid "Privacy group name"
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257
-msgid "Members are visible to other channels"
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group removed."
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:186
-msgid "Unable to remove privacy group."
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:252
-#, php-format
-msgid "Privacy Group: %s"
+#: ../../addon/morepokes/morepokes.php:21
+msgid "patent"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:254
-msgid "Privacy group name: "
+#: ../../addon/morepokes/morepokes.php:21
+msgid "patented"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:259
-msgid "Delete Group"
+#: ../../addon/morepokes/morepokes.php:22
+msgid "hug"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:270
-msgid "Group members"
+#: ../../addon/morepokes/morepokes.php:22
+msgid "hugged"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:272
-msgid "Not in this group"
+#: ../../addon/morepokes/morepokes.php:23
+msgid "murder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:304
-msgid "Click a channel to toggle membership"
+#: ../../addon/morepokes/morepokes.php:23
+msgid "murdered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
+#: ../../addon/morepokes/morepokes.php:24
+msgid "worship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
+#: ../../addon/morepokes/morepokes.php:24
+msgid "worshipped"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Changeaddr.php:78
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "WARNING: "
+#: ../../addon/morepokes/morepokes.php:25
+msgid "kiss"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
+#: ../../addon/morepokes/morepokes.php:25
+msgid "kissed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
+#: ../../addon/morepokes/morepokes.php:26
+msgid "tempt"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Changeaddr.php:79
-#: ../../Zotlabs/Module/Removeaccount.php:59
-msgid "Please enter your password for verification:"
+#: ../../addon/morepokes/morepokes.php:26
+msgid "tempted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-msgid "Remove Channel"
+#: ../../addon/morepokes/morepokes.php:27
+msgid "raise eyebrows at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
-msgid "App installed."
+#: ../../addon/morepokes/morepokes.php:27
+msgid "raised their eyebrows at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:49
-msgid "Malformed app."
+#: ../../addon/morepokes/morepokes.php:28
+msgid "insult"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:132
-msgid "Embed code"
+#: ../../addon/morepokes/morepokes.php:28
+msgid "insulted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:138
-msgid "Edit App"
+#: ../../addon/morepokes/morepokes.php:29
+msgid "praise"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:138
-msgid "Create App"
+#: ../../addon/morepokes/morepokes.php:29
+msgid "praised"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:143
-msgid "Name of app"
+#: ../../addon/morepokes/morepokes.php:30
+msgid "be dubious of"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:144
-msgid "Location (URL) of app"
+#: ../../addon/morepokes/morepokes.php:30
+msgid "was dubious of"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:146
-msgid "Photo icon URL"
+#: ../../addon/morepokes/morepokes.php:31
+msgid "eat"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:146
-msgid "80 x 80 pixels - optional"
+#: ../../addon/morepokes/morepokes.php:31
+msgid "ate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:147
-msgid "Categories (optional, comma separated list)"
+#: ../../addon/morepokes/morepokes.php:32
+msgid "giggle and fawn at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:148
-msgid "Version ID"
+#: ../../addon/morepokes/morepokes.php:32
+msgid "giggled and fawned at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:149
-msgid "Price of app"
+#: ../../addon/morepokes/morepokes.php:33
+msgid "doubt"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:150
-msgid "Location (URL) to purchase app"
+#: ../../addon/morepokes/morepokes.php:33
+msgid "doubted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
-msgid ""
-"Channel name changes are not allowed within 48 hours of changing the account "
-"password."
+#: ../../addon/morepokes/morepokes.php:34
+msgid "glare"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:46 ../../Zotlabs/Module/Register.php:100
-#: ../../include/channel.php:226 ../../include/channel.php:706
-msgid "Reserved nickname. Please choose another."
+#: ../../addon/morepokes/morepokes.php:34
+msgid "glared at"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:51 ../../Zotlabs/Module/Register.php:105
-#: ../../include/channel.php:231 ../../include/channel.php:711
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../addon/morepokes/morepokes.php:35
+msgid "fuck"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
-msgid "Change channel nickname/address"
+#: ../../addon/morepokes/morepokes.php:35
+msgid "fucked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
-msgid "Any/all connections on other networks will be lost!"
+#: ../../addon/morepokes/morepokes.php:36
+msgid "bonk"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
-msgid "New channel address"
+#: ../../addon/morepokes/morepokes.php:36
+msgid "bonked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
-msgid "Rename Channel"
+#: ../../addon/morepokes/morepokes.php:37
+msgid "declare undying love for"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:45
-msgid "Name is required"
+#: ../../addon/morepokes/morepokes.php:37
+msgid "declared undying love for"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:49
-msgid "Key and Secret are required"
+#: ../../addon/rendezvous/rendezvous.php:57
+msgid "Errors encountered deleting database table "
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:100
-msgid "OAuth Apps Manager App"
+#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:496
+msgid "Submit Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:101
-msgid "OAuth authentication tokens for mobile and remote apps"
+#: ../../addon/rendezvous/rendezvous.php:96
+msgid "Drop tables when uninstalling?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
-#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Oauth2.php:143
-#: ../../Zotlabs/Module/Oauth2.php:193
-msgid "Add application"
+#: ../../addon/rendezvous/rendezvous.php:96
+msgid ""
+"If checked, the Rendezvous database tables will be deleted when the plugin "
+"is uninstalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth2.php:118
-#: ../../Zotlabs/Module/Oauth2.php:146
-msgid "Name of application"
+#: ../../addon/rendezvous/rendezvous.php:97
+msgid "Mapbox Access Token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:596
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:505
-msgid "Consumer Key"
+#: ../../addon/rendezvous/rendezvous.php:97
+msgid ""
+"If you enter a Mapbox access token, it will be used to retrieve map tiles "
+"from Mapbox instead of the default OpenStreetMap tile server."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../addon/rendezvous/rendezvous.php:162
+msgid "Rendezvous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:595
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:506
-msgid "Consumer Secret"
+#: ../../addon/rendezvous/rendezvous.php:167
+msgid ""
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
-#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
-msgid "Redirect"
+#: ../../addon/rendezvous/rendezvous.php:168
+msgid "Welcome to Rendezvous!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
-#: ../../Zotlabs/Module/Oauth2.php:148
+#: ../../addon/rendezvous/rendezvous.php:169
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+"Enter your name to join this rendezvous. To begin sharing your location with "
+"the other members, tap the GPS control. When your location is discovered, a "
+"red dot will appear and others will be able to see you on the map."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
-msgid "Icon url"
+#: ../../addon/rendezvous/rendezvous.php:171
+msgid "Let's meet here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Register.php:498
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
-msgid "Optional"
+#: ../../addon/rendezvous/rendezvous.php:172
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113
+#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Zotlabs/Lib/NativeWikiPage.php:576
+#: ../../Zotlabs/Storage/Browser.php:377
+msgid "Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:128
-msgid "Application not found."
+#: ../../addon/rendezvous/rendezvous.php:173
+#: ../../addon/cart/submodules/hzservices.php:656
+#: ../../addon/cart/submodules/manualcat.php:260
+#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Appman.php:145
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:171
-msgid "Connected OAuth Apps"
+#: ../../addon/rendezvous/rendezvous.php:174
+msgid "New marker"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
-msgid "Client key starts with"
+#: ../../addon/rendezvous/rendezvous.php:175
+msgid "Edit marker"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:176 ../../Zotlabs/Module/Oauth2.php:197
-msgid "No name"
+#: ../../addon/rendezvous/rendezvous.php:176
+msgid "New identity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth.php:177 ../../Zotlabs/Module/Oauth2.php:198
-msgid "Remove authorization"
+#: ../../addon/rendezvous/rendezvous.php:177
+msgid "Delete marker"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:12
-#: ../../Zotlabs/Module/Email_validation.php:24
-msgid "Token verification failed."
+#: ../../addon/rendezvous/rendezvous.php:178
+msgid "Delete member"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:30
-msgid "Email verification resent"
+#: ../../addon/rendezvous/rendezvous.php:179
+msgid "Edit proximity alert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:33
-msgid "Unable to resend email verification message."
+#: ../../addon/rendezvous/rendezvous.php:180
+msgid ""
+"A proximity alert will be issued when this member is within a certain radius "
+"of you.<br><br>Enter a radius in meters (0 to disable):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:21
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Photos.php:519
-#: ../../Zotlabs/Module/Directory.php:73 ../../Zotlabs/Module/Directory.php:78
-#: ../../Zotlabs/Module/Ratings.php:83
-msgid "Public access denied."
+#: ../../addon/rendezvous/rendezvous.php:180
+#: ../../addon/rendezvous/rendezvous.php:185
+msgid "distance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379
-#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/text.php:1144
-#: ../../include/text.php:1156 ../../include/acl_selectors.php:149
-#: ../../include/nav.php:194
-msgid "Search"
+#: ../../addon/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:250
-#, php-format
-msgid "Items tagged with: %s"
+#: ../../addon/rendezvous/rendezvous.php:182
+#: ../../addon/rendezvous/rendezvous.php:184
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:252
-#, php-format
-msgid "Search results for: %s"
+#: ../../addon/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Moderate.php:67
-msgid "Comment approved"
+#: ../../addon/rendezvous/rendezvous.php:186
+msgid "Reminder note"
 msgstr ""
 
-#: ../../Zotlabs/Module/Moderate.php:71
-msgid "Comment deleted"
+#: ../../addon/rendezvous/rendezvous.php:187
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:150 ../../Zotlabs/Module/Editpost.php:110
-msgid "Edit post"
+#: ../../addon/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../addon/rendezvous/rendezvous.php:200
+msgid ""
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or "
+"share their own locations with the group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../addon/rendezvous/rendezvous.php:232
+msgid "You have no rendezvous. Press the button above to create a rendezvous!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:95 ../../Zotlabs/Module/Card_edit.php:44
-#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Page.php:75
-#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Article_edit.php:44
-#: ../../Zotlabs/Module/Attach.php:22 ../../Zotlabs/Module/Cal.php:31
-#: ../../Zotlabs/Module/Attach_edit.php:52
-msgid "Channel not found."
+#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:720
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:132
-msgid "toggle full screen mode"
+#: ../../addon/startpage/Mod_Startpage.php:50
+msgid "Startpage App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:50
-msgid "Post not found."
+#: ../../addon/startpage/Mod_Startpage.php:51
+msgid "Set a preferred page to load on login from home page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:158 ../../include/text.php:2260
-#: ../../include/markdown.php:204 ../../include/bbcode.php:555
-msgid "post"
+#: ../../addon/startpage/Mod_Startpage.php:62
+msgid "Page to load after login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
-#: ../../include/text.php:2262
-msgid "comment"
+#: ../../addon/startpage/Mod_Startpage.php:62
+msgid ""
+"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
+"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
+"blank for default network page (grid)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:121
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../addon/startpage/Mod_Startpage.php:70
+msgid "Startpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:93
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+#: ../../addon/mail/Mod_Mail.php:36
+msgid "Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:108
-msgid "Import completed"
+#: ../../addon/mail/Mod_Mail.php:48
+msgid "message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:125
-msgid "Import Items"
+#: ../../addon/mail/Mod_Mail.php:75
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:126
-msgid "Use this form to import existing posts and content from an export file."
+#: ../../addon/mail/Mod_Mail.php:136
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
-msgid "Continue"
+#: ../../addon/mail/Mod_Mail.php:166 ../../Zotlabs/Module/Wiki.php:211
+#: ../../Zotlabs/Storage/Browser.php:404
+msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:99
-msgid "Premium Channel Setup"
+#: ../../addon/mail/Mod_Mail.php:167
+msgid "Delete message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:101
-msgid "Enable premium channel connection restrictions"
+#: ../../addon/mail/Mod_Mail.php:168
+msgid "Delivery report"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:102
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../addon/mail/Mod_Mail.php:169
+msgid "Recall message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+#: ../../addon/mail/Mod_Mail.php:171
+msgid "Message has been recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:105
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../addon/mail/Mod_Mail.php:189
+msgid "Delete Conversation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127
+#: ../../addon/mail/Mod_Mail.php:191
 msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:115
-msgid "(No specific instructions have been provided by the channel owner.)"
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:123
-msgid "Restricted or Premium Channel"
+#: ../../addon/mail/Mod_Mail.php:195
+msgid "Send Reply"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:138
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+#: ../../addon/mail/Mod_Mail.php:196
+msgid "To:"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:159
-msgid "Your real name is recommended."
+#: ../../addon/mail/Mod_Mail.php:198 ../../Zotlabs/Module/Invite.php:542
+msgid "Subject:"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:160
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
+#: ../../addon/mail/Mod_Mail.php:200
+#, php-format
+msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:165
-msgid ""
-"This will be used to create a unique network address (like an email address)."
+#: ../../addon/mail/Mod_Mail.php:204
+msgid "Attach file"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:167
-msgid "Allowed characters are a-z 0-9, - and _"
+#: ../../addon/mail/Mod_Mail.php:401 ../../include/text.php:1841
+msgid "Download binary/encrypted content"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:175
-msgid "Channel name"
+#: ../../addon/adultphotoflag/adultphotoflag.php:24
+msgid "Flag Adult Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:177
-#: ../../Zotlabs/Module/Register.php:510
-msgid "Choose a short nickname"
+#: ../../addon/adultphotoflag/adultphotoflag.php:25
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:537
-msgid "Channel role and privacy"
+#: ../../addon/upgrade_info/upgrade_info.php:48
+msgid "Your channel has been upgraded to $Projectname version"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid ""
-"Select a channel permission role compatible with your usage needs and "
-"privacy requirements."
+#: ../../addon/upgrade_info/upgrade_info.php:50
+msgid "Please have a look at the"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid "Read more about channel permission roles"
+#: ../../addon/upgrade_info/upgrade_info.php:52
+msgid "git history"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:181
-msgid "Create a Channel"
+#: ../../addon/upgrade_info/upgrade_info.php:54
+msgid "change log"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:182
-msgid ""
-"A channel is a unique network identity. It can represent a person (social "
-"network profile), a forum (group), a business or celebrity page, a newsfeed, "
-"and many other things."
+#: ../../addon/upgrade_info/upgrade_info.php:55
+msgid "for further info."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:183
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
+#: ../../addon/upgrade_info/upgrade_info.php:60
+msgid "Upgrade Info"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:188
-msgid "Validate"
+#: ../../addon/upgrade_info/upgrade_info.php:64
+msgid "Do not show this again"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Widget/Appstore.php:14
-msgid "Available Apps"
+#: ../../addon/twitter/Mod_Twitter.php:65
+msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:50
-msgid "Installed Apps"
+#: ../../addon/twitter/Mod_Twitter.php:78
+msgid "Twitter Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:53
-msgid "Manage Apps"
+#: ../../addon/twitter/Mod_Twitter.php:79
+msgid "Relay public posts to Twitter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:54
-msgid "Create Custom App"
+#: ../../addon/twitter/Mod_Twitter.php:103
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../addon/twitter/Mod_Twitter.php:125
 msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
+"At this Hubzilla instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
+#: ../../addon/twitter/Mod_Twitter.php:127
+msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
+#: ../../addon/twitter/Mod_Twitter.php:130
+msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:109
-msgid "Remove Account"
+#: ../../addon/twitter/Mod_Twitter.php:152
+msgid ""
+"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:14
-#: ../../Zotlabs/Module/Filestorage.php:53
-msgid "Deprecated!"
+#: ../../addon/twitter/Mod_Twitter.php:157
+msgid "Twitter post length"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Display.php:42
-#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:62
-#: ../../Zotlabs/Module/Admin/Themes.php:72
-#: ../../Zotlabs/Module/Admin/Addons.php:260 ../../Zotlabs/Module/Thing.php:96
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../include/items.php:4011
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:284
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:285
-msgid "Item not found."
+#: ../../addon/twitter/Mod_Twitter.php:157
+msgid "Maximum tweet length"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:109
-#: ../../Zotlabs/Module/Attach_edit.php:69
-msgid "File not found."
+#: ../../addon/twitter/Mod_Twitter.php:162
+msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Permission Denied."
+#: ../../addon/twitter/Mod_Twitter.php:162
+msgid ""
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:190
-msgid "Edit file permissions"
+#: ../../addon/twitter/Mod_Twitter.php:181
+msgid "Twitter Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:195
-#: ../../Zotlabs/Module/Connedit.php:683 ../../Zotlabs/Module/Chat.php:241
-#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1047
-#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
-#: ../../include/acl_selectors.php:154
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:254
-msgid "Permissions"
+#: ../../addon/twitter/twitter.php:109
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:202
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:261
-msgid "Set/edit permissions"
+#: ../../addon/pumpio/pumpio.php:152
+msgid "You are now authenticated to pumpio."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:203
-msgid "Include all files and sub folders"
+#: ../../addon/pumpio/pumpio.php:153
+msgid "return to the featured settings page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:204
-msgid "Return to file list"
+#: ../../addon/pumpio/pumpio.php:168
+msgid "Post to Pump.io"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:206
-#: ../../Zotlabs/Storage/Browser.php:386
-msgid "Copy/paste this code to attach file to a post"
+#: ../../addon/pumpio/Mod_Pumpio.php:40
+msgid "Pump.io Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:207
-#: ../../Zotlabs/Storage/Browser.php:387
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../addon/pumpio/Mod_Pumpio.php:53
+msgid "Pump.io Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:209
-msgid "Share this file"
+#: ../../addon/pumpio/Mod_Pumpio.php:54
+msgid "Relay public posts to pump.io"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:210
-msgid "Show URL to this file"
+#: ../../addon/pumpio/Mod_Pumpio.php:73
+msgid "Pump.io servername"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Storage/Browser.php:552
-msgid "Show in your contacts shared folder"
+#: ../../addon/pumpio/Mod_Pumpio.php:73
+msgid "Without \"http://\" or \"https://\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
-#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editblock.php:79
-#: ../../Zotlabs/Module/Editblock.php:95 ../../Zotlabs/Module/Editpost.php:24
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-msgid "Item not found"
+#: ../../addon/pumpio/Mod_Pumpio.php:77
+msgid "Pump.io username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220
-#: ../../Zotlabs/Module/Editwebpage.php:143
-#: ../../Zotlabs/Module/Article_edit.php:100
-#: ../../include/conversation.php:1345
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:95
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:310
-msgid "Insert web link"
+#: ../../addon/pumpio/Mod_Pumpio.php:77
+msgid "Without the servername"
 msgstr ""
 
-#: ../../Zotlabs/Module/Card_edit.php:118
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674
-#: ../../Zotlabs/Module/Photos.php:1044
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../include/conversation.php:1477
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:221
-msgid "Title (optional)"
+#: ../../addon/pumpio/Mod_Pumpio.php:88
+msgid "You are not authenticated to pumpio"
 msgstr ""
 
-#: ../../Zotlabs/Module/Card_edit.php:129
-msgid "Edit Card"
+#: ../../addon/pumpio/Mod_Pumpio.php:90
+msgid "(Re-)Authenticate your pump.io connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
-msgid "No connections."
+#: ../../addon/pumpio/Mod_Pumpio.php:94
+msgid "Post to pump.io by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:80
-#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1038
-msgid "Accepts"
+#: ../../addon/pumpio/Mod_Pumpio.php:98
+msgid "Should posts be public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:83
-#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1041
-msgid "Comments"
+#: ../../addon/pumpio/Mod_Pumpio.php:102
+msgid "Mirror all public posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:88
-#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1046
-msgid "Stream items"
+#: ../../addon/pumpio/Mod_Pumpio.php:112
+msgid "Pump.io Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:93
-#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1051
-msgid "Wall posts"
+#: ../../addon/gravatar/gravatar.php:123
+msgid "generic profile image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:97
-#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1055
-msgid "Nothing"
+#: ../../addon/gravatar/gravatar.php:124
+msgid "random geometric pattern"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:105
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../addon/gravatar/gravatar.php:125
+msgid "monster face"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:135
-msgid "View Connections"
+#: ../../addon/gravatar/gravatar.php:126
+msgid "computer generated face"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:54
-msgid "Name and Secret are required"
+#: ../../addon/gravatar/gravatar.php:127
+msgid "retro arcade style face"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:106
-msgid "OAuth2 Apps Manager App"
+#: ../../addon/gravatar/gravatar.php:128
+msgid "Hub default profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:107
-msgid "OAuth2 authenticatication tokens for mobile and remote apps"
+#: ../../addon/gravatar/gravatar.php:143
+msgid "Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:115
-msgid "Add OAuth2 application"
+#: ../../addon/gravatar/gravatar.php:143
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
-msgid "Grant Types"
+#: ../../addon/gravatar/gravatar.php:150 ../../addon/msgfooter/msgfooter.php:46
+#: ../../addon/xmpp/xmpp.php:43
+msgid "Save Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
-msgid "leave blank unless your application sepcifically requires this"
+#: ../../addon/gravatar/gravatar.php:151
+msgid "Default avatar image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
-msgid "Authorization scope"
+#: ../../addon/gravatar/gravatar.php:151
+msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:134
-msgid "OAuth2 Application not found."
+#: ../../addon/gravatar/gravatar.php:152
+msgid "Rating of images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
-msgid "leave blank unless your application specifically requires this"
+#: ../../addon/gravatar/gravatar.php:152
+msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:192
-msgid "Connected OAuth2 Apps"
+#: ../../addon/gravatar/gravatar.php:165
+msgid "Gravatar settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:35
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1410
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:51
-msgid "Profile Unavailable."
+#: ../../addon/msgfooter/msgfooter.php:47
+msgid "text to include in all outgoing posts from this site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:52
-msgid "Wiki App"
+#: ../../addon/sendzid/Mod_Sendzid.php:14
+msgid "Send your identity to all websites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:53
-msgid "Provide a wiki for your channel"
+#: ../../addon/sendzid/Mod_Sendzid.php:20
+msgid "Sendzid App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:77
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1556
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:478
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:456
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:37
-#: ../../extend/addon/hubzilla-addons/cart/manual_payments.php:93
-msgid "Invalid channel"
+#: ../../addon/sendzid/Mod_Sendzid.php:32
+msgid "Send ZID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:132
-msgid "Error retrieving wiki"
+#: ../../addon/cart/widgets/catalogitem.php:57
+#: ../../addon/cart/submodules/hzservices.php:659
+#: ../../addon/cart/submodules/manualcat.php:263
+msgid "Price"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:139
-msgid "Error creating zip file export folder"
+#: ../../addon/cart/manual_payments.php:7
+msgid "Error: order mismatch. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:190
-msgid "Error downloading wiki: "
+#: ../../addon/cart/manual_payments.php:61
+msgid "Manual payments are not enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../include/nav.php:536
-msgid "Wikis"
+#: ../../addon/cart/manual_payments.php:68
+#: ../../addon/cart/submodules/paypalbutton.php:392
+#: ../../addon/cart/submodules/paypalbuttonV2.php:409
+#: ../../addon/cart/cart.php:1578
+msgid "Order not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404
-msgid "Download"
+#: ../../addon/cart/manual_payments.php:77
+msgid "Finished"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:215
-msgid "Wiki name"
+#: ../../addon/cart/manual_payments.php:93
+#: ../../addon/cart/submodules/paypalbutton.php:456
+#: ../../addon/cart/submodules/paypalbuttonV2.php:478
+#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1556
+#: ../../Zotlabs/Module/Wiki.php:77
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:216
-msgid "Content type"
+#: ../../addon/cart/submodules/subscriptions.php:151
+msgid "Enable Subscription Management Module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
-#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2118
-#: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41
-msgid "Markdown"
+#: ../../addon/cart/submodules/subscriptions.php:223
+msgid ""
+"Cannot include subscription items with different terms in the same order."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
-#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2116
-msgid "BBcode"
+#: ../../addon/cart/submodules/subscriptions.php:372
+msgid "Select Subscription to Edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2119
-msgid "Text"
+#: ../../addon/cart/submodules/subscriptions.php:380
+msgid "Edit Subscriptions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
-msgid "Type"
+#: ../../addon/cart/submodules/subscriptions.php:414
+msgid "Subscription SKU"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:219
-msgid "Any&nbsp;type"
+#: ../../addon/cart/submodules/subscriptions.php:419
+msgid "Catalog Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:226
-msgid "Lock content type"
+#: ../../addon/cart/submodules/subscriptions.php:423
+msgid "Subscription available for purchase."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:227
-msgid "Create a status post for this wiki"
+#: ../../addon/cart/submodules/subscriptions.php:428
+msgid "Maximum active subscriptions to this item per account."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:228
-msgid "Edit Wiki Name"
+#: ../../addon/cart/submodules/subscriptions.php:431
+msgid "Subscription price."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:273
-msgid "Wiki not found"
+#: ../../addon/cart/submodules/subscriptions.php:435
+msgid "Quantity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:299
-msgid "Rename page"
+#: ../../addon/cart/submodules/subscriptions.php:439
+msgid "Term"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:320
-msgid "Error retrieving page content"
+#: ../../addon/cart/submodules/hzservices.php:64
+msgid "Enable Hubzilla Services Module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330
-msgid "New page"
+#: ../../addon/cart/submodules/hzservices.php:163
+#: ../../addon/cart/submodules/manualcat.php:172
+msgid "New Sku"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:365
-msgid "Revision Comparison"
+#: ../../addon/cart/submodules/hzservices.php:198
+#: ../../addon/cart/submodules/manualcat.php:208
+msgid "Cannot save edits to locked item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579
-#: ../../Zotlabs/Widget/Wiki_page_history.php:25
-msgid "Revert"
+#: ../../addon/cart/submodules/hzservices.php:247
+#: ../../addon/cart/submodules/hzservices.php:334
+msgid "SKU not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:373
-msgid "Short description of your changes (optional)"
+#: ../../addon/cart/submodules/hzservices.php:300
+#: ../../addon/cart/submodules/hzservices.php:304
+msgid "Invalid Activation Directive."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:383
-#: ../../extend/addon/hubzilla-addons/ljpost/ljpost.php:134
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:69
-#: ../../extend/addon/hubzilla-addons/dwpost/dwpost.php:134
-#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:173
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:98
-msgid "Source"
+#: ../../addon/cart/submodules/hzservices.php:375
+#: ../../addon/cart/submodules/hzservices.php:379
+msgid "Invalid Deactivation Directive."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:393
-msgid "New page name"
+#: ../../addon/cart/submodules/hzservices.php:565
+msgid "Add to this privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:398
-msgid "Embed image from photo albums"
+#: ../../addon/cart/submodules/hzservices.php:581
+msgid "Set user service class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1459
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:208
-msgid "Embed an image from your albums"
+#: ../../addon/cart/submodules/hzservices.php:608
+msgid "You must be using a local account to purchase this service."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:508
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1461
-#: ../../include/conversation.php:1514
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:210
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:257
-msgid "OK"
+#: ../../addon/cart/submodules/hzservices.php:648
+#: ../../addon/cart/submodules/manualcat.php:252
+msgid "Changes Locked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:509
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1387
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:139
-msgid "Choose images to embed"
+#: ../../addon/cart/submodules/hzservices.php:652
+#: ../../addon/cart/submodules/manualcat.php:256
+msgid "Item available for purchase."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:510
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1388
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:140
-msgid "Choose an album"
+#: ../../addon/cart/submodules/hzservices.php:662
+#: ../../addon/cart/submodules/manualcat.php:266
+msgid "Photo URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:404 ../../Zotlabs/Module/Profile_photo.php:511
-#: ../../Zotlabs/Module/Cover_photo.php:432
-msgid "Choose a different album"
+#: ../../addon/cart/submodules/hzservices.php:666
+msgid "Add buyer to privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:512
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1390
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:142
-msgid "Error getting album list"
+#: ../../addon/cart/submodules/hzservices.php:671
+msgid "Add buyer as connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:513
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1391
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:143
-msgid "Error getting photo link"
+#: ../../addon/cart/submodules/hzservices.php:679
+#: ../../addon/cart/submodules/hzservices.php:721
+msgid "Set Service Class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:514
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1392
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:144
-msgid "Error getting album"
+#: ../../addon/cart/submodules/orderoptions.php:70
+msgid "Enable Order/Item Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:409
-msgid "History"
+#: ../../addon/cart/submodules/orderoptions.php:333
+#: ../../addon/cart/submodules/orderoptions.php:357
+#: ../../addon/cart/submodules/orderoptions.php:433
+#: ../../addon/cart/submodules/orderoptions.php:457
+msgid "Label"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:487
-msgid "Error creating wiki. Invalid name."
+#: ../../addon/cart/submodules/orderoptions.php:334
+#: ../../addon/cart/submodules/orderoptions.php:358
+#: ../../addon/cart/submodules/orderoptions.php:434
+#: ../../addon/cart/submodules/orderoptions.php:458
+#: ../../include/js_strings.php:123 ../../include/datetime.php:211
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:143
+#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "Required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:494
-msgid "A wiki with this name already exists."
+#: ../../addon/cart/submodules/orderoptions.php:336
+#: ../../addon/cart/submodules/orderoptions.php:360
+#: ../../addon/cart/submodules/orderoptions.php:436
+#: ../../addon/cart/submodules/orderoptions.php:460
+msgid "Instructions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:507
-msgid "Wiki created, but error creating Home page."
+#: ../../addon/cart/submodules/paypalbutton.php:85
+msgid "Enable Paypal Button Module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:514
-msgid "Error creating wiki"
+#: ../../addon/cart/submodules/paypalbutton.php:93
+#: ../../addon/cart/submodules/paypalbuttonV2.php:94
+msgid "Use Production Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:538
-msgid "Error updating wiki. Invalid name."
+#: ../../addon/cart/submodules/paypalbutton.php:100
+#: ../../addon/cart/submodules/paypalbuttonV2.php:101
+msgid "Paypal Sandbox Client Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:557
-msgid "Error updating wiki"
+#: ../../addon/cart/submodules/paypalbutton.php:107
+#: ../../addon/cart/submodules/paypalbuttonV2.php:108
+msgid "Paypal Sandbox Secret Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:572
-msgid "Wiki delete permission denied."
+#: ../../addon/cart/submodules/paypalbutton.php:113
+#: ../../addon/cart/submodules/paypalbuttonV2.php:114
+msgid "Paypal Production Client Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:582
-msgid "Error deleting wiki"
+#: ../../addon/cart/submodules/paypalbutton.php:120
+#: ../../addon/cart/submodules/paypalbuttonV2.php:121
+msgid "Paypal Production Secret Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:615
-msgid "New page created"
+#: ../../addon/cart/submodules/paypalbutton.php:252
+#: ../../addon/cart/submodules/paypalbuttonV2.php:264
+msgid "Paypal button payments are not enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:741
-msgid "Cannot delete Home"
+#: ../../addon/cart/submodules/paypalbutton.php:270
+#: ../../addon/cart/submodules/paypalbuttonV2.php:282
+msgid ""
+"Paypal button payments are not properly configured.  Please choose another "
+"payment option."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:817
-msgid "Current Revision"
+#: ../../addon/cart/submodules/paypalbuttonV2.php:86
+msgid "Enable Paypal Button Module (API-v2)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:817
-msgid "Selected Revision"
+#: ../../addon/cart/submodules/manualcat.php:61
+msgid "Enable Manual Cart Module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:872
-msgid "You must be authenticated."
+#: ../../addon/cart/myshop.php:30
+msgid "Access Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
-msgid "Block Name"
+#: ../../addon/cart/myshop.php:112 ../../addon/cart/cart.php:1446
+msgid "Order Not Found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2712
-msgid "Blocks"
+#: ../../addon/cart/myshop.php:189 ../../addon/cart/myshop.php:223
+#: ../../addon/cart/myshop.php:271 ../../addon/cart/myshop.php:329
+msgid "Invalid Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
+#: ../../addon/cart/Settings/Cart.php:58
+msgid "Enable Test Catalog"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dircensor.php:42
-msgid "Entry censored"
+#: ../../addon/cart/Settings/Cart.php:70
+msgid "Enable Manual Payments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dircensor.php:45
-msgid "Entry uncensored"
+#: ../../addon/cart/Settings/Cart.php:90
+msgid "Base Merchant Currency"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66
-msgid "Location not found."
+#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1375
+msgid "Cart Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:75
-msgid "Location lookup failed."
+#: ../../addon/cart/cart.php:252
+msgid "DB Cleanup Failure"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:79
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+#: ../../addon/cart/cart.php:674
+msgid "[cart] Item Added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:108
-msgid "Syncing locations"
+#: ../../addon/cart/cart.php:1063
+msgid "Order already checked out."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:117
-msgid "No locations found."
+#: ../../addon/cart/cart.php:1368
+msgid "Drop database tables when uninstalling."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:127
-msgid "Manage Channel Locations"
+#: ../../addon/cart/cart.php:1387 ../../addon/cart/cart.php:1390
+msgid "Shop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:130
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:285
-msgid "Primary"
+#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:51
+#: ../../Zotlabs/Module/Wiki.php:35
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:131 ../../Zotlabs/Module/Menu.php:177
-msgid "Drop"
+#: ../../addon/cart/cart.php:1507
+msgid "Cart utilities for orders and payments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:133
-msgid "Sync Now"
+#: ../../addon/cart/cart.php:1545
+msgid "You must be logged into the Grid to shop."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:134
-msgid "Please wait several minutes between consecutive operations."
+#: ../../addon/cart/cart.php:1592
+msgid "Access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:135
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+#: ../../addon/cart/cart.php:1644 ../../addon/cart/cart.php:1787
+msgid "No Order Found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:136
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../addon/cart/cart.php:1653
+msgid "An unknown error has occurred Please start again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
+#: ../../addon/cart/cart.php:1796
+msgid "Requirements not met."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
+#: ../../addon/cart/cart.php:1796
+msgid "Review your order and complete any needed requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345
-#: ../../include/features.php:368 ../../include/nav.php:444
-msgid "Photos"
+#: ../../addon/cart/cart.php:1822
+msgid "Invalid Payment Type.  Please start again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351
-#: ../../Zotlabs/Lib/Apps.php:340 ../../include/nav.php:452
-msgid "Files"
+#: ../../addon/cart/cart.php:1829
+msgid "Order not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:121
-msgid "Could not locate selected profile."
+#: ../../addon/nofed/Mod_Nofed.php:21
+msgid "nofed Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:265
-msgid "Connection updated."
+#: ../../addon/nofed/Mod_Nofed.php:33
+msgid "No Federation App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:267
-msgid "Failed to update connection record."
+#: ../../addon/nofed/Mod_Nofed.php:34
+msgid ""
+"Prevent posting from being federated to anybody. It will exist only on your "
+"channel page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:310
-msgid "is now connected to"
+#: ../../addon/nofed/Mod_Nofed.php:42
+msgid "Federate posts by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:435
-msgid "Could not access address book record."
+#: ../../addon/nofed/Mod_Nofed.php:50
+msgid "No Federation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:483 ../../Zotlabs/Module/Connedit.php:487
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../addon/nofed/nofed.php:47
+msgid "Federate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:502 ../../Zotlabs/Module/Connedit.php:511
-#: ../../Zotlabs/Module/Connedit.php:520 ../../Zotlabs/Module/Connedit.php:529
-#: ../../Zotlabs/Module/Connedit.php:542
-msgid "Unable to set address book parameters."
+#: ../../addon/smileybutton/Mod_Smileybutton.php:35
+msgid "Smileybutton App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:561
-msgid "Connection has been removed."
+#: ../../addon/smileybutton/Mod_Smileybutton.php:36
+msgid "Adds a smileybutton to the jot editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:344
-#: ../../include/conversation.php:1083 ../../include/nav.php:115
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57
-msgid "View Profile"
+#: ../../addon/smileybutton/Mod_Smileybutton.php:44
+msgid "Hide the button and show the smilies directly."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:604
-#, php-format
-msgid "View %s's profile"
+#: ../../addon/smileybutton/Mod_Smileybutton.php:52
+msgid "Smileybutton Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:608
-msgid "Refresh Permissions"
+#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2099
+msgid "file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
-msgid "Fetch updated permissions"
+#: ../../addon/redfiles/redfiles.php:119
+msgid "Redmatrix File Storage Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Refresh Photo"
+#: ../../addon/redfiles/redfiles.php:120
+msgid "This will import all your Redmatrix cloud files to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:618
-msgid "Fetch updated photo"
+#: ../../addon/diaspora/diaspora.php:75
+msgid ""
+"Please install the statistics addon to be able to configure a diaspora relay"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:622 ../../include/conversation.php:1093
-msgid "Recent Activity"
+#: ../../addon/diaspora/diaspora.php:85
+msgid "Diaspora Relay Handle"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:625
-msgid "View recent posts and comments"
+#: ../../addon/diaspora/diaspora.php:85
+msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
-#: ../../Zotlabs/Module/Admin/Accounts.php:322
-msgid "Unblock"
+#: ../../addon/diaspora/diaspora.php:105
+msgid "Diaspora relay could not be imported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
-#: ../../Zotlabs/Module/Admin/Accounts.php:321
-msgid "Block"
+#: ../../addon/diaspora/diaspora.php:999
+msgid "No subject"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:632
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:337
+#: ../../addon/diaspora/util.php:350 ../../Zotlabs/Lib/Enotify.php:61
+msgid "$projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:633
-msgid "This connection is blocked!"
+#: ../../addon/diaspora/import_diaspora.php:19
+msgid "No username found in import file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Unignore"
+#: ../../addon/diaspora/import_diaspora.php:44 ../../include/import.php:76
+msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
-#: ../../Zotlabs/Module/Connections.php:345
-msgid "Ignore"
+#: ../../addon/diaspora/import_diaspora.php:142
+#: ../../Zotlabs/Module/Import.php:530
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:640
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../addon/diaspora/Mod_Diaspora.php:43
+msgid "Diaspora Protocol Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:641
-msgid "This connection is ignored!"
+#: ../../addon/diaspora/Mod_Diaspora.php:52
+msgid ""
+"The diaspora protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Unarchive"
+#: ../../addon/diaspora/Mod_Diaspora.php:58
+msgid "Diaspora Protocol App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Archive"
+#: ../../addon/diaspora/Mod_Diaspora.php:77
+msgid "Allow any Diaspora member to comment or like your public posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:648
+#: ../../addon/diaspora/Mod_Diaspora.php:77
 msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:649
-msgid "This connection is archived!"
+"If this setting is disabled only your contacts will be able to comment or "
+"like your public posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Unhide"
+#: ../../addon/diaspora/Mod_Diaspora.php:81
+msgid "Prevent your hashtags from being redirected to other sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Hide"
+#: ../../addon/diaspora/Mod_Diaspora.php:85
+msgid "Sign and forward posts and comments with no existing Diaspora signature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:656
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../addon/diaspora/Mod_Diaspora.php:90
+msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:657
-msgid "This connection is hidden!"
+#: ../../addon/diaspora/Mod_Diaspora.php:99
+msgid "Diaspora Protocol"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:664
-msgid "Delete this connection"
+#: ../../addon/diaspora/Receiver.php:1571
+#, php-format
+msgid "%1$s dislikes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:672
-msgid "Fetch Vcard"
+#: ../../addon/diaspora/Receiver.php:2200 ../../Zotlabs/Module/Like.php:481
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:675
-msgid "Fetch electronic calling card for this connection"
+#: ../../addon/diaspora/Receiver.php:2202 ../../Zotlabs/Module/Like.php:483
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Open Individual Permissions section by default"
+#: ../../addon/diaspora/Receiver.php:2204 ../../Zotlabs/Module/Like.php:485
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Affinity"
+#: ../../addon/piwik/piwik.php:85
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:712
-msgid "Open Set Affinity section by default"
+#: ../../addon/piwik/piwik.php:88
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:30
-msgid "Me"
+#: ../../addon/piwik/piwik.php:96
+msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:31
-msgid "Family"
+#: ../../addon/piwik/piwik.php:96
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:718
-#: ../../Zotlabs/Module/Settings/Channel.php:71
-#: ../../Zotlabs/Module/Settings/Channel.php:75
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:79
-#: ../../Zotlabs/Module/Settings/Channel.php:90
-#: ../../Zotlabs/Widget/Affinity.php:32 ../../include/channel.php:506
-#: ../../include/channel.php:509 ../../include/selectors.php:134
-msgid "Friends"
+#: ../../addon/piwik/piwik.php:97
+msgid "Site ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Widget/Affinity.php:33
-msgid "Acquaintances"
+#: ../../addon/piwik/piwik.php:98
+msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:720
-#: ../../Zotlabs/Module/Connections.php:97
-#: ../../Zotlabs/Module/Connections.php:111
-#: ../../Zotlabs/Widget/Affinity.php:34
-msgid "All"
+#: ../../addon/piwik/piwik.php:99
+msgid "Asynchronous tracking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:749
-msgid "Filter"
+#: ../../addon/piwik/piwik.php:100
+msgid "Enable frontend JavaScript error tracking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:752
-msgid "Open Custom Filter section by default"
+#: ../../addon/piwik/piwik.php:100
+msgid "This feature requires Piwik >= 2.2.0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Approve this connection"
+#: ../../addon/workflow/workflow.php:222
+msgid "Workflow user."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Accept connection to allow communication"
+#: ../../addon/workflow/workflow.php:272
+msgid "This channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Set Affinity"
+#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:128
+msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:797
-msgid "Set Profile"
+#: ../../addon/workflow/workflow.php:327
+msgid "Create New Workflow Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:800
-msgid "Set Affinity & Profile"
+#: ../../addon/workflow/workflow.php:541 ../../addon/workflow/workflow.php:1437
+#: ../../addon/workflow/workflow.php:1456
+msgid "Workflow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:848
-msgid "This connection is unreachable from this location."
+#: ../../addon/workflow/workflow.php:1425
+msgid "No Workflows Available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:849
-msgid "This connection may be unreachable from other channel locations."
+#: ../../addon/workflow/workflow.php:1455
+msgid "Add item to which workflow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:851
-msgid "Location independence is not supported by their network."
+#: ../../addon/workflow/workflow.php:1515
+#: ../../addon/workflow/workflow.php:1634
+msgid "Create Workflow Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:857
-msgid ""
-"This connection is unreachable from this location. Location independence is "
-"not supported by their network."
+#: ../../addon/workflow/workflow.php:2596
+msgid "Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:860 ../../include/items.php:4618
-#, php-format
-msgid "Connection: %s"
+#: ../../addon/workflow/workflow.php:2598
+msgid "Web link."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:861
-msgid "Connection requests will be approved without your interaction"
+#: ../../addon/workflow/workflow.php:2617
+#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1376
+#: ../../Zotlabs/Module/Connedit.php:910
+msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:870
-msgid "This connection's primary address is"
+#: ../../addon/workflow/workflow.php:2619
+#: ../../addon/workflow/workflow.php:2680
+msgid "Brief description or title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:871
-msgid "Available locations:"
+#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:21
+#: ../../Zotlabs/Lib/Apps.php:371
+msgid "Notes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Connection Tools"
+#: ../../addon/workflow/workflow.php:2627
+#: ../../addon/workflow/workflow.php:2688
+msgid "Notes and Info"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:879
-msgid "Slide to adjust your degree of friendship"
+#: ../../addon/workflow/workflow.php:2686
+msgid "Body"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:880 ../../Zotlabs/Module/Rate.php:157
-#: ../../include/js_strings.php:20
-msgid "Rating"
+#: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:101
+msgid "Workflow Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "Slide to adjust your rating"
+#: ../../addon/donate/donate.php:21
+msgid "Project Servers and Resources"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Connedit.php:887
-msgid "Optionally explain your rating"
+#: ../../addon/donate/donate.php:22
+msgid "Project Creator and Tech Lead"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:884
-msgid "Custom Filter"
+#: ../../addon/donate/donate.php:49
+msgid ""
+"And the hundreds of other people and organisations who helped make the "
+"Hubzilla possible."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:885
-msgid "Only import posts with this text"
+#: ../../addon/donate/donate.php:52
+msgid ""
+"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
+"their time and expertise - and often paying out of pocket for services they "
+"share with others."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886
-#: ../../Zotlabs/Module/Admin/Site.php:512
-#: ../../Zotlabs/Module/Admin/Site.php:513
+#: ../../addon/donate/donate.php:53
 msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
+"There is no corporate funding and no ads, and we do not collect and sell "
+"your personal information. (We don't control your personal information - "
+"<strong>you do</strong>.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "Do not import posts with this text"
+#: ../../addon/donate/donate.php:54
+msgid ""
+"Help support our ground-breaking work in decentralisation, web identity, and "
+"privacy."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:888
-msgid "This information is public!"
+#: ../../addon/donate/donate.php:56
+msgid ""
+"Your donations keep servers and services running and also helps us to "
+"provide innovative new features and continued development."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:893
-msgid "Connection Pending Approval"
+#: ../../addon/donate/donate.php:59
+msgid "Donate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:898
-#, php-format
+#: ../../addon/donate/donate.php:61
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"Choose a project, developer, or public hub to support with a one-time "
+"donation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Tokens.php:180
-msgid "Their Settings"
+#: ../../addon/donate/donate.php:62
+msgid "Donate Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Tokens.php:187
-#: ../../Zotlabs/Module/Permcats.php:128
+#: ../../addon/donate/donate.php:63
 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."
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../addon/donate/donate.php:64
 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/Connedit.php:906
-msgid "Last update:"
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:914
-msgid "Details"
+#: ../../addon/donate/donate.php:65
+msgid "Sponsor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:81
-msgid "Email resent"
+#: ../../addon/donate/donate.php:68
+msgid "Special thanks to: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:81
-msgid "Email resend failed"
+#: ../../addon/likebanner/likebanner.php:51
+msgid "Your Webbie:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:106
-msgid "Verification successful"
+#: ../../addon/likebanner/likebanner.php:54
+msgid "Fontsize (px):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:150
-msgid "Account successfull created"
+#: ../../addon/likebanner/likebanner.php:68
+msgid "Link:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:191
-msgid "Channel successfull created"
+#: ../../addon/likebanner/likebanner.php:70
+msgid "Like us on Hubzilla"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:197
-msgid "Automatic channel creation failed. Please create a channel."
+#: ../../addon/likebanner/likebanner.php:72
+msgid "Embed:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:209
-msgid "Account creation error"
+#: ../../addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:221
-msgid "Verify failed"
+#: ../../addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:226
-msgid "Token verification failed"
+#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Invite.php:225
+#: ../../Zotlabs/Module/Invite.php:494 ../../Zotlabs/Module/Invite.php:508
+#: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95
+#: ../../Zotlabs/Lib/Enotify.php:66
+msgid "$Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:231
-msgid "Request not inside time frame"
+#: ../../addon/opensearch/opensearch.php:43
+msgid "Search $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:237 ../../Zotlabs/Module/Regate.php:267
-msgid "Identity unknown"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:22
+msgid "Fuzzloc Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:243
-msgid "dId2 mistaken"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:34
+msgid "Fuzzy Location App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:271
-msgid "Your Registration ID"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:35
+msgid ""
+"Blur your precise location if your channel uses browser location mapping"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:284 ../../Zotlabs/Module/Regate.php:376
-#: ../../Zotlabs/Module/Regate.php:408
-msgid "Registration verification"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:40
+msgid "Minimum offset in meters"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:291 ../../Zotlabs/Module/Regate.php:413
-msgid "Hold on, you can start verification in"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:44
+msgid "Maximum offset in meters"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:292
-msgid "Please remember your verification token for ID"
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:53
+msgid "Fuzzy Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:294
-msgid "Token validity"
+#: ../../addon/hubwall/hubwall.php:19
+msgid "Send email to all members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:330
-msgid "Resend email"
+#: ../../addon/hubwall/hubwall.php:33 ../../Zotlabs/Lib/Enotify.php:65
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:335
-msgid "Registration status"
+#: ../../addon/hubwall/hubwall.php:50 ../../addon/mailtest/mailtest.php:50
+msgid "No recipients found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:338
-msgid "Verification successful!"
+#: ../../addon/hubwall/hubwall.php:73
+#, php-format
+msgid "%1$d of %2$d messages sent."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:339
-msgid "Your login ID is"
+#: ../../addon/hubwall/hubwall.php:81
+msgid "Send email to all hub members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:340
-msgid ""
-"After your account has been approved by our administrator you will be able "
-"to login with your login ID and your provided password."
+#: ../../addon/hubwall/hubwall.php:92 ../../addon/mailtest/mailtest.php:96
+msgid "Message subject"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:352
-msgid "Registration request revoked"
+#: ../../addon/hubwall/hubwall.php:93
+msgid "Sender Email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:353
-msgid "Sorry for any inconvience. Thank you for your response."
+#: ../../addon/hubwall/hubwall.php:94
+msgid "Test mode (only send to hub administrator)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:377
-msgid "Please enter your verification token for ID"
+#: ../../addon/notifyadmin/notifyadmin.php:34
+msgid "New registration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:378 ../../Zotlabs/Module/Regate.php:405
-msgid "Please check your email!"
+#: ../../addon/notifyadmin/notifyadmin.php:40
+#: ../../Zotlabs/Module/Invite.php:252
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:388
-msgid "Verification token"
+#: ../../addon/notifyadmin/notifyadmin.php:42
+#, php-format
+msgid "Message sent to %s. New account registration: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:399
-msgid "ID expired"
+#: ../../addon/flashcards/Mod_Flashcards.php:218
+msgid "Not allowed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:414
-msgid "You will require the verification token for ID"
+#: ../../addon/flashcards/Mod_Flashcards.php:254
+#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:241
+#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:678
+#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Thing.php:321
+#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:675
+msgid "Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:423
-msgid "Unknown or expired ID"
+#: ../../addon/flashcards/Mod_Flashcards.php:261
+#: ../../Zotlabs/Module/Filestorage.php:202
+msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regate.php:434
-msgid "dId2 malformed"
+#: ../../addon/flashcards/Mod_Flashcards.php:284
+#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3667
+#: ../../Zotlabs/Module/Filestorage.php:29
+#: ../../Zotlabs/Module/Admin/Themes.php:72
+#: ../../Zotlabs/Module/Admin/Addons.php:260
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:42
+#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:61
+#: ../../Zotlabs/Module/Thing.php:96
+msgid "Item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:93
-#: ../../Zotlabs/Module/Cover_photo.php:85
-msgid "Image uploaded but image cropping failed."
+#: ../../addon/libertree/libertree.php:43
+msgid "Post to Libertree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:147
-#: ../../Zotlabs/Module/Profile_photo.php:284
-#: ../../include/photo/photo_driver.php:435
-msgid "Profile Photos"
+#: ../../addon/libertree/Mod_Libertree.php:25
+msgid "Libertree Crosspost Connector Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:166
-#: ../../Zotlabs/Module/Cover_photo.php:212
-msgid "Image resize failed."
+#: ../../addon/libertree/Mod_Libertree.php:35
+msgid "Libertree Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:254
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:298
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../addon/libertree/Mod_Libertree.php:36
+msgid "Relay public posts to Libertree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:261
-#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:196
-msgid "Unable to process image"
+#: ../../addon/libertree/Mod_Libertree.php:51
+msgid "Libertree API token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:296
-#: ../../Zotlabs/Module/Cover_photo.php:265
-msgid "Image upload failed."
+#: ../../addon/libertree/Mod_Libertree.php:55
+msgid "Libertree site URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Cover_photo.php:282
-msgid "Unable to process image."
+#: ../../addon/libertree/Mod_Libertree.php:59
+msgid "Post to Libertree by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:431
-#: ../../Zotlabs/Module/Cover_photo.php:367
-#: ../../Zotlabs/Module/Cover_photo.php:382
-msgid "Photo not available."
+#: ../../addon/libertree/Mod_Libertree.php:67
+msgid "Libertree Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-msgid ""
-"Your default profile photo is visible to anybody on the internet. Profile "
-"photos for alternate profiles will inherit the permissions of the profile"
+#: ../../addon/randpost/randpost.php:99
+msgid "You're welcome."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-msgid ""
-"Your profile photo is visible to anybody on the internet and may be "
-"distributed to other websites."
+#: ../../addon/randpost/randpost.php:100
+msgid "Ah shucks..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:497
-#: ../../Zotlabs/Module/Cover_photo.php:420
-msgid "Upload File:"
+#: ../../addon/randpost/randpost.php:101
+msgid "Don't mention it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:498
-#: ../../Zotlabs/Module/Cover_photo.php:421
-msgid "Select a profile:"
+#: ../../addon/randpost/randpost.php:102
+msgid "&lt;blush&gt;"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
-msgid "Use Photo for Profile"
+#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:329
+msgid "Report Bug"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
-msgid "Change Profile Photo"
+#: ../../addon/totp/Mod_Totp.php:23
+msgid "TOTP Two-Step Verification"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:500
-msgid "Use"
+#: ../../addon/totp/Mod_Totp.php:24
+msgid "Enter the 2-step verification generated by your authenticator app:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:500
-#: ../../Zotlabs/Module/Photos.php:688 ../../Zotlabs/Module/Cover_photo.php:423
-#: ../../Zotlabs/Module/Embedphotos.php:189
-#: ../../Zotlabs/Storage/Browser.php:540 ../../Zotlabs/Widget/Cdav.php:146
-#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Widget/Album.php:97
-msgid "Upload"
+#: ../../addon/totp/Mod_Totp.php:25
+msgid "Success!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:501
-#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../Zotlabs/Module/Admin/Addons.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:424
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:92
-msgid "Remove"
+#: ../../addon/totp/Mod_Totp.php:26
+msgid "Invalid code, please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:505
-#: ../../Zotlabs/Module/Profile_photo.php:506
-#: ../../Zotlabs/Module/Cover_photo.php:426
-#: ../../Zotlabs/Module/Cover_photo.php:427
-msgid "Use a photo from your albums"
+#: ../../addon/totp/Mod_Totp.php:27
+msgid "Too many invalid codes..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:516
-#: ../../Zotlabs/Module/Cover_photo.php:438
-msgid "Select existing photo"
+#: ../../addon/totp/Mod_Totp.php:28
+msgid "Verify"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:535
-#: ../../Zotlabs/Module/Cover_photo.php:455
-msgid "Crop Image"
+#: ../../addon/totp/Settings/Totp.php:90
+msgid ""
+"You haven't set a TOTP secret yet.\n"
+"Please click the button below to generate one and register this site\n"
+"with your preferred authenticator app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:536
-#: ../../Zotlabs/Module/Cover_photo.php:456
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../addon/totp/Settings/Totp.php:93
+msgid "Your TOTP secret is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:538
-#: ../../Zotlabs/Module/Cover_photo.php:458
-msgid "Done Editing"
+#: ../../addon/totp/Settings/Totp.php:94
+msgid ""
+"Be sure to save it somewhere in case you lose or replace your mobile "
+"device.\n"
+"Use your mobile device to scan the QR code below to register this site\n"
+"with your preferred authenticator app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-msgid "Files: shared with me"
+#: ../../addon/totp/Settings/Totp.php:99
+msgid "Test"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-msgid "NEW"
+#: ../../addon/totp/Settings/Totp.php:100
+msgid "Generate New Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1558
-msgid "Size"
+#: ../../addon/totp/Settings/Totp.php:101
+msgid "Go"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
-#: ../../Zotlabs/Storage/Browser.php:380
-msgid "Last Modified"
+#: ../../addon/totp/Settings/Totp.php:102
+msgid "Enter your password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
-msgid "Remove all files"
+#: ../../addon/totp/Settings/Totp.php:103
+msgid "enter TOTP code from your device"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:111
-msgid "Remove this file"
+#: ../../addon/totp/Settings/Totp.php:104
+msgid "Pass!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:137
-msgid "Edit Layout"
+#: ../../addon/totp/Settings/Totp.php:105
+msgid "Fail"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:145
-msgid "Create a new channel"
+#: ../../addon/totp/Settings/Totp.php:106
+msgid "Incorrect password, try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:337
-#: ../../include/nav.php:101
-msgid "Channel Manager"
+#: ../../addon/totp/Settings/Totp.php:107
+msgid "Record your new TOTP secret and rescan the QR code above."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:171
-msgid "Current Channel"
+#: ../../addon/totp/Settings/Totp.php:115
+msgid "TOTP Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
-msgid "Switch to one of your channels by selecting it."
+#: ../../addon/logrot/logrot.php:36
+msgid "Logfile archive directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:174
-msgid "Default Channel"
+#: ../../addon/logrot/logrot.php:36
+msgid "Directory to store rotated logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Make Default"
+#: ../../addon/logrot/logrot.php:37
+msgid "Logfile size in bytes before rotating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:178
-#, php-format
-msgid "%d new messages"
+#: ../../addon/logrot/logrot.php:38
+msgid "Number of logfiles to retain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../addon/testdrive/testdrive.php:104
 #, php-format
-msgid "%d new introductions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:181
-msgid "Delegated Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Follow.php:93
-msgid "Connection added."
+msgid "Your account on %s will expire in a few days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:471 ../../Zotlabs/Module/Pin.php:36
-msgid "Unable to locate original post."
+#: ../../addon/testdrive/testdrive.php:105
+msgid "Your $Productname test account is about to expire."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:757
-msgid "Empty post discarded."
+#: ../../addon/hideaside/Mod_Hideaside.php:23
+#: ../../addon/hideaside/Mod_Hideaside.php:27
+msgid "Hide Aside App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1189
-msgid "Duplicate post suppressed."
+#: ../../addon/hideaside/Mod_Hideaside.php:24
+#: ../../addon/hideaside/Mod_Hideaside.php:28
+msgid "Fade out aside areas after a while when using endless scroll"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1334
-msgid "System error. Post not saved."
+#: ../../addon/skeleton/Mod_Skeleton.php:32
+msgid "Skeleton App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1368
-msgid "Your comment is awaiting approval."
+#: ../../addon/skeleton/Mod_Skeleton.php:33
+msgid "A skeleton for addons, you can copy/paste"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1498
-msgid "Unable to obtain post information from database."
+#: ../../addon/skeleton/Mod_Skeleton.php:40
+msgid "Some setting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1505
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../addon/skeleton/Mod_Skeleton.php:40
+msgid "A setting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1512
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../addon/skeleton/Mod_Skeleton.php:48
+msgid "Skeleton Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:158
-msgid "Website:"
+#: ../../addon/socialauth/Mod_SocialAuth.php:104
+#: ../../addon/socialauth/Mod_SocialAuth.php:176
+msgid "Network error"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:161
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+#: ../../addon/socialauth/Mod_SocialAuth.php:108
+#: ../../addon/socialauth/Mod_SocialAuth.php:180
+msgid "API error"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:162
-msgid "Rating (this information is public)"
+#: ../../addon/socialauth/Mod_SocialAuth.php:112
+#: ../../addon/socialauth/Mod_SocialAuth.php:184
+msgid "Unknown issue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:163
-msgid "Optionally explain your rating (this information is public)"
+#: ../../addon/socialauth/Mod_SocialAuth.php:168
+msgid "Unable to login using email address "
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
-msgid "Invalid item."
+#: ../../addon/socialauth/Mod_SocialAuth.php:202
+msgid "Sign in to Hubzilla using a social account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Display.php:136
-#: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173
-#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Block.php:77
-#: ../../Zotlabs/Web/Router.php:186 ../../Zotlabs/Lib/NativeWikiPage.php:533
-#: ../../include/help.php:132
-msgid "Page not found."
+#: ../../addon/socialauth/Mod_SocialAuth.php:207
+msgid "Social Authentication using your social media account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:173
+#: ../../addon/socialauth/Mod_SocialAuth.php:211
 msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr ""
-
-#: ../../Zotlabs/Module/Xchan.php:10
-msgid "Xchan Lookup"
+"This app enables one or more social provider sign-in buttons on the login "
+"page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Xchan.php:13
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../addon/socialauth/Mod_SocialAuth.php:229
+msgid "Add an identity provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Xchan.php:41 ../../Zotlabs/Module/Mitem.php:134
-#: ../../Zotlabs/Module/Menu.php:232
-msgid "Not found."
+#: ../../addon/socialauth/Mod_SocialAuth.php:256
+msgid "Enable "
 msgstr ""
 
-#: ../../Zotlabs/Module/Achievements.php:38
-msgid "Some blurb about what to do when you're new here"
+#: ../../addon/socialauth/Mod_SocialAuth.php:263
+msgid "Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:128
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../addon/socialauth/Mod_SocialAuth.php:263
+#: ../../addon/socialauth/Mod_SocialAuth.php:268
+#: ../../addon/socialauth/Mod_SocialAuth.php:284
+#: ../../addon/socialauth/Mod_SocialAuth.php:297
+msgid "Word"
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:130
-#, php-format
-msgid "%1$s stopped following %2$s's %3$s"
+#: ../../addon/socialauth/Mod_SocialAuth.php:268
+msgid "Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
+#: ../../addon/socialauth/Mod_SocialAuth.php:297
+msgid "Add a custom provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
+#: ../../addon/socialauth/Mod_SocialAuth.php:317
+msgid "Remove an identity provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:348
-msgid "webpage"
+#: ../../addon/socialauth/Mod_SocialAuth.php:327
+msgid "Social authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:354
-msgid "block"
+#: ../../addon/socialauth/Mod_SocialAuth.php:366
+msgid "Error while saving provider settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:351
-msgid "layout"
+#: ../../addon/socialauth/Mod_SocialAuth.php:382
+msgid "Custom provider already exists"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:357
-msgid "menu"
+#: ../../addon/socialauth/Mod_SocialAuth.php:399
+msgid "Social authentication settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:185
-#, php-format
-msgid "%s element installed"
+#: ../../addon/nsfw/nsfw.php:152
+msgid "Possible adult content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:188
+#: ../../addon/nsfw/nsfw.php:167
 #, php-format
-msgid "%s element installation failed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:25 ../../Zotlabs/Widget/Pubsites.php:12
-msgid "Public Hubs"
+msgid "%s - view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:28
-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."
+#: ../../addon/nsfw/Mod_Nsfw.php:22
+msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Hub URL"
+#: ../../addon/nsfw/Mod_Nsfw.php:33
+msgid "NSFW App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Access Type"
+#: ../../addon/nsfw/Mod_Nsfw.php:34
+msgid "Collapse content that contains predefined words"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Registration Policy"
+#: ../../addon/nsfw/Mod_Nsfw.php:44
+msgid ""
+"This app looks in posts for the words/text you specify below, and collapses "
+"any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Stats"
+#: ../../addon/nsfw/Mod_Nsfw.php:49
+msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Software"
+#: ../../addon/nsfw/Mod_Nsfw.php:49
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:36 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:1133
-msgid "Ratings"
+#: ../../addon/nsfw/Mod_Nsfw.php:58
+msgid "NSFW"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:50
-msgid "Rate"
+#: ../../addon/upload_limits/upload_limits.php:25
+msgid "Show Upload Limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:29 ../../Zotlabs/Module/Channel.php:44
-#: ../../Zotlabs/Module/Ochannel.php:32
-msgid "You must be logged in to see this page."
+#: ../../addon/upload_limits/upload_limits.php:27
+msgid "Hubzilla configured maximum size: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:100
-msgid "Chatrooms App"
+#: ../../addon/upload_limits/upload_limits.php:28
+msgid "PHP upload_max_filesize: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:101
-msgid "Access Controlled Chatrooms"
+#: ../../addon/upload_limits/upload_limits.php:29
+msgid "PHP post_max_size (must be larger than upload_max_filesize): "
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:194
-msgid "Room not found"
+#: ../../addon/tictac/tictac.php:21
+msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:210
-msgid "Leave Room"
+#: ../../addon/tictac/tictac.php:54
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:211
-msgid "Delete Room"
+#: ../../addon/tictac/tictac.php:59
+msgid "New game"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:212
-msgid "I am away right now"
+#: ../../addon/tictac/tictac.php:60
+msgid "New game with handicap"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:213
-msgid "I am online"
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:215
-msgid "Bookmark this room"
+#: ../../addon/tictac/tictac.php:62
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1382
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:134
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:120
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:241
-msgid "Please enter a link URL:"
+#: ../../addon/tictac/tictac.php:64
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841
-#: ../../include/conversation.php:1512
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:255
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:173
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:316
-msgid "Encrypt text"
+#: ../../addon/tictac/tictac.php:183
+msgid "You go first..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:238
-msgid "New Chatroom"
+#: ../../addon/tictac/tictac.php:188
+msgid "I'm going first this time..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:239
-msgid "Chatroom name"
+#: ../../addon/tictac/tictac.php:194
+msgid "You won!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:240
-msgid "Expiration of chats (minutes)"
+#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225
+msgid "\"Cat\" game!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:256
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../addon/tictac/tictac.php:223
+msgid "I won!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:261
-msgid "No chatrooms available"
+#: ../../addon/mailtest/mailtest.php:19
+msgid "Send test email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:265
-msgid "Expiration"
+#: ../../addon/mailtest/mailtest.php:66
+msgid "Mail sent."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:266
-msgid "min"
+#: ../../addon/mailtest/mailtest.php:68
+msgid "Sending of mail failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid "Channel Export App"
+#: ../../addon/mailtest/mailtest.php:77
+msgid "Mail Test"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your channel"
+#: ../../addon/ljpost/Mod_Ljpost.php:38
+msgid "Livejournal Crosspost Connector App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74
-msgid "Export Channel"
+#: ../../addon/ljpost/Mod_Ljpost.php:39
+msgid "Relay public posts to Livejournal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:75
-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."
+#: ../../addon/ljpost/Mod_Ljpost.php:55
+msgid "Livejournal username"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:76
-msgid "Export Content"
+#: ../../addon/ljpost/Mod_Ljpost.php:59
+msgid "Livejournal password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:77
-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."
+#: ../../addon/ljpost/Mod_Ljpost.php:63
+msgid "Post to Livejournal by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:79
-msgid "Export your posts from a given year."
+#: ../../addon/ljpost/Mod_Ljpost.php:67
+msgid "Send wall-to-wall posts to Livejournal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:81
-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."
+#: ../../addon/ljpost/Mod_Ljpost.php:79
+msgid "Livejournal Crosspost Connector"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:82
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+#: ../../addon/ljpost/ljpost.php:49
+msgid "Post to Livejournal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:83
-#, 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>"
+#: ../../addon/ljpost/ljpost.php:127
+msgid "Posted by"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:84
-#, 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)."
+#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2114
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:370
+msgid "Markdown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
+#: ../../addon/mdpost/mdpost.php:42
+msgid "Use markdown for editing posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
+#: ../../addon/hzfiles/hzfiles.php:81
+msgid "Hubzilla File Storage Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
-#, php-format
-msgid "Site Member (%s)"
+#: ../../addon/hzfiles/hzfiles.php:82
+msgid "This will import all your cloud files from another server."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../addon/hzfiles/hzfiles.php:83
+msgid "Hubzilla Server base URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../addon/authchoose/Mod_Authchoose.php:22
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725
-msgid "Password Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
+"Allow magic authentication only to websites of your immediate connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:96
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: ../../addon/authchoose/Mod_Authchoose.php:28
+#: ../../addon/authchoose/Mod_Authchoose.php:33
+msgid "Authchoose App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../addon/authchoose/Mod_Authchoose.php:39
+msgid "Authchoose"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
+#: ../../addon/pageheader/Mod_Pageheader.php:22
+msgid "pageheader Settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:131
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../addon/pageheader/Mod_Pageheader.php:34
+msgid "Page Header App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
+#: ../../addon/pageheader/Mod_Pageheader.php:35
+msgid "Inserts a page header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Vote.php:40
-msgid "Poll not found."
+#: ../../addon/pageheader/Mod_Pageheader.php:43
+msgid "Message to display on every page on this server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Vote.php:71
-msgid "Invalid response."
+#: ../../addon/pageheader/Mod_Pageheader.php:51
+msgid "Page Header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Vote.php:132
-msgid "Response submitted. Updates may not appear instantly."
+#: ../../addon/irc/Mod_Irc.php:23 ../../addon/irc/irc.php:41
+msgid "Popular Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948
-msgid "sent you a private message"
+#: ../../addon/irc/irc.php:37
+msgid "Channels to auto connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914
-msgid "added your channel"
+#: ../../addon/irc/irc.php:37 ../../addon/irc/irc.php:41
+msgid "Comma separated list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:418
-msgid "requires approval"
+#: ../../addon/irc/irc.php:45
+msgid "IRC Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957
-msgid "g A l F d"
+#: ../../addon/irc/irc.php:54
+msgid "IRC settings saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960
-msgid "[today]"
+#: ../../addon/irc/irc.php:58
+msgid "IRC Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:456
-msgid "posted an event"
+#: ../../addon/xmpp/xmpp.php:44
+msgid "Jabber BOSH host"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829
-#: ../../Zotlabs/Lib/Enotify.php:931
-msgid "shared a file with you"
+#: ../../addon/xmpp/xmpp.php:45
+msgid "Use central userbase"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:354 ../../Zotlabs/Module/Channel.php:483
+#: ../../addon/xmpp/xmpp.php:45
 msgid ""
-"You must enable javascript for your browser to be able to view this content."
-msgstr ""
-
-#: ../../Zotlabs/Module/Display.php:372
-msgid "Article"
-msgstr ""
-
-#: ../../Zotlabs/Module/Display.php:417
-msgid "Item has been removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:96
-#: ../../Zotlabs/Module/Admin/Accounts.php:308
-#: ../../Zotlabs/Module/Admin/Accounts.php:327
-#: ../../Zotlabs/Widget/Admin.php:23
-msgid "Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "Blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:98
-msgid "Expired accounts"
+"If enabled, members will automatically login to an ejabberd server that has "
+"to be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:99
-msgid "Expiring accounts"
+#: ../../addon/xmpp/Mod_Xmpp.php:23
+msgid "XMPP settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:117
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Widget/Admin.php:24
-msgid "Channels"
+#: ../../addon/xmpp/Mod_Xmpp.php:35
+msgid "XMPP App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:123
-msgid "Message queues"
+#: ../../addon/xmpp/Mod_Xmpp.php:36
+msgid "Embedded XMPP (Jabber) client"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:137
-msgid "Your software should be updated"
+#: ../../addon/xmpp/Mod_Xmpp.php:52
+msgid "Individual credentials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:141 ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Security.php:98
-#: ../../Zotlabs/Module/Admin/Accounts.php:307
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Addons.php:342
-#: ../../Zotlabs/Module/Admin/Addons.php:440
-#: ../../Zotlabs/Module/Admin/Site.php:408
-msgid "Administration"
+#: ../../addon/xmpp/Mod_Xmpp.php:58
+msgid "Jabber BOSH server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Summary"
+#: ../../addon/xmpp/Mod_Xmpp.php:67
+msgid "XMPP Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Registered accounts"
+#: ../../include/text.php:523
+msgid "prev"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Pending registrations"
+#: ../../include/text.php:525
+msgid "first"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Registered channels"
+#: ../../include/text.php:554
+msgid "last"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:148
-msgid "Active addons"
+#: ../../include/text.php:557
+msgid "next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:149
-msgid "Version"
+#: ../../include/text.php:575
+msgid "older"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:150
-msgid "Repository version (master)"
+#: ../../include/text.php:577
+msgid "newer"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:151
-msgid "Repository version (dev)"
+#: ../../include/text.php:1018
+msgid "No connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:80
-msgid "Page owner information could not be retrieved."
+#: ../../include/text.php:1030 ../../include/features.php:133
+#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:334
+msgid "Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
-msgid "Album not found."
+#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:80
+#: ../../Zotlabs/Module/Connections.php:289
+msgid "Accepts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:105
-msgid "Delete Album"
+#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Zotlabs/Module/Connections.php:292
+msgid "Comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
+#: ../../include/text.php:1046 ../../Zotlabs/Module/Viewconnections.php:88
+#: ../../Zotlabs/Module/Connections.php:297
+msgid "Stream items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:530
-msgid "No photos selected"
+#: ../../include/text.php:1051 ../../Zotlabs/Module/Viewconnections.php:93
+#: ../../Zotlabs/Module/Connections.php:302
+msgid "Wall posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:579
-msgid "Access to this item is restricted."
+#: ../../include/text.php:1055 ../../Zotlabs/Module/Viewconnections.php:97
+#: ../../Zotlabs/Module/Connections.php:306
+msgid "Nothing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:622
+#: ../../include/text.php:1070
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:625
+#: ../../include/text.php:1133
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Upload Photos"
+msgid "Network: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:671
-msgid "Enter an album name"
+#: ../../include/text.php:1144 ../../include/text.php:1156
+#: ../../include/nav.php:194 ../../include/acl_selectors.php:149
+#: ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Zotlabs/Widget/Activity_filter.php:203
+#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:379
+#: ../../Zotlabs/Lib/Apps.php:354
+msgid "Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:672
-msgid "or select an existing album (doubleclick)"
+#: ../../include/text.php:1236 ../../include/text.php:1240
+msgid "poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:673
-msgid "Create a status post for this upload"
+#: ../../include/text.php:1236 ../../include/text.php:1240
+#: ../../include/conversation.php:267
+msgid "poked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:675
-msgid "Description (optional)"
+#: ../../include/text.php:1241
+msgid "ping"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:761
-msgid "Show Newest First"
+#: ../../include/text.php:1241
+msgid "pinged"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:763
-msgid "Show Oldest First"
+#: ../../include/text.php:1242
+msgid "prod"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1333
-#: ../../Zotlabs/Module/Embedphotos.php:171
-#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
-msgid "View Photo"
+#: ../../include/text.php:1242
+msgid "prodded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1255
-#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1112
-#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1552
-#: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:268
-#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1214
-#: ../../include/cdav.php:158 ../../include/cdav.php:159
-#: ../../include/cdav.php:167
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1189
-msgid "Unknown"
+#: ../../include/text.php:1243
+msgid "slap"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:818 ../../Zotlabs/Module/Embedphotos.php:187
-#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95
-msgid "Edit Album"
+#: ../../include/text.php:1243
+msgid "slapped"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364
-msgid "Add Photos"
+#: ../../include/text.php:1244
+msgid "finger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:868
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../include/text.php:1244
+msgid "fingered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Photo not available"
+#: ../../include/text.php:1245
+msgid "rebuff"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:928
-msgid "Use as profile photo"
+#: ../../include/text.php:1245
+msgid "rebuffed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:929
-msgid "Use as cover photo"
+#: ../../include/text.php:1268
+msgid "happy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:936
-msgid "Private Photo"
+#: ../../include/text.php:1269
+msgid "sad"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:951
-msgid "View Full Size"
+#: ../../include/text.php:1270
+msgid "mellow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1033
-msgid "Edit photo"
+#: ../../include/text.php:1271
+msgid "tired"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CW (right)"
+#: ../../include/text.php:1272
+msgid "perky"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CCW (left)"
+#: ../../include/text.php:1273
+msgid "angry"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Move photo to album"
+#: ../../include/text.php:1274
+msgid "stupefied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
+#: ../../include/text.php:1275
+msgid "puzzled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
+#: ../../include/text.php:1276
+msgid "interested"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
+#: ../../include/text.php:1277
+msgid "bitter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../include/text.php:1278
+msgid "cheerful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
+#: ../../include/text.php:1279
+msgid "alive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
-msgid "I like this (toggle)"
+#: ../../include/text.php:1280
+msgid "annoyed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
-msgid "I don't like this (toggle)"
+#: ../../include/text.php:1281
+msgid "anxious"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:503
-#: ../../include/conversation.php:830
-msgid "Please wait"
+#: ../../include/text.php:1282
+msgid "cranky"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:824
-msgid "This is you"
+#: ../../include/text.php:1283
+msgid "disturbed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Lib/ThreadItem.php:826 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../include/text.php:1284
+msgid "frustrated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:652
-msgctxt "title"
-msgid "Likes"
+#: ../../include/text.php:1285
+msgid "depressed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:653
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/text.php:1286
+msgid "motivated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:77
-#: ../../include/conversation.php:654
-msgctxt "title"
-msgid "Agree"
+#: ../../include/text.php:1287
+msgid "relaxed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:78
-#: ../../include/conversation.php:655
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/text.php:1288
+msgid "surprised"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:79
-#: ../../include/conversation.php:656
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/text.php:1476 ../../include/js_strings.php:99
+msgid "Monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:66
-#: ../../include/conversation.php:657
-msgctxt "title"
-msgid "Attending"
+#: ../../include/text.php:1476 ../../include/js_strings.php:100
+msgid "Tuesday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:67
-#: ../../include/conversation.php:658
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/text.php:1476 ../../include/js_strings.php:101
+msgid "Wednesday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:68
-#: ../../include/conversation.php:659
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/text.php:1476 ../../include/js_strings.php:102
+msgid "Thursday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
-msgid "View all"
+#: ../../include/text.php:1476 ../../include/js_strings.php:103
+msgid "Friday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243
-#: ../../include/conversation.php:1752 ../../include/channel.php:1809
-#: ../../include/taxonomy.php:670
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248
-#: ../../include/conversation.php:1755
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1247
-msgid "Photo Tools"
+#: ../../include/text.php:1476 ../../include/js_strings.php:104
+msgid "Saturday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1256
-msgid "In This Photo:"
+#: ../../include/text.php:1476 ../../include/js_strings.php:98
+msgid "Sunday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1261
-msgid "Map"
+#: ../../include/text.php:1480 ../../include/js_strings.php:74
+msgid "January"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:491
-msgctxt "noun"
-msgid "Likes"
+#: ../../include/text.php:1480 ../../include/js_strings.php:75
+msgid "February"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:492
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../include/text.php:1480 ../../include/js_strings.php:76
+msgid "March"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Storage/Browser.php:411
-#: ../../Zotlabs/Lib/ThreadItem.php:497 ../../Zotlabs/Widget/Pinned.php:158
-#: ../../include/acl_selectors.php:156
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:233
-msgid "Close"
+#: ../../include/text.php:1480 ../../include/js_strings.php:77
+msgid "April"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362 ../../include/photos.php:667
-msgid "Recent Photos"
+#: ../../include/text.php:1480
+msgid "May"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Profile.php:62
-#: ../../Zotlabs/Module/Hcard.php:37
-msgid "Posts and comments"
+#: ../../include/text.php:1480 ../../include/js_strings.php:79
+msgid "June"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Profile.php:69
-#: ../../Zotlabs/Module/Hcard.php:44
-msgid "Only posts"
+#: ../../include/text.php:1480 ../../include/js_strings.php:80
+msgid "July"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:206
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../include/text.php:1480 ../../include/js_strings.php:81
+msgid "August"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:221 ../../Zotlabs/Module/Network.php:168
-msgid "Search Results For:"
+#: ../../include/text.php:1480 ../../include/js_strings.php:82
+msgid "September"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:51
-msgid "Cards App"
+#: ../../include/text.php:1480 ../../include/js_strings.php:83
+msgid "October"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:52
-msgid "Create personal planning cards"
+#: ../../include/text.php:1480 ../../include/js_strings.php:84
+msgid "November"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:112
-msgid "Add Card"
+#: ../../include/text.php:1480 ../../include/js_strings.php:85
+msgid "December"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:326
-#: ../../include/nav.php:501
-msgid "Cards"
+#: ../../include/text.php:1538
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:21
-msgid "This page is available only to site members"
+#: ../../include/text.php:1540 ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:379
+msgid "Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:27
-msgid "Welcome"
+#: ../../include/text.php:1540 ../../include/feedutils.php:874
+msgid "unknown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:29
-msgid "What would you like to do?"
+#: ../../include/text.php:1581
+msgid "remove category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:31
-msgid ""
-"Please bookmark this page if you would like to return to it in the future"
+#: ../../include/text.php:1658
+msgid "remove from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:35
-msgid "Upload a profile photo"
+#: ../../include/text.php:1912
+msgid "Poll has ended."
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:36
-msgid "Upload a cover photo"
+#: ../../include/text.php:1915
+#, php-format
+msgid "Poll ends: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:37
-msgid "Edit your default profile"
+#: ../../include/text.php:1920 ../../Zotlabs/Lib/ThreadItem.php:446
+msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:41
-msgid "View friend suggestions"
+#: ../../include/text.php:2072
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:39
-msgid "View the channel directory"
+#: ../../include/text.php:2094 ../../include/language.php:428
+msgid "default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:40
-msgid "View/edit your channel settings"
+#: ../../include/text.php:2102
+msgid "Page layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:41
-msgid "View the site or project documentation"
+#: ../../include/text.php:2102
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:42
-msgid "Visit your channel homepage"
+#: ../../include/text.php:2112 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:370
+msgid "BBcode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:43
-msgid ""
-"View your connections and/or add somebody whose address you already know"
+#: ../../include/text.php:2113
+msgid "HTML"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:44
-msgid ""
-"View your personal stream (this may be empty until you add some connections)"
+#: ../../include/text.php:2115 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
+msgid "Text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:52
-msgid "View the public stream. Warning: this content is not moderated"
+#: ../../include/text.php:2116
+msgid "Comanche Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:58
-#: ../../Zotlabs/Module/Connections.php:116
-#: ../../Zotlabs/Module/Connections.php:274
-msgid "Active"
+#: ../../include/text.php:2121
+msgid "PHP"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:63
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:279
-msgid "Blocked"
+#: ../../include/text.php:2130
+msgid "Page content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:68
-#: ../../Zotlabs/Module/Connections.php:189
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Ignored"
+#: ../../include/text.php:2253 ../../include/event.php:1259
+#: ../../include/conversation.php:132
+#: ../../Zotlabs/Module/Channel_calendar.php:221
+#: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75
+msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:73
-#: ../../Zotlabs/Module/Connections.php:203
-#: ../../Zotlabs/Module/Connections.php:277
-msgid "Hidden"
+#: ../../include/text.php:2256 ../../include/conversation.php:158
+#: ../../include/bbcode.php:555 ../../include/markdown.php:205
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3245
+msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:78
-#: ../../Zotlabs/Module/Connections.php:196
-msgid "Archived/Unreachable"
+#: ../../include/text.php:2258 ../../include/conversation.php:160
+#: ../../Zotlabs/Module/Tagger.php:81
+msgid "comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:83
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Notifications.php:53 ../../Zotlabs/Module/Menu.php:180
-msgid "New"
+#: ../../include/text.php:2263
+msgid "activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:158
-msgid "Active Connections"
+#: ../../include/text.php:2266
+msgid "poll"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:161
-msgid "Show active connections"
+#: ../../include/text.php:2379
+msgid "a-z, 0-9, -, and _ only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:165
-#: ../../Zotlabs/Widget/Notifications.php:104
-msgid "New Connections"
+#: ../../include/text.php:2684
+msgid "Design Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:168
-msgid "Show pending (new) connections"
+#: ../../include/text.php:2687 ../../Zotlabs/Module/Blocks.php:154
+msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show blocked connections"
+#: ../../include/text.php:2688 ../../Zotlabs/Module/Menu.php:171
+msgid "Menus"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:192
-msgid "Only show ignored connections"
+#: ../../include/text.php:2689 ../../Zotlabs/Module/Layouts.php:184
+msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:199
-msgid "Only show archived/unreachable connections"
+#: ../../include/text.php:2690
+msgid "Pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:206
-msgid "Only show hidden connections"
+#: ../../include/text.php:2702
+msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:221
-msgid "Show all connections"
+#: ../../include/text.php:2703
+msgid "Import website..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Pending approval"
+#: ../../include/text.php:2704
+msgid "Select folder to import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:276
-msgid "Archived"
+#: ../../include/text.php:2705
+msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Not connected at this location"
+#: ../../include/text.php:2706
+msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:319
-#, php-format
-msgid "%1$s [%2$s]"
+#: ../../include/text.php:2707
+msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:320
-msgid "Edit connection"
+#: ../../include/text.php:2708
+msgid "Enter path to website files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:322
-msgid "Delete connection"
+#: ../../include/text.php:2709
+msgid "Select folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:331
-msgid "Channel address"
+#: ../../include/text.php:2710
+msgid "Export website..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:333 ../../include/features.php:290
-msgid "Network"
+#: ../../include/text.php:2711
+msgid "Export to a zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:336
-msgid "Call"
+#: ../../include/text.php:2712
+msgid "website.zip"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:338
-msgid "Status"
+#: ../../include/text.php:2713
+msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:340
-msgid "Connected"
+#: ../../include/text.php:2714
+msgid "Export to cloud files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:342
-msgid "Approve connection"
+#: ../../include/text.php:2715
+msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:343
-#: ../../Zotlabs/Module/Admin/Accounts.php:318
-#: ../../include/conversation.php:776
-msgid "Approve"
+#: ../../include/text.php:2716
+msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:344
-msgid "Ignore connection"
+#: ../../include/text.php:2717
+msgid "Specify folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:346
-msgid "Recent activity"
+#: ../../include/opengraph.php:56
+#, php-format
+msgid "This is the home page of %s."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
-#: ../../Zotlabs/Module/Directory.php:370 ../../Zotlabs/Widget/Follow.php:32
-#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1103
-#: ../../include/channel.php:1646 ../../include/connections.php:110
-msgid "Connect"
+#: ../../include/event.php:33 ../../include/event.php:110
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:352
-msgid "Connect at this location"
+#: ../../include/event.php:41
+msgid "Starts:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333
-#: ../../include/features.php:133 ../../include/text.php:1030
-msgid "Connections"
+#: ../../include/event.php:51
+msgid "Finishes:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:380
-msgid "Search your connections"
+#: ../../include/event.php:63 ../../include/event.php:134
+#: ../../include/channel.php:1581 ../../Zotlabs/Module/Directory.php:353
+msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:381
-msgid "Connections search"
+#: ../../include/event.php:110
+msgid "l F d, Y"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:382
-#: ../../Zotlabs/Module/Directory.php:433
-#: ../../Zotlabs/Module/Directory.php:438 ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../include/event.php:114
+msgid "Start:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
-msgid "Item is not editable"
+#: ../../include/event.php:118
+msgid "End:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
+#: ../../include/event.php:1106
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
+#: ../../include/event.php:1337
+msgid "Not specified"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
+#: ../../include/event.php:1338
+msgid "Needs Action"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:35
-msgid "Affinity Tool settings updated."
+#: ../../include/event.php:1339
+msgid "Completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:47
-msgid ""
-"This app presents a slider control in your connection editor and also on "
-"your network page. The slider represents your degree of friendship "
-"(affinity) with each connection. It allows you to zoom in or out and display "
-"conversations from only your closest friends or everybody in your stream."
+#: ../../include/event.php:1340
+msgid "In Process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:52
-msgid "Affinity Tool App"
+#: ../../include/event.php:1341
+msgid "Cancelled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:57
-msgid ""
-"The numbers below represent the minimum and maximum slider default positions "
-"for your network/stream page as a percentage."
+#: ../../include/event.php:1422 ../../include/connections.php:734
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Connedit.php:917
+msgid "Mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:64
-msgid "Default maximum affinity level"
+#: ../../include/event.php:1423 ../../include/connections.php:735
+#: ../../Zotlabs/Widget/Notifications.php:36 ../../Zotlabs/Module/Cdav.php:1384
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:918
+msgid "Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:64
-msgid "0-99 default 99"
+#: ../../include/event.php:1424 ../../include/connections.php:736
+msgid "Home, Voice"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:70
-msgid "Default minimum affinity level"
+#: ../../include/event.php:1425 ../../include/connections.php:737
+msgid "Home, Fax"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:70
-msgid "0-99 - default 0"
+#: ../../include/event.php:1426 ../../include/connections.php:738
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:795
+#: ../../Zotlabs/Module/Connedit.php:919
+msgid "Work"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:76
-msgid "Persistent affinity levels"
+#: ../../include/event.php:1427 ../../include/connections.php:739
+msgid "Work, Voice"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:76
-msgid ""
-"If disabled the max and min levels will be reset to default after page reload"
+#: ../../include/event.php:1428 ../../include/connections.php:740
+msgid "Work, Fax"
 msgstr ""
 
-#: ../../Zotlabs/Module/Affinity.php:84
-msgid "Affinity Tool Settings"
+#: ../../include/event.php:1429 ../../include/event.php:1436
+#: ../../include/selectors.php:60 ../../include/selectors.php:77
+#: ../../include/selectors.php:115 ../../include/selectors.php:151
+#: ../../include/connections.php:741 ../../include/connections.php:748
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:796
+#: ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Access/PermissionRoles.php:310
+msgid "Other"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:45
-msgid "No connections in common."
+#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:65
-msgid "View Common Connections"
+#: ../../include/features.php:82 ../../include/nav.php:463
+#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:347
+msgid "Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186
-#, php-format
-msgid "&#x1f501; Repeated %1$s's %2$s"
+#: ../../include/features.php:86
+msgid "Start calendar week on Monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Share.php:120
-msgid "Post repeated"
+#: ../../include/features.php:87
+msgid "Default is Sunday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
-msgid "Page link"
+#: ../../include/features.php:94
+msgid "Event Timezone Selection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
-msgid "Edit Webpage"
+#: ../../include/features.php:95
+msgid "Allow event creation in timezones other than your own."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile.php:106
-msgid "vcard"
+#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:344
+msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Article_edit.php:128
-msgid "Edit Article"
+#: ../../include/features.php:108
+msgid "Search by Date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:46
-msgid "Authentication failed."
+#: ../../include/features.php:109
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2625
-#: ../../boot.php:1717
-msgid "Remote Authentication"
+#: ../../include/features.php:116
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2626
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../include/features.php:117
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2627
-msgid "Authenticate"
+#: ../../include/features.php:124 ../../include/features.php:358
+msgid "Use blog/list mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Attach.php:68
-msgid "Item not available."
+#: ../../include/features.php:125 ../../include/features.php:359
+msgid "Comments will be displayed separately"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
-msgid "This setting requires special processing and editing has been blocked."
+#: ../../include/features.php:137
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:57
-msgid "Configuration Editor"
+#: ../../include/features.php:138
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:58
-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."
+#: ../../include/features.php:146
+msgid "Conversation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Randprof.php:29
-msgid "Random Channel App"
+#: ../../include/features.php:158
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Randprof.php:30
-msgid "Visit a random channel in the $Projectname network"
+#: ../../include/features.php:159
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
+#: ../../include/features.php:166
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
+#: ../../include/features.php:167
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-#: ../../Zotlabs/Module/Admin/Addons.php:311
-msgid "Disable"
+#: ../../include/features.php:174
+msgid "Star Posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-#: ../../Zotlabs/Module/Admin/Addons.php:314
-msgid "Enable"
+#: ../../include/features.php:175
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
+#: ../../include/features.php:182
+msgid "Reply on comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
-msgid "Themes"
+#: ../../include/features.php:183
+msgid "Ability to reply on selected comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-#: ../../Zotlabs/Module/Admin/Addons.php:344
-msgid "Toggle"
+#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:348
+msgid "Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339
-#: ../../Zotlabs/Widget/Settings_menu.php:61
-#: ../../Zotlabs/Widget/Newmember.php:53 ../../include/nav.php:106
-msgid "Settings"
+#: ../../include/features.php:196
+msgid "Advanced Directory Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-#: ../../Zotlabs/Module/Admin/Addons.php:352
-msgid "Author: "
+#: ../../include/features.php:197
+msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-#: ../../Zotlabs/Module/Admin/Addons.php:353
-msgid "Maintainer: "
+#: ../../include/features.php:206
+msgid "Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
+#: ../../include/features.php:210
+msgid "Post Categories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
-msgid "[Unsupported]"
+#: ../../include/features.php:211
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
+#: ../../include/features.php:218
+msgid "Large Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../include/features.php:219
 msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+#: ../../include/features.php:226
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
+#: ../../include/features.php:227
 msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:99 ../../Zotlabs/Widget/Admin.php:25
-msgid "Security"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:101
-msgid "Block public"
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
+#: ../../include/features.php:234
+msgid "Disable Comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid "Provide a cloud root directory"
+#: ../../include/features.php:235
+msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid ""
-"The cloud root directory lists all channel names which provide public files"
+#: ../../include/features.php:242
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:103
-msgid "Show total disk space available to cloud uploads"
+#: ../../include/features.php:243
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
-msgid "Set \"Transport Security\" HTTP header"
+#: ../../include/features.php:250
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:105
-msgid "Set \"Content Security Policy\" HTTP header"
+#: ../../include/features.php:251
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
-msgid "Allowed email domains"
+#: ../../include/features.php:258
+msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
+#: ../../include/features.php:259
 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"
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
-msgid "Not allowed email domains"
+#: ../../include/features.php:266
+msgid "Auto-save drafts of posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
+#: ../../include/features.php:267
 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."
+"Automatically saves post and comment drafts in local browser storage to help "
+"prevent accidental loss of compositions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
-msgid "Allow communications only from these sites"
+#: ../../include/features.php:276
+msgid "Manage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
+#: ../../include/features.php:280
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:109
-msgid "Block communications from these sites"
+#: ../../include/features.php:281
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:110
-msgid "Allow communications only from these channels"
+#: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:16
+#: ../../Zotlabs/Module/Connections.php:333
+msgid "Network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:110
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
+#: ../../include/features.php:294
+msgid "Events Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:111
-msgid "Block communications from these channels"
+#: ../../include/features.php:295
+msgid "Ability to display only events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:112
-msgid "Only allow embeds from secure (SSL) websites and links."
+#: ../../include/features.php:302
+msgid "Polls Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "Allow unfiltered embedded HTML content only from these domains"
+#: ../../include/features.php:303
+msgid "Ability to display only polls"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "One site per line. By default embedded content is filtered."
+#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:83
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:114
-msgid "Block embedded HTML from these domains"
+#: ../../include/features.php:311
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "Allow SVG thumbnails in file browser"
+#: ../../include/features.php:318 ../../include/contact_widgets.php:53
+#: ../../Zotlabs/Widget/Activity_filter.php:189
+#: ../../Zotlabs/Widget/Filer.php:28
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "WARNING: SVG images may contain malicious code."
+#: ../../include/features.php:319
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:116
-msgid "Allow embedded (inline) PDF files"
+#: ../../include/features.php:326
+msgid "Alternate Stream Order"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:128
-#, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:135
-#, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Account not found"
+#: ../../include/features.php:327
+msgid ""
+"Ability to order the stream by last post date, last comment date or "
+"unthreaded activities"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2785
-#, php-format
-msgid "Account '%s' deleted"
+#: ../../include/features.php:334
+msgid "Contact Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:192
-#, php-format
-msgid "Account '%s' blocked"
+#: ../../include/features.php:335
+msgid "Ability to display only posts of a selected contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:200
-#, php-format
-msgid "Account '%s' unblocked"
+#: ../../include/features.php:342
+msgid "Forum Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:240
-msgid "Unverified"
+#: ../../include/features.php:343
+msgid "Ability to display only posts of a specific forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:243
-msgid "Expired"
+#: ../../include/features.php:350
+msgid "Personal Posts Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show verified registrations"
+#: ../../include/features.php:351
+msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show all registrations"
+#: ../../include/features.php:368 ../../include/nav.php:444
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:346
+msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:312
-msgid "Select toggle"
+#: ../../include/features.php:372
+msgid "Photo Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:313
-msgid "Deny selected"
+#: ../../include/features.php:373
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:314
-msgid "Approve selected"
+#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:364
+msgid "Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "All registrations"
+#: ../../include/features.php:386
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "Verified registrations waiting for approval"
+#: ../../include/features.php:387
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Request date"
+#: ../../include/features.php:394
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Requests"
+#: ../../include/features.php:395
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No registrations available"
+#: ../../include/features.php:402
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No verified registrations available"
+#: ../../include/features.php:403
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:323
-msgid "Verified"
+#: ../../include/security.php:607
+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 ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:324
-msgid "Not yet verified"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:329
-msgid "ID"
+#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1097
+#: ../../Zotlabs/Module/Photos.php:1213 ../../Zotlabs/Lib/ThreadItem.php:826
+msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:331
-msgid "All channels"
+#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:535
+#, php-format
+msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:332
-msgid "Register date"
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:333
-msgid "Last login"
+#: ../../include/js_strings.php:9
+#, php-format
+msgid "%s expand"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:334
-msgid "Expires"
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:335
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Service class"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:337
-msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
-"on this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:161
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:338
-msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../include/js_strings.php:13
+msgid "everybody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:347
-#: ../../include/conversation.php:1123
-msgid "Message"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
-msgid "Off"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
-msgid "On"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#, php-format
-msgid "Lock feature %s"
+#: ../../include/js_strings.php:17
+msgid "close all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
+#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Connedit.php:872
+msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
+#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Profiles.php:511
+#: ../../Zotlabs/Module/Profiles.php:735 ../../Zotlabs/Module/Locs.php:126
+msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
+#: ../../include/js_strings.php:26
+msgid "lovely"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Update has been marked successful"
+#: ../../include/js_strings.php:27
+msgid "wonderful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Verification of update %s failed. Check system logs."
+#: ../../include/js_strings.php:28
+msgid "fantastic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:35
-#: ../../Zotlabs/Module/Admin/Dbsync.php:74
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../include/js_strings.php:29
+msgid "great"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
-#, php-format
-msgid "Verifying update %s did not return a status. Unknown if it succeeded."
+#: ../../include/js_strings.php:30
+msgid ""
+"Your chosen nickname was either already taken or not valid. Please use our "
+"suggestion ("
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:42
-#, php-format
-msgid "Update %s does not contain a verification function."
+#: ../../include/js_strings.php:31
+msgid ") or enter a new one."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:46
-#: ../../Zotlabs/Module/Admin/Dbsync.php:81
-#, php-format
-msgid "Update function %s could not be found."
+#: ../../include/js_strings.php:32
+msgid "Thank you, this nickname is valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:71
-#, php-format
-msgid "Executing update procedure %s failed. Check system logs."
+#: ../../include/js_strings.php:33
+msgid "A channel name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:78
-#, php-format
-msgid ""
-"Update %s did not return a status. It cannot be determined if it was "
-"successful."
+#: ../../include/js_strings.php:34
+msgid "This is a "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:99
-msgid "Failed Updates"
+#: ../../include/js_strings.php:35
+msgid " channel name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:101
-msgid "Mark success (if update was manually applied)"
+#: ../../include/js_strings.php:36
+msgid "Back to reply"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:102
-msgid "Attempt to verify this update if a verification procedure exists"
+#: ../../include/js_strings.php:37
+msgid "Pinned"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:103
-msgid "Attempt to execute this update step automatically"
+#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:473
+msgid "Pin to the top"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:108
-msgid "No failed updates."
+#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155
+#: ../../Zotlabs/Lib/ThreadItem.php:473
+msgid "Unpin from the top"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../include/js_strings.php:45
 #, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
+msgid "%d minutes"
+msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../include/js_strings.php:46
 #, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
+msgid "about %d hours"
+msgid_plural "about %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../include/js_strings.php:47
 #, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
+msgid "%d days"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
-msgid "Channel not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:75
-#, php-format
-msgid "Channel '%s' deleted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' censored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../include/js_strings.php:48
 #, php-format
-msgid "Channel '%s' uncensored"
-msgstr ""
+msgid "%d months"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../include/js_strings.php:49
 #, php-format
-msgid "Channel '%s' code allowed"
-msgstr ""
+msgid "%d years"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code disallowed"
+#: ../../include/js_strings.php:54
+msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
+#: ../../include/js_strings.php:55
+msgid "timeago.prefixFromNow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-#: ../../Zotlabs/Module/Directory.php:362
-msgid "Censor"
+#: ../../include/js_strings.php:56
+msgid "timeago.suffixAgo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
-#: ../../Zotlabs/Module/Directory.php:362
-msgid "Uncensor"
+#: ../../include/js_strings.php:57
+msgid "timeago.suffixFromNow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow Code"
+#: ../../include/js_strings.php:60
+msgid "less than a minute"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
-msgid "Disallow Code"
+#: ../../include/js_strings.php:61
+msgid "about a minute"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421
-msgid "Channel"
+#: ../../include/js_strings.php:63
+msgid "about an hour"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
+#: ../../include/js_strings.php:65
+msgid "a day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
-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?"
+#: ../../include/js_strings.php:67
+msgid "about a month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
-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?"
+#: ../../include/js_strings.php:69
+msgid "about a year"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
+#: ../../include/js_strings.php:71
+msgid " "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
-msgid "Logs"
+#: ../../include/js_strings.php:72
+msgid "timeago.numbers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
+#: ../../include/js_strings.php:78
+msgctxt "long"
+msgid "May"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
+#: ../../include/js_strings.php:86
+msgid "Jan"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
+#: ../../include/js_strings.php:87
+msgid "Feb"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
+#: ../../include/js_strings.php:88
+msgid "Mar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
+#: ../../include/js_strings.php:89
+msgid "Apr"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
+#: ../../include/js_strings.php:90
+msgctxt "short"
+msgid "May"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
+#: ../../include/js_strings.php:91
+msgid "Jun"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
+#: ../../include/js_strings.php:92
+msgid "Jul"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
+#: ../../include/js_strings.php:93
+msgid "Aug"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
+#: ../../include/js_strings.php:94
+msgid "Sep"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
+#: ../../include/js_strings.php:95
+msgid "Oct"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Account language (for emails)"
+#: ../../include/js_strings.php:96
+msgid "Nov"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:290
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../include/js_strings.php:97
+msgid "Dec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:295
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../include/js_strings.php:105
+msgid "Sun"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:343
-#: ../../Zotlabs/Module/Admin/Addons.php:441 ../../Zotlabs/Widget/Admin.php:27
-msgid "Addons"
+#: ../../include/js_strings.php:106
+msgid "Mon"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
-msgid "Minimum project version: "
+#: ../../include/js_strings.php:107
+msgid "Tue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
-msgid "Maximum project version: "
+#: ../../include/js_strings.php:108
+msgid "Wed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
-msgid "Minimum PHP version: "
+#: ../../include/js_strings.php:109
+msgid "Thu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:357
-msgid "Compatible Server Roles: "
+#: ../../include/js_strings.php:110
+msgid "Fri"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:358
-msgid "Requires: "
+#: ../../include/js_strings.php:111
+msgid "Sat"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:359
-#: ../../Zotlabs/Module/Admin/Addons.php:446
-msgid "Disabled - version incompatibility"
+#: ../../include/js_strings.php:112
+msgctxt "calendar"
+msgid "today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:415
-msgid "Enter the public git repository URL of the addon repo."
+#: ../../include/js_strings.php:113
+msgctxt "calendar"
+msgid "month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:416
-msgid "Addon repo git URL"
+#: ../../include/js_strings.php:114
+msgctxt "calendar"
+msgid "week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "Custom repo name"
+#: ../../include/js_strings.php:115
+msgctxt "calendar"
+msgid "day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "(optional)"
+#: ../../include/js_strings.php:116
+msgctxt "calendar"
+msgid "All day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:418
-msgid "Download Addon Repo"
+#: ../../include/js_strings.php:119
+msgid "Please stand by while your download is being prepared."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:425
-msgid "Install new repo"
+#: ../../include/js_strings.php:122
+msgid "Email address not valid"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:536
-msgid "Install"
+#: ../../include/help.php:81
+msgid "Help:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:449
-msgid "Manage Repos"
+#: ../../include/help.php:118 ../../include/help.php:126
+#: ../../include/nav.php:180 ../../include/nav.php:320
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:349
+msgid "Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:450
-msgid "Installed Addon Repositories"
+#: ../../include/help.php:130
+msgid "Not Found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:451
-msgid "Install a New Addon Repository"
+#: ../../include/help.php:133 ../../Zotlabs/Module/Display.php:136
+#: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173
+#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Page.php:136
+#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:533
+#: ../../Zotlabs/Web/Router.php:186
+msgid "Page not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Addons.php:458
-msgid "Switch branch"
+#: ../../include/photos.php:154
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:112
-msgid "Invalid input"
+#: ../../include/photos.php:165
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:132
-msgid "Errors"
+#: ../../include/photos.php:199 ../../Zotlabs/Module/Profile_photo.php:261
+#: ../../Zotlabs/Module/Cover_photo.php:241
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:225
-msgid "Site settings updated."
+#: ../../include/photos.php:327
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3395
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:335
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:359
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:435
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:459
-#: ../../view/theme/redbasic/php/config.php:15
-msgid "Default"
+#: ../../include/photos.php:376
+msgid "a new photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:262
-#: ../../Zotlabs/Module/Settings/Display.php:118
+#: ../../include/photos.php:380
 #, php-format
-msgid "%s - (Incompatible)"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
-msgid "mobile"
+#: ../../include/photos.php:715 ../../include/nav.php:447
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:271
-msgid "experimental"
+#: ../../include/photos.php:716 ../../Zotlabs/Module/Photos.php:1346
+#: ../../Zotlabs/Module/Photos.php:1359 ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
-msgid "unsupported"
+#: ../../include/photos.php:720
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
-msgid "Yes - with approval"
+#: ../../include/network.php:1737 ../../include/network.php:1738
+msgid "Friendica"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
-msgid "My site is not a public server"
+#: ../../include/network.php:1739
+msgid "OStatus"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
-msgid "My site has paid access only"
+#: ../../include/network.php:1740
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
-msgid "My site has free access only"
+#: ../../include/network.php:1741
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
-msgid "My site offers free accounts with optional paid upgrades"
+#: ../../include/network.php:1744
+msgid "Diaspora"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid "Default permission role for new accounts"
+#: ../../include/network.php:1745
+msgid "Facebook"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid ""
-"This role will be used for the first channel created after registration."
+#: ../../include/network.php:1746
+msgid "Zot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
-msgid "Minute(s)"
+#: ../../include/network.php:1747
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399
-msgid "Hour(s)"
+#: ../../include/network.php:1748
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400
-msgid "Day(s)"
+#: ../../include/network.php:1749
+msgid "MySpace"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
-msgid "Week(s)"
+#: ../../include/activities.php:42
+msgid " and "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:357
-msgid "Month(s)"
+#: ../../include/activities.php:50
+msgid "public profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
-msgid "Year(s)"
+#: ../../include/activities.php:59
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
-msgid "Register verification delay"
+#: ../../include/activities.php:60
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
-msgid "Time to wait before a registration can be verified"
+#: ../../include/activities.php:63
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:372
-#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
-msgid "duration up from now"
-msgstr ""
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:388
-msgid "Register verification expiration time"
+#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145
+#: ../../Zotlabs/Module/Admin/Site.php:416
+msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:391
-msgid "Time before an unverified registration will expire"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:411 ../../Zotlabs/Widget/Admin.php:22
-msgid "Site"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:413
-#: ../../Zotlabs/Module/Register.php:520
-msgid "Registration"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:414
-msgid "File upload"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:415
-msgid "Policies"
+#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437
+#: ../../Zotlabs/Module/Connections.php:382
+msgid "Find"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:416 ../../include/contact_widgets.php:16
-#: ../../include/acl_selectors.php:145
-msgid "Advanced"
+#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:436
+#: ../../Zotlabs/Module/Suggest.php:79
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:420
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:593
-msgid "Site name"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Banner/Logo"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Unfiltered HTML/CSS/JS is allowed"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid "Administrator Information"
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:115
+#: ../../include/contact_widgets.php:159 ../../include/contact_widgets.php:204
+#: ../../include/contact_widgets.php:239
+#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
+msgid "Everything"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156
+#: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236
+#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
+#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
+#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Module/Cdav.php:1072
+#: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:388
+#: ../../Zotlabs/Storage/Browser.php:403
+msgid "Categories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
-msgid "Site Information"
+#: ../../include/contact_widgets.php:269
+msgid "Common Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:424
-msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../include/contact_widgets.php:273
+#, php-format
+msgid "View all %d common connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:425
-msgid "System language"
+#: ../../include/language.php:441
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
-msgid "System theme"
+#: ../../include/import.php:29
+msgid "Unable to import a removed channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
+#: ../../include/import.php:55
 msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "Allow Feeds as Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "(Heavy system resource usage)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:430
-msgid "Maximum image size"
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: ../../include/import.php:121
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age"
+#: ../../include/nav.php:95
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age (in years) for who may register on this site."
+#: ../../include/nav.php:95
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "Which best describes the types of account offered by this hub?"
+#: ../../include/nav.php:101 ../../Zotlabs/Module/Manage.php:160
+#: ../../Zotlabs/Lib/Apps.php:338
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "This is displayed on the public server site list."
+#: ../../include/nav.php:101
+msgid "Manage your channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:438
-msgid "Register text"
+#: ../../include/nav.php:104 ../../include/group.php:327
+#: ../../include/acl_selectors.php:87
+#: ../../Zotlabs/Widget/Activity_filter.php:88
+#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154
+#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:365
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:440
-msgid "This text will be displayed prominently at the registration page"
+#: ../../include/nav.php:104
+msgid "Manage your privacy groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:444
-msgid "Does this site allow new member registration?"
+#: ../../include/nav.php:106 ../../Zotlabs/Widget/Settings_menu.php:61
+#: ../../Zotlabs/Widget/Newmember.php:53
+#: ../../Zotlabs/Module/Admin/Themes.php:125
+#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:340
+msgid "Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:451
-msgid "Configure the registration open days/hours"
+#: ../../include/nav.php:106
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:453
-msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
+#: ../../include/nav.php:112 ../../include/nav.php:142
+#: ../../include/nav.php:163 ../../boot.php:1720
+msgid "Logout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:454
-msgid ""
-"Weekdays and hours must be separated by colon ':', From-To ranges with a "
-"dash `-` example: 1:800-1200"
+#: ../../include/nav.php:112 ../../include/nav.php:142
+msgid "End this session"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:455
-msgid ""
-"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
-"2:900-1700"
+#: ../../include/nav.php:115
+msgid "Your profile page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:456
-msgid ""
-"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
-"or 1-2,4-5:900-1700"
+#: ../../include/nav.php:118 ../../include/channel.php:1486
+#: ../../Zotlabs/Module/Profiles.php:831
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-msgid "Advanced examples:"
+#: ../../include/nav.php:118
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-#: ../../Zotlabs/Module/Settings/Channel.php:420
-msgid "or"
+#: ../../include/nav.php:120 ../../Zotlabs/Widget/Newmember.php:35
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:458
-msgid "Check your configuration"
+#: ../../include/nav.php:127 ../../include/nav.php:131
+#: ../../Zotlabs/Lib/Apps.php:337 ../../boot.php:1721
+msgid "Login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:462
-msgid "Max account registrations per day"
+#: ../../include/nav.php:127 ../../include/nav.php:131
+msgid "Sign in"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:464
-msgid "Unlimited if zero or no value - default 50"
+#: ../../include/nav.php:161
+msgid "Take me home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:468
-msgid "Max account registrations from same IP"
+#: ../../include/nav.php:163
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:470
-msgid "Unlimited if zero or no value - default 3"
+#: ../../include/nav.php:168 ../../Zotlabs/Module/Register.php:542
+#: ../../boot.php:1698
+msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:476
-msgid "Auto channel create"
+#: ../../include/nav.php:168
+msgid "Create an account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:478
-msgid ""
-"If disabled the channel will be created in a separate step during the "
-"registration process"
+#: ../../include/nav.php:180
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:482
-msgid "Require invite code"
+#: ../../include/nav.php:194
+msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:487
-msgid "Allow invite code"
+#: ../../include/nav.php:200 ../../Zotlabs/Widget/Admin.php:55
+msgid "Admin"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:492
-msgid "Require email address"
+#: ../../include/nav.php:200
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:494
-msgid "The provided email address will be verified (recommended)"
+#: ../../include/nav.php:324 ../../Zotlabs/Widget/Messages.php:25
+#: ../../Zotlabs/Widget/Notifications.php:166
+#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:854
+msgid "Loading"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:498
-msgid "Abandon account after x days"
+#: ../../include/nav.php:330
+msgid "@name, !forum, #tag, ?doc, content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:500
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../include/nav.php:331
+msgid "Please wait..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
-msgid "Site homepage to show visitors (default: login box)"
+#: ../../include/nav.php:337
+msgid "Add Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
-msgid ""
-"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
+#: ../../include/nav.php:338
+msgid "Arrange Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid "Preserve site homepage URL"
+#: ../../include/nav.php:339
+msgid "Toggle System Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
+#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154
+msgid "Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
-msgid "Allowed friend domains"
+#: ../../include/nav.php:424
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83
+msgid "About"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
-msgid "Force publish"
+#: ../../include/nav.php:437
+msgid "Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: ../../include/nav.php:452 ../../Zotlabs/Widget/Notifications.php:101
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "Files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
-msgid "Import Public Streams"
+#: ../../include/nav.php:455
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
+#: ../../include/nav.php:477 ../../include/nav.php:480
+#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:331
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
-msgid "Site only Public Streams"
+#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:330
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
-msgid ""
-"Allow access to public content originating only from this site if Imported "
-"Public Streams are disabled."
+#: ../../include/nav.php:493
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid "Allow anybody on the internet to access the Public streams"
+#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207
+#: ../../Zotlabs/Lib/Apps.php:327
+msgid "Cards"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid ""
-"Disable to require authentication before viewing. Warning: this content is "
-"unmoderated."
+#: ../../include/nav.php:504
+msgid "View Cards"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-msgid "Only import Public stream posts with this text"
+#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:225
+#: ../../Zotlabs/Lib/Apps.php:326
+msgid "Articles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:513
-msgid "Do not import Public stream posts with this text"
+#: ../../include/nav.php:515
+msgid "View Articles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
-msgid "Login on Homepage"
+#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Zotlabs/Lib/Apps.php:342
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
-msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
+#: ../../include/nav.php:527
+msgid "View Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid "Enable context help"
+#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../Zotlabs/Module/Wiki.php:205
+msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
+#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:343
+msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:519
-msgid "Reply-to email address for system generated email."
+#: ../../include/auth.php:194
+msgid "Delegation session ended."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:520
-msgid "Sender (From) email address for system generated email."
+#: ../../include/auth.php:198
+msgid "Logged out."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:521
-msgid "Name of email sender for system generated email."
+#: ../../include/auth.php:294
+msgid "Email validation is incomplete. Please check your email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Directory Server URL"
+#: ../../include/auth.php:310
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Default directory server"
+#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51
+#: ../../Zotlabs/Module/Profiles.php:737
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
-msgid "Enable SSE Notifications"
+#: ../../include/datetime.php:140
+msgid "Birthday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
-msgid ""
-"If disabled, traditional polling will be used. Warning: this setting might "
-"not be suited for shared hosting"
+#: ../../include/datetime.php:140
+msgid "Age: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:527
-msgid "Proxy user"
+#: ../../include/datetime.php:140
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:528
-msgid "Proxy URL"
+#: ../../include/datetime.php:238 ../../boot.php:2735
+msgid "never"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Network timeout"
+#: ../../include/datetime.php:244
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../include/datetime.php:262
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
-msgid "Delivery interval"
-msgstr ""
+#: ../../include/datetime.php:273
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
+#: ../../include/datetime.php:276
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
-msgid "Deliveries per process"
-msgstr ""
+#: ../../include/datetime.php:279
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust "
-"if necessary to tune system performance. Recommend: 1-5."
-msgstr ""
+#: ../../include/datetime.php:282
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid "Queue Threshold"
-msgstr ""
+#: ../../include/datetime.php:285
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid ""
-"Always defer immediate delivery if queue contains more than this number of "
-"entries."
-msgstr ""
+#: ../../include/datetime.php:288
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
-msgid "Poll interval"
-msgstr ""
+#: ../../include/datetime.php:291
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: ../../include/datetime.php:520
+#, php-format
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
-msgid "Path to ImageMagick convert program"
+#: ../../include/datetime.php:521
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
-msgid ""
-"If set, use this program to generate photo thumbnails for huge images ( > "
-"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
-"Example: /usr/bin/convert"
+#: ../../include/cdav.php:157
+msgid "INVALID EVENT DISMISSED!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid "Maximum Load Average"
+#: ../../include/cdav.php:158
+msgid "Summary: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../include/cdav.php:159
+msgid "Date: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "Expiration period in days for imported (grid/network) content"
+#: ../../include/cdav.php:160 ../../include/cdav.php:168
+msgid "Reason: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "0 for no expiration of imported content"
+#: ../../include/cdav.php:166
+msgid "INVALID CARD DISMISSED!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:537
-msgid ""
-"Do not expire any posts which have comments less than this many days ago"
+#: ../../include/cdav.php:167
+msgid "Name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
-msgid ""
-"Public servers: Optional landing (marketing) webpage for new registrants"
+#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:178
+msgid "channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
+#: ../../include/conversation.php:183
 #, php-format
-msgid "Create this page first. Default is %s/register"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Page to display after creating a new channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Default: profiles"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Optional: site location"
+msgid "likes %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Region or country"
+#: ../../include/conversation.php:186
+#, php-format
+msgid "doesn't like %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:625
-#: ../../Zotlabs/Module/Admin/Site.php:626
-msgid "Invalid 24h time value (hhmm/hmm)"
+#: ../../include/conversation.php:226 ../../include/conversation.php:228
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "New Profile Field"
+#: ../../include/conversation.php:263
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "Field nickname"
+#: ../../include/conversation.php:286 ../../Zotlabs/Module/Mood.php:76
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "System name of field"
+#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:502
+msgid "This is an unsaved preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
-msgid "Input type"
+#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1113
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Field Name"
+#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Label on profile pages"
+#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:77
+#: ../../Zotlabs/Module/Photos.php:1114
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Help text"
+#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:78
+#: ../../Zotlabs/Module/Photos.php:1114
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Additional info (optional)"
+#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:79
+#: ../../Zotlabs/Module/Photos.php:1114
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
-msgid "Field definition not found"
+#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:66
+#: ../../Zotlabs/Module/Photos.php:1115
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
-msgid "Edit Profile Field"
+#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:67
+#: ../../Zotlabs/Module/Photos.php:1115
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
-msgid "Profile Fields"
+#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:68
+#: ../../Zotlabs/Module/Photos.php:1115
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
-msgid "Basic Profile Fields"
+#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:181
+msgid "Select"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "Advanced Profile Fields"
+#: ../../include/conversation.php:730 ../../include/conversation.php:784
+#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:174
+#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1057
+#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Webpages.php:256
+#: ../../Zotlabs/Module/Admin/Accounts.php:320
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Connections.php:329
+#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Profiles.php:801
+#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269
+#: ../../Zotlabs/Module/Connedit.php:653 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Lib/Apps.php:559 ../../Zotlabs/Lib/ThreadItem.php:171
+#: ../../Zotlabs/Storage/Browser.php:384
+msgid "Delete"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "(In addition to basic fields)"
+#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
-msgid "All available fields"
+#: ../../include/conversation.php:742 ../../Zotlabs/Lib/ThreadItem.php:103
+msgid "Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
-msgid "Custom Fields"
+#: ../../include/conversation.php:751 ../../Zotlabs/Widget/Pinned.php:88
+#: ../../Zotlabs/Lib/ThreadItem.php:285
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
-msgid "Create Custom Field"
+#: ../../include/conversation.php:752 ../../Zotlabs/Widget/Pinned.php:89
+#: ../../Zotlabs/Lib/ThreadItem.php:286
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:58
-msgid "No more system notifications."
+#: ../../include/conversation.php:783
+#: ../../Zotlabs/Module/Admin/Accounts.php:318
+#: ../../Zotlabs/Module/Connections.php:343
+msgid "Approve"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:62
-msgid "System Notifications"
+#: ../../include/conversation.php:789
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:62
-msgid "Permissions denied."
+#: ../../include/conversation.php:810
+msgid "Categories:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:122
-msgid "Thing updated"
+#: ../../include/conversation.php:811
+msgid "Filed under:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:174
-msgid "Object store: failed"
+#: ../../include/conversation.php:817 ../../Zotlabs/Widget/Pinned.php:132
+#: ../../Zotlabs/Lib/ThreadItem.php:430
+#, php-format
+msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:178
-msgid "Thing added"
+#: ../../include/conversation.php:820 ../../Zotlabs/Widget/Pinned.php:135
+#: ../../Zotlabs/Lib/ThreadItem.php:433
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:204
+#: ../../include/conversation.php:821 ../../Zotlabs/Widget/Pinned.php:136
+#: ../../Zotlabs/Lib/ThreadItem.php:434
 #, php-format
-msgid "OBJ: %1$s %2$s %3$s"
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:267
-msgid "Show Thing"
+#: ../../include/conversation.php:836
+msgid "View in context"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:274
-msgid "item not found."
+#: ../../include/conversation.php:838 ../../Zotlabs/Module/Photos.php:1079
+#: ../../Zotlabs/Lib/ThreadItem.php:503
+msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:307
-msgid "Edit Thing"
+#: ../../include/conversation.php:938
+msgid "remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
-msgid "Select a profile"
+#: ../../include/conversation.php:942
+msgid "Loading..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Post an activity"
+#: ../../include/conversation.php:943 ../../Zotlabs/Lib/ThreadItem.php:302
+msgid "Conversation Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Only sends to viewers of the applicable profile"
+#: ../../include/conversation.php:944
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
-msgid "Name of thing e.g. something"
+#: ../../include/conversation.php:988
+msgid "View Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
-msgid "URL of thing (optional)"
+#: ../../include/conversation.php:998
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
-msgid "URL for photo of thing (optional)"
+#: ../../include/conversation.php:1007
+msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:364
-msgid "Add Thing to your Profile"
+#: ../../include/conversation.php:1096 ../../Zotlabs/Module/Connedit.php:614
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:40
-msgid "Suggest Channels App"
+#: ../../include/conversation.php:1106 ../../include/connections.php:110
+#: ../../include/channel.php:1566 ../../Zotlabs/Widget/Suggestions.php:46
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:369
+#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:41
-msgid ""
-"Suggestions for channels in the $Projectname network you might be interested "
-"in"
+#: ../../include/conversation.php:1116
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:54
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../include/conversation.php:1126
+#: ../../Zotlabs/Module/Admin/Accounts.php:347
+msgid "Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:48
-msgid "Ignore/Hide"
+#: ../../include/conversation.php:1136 ../../Zotlabs/Module/Pubsites.php:35
+msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:437
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../include/conversation.php:1146 ../../Zotlabs/Module/Poke.php:199
+#: ../../Zotlabs/Lib/Apps.php:352
+msgid "Poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:36
-msgid "Email Verification Required"
+#: ../../include/conversation.php:1268
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../include/conversation.php:1268
 #, php-format
-msgid ""
-"A verification token was sent to your email address [%s]. Enter that token "
-"here to complete the account verification step. Please allow a few minutes "
-"for delivery, and check your spam folder if you do not see the message."
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:38
-msgid "Resend Email"
-msgstr ""
+#: ../../include/conversation.php:1272
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Email_validation.php:41
-msgid "Validation token"
-msgstr ""
+#: ../../include/conversation.php:1274
+#, 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] ""
 
-#: ../../Zotlabs/Module/Notes.php:57
-msgid "Notes App"
+#: ../../include/conversation.php:1280
+msgid "and"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notes.php:58
-msgid "A simple notes app with a widget (note: notes are not encrypted)"
-msgstr ""
+#: ../../include/conversation.php:1283
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Tokens.php:39
+#: ../../include/conversation.php:1284
 #, php-format
-msgid "This channel is limited to %d tokens"
+msgid "%s like this."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:45
-msgid "Name and Password are required."
+#: ../../include/conversation.php:1284
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:85
-msgid "Token saved."
+#: ../../include/conversation.php:1468
+msgid "Toggle poll"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:99
-msgid "Guest Access App"
+#: ../../include/conversation.php:1469
+msgid "Option"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:100
-msgid "Create access tokens so that non-members can access private content"
+#: ../../include/conversation.php:1470
+msgid "Add option"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:133
-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."
+#: ../../include/conversation.php:1471
+msgid "Minutes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:135
-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:"
+#: ../../include/conversation.php:1471
+msgid "Hours"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:170
-msgid "Guest Access Tokens"
+#: ../../include/conversation.php:1471
+msgid "Days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:177
-msgid "Login Name"
+#: ../../include/conversation.php:1472
+msgid "Allow multiple answers"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:178
-msgid "Login Password"
+#: ../../include/conversation.php:1482
+msgid "Summary (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:179
-msgid "Expires (yyyy-mm-dd)"
-msgstr ""
+#: ../../include/conversation.php:1754 ../../include/taxonomy.php:670
+#: ../../include/channel.php:1729 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:243
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of Pinned Navbar Apps"
-msgstr ""
+#: ../../include/conversation.php:1757 ../../Zotlabs/Module/Photos.php:1141
+#: ../../Zotlabs/Lib/ThreadItem.php:248
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of App Tray Apps"
-msgstr ""
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid ""
-"Use arrows to move the corresponding app left (top) or right (bottom) in the "
-"navbar"
-msgstr ""
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid "Use arrows to move the corresponding app up or down in the app tray"
-msgstr ""
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Notifications.php:63
-#: ../../Zotlabs/Lib/ThreadItem.php:484
-msgid "Mark all seen"
-msgstr ""
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95
-#: ../../Zotlabs/Module/Invite.php:225 ../../Zotlabs/Module/Invite.php:494
-#: ../../Zotlabs/Module/Invite.php:508 ../../Zotlabs/Lib/Enotify.php:66
-#: ../../extend/addon/hubzilla-addons/opensearch/opensearch.php:42
-msgid "$Projectname"
-msgstr ""
+#: ../../include/conversation.php:1772
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Home.php:104
-#, php-format
-msgid "Welcome to %s"
+#: ../../include/conversation.php:1775
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/selectors.php:18
+msgid "Profile to assign new connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:52
-msgid "Articles App"
+#: ../../include/selectors.php:41
+msgid "Frequently"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:53
-msgid "Create interactive articles"
+#: ../../include/selectors.php:42
+msgid "Hourly"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:116
-msgid "Add Article"
+#: ../../include/selectors.php:43
+msgid "Twice daily"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:325
-#: ../../include/nav.php:512
-msgid "Articles"
+#: ../../include/selectors.php:44
+msgid "Daily"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:169
-msgid "$Projectname Server - Setup"
+#: ../../include/selectors.php:45
+msgid "Weekly"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:173
-msgid "Could not connect to database."
+#: ../../include/selectors.php:46
+msgid "Monthly"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:177
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../include/selectors.php:60
+msgid "Currently Male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:184
-msgid "Could not create table."
+#: ../../include/selectors.php:60
+msgid "Currently Female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:190
-msgid "Your site database has been installed."
+#: ../../include/selectors.php:60
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:196
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
+#: ../../include/selectors.php:60
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261
-#: ../../Zotlabs/Module/Setup.php:768
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../include/selectors.php:60
+msgid "Transgender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:258
-msgid "System check"
+#: ../../include/selectors.php:60
+msgid "Intersex"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:263
-msgid "Check again"
+#: ../../include/selectors.php:60
+msgid "Transsexual"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:284
-msgid "Database connection"
+#: ../../include/selectors.php:60
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:285
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
+#: ../../include/selectors.php:60 ../../include/channel.php:1674
+msgid "Neuter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:286
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../include/selectors.php:60 ../../include/channel.php:1676
+msgid "Non-specific"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:287
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../include/selectors.php:60
+msgid "Undecided"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:291
-msgid "Database Server Name"
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
+msgid "Males"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:291
-msgid "Default is 127.0.0.1"
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
+msgid "Females"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:292
-msgid "Database Port"
+#: ../../include/selectors.php:96
+msgid "Gay"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:292
-msgid "Communication port number - use 0 for default"
+#: ../../include/selectors.php:96
+msgid "Lesbian"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:293
-msgid "Database Login Name"
+#: ../../include/selectors.php:96
+msgid "No Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Login Password"
+#: ../../include/selectors.php:96
+msgid "Bisexual"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Name"
+#: ../../include/selectors.php:96
+msgid "Autosexual"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Type"
+#: ../../include/selectors.php:96
+msgid "Abstinent"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
-msgid "Site administrator email address"
+#: ../../include/selectors.php:96
+msgid "Virgin"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../include/selectors.php:96
+msgid "Deviant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
-msgid "Website URL"
+#: ../../include/selectors.php:96
+msgid "Fetish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
-msgid "Please use SSL (https) URL if available."
+#: ../../include/selectors.php:96
+msgid "Oodles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:342
-msgid "Please select a default timezone for your website"
+#: ../../include/selectors.php:96
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:327
-msgid "Site settings"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Single"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:381
-msgid "PHP version 7.1 or greater is required."
+#: ../../include/selectors.php:134
+msgid "Lonely"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:382
-msgid "PHP version"
+#: ../../include/selectors.php:134
+msgid "Available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:398
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../include/selectors.php:134
+msgid "Unavailable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:399
-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."
+#: ../../include/selectors.php:134
+msgid "Has crush"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:403
-msgid "PHP executable path"
+#: ../../include/selectors.php:134
+msgid "Infatuated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:403
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Dating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:408
-msgid "Command line PHP"
+#: ../../include/selectors.php:134
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:418
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
+#: ../../include/selectors.php:134
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:422
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../include/selectors.php:134 ../../include/channel.php:457
+#: ../../include/channel.php:460 ../../Zotlabs/Widget/Affinity.php:32
+#: ../../Zotlabs/Module/Settings/Channel.php:71
+#: ../../Zotlabs/Module/Settings/Channel.php:75
+#: ../../Zotlabs/Module/Settings/Channel.php:76
+#: ../../Zotlabs/Module/Settings/Channel.php:79
+#: ../../Zotlabs/Module/Settings/Channel.php:90
+#: ../../Zotlabs/Module/Connedit.php:710
+msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:423
-msgid "This is required for message delivery to work."
+#: ../../include/selectors.php:134
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:426
-msgid "PHP register_argc_argv"
+#: ../../include/selectors.php:134
+msgid "Casual"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:446
-msgid ""
-"This is not sufficient to upload larger images or files. You should be able "
-"to upload at least 4 MB at once."
+#: ../../include/selectors.php:134
+msgid "Engaged"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:448
-#, 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."
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Married"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:454
-msgid "You can adjust these settings in the server php.ini file."
+#: ../../include/selectors.php:134
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:456
-msgid "PHP upload limits"
+#: ../../include/selectors.php:134
+msgid "Partners"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:479
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:480
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../include/selectors.php:134
+msgid "Common law"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:483
-msgid "Generate encryption keys"
+#: ../../include/selectors.php:134
+msgid "Happy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
-msgid "libCurl PHP module"
+#: ../../include/selectors.php:134
+msgid "Not looking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
-msgid "GD graphics PHP module"
+#: ../../include/selectors.php:134
+msgid "Swinger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
-msgid "OpenSSL PHP module"
+#: ../../include/selectors.php:134
+msgid "Betrayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:503
-msgid "PDO database PHP module"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Separated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:504
-msgid "mb_string PHP module"
+#: ../../include/selectors.php:134
+msgid "Unstable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:505
-msgid "xml PHP module"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Divorced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:506
-msgid "zip PHP module"
+#: ../../include/selectors.php:134
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
-msgid "Apache mod_rewrite module"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Widowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:510
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../include/selectors.php:134
+msgid "Uncertain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
-msgid "exec"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "It's complicated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:516
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
+#: ../../include/selectors.php:134
+msgid "Don't care"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525
-msgid "shell_exec"
+#: ../../include/selectors.php:134
+msgid "Ask me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:522
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../include/connections.php:134
+msgid "New window"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:530
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../include/connections.php:135
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../include/group.php:23 ../../Zotlabs/Lib/Group.php:28
 msgid ""
-"Error: GD PHP module with JPEG support or ImageMagick graphics library "
-"required but not installed."
+"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 ""
 
-#: ../../Zotlabs/Module/Setup.php:538
-msgid "Error: openssl PHP module required but not installed."
+#: ../../include/group.php:271 ../../Zotlabs/Lib/Group.php:270
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:544
-msgid ""
-"Error: PDO database PHP module missing a driver for either mysql or pgsql."
+#: ../../include/group.php:305 ../../Zotlabs/Lib/AccessList.php:311
+#: ../../Zotlabs/Lib/Group.php:302
+msgid "edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:549
-msgid "Error: PDO database PHP module required but not installed."
+#: ../../include/group.php:328 ../../Zotlabs/Lib/Group.php:325
+msgid "Edit group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:553
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../include/group.php:329 ../../Zotlabs/Lib/Group.php:326
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:557
-msgid "Error: xml PHP module required for DAV but not installed."
+#: ../../include/group.php:330 ../../Zotlabs/Lib/Group.php:327
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:561
-msgid "Error: zip PHP module required but not installed."
+#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84
+#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329
+msgid "add"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:580 ../../Zotlabs/Module/Setup.php:589
-msgid ".htconfig.php is writable"
+#: ../../include/taxonomy.php:323
+msgid "Trending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:585
-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."
+#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:460
+#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:22
+msgid "Tags"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:586
-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."
+#: ../../include/taxonomy.php:561
+msgid "Keywords"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:587
-msgid "Please see install/INSTALL.txt for additional information."
+#: ../../include/taxonomy.php:582
+msgid "have"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:603
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
+#: ../../include/taxonomy.php:582
+msgid "has"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:604
-#, 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."
+#: ../../include/taxonomy.php:583
+msgid "want"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../include/taxonomy.php:583
+msgid "wants"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:606
-#, 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."
+#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:318
+msgid "like"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:609
-#, php-format
-msgid "%s is writable"
+#: ../../include/taxonomy.php:584
+msgid "likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:625
-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 top level "
-"web folder"
+#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:319
+msgid "dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:629
-msgid "store is writable"
+#: ../../include/taxonomy.php:585
+msgid "dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../include/items.php:979 ../../include/items.php:1039
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:662
-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!"
+#: ../../include/items.php:1243
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:663
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
+#: ../../include/items.php:1245
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:664
-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."
+#: ../../include/items.php:1247
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:665
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
+#: ../../include/items.php:1249
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:666
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
+#: ../../include/items.php:1251
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:667
-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."
+#: ../../include/items.php:1253
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:669
-msgid "SSL certificate validation"
+#: ../../include/items.php:1255
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:675
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
+#: ../../include/items.php:1257
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:678
-msgid "Url rewrite is working"
+#: ../../include/items.php:4241 ../../Zotlabs/Module/Group.php:62
+#: ../../Zotlabs/Module/Group.php:214
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:691
-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."
+#: ../../include/items.php:4257
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:720
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:401
-msgid "Errors encountered creating database tables."
+#: ../../include/items.php:4264
+#, php-format
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:766
-msgid "<h1>What next?</h1>"
+#: ../../include/items.php:4274 ../../Zotlabs/Module/Connedit.php:852
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:767
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../include/items.php:4276
+msgid "Connection not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:122
-msgid "No default suggestions were found."
+#: ../../include/items.php:4622 ../../Zotlabs/Module/Cover_photo.php:297
+msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:282
+#: ../../include/items.php:4623 ../../Zotlabs/Module/Cover_photo.php:298
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:293
-msgid "Gender: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:295
-msgid "Status: "
+msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:297
-msgid "Homepage: "
+#: ../../include/items.php:4624 ../../Zotlabs/Module/Cover_photo.php:299
+msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:349 ../../include/channel.php:1834
-msgid "Age:"
+#: ../../include/items.php:4625 ../../Zotlabs/Module/Cover_photo.php:300
+#, php-format
+msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:354 ../../include/channel.php:1661
-#: ../../include/event.php:63 ../../include/event.php:134
-msgid "Location:"
+#: ../../include/items.php:4627 ../../Zotlabs/Module/Cover_photo.php:302
+#, php-format
+msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:360
-msgid "Description:"
+#: ../../include/items.php:4629
+msgid "profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:367 ../../include/channel.php:1863
-msgid "Hometown:"
+#: ../../include/items.php:4821
+#, php-format
+msgid "[Edited %s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:369 ../../include/channel.php:1869
-msgid "About:"
+#: ../../include/items.php:4821
+msgctxt "edit_activity"
+msgid "Post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:371
-msgid "Public Forum:"
+#: ../../include/items.php:4821
+msgctxt "edit_activity"
+msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:374
-msgid "Keywords: "
+#: ../../include/account.php:38
+msgid "The provided email address is not valid"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:377
-msgid "Don't suggest"
+#: ../../include/account.php:41
+msgid "The provided email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:379
-msgid "Common connections (estimated):"
+#: ../../include/account.php:48
+msgid "The provided email address is already registered at this site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:428
-msgid "Global Directory"
+#: ../../include/account.php:55
+msgid ""
+"There is a pending registration for this address - click \"Register\" to "
+"continue verification"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:428
-msgid "Local Directory"
+#: ../../include/account.php:94
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:434
-msgid "Finding:"
+#: ../../include/account.php:103
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:439
-msgid "next page"
+#: ../../include/account.php:191
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:439
-msgid "previous page"
+#: ../../include/account.php:258 ../../include/account.php:366
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:440
-msgid "Sort options"
+#: ../../include/account.php:435 ../../include/account.php:503
+#: ../../Zotlabs/Module/Register.php:328
+#, php-format
+msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:441
-msgid "Alphabetic"
+#: ../../include/account.php:578
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:442
-msgid "Reverse Alphabetic"
+#: ../../include/account.php:600
+msgid "your registration password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:443
-msgid "Newest to Oldest"
+#: ../../include/account.php:606 ../../include/account.php:695
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:444
-msgid "Oldest to Newest"
+#: ../../include/account.php:706
+msgid "Account approved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:461
-msgid "No entries (some entries may be hidden)."
+#: ../../include/account.php:762
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:209
-msgid "Menu not found."
+#: ../../include/account.php:769
+#, php-format
+msgid "Could not revoke registration for %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:63
-msgid "Unable to create element."
+#: ../../include/account.php:1185 ../../include/account.php:1187
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:87
-msgid "Unable to update menu element."
+#: ../../include/account.php:1193
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:103
-msgid "Unable to add menu element."
+#: ../../include/account.php:1198
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
-msgid "Menu Item Permissions"
+#: ../../include/account.php:1258
+msgid "open"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:528
-msgid "(click to open/close)"
+#: ../../include/account.php:1258
+msgid "closed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
-msgid "Link Name"
+#: ../../include/account.php:1265
+msgid "Registration is currently"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
-msgid "Link or Submenu Target"
+#: ../../include/account.php:1274
+msgid "please come back"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:175
-msgid "Enter URL of the link or select a menu name to create a submenu"
+#: ../../include/photo/photo_driver.php:435
+#: ../../Zotlabs/Module/Profile_photo.php:147
+#: ../../Zotlabs/Module/Profile_photo.php:284
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
-msgid "Use magic-auth if available"
+#: ../../include/attach.php:273 ../../include/attach.php:324
+#: ../../include/attach.php:419
+msgid "Item was not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
-msgid "Open link in new window"
+#: ../../include/attach.php:290
+msgid "Unknown error."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Order in list"
+#: ../../include/attach.php:612
+msgid "No source file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../include/attach.php:634
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Submit and finish"
+#: ../../include/attach.php:653
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Submit and continue"
+#: ../../include/attach.php:795
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Menu:"
+#: ../../include/attach.php:816
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:192
-msgid "Link Target"
+#: ../../include/attach.php:1004
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:195
-msgid "Edit menu"
+#: ../../include/attach.php:1033
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:198
-msgid "Edit element"
+#: ../../include/attach.php:1105 ../../include/attach.php:1121
+msgid "Path not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:199
-msgid "Drop element"
+#: ../../include/attach.php:1169 ../../include/attach.php:1332
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:200
-msgid "New element"
+#: ../../include/attach.php:1195
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:201
-msgid "Edit this menu container"
+#: ../../include/attach.php:1220
+msgid "Path not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Add menu element"
+#: ../../include/attach.php:1288
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:203
-msgid "Delete this menu item"
+#: ../../include/attach.php:1292
+msgid "database storage failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:204
-msgid "Edit this menu item"
+#: ../../include/attach.php:1338
+msgid "Empty path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:222
-msgid "Menu item not found."
+#: ../../include/attach.php:2099
+#, php-format
+msgid "%s shared a %s with you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:235
-msgid "Menu item deleted."
+#: ../../include/bookmarks.php:34
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:237
-msgid "Menu item could not be deleted."
+#: ../../include/menu.php:120 ../../include/channel.php:1486
+#: ../../include/channel.php:1490 ../../Zotlabs/Widget/Cdav.php:138
+#: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:97
+#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99
+#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Webpages.php:254
+#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Connections.php:321
+#: ../../Zotlabs/Module/Connections.php:363
+#: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Menu.php:176
+#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268
+#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:558
+#: ../../Zotlabs/Lib/ThreadItem.php:149
+msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:244
-msgid "Edit Menu Element"
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
+#: ../../include/bbcode.php:1546 ../../include/bbcode.php:1554
+msgid "Image/photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:254
-msgid "Link text"
+#: ../../include/bbcode.php:280 ../../include/bbcode.php:1571
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:76 ../../include/conversation.php:286
+#: ../../include/bbcode.php:334
 #, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+msgid "Install %1$s element %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:134
-msgid "Mood App"
+#: ../../include/bbcode.php:338
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Module/Mood.php:155
-msgid "Set your current mood and tell your friends"
+#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:43
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350
-msgid "Mood"
+#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:53
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:29
-msgid "Permission category name is required."
+#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:48
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:48
-msgid "Permission category saved."
+#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:60
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:63
-msgid "Permission Categories App"
+#: ../../include/bbcode.php:551
+msgid "card"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:64
-msgid "Create custom connection permission limits"
+#: ../../include/bbcode.php:553
+msgid "article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:80
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
+#: ../../include/bbcode.php:559 ../../include/markdown.php:203
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374
-msgid "Permission Categories"
+#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:121
-msgid "Permission category name"
+#: ../../include/bbcode.php:644 ../../include/markdown.php:256
+msgid "spoiler"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
+#: ../../include/bbcode.php:657
+msgid "View article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
+#: ../../include/bbcode.php:657
+msgid "View summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
+#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1238
+#: ../../Zotlabs/Lib/NativeWikiPage.php:618
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
+#: ../../include/bbcode.php:1522
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:212
-msgid "Nickname is required."
+#: ../../include/channel.php:46
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:112
-msgid "Email address required"
+#: ../../include/channel.php:79
+msgid "Empty name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:156
-msgid "No password provided"
+#: ../../include/channel.php:82
+msgid "Name too long"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:161 ../../include/js_strings.php:12
-msgid "Passwords do not match"
+#: ../../include/channel.php:199
+msgid "No account identifier"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:179
-msgid "Terms of Service not accepted"
+#: ../../include/channel.php:211 ../../Zotlabs/Module/Register.php:95
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:241
-msgid "Invitation code succesfully applied"
+#: ../../include/channel.php:225 ../../include/channel.php:657
+#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:261
-msgid "Invitation not in time or too late"
+#: ../../include/channel.php:230 ../../include/channel.php:662
+#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:267
-msgid "Invitation email failed"
+#: ../../include/channel.php:290
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:275
-msgid "Invitation code failed"
+#: ../../include/channel.php:393
+msgid "Default Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:282
-msgid "Invitations are not available"
+#: ../../include/channel.php:590 ../../include/channel.php:679
+msgid "Unable to retrieve modified identity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:292
-msgid "Registration on this hub is by invitation only"
+#: ../../include/channel.php:1330
+msgid "Requested channel is not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:328 ../../include/account.php:435
-#: ../../include/account.php:503
-#, php-format
-msgid "Registration confirmation for %s"
+#: ../../include/channel.php:1479 ../../Zotlabs/Module/Profiles.php:729
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:399
-msgid "New register request"
+#: ../../include/channel.php:1487
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:417
-msgid "Error creating dId A"
+#: ../../include/channel.php:1505 ../../Zotlabs/Module/Profiles.php:821
+msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:435
-msgid "Registration on this hub is disabled."
+#: ../../include/channel.php:1508
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:444
-msgid "Registration on this hub is by approval only."
+#: ../../include/channel.php:1509 ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Profiles.php:825
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:445
-msgid "Register at another affiliated hub in case when prefered"
+#: ../../include/channel.php:1585 ../../include/channel.php:1713
+msgid "Gender:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:458
-msgid "Registration on this hub is by invitation only."
+#: ../../include/channel.php:1586 ../../include/channel.php:1757
+msgid "Status:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:459
-msgid "Register at another affiliated hub"
+#: ../../include/channel.php:1587 ../../include/channel.php:1781
+msgid "Homepage:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Terms of Service"
+#: ../../include/channel.php:1588
+msgid "Online Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:479
-#, php-format
-msgid "I accept the %s for this website"
+#: ../../include/channel.php:1641
+msgid "Change your profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:486
-#, php-format
-msgid "I am over %s years of age and accept the %s for this website"
+#: ../../include/channel.php:1672
+msgid "Trans"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:496
-msgid "Your email address"
+#: ../../include/channel.php:1711 ../../Zotlabs/Module/Settings/Channel.php:501
+msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:503
-msgid "Choose a password"
+#: ../../include/channel.php:1718
+msgid "Like this channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:504
-msgid "Please re-enter your password"
+#: ../../include/channel.php:1742
+msgid "j F, Y"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:506
-msgid "Please enter your invitation code"
+#: ../../include/channel.php:1743
+msgid "j F"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:508
-msgid "Your name"
+#: ../../include/channel.php:1750
+msgid "Birthday:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:508
-msgid "Real name is preferred"
+#: ../../include/channel.php:1754 ../../Zotlabs/Module/Directory.php:348
+msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:510
-msgid ""
-"Your nickname will be used to create an easy to remember channel address"
+#: ../../include/channel.php:1763
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:514
-msgid "Why do you want to join this hub?"
+#: ../../include/channel.php:1775
+msgid "Tags:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:514
-msgid "This will help to review your registration"
+#: ../../include/channel.php:1779
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:528
-msgid "I have an invite code"
+#: ../../include/channel.php:1783 ../../Zotlabs/Module/Directory.php:366
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168
-#: ../../boot.php:1696
-msgid "Register"
+#: ../../include/channel.php:1785
+msgid "Political Views:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:575
-msgid ""
-"This site has exceeded the number of allowed daily account registrations."
+#: ../../include/channel.php:1787
+msgid "Religion:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:123 ../../Zotlabs/Module/Lockview.php:117
-#: ../../Zotlabs/Module/Lockview.php:153
-msgctxt "acl"
-msgid "Profile"
+#: ../../include/channel.php:1789 ../../Zotlabs/Module/Directory.php:368
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:370
-msgid "network"
+#: ../../include/channel.php:1791
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:25
-msgid "No feature settings configured"
+#: ../../include/channel.php:1793
+msgid "Likes:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "Addon Settings"
+#: ../../include/channel.php:1795
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:35
-msgid "Please save/submit changes to any panel before opening another."
+#: ../../include/channel.php:1797
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:21
-msgid "Not valid email."
+#: ../../include/channel.php:1799
+msgid "My other channels:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:24
-msgid "Protected email address. Cannot change to that email."
+#: ../../include/channel.php:1801
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:33
-msgid "System failure storing new email. Please try again."
+#: ../../include/channel.php:1803
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:51
-msgid "Password verification failed."
+#: ../../include/channel.php:1805
+msgid "Television:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:58
-msgid "Passwords do not match. Password unchanged."
+#: ../../include/channel.php:1807
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:62
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../include/channel.php:1809
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:76
-msgid "Password changed."
+#: ../../include/channel.php:1811
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:78
-msgid "Password update failed. Please try again."
+#: ../../include/channel.php:1813
+msgid "School/education:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:103
-msgid "Account Settings"
+#: ../../include/channel.php:1834 ../../Zotlabs/Module/Profperm.php:113
+#: ../../Zotlabs/Lib/Apps.php:363
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:104
-msgid "Current Password"
+#: ../../include/channel.php:1836
+msgid "Like this thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:105
-msgid "Enter New Password"
+#: ../../include/channel.php:1837
+msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Confirm New Password"
+#: ../../include/channel.php:2276 ../../Zotlabs/Module/Cover_photo.php:304
+msgid "cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Leave password fields blank unless changing"
+#: ../../include/channel.php:2545 ../../Zotlabs/Module/Rmagic.php:96
+#: ../../boot.php:1722
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:108
-msgid "DId2 or Email Address:"
+#: ../../include/channel.php:2546 ../../Zotlabs/Module/Rmagic.php:97
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:110
-msgid "Remove this account including all its channels"
+#: ../../include/channel.php:2547 ../../Zotlabs/Module/Rmagic.php:98
+msgid "Authenticate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Events.php:40
-msgid "Events Settings"
+#: ../../include/channel.php:2705 ../../Zotlabs/Module/Admin/Accounts.php:184
+#, php-format
+msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Profiles.php:49
-msgid "Profiles Settings"
+#: ../../include/acl_selectors.php:33
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Editor.php:40
-msgid "Editor Settings"
+#: ../../include/acl_selectors.php:100
+msgid "Profile-Based Privacy Groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Features.php:45
-msgid "Additional Features"
+#: ../../include/acl_selectors.php:119
+msgid "Private Forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Manage.php:41
-msgid "Channel Manager Settings"
+#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Forums.php:100
+#: ../../Zotlabs/Widget/Activity_filter.php:123
+#: ../../Zotlabs/Widget/Notifications.php:124
+#: ../../Zotlabs/Widget/Notifications.php:125
+msgid "Forums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:127
-#, php-format
-msgid "%s - (Experimental)"
+#: ../../include/acl_selectors.php:136
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Only me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:183
-msgid "Display Settings"
+#: ../../include/acl_selectors.php:143
+msgid "Share with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:184
-msgid "Theme Settings"
+#: ../../include/acl_selectors.php:144
+msgid "Custom selection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:185
-msgid "Custom Theme Settings"
+#: ../../include/acl_selectors.php:146
+msgid ""
+"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and "
+"limit the scope of \"Allow\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:186
-msgid "Content Settings"
+#: ../../include/acl_selectors.php:147 ../../Zotlabs/Module/Authorize.php:32
+msgid "Allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:192
-msgid "Display Theme:"
+#: ../../include/acl_selectors.php:148
+msgid "Don't allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
-msgid "Select scheme"
+#: ../../include/acl_selectors.php:181
+#, 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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
-msgid "Preload images before rendering the page"
+#: ../../include/oembed.php:153
+msgid "View PDF"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
-msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
+#: ../../include/oembed.php:365
+msgid " by "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
-msgid "Enable user zoom on mobile devices"
+#: ../../include/oembed.php:366
+msgid " on "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-msgid "Update browser every xx seconds"
+#: ../../include/oembed.php:395
+msgid "Embedded content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../include/oembed.php:404
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Maximum number of conversations to load at any time:"
+#: ../../include/zid.php:403
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Maximum of 30 items"
+#: ../../Zotlabs/Widget/Activity_order.php:90
+msgid "Commented Date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
-msgid "Show emoticons (smilies) as images"
+#: ../../Zotlabs/Widget/Activity_order.php:94
+msgid "Order by last commented date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Provide channel menu in navigation bar"
+#: ../../Zotlabs/Widget/Activity_order.php:97
+msgid "Posted Date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Default: channel menu located in app menu"
+#: ../../Zotlabs/Widget/Activity_order.php:101
+msgid "Order by last posted date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
-msgid "Link post titles to source"
+#: ../../Zotlabs/Widget/Activity_order.php:104
+msgid "Date Unthreaded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
-#: ../../Zotlabs/Widget/Newmember.php:75
-msgid "New Member Links"
+#: ../../Zotlabs/Widget/Activity_order.php:108
+msgid "Order unthreaded by date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
-msgid "Display new member quick links menu"
+#: ../../Zotlabs/Widget/Activity_order.php:123
+msgid "Stream Order"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Photos.php:40
-msgid "Photos Settings"
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
-msgid "Nobody except yourself"
+#: ../../Zotlabs/Widget/Wiki_pages.php:34
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
+msgid "Add new page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:330
-msgid "Only those you specifically allow"
+#: ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:165
+msgid "Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
-msgid "Approved connections"
+#: ../../Zotlabs/Widget/Wiki_pages.php:85
+msgid "Wiki Pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:332
-msgid "Any connections"
+#: ../../Zotlabs/Widget/Wiki_pages.php:96
+msgid "Page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:333
-msgid "Anybody on this website"
+#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87
+#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:787
+#: ../../Zotlabs/Module/Photos.php:1331
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:334
-msgid "Anybody in this network"
+#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
+#: ../../Zotlabs/Module/Embedphotos.php:187 ../../Zotlabs/Module/Photos.php:818
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:335
-msgid "Anybody authenticated"
+#: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Cdav.php:146
+#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
+#: ../../Zotlabs/Module/Embedphotos.php:189
+#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:688
+#: ../../Zotlabs/Storage/Browser.php:540
+msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:336
-msgid "Anybody on the internet"
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:411
-msgid "Publish your default profile in the network directory"
+#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:24
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:416
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../Zotlabs/Widget/Conversations.php:15
+msgid "Received Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:429
-msgid "Your channel address is"
+#: ../../Zotlabs/Widget/Conversations.php:19
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:432
-msgid "Your files/photos are accessible via WebDAV at"
+#: ../../Zotlabs/Widget/Conversations.php:23
+msgid "Conversations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-msgid "Automatic membership approval"
+#: ../../Zotlabs/Widget/Conversations.php:33
+msgid "No messages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
-msgid "Channel Settings"
+#: ../../Zotlabs/Widget/Conversations.php:53
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
-msgid "Basic Settings"
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1791
-msgid "Full Name:"
+#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+msgid "I will attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-msgid "Email Address:"
+#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+msgid "I will not attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid "Your Timezone:"
+#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+msgid "I might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
-msgid "Default Post Location:"
+#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+msgid "I agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
-msgid "Geographical location to display on your posts"
+#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+msgid "I disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
-msgid "Use Browser Location:"
+#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+msgid "I abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Adult Content"
+#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
+msgid "Share This"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
+#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
+msgid "share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Security and Privacy Settings"
+#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid "Your permissions are already configured. Click to view/adjust"
+#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Widget/Messages.php:91
+#: ../../Zotlabs/Lib/ThreadItem.php:414
+msgid "via"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Hide my online presence"
+#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:445
+msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Prevents displaying in your profile that you are online"
+#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:447
+msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
-msgid "Simple Privacy Settings:"
+#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:471
+msgid "Pinned post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+#: ../../Zotlabs/Widget/Pinned.php:156
+msgid "Don't show"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
-msgid "Private - <em>default private, never open or public</em>"
+#: ../../Zotlabs/Widget/Cdav.php:37
+msgid "Select Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+#: ../../Zotlabs/Widget/Cdav.php:42
+msgid "Read-write"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid "Allow others to tag your posts"
+#: ../../Zotlabs/Widget/Cdav.php:43
+msgid "Read-only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
+#: ../../Zotlabs/Widget/Cdav.php:127
+msgid "Channel Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-msgid "Channel Permission Limits"
+#: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143
+#: ../../Zotlabs/Module/Cdav.php:1056
+msgid "CalDAV Calendars"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Expire other channel content after this many days"
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Shared CalDAV Calendars"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "0 or blank to use the website limit."
+#: ../../Zotlabs/Widget/Cdav.php:135
+msgid "Share this calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-#, php-format
-msgid "This website expires after %d days."
+#: ../../Zotlabs/Widget/Cdav.php:137
+msgid "Calendar name and color"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "This website does not expire imported content."
+#: ../../Zotlabs/Widget/Cdav.php:139
+msgid "Create new CalDAV calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "The website limit takes precedence if lower than your limit."
+#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
+#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1389
+#: ../../Zotlabs/Module/Webpages.php:253
+#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Menu.php:182
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
+msgid "Create"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
-msgid "Maximum Friend Requests/Day:"
+#: ../../Zotlabs/Widget/Cdav.php:141
+msgid "Calendar Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
-msgid "May reduce spam activity"
+#: ../../Zotlabs/Widget/Cdav.php:142
+msgid "Calendar Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
-msgid "Default Privacy Group"
+#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1056
+msgid "Channel Calendars"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "Use my default audience setting for the type of object published"
+#: ../../Zotlabs/Widget/Cdav.php:144
+msgid "Import calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
-msgid "Default permissions category"
+#: ../../Zotlabs/Widget/Cdav.php:145
+msgid "Select a calendar to import to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Maximum private messages per day from unknown people:"
+#: ../../Zotlabs/Widget/Cdav.php:172
+msgid "Addressbooks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Useful to reduce spamming"
+#: ../../Zotlabs/Widget/Cdav.php:174
+msgid "Addressbook name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
-#: ../../Zotlabs/Lib/Enotify.php:68
-msgid "Notification Settings"
+#: ../../Zotlabs/Widget/Cdav.php:176
+msgid "Create new addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "By default post a status message when:"
+#: ../../Zotlabs/Widget/Cdav.php:177
+msgid "Addressbook Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-msgid "accepting a friend request"
+#: ../../Zotlabs/Widget/Cdav.php:179
+msgid "Addressbook Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-msgid "joining a forum/community"
+#: ../../Zotlabs/Widget/Cdav.php:180
+msgid "Import addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
-msgid "making an <em>interesting</em> profile change"
+#: ../../Zotlabs/Widget/Cdav.php:181
+msgid "Select an addressbook to import to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
-msgid "Send a notification email when:"
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "You receive a connection request"
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
-msgid "Your connections are confirmed"
+#: ../../Zotlabs/Widget/Settings_menu.php:32
+msgid "Account settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-msgid "Someone writes on your profile wall"
+#: ../../Zotlabs/Widget/Settings_menu.php:38
+msgid "Channel settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-msgid "Someone writes a followup comment"
+#: ../../Zotlabs/Widget/Settings_menu.php:46
+msgid "Display settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
-msgid "You receive a private message"
+#: ../../Zotlabs/Widget/Settings_menu.php:53
+msgid "Manage locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
-msgid "You receive a friend suggestion"
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
-msgid "You are tagged in a post"
+#: ../../Zotlabs/Widget/Suggestions.php:48 ../../Zotlabs/Module/Suggest.php:73
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
-msgid "You are poked/prodded/etc. in a post"
+#: ../../Zotlabs/Widget/Suggestions.php:53
+msgid "Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
-msgid "Someone likes your post/comment"
+#: ../../Zotlabs/Widget/Suggestions.php:54
+msgid "See more..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:565
-msgid "Show visual notifications including:"
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
-msgid "Unseen stream activity"
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+msgctxt "wiki_history"
+msgid "Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
-msgid "Unseen channel activity"
+#: ../../Zotlabs/Widget/Wiki_page_history.php:24
+#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+msgid "Date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-msgid "Unseen private messages"
+#: ../../Zotlabs/Widget/Wiki_page_history.php:25
+#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "Recommended"
+#: ../../Zotlabs/Widget/Wiki_page_history.php:26
+#: ../../Zotlabs/Lib/NativeWikiPage.php:580
+msgid "Compare"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
-msgid "Upcoming events"
+#: ../../Zotlabs/Widget/Hq_controls.php:17
+msgid "Toggle post editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-msgid "Events today"
+#: ../../Zotlabs/Widget/Hq_controls.php:28
+msgid "Toggle personal notes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Upcoming birthdays"
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Not available in all themes"
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
-msgid "System (personal) notifications"
+#: ../../Zotlabs/Widget/Mailmenu.php:20
+msgid "Inbox"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-msgid "System info messages"
+#: ../../Zotlabs/Widget/Mailmenu.php:25
+msgid "Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-msgid "System critical alerts"
+#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+msgid "photo/image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "New connections"
+#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:411
+msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-msgid "System Registrations"
+#: ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Module/Admin/Accounts.php:308
+#: ../../Zotlabs/Module/Admin/Accounts.php:327
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
-msgid "Unseen shared files"
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
-msgid "Unseen public stream activity"
+#: ../../Zotlabs/Widget/Admin.php:24
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
-msgid "Unseen likes and dislikes"
+#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:99
+msgid "Security"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
-msgid "Unseen forum posts"
+#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:359
+msgid "Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
-msgid "Email notification hub (hostname)"
+#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Zotlabs/Module/Admin/Addons.php:441
+msgid "Addons"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
-#, php-format
-msgid ""
-"If your channel is mirrored to multiple hubs, set this to your preferred "
-"location. This will prevent duplicate email notifications. Example: %s"
+#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157
+msgid "Themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
-msgid "Show new wall posts, private messages and connections under Notices"
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
-msgid "Notify me of events this many days in advance"
+#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168
+msgid "Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
-msgid "Must be greater than 0"
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
-msgid "Advanced Account/Page Type Settings"
+#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58
+#: ../../Zotlabs/Module/Admin/Logs.php:83
+msgid "Logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
-msgid "Change the behaviour of this account for special situations"
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Addon Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
-msgid "Miscellaneous Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:37
+#: ../../Zotlabs/Widget/Notifications.php:55
+msgid "Direct Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
-msgid "Default photo upload folder"
+#: ../../Zotlabs/Widget/Activity_filter.php:41
+msgid "Show direct (private) messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
-#: ../../Zotlabs/Module/Settings/Channel.php:595
-msgid "%Y - current year, %m -  current month"
+#: ../../Zotlabs/Widget/Activity_filter.php:46
+#: ../../Zotlabs/Widget/Notifications.php:74
+msgid "Events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
-msgid "Default file upload folder"
+#: ../../Zotlabs/Widget/Activity_filter.php:50
+msgid "Show posts that include events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-msgid "Remove this channel."
+#: ../../Zotlabs/Widget/Activity_filter.php:56
+msgid "Polls"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Connections.php:40
-msgid "Connections Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:60
+msgid "Show posts that include polls"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Calendar.php:40
-msgid "Calendar Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:83
+#, php-format
+msgid "Show posts related to the %s privacy group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Directory.php:40
-msgid "Directory Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:92
+msgid "Show my privacy groups"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:46
-#: ../../Zotlabs/Module/Settings/Network.php:42
-msgid "Max height of content (in pixels)"
+#: ../../Zotlabs/Widget/Activity_filter.php:116
+msgid "Show posts to this forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:48
-#: ../../Zotlabs/Module/Settings/Network.php:44
-msgid "Click to expand content exceeding this height"
+#: ../../Zotlabs/Widget/Activity_filter.php:127
+msgid "Show forums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:61
-msgid "Personal menu to display in your channel pages"
+#: ../../Zotlabs/Widget/Activity_filter.php:141
+msgid "Starred Posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:88
-msgid "Channel Home Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:145
+msgid "Show posts that I have starred"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Network.php:59
-msgid "Stream Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:156
+msgid "Personal Posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:23
-msgid "Settings saved."
+#: ../../Zotlabs/Widget/Activity_filter.php:160
+msgid "Show posts that mention or involve me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:25
-msgid "Settings saved. Reload page please."
+#: ../../Zotlabs/Widget/Activity_filter.php:183
+#, php-format
+msgid "Show posts that I have filed to %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:47
-msgid "Conversation Settings"
+#: ../../Zotlabs/Widget/Activity_filter.php:193
+msgid "Show filed post categories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:19
-msgid "Remote Diagnostics App"
+#: ../../Zotlabs/Widget/Activity_filter.php:207
+msgid "Panel search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:20
-msgid "Perform diagnostics on remote channels"
+#: ../../Zotlabs/Widget/Activity_filter.php:217
+msgid "Filter by name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
-msgid "Invite App"
+#: ../../Zotlabs/Widget/Activity_filter.php:232
+msgid "Remove active filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:68
-msgid "Register is closed"
+#: ../../Zotlabs/Widget/Activity_filter.php:248
+msgid "Stream Filters"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
-msgid "Note, the invitation code is valid up to"
+#: ../../Zotlabs/Widget/Appstore.php:11
+msgid "App Collections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:115
-#, php-format
-msgid "Too many recipients for one invitation (max %d)"
+#: ../../Zotlabs/Widget/Appstore.php:13
+msgid "Installed apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:119
-msgid "No recipients for this invitation"
+#: ../../Zotlabs/Widget/Appstore.php:14 ../../Zotlabs/Module/Apps.php:50
+msgid "Available Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:133
-#, php-format
-msgid "(%s) : Not a valid email address"
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:138
-#, php-format
-msgid "(%s) : Not a real email address"
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:145
-#, php-format
-msgid "(%s) : Not allowed email address"
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:158
-#, php-format
-msgid "(%s) : email address already in use"
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:165
-#, php-format
-msgid "(%s) : Accepted email address"
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:252
-#: ../../extend/addon/hubzilla-addons/notifyadmin/notifyadmin.php:40
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:257
-#, php-format
-msgid "To %s : Message delivery success."
+#: ../../Zotlabs/Widget/Cover_photo.php:65
+msgid "Click to show more"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:289
+#: ../../Zotlabs/Widget/Follow.php:22
 #, php-format
-msgid "%1$d mail(s) sent, %2$d mail error(s)"
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:315
-msgid "Invites not proposed by configuration"
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:316
-msgid "Contact the site admin"
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:332
-msgid "Invites by users not enabled"
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:337
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Widget/Messages.php:22
+msgid "Public and restricted messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:353
-msgid "Not on xchan"
+#: ../../Zotlabs/Widget/Messages.php:23
+msgid "Direct messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:386
-msgid "All users invitation limit exceeded."
+#: ../../Zotlabs/Widget/Messages.php:24
+msgid "Starred messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:404
-msgid "Invitation expires after"
+#: ../../Zotlabs/Widget/Messages.php:26
+msgid "No messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
-msgid "Invitation"
+#: ../../Zotlabs/Widget/Newmember.php:31
+msgid "Profile Creation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:534
-msgid "Send invitations"
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "Upload profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:535
-msgid "Invitations I am using"
+#: ../../Zotlabs/Widget/Newmember.php:34
+msgid "Upload cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:536
-msgid "Invitations we are using"
+#: ../../Zotlabs/Widget/Newmember.php:38
+msgid "Find and Connect with others"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:537
-msgid "§ Note, the email(s) sent will be recorded in the system logs"
+#: ../../Zotlabs/Widget/Newmember.php:40
+msgid "View the directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:538
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Widget/Newmember.php:41 ../../Zotlabs/Module/Go.php:38
+msgid "View friend suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:539
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:164
-msgid "Your message:"
+#: ../../Zotlabs/Widget/Newmember.php:42
+msgid "Manage your connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:540
-msgid "Invite template"
+#: ../../Zotlabs/Widget/Newmember.php:45
+msgid "Communicate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:542
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:161
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:303
-msgid "Subject:"
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "View your channel homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:548
-msgid "Here you may enter personal notes to the recipient(s)"
+#: ../../Zotlabs/Widget/Newmember.php:48
+msgid "View your network stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "About this site"
+#: ../../Zotlabs/Widget/Newmember.php:54
+msgid "Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:22
-msgid "Site Name"
+#: ../../Zotlabs/Widget/Newmember.php:57
+msgid "Missing Features?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
-msgid "Administrator"
+#: ../../Zotlabs/Widget/Newmember.php:59
+msgid "Pin apps to navigation bar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "Software and Project information"
+#: ../../Zotlabs/Widget/Newmember.php:60
+msgid "Install more apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid "This site is powered by $Projectname"
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "View public stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
+#: ../../Zotlabs/Widget/Newmember.php:75
+#: ../../Zotlabs/Module/Settings/Display.php:203
+msgid "New Member Links"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Additional federated transport protocols:"
+#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:708
+msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:709
+msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:37
-msgid "Project homepage"
+#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:711
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
-msgid "Developer homepage"
+#: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97
+#: ../../Zotlabs/Module/Connections.php:111
+#: ../../Zotlabs/Module/Connedit.php:712
+msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
+#: ../../Zotlabs/Widget/Affinity.php:54
+msgid "Refresh"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
+#: ../../Zotlabs/Widget/Notifications.php:17
+msgid "New network activity notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
+#: ../../Zotlabs/Widget/Notifications.php:20
+msgid "Network stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
+#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Zotlabs/Widget/Notifications.php:62
+msgid "Mark all notifications read"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
+#: ../../Zotlabs/Widget/Notifications.php:26
+#: ../../Zotlabs/Widget/Notifications.php:46
+#: ../../Zotlabs/Widget/Notifications.php:65
+#: ../../Zotlabs/Widget/Notifications.php:157
+msgid "Show new posts only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lang.php:17
-msgid "Language App"
+#: ../../Zotlabs/Widget/Notifications.php:27
+#: ../../Zotlabs/Widget/Notifications.php:47
+#: ../../Zotlabs/Widget/Notifications.php:66
+#: ../../Zotlabs/Widget/Notifications.php:127
+#: ../../Zotlabs/Widget/Notifications.php:158
+msgid "Filter by name or address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lang.php:18
-msgid "Change UI language"
+#: ../../Zotlabs/Widget/Notifications.php:37
+msgid "New home activity notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "Welcome to Hubzilla!"
+#: ../../Zotlabs/Widget/Notifications.php:40
+msgid "Home stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "You have got no unseen posts..."
+#: ../../Zotlabs/Widget/Notifications.php:43
+#: ../../Zotlabs/Widget/Notifications.php:154
+msgid "Mark all notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:196
-#: ../../Zotlabs/Module/Cover_photo.php:254
-msgid "Cover Photos"
+#: ../../Zotlabs/Widget/Notifications.php:56
+msgid "New direct messages notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4966
-msgid "female"
+#: ../../Zotlabs/Widget/Notifications.php:59
+msgid "Direct messages stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4967
-#, php-format
-msgid "%1$s updated her %2$s"
+#: ../../Zotlabs/Widget/Notifications.php:75
+msgid "New events notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4968
-msgid "male"
+#: ../../Zotlabs/Widget/Notifications.php:78
+msgid "View events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4969
-#, php-format
-msgid "%1$s updated his %2$s"
+#: ../../Zotlabs/Widget/Notifications.php:81
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4971
-#, php-format
-msgid "%1$s updated their %2$s"
+#: ../../Zotlabs/Widget/Notifications.php:89
+#: ../../Zotlabs/Module/Connections.php:165
+msgid "New Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2356
-msgid "cover photo"
+#: ../../Zotlabs/Widget/Notifications.php:90
+msgid "New connections notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:418
-msgid "Your cover photo may be visible to anybody on the internet"
+#: ../../Zotlabs/Widget/Notifications.php:93
+msgid "View all connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:422
-msgid "Change Cover Photo"
+#: ../../Zotlabs/Widget/Notifications.php:102
+msgid "New files notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:68
-msgid "Unable to update menu."
+#: ../../Zotlabs/Widget/Notifications.php:109
+#: ../../Zotlabs/Widget/Notifications.php:110
+msgid "Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:79
-msgid "Unable to create menu."
+#: ../../Zotlabs/Widget/Notifications.php:113
+msgid "View all notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
-msgid "Menu Name"
+#: ../../Zotlabs/Widget/Notifications.php:116
+msgid "Mark all notices seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:161
-msgid "Unique name (not visible on webpage) - required"
+#: ../../Zotlabs/Widget/Notifications.php:137
+msgid "Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
-msgid "Menu Title"
+#: ../../Zotlabs/Widget/Notifications.php:138
+msgid "New registrations notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:162
-msgid "Visible on webpage - leave empty for no title"
+#: ../../Zotlabs/Widget/Notifications.php:147
+#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:376
+msgid "Public Stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:163
-msgid "Allow Bookmarks"
+#: ../../Zotlabs/Widget/Notifications.php:148
+msgid "New public stream notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-msgid "Menu may be used to store saved bookmarks"
+#: ../../Zotlabs/Widget/Notifications.php:151
+msgid "Public stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
-msgid "Submit and proceed"
+#: ../../Zotlabs/Widget/Notifications.php:165
+msgid "Sorry, you have got no notifications at the moment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2713
-msgid "Menus"
+#: ../../Zotlabs/Module/Tokens.php:39
+#, php-format
+msgid "This channel is limited to %d tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:181
-msgid "Bookmarks allowed"
+#: ../../Zotlabs/Module/Tokens.php:45
+msgid "Name and Password are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:183
-msgid "Delete this menu"
+#: ../../Zotlabs/Module/Tokens.php:85
+msgid "Token saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
-msgid "Edit menu contents"
+#: ../../Zotlabs/Module/Tokens.php:99
+msgid "Guest Access App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:185
-msgid "Edit this menu"
+#: ../../Zotlabs/Module/Tokens.php:100
+msgid "Create access tokens so that non-members can access private content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:201
-msgid "Menu could not be deleted."
+#: ../../Zotlabs/Module/Tokens.php:133
+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/Menu.php:214
-msgid "Edit Menu"
+#: ../../Zotlabs/Module/Tokens.php:135
+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/Menu.php:218
-msgid "Add or remove entries to this menu"
+#: ../../Zotlabs/Module/Tokens.php:170
+msgid "Guest Access Tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Menu name"
+#: ../../Zotlabs/Module/Tokens.php:177
+msgid "Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Must be unique, only seen by you"
+#: ../../Zotlabs/Module/Tokens.php:178
+msgid "Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title"
+#: ../../Zotlabs/Module/Tokens.php:179
+msgid "Expires (yyyy-mm-dd)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title as seen by others"
+#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:892
+msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:222
-msgid "Allow bookmarks"
+#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:893
+msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:41
-msgid "Failed to create source. No channel selected."
+#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
+#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:888
+msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:57
-msgid "Source created."
+#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
+#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:895
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:70
-msgid "Source updated."
+#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128
+#: ../../Zotlabs/Module/Connedit.php:896
+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/Sources.php:88
-msgid "Sources App"
+#: ../../Zotlabs/Module/Article_edit.php:17
+#: ../../Zotlabs/Module/Article_edit.php:33
+#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Editpost.php:24
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79
+msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:89
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../Zotlabs/Module/Article_edit.php:44
+#: ../../Zotlabs/Module/Attach_edit.php:52
+#: ../../Zotlabs/Module/Wall_upload.php:31
+#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:95
+#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Attach.php:22
+#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Block.php:41
+msgid "Channel not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:101
-msgid "*"
+#: ../../Zotlabs/Module/Article_edit.php:127
+msgid "Edit Article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368
-msgid "Channel Sources"
+#: ../../Zotlabs/Module/Attach_edit.php:69
+#: ../../Zotlabs/Module/Filestorage.php:109
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:108
-msgid "Manage remote sources of content for your channel."
+#: ../../Zotlabs/Module/Attach_edit.php:118
+msgid "Can not copy folder into itself."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
-msgid "New Source"
+#: ../../Zotlabs/Module/Attach_edit.php:131
+#, php-format
+msgid "Can not move folder \"%s\" into itself."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+#: ../../Zotlabs/Module/Network.php:107
+msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
-msgid "Only import content with these words (one per line)"
+#: ../../Zotlabs/Module/Network.php:156
+msgid "No such channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
-msgid "Leave blank to import all public content"
+#: ../../Zotlabs/Module/Network.php:168 ../../Zotlabs/Module/Channel.php:234
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
-msgid "Channel Name"
+#: ../../Zotlabs/Module/Network.php:209 ../../Zotlabs/Module/Channel.php:269
+#: ../../Zotlabs/Module/Hq.php:113 ../../Zotlabs/Module/Pubstream.php:95
+#: ../../Zotlabs/Module/Display.php:76
+msgid "Reset form"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
+#: ../../Zotlabs/Module/Network.php:243
+msgid "Privacy group is empty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-msgid "Resend posts with this channel as author"
+#: ../../Zotlabs/Module/Network.php:253
+msgid "Privacy group: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-msgid "Copyrights may apply"
+#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:68
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
-msgid "Source not found."
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:83
+#: ../../Zotlabs/Module/Import.php:99
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:151
-msgid "Edit Source"
+#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:106
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:152
-msgid "Delete Source"
+#: ../../Zotlabs/Module/Import_items.php:93
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:182
-msgid "Source removed"
+#: ../../Zotlabs/Module/Import_items.php:108
+msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:184
-msgid "Unable to remove source."
+#: ../../Zotlabs/Module/Import_items.php:125
+msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:165
-msgid "Poke App"
+#: ../../Zotlabs/Module/Import_items.php:126
+msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:166
-msgid "Poke somebody in your addressbook"
+#: ../../Zotlabs/Module/Import_items.php:127
+#: ../../Zotlabs/Module/Import.php:565
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:351
-#: ../../include/conversation.php:1143
-msgid "Poke"
+#: ../../Zotlabs/Module/Import.php:162
+#, php-format
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:200
-msgid "Poke somebody"
+#: ../../Zotlabs/Module/Import.php:189
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:203
-msgid "Poke/Prod"
+#: ../../Zotlabs/Module/Import.php:558
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:204
-msgid "Poke, prod or do other things to somebody"
+#: ../../Zotlabs/Module/Import.php:563
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:211
-msgid "Recipient"
+#: ../../Zotlabs/Module/Import.php:564
+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/Poke.php:212
-msgid "Choose what you wish to do to recipient"
+#: ../../Zotlabs/Module/Import.php:566
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
-msgid "Make this post private"
+#: ../../Zotlabs/Module/Import.php:568
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:107
-msgid "No such group"
+#: ../../Zotlabs/Module/Import.php:569
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:156
-msgid "No such channel"
+#: ../../Zotlabs/Module/Import.php:570
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:243
-msgid "Privacy group is empty"
+#: ../../Zotlabs/Module/Import.php:571
+msgid "Import a few months of posts if possible (limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:253
-msgid "Privacy group: "
+#: ../../Zotlabs/Module/Import.php:573
+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/Network.php:326
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:29
-msgid "Invalid channel."
+#: ../../Zotlabs/Module/Import.php:575
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Attach_edit.php:118
-msgid "Can not copy folder into itself."
+#: ../../Zotlabs/Module/Import.php:576
+msgid "Move this channel (disable all previous locations)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Attach_edit.php:131
-#, php-format
-msgid "Can not move folder \"%s\" into itself."
+#: ../../Zotlabs/Module/Import.php:577
+msgid "Use this channel nickname instead of the one provided"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
-msgid "item"
+#: ../../Zotlabs/Module/Import.php:577
+msgid ""
+"Leave blank to keep your existing channel nickname. You will be randomly "
+"assigned a similar nickname if either name is already allocated on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Import.php:579
+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/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Channel.php:44
+#: ../../Zotlabs/Module/Chat.php:29
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:292
-msgid "Change filename to"
+#: ../../Zotlabs/Module/Z6trans.php:19
+msgid "Update to Hubzilla 5.0 step 2"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
-msgid "Select a target location"
+#: ../../Zotlabs/Module/Z6trans.php:21
+msgid "To complete the update please run"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
-msgid "Copy to target location"
+#: ../../Zotlabs/Module/Z6trans.php:23
+msgid "php util/z6convert.php"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
-msgid "Set permissions for all files and sub folders"
+#: ../../Zotlabs/Module/Z6trans.php:25
+msgid "from the terminal."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:312
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Register.php:112
+msgid "Email address required"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:351
-msgid "File category"
+#: ../../Zotlabs/Module/Register.php:156
+msgid "No password provided"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:362
-msgid "Total"
+#: ../../Zotlabs/Module/Register.php:179
+msgid "Terms of Service not accepted"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:364
-msgid "Shared"
+#: ../../Zotlabs/Module/Register.php:241
+msgid "Invitation code succesfully applied"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:366
-msgid "Add Files"
+#: ../../Zotlabs/Module/Register.php:261
+msgid "Invitation not in time or too late"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:369 ../../Zotlabs/Lib/ThreadItem.php:175
-msgid "Admin Delete"
+#: ../../Zotlabs/Module/Register.php:267
+msgid "Invitation email failed"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:381
-msgid "parent"
+#: ../../Zotlabs/Module/Register.php:275
+msgid "Invitation code failed"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:399
-msgid "Select All"
+#: ../../Zotlabs/Module/Register.php:282
+msgid "Invitations are not available"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:400
-msgid "Bulk Actions"
+#: ../../Zotlabs/Module/Register.php:292
+msgid "Registration on this hub is by invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:401
-msgid "Adjust Permissions"
+#: ../../Zotlabs/Module/Register.php:399
+msgid "New register request"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:402
-msgid "Move or Copy"
+#: ../../Zotlabs/Module/Register.php:417
+msgid "Error creating dId A"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:405
-msgid "Info"
+#: ../../Zotlabs/Module/Register.php:435
+msgid "Registration on this hub is disabled."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:406
-msgid "Rename"
+#: ../../Zotlabs/Module/Register.php:444
+msgid "Registration on this hub is by approval only."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:360
-msgid "Post"
+#: ../../Zotlabs/Module/Register.php:445
+msgid "Register at another affiliated hub in case when prefered"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:408
-msgid "Attachment BBcode"
+#: ../../Zotlabs/Module/Register.php:458
+msgid "Registration on this hub is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:409
-msgid "Embed BBcode"
+#: ../../Zotlabs/Module/Register.php:459
+msgid "Register at another affiliated hub"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:410
-msgid "Link BBcode"
+#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Terms of Service"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:480
+#: ../../Zotlabs/Module/Register.php:479
 #, php-format
-msgid "You are using %1$s of your available file storage."
+msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:485
+#: ../../Zotlabs/Module/Register.php:486
 #, php-format
-msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
-msgstr ""
-
-#: ../../Zotlabs/Storage/Browser.php:496
-msgid "WARNING:"
-msgstr ""
-
-#: ../../Zotlabs/Storage/Browser.php:537
-msgid "Create new folder"
+msgid "I am over %s years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:539
-msgid "Upload file"
+#: ../../Zotlabs/Module/Register.php:496
+msgid "Your email address"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:551
-msgid "Drop files here to immediately upload"
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Oauth.php:117
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
+msgid "Optional"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:554
-msgid ""
-"You can select files via the upload button or drop them right here or into "
-"an existing folder."
+#: ../../Zotlabs/Module/Register.php:503
+msgid "Choose a password"
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:154
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+#: ../../Zotlabs/Module/Register.php:504
+msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:266
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:76
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:178
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
+#: ../../Zotlabs/Module/Register.php:506
+msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:23
-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."
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Your name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:271
-msgid "Add new connections to this privacy group"
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Real name is preferred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:302 ../../Zotlabs/Lib/AccessList.php:311
-#: ../../include/group.php:305
-msgid "edit"
+#: ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/New_channel.php:177
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:325 ../../include/group.php:328
-msgid "Edit group"
+#: ../../Zotlabs/Module/Register.php:510
+msgid ""
+"Your nickname will be used to create an easy to remember channel address"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:329
-msgid "Add privacy group"
+#: ../../Zotlabs/Module/Register.php:514
+msgid "Why do you want to join this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:330
-msgid "Channels not in any privacy group"
+#: ../../Zotlabs/Module/Register.php:514
+msgid "This will help to review your registration"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Lib/AccessList.php:336
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:332
-msgid "add"
+#: ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:413
+msgid "Registration"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
-#: ../../include/follow.php:39
-msgid "Channel is blocked on this site."
+#: ../../Zotlabs/Module/Register.php:528
+msgid "I have an invite code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:51 ../../include/follow.php:44
-msgid "Channel location missing."
+#: ../../Zotlabs/Module/Register.php:575
+msgid ""
+"This site has exceeded the number of allowed daily account registrations."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:103 ../../include/follow.php:168
-msgid "Remote channel or protocol unavailable."
+#: ../../Zotlabs/Module/Search.php:21
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Directory.php:72
+#: ../../Zotlabs/Module/Directory.php:77 ../../Zotlabs/Module/Photos.php:519
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:137 ../../include/follow.php:192
-msgid "Channel discovery failed."
+#: ../../Zotlabs/Module/Search.php:249
+#, php-format
+msgid "Items tagged with: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:155 ../../include/follow.php:204
-msgid "Protocol disabled."
+#: ../../Zotlabs/Module/Search.php:251
+#, php-format
+msgid "Search results for: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:167 ../../include/follow.php:215
-msgid "Cannot connect to yourself."
+#: ../../Zotlabs/Module/Setup.php:169
+msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:271
-msgid "error saving data"
+#: ../../Zotlabs/Module/Setup.php:173
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:323
-msgid "Apps"
+#: ../../Zotlabs/Module/Setup.php:177
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:324
-msgid "Affinity Tool"
+#: ../../Zotlabs/Module/Setup.php:184
+msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:327
-msgid "Site Admin"
+#: ../../Zotlabs/Module/Setup.php:190
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:328
-#: ../../extend/addon/hubzilla-addons/buglink/buglink.php:16
-msgid "Report Bug"
+#: ../../Zotlabs/Module/Setup.php:196
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:329 ../../include/nav.php:490
-msgid "Bookmarks"
+#: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261
+#: ../../Zotlabs/Module/Setup.php:768
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:330 ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/nav.php:477 ../../include/nav.php:480
-msgid "Chatrooms"
+#: ../../Zotlabs/Module/Setup.php:258
+msgid "System check"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:331
-msgid "Content Filter"
+#: ../../Zotlabs/Module/Setup.php:262 ../../Zotlabs/Module/Cdav.php:1037
+#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:956
+msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:332
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:135
-msgid "Content Import"
+#: ../../Zotlabs/Module/Setup.php:263
+msgid "Check again"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:334
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Module/Setup.php:284
+msgid "Database connection"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Suggest Channels"
+#: ../../Zotlabs/Module/Setup.php:285
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127
-#: ../../include/nav.php:131 ../../boot.php:1716
-msgid "Login"
+#: ../../Zotlabs/Module/Setup.php:286
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:338
-msgid "Stream"
+#: ../../Zotlabs/Module/Setup.php:287
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:342 ../../include/nav.php:539
-msgid "Wiki"
+#: ../../Zotlabs/Module/Setup.php:291
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:343 ../../include/features.php:104
-msgid "Channel Home"
+#: ../../Zotlabs/Module/Setup.php:291
+msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:82
-#: ../../include/nav.php:463 ../../include/nav.php:466
-msgid "Calendar"
+#: ../../Zotlabs/Module/Setup.php:292
+msgid "Database Port"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:347 ../../include/features.php:192
-msgid "Directory"
+#: ../../Zotlabs/Module/Setup.php:292
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:349
-msgid "Mail"
+#: ../../Zotlabs/Module/Setup.php:293
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:352
-msgid "Chat"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:354
-msgid "Probe"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:355
-msgid "Suggest"
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Type"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:356
-msgid "Random Channel"
+#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:357
-msgid "Invite"
+#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Widget/Admin.php:26
-msgid "Features"
+#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+msgid "Website URL"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:359
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:69
-msgid "Language"
+#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:361
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:58
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:59
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:60
-msgid "Profile Photo"
+#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:342
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:363 ../../include/features.php:382
-msgid "Profiles"
+#: ../../Zotlabs/Module/Setup.php:327
+msgid "Site settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:365
-msgid "Notifications"
+#: ../../Zotlabs/Module/Setup.php:381
+msgid "PHP version 7.1 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:366
-msgid "Order Apps"
+#: ../../Zotlabs/Module/Setup.php:382
+msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:367
-msgid "CardDAV"
+#: ../../Zotlabs/Module/Setup.php:398
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:369
-msgid "Guest Access"
+#: ../../Zotlabs/Module/Setup.php:399
+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/Lib/Apps.php:370 ../../Zotlabs/Widget/Notes.php:21
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2625
-msgid "Notes"
+#: ../../Zotlabs/Module/Setup.php:403
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:371
-msgid "OAuth Apps Manager"
+#: ../../Zotlabs/Module/Setup.php:403
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:372
-msgid "OAuth2 Apps Manager"
+#: ../../Zotlabs/Module/Setup.php:408
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:373
-msgid "PDL Editor"
+#: ../../Zotlabs/Module/Setup.php:418
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:376
-msgid "My Chatrooms"
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:377
-msgid "Channel Export"
+#: ../../Zotlabs/Module/Setup.php:423
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:554
-msgid "Purchase"
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:559
-msgid "Undelete"
+#: ../../Zotlabs/Module/Setup.php:446
+msgid ""
+"This is not sufficient to upload larger images or files. You should be able "
+"to upload at least 4 MB at once."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:569
-msgid "Add to app-tray"
+#: ../../Zotlabs/Module/Setup.php:448
+#, 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/Lib/Apps.php:570
-msgid "Remove from app-tray"
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "You can adjust these settings in the server php.ini file."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:571
-msgid "Pin to navbar"
+#: ../../Zotlabs/Module/Setup.php:456
+msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:572
-msgid "Unpin from navbar"
+#: ../../Zotlabs/Module/Setup.php:479
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:67
-msgid "Source code of failed update: "
+#: ../../Zotlabs/Module/Setup.php:480
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:88
-#, php-format
-msgid "Update Error at %s"
+#: ../../Zotlabs/Module/Setup.php:483
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:94
-#, php-format
-msgid "Update %s failed. See error logs."
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:28
-msgid ""
-"A deleted list with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this list and any future members. If this is "
-"not what you intended, please create another list with a different name."
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:286
-msgid "Add new connections to this access list"
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:331
-msgid "Lists"
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "PDO database PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:332
-msgid "Edit list"
+#: ../../Zotlabs/Module/Setup.php:504
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:333
-msgid "Create new list"
+#: ../../Zotlabs/Module/Setup.php:505
+msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/AccessList.php:334
-msgid "Channels not in any access list"
+#: ../../Zotlabs/Module/Setup.php:506
+msgid "zip PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:25
-msgid "Missing room name"
+#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:34
-msgid "Duplicate room name"
+#: ../../Zotlabs/Module/Setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
-msgid "Invalid room specifier."
+#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
+msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:124
-msgid "Room not found."
+#: ../../Zotlabs/Module/Setup.php:516
+msgid ""
+"Error: exec is required but is either not installed or has been disabled in "
+"php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:145
-msgid "Room is full"
+#: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525
+msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
-msgid "0. Beginner/Basic"
+#: ../../Zotlabs/Module/Setup.php:522
+msgid ""
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
-msgid "1. Novice - not skilled but willing to learn"
+#: ../../Zotlabs/Module/Setup.php:530
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
-msgid "2. Intermediate - somewhat comfortable"
+#: ../../Zotlabs/Module/Setup.php:534
+msgid ""
+"Error: GD PHP module with JPEG support or ImageMagick graphics library "
+"required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
-msgid "3. Advanced - very comfortable"
+#: ../../Zotlabs/Module/Setup.php:538
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
-msgid "4. Expert - I can write computer code"
+#: ../../Zotlabs/Module/Setup.php:544
+msgid ""
+"Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
-msgid "5. Wizard - I probably know more than you do"
+#: ../../Zotlabs/Module/Setup.php:549
+msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60
-msgid "$Projectname Notification"
+#: ../../Zotlabs/Module/Setup.php:553
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:336
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:349
-#: ../../extend/addon/hubzilla-addons/diaspora/p.php:48
-msgid "$projectname"
+#: ../../Zotlabs/Module/Setup.php:557
+msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:63
-msgid "Thank You,"
+#: ../../Zotlabs/Module/Setup.php:561
+msgid "Error: zip PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:33
-#, php-format
-msgid "%s Administrator"
+#: ../../Zotlabs/Module/Setup.php:580 ../../Zotlabs/Module/Setup.php:589
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:66
-#, php-format
-msgid "This email was sent by %1$s at %2$s."
+#: ../../Zotlabs/Module/Setup.php:585
+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/Lib/Enotify.php:67
-#, php-format
+#: ../../Zotlabs/Module/Setup.php:586
 msgid ""
-"To stop receiving these messages, please adjust your Notification Settings "
-"at %s"
+"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/Lib/Enotify.php:68
-#, php-format
-msgid "To stop receiving these messages, please adjust your %s."
+#: ../../Zotlabs/Module/Setup.php:587
+msgid "Please see install/INSTALL.txt for additional information."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../Zotlabs/Module/Setup.php:603
+msgid ""
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Zotlabs/Module/Setup.php:604
 #, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
+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/Lib/Enotify.php:129
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
+#: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Zotlabs/Module/Setup.php:606
 #, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:130
-msgid "a private message"
+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/Lib/Enotify.php:131
+#: ../../Zotlabs/Module/Setup.php:609
 #, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:144
-msgid "commented on"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:157
-msgid "liked"
+msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:160
-msgid "disliked"
+#: ../../Zotlabs/Module/Setup.php:625
+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 top level "
+"web folder"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:165
-msgid "voted on"
+#: ../../Zotlabs/Module/Setup.php:629
+msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:208
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
+#: ../../Zotlabs/Module/Setup.php:661
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:216
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../Zotlabs/Module/Setup.php:662
+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/Lib/Enotify.php:225
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Module/Setup.php:663
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:237
-#, php-format
-msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Module/Setup.php:664
+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/Lib/Enotify.php:239
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Module/Setup.php:665
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:240
-#, php-format
-msgid "%1$s commented on an item/conversation you have been following."
+#: ../../Zotlabs/Module/Setup.php:666
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324
-#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365
-#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../Zotlabs/Module/Setup.php:667
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248
-#, php-format
-msgid "Please visit %s to approve or reject this comment."
+#: ../../Zotlabs/Module/Setup.php:669
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:306
-#, php-format
-msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
+#: ../../Zotlabs/Module/Setup.php:675
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:320
-#, php-format
-msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Module/Setup.php:678
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:321
-#, php-format
-msgid "%1$s liked an item/conversation you created."
+#: ../../Zotlabs/Module/Setup.php:691
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:332
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
+#: ../../Zotlabs/Module/Setup.php:766
+msgid "<h1>What next?</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:334
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+#: ../../Zotlabs/Module/Setup.php:767
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:336
-#, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:359
+#: ../../Zotlabs/Module/Viewconnections.php:105
 #, php-format
-msgid "[$Projectname:Notify] %s tagged you"
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:360
-#, php-format
-msgid "%1$s tagged you at %2$s"
+#: ../../Zotlabs/Module/Viewconnections.php:135
+msgid "View Connections"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:361
-#, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
+#: ../../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/Lib/Enotify.php:372
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:373
-#, php-format
-msgid "%1$s poked you at %2$s"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:374
-#, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:389
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:390
-#, php-format
-msgid "%1$s tagged your post at %2$s"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:391
-#, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
+#: ../../Zotlabs/Module/Pubsites.php:49
+msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:402
-msgid "[$Projectname:Notify] Introduction received"
+#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:260
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:212
+#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Layouts.php:198
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:403
-#, php-format
-msgid "You've received an new connection request from '%1$s' at %2$s"
+#: ../../Zotlabs/Module/Channel.php:144 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Profile.php:62
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:404
-#, php-format
-msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
+#: ../../Zotlabs/Module/Channel.php:151 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Profile.php:69
+msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../Zotlabs/Module/Channel.php:219
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:409
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../Zotlabs/Module/Channel.php:496 ../../Zotlabs/Module/Display.php:354
+msgid ""
+"You must enable javascript for your browser to be able to view this content."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:416
-msgid "[$Projectname:Notify] Friend suggestion received"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:417
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:418
-#, php-format
-msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:423
-msgid "Name:"
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:424
-msgid "Photo:"
+#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Zotlabs/Module/Connections.php:218
+msgid "All Connections"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:427
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../Zotlabs/Module/Group.php:46
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:652
-msgid "[$Projectname:Notify]"
+#: ../../Zotlabs/Module/Group.php:49
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-msgid "created a new poll"
+#: ../../Zotlabs/Module/Group.php:81
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-msgid "created a new post"
+#: ../../Zotlabs/Module/Group.php:107
+msgid "Privacy Groups App"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:821
-#, php-format
-msgid "voted on %s's poll"
+#: ../../Zotlabs/Module/Group.php:108
+msgid "Management of privacy groups"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:821
-#, php-format
-msgid "commented on %s's post"
+#: ../../Zotlabs/Module/Group.php:143
+msgid "Add Group"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:825
-#, php-format
-msgid "repeated %s's post"
+#: ../../Zotlabs/Module/Group.php:147
+msgid "Privacy group name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:837
-#, php-format
-msgid "edited a post dated %s"
+#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:841
-#, php-format
-msgid "edited a comment dated %s"
+#: ../../Zotlabs/Module/Group.php:156 ../../Zotlabs/Module/Help.php:84
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:970
-msgid "created an event"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:986
-msgid "status verified"
+#: ../../Zotlabs/Module/Group.php:186
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libsync.php:740 ../../include/zot.php:2663
+#: ../../Zotlabs/Module/Group.php:252
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "Privacy Group: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:94
-msgid "(No Title)"
+#: ../../Zotlabs/Module/Group.php:254
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:109
-msgid "Wiki page create failed."
+#: ../../Zotlabs/Module/Group.php:259
+msgid "Delete Group"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:123
-msgid "Wiki not found."
+#: ../../Zotlabs/Module/Group.php:270
+msgid "Group members"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:134
-msgid "Destination name already exists"
+#: ../../Zotlabs/Module/Group.php:272
+msgid "Not in this group"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:167
-#: ../../Zotlabs/Lib/NativeWikiPage.php:368
-msgid "Page not found"
+#: ../../Zotlabs/Module/Group.php:304
+msgid "Click a channel to toggle membership"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:200
-msgid "Error reading page content"
+#: ../../Zotlabs/Module/Card_edit.php:129
+msgid "Edit Card"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
-#: ../../Zotlabs/Lib/NativeWikiPage.php:409
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480
-#: ../../Zotlabs/Lib/NativeWikiPage.php:522
-msgid "Error reading wiki"
+#: ../../Zotlabs/Module/Go.php:21
+msgid "This page is available only to site members"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:396
-msgid "Page update failed."
+#: ../../Zotlabs/Module/Go.php:27
+msgid "Welcome"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:431
-msgid "Nothing deleted"
+#: ../../Zotlabs/Module/Go.php:29
+msgid "What would you like to do?"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:501
-msgid "Compare: object not found."
+#: ../../Zotlabs/Module/Go.php:31
+msgid ""
+"Please bookmark this page if you would like to return to it in the future"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
-msgid "Page updated"
+#: ../../Zotlabs/Module/Go.php:35
+msgid "Upload a profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:511
-msgid "Untitled"
+#: ../../Zotlabs/Module/Go.php:36
+msgid "Upload a cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:517
-msgid "Wiki resource_id required for git commit"
+#: ../../Zotlabs/Module/Go.php:37
+msgid "Edit your default profile"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-msgctxt "wiki_history"
-msgid "Message"
+#: ../../Zotlabs/Module/Go.php:39
+msgid "View the channel directory"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:578
-#: ../../Zotlabs/Widget/Wiki_page_history.php:24
-msgid "Date"
+#: ../../Zotlabs/Module/Go.php:40
+msgid "View/edit your channel settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:580
-#: ../../Zotlabs/Widget/Wiki_page_history.php:26
-msgid "Compare"
+#: ../../Zotlabs/Module/Go.php:41
+msgid "View the site or project documentation"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:618 ../../include/bbcode.php:1050
-#: ../../include/bbcode.php:1217
-msgid "Different viewers will see this text differently"
+#: ../../Zotlabs/Module/Go.php:42
+msgid "Visit your channel homepage"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:739
-msgid "Private Message"
+#: ../../Zotlabs/Module/Go.php:43
+msgid ""
+"View your connections and/or add somebody whose address you already know"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:131
-msgid "Privacy conflict. Discretion advised."
+#: ../../Zotlabs/Module/Go.php:44
+msgid ""
+"View your personal stream (this may be empty until you add some connections)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../include/conversation.php:729
-msgid "Select"
+#: ../../Zotlabs/Module/Go.php:52
+msgid "View the public stream. Warning: this content is not moderated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
-msgid "I will attend"
+#: ../../Zotlabs/Module/Oauth.php:45
+msgid "Name is required"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
-msgid "I will not attend"
+#: ../../Zotlabs/Module/Oauth.php:49
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
-msgid "I might attend"
+#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
+#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1390
+#: ../../Zotlabs/Module/Admin/Addons.php:457
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Oauth2.php:58
+#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Lib/Apps.php:537
+msgid "Update"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
-msgid "I agree"
+#: ../../Zotlabs/Module/Oauth.php:100
+msgid "OAuth Apps Manager App"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
-msgid "I disagree"
+#: ../../Zotlabs/Module/Oauth.php:101
+msgid "OAuth authentication tokens for mobile and remote apps"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
-msgid "I abstain"
+#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
+#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Oauth2.php:143
+#: ../../Zotlabs/Module/Oauth2.php:193
+msgid "Add application"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:734
-msgid "Toggle Star Status"
+#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth2.php:118
+#: ../../Zotlabs/Module/Oauth2.php:146
+msgid "Name of application"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Widget/Pinned.php:88
-#: ../../include/conversation.php:748
-msgid "Message signature validated"
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Widget/Pinned.php:89
-#: ../../include/conversation.php:749
-msgid "Message signature incorrect"
+#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:935
-msgid "Conversation Tools"
+#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
+#: ../../Zotlabs/Module/Oauth2.php:148
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584
-msgid "like"
+#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
+msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:319 ../../include/taxonomy.php:585
-msgid "dislike"
+#: ../../Zotlabs/Module/Oauth.php:128
+msgid "Application not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "Reply on this comment"
+#: ../../Zotlabs/Module/Oauth.php:171
+msgid "Connected OAuth Apps"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "reply"
+#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "Reply to"
+#: ../../Zotlabs/Module/Oauth.php:176 ../../Zotlabs/Module/Oauth2.php:197
+msgid "No name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
-msgid "Share This"
+#: ../../Zotlabs/Module/Oauth.php:177 ../../Zotlabs/Module/Oauth2.php:198
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
-msgid "share"
+#: ../../Zotlabs/Module/Editwebpage.php:139
+msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:340
-msgid "Delivery Report"
+#: ../../Zotlabs/Module/Editwebpage.php:166
+msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:359
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-#, php-format
-msgid "%d unseen"
+#: ../../Zotlabs/Module/Dirsearch.php:24 ../../Zotlabs/Module/Regdir.php:52
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:413
-msgid "to"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Pinned.php:127
-msgid "via"
+#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:471
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:415
-msgid "Wall-to-Wall"
+#: ../../Zotlabs/Module/Chat.php:100
+msgid "Chatrooms App"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:416
-msgid "via Wall-To-Wall:"
+#: ../../Zotlabs/Module/Chat.php:101
+msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:430 ../../Zotlabs/Widget/Pinned.php:132
-#: ../../include/conversation.php:809
-#, php-format
-msgid "from %s"
+#: ../../Zotlabs/Module/Chat.php:194
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:433 ../../Zotlabs/Widget/Pinned.php:135
-#: ../../include/conversation.php:812
-#, php-format
-msgid "last edited: %s"
+#: ../../Zotlabs/Module/Chat.php:210
+msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:434 ../../Zotlabs/Widget/Pinned.php:136
-#: ../../include/conversation.php:813
-#, php-format
-msgid "Expires: %s"
+#: ../../Zotlabs/Module/Chat.php:211
+msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:444
-msgid "Attend"
+#: ../../Zotlabs/Module/Chat.php:212
+msgid "I am away right now"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:445 ../../Zotlabs/Widget/Pinned.php:141
-msgid "Attendance Options"
+#: ../../Zotlabs/Module/Chat.php:213
+msgid "I am online"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1924
-msgid "Vote"
+#: ../../Zotlabs/Module/Chat.php:215
+msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../Zotlabs/Widget/Pinned.php:142
-msgid "Voting Options"
+#: ../../Zotlabs/Module/Chat.php:238
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:462
-msgid "Go to previous comment"
+#: ../../Zotlabs/Module/Chat.php:239
+msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:471 ../../Zotlabs/Widget/Pinned.php:154
-msgid "Pinned post"
+#: ../../Zotlabs/Module/Chat.php:240
+msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../Zotlabs/Widget/Pinned.php:155
-#: ../../include/js_strings.php:39
-msgid "Unpin from the top"
+#: ../../Zotlabs/Module/Chat.php:256
+#, php-format
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../include/js_strings.php:38
-msgid "Pin to the top"
+#: ../../Zotlabs/Module/Chat.php:261
+msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:474
-#: ../../extend/addon/hubzilla-addons/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
+#: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:135
+#: ../../Zotlabs/Module/Profiles.php:832 ../../Zotlabs/Module/Wiki.php:213
+msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:475
-msgid "Add to Calendar"
+#: ../../Zotlabs/Module/Chat.php:265
+msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:502 ../../include/conversation.php:516
-msgid "This is an unsaved preview"
+#: ../../Zotlabs/Module/Chat.php:266
+msgid "min"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:535 ../../include/js_strings.php:7
-#, php-format
-msgid "%s show all"
+#: ../../Zotlabs/Module/Channel_calendar.php:62
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1451
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:200
-msgid "Bold"
+#: ../../Zotlabs/Module/Channel_calendar.php:64
+#: ../../Zotlabs/Module/Channel_calendar.php:72
+#: ../../Zotlabs/Module/Channel_calendar.php:87
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1452
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:201
-msgid "Italic"
+#: ../../Zotlabs/Module/Channel_calendar.php:70
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1453
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:202
-msgid "Underline"
+#: ../../Zotlabs/Module/Channel_calendar.php:85
+#: ../../Zotlabs/Module/Channel_calendar.php:226
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1454
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:203
-msgid "Quote"
+#: ../../Zotlabs/Module/Channel_calendar.php:370
+msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1455
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:204
-msgid "Code"
+#: ../../Zotlabs/Module/Channel_calendar.php:372
+msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:833
-msgid "Image"
+#: ../../Zotlabs/Module/Channel_calendar.php:392
+#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165
+msgid "Link to source"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1456
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:205
-msgid "Attach/Upload file"
+#: ../../Zotlabs/Module/Channel_calendar.php:406
+msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:835
-msgid "Insert Link"
+#: ../../Zotlabs/Module/Channel_calendar.php:493
+msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:836
-msgid "Video"
+#: ../../Zotlabs/Module/Like.php:106
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:846
-msgid "Your full name (required)"
+#: ../../Zotlabs/Module/Like.php:112
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:847
-msgid "Your email address (required)"
+#: ../../Zotlabs/Module/Like.php:113
+msgid ""
+"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/Lib/ThreadItem.php:848
-msgid "Your website URL (optional)"
+#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
+#: ../../Zotlabs/Module/Like.php:230
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2163
-#, php-format
-msgid "Likes %1$s's %2$s"
+#: ../../Zotlabs/Module/Like.php:207
+msgid "thing"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2166
-#, php-format
-msgid "Doesn't like %1$s's %2$s"
+#: ../../Zotlabs/Module/Like.php:253
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2172
-#, php-format
-msgid "Will attend %s's event"
+#: ../../Zotlabs/Module/Like.php:289
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2175
+#: ../../Zotlabs/Module/Like.php:475
 #, php-format
-msgid "Will not attend %s's event"
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2178
+#: ../../Zotlabs/Module/Like.php:477
 #, php-format
-msgid "May attend %s's event"
+msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2181
+#: ../../Zotlabs/Module/Like.php:479
 #, php-format
-msgid "May not attend %s's event"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Activity.php:3114 ../../Zotlabs/Lib/Activity.php:3306
-#: ../../include/network.php:1767
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1490
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1939
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2147
-msgid "ActivityPub"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWiki.php:146
-msgid "Wiki updated successfully"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWiki.php:206
-msgid "Wiki files deleted successfully"
+msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:142
-msgid "Directory Options"
+#: ../../Zotlabs/Module/Like.php:586
+msgid "Action completed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:144
-msgid "Safe Mode"
+#: ../../Zotlabs/Module/Like.php:587
+msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../include/dir_fns.php:145
-msgid "Public Forums Only"
+#: ../../Zotlabs/Module/Poke.php:165
+msgid "Poke App"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/dir_fns.php:146
-msgid "This Website Only"
+#: ../../Zotlabs/Module/Poke.php:166
+msgid "Poke somebody in your addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:82
-msgctxt "permcat"
-msgid "default"
+#: ../../Zotlabs/Module/Poke.php:200
+msgid "Poke somebody"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:133
-msgctxt "permcat"
-msgid "follower"
+#: ../../Zotlabs/Module/Poke.php:203
+msgid "Poke/Prod"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:137
-msgctxt "permcat"
-msgid "contributor"
+#: ../../Zotlabs/Module/Poke.php:204
+msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:141
-msgctxt "permcat"
-msgid "publisher"
+#: ../../Zotlabs/Module/Poke.php:211
+msgid "Recipient"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzot.php:655 ../../include/zot.php:805
-msgid "Unable to verify channel signature"
+#: ../../Zotlabs/Module/Poke.php:212
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
-#: ../../include/acl_selectors.php:33
-msgid "Visible to your default audience"
+#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
+msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:136
-msgid "Only me"
+#: ../../Zotlabs/Module/Cdav.php:819
+msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Public"
+#: ../../Zotlabs/Module/Cdav.php:821
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
+#: ../../Zotlabs/Module/Cdav.php:877
+msgid "CardDAV App"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-#, php-format
-msgid "Any account on %s"
+#: ../../Zotlabs/Module/Cdav.php:878
+msgid "CalDAV capable addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
+#: ../../Zotlabs/Module/Cdav.php:1010
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
+#: ../../Zotlabs/Module/Cdav.php:1011
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
+#: ../../Zotlabs/Module/Cdav.php:1012
+msgid "End date and time"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
+#: ../../Zotlabs/Module/Cdav.php:1013
+msgid "Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cal.php:203
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
+#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Cal.php:205
+msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid "This is your default setting for who can view your connections"
+#: ../../Zotlabs/Module/Cdav.php:1039
+msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your file storage and photos"
+#: ../../Zotlabs/Module/Cdav.php:1040
+msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
+#: ../../Zotlabs/Module/Cdav.php:1041
+msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:115
-#: ../../include/contact_widgets.php:159 ../../include/contact_widgets.php:204
-#: ../../include/contact_widgets.php:239
-msgid "Everything"
+#: ../../Zotlabs/Module/Cdav.php:1042
+msgid "List month"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:37
-msgid "Select Channel"
+#: ../../Zotlabs/Module/Cdav.php:1043
+msgid "List week"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:42
-msgid "Read-write"
+#: ../../Zotlabs/Module/Cdav.php:1044
+msgid "List day"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:43
-msgid "Read-only"
+#: ../../Zotlabs/Module/Cdav.php:1052
+msgid "More"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:127
-msgid "Channel Calendar"
+#: ../../Zotlabs/Module/Cdav.php:1053
+msgid "Less"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:131
-msgid "Shared CalDAV Calendars"
+#: ../../Zotlabs/Module/Cdav.php:1055
+msgid "Select calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:135
-msgid "Share this calendar"
+#: ../../Zotlabs/Module/Cdav.php:1058
+msgid "Delete all"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:137
-msgid "Calendar name and color"
+#: ../../Zotlabs/Module/Cdav.php:1061
+msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:139
-msgid "Create new CalDAV calendar"
+#: ../../Zotlabs/Module/Cdav.php:1062
+msgid ""
+"Could not fetch calendar resource. The selected calendar might be disabled."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:141
-msgid "Calendar Name"
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:909
+msgid "Organisation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:142
-msgid "Calendar Tools"
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Connedit.php:911
+msgid "Phone"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:144
-msgid "Import calendar"
+#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:789
+#: ../../Zotlabs/Module/Connedit.php:913
+msgid "Instant messenger"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:145
-msgid "Select a calendar to import to"
+#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Connedit.php:914
+msgid "Website"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:172
-msgid "Addressbooks"
+#: ../../Zotlabs/Module/Cdav.php:1381
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:791
+#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Locs.php:127
+msgid "Address"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:174
-msgid "Addressbook name"
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Connedit.php:916
+msgid "Note"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:176
-msgid "Create new addressbook"
+#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:797
+#: ../../Zotlabs/Module/Connedit.php:921
+msgid "Add Contact"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:177
-msgid "Addressbook Name"
+#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Connedit.php:922
+msgid "Add Field"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:179
-msgid "Addressbook Tools"
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:927
+msgid "P.O. Box"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:180
-msgid "Import addressbook"
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:928
+msgid "Additional"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:181
-msgid "Select an addressbook to import to"
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:929
+msgid "Street"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Filer.php:28
-#: ../../Zotlabs/Widget/Activity_filter.php:189
-#: ../../include/contact_widgets.php:53 ../../include/features.php:318
-msgid "Saved Folders"
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:930
+msgid "Locality"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:323
-#: ../../include/taxonomy.php:460 ../../include/taxonomy.php:481
-msgid "Tags"
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:931
+msgid "Region"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Archive.php:43
-msgid "Archives"
+#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Connedit.php:932
+msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
-msgid "Chat Members"
+#: ../../Zotlabs/Module/Cdav.php:1399 ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Connedit.php:933
+msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Rating.php:51
-msgid "Rating Tools"
+#: ../../Zotlabs/Module/Cdav.php:1458
+msgid "Default Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
-msgid "Rate Me"
+#: ../../Zotlabs/Module/Cdav.php:1469
+msgid "Default Addressbook"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Rating.php:60
-msgid "View Ratings"
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:34
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
-msgid "Add new page"
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:85
-msgid "Wiki Pages"
+#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
+#: ../../Zotlabs/Module/Acl.php:123
+msgctxt "acl"
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
-msgid "Page name"
+#: ../../Zotlabs/Module/Item.php:757
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
-msgid "Bookmarked Chatrooms"
+#: ../../Zotlabs/Module/Item.php:1191
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
-msgid "photo/image"
+#: ../../Zotlabs/Module/Item.php:1336
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Forums.php:100
-#: ../../Zotlabs/Widget/Activity_filter.php:123
-#: ../../Zotlabs/Widget/Notifications.php:139
-#: ../../Zotlabs/Widget/Notifications.php:140
-#: ../../include/acl_selectors.php:125
-msgid "Forums"
+#: ../../Zotlabs/Module/Item.php:1370
+msgid "Your comment is awaiting approval."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
-msgid "Remove term"
+#: ../../Zotlabs/Module/Item.php:1500
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:310
-msgid "Saved Searches"
+#: ../../Zotlabs/Module/Item.php:1507
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Zotlabs/Module/Item.php:1514
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Follow.php:29
-msgid "Add New Connection"
+#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:209
+msgid "Menu not found."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Follow.php:30
-msgid "Enter channel address"
+#: ../../Zotlabs/Module/Mitem.php:63
+msgid "Unable to create element."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Follow.php:31
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../Zotlabs/Module/Mitem.php:87
+msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestions.php:53
-msgid "Suggestions"
+#: ../../Zotlabs/Module/Mitem.php:103
+msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestions.php:54
-msgid "See more..."
+#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Xchan.php:41
+#: ../../Zotlabs/Module/Menu.php:232
+msgid "Not found."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
+#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
+msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
-msgid "Member registrations waiting for confirmation"
+#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
+#: ../../Zotlabs/Module/Settings/Channel.php:528
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:29
-msgid "Inspect queue"
+#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
+msgid "Link Name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:31
-msgid "DB updates"
+#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
+msgid "Link or Submenu Target"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:200
-msgid "Admin"
+#: ../../Zotlabs/Module/Mitem.php:175
+msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:56
-msgid "Addon Features"
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
+msgid "Use magic-auth if available"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
-msgid "Overview"
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
+msgid "Open link in new window"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Appstore.php:11
-msgid "App Collections"
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Order in list"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Appstore.php:13
-msgid "Installed apps"
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:90
-msgid "Commented Date"
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Submit and finish"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:94
-msgid "Order by last commented date"
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Submit and continue"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:97
-msgid "Posted Date"
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Menu:"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:101
-msgid "Order by last posted date"
+#: ../../Zotlabs/Module/Mitem.php:192
+msgid "Link Target"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:104
-msgid "Date Unthreaded"
+#: ../../Zotlabs/Module/Mitem.php:195
+msgid "Edit menu"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:108
-msgid "Order unthreaded by date"
+#: ../../Zotlabs/Module/Mitem.php:198
+msgid "Edit element"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_order.php:123
-msgid "Stream Order"
+#: ../../Zotlabs/Module/Mitem.php:199
+msgid "Drop element"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
-msgid "Private Mail Menu"
+#: ../../Zotlabs/Module/Mitem.php:200
+msgid "New element"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
-msgid "Combined View"
+#: ../../Zotlabs/Module/Mitem.php:201
+msgid "Edit this menu container"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
-msgid "Inbox"
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Add menu element"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
-msgid "Outbox"
+#: ../../Zotlabs/Module/Mitem.php:203
+msgid "Delete this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
-msgid "New Message"
+#: ../../Zotlabs/Module/Mitem.php:204
+msgid "Edit this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Affinity.php:54
-msgid "Refresh"
+#: ../../Zotlabs/Module/Mitem.php:222
+msgid "Menu item not found."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
-msgid "HQ Control Panel"
+#: ../../Zotlabs/Module/Mitem.php:235
+msgid "Menu item deleted."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
-msgid "Create a new post"
+#: ../../Zotlabs/Module/Mitem.php:237
+msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
+#: ../../Zotlabs/Module/Mitem.php:244
+msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
+#: ../../Zotlabs/Module/Mitem.php:254
+msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
+#: ../../Zotlabs/Module/Profile.php:106
+msgid "vcard"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:37
-msgid "Direct Messages"
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+msgid "Files: shared with me"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:41
-msgid "Show direct (private) messages"
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+msgid "NEW"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:46
-msgid "Events"
+#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Zotlabs/Storage/Browser.php:380
+msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:50
-msgid "Show posts that include events"
+#: ../../Zotlabs/Module/Sharedwithme.php:110
+msgid "Remove all files"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:56
-msgid "Polls"
+#: ../../Zotlabs/Module/Sharedwithme.php:111
+msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:60
-msgid "Show posts that include polls"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:83
-#, php-format
-msgid "Show posts related to the %s privacy group"
+#: ../../Zotlabs/Module/Help.php:85
+msgid "Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:92
-msgid "Show my privacy groups"
+#: ../../Zotlabs/Module/Help.php:86
+msgid "Developers"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:116
-msgid "Show posts to this forum"
+#: ../../Zotlabs/Module/Help.php:87
+msgid "Tutorials"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:127
-msgid "Show forums"
+#: ../../Zotlabs/Module/Help.php:98
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:141
-msgid "Starred Posts"
+#: ../../Zotlabs/Module/Help.php:99
+msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:145
-msgid "Show posts that I have starred"
+#: ../../Zotlabs/Module/Webpages.php:48
+msgid "Webpages App"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:156
-msgid "Personal Posts"
+#: ../../Zotlabs/Module/Webpages.php:49
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:160
-msgid "Show posts that mention or involve me"
+#: ../../Zotlabs/Module/Webpages.php:69
+msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:183
-#, php-format
-msgid "Show posts that I have filed to %s"
+#: ../../Zotlabs/Module/Webpages.php:70
+msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
-msgid "Show filed post categories"
+#: ../../Zotlabs/Module/Webpages.php:93
+msgid "Export Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:207
-msgid "Panel search"
+#: ../../Zotlabs/Module/Webpages.php:94
+msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:217
-msgid "Filter by name"
+#: ../../Zotlabs/Module/Webpages.php:262
+msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:232
-msgid "Remove active filter"
+#: ../../Zotlabs/Module/Webpages.php:263
+msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity_filter.php:248
-msgid "Stream Filters"
+#: ../../Zotlabs/Module/Webpages.php:264
+msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity.php:50
-msgctxt "widget"
-msgid "Activity"
+#: ../../Zotlabs/Module/Webpages.php:265 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:191
+msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:16
-msgid "New Network Activity"
+#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Blocks.php:158
+#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:192
+msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:17
-msgid "New Network Activity Notifications"
+#: ../../Zotlabs/Module/Webpages.php:294
+msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:20
-msgid "View your network activity"
+#: ../../Zotlabs/Module/Webpages.php:306
+msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:23
-#: ../../Zotlabs/Widget/Notifications.php:62
-msgid "Mark all notifications read"
+#: ../../Zotlabs/Module/Webpages.php:317
+msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:65
-#: ../../Zotlabs/Widget/Notifications.php:172
-msgid "Show new posts only"
+#: ../../Zotlabs/Module/Webpages.php:344
+msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:47
-#: ../../Zotlabs/Widget/Notifications.php:66
-#: ../../Zotlabs/Widget/Notifications.php:142
-#: ../../Zotlabs/Widget/Notifications.php:173
-msgid "Filter by name or address"
+#: ../../Zotlabs/Module/Webpages.php:419
+msgid "Import complete."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:36
-msgid "New Home Activity"
+#: ../../Zotlabs/Module/Filestorage.php:14
+#: ../../Zotlabs/Module/Filestorage.php:53
+msgid "Deprecated!"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:37
-msgid "New Home Activity Notifications"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:40
-msgid "View your home activity"
+#: ../../Zotlabs/Module/Filestorage.php:190
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:43
-#: ../../Zotlabs/Widget/Notifications.php:169
-msgid "Mark all notifications seen"
+#: ../../Zotlabs/Module/Filestorage.php:203
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:55
-msgid "New Direct Messages"
+#: ../../Zotlabs/Module/Filestorage.php:204
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:56
-msgid "New Direct Messages Notifications"
+#: ../../Zotlabs/Module/Filestorage.php:206
+#: ../../Zotlabs/Storage/Browser.php:386
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:59
-msgid "View your direct messages"
+#: ../../Zotlabs/Module/Filestorage.php:207
+#: ../../Zotlabs/Storage/Browser.php:387
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:74
-msgid "New Mails"
+#: ../../Zotlabs/Module/Filestorage.php:209
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New Mails Notifications"
+#: ../../Zotlabs/Module/Filestorage.php:210
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View your private mails"
+#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Storage/Browser.php:552
+msgid "Show in your contacts shared folder"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all messages seen"
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:89
-msgid "New Events"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:90
-msgid "New Events Notifications"
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:93
-msgid "View events"
+#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:96
-msgid "Mark all events seen"
+#: ../../Zotlabs/Module/Connect.php:99
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:105
-msgid "New Connections Notifications"
+#: ../../Zotlabs/Module/Connect.php:101
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:108
-msgid "View all connections"
+#: ../../Zotlabs/Module/Connect.php:102
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:116
-msgid "New Files"
+#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:117
-msgid "New Files Notifications"
+#: ../../Zotlabs/Module/Connect.php:105
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:124
-#: ../../Zotlabs/Widget/Notifications.php:125
-msgid "Notices"
+#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:128
-msgid "View all notices"
+#: ../../Zotlabs/Module/Connect.php:115
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:131
-msgid "Mark all notices seen"
+#: ../../Zotlabs/Module/Connect.php:123
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:152
-msgid "New Registrations"
+#: ../../Zotlabs/Module/Cloud.php:120
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:153
-msgid "New Registrations Notifications"
+#: ../../Zotlabs/Module/Cloud.php:130
+msgid "Unknown error"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:163
-msgid "Public Stream Notifications"
+#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2180
+#, php-format
+msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:166
-msgid "View the public stream"
+#: ../../Zotlabs/Module/Share.php:120
+msgid "Post repeated"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:181
-msgid "Sorry, you have got no notifications at the moment"
+#: ../../Zotlabs/Module/Acl.php:370
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:156
-msgid "Don't show"
+#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:151
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:32
-msgid "Account settings"
+#: ../../Zotlabs/Module/Tagger.php:50
+msgid "Post not found."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:38
-msgid "Channel settings"
+#: ../../Zotlabs/Module/Tagger.php:121
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:46
-msgid "Display settings"
+#: ../../Zotlabs/Module/Authorize.php:17
+msgid "Unknown App"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:53
-msgid "Manage locations"
+#: ../../Zotlabs/Module/Authorize.php:29
+msgid "Authorize"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
-msgid "Suggested Chatrooms"
+#: ../../Zotlabs/Module/Authorize.php:30
+#, php-format
+msgid "Do you authorize the app %s to access your channel data?"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:17
-msgid "Received Messages"
+#: ../../Zotlabs/Module/Authorize.php:33
+#: ../../Zotlabs/Module/Admin/Accounts.php:319
+msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Sent Messages"
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Conversations"
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:37
-msgid "No messages."
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:31
-msgid "Profile Creation"
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:33
-msgid "Upload profile photo"
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:34
-msgid "Upload cover photo"
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:120
-msgid "Edit your profile"
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:38
-msgid "Find and Connect with others"
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:40
-msgid "View the directory"
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Zotlabs/Module/Admin/Addons.php:311
+msgid "Disable"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:42
-msgid "Manage your connections"
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Zotlabs/Module/Admin/Addons.php:314
+msgid "Enable"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:45
-msgid "Communicate"
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:47
-msgid "View your channel homepage"
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Zotlabs/Module/Admin/Accounts.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:408
+#: ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Addons.php:342
+#: ../../Zotlabs/Module/Admin/Addons.php:440 ../../Zotlabs/Module/Admin.php:140
+msgid "Administration"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:48
-msgid "View your network stream"
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Zotlabs/Module/Admin/Addons.php:344
+msgid "Toggle"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:54
-msgid "Documentation"
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Zotlabs/Module/Admin/Addons.php:352
+msgid "Author: "
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:57
-msgid "Missing Features?"
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Zotlabs/Module/Admin/Addons.php:353
+msgid "Maintainer: "
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:59
-msgid "Pin apps to navigation bar"
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:60
-msgid "Install more apps"
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Newmember.php:71
-msgid "View public stream"
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Cover_photo.php:65
-msgid "Click to show more"
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
 msgstr ""
 
-#: ../../util/nconfig.php:34
-msgid "Source channel not found."
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
 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"
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../Zotlabs/Module/Admin/Security.php:101
+msgid "Block public"
 msgstr ""
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../Zotlabs/Module/Admin/Security.php:101
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid "Provide a cloud root directory"
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid ""
+"The cloud root directory lists all channel names which provide public files"
 msgstr ""
 
-#: ../../include/contact_widgets.php:269
-msgid "Common Connections"
+#: ../../Zotlabs/Module/Admin/Security.php:103
+msgid "Show total disk space available to cloud uploads"
 msgstr ""
 
-#: ../../include/contact_widgets.php:273
-#, php-format
-msgid "View all %d common connections"
+#: ../../Zotlabs/Module/Admin/Security.php:104
+msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../include/conversation.php:183
-#, php-format
-msgid "likes %1$s's %2$s"
+#: ../../Zotlabs/Module/Admin/Security.php:105
+msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../include/conversation.php:186
-#, php-format
-msgid "doesn't like %1$s's %2$s"
+#: ../../Zotlabs/Module/Admin/Security.php:106
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../include/conversation.php:226 ../../include/conversation.php:228
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../Zotlabs/Module/Admin/Security.php:106
+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 ""
 
-#: ../../include/conversation.php:263
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../Zotlabs/Module/Admin/Security.php:107
+msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../include/conversation.php:267 ../../include/text.php:1236
-#: ../../include/text.php:1240
-msgid "poked"
+#: ../../Zotlabs/Module/Admin/Security.php:107
+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 ""
 
-#: ../../include/conversation.php:781
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../Zotlabs/Module/Admin/Security.php:108
+msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../include/conversation.php:802
-msgid "Categories:"
+#: ../../Zotlabs/Module/Admin/Security.php:108
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
 msgstr ""
 
-#: ../../include/conversation.php:803
-msgid "Filed under:"
+#: ../../Zotlabs/Module/Admin/Security.php:109
+msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../include/conversation.php:828
-msgid "View in context"
+#: ../../Zotlabs/Module/Admin/Security.php:110
+msgid "Allow communications only from these channels"
 msgstr ""
 
-#: ../../include/conversation.php:930
-msgid "remove"
+#: ../../Zotlabs/Module/Admin/Security.php:110
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "Loading..."
+#: ../../Zotlabs/Module/Admin/Security.php:111
+msgid "Block communications from these channels"
 msgstr ""
 
-#: ../../include/conversation.php:936
-msgid "Delete Selected Items"
+#: ../../Zotlabs/Module/Admin/Security.php:112
+msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../include/conversation.php:980
-msgid "View Source"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../include/conversation.php:990
-msgid "Follow Thread"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../include/conversation.php:999
-msgid "Unfollow Thread"
+#: ../../Zotlabs/Module/Admin/Security.php:114
+msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: ../../include/conversation.php:1113
-msgid "Edit Connection"
+#: ../../Zotlabs/Module/Admin/Security.php:115
+msgid "Allow SVG thumbnails in file browser"
 msgstr ""
 
-#: ../../include/conversation.php:1265
-#, php-format
-msgid "%s likes this."
+#: ../../Zotlabs/Module/Admin/Security.php:115
+msgid "WARNING: SVG images may contain malicious code."
 msgstr ""
 
-#: ../../include/conversation.php:1265
-#, php-format
-msgid "%s doesn't like this."
+#: ../../Zotlabs/Module/Admin/Security.php:116
+msgid "Allow embedded (inline) PDF files"
 msgstr ""
 
-#: ../../include/conversation.php:1269
+#: ../../Zotlabs/Module/Admin/Accounts.php:128
 #, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1271
+#: ../../Zotlabs/Module/Admin/Accounts.php:135
 #, 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."
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1277
-msgid "and"
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Account not found"
 msgstr ""
 
-#: ../../include/conversation.php:1280
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1281
+#: ../../Zotlabs/Module/Admin/Accounts.php:192
 #, php-format
-msgid "%s like this."
+msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../include/conversation.php:1281
+#: ../../Zotlabs/Module/Admin/Accounts.php:200
 #, php-format
-msgid "%s don't like this."
+msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../include/conversation.php:1332
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:82
-msgid "Set your location"
+#: ../../Zotlabs/Module/Admin/Accounts.php:240
+msgid "Unverified"
 msgstr ""
 
-#: ../../include/conversation.php:1333
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:83
-msgid "Clear browser location"
+#: ../../Zotlabs/Module/Admin/Accounts.php:243
+msgid "Expired"
 msgstr ""
 
-#: ../../include/conversation.php:1349
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:99
-msgid "Embed (existing) photo from your photo albums"
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show verified registrations"
 msgstr ""
 
-#: ../../include/conversation.php:1383
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:135
-msgid "Tag term:"
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show all registrations"
 msgstr ""
 
-#: ../../include/conversation.php:1384
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:136
-msgid "Where are you right now?"
+#: ../../Zotlabs/Module/Admin/Accounts.php:312
+msgid "Select toggle"
 msgstr ""
 
-#: ../../include/conversation.php:1389
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:141
-msgid "Choose a different album..."
+#: ../../Zotlabs/Module/Admin/Accounts.php:313
+msgid "Deny selected"
 msgstr ""
 
-#: ../../include/conversation.php:1393
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:145
-msgid "Comments enabled"
+#: ../../Zotlabs/Module/Admin/Accounts.php:314
+msgid "Approve selected"
 msgstr ""
 
-#: ../../include/conversation.php:1394
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:146
-msgid "Comments disabled"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "All registrations"
 msgstr ""
 
-#: ../../include/conversation.php:1446
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:195
-msgid "Page link name"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "Verified registrations waiting for approval"
 msgstr ""
 
-#: ../../include/conversation.php:1449
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:198
-msgid "Post as"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Request date"
 msgstr ""
 
-#: ../../include/conversation.php:1463
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:212
-msgid "Toggle voting"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Requests"
 msgstr ""
 
-#: ../../include/conversation.php:1464
-msgid "Toggle poll"
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No registrations available"
 msgstr ""
 
-#: ../../include/conversation.php:1465
-msgid "Option"
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No verified registrations available"
 msgstr ""
 
-#: ../../include/conversation.php:1466
-msgid "Add option"
+#: ../../Zotlabs/Module/Admin/Accounts.php:321
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Block"
 msgstr ""
 
-#: ../../include/conversation.php:1467
-msgid "Minutes"
+#: ../../Zotlabs/Module/Admin/Accounts.php:322
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Unblock"
 msgstr ""
 
-#: ../../include/conversation.php:1467
-msgid "Hours"
+#: ../../Zotlabs/Module/Admin/Accounts.php:323
+msgid "Verified"
 msgstr ""
 
-#: ../../include/conversation.php:1467
-msgid "Days"
+#: ../../Zotlabs/Module/Admin/Accounts.php:324
+msgid "Not yet verified"
 msgstr ""
 
-#: ../../include/conversation.php:1468
-msgid "Allow multiple answers"
+#: ../../Zotlabs/Module/Admin/Accounts.php:329
+msgid "ID"
 msgstr ""
 
-#: ../../include/conversation.php:1470
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:215
-msgid "Disable comments"
+#: ../../Zotlabs/Module/Admin/Accounts.php:331
+msgid "All channels"
 msgstr ""
 
-#: ../../include/conversation.php:1471
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:216
-msgid "Toggle comments"
+#: ../../Zotlabs/Module/Admin/Accounts.php:332
+msgid "Register date"
 msgstr ""
 
-#: ../../include/conversation.php:1478
-msgid "Summary (optional)"
+#: ../../Zotlabs/Module/Admin/Accounts.php:333
+msgid "Last login"
 msgstr ""
 
-#: ../../include/conversation.php:1481
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:224
-msgid "Categories (optional, comma-separated list)"
+#: ../../Zotlabs/Module/Admin/Accounts.php:334
+msgid "Expires"
 msgstr ""
 
-#: ../../include/conversation.php:1504
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:247
-msgid "Other networks and post services"
+#: ../../Zotlabs/Module/Admin/Accounts.php:335
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+msgid "Service class"
 msgstr ""
 
-#: ../../include/conversation.php:1507
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:250
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:314
-msgid "Set expiration date"
+#: ../../Zotlabs/Module/Admin/Accounts.php:337
+msgid ""
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../include/conversation.php:1510
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:253
-msgid "Set publish date"
+#: ../../Zotlabs/Module/Admin/Accounts.php:338
+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 ""
 
-#: ../../include/conversation.php:1758
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1761
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1764
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1767
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1770
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1773
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/channel.php:47
-msgid "Unable to obtain identity information from database"
+#: ../../Zotlabs/Module/Admin/Site.php:112
+msgid "Invalid input"
 msgstr ""
 
-#: ../../include/channel.php:80
-msgid "Empty name"
+#: ../../Zotlabs/Module/Admin/Site.php:132
+msgid "Errors"
 msgstr ""
 
-#: ../../include/channel.php:83
-msgid "Name too long"
+#: ../../Zotlabs/Module/Admin/Site.php:225
+msgid "Site settings updated."
 msgstr ""
 
-#: ../../include/channel.php:200
-msgid "No account identifier"
+#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Settings/Display.php:118
+#, php-format
+msgid "%s - (Incompatible)"
 msgstr ""
 
-#: ../../include/channel.php:295
-msgid "Unable to retrieve created identity"
+#: ../../Zotlabs/Module/Admin/Site.php:269
+msgid "mobile"
 msgstr ""
 
-#: ../../include/channel.php:442
-msgid "Default Profile"
+#: ../../Zotlabs/Module/Admin/Site.php:271
+msgid "experimental"
 msgstr ""
 
-#: ../../include/channel.php:639 ../../include/channel.php:728
-msgid "Unable to retrieve modified identity"
+#: ../../Zotlabs/Module/Admin/Site.php:273
+msgid "unsupported"
 msgstr ""
 
-#: ../../include/channel.php:1410
-msgid "Requested channel is not available."
+#: ../../Zotlabs/Module/Admin/Site.php:320
+msgid "Yes - with approval"
 msgstr ""
 
-#: ../../include/channel.php:1567
-msgid "Create New Profile"
+#: ../../Zotlabs/Module/Admin/Site.php:328
+msgid "My site is not a public server"
 msgstr ""
 
-#: ../../include/channel.php:1570 ../../include/nav.php:120
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58
-msgid "Edit Profile"
+#: ../../Zotlabs/Module/Admin/Site.php:329
+msgid "My site has paid access only"
 msgstr ""
 
-#: ../../include/channel.php:1588
-msgid "Visible to everybody"
+#: ../../Zotlabs/Module/Admin/Site.php:330
+msgid "My site has free access only"
 msgstr ""
 
-#: ../../include/channel.php:1665 ../../include/channel.php:1793
-msgid "Gender:"
+#: ../../Zotlabs/Module/Admin/Site.php:331
+msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../include/channel.php:1666 ../../include/channel.php:1837
-msgid "Status:"
+#: ../../Zotlabs/Module/Admin/Site.php:345
+msgid "Default permission role for new accounts"
 msgstr ""
 
-#: ../../include/channel.php:1667 ../../include/channel.php:1861
-msgid "Homepage:"
+#: ../../Zotlabs/Module/Admin/Site.php:345
+msgid ""
+"This role will be used for the first channel created after registration."
 msgstr ""
 
-#: ../../include/channel.php:1668
-msgid "Online Now"
+#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
+msgid "Minute(s)"
 msgstr ""
 
-#: ../../include/channel.php:1721
-msgid "Change your profile photo"
+#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399
+msgid "Hour(s)"
 msgstr ""
 
-#: ../../include/channel.php:1748 ../../include/selectors.php:60
-#: ../../include/selectors.php:77
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:87
-msgid "Female"
+#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400
+msgid "Day(s)"
 msgstr ""
 
-#: ../../include/channel.php:1750 ../../include/selectors.php:60
-#: ../../include/selectors.php:77
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:85
-msgid "Male"
+#: ../../Zotlabs/Module/Admin/Site.php:356
+msgid "Week(s)"
 msgstr ""
 
-#: ../../include/channel.php:1752
-msgid "Trans"
+#: ../../Zotlabs/Module/Admin/Site.php:357
+msgid "Month(s)"
 msgstr ""
 
-#: ../../include/channel.php:1754 ../../include/selectors.php:60
-msgid "Neuter"
+#: ../../Zotlabs/Module/Admin/Site.php:358
+msgid "Year(s)"
 msgstr ""
 
-#: ../../include/channel.php:1756 ../../include/selectors.php:60
-msgid "Non-specific"
+#: ../../Zotlabs/Module/Admin/Site.php:366
+msgid "Register verification delay"
 msgstr ""
 
-#: ../../include/channel.php:1798
-msgid "Like this channel"
+#: ../../Zotlabs/Module/Admin/Site.php:369
+msgid "Time to wait before a registration can be verified"
 msgstr ""
 
-#: ../../include/channel.php:1822
-msgid "j F, Y"
+#: ../../Zotlabs/Module/Admin/Site.php:372
+#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
+msgid "duration up from now"
 msgstr ""
 
-#: ../../include/channel.php:1823
-msgid "j F"
+#: ../../Zotlabs/Module/Admin/Site.php:388
+msgid "Register verification expiration time"
 msgstr ""
 
-#: ../../include/channel.php:1830
-msgid "Birthday:"
+#: ../../Zotlabs/Module/Admin/Site.php:391
+msgid "Time before an unverified registration will expire"
 msgstr ""
 
-#: ../../include/channel.php:1843
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../Zotlabs/Module/Admin/Site.php:414
+msgid "File upload"
 msgstr ""
 
-#: ../../include/channel.php:1855
-msgid "Tags:"
+#: ../../Zotlabs/Module/Admin/Site.php:415
+msgid "Policies"
 msgstr ""
 
-#: ../../include/channel.php:1859
-msgid "Sexual Preference:"
+#: ../../Zotlabs/Module/Admin/Site.php:422
+msgid "Banner/Logo"
 msgstr ""
 
-#: ../../include/channel.php:1865
-msgid "Political Views:"
+#: ../../Zotlabs/Module/Admin/Site.php:422
+msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr ""
 
-#: ../../include/channel.php:1867
-msgid "Religion:"
+#: ../../Zotlabs/Module/Admin/Site.php:423
+msgid "Administrator Information"
 msgstr ""
 
-#: ../../include/channel.php:1871
-msgid "Hobbies/Interests:"
+#: ../../Zotlabs/Module/Admin/Site.php:423
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
 
-#: ../../include/channel.php:1873
-msgid "Likes:"
+#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
+msgid "Site Information"
 msgstr ""
 
-#: ../../include/channel.php:1875
-msgid "Dislikes:"
+#: ../../Zotlabs/Module/Admin/Site.php:424
+msgid ""
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
 
-#: ../../include/channel.php:1877
-msgid "Contact information and Social Networks:"
+#: ../../Zotlabs/Module/Admin/Site.php:425
+msgid "System language"
 msgstr ""
 
-#: ../../include/channel.php:1879
-msgid "My other channels:"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid "System theme"
 msgstr ""
 
-#: ../../include/channel.php:1881
-msgid "Musical interests:"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../include/channel.php:1883
-msgid "Books, literature:"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../include/channel.php:1885
-msgid "Television:"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../include/channel.php:1887
-msgid "Film/dance/culture/entertainment:"
+#: ../../Zotlabs/Module/Admin/Site.php:430
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../include/channel.php:1889
-msgid "Love/Romance:"
+#: ../../Zotlabs/Module/Admin/Site.php:430
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: ../../include/channel.php:1891
-msgid "Work/employment:"
+#: ../../Zotlabs/Module/Admin/Site.php:431
+msgid "Minimum age"
 msgstr ""
 
-#: ../../include/channel.php:1893
-msgid "School/education:"
+#: ../../Zotlabs/Module/Admin/Site.php:431
+msgid "Minimum age (in years) for who may register on this site."
 msgstr ""
 
-#: ../../include/channel.php:1916
-msgid "Like this thing"
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../include/features.php:86
-msgid "Start calendar week on Monday"
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "This is displayed on the public server site list."
 msgstr ""
 
-#: ../../include/features.php:87
-msgid "Default is Sunday"
+#: ../../Zotlabs/Module/Admin/Site.php:438
+msgid "Register text"
 msgstr ""
 
-#: ../../include/features.php:94
-msgid "Event Timezone Selection"
+#: ../../Zotlabs/Module/Admin/Site.php:440
+msgid "This text will be displayed prominently at the registration page"
 msgstr ""
 
-#: ../../include/features.php:95
-msgid "Allow event creation in timezones other than your own."
+#: ../../Zotlabs/Module/Admin/Site.php:444
+msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../include/features.php:108
-msgid "Search by Date"
+#: ../../Zotlabs/Module/Admin/Site.php:451
+msgid "Configure the registration open days/hours"
 msgstr ""
 
-#: ../../include/features.php:109
-msgid "Ability to select posts by date ranges"
+#: ../../Zotlabs/Module/Admin/Site.php:453
+msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
 msgstr ""
 
-#: ../../include/features.php:116
-msgid "Tag Cloud"
+#: ../../Zotlabs/Module/Admin/Site.php:454
+msgid ""
+"Weekdays and hours must be separated by colon ':', From-To ranges with a "
+"dash `-` example: 1:800-1200"
 msgstr ""
 
-#: ../../include/features.php:117
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../Zotlabs/Module/Admin/Site.php:455
+msgid ""
+"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
+"2:900-1700"
 msgstr ""
 
-#: ../../include/features.php:124 ../../include/features.php:358
-msgid "Use blog/list mode"
+#: ../../Zotlabs/Module/Admin/Site.php:456
+msgid ""
+"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
+"or 1-2,4-5:900-1700"
 msgstr ""
 
-#: ../../include/features.php:125 ../../include/features.php:359
-msgid "Comments will be displayed separately"
+#: ../../Zotlabs/Module/Admin/Site.php:457
+msgid "Advanced examples:"
 msgstr ""
 
-#: ../../include/features.php:137
-msgid "Connection Filtering"
+#: ../../Zotlabs/Module/Admin/Site.php:457
+#: ../../Zotlabs/Module/Settings/Channel.php:420
+msgid "or"
 msgstr ""
 
-#: ../../include/features.php:138
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../Zotlabs/Module/Admin/Site.php:458
+msgid "Check your configuration"
 msgstr ""
 
-#: ../../include/features.php:146
-msgid "Conversation"
+#: ../../Zotlabs/Module/Admin/Site.php:462
+msgid "Max account registrations per day"
 msgstr ""
 
-#: ../../include/features.php:158
-msgid "Emoji Reactions"
+#: ../../Zotlabs/Module/Admin/Site.php:464
+msgid "Unlimited if zero or no value - default 50"
 msgstr ""
 
-#: ../../include/features.php:159
-msgid "Add emoji reaction ability to posts"
+#: ../../Zotlabs/Module/Admin/Site.php:468
+msgid "Max account registrations from same IP"
 msgstr ""
 
-#: ../../include/features.php:166
-msgid "Dislike Posts"
+#: ../../Zotlabs/Module/Admin/Site.php:470
+msgid "Unlimited if zero or no value - default 3"
 msgstr ""
 
-#: ../../include/features.php:167
-msgid "Ability to dislike posts/comments"
+#: ../../Zotlabs/Module/Admin/Site.php:476
+msgid "Auto channel create"
 msgstr ""
 
-#: ../../include/features.php:174
-msgid "Star Posts"
+#: ../../Zotlabs/Module/Admin/Site.php:478
+msgid ""
+"If disabled the channel will be created in a separate step during the "
+"registration process"
 msgstr ""
 
-#: ../../include/features.php:175
-msgid "Ability to mark special posts with a star indicator"
+#: ../../Zotlabs/Module/Admin/Site.php:482
+msgid "Require invite code"
 msgstr ""
 
-#: ../../include/features.php:182
-msgid "Reply on comment"
+#: ../../Zotlabs/Module/Admin/Site.php:487
+msgid "Allow invite code"
 msgstr ""
 
-#: ../../include/features.php:183
-msgid "Ability to reply on selected comment"
+#: ../../Zotlabs/Module/Admin/Site.php:492
+msgid "Require email address"
 msgstr ""
 
-#: ../../include/features.php:196
-msgid "Advanced Directory Search"
+#: ../../Zotlabs/Module/Admin/Site.php:494
+msgid "The provided email address will be verified (recommended)"
 msgstr ""
 
-#: ../../include/features.php:197
-msgid "Allows creation of complex directory search queries"
+#: ../../Zotlabs/Module/Admin/Site.php:498
+msgid "Abandon account after x days"
 msgstr ""
 
-#: ../../include/features.php:206
-msgid "Editor"
+#: ../../Zotlabs/Module/Admin/Site.php:500
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../include/features.php:210
-msgid "Post Categories"
+#: ../../Zotlabs/Module/Admin/Site.php:505
+msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../include/features.php:211
-msgid "Add categories to your posts"
+#: ../../Zotlabs/Module/Admin/Site.php:505
+msgid ""
+"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../include/features.php:218
-msgid "Large Photos"
+#: ../../Zotlabs/Module/Admin/Site.php:506
+msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../include/features.php:219
+#: ../../Zotlabs/Module/Admin/Site.php:506
 msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
 msgstr ""
 
-#: ../../include/features.php:226
-msgid "Even More Encryption"
+#: ../../Zotlabs/Module/Admin/Site.php:507
+msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../include/features.php:227
+#: ../../Zotlabs/Module/Admin/Site.php:507
 msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../include/features.php:234
-msgid "Disable Comments"
+#: ../../Zotlabs/Module/Admin/Site.php:508
+msgid "Force publish"
 msgstr ""
 
-#: ../../include/features.php:235
-msgid "Provide the option to disable comments for a post"
+#: ../../Zotlabs/Module/Admin/Site.php:508
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../include/features.php:242
-msgid "Delayed Posting"
+#: ../../Zotlabs/Module/Admin/Site.php:509
+msgid "Import Public Streams"
 msgstr ""
 
-#: ../../include/features.php:243
-msgid "Allow posts to be published at a later date"
+#: ../../Zotlabs/Module/Admin/Site.php:509
+msgid ""
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
 msgstr ""
 
-#: ../../include/features.php:250
-msgid "Content Expiration"
+#: ../../Zotlabs/Module/Admin/Site.php:510
+msgid "Site only Public Streams"
 msgstr ""
 
-#: ../../include/features.php:251
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../Zotlabs/Module/Admin/Site.php:510
+msgid ""
+"Allow access to public content originating only from this site if Imported "
+"Public Streams are disabled."
 msgstr ""
 
-#: ../../include/features.php:258
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../Zotlabs/Module/Admin/Site.php:511
+msgid "Allow anybody on the internet to access the Public streams"
 msgstr ""
 
-#: ../../include/features.php:259
+#: ../../Zotlabs/Module/Admin/Site.php:511
 msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+"Disable to require authentication before viewing. Warning: this content is "
+"unmoderated."
 msgstr ""
 
-#: ../../include/features.php:266
-msgid "Auto-save drafts of posts and comments"
+#: ../../Zotlabs/Module/Admin/Site.php:512
+msgid "Only import Public stream posts with this text"
 msgstr ""
 
-#: ../../include/features.php:267
+#: ../../Zotlabs/Module/Admin/Site.php:512
+#: ../../Zotlabs/Module/Admin/Site.php:513
+#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878
 msgid ""
-"Automatically saves post and comment drafts in local browser storage to help "
-"prevent accidental loss of compositions"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
 msgstr ""
 
-#: ../../include/features.php:276
-msgid "Manage"
+#: ../../Zotlabs/Module/Admin/Site.php:513
+msgid "Do not import Public stream posts with this text"
 msgstr ""
 
-#: ../../include/features.php:280
-msgid "Navigation Channel Select"
+#: ../../Zotlabs/Module/Admin/Site.php:516
+msgid "Login on Homepage"
 msgstr ""
 
-#: ../../include/features.php:281
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../Zotlabs/Module/Admin/Site.php:516
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
 msgstr ""
 
-#: ../../include/features.php:294
-msgid "Events Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:517
+msgid "Enable context help"
 msgstr ""
 
-#: ../../include/features.php:295
-msgid "Ability to display only events"
+#: ../../Zotlabs/Module/Admin/Site.php:517
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../include/features.php:302
-msgid "Polls Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:519
+msgid "Reply-to email address for system generated email."
 msgstr ""
 
-#: ../../include/features.php:303
-msgid "Ability to display only polls"
+#: ../../Zotlabs/Module/Admin/Site.php:520
+msgid "Sender (From) email address for system generated email."
 msgstr ""
 
-#: ../../include/features.php:311
-msgid "Save search terms for re-use"
+#: ../../Zotlabs/Module/Admin/Site.php:521
+msgid "Name of email sender for system generated email."
 msgstr ""
 
-#: ../../include/features.php:319
-msgid "Ability to file posts under folders"
+#: ../../Zotlabs/Module/Admin/Site.php:523
+msgid "Directory Server URL"
 msgstr ""
 
-#: ../../include/features.php:326
-msgid "Alternate Stream Order"
+#: ../../Zotlabs/Module/Admin/Site.php:523
+msgid "Default directory server"
 msgstr ""
 
-#: ../../include/features.php:327
-msgid ""
-"Ability to order the stream by last post date, last comment date or "
-"unthreaded activities"
+#: ../../Zotlabs/Module/Admin/Site.php:525
+msgid "Enable SSE Notifications"
 msgstr ""
 
-#: ../../include/features.php:334
-msgid "Contact Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:525
+msgid ""
+"If disabled, traditional polling will be used. Warning: this setting might "
+"not be suited for shared hosting"
 msgstr ""
 
-#: ../../include/features.php:335
-msgid "Ability to display only posts of a selected contact"
+#: ../../Zotlabs/Module/Admin/Site.php:527
+msgid "Proxy user"
 msgstr ""
 
-#: ../../include/features.php:342
-msgid "Forum Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:528
+msgid "Proxy URL"
 msgstr ""
 
-#: ../../include/features.php:343
-msgid "Ability to display only posts of a specific forum"
+#: ../../Zotlabs/Module/Admin/Site.php:529
+msgid "Network timeout"
 msgstr ""
 
-#: ../../include/features.php:350
-msgid "Personal Posts Filter"
+#: ../../Zotlabs/Module/Admin/Site.php:529
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../include/features.php:351
-msgid "Ability to display only posts that you've interacted on"
+#: ../../Zotlabs/Module/Admin/Site.php:530
+msgid "Delivery interval"
 msgstr ""
 
-#: ../../include/features.php:372
-msgid "Photo Location"
+#: ../../Zotlabs/Module/Admin/Site.php:530
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
 msgstr ""
 
-#: ../../include/features.php:373
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../Zotlabs/Module/Admin/Site.php:531
+msgid "Deliveries per process"
 msgstr ""
 
-#: ../../include/features.php:386
-msgid "Advanced Profiles"
+#: ../../Zotlabs/Module/Admin/Site.php:531
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../include/features.php:387
-msgid "Additional profile sections and selections"
+#: ../../Zotlabs/Module/Admin/Site.php:532
+msgid "Queue Threshold"
 msgstr ""
 
-#: ../../include/features.php:394
-msgid "Profile Import/Export"
+#: ../../Zotlabs/Module/Admin/Site.php:532
+msgid ""
+"Always defer immediate delivery if queue contains more than this number of "
+"entries."
 msgstr ""
 
-#: ../../include/features.php:395
-msgid "Save and load profile details across sites/channels"
+#: ../../Zotlabs/Module/Admin/Site.php:533
+msgid "Poll interval"
 msgstr ""
 
-#: ../../include/features.php:402
-msgid "Multiple Profiles"
+#: ../../Zotlabs/Module/Admin/Site.php:533
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../include/features.php:403
-msgid "Ability to create multiple profiles"
+#: ../../Zotlabs/Module/Admin/Site.php:534
+msgid "Path to ImageMagick convert program"
 msgstr ""
 
-#: ../../include/auth.php:194
-msgid "Delegation session ended."
+#: ../../Zotlabs/Module/Admin/Site.php:534
+msgid ""
+"If set, use this program to generate photo thumbnails for huge images ( > "
+"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
+"Example: /usr/bin/convert"
 msgstr ""
 
-#: ../../include/auth.php:198
-msgid "Logged out."
+#: ../../Zotlabs/Module/Admin/Site.php:535
+msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../include/auth.php:294
-msgid "Email validation is incomplete. Please check your email."
+#: ../../Zotlabs/Module/Admin/Site.php:535
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: ../../include/auth.php:310
-msgid "Failed authentication"
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../include/auth.php:320
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:188
-msgid "Login failed."
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../include/text.php:523
-msgid "prev"
+#: ../../Zotlabs/Module/Admin/Site.php:537
+msgid ""
+"Do not expire any posts which have comments less than this many days ago"
 msgstr ""
 
-#: ../../include/text.php:525
-msgid "first"
+#: ../../Zotlabs/Module/Admin/Site.php:538
+msgid ""
+"Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
 
-#: ../../include/text.php:554
-msgid "last"
+#: ../../Zotlabs/Module/Admin/Site.php:538
+#, php-format
+msgid "Create this page first. Default is %s/register"
 msgstr ""
 
-#: ../../include/text.php:557
-msgid "next"
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "Page to display after creating a new channel"
 msgstr ""
 
-#: ../../include/text.php:575
-msgid "older"
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "Default: profiles"
 msgstr ""
 
-#: ../../include/text.php:577
-msgid "newer"
+#: ../../Zotlabs/Module/Admin/Site.php:540
+msgid "Optional: site location"
 msgstr ""
 
-#: ../../include/text.php:1018
-msgid "No connections"
+#: ../../Zotlabs/Module/Admin/Site.php:540
+msgid "Region or country"
 msgstr ""
 
-#: ../../include/text.php:1070
-#, php-format
-msgid "View all %s connections"
+#: ../../Zotlabs/Module/Admin/Site.php:625
+#: ../../Zotlabs/Module/Admin/Site.php:626
+msgid "Invalid 24h time value (hhmm/hmm)"
 msgstr ""
 
-#: ../../include/text.php:1133
-#, php-format
-msgid "Network: %s"
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../include/text.php:1236 ../../include/text.php:1240
-msgid "poke"
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
 msgstr ""
 
-#: ../../include/text.php:1241
-msgid "ping"
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
 msgstr ""
 
-#: ../../include/text.php:1241
-msgid "pinged"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
 msgstr ""
 
-#: ../../include/text.php:1242
-msgid "prod"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
 msgstr ""
 
-#: ../../include/text.php:1242
-msgid "prodded"
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
 msgstr ""
 
-#: ../../include/text.php:1243
-msgid "slap"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Channels.php:31
+#, php-format
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/text.php:1243
-msgid "slapped"
+#: ../../Zotlabs/Module/Admin/Channels.php:40
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:46
+#, php-format
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:65
+msgid "Channel not found"
 msgstr ""
 
-#: ../../include/text.php:1244
-msgid "finger"
+#: ../../Zotlabs/Module/Admin/Channels.php:75
+#, php-format
+msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../include/text.php:1244
-msgid "fingered"
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../include/text.php:1245
-msgid "rebuff"
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../include/text.php:1245
-msgid "rebuffed"
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../include/text.php:1268
-msgid "happy"
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../include/text.php:1269
-msgid "sad"
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
 msgstr ""
 
-#: ../../include/text.php:1270
-msgid "mellow"
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Censor"
 msgstr ""
 
-#: ../../include/text.php:1271
-msgid "tired"
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Uncensor"
 msgstr ""
 
-#: ../../include/text.php:1272
-msgid "perky"
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
 msgstr ""
 
-#: ../../include/text.php:1273
-msgid "angry"
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
 msgstr ""
 
-#: ../../include/text.php:1274
-msgid "stupefied"
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
 msgstr ""
 
-#: ../../include/text.php:1275
-msgid "puzzled"
+#: ../../Zotlabs/Module/Admin/Channels.php:162
+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 ""
 
-#: ../../include/text.php:1276
-msgid "interested"
+#: ../../Zotlabs/Module/Admin/Channels.php:163
+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 ""
 
-#: ../../include/text.php:1277
-msgid "bitter"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
 msgstr ""
 
-#: ../../include/text.php:1278
-msgid "cheerful"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
 msgstr ""
 
-#: ../../include/text.php:1279
-msgid "alive"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
 msgstr ""
 
-#: ../../include/text.php:1280
-msgid "annoyed"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
 msgstr ""
 
-#: ../../include/text.php:1281
-msgid "anxious"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
 msgstr ""
 
-#: ../../include/text.php:1282
-msgid "cranky"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
 msgstr ""
 
-#: ../../include/text.php:1283
-msgid "disturbed"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Account language (for emails)"
 msgstr ""
 
-#: ../../include/text.php:1284
-msgid "frustrated"
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "New Profile Field"
 msgstr ""
 
-#: ../../include/text.php:1285
-msgid "depressed"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "Field nickname"
 msgstr ""
 
-#: ../../include/text.php:1286
-msgid "motivated"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "System name of field"
 msgstr ""
 
-#: ../../include/text.php:1287
-msgid "relaxed"
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+#: ../../Zotlabs/Module/Admin/Profs.php:111
+msgid "Input type"
 msgstr ""
 
-#: ../../include/text.php:1288
-msgid "surprised"
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Field Name"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:99
-msgid "Monday"
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Label on profile pages"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:100
-msgid "Tuesday"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Help text"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:101
-msgid "Wednesday"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:102
-msgid "Thursday"
+#: ../../Zotlabs/Module/Admin/Profs.php:103
+msgid "Field definition not found"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:103
-msgid "Friday"
+#: ../../Zotlabs/Module/Admin/Profs.php:109
+msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:104
-msgid "Saturday"
+#: ../../Zotlabs/Module/Admin/Profs.php:169
+msgid "Basic Profile Fields"
 msgstr ""
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:98
-msgid "Sunday"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:74
-msgid "January"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:75
-msgid "February"
+#: ../../Zotlabs/Module/Admin/Profs.php:172
+msgid "All available fields"
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:76
-msgid "March"
+#: ../../Zotlabs/Module/Admin/Profs.php:173
+msgid "Custom Fields"
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:77
-msgid "April"
+#: ../../Zotlabs/Module/Admin/Profs.php:177
+msgid "Create Custom Field"
 msgstr ""
 
-#: ../../include/text.php:1480
-msgid "May"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:79
-msgid "June"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Verification of update %s failed. Check system logs."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:80
-msgid "July"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:35
+#: ../../Zotlabs/Module/Admin/Dbsync.php:74
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:81
-msgid "August"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Verifying update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:82
-msgid "September"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#, php-format
+msgid "Update %s does not contain a verification function."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:83
-msgid "October"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:46
+#: ../../Zotlabs/Module/Admin/Dbsync.php:81
+#, php-format
+msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:84
-msgid "November"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#, php-format
+msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:85
-msgid "December"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#, php-format
+msgid ""
+"Update %s did not return a status. It cannot be determined if it was "
+"successful."
 msgstr ""
 
-#: ../../include/text.php:1556
-msgid "Unknown Attachment"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:99
+msgid "Failed Updates"
 msgstr ""
 
-#: ../../include/text.php:1558 ../../include/feedutils.php:872
-msgid "unknown"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:101
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../include/text.php:1599
-msgid "remove category"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:102
+msgid "Attempt to verify this update if a verification procedure exists"
 msgstr ""
 
-#: ../../include/text.php:1676
-msgid "remove from file"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:103
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../include/text.php:1845 ../../include/message.php:13
-msgid "Download binary/encrypted content"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:108
+msgid "No failed updates."
 msgstr ""
 
-#: ../../include/text.php:1916
-msgid "Poll has ended."
+#: ../../Zotlabs/Module/Admin/Addons.php:290
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../include/text.php:1919
+#: ../../Zotlabs/Module/Admin/Addons.php:295
 #, php-format
-msgid "Poll ends: %s"
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../include/text.php:2098 ../../include/language.php:428
-msgid "default"
+#: ../../Zotlabs/Module/Admin/Addons.php:354
+msgid "Minimum project version: "
 msgstr ""
 
-#: ../../include/text.php:2106
-msgid "Page layout"
+#: ../../Zotlabs/Module/Admin/Addons.php:355
+msgid "Maximum project version: "
 msgstr ""
 
-#: ../../include/text.php:2106
-msgid "You can create your own with the layouts tool"
+#: ../../Zotlabs/Module/Admin/Addons.php:356
+msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../include/text.php:2117
-msgid "HTML"
+#: ../../Zotlabs/Module/Admin/Addons.php:357
+msgid "Compatible Server Roles: "
 msgstr ""
 
-#: ../../include/text.php:2120
-msgid "Comanche Layout"
+#: ../../Zotlabs/Module/Admin/Addons.php:358
+msgid "Requires: "
 msgstr ""
 
-#: ../../include/text.php:2125
-msgid "PHP"
+#: ../../Zotlabs/Module/Admin/Addons.php:359
+#: ../../Zotlabs/Module/Admin/Addons.php:446
+msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../include/text.php:2134
-msgid "Page content type"
+#: ../../Zotlabs/Module/Admin/Addons.php:415
+msgid "Enter the public git repository URL of the addon repo."
 msgstr ""
 
-#: ../../include/text.php:2267
-msgid "activity"
+#: ../../Zotlabs/Module/Admin/Addons.php:416
+msgid "Addon repo git URL"
 msgstr ""
 
-#: ../../include/text.php:2270
-msgid "poll"
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "Custom repo name"
 msgstr ""
 
-#: ../../include/text.php:2383
-msgid "a-z, 0-9, -, and _ only"
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "(optional)"
 msgstr ""
 
-#: ../../include/text.php:2709
-msgid "Design Tools"
+#: ../../Zotlabs/Module/Admin/Addons.php:418
+msgid "Download Addon Repo"
 msgstr ""
 
-#: ../../include/text.php:2715
-msgid "Pages"
+#: ../../Zotlabs/Module/Admin/Addons.php:425
+msgid "Install new repo"
 msgstr ""
 
-#: ../../include/text.php:2727
-msgid "Import"
+#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:537
+msgid "Install"
 msgstr ""
 
-#: ../../include/text.php:2728
-msgid "Import website..."
+#: ../../Zotlabs/Module/Admin/Addons.php:449
+msgid "Manage Repos"
 msgstr ""
 
-#: ../../include/text.php:2729
-msgid "Select folder to import"
+#: ../../Zotlabs/Module/Admin/Addons.php:450
+msgid "Installed Addon Repositories"
 msgstr ""
 
-#: ../../include/text.php:2730
-msgid "Import from a zipped folder:"
+#: ../../Zotlabs/Module/Admin/Addons.php:451
+msgid "Install a New Addon Repository"
 msgstr ""
 
-#: ../../include/text.php:2731
-msgid "Import from cloud files:"
+#: ../../Zotlabs/Module/Admin/Addons.php:458
+msgid "Switch branch"
 msgstr ""
 
-#: ../../include/text.php:2732
-msgid "/cloud/channel/path/to/folder"
+#: ../../Zotlabs/Module/Apps.php:50
+msgid "Installed Apps"
 msgstr ""
 
-#: ../../include/text.php:2733
-msgid "Enter path to website files"
+#: ../../Zotlabs/Module/Apps.php:53
+msgid "Manage Apps"
 msgstr ""
 
-#: ../../include/text.php:2734
-msgid "Select folder"
+#: ../../Zotlabs/Module/Apps.php:54
+msgid "Create Custom App"
 msgstr ""
 
-#: ../../include/text.php:2735
-msgid "Export website..."
+#: ../../Zotlabs/Module/Achievements.php:38
+msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../include/text.php:2736
-msgid "Export to a zip file"
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
 
-#: ../../include/text.php:2737
-msgid "website.zip"
+#: ../../Zotlabs/Module/Removeme.php:60
+msgid "Remove This Channel"
 msgstr ""
 
-#: ../../include/text.php:2738
-msgid "Enter a name for the zip file."
+#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Changeaddr.php:78
+msgid "WARNING: "
 msgstr ""
 
-#: ../../include/text.php:2739
-msgid "Export to cloud files"
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be completely removed from the network. "
 msgstr ""
 
-#: ../../include/text.php:2740
-msgid "/path/to/export/folder"
+#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: ../../include/text.php:2741
-msgid "Enter a path to a cloud files destination."
+#: ../../Zotlabs/Module/Removeme.php:62
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Changeaddr.php:79
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../include/text.php:2742
-msgid "Specify folder"
+#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Settings/Channel.php:597
+msgid "Remove Channel"
 msgstr ""
 
-#: ../../include/message.php:41
-msgid "Unable to determine sender."
+#: ../../Zotlabs/Module/Regate.php:81
+msgid "Email resent"
 msgstr ""
 
-#: ../../include/message.php:80
-msgid "No recipient provided."
+#: ../../Zotlabs/Module/Regate.php:81
+msgid "Email resend failed"
 msgstr ""
 
-#: ../../include/message.php:85
-msgid "[no subject]"
+#: ../../Zotlabs/Module/Regate.php:106
+msgid "Verification successful"
 msgstr ""
 
-#: ../../include/message.php:214
-msgid "Stored post could not be verified."
+#: ../../Zotlabs/Module/Regate.php:150
+msgid "Account successfull created"
 msgstr ""
 
-#: ../../include/markdown.php:202 ../../include/bbcode.php:559
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../Zotlabs/Module/Regate.php:191
+msgid "Channel successfull created"
 msgstr ""
 
-#: ../../include/markdown.php:255 ../../include/bbcode.php:644
-msgid "spoiler"
+#: ../../Zotlabs/Module/Regate.php:197
+msgid "Automatic channel creation failed. Please create a channel."
 msgstr ""
 
-#: ../../include/acl_selectors.php:100
-msgid "Profile-Based Privacy Groups"
+#: ../../Zotlabs/Module/Regate.php:209
+msgid "Account creation error"
 msgstr ""
 
-#: ../../include/acl_selectors.php:119
-msgid "Private Forum"
+#: ../../Zotlabs/Module/Regate.php:221
+msgid "Verify failed"
 msgstr ""
 
-#: ../../include/acl_selectors.php:143
-msgid "Share with"
+#: ../../Zotlabs/Module/Regate.php:226
+msgid "Token verification failed"
 msgstr ""
 
-#: ../../include/acl_selectors.php:144
-msgid "Custom selection"
+#: ../../Zotlabs/Module/Regate.php:231
+msgid "Request not inside time frame"
 msgstr ""
 
-#: ../../include/acl_selectors.php:146
-msgid ""
-"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and "
-"limit the scope of \"Allow\"."
+#: ../../Zotlabs/Module/Regate.php:237 ../../Zotlabs/Module/Regate.php:267
+msgid "Identity unknown"
 msgstr ""
 
-#: ../../include/acl_selectors.php:148
-msgid "Don't allow"
+#: ../../Zotlabs/Module/Regate.php:243
+msgid "dId2 mistaken"
 msgstr ""
 
-#: ../../include/acl_selectors.php:181
-#, 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."
+#: ../../Zotlabs/Module/Regate.php:271
+msgid "Your Registration ID"
 msgstr ""
 
-#: ../../include/opengraph.php:56
-#, php-format
-msgid "This is the home page of %s."
+#: ../../Zotlabs/Module/Regate.php:284 ../../Zotlabs/Module/Regate.php:376
+#: ../../Zotlabs/Module/Regate.php:408
+msgid "Registration verification"
 msgstr ""
 
-#: ../../include/taxonomy.php:323
-msgid "Trending"
+#: ../../Zotlabs/Module/Regate.php:291 ../../Zotlabs/Module/Regate.php:413
+msgid "Hold on, you can start verification in"
 msgstr ""
 
-#: ../../include/taxonomy.php:561
-msgid "Keywords"
+#: ../../Zotlabs/Module/Regate.php:292
+msgid "Please remember your verification token for ID"
 msgstr ""
 
-#: ../../include/taxonomy.php:582
-msgid "have"
+#: ../../Zotlabs/Module/Regate.php:294
+msgid "Token validity"
 msgstr ""
 
-#: ../../include/taxonomy.php:582
-msgid "has"
+#: ../../Zotlabs/Module/Regate.php:330
+msgid "Resend email"
 msgstr ""
 
-#: ../../include/taxonomy.php:583
-msgid "want"
+#: ../../Zotlabs/Module/Regate.php:335
+msgid "Registration status"
 msgstr ""
 
-#: ../../include/taxonomy.php:583
-msgid "wants"
+#: ../../Zotlabs/Module/Regate.php:338
+msgid "Verification successful!"
 msgstr ""
 
-#: ../../include/taxonomy.php:584
-msgid "likes"
+#: ../../Zotlabs/Module/Regate.php:339
+msgid "Your login ID is"
 msgstr ""
 
-#: ../../include/taxonomy.php:585
-msgid "dislikes"
+#: ../../Zotlabs/Module/Regate.php:340
+msgid ""
+"After your account has been approved by our administrator you will be able "
+"to login with your login ID and your provided password."
 msgstr ""
 
-#: ../../include/import.php:29
-msgid "Unable to import a removed channel."
+#: ../../Zotlabs/Module/Regate.php:352
+msgid "Registration request revoked"
 msgstr ""
 
-#: ../../include/import.php:55
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../Zotlabs/Module/Regate.php:353
+msgid "Sorry for any inconvience. Thank you for your response."
 msgstr ""
 
-#: ../../include/import.php:76
-#: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:44
-msgid "Unable to create a unique channel address. Import failed."
+#: ../../Zotlabs/Module/Regate.php:377
+msgid "Please enter your verification token for ID"
 msgstr ""
 
-#: ../../include/import.php:121
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Regate.php:378 ../../Zotlabs/Module/Regate.php:405
+msgid "Please check your email!"
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Remote authentication"
+#: ../../Zotlabs/Module/Regate.php:388
+msgid "Verification token"
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Click to authenticate to your home hub"
+#: ../../Zotlabs/Module/Regate.php:399
+msgid "ID expired"
 msgstr ""
 
-#: ../../include/nav.php:101
-msgid "Manage your channels"
+#: ../../Zotlabs/Module/Regate.php:414
+msgid "You will require the verification token for ID"
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Manage your privacy groups"
+#: ../../Zotlabs/Module/Regate.php:423
+msgid "Unknown or expired ID"
 msgstr ""
 
-#: ../../include/nav.php:106
-msgid "Account/Channel Settings"
+#: ../../Zotlabs/Module/Regate.php:434
+msgid "dId2 malformed"
 msgstr ""
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
-#: ../../include/nav.php:163 ../../boot.php:1715
-msgid "Logout"
+#: ../../Zotlabs/Module/Manage.php:128 ../../Zotlabs/Module/New_channel.php:147
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
-msgid "End this session"
+#: ../../Zotlabs/Module/Manage.php:135
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../include/nav.php:115
-msgid "Your profile page"
+#: ../../Zotlabs/Module/Manage.php:161
+msgid "Current Channel"
 msgstr ""
 
-#: ../../include/nav.php:118
-msgid "Manage/Edit profiles"
+#: ../../Zotlabs/Module/Manage.php:163
+msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../include/nav.php:127 ../../include/nav.php:131
-msgid "Sign in"
+#: ../../Zotlabs/Module/Manage.php:164
+msgid "Default Channel"
 msgstr ""
 
-#: ../../include/nav.php:161
-msgid "Take me home"
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Make Default"
 msgstr ""
 
-#: ../../include/nav.php:163
-msgid "Log me out of this site"
+#: ../../Zotlabs/Module/Manage.php:168
+#, php-format
+msgid "%d new introductions"
 msgstr ""
 
-#: ../../include/nav.php:168
-msgid "Create an account"
+#: ../../Zotlabs/Module/Manage.php:170
+msgid "Delegated Channel"
 msgstr ""
 
-#: ../../include/nav.php:180
-msgid "Help and documentation"
+#: ../../Zotlabs/Module/Chanview.php:132
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../include/nav.php:194
-msgid "Search site @name, !forum, #tag, ?docs, content"
+#: ../../Zotlabs/Module/Pubstream.php:20
+msgid "Public Stream App"
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Site Setup and Configuration"
+#: ../../Zotlabs/Module/Pubstream.php:21
+msgid "The unmoderated public stream of this hub"
 msgstr ""
 
-#: ../../include/nav.php:330
-msgid "@name, !forum, #tag, ?doc, content"
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
 msgstr ""
 
-#: ../../include/nav.php:331
-msgid "Please wait..."
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
 msgstr ""
 
-#: ../../include/nav.php:337
-msgid "Add Apps"
+#: ../../Zotlabs/Module/Permcats.php:29
+msgid "Permission category name is required."
 msgstr ""
 
-#: ../../include/nav.php:338
-msgid "Arrange Apps"
+#: ../../Zotlabs/Module/Permcats.php:48
+msgid "Permission category saved."
 msgstr ""
 
-#: ../../include/nav.php:339
-msgid "Toggle System Apps"
+#: ../../Zotlabs/Module/Permcats.php:63
+msgid "Permission Categories App"
 msgstr ""
 
-#: ../../include/nav.php:424
-msgid "Status Messages and Posts"
+#: ../../Zotlabs/Module/Permcats.php:64
+msgid "Create custom connection permission limits"
 msgstr ""
 
-#: ../../include/nav.php:437
-msgid "Profile Details"
+#: ../../Zotlabs/Module/Permcats.php:80
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
 msgstr ""
 
-#: ../../include/nav.php:447 ../../include/photos.php:666
-msgid "Photo Albums"
+#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:375
+msgid "Permission Categories"
 msgstr ""
 
-#: ../../include/nav.php:455
-msgid "Files and Storage"
+#: ../../Zotlabs/Module/Permcats.php:121
+msgid "Permission category name"
 msgstr ""
 
-#: ../../include/nav.php:493
-msgid "Saved Bookmarks"
+#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Zotlabs/Module/Email_validation.php:24
+msgid "Token verification failed."
 msgstr ""
 
-#: ../../include/nav.php:504
-msgid "View Cards"
+#: ../../Zotlabs/Module/Email_resend.php:30
+msgid "Email verification resent"
 msgstr ""
 
-#: ../../include/nav.php:515
-msgid "View Articles"
+#: ../../Zotlabs/Module/Email_resend.php:33
+msgid "Unable to resend email verification message."
 msgstr ""
 
-#: ../../include/nav.php:527
-msgid "View Webpages"
+#: ../../Zotlabs/Module/Cal.php:62
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../include/language.php:441
-msgid "Select an alternate language"
+#: ../../Zotlabs/Module/Viewsrc.php:43
+msgid "item"
 msgstr ""
 
-#: ../../include/zid.php:403
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of Pinned Navbar Apps"
 msgstr ""
 
-#: ../../include/bookmarks.php:34
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of App Tray Apps"
 msgstr ""
 
-#: ../../include/activities.php:42
-msgid " and "
+#: ../../Zotlabs/Module/Apporder.php:48
+msgid ""
+"Use arrows to move the corresponding app left (top) or right (bottom) in the "
+"navbar"
 msgstr ""
 
-#: ../../include/activities.php:50
-msgid "public profile"
+#: ../../Zotlabs/Module/Apporder.php:48
+msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
 msgstr ""
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
 msgstr ""
 
-#: ../../include/activities.php:63
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: ../../Zotlabs/Module/Moderate.php:67
+msgid "Comment approved"
 msgstr ""
 
-#: ../../include/cdav.php:157
-msgid "INVALID EVENT DISMISSED!"
+#: ../../Zotlabs/Module/Moderate.php:71
+msgid "Comment deleted"
 msgstr ""
 
-#: ../../include/cdav.php:158
-msgid "Summary: "
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
 
-#: ../../include/cdav.php:159
-msgid "Date: "
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
 msgstr ""
 
-#: ../../include/cdav.php:160 ../../include/cdav.php:168
-msgid "Reason: "
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
 msgstr ""
 
-#: ../../include/cdav.php:166
-msgid "INVALID CARD DISMISSED!"
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:109
+msgid "Remove Account"
 msgstr ""
 
-#: ../../include/cdav.php:167
-msgid "Name: "
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
+msgid "Language App"
 msgstr ""
 
-#: ../../include/photos.php:151
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../Zotlabs/Module/Lang.php:64
+msgid "Change UI language"
 msgstr ""
 
-#: ../../include/photos.php:162
-msgid "Image file is empty."
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid "Channel Export App"
 msgstr ""
 
-#: ../../include/photos.php:324
-msgid "Photo storage failed."
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your channel"
 msgstr ""
 
-#: ../../include/photos.php:373
-msgid "a new photo"
+#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74
+msgid "Export Channel"
 msgstr ""
 
-#: ../../include/photos.php:377
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../Zotlabs/Module/Uexport.php:75
+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 ""
 
-#: ../../include/photos.php:671
-msgid "Upload New Photos"
+#: ../../Zotlabs/Module/Uexport.php:76
+msgid "Export Content"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../Zotlabs/Module/Uexport.php:77
+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 ""
 
-#: ../../include/js_strings.php:8
-#, php-format
-msgid "%s show less"
+#: ../../Zotlabs/Module/Uexport.php:79
+msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
+#: ../../Zotlabs/Module/Uexport.php:81
+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 ""
 
-#: ../../include/js_strings.php:10
+#: ../../Zotlabs/Module/Uexport.php:82
 #, php-format
-msgid "%s collapse"
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
 msgstr ""
 
-#: ../../include/js_strings.php:11
-msgid "Password too short"
+#: ../../Zotlabs/Module/Uexport.php:83
+#, 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 ""
 
-#: ../../include/js_strings.php:13
-msgid "everybody"
+#: ../../Zotlabs/Module/Uexport.php:84
+#, 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 ""
 
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
+#: ../../Zotlabs/Module/Display.php:372
+msgid "Article"
 msgstr ""
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
+#: ../../Zotlabs/Module/Display.php:417
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
 msgstr ""
 
-#: ../../include/js_strings.php:17
-msgid "close all"
+#: ../../Zotlabs/Module/Common.php:45
+msgid "No connections in common."
 msgstr ""
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
+#: ../../Zotlabs/Module/Common.php:65
+msgid "View Common Connections"
 msgstr ""
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
+#: ../../Zotlabs/Module/Impel.php:185
+#, php-format
+msgid "%s element installed"
 msgstr ""
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
+#: ../../Zotlabs/Module/Impel.php:188
+#, php-format
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
+#: ../../Zotlabs/Module/New_channel.php:159
+msgid "Your real name is recommended."
 msgstr ""
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
+#: ../../Zotlabs/Module/New_channel.php:160
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
 msgstr ""
 
-#: ../../include/js_strings.php:26
-msgid "lovely"
+#: ../../Zotlabs/Module/New_channel.php:165
+msgid ""
+"This will be used to create a unique network address (like an email address)."
 msgstr ""
 
-#: ../../include/js_strings.php:27
-msgid "wonderful"
+#: ../../Zotlabs/Module/New_channel.php:167
+msgid "Allowed characters are a-z 0-9, - and _"
 msgstr ""
 
-#: ../../include/js_strings.php:28
-msgid "fantastic"
+#: ../../Zotlabs/Module/New_channel.php:175
+msgid "Channel name"
 msgstr ""
 
-#: ../../include/js_strings.php:29
-msgid "great"
+#: ../../Zotlabs/Module/New_channel.php:178
+#: ../../Zotlabs/Module/Settings/Channel.php:537
+msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../include/js_strings.php:30
+#: ../../Zotlabs/Module/New_channel.php:178
 msgid ""
-"Your chosen nickname was either already taken or not valid. Please use our "
-"suggestion ("
+"Select a channel permission role compatible with your usage needs and "
+"privacy requirements."
 msgstr ""
 
-#: ../../include/js_strings.php:31
-msgid ") or enter a new one."
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid "Read more about channel permission roles"
 msgstr ""
 
-#: ../../include/js_strings.php:32
-msgid "Thank you, this nickname is valid."
+#: ../../Zotlabs/Module/New_channel.php:181
+msgid "Create a Channel"
 msgstr ""
 
-#: ../../include/js_strings.php:33
-msgid "A channel name is required."
+#: ../../Zotlabs/Module/New_channel.php:182
+msgid ""
+"A channel is a unique network identity. It can represent a person (social "
+"network profile), a forum (group), a business or celebrity page, a newsfeed, "
+"and many other things."
 msgstr ""
 
-#: ../../include/js_strings.php:34
-msgid "This is a "
+#: ../../Zotlabs/Module/New_channel.php:183
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../include/js_strings.php:35
-msgid " channel name"
+#: ../../Zotlabs/Module/New_channel.php:188
+msgid "Validate"
 msgstr ""
 
-#: ../../include/js_strings.php:36
-msgid "Back to reply"
+#: ../../Zotlabs/Module/Dircensor.php:42
+msgid "Entry censored"
 msgstr ""
 
-#: ../../include/js_strings.php:37
-msgid "Pinned"
+#: ../../Zotlabs/Module/Dircensor.php:45
+msgid "Entry uncensored"
 msgstr ""
 
-#: ../../include/js_strings.php:45
-#, php-format
-msgid "%d minutes"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/js_strings.php:46
-#, php-format
-msgid "about %d hours"
-msgid_plural "about %d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/js_strings.php:47
-#, php-format
-msgid "%d days"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/js_strings.php:48
-#, php-format
-msgid "%d months"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/js_strings.php:49
-#, php-format
-msgid "%d years"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
+msgstr ""
 
-#: ../../include/js_strings.php:54
-msgid "timeago.prefixAgo"
+#: ../../Zotlabs/Module/Mood.php:134
+msgid "Mood App"
 msgstr ""
 
-#: ../../include/js_strings.php:55
-msgid "timeago.prefixFromNow"
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Module/Mood.php:155
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../include/js_strings.php:56
-msgid "timeago.suffixAgo"
+#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:351
+msgid "Mood"
 msgstr ""
 
-#: ../../include/js_strings.php:57
-msgid "timeago.suffixFromNow"
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "About this site"
 msgstr ""
 
-#: ../../include/js_strings.php:60
-msgid "less than a minute"
+#: ../../Zotlabs/Module/Siteinfo.php:22
+msgid "Site Name"
 msgstr ""
 
-#: ../../include/js_strings.php:61
-msgid "about a minute"
+#: ../../Zotlabs/Module/Siteinfo.php:26
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/js_strings.php:63
-msgid "about an hour"
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "Software and Project information"
 msgstr ""
 
-#: ../../include/js_strings.php:65
-msgid "a day"
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid "This site is powered by $Projectname"
 msgstr ""
 
-#: ../../include/js_strings.php:67
-msgid "about a month"
+#: ../../Zotlabs/Module/Siteinfo.php:31
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
 msgstr ""
 
-#: ../../include/js_strings.php:69
-msgid "about a year"
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Additional federated transport protocols:"
 msgstr ""
 
-#: ../../include/js_strings.php:71
-msgid " "
+#: ../../Zotlabs/Module/Siteinfo.php:36
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../include/js_strings.php:72
-msgid "timeago.numbers"
+#: ../../Zotlabs/Module/Siteinfo.php:37
+msgid "Project homepage"
 msgstr ""
 
-#: ../../include/js_strings.php:78
-msgctxt "long"
-msgid "May"
+#: ../../Zotlabs/Module/Siteinfo.php:38
+msgid "Developer homepage"
 msgstr ""
 
-#: ../../include/js_strings.php:86
-msgid "Jan"
+#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+msgid "App installed."
 msgstr ""
 
-#: ../../include/js_strings.php:87
-msgid "Feb"
+#: ../../Zotlabs/Module/Appman.php:49
+msgid "Malformed app."
 msgstr ""
 
-#: ../../include/js_strings.php:88
-msgid "Mar"
+#: ../../Zotlabs/Module/Appman.php:132
+msgid "Embed code"
 msgstr ""
 
-#: ../../include/js_strings.php:89
-msgid "Apr"
+#: ../../Zotlabs/Module/Appman.php:138
+msgid "Edit App"
 msgstr ""
 
-#: ../../include/js_strings.php:90
-msgctxt "short"
-msgid "May"
+#: ../../Zotlabs/Module/Appman.php:138
+msgid "Create App"
 msgstr ""
 
-#: ../../include/js_strings.php:91
-msgid "Jun"
+#: ../../Zotlabs/Module/Appman.php:143
+msgid "Name of app"
 msgstr ""
 
-#: ../../include/js_strings.php:92
-msgid "Jul"
+#: ../../Zotlabs/Module/Appman.php:144
+msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../include/js_strings.php:93
-msgid "Aug"
+#: ../../Zotlabs/Module/Appman.php:146
+msgid "Photo icon URL"
 msgstr ""
 
-#: ../../include/js_strings.php:94
-msgid "Sep"
+#: ../../Zotlabs/Module/Appman.php:146
+msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: ../../include/js_strings.php:95
-msgid "Oct"
+#: ../../Zotlabs/Module/Appman.php:147
+msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: ../../include/js_strings.php:96
-msgid "Nov"
+#: ../../Zotlabs/Module/Appman.php:148
+msgid "Version ID"
 msgstr ""
 
-#: ../../include/js_strings.php:97
-msgid "Dec"
+#: ../../Zotlabs/Module/Appman.php:149
+msgid "Price of app"
 msgstr ""
 
-#: ../../include/js_strings.php:105
-msgid "Sun"
+#: ../../Zotlabs/Module/Appman.php:150
+msgid "Location (URL) to purchase app"
 msgstr ""
 
-#: ../../include/js_strings.php:106
-msgid "Mon"
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "Blocked accounts"
 msgstr ""
 
-#: ../../include/js_strings.php:107
-msgid "Tue"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "Expired accounts"
 msgstr ""
 
-#: ../../include/js_strings.php:108
-msgid "Wed"
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expiring accounts"
 msgstr ""
 
-#: ../../include/js_strings.php:109
-msgid "Thu"
+#: ../../Zotlabs/Module/Admin.php:122
+msgid "Message queues"
 msgstr ""
 
-#: ../../include/js_strings.php:110
-msgid "Fri"
+#: ../../Zotlabs/Module/Admin.php:136
+msgid "Your software should be updated"
 msgstr ""
 
-#: ../../include/js_strings.php:111
-msgid "Sat"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Summary"
 msgstr ""
 
-#: ../../include/js_strings.php:112
-msgctxt "calendar"
-msgid "today"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Registered accounts"
 msgstr ""
 
-#: ../../include/js_strings.php:113
-msgctxt "calendar"
-msgid "month"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../include/js_strings.php:114
-msgctxt "calendar"
-msgid "week"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Registered channels"
 msgstr ""
 
-#: ../../include/js_strings.php:115
-msgctxt "calendar"
-msgid "day"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Active addons"
 msgstr ""
 
-#: ../../include/js_strings.php:116
-msgctxt "calendar"
-msgid "All day"
+#: ../../Zotlabs/Module/Admin.php:148
+msgid "Version"
 msgstr ""
 
-#: ../../include/js_strings.php:119
-msgid "Please stand by while your download is being prepared."
+#: ../../Zotlabs/Module/Admin.php:149
+msgid "Repository version (master)"
 msgstr ""
 
-#: ../../include/js_strings.php:122
-msgid "Email address not valid"
+#: ../../Zotlabs/Module/Admin.php:150
+msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../include/security.php:607
-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."
+#: ../../Zotlabs/Module/Cards.php:51
+msgid "Cards App"
 msgstr ""
 
-#: ../../include/selectors.php:18
-msgid "Profile to assign new connections"
+#: ../../Zotlabs/Module/Cards.php:52
+msgid "Create personal planning cards"
 msgstr ""
 
-#: ../../include/selectors.php:41
-msgid "Frequently"
+#: ../../Zotlabs/Module/Cards.php:112
+msgid "Add Card"
 msgstr ""
 
-#: ../../include/selectors.php:42
-msgid "Hourly"
+#: ../../Zotlabs/Module/Directory.php:121
+msgid "No default suggestions were found."
 msgstr ""
 
-#: ../../include/selectors.php:43
-msgid "Twice daily"
+#: ../../Zotlabs/Module/Directory.php:281
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:292
+msgid "Gender: "
 msgstr ""
 
-#: ../../include/selectors.php:44
-msgid "Daily"
+#: ../../Zotlabs/Module/Directory.php:294
+msgid "Status: "
 msgstr ""
 
-#: ../../include/selectors.php:45
-msgid "Weekly"
+#: ../../Zotlabs/Module/Directory.php:296
+msgid "Homepage: "
 msgstr ""
 
-#: ../../include/selectors.php:46
-msgid "Monthly"
+#: ../../Zotlabs/Module/Directory.php:359
+msgid "Description:"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Currently Male"
+#: ../../Zotlabs/Module/Directory.php:370
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Currently Female"
+#: ../../Zotlabs/Module/Directory.php:373
+msgid "Keywords: "
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Mostly Male"
+#: ../../Zotlabs/Module/Directory.php:376
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Mostly Female"
+#: ../../Zotlabs/Module/Directory.php:378
+msgid "Common connections (estimated):"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Transgender"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Global Directory"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Intersex"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Local Directory"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Transsexual"
+#: ../../Zotlabs/Module/Directory.php:433
+msgid "Finding:"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Hermaphrodite"
+#: ../../Zotlabs/Module/Directory.php:438
+msgid "next page"
 msgstr ""
 
-#: ../../include/selectors.php:60
-msgid "Undecided"
+#: ../../Zotlabs/Module/Directory.php:438
+msgid "previous page"
 msgstr ""
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
-msgid "Males"
+#: ../../Zotlabs/Module/Directory.php:439
+msgid "Sort options"
 msgstr ""
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
-msgid "Females"
+#: ../../Zotlabs/Module/Directory.php:440
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Gay"
+#: ../../Zotlabs/Module/Directory.php:441
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Lesbian"
+#: ../../Zotlabs/Module/Directory.php:442
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "No Preference"
+#: ../../Zotlabs/Module/Directory.php:443
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Bisexual"
+#: ../../Zotlabs/Module/Directory.php:460
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Autosexual"
+#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Abstinent"
+#: ../../Zotlabs/Module/Api.php:75
+msgid "Return to your app and insert this Security Code:"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Virgin"
+#: ../../Zotlabs/Module/Api.php:85
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Deviant"
+#: ../../Zotlabs/Module/Api.php:97
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Fetish"
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Oodles"
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:113
+msgid "Block Name"
 msgstr ""
 
-#: ../../include/selectors.php:96
-msgid "Nonsexual"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Single"
+#: ../../Zotlabs/Module/Email_validation.php:36
+msgid "Email Verification Required"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Lonely"
+#: ../../Zotlabs/Module/Email_validation.php:37
+#, php-format
+msgid ""
+"A verification token was sent to your email address [%s]. Enter that token "
+"here to complete the account verification step. Please allow a few minutes "
+"for delivery, and check your spam folder if you do not see the message."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Available"
+#: ../../Zotlabs/Module/Email_validation.php:38
+msgid "Resend Email"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Unavailable"
+#: ../../Zotlabs/Module/Email_validation.php:41
+msgid "Validation token"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Has crush"
+#: ../../Zotlabs/Module/Attach.php:68
+msgid "Item not available."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Infatuated"
+#: ../../Zotlabs/Module/Vote.php:40
+msgid "Poll not found."
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Dating"
+#: ../../Zotlabs/Module/Vote.php:71
+msgid "Invalid response."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Unfaithful"
+#: ../../Zotlabs/Module/Vote.php:132
+msgid "Response submitted. Updates may not appear instantly."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Sex Addict"
+#: ../../Zotlabs/Module/Profile_photo.php:93
+#: ../../Zotlabs/Module/Cover_photo.php:85
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Friends/Benefits"
+#: ../../Zotlabs/Module/Profile_photo.php:166
+#: ../../Zotlabs/Module/Cover_photo.php:212
+msgid "Image resize failed."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Casual"
+#: ../../Zotlabs/Module/Profile_photo.php:296
+#: ../../Zotlabs/Module/Cover_photo.php:265
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Engaged"
+#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Cover_photo.php:282
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Married"
+#: ../../Zotlabs/Module/Profile_photo.php:379
+#: ../../Zotlabs/Module/Profile_photo.php:431
+#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Zotlabs/Module/Cover_photo.php:382
+msgid "Photo not available."
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Imaginarily married"
+#: ../../Zotlabs/Module/Profile_photo.php:495
+msgid ""
+"Your default profile photo is visible to anybody on the internet. Profile "
+"photos for alternate profiles will inherit the permissions of the profile"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Partners"
+#: ../../Zotlabs/Module/Profile_photo.php:495
+msgid ""
+"Your profile photo is visible to anybody on the internet and may be "
+"distributed to other websites."
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Cohabiting"
+#: ../../Zotlabs/Module/Profile_photo.php:497
+#: ../../Zotlabs/Module/Cover_photo.php:420
+msgid "Upload File:"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Common law"
+#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Zotlabs/Module/Cover_photo.php:421
+msgid "Select a profile:"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Happy"
+#: ../../Zotlabs/Module/Profile_photo.php:499
+msgid "Use Photo for Profile"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Not looking"
+#: ../../Zotlabs/Module/Profile_photo.php:499
+msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Swinger"
+#: ../../Zotlabs/Module/Profile_photo.php:500
+msgid "Use"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Betrayed"
+#: ../../Zotlabs/Module/Profile_photo.php:505
+#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Zotlabs/Module/Cover_photo.php:427
+msgid "Use a photo from your albums"
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Separated"
+#: ../../Zotlabs/Module/Profile_photo.php:511
+#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:404
+msgid "Choose a different album"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Unstable"
+#: ../../Zotlabs/Module/Profile_photo.php:516
+#: ../../Zotlabs/Module/Cover_photo.php:438
+msgid "Select existing photo"
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Divorced"
+#: ../../Zotlabs/Module/Profile_photo.php:535
+#: ../../Zotlabs/Module/Cover_photo.php:455
+msgid "Crop Image"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Imaginarily divorced"
+#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Cover_photo.php:456
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Widowed"
+#: ../../Zotlabs/Module/Profile_photo.php:538
+#: ../../Zotlabs/Module/Cover_photo.php:458
+msgid "Done Editing"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Uncertain"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
 msgstr ""
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "It's complicated"
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "Enter a folder name"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Don't care"
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: ../../include/selectors.php:134
-msgid "Ask me"
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/network.php:1762 ../../include/network.php:1763
-msgid "Friendica"
+#: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129
+#: ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Name"
 msgstr ""
 
-#: ../../include/network.php:1764
-msgid "OStatus"
+#: ../../Zotlabs/Module/Editlayout.php:129 ../../Zotlabs/Module/Layouts.php:132
+msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../include/network.php:1765
-msgid "GNU-Social"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
 msgstr ""
 
-#: ../../include/network.php:1766
-msgid "RSS/Atom"
+#: ../../Zotlabs/Module/Connections.php:58
+#: ../../Zotlabs/Module/Connections.php:116
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Active"
 msgstr ""
 
-#: ../../include/network.php:1769
-msgid "Diaspora"
+#: ../../Zotlabs/Module/Connections.php:63
+#: ../../Zotlabs/Module/Connections.php:182
+#: ../../Zotlabs/Module/Connections.php:279
+msgid "Blocked"
 msgstr ""
 
-#: ../../include/network.php:1770
-msgid "Facebook"
+#: ../../Zotlabs/Module/Connections.php:68
+#: ../../Zotlabs/Module/Connections.php:189
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Ignored"
 msgstr ""
 
-#: ../../include/network.php:1771
-msgid "Zot"
+#: ../../Zotlabs/Module/Connections.php:73
+#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:277
+msgid "Hidden"
 msgstr ""
 
-#: ../../include/network.php:1772
-msgid "LinkedIn"
+#: ../../Zotlabs/Module/Connections.php:78
+#: ../../Zotlabs/Module/Connections.php:196
+msgid "Archived/Unreachable"
 msgstr ""
 
-#: ../../include/network.php:1773
-msgid "XMPP/IM"
+#: ../../Zotlabs/Module/Connections.php:83
+#: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:180
+#: ../../Zotlabs/Module/Notifications.php:101
+msgid "New"
 msgstr ""
 
-#: ../../include/network.php:1774
-msgid "MySpace"
+#: ../../Zotlabs/Module/Connections.php:158
+msgid "Active Connections"
 msgstr ""
 
-#: ../../include/account.php:38
-msgid "The provided email address is not valid"
+#: ../../Zotlabs/Module/Connections.php:161
+msgid "Show active connections"
 msgstr ""
 
-#: ../../include/account.php:41
-msgid "The provided email domain is not among those allowed on this site"
+#: ../../Zotlabs/Module/Connections.php:168
+msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../include/account.php:48
-msgid "The provided email address is already registered at this site"
+#: ../../Zotlabs/Module/Connections.php:185
+msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../include/account.php:55
-msgid ""
-"There is a pending registration for this address - click \"Register\" to "
-"continue verification"
+#: ../../Zotlabs/Module/Connections.php:192
+msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../include/account.php:94
-msgid "An invitation is required."
+#: ../../Zotlabs/Module/Connections.php:199
+msgid "Only show archived/unreachable connections"
 msgstr ""
 
-#: ../../include/account.php:103
-msgid "Invitation could not be verified."
+#: ../../Zotlabs/Module/Connections.php:206
+msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../include/account.php:191
-msgid "Please enter the required information."
+#: ../../Zotlabs/Module/Connections.php:221
+msgid "Show all connections"
 msgstr ""
 
-#: ../../include/account.php:258 ../../include/account.php:366
-msgid "Failed to store account information."
+#: ../../Zotlabs/Module/Connections.php:275
+msgid "Pending approval"
 msgstr ""
 
-#: ../../include/account.php:578
-#, php-format
-msgid "Registration request at %s"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Archived"
 msgstr ""
 
-#: ../../include/account.php:600
-msgid "your registration password"
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Not connected at this location"
 msgstr ""
 
-#: ../../include/account.php:606 ../../include/account.php:695
+#: ../../Zotlabs/Module/Connections.php:319
 #, php-format
-msgid "Registration details for %s"
+msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../include/account.php:706
-msgid "Account approved."
+#: ../../Zotlabs/Module/Connections.php:320
+msgid "Edit connection"
 msgstr ""
 
-#: ../../include/account.php:762
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../Zotlabs/Module/Connections.php:322
+msgid "Delete connection"
 msgstr ""
 
-#: ../../include/account.php:769
-#, php-format
-msgid "Could not revoke registration for %s"
+#: ../../Zotlabs/Module/Connections.php:331
+msgid "Channel address"
 msgstr ""
 
-#: ../../include/account.php:1185 ../../include/account.php:1187
-msgid "Click here to upgrade."
+#: ../../Zotlabs/Module/Connections.php:336
+msgid "Call"
 msgstr ""
 
-#: ../../include/account.php:1193
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../Zotlabs/Module/Connections.php:338
+msgid "Status"
 msgstr ""
 
-#: ../../include/account.php:1198
-msgid "This action is not available under your subscription plan."
+#: ../../Zotlabs/Module/Connections.php:340
+msgid "Connected"
 msgstr ""
 
-#: ../../include/account.php:1258
-msgid "open"
+#: ../../Zotlabs/Module/Connections.php:342
+msgid "Approve connection"
 msgstr ""
 
-#: ../../include/account.php:1258
-msgid "closed"
+#: ../../Zotlabs/Module/Connections.php:344
+msgid "Ignore connection"
 msgstr ""
 
-#: ../../include/account.php:1265
-msgid "Registration is currently"
+#: ../../Zotlabs/Module/Connections.php:345
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Ignore"
 msgstr ""
 
-#: ../../include/account.php:1274
-msgid "please come back"
+#: ../../Zotlabs/Module/Connections.php:346
+msgid "Recent activity"
 msgstr ""
 
-#: ../../include/help.php:80
-msgid "Help:"
+#: ../../Zotlabs/Module/Connections.php:352
+msgid "Connect at this location"
 msgstr ""
 
-#: ../../include/help.php:129
-msgid "Not Found"
+#: ../../Zotlabs/Module/Connections.php:380
+msgid "Search your connections"
 msgstr ""
 
-#: ../../include/attach.php:273 ../../include/attach.php:324
-#: ../../include/attach.php:419
-msgid "Item was not found."
+#: ../../Zotlabs/Module/Connections.php:381
+msgid "Connections search"
 msgstr ""
 
-#: ../../include/attach.php:290
-msgid "Unknown error."
+#: ../../Zotlabs/Module/Cover_photo.php:196
+#: ../../Zotlabs/Module/Cover_photo.php:254
+msgid "Cover Photos"
 msgstr ""
 
-#: ../../include/attach.php:612
-msgid "No source file."
+#: ../../Zotlabs/Module/Cover_photo.php:418
+msgid "Your cover photo may be visible to anybody on the internet"
 msgstr ""
 
-#: ../../include/attach.php:634
-msgid "Cannot locate file to replace"
+#: ../../Zotlabs/Module/Cover_photo.php:422
+msgid "Change Cover Photo"
 msgstr ""
 
-#: ../../include/attach.php:653
-msgid "Cannot locate file to revise/update"
+#: ../../Zotlabs/Module/Photos.php:80
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../include/attach.php:795
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
+msgid "Album not found."
 msgstr ""
 
-#: ../../include/attach.php:816
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../Zotlabs/Module/Photos.php:105
+msgid "Delete Album"
 msgstr ""
 
-#: ../../include/attach.php:1004
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../include/attach.php:1033
-msgid "Stored file could not be verified. Upload failed."
+#: ../../Zotlabs/Module/Photos.php:530
+msgid "No photos selected"
 msgstr ""
 
-#: ../../include/attach.php:1105 ../../include/attach.php:1121
-msgid "Path not available."
+#: ../../Zotlabs/Module/Photos.php:579
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../include/attach.php:1169 ../../include/attach.php:1332
-msgid "Empty pathname"
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../include/attach.php:1195
-msgid "duplicate filename or path"
+#: ../../Zotlabs/Module/Photos.php:625
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../include/attach.php:1220
-msgid "Path not found."
+#: ../../Zotlabs/Module/Photos.php:667
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../include/attach.php:1288
-msgid "mkdir failed."
+#: ../../Zotlabs/Module/Photos.php:671
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../include/attach.php:1292
-msgid "database storage failed."
+#: ../../Zotlabs/Module/Photos.php:672
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../include/attach.php:1338
-msgid "Empty path"
+#: ../../Zotlabs/Module/Photos.php:673
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../include/attach.php:2099
-#, php-format
-msgid "%s shared a %s with you"
+#: ../../Zotlabs/Module/Photos.php:675
+msgid "Description (optional)"
 msgstr ""
 
-#: ../../include/attach.php:2099
-#: ../../extend/addon/hubzilla-addons/redfiles/redfilehelper.php:64
-msgid "file"
+#: ../../Zotlabs/Module/Photos.php:761
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../include/connections.php:134
-msgid "New window"
+#: ../../Zotlabs/Module/Photos.php:763
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../include/connections.php:135
-msgid "Open the selected location in a different window or browser tab"
+#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1362
+msgid "Add Photos"
 msgstr ""
 
-#: ../../include/connections.php:736 ../../include/event.php:1424
-msgid "Home, Voice"
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../include/connections.php:737 ../../include/event.php:1425
-msgid "Home, Fax"
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
 msgstr ""
 
-#: ../../include/connections.php:739 ../../include/event.php:1427
-msgid "Work, Voice"
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../include/connections.php:740 ../../include/event.php:1428
-msgid "Work, Fax"
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
 msgstr ""
 
-#: ../../include/oembed.php:153
-msgid "View PDF"
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
 msgstr ""
 
-#: ../../include/oembed.php:365
-msgid " by "
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
 msgstr ""
 
-#: ../../include/oembed.php:366
-msgid " on "
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Edit photo"
 msgstr ""
 
-#: ../../include/oembed.php:395
-msgid "Embedded content"
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../include/oembed.php:404
-msgid "Embedding disabled"
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../include/event.php:33 ../../include/event.php:110
-msgid "l F d, Y \\@ g:i A"
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Move photo to album"
 msgstr ""
 
-#: ../../include/event.php:41
-msgid "Starts:"
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../include/event.php:51
-msgid "Finishes:"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../include/event.php:110
-msgid "l F d, Y"
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../include/event.php:114
-msgid "Start:"
+#: ../../Zotlabs/Module/Photos.php:1054
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../include/event.php:118
-msgid "End:"
+#: ../../Zotlabs/Module/Photos.php:1057
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../include/event.php:123
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:67
-msgid "Timezone"
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/event.php:1106
-msgid "This event has been added to your calendar."
+#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/event.php:1337
-msgid "Not specified"
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1211
+#: ../../Zotlabs/Lib/ThreadItem.php:824
+msgid "This is you"
 msgstr ""
 
-#: ../../include/event.php:1338
-msgid "Needs Action"
+#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
+#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
+msgid "View all"
 msgstr ""
 
-#: ../../include/event.php:1339
-msgid "Completed"
+#: ../../Zotlabs/Module/Photos.php:1245
+msgid "Photo Tools"
 msgstr ""
 
-#: ../../include/event.php:1340
-msgid "In Process"
+#: ../../Zotlabs/Module/Photos.php:1254
+msgid "In This Photo:"
 msgstr ""
 
-#: ../../include/event.php:1341
-msgid "Cancelled"
+#: ../../Zotlabs/Module/Photos.php:1259
+msgid "Map"
 msgstr ""
 
-#: ../../include/datetime.php:140
-msgid "Birthday"
+#: ../../Zotlabs/Module/Photos.php:1267 ../../Zotlabs/Lib/ThreadItem.php:491
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/datetime.php:140
-msgid "Age: "
+#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:492
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/datetime.php:140
-msgid "YYYY-MM-DD or MM-DD"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
 msgstr ""
 
-#: ../../include/datetime.php:238 ../../boot.php:2730
-msgid "never"
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../include/datetime.php:244
-msgid "less than a second ago"
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../include/datetime.php:262
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
 #, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../include/datetime.php:273
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
 
-#: ../../include/datetime.php:276
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1730
+msgid "Password Reset"
+msgstr ""
 
-#: ../../include/datetime.php:279
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr ""
 
-#: ../../include/datetime.php:282
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr ""
 
-#: ../../include/datetime.php:285
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr ""
 
-#: ../../include/datetime.php:288
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr ""
 
-#: ../../include/datetime.php:291
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
 
-#: ../../include/datetime.php:520
+#: ../../Zotlabs/Module/Lostpass.php:117
 #, php-format
-msgid "%1$s's birthday"
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../include/datetime.php:521
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../include/items.php:1038 ../../include/items.php:1098
-msgid "(Unknown)"
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../include/items.php:1302
-msgid "Visible to anybody on the internet."
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
 msgstr ""
 
-#: ../../include/items.php:1304
-msgid "Visible to you only."
+#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78
+msgid "Reset"
 msgstr ""
 
-#: ../../include/items.php:1306
-msgid "Visible to anybody in this network."
+#: ../../Zotlabs/Module/Follow.php:93
+msgid "Connection added."
 msgstr ""
 
-#: ../../include/items.php:1308
-msgid "Visible to anybody authenticated."
+#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
+msgid "Invalid item."
 msgstr ""
 
-#: ../../include/items.php:1310
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../Zotlabs/Module/Page.php:173
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: ../../include/items.php:1312
-msgid "Visible to all connections."
+#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
+#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:660
+msgid "Profile not found."
 msgstr ""
 
-#: ../../include/items.php:1314
-msgid "Visible to approved connections."
+#: ../../Zotlabs/Module/Profiles.php:46
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../include/items.php:1316
-msgid "Visible to specific connections."
+#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
+msgid "Profile-"
 msgstr ""
 
-#: ../../include/items.php:4601
-msgid "Privacy group is empty."
+#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
+msgid "New profile created."
 msgstr ""
 
-#: ../../include/items.php:4608
-#, php-format
-msgid "Privacy group: %s"
+#: ../../Zotlabs/Module/Profiles.php:113
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../include/items.php:4620
-msgid "Connection not found."
+#: ../../Zotlabs/Module/Profiles.php:148
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../include/items.php:4973
-msgid "profile photo"
+#: ../../Zotlabs/Module/Profiles.php:254
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../include/items.php:5165
-#, php-format
-msgid "[Edited %s]"
+#: ../../Zotlabs/Module/Profiles.php:461
+msgid "Marital Status"
 msgstr ""
 
-#: ../../include/items.php:5165
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../Zotlabs/Module/Profiles.php:465
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../include/items.php:5165
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:773
+msgid "Likes"
 msgstr ""
 
-#: ../../include/follow.php:86
-msgid "Response from remote channel was incomplete."
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:774
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/follow.php:98
-msgid "Premium channel - please visit:"
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:781
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../include/follow.php:112
-msgid "Channel was deleted and no longer exists."
+#: ../../Zotlabs/Module/Profiles.php:480
+msgid "Religion"
 msgstr ""
 
-#: ../../include/zot.php:778
-msgid "Invalid data packet"
+#: ../../Zotlabs/Module/Profiles.php:484
+msgid "Political Views"
 msgstr ""
 
-#: ../../include/zot.php:4378
-msgid "invalid target signature"
+#: ../../Zotlabs/Module/Profiles.php:492
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
-#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533
-msgid "Image/photo"
+#: ../../Zotlabs/Module/Profiles.php:496
+msgid "Homepage"
 msgstr ""
 
-#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550
-msgid "Encrypted content"
+#: ../../Zotlabs/Module/Profiles.php:500
+msgid "Interests"
 msgstr ""
 
-#: ../../include/bbcode.php:334
-#, php-format
-msgid "Install %1$s element %2$s"
+#: ../../Zotlabs/Module/Profiles.php:596
+msgid "Profile updated."
 msgstr ""
 
-#: ../../include/bbcode.php:338
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+#: ../../Zotlabs/Module/Profiles.php:679
+msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../include/bbcode.php:551
-msgid "card"
+#: ../../Zotlabs/Module/Profiles.php:723
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../include/bbcode.php:553
-msgid "article"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "View this profile"
 msgstr ""
 
-#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
-msgid "Click to open/close"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../include/bbcode.php:657
-msgid "View article"
+#: ../../Zotlabs/Module/Profiles.php:728
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../include/bbcode.php:657
-msgid "View summary"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../include/bbcode.php:1501
-msgid "$1 wrote:"
+#: ../../Zotlabs/Module/Profiles.php:731
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:453
-msgid "Follow"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:456
-#, php-format
-msgid "%1$s is now following %2$s"
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Add profile things"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:16
-msgid ""
-"The GNU-Social protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Personal"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22
-msgid "GNU-Social Protocol App"
+#: ../../Zotlabs/Module/Profiles.php:736
+msgid "Relationship"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:34
-msgid "GNU-Social Protocol"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/qrator/qrator.php:48
-msgid "QR code"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/qrator/qrator.php:63
-msgid "QR Generator"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Your gender"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/qrator/qrator.php:64
-msgid "Enter some text"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Marital status"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/Mod_Irc.php:23
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:41
-msgid "Popular Channels"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:37
-msgid "Channels to auto connect"
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Profile name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:37
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:41
-msgid "Comma separated list"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:45
-msgid "IRC Settings"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "Your full name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:54
-msgid "IRC settings saved."
+#: ../../Zotlabs/Module/Profiles.php:751
+msgid "Short title/description"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/irc/irc.php:58
-msgid "IRC Chatroom"
+#: ../../Zotlabs/Module/Profiles.php:751
+msgid "Maximal 190 characters"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:19
-msgid "Send email to all members"
+#: ../../Zotlabs/Module/Profiles.php:754
+msgid "Street address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:50
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:50
-msgid "No recipients found."
+#: ../../Zotlabs/Module/Profiles.php:755
+msgid "Locality/City"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:73
-#, php-format
-msgid "%1$d of %2$d messages sent."
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Region/State"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:81
-msgid "Send email to all hub members."
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:92
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:96
-msgid "Message subject"
+#: ../../Zotlabs/Module/Profiles.php:763
+msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:93
-msgid "Sender Email address"
+#: ../../Zotlabs/Module/Profiles.php:763
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:94
-msgid "Test mode (only send to hub administrator)"
+#: ../../Zotlabs/Module/Profiles.php:764
+msgid "Since (date)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:51
-msgid "Your Webbie:"
+#: ../../Zotlabs/Module/Profiles.php:767
+msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:54
-msgid "Fontsize (px):"
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Hometown"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:68
-msgid "Link:"
+#: ../../Zotlabs/Module/Profiles.php:770
+msgid "Political views"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:70
-msgid "Like us on Hubzilla"
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Religious views"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:72
-msgid "Embed:"
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:46
-#: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:43
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:150
-msgid "Save Settings"
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:47
-msgid "text to include in all outgoing posts from this site"
+#: ../../Zotlabs/Module/Profiles.php:775
+msgid "Musical interests"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:19
-msgid "lonely"
+#: ../../Zotlabs/Module/Profiles.php:776
+msgid "Books, literature"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:20
-msgid "drunk"
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Television"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:21
-msgid "horny"
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:22
-msgid "stoned"
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:23
-msgid "fucked up"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Love/Romance"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:24
-msgid "clusterfucked"
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "School/Education"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:25
-msgid "crazy"
+#: ../../Zotlabs/Module/Profiles.php:783
+msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:26
-msgid "hurt"
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "My other channels"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:27
-msgid "sleepy"
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "Communications"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:28
-msgid "grumpy"
+#: ../../Zotlabs/Module/Subthread.php:128
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:29
-msgid "high"
+#: ../../Zotlabs/Module/Subthread.php:130
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:30
-msgid "semi-conscious"
+#: ../../Zotlabs/Module/Articles.php:52
+msgid "Articles App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:31
-msgid "in love"
+#: ../../Zotlabs/Module/Articles.php:53
+msgid "Create interactive articles"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:32
-msgid "in lust"
+#: ../../Zotlabs/Module/Articles.php:116
+msgid "Add Article"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:33
-msgid "naked"
+#: ../../Zotlabs/Module/Bookmarks.php:62
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:34
-msgid "stinky"
+#: ../../Zotlabs/Module/Bookmarks.php:78
+msgid "Bookmarks App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:35
-msgid "sweaty"
+#: ../../Zotlabs/Module/Bookmarks.php:79
+msgid "Bookmark links from posts and manage them"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:36
-msgid "bleeding out"
+#: ../../Zotlabs/Module/Bookmarks.php:92
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:37
-msgid "victorious"
+#: ../../Zotlabs/Module/Bookmarks.php:103
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:38
-msgid "defeated"
+#: ../../Zotlabs/Module/Changeaddr.php:35
+msgid ""
+"Channel name changes are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:39
-msgid "envious"
+#: ../../Zotlabs/Module/Changeaddr.php:77
+msgid "Change channel nickname/address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:40
-msgid "jealous"
+#: ../../Zotlabs/Module/Changeaddr.php:78
+msgid "Any/all connections on other networks will be lost!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:85
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
+#: ../../Zotlabs/Module/Changeaddr.php:80
+msgid "New channel address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:88
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
+#: ../../Zotlabs/Module/Changeaddr.php:81
+msgid "Rename Channel"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:96
-msgid "Piwik Base URL"
+#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
+msgid "Invite App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:96
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
+#: ../../Zotlabs/Module/Invite.php:68
+msgid "Register is closed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:97
-msgid "Site ID"
+#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
+msgid "Note, the invitation code is valid up to"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:98
-msgid "Show opt-out cookie link?"
+#: ../../Zotlabs/Module/Invite.php:115
+#, php-format
+msgid "Too many recipients for one invitation (max %d)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:99
-msgid "Asynchronous tracking"
+#: ../../Zotlabs/Module/Invite.php:119
+msgid "No recipients for this invitation"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:100
-msgid "Enable frontend JavaScript error tracking"
+#: ../../Zotlabs/Module/Invite.php:133
+#, php-format
+msgid "(%s) : Not a valid email address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/piwik/piwik.php:100
-msgid "This feature requires Piwik >= 2.2.0"
+#: ../../Zotlabs/Module/Invite.php:138
+#, php-format
+msgid "(%s) : Not a real email address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:101
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:102
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:144
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:180
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:214
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:261
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:296
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:319
-msgid "Access Denied"
+#: ../../Zotlabs/Module/Invite.php:145
+#, php-format
+msgid "(%s) : Not allowed email address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:109
-msgid "Enable Community Moderation"
+#: ../../Zotlabs/Module/Invite.php:158
+#, php-format
+msgid "(%s) : email address already in use"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:117
-msgid "Reputation automatically given to new members"
+#: ../../Zotlabs/Module/Invite.php:165
+#, php-format
+msgid "(%s) : Accepted email address"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:118
-msgid "Reputation will never fall below this value"
+#: ../../Zotlabs/Module/Invite.php:257
+#, php-format
+msgid "To %s : Message delivery success."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:119
-msgid "Minimum reputation before posting is allowed"
+#: ../../Zotlabs/Module/Invite.php:289
+#, php-format
+msgid "%1$d mail(s) sent, %2$d mail error(s)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:120
-msgid "Minimum reputation before commenting is allowed"
+#: ../../Zotlabs/Module/Invite.php:315
+msgid "Invites not proposed by configuration"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:121
-msgid "Minimum reputation before a member is able to moderate other posts"
+#: ../../Zotlabs/Module/Invite.php:316
+msgid "Contact the site admin"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:122
-msgid ""
-"Max ratio of moderator's reputation that can be added to/deducted from "
-"reputation of person being moderated"
+#: ../../Zotlabs/Module/Invite.php:332
+msgid "Invites by users not enabled"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:123
-msgid "Reputation \"cost\" to post"
+#: ../../Zotlabs/Module/Invite.php:337
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:124
-msgid "Reputation \"cost\" to comment"
+#: ../../Zotlabs/Module/Invite.php:353
+msgid "Not on xchan"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:125
-msgid ""
-"Reputation automatically recovers at this rate per hour until it reaches "
-"minimum_to_post"
+#: ../../Zotlabs/Module/Invite.php:386
+msgid "All users invitation limit exceeded."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:126
-msgid ""
-"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
-"at this rate per hour"
+#: ../../Zotlabs/Module/Invite.php:404
+msgid "Invitation expires after"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:140
-msgid "Community Moderation Settings"
+#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
+msgid "Invitation"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:232
-msgid "Channel Reputation"
+#: ../../Zotlabs/Module/Invite.php:534
+msgid "Send invitations"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:236
-msgid "An Error has occurred."
+#: ../../Zotlabs/Module/Invite.php:535
+msgid "Invitations I am using"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:254
-msgid "Upvote"
+#: ../../Zotlabs/Module/Invite.php:536
+msgid "Invitations we are using"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:255
-msgid "Downvote"
+#: ../../Zotlabs/Module/Invite.php:537
+msgid "§ Note, the email(s) sent will be recorded in the system logs"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:414
-msgid "Can moderate reputation on my channel."
+#: ../../Zotlabs/Module/Invite.php:538
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:57
-msgid "Errors encountered deleting database table "
+#: ../../Zotlabs/Module/Invite.php:539
+msgid "Your message:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:95
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:503
-msgid "Submit Settings"
+#: ../../Zotlabs/Module/Invite.php:540
+msgid "Invite template"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:96
-msgid "Drop tables when uninstalling?"
+#: ../../Zotlabs/Module/Invite.php:548
+msgid "Here you may enter personal notes to the recipient(s)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:96
-msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin "
-"is uninstalled."
+#: ../../Zotlabs/Module/Notes.php:56
+msgid "Notes App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:97
-msgid "Mapbox Access Token"
+#: ../../Zotlabs/Module/Notes.php:57
+msgid "A simple notes app with a widget (note: notes are not encrypted)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:97
-msgid ""
-"If you enter a Mapbox access token, it will be used to retrieve map tiles "
-"from Mapbox instead of the default OpenStreetMap tile server."
+#: ../../Zotlabs/Module/Sse_bs.php:567
+msgid "Private forum"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:162
-msgid "Rendezvous"
+#: ../../Zotlabs/Module/Sse_bs.php:567
+msgid "Public forum"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:167
-msgid ""
-"This identity has been deleted by another member due to inactivity. Please "
-"press the \"New identity\" button or refresh the page to register a new "
-"identity. You may use the same name."
+#: ../../Zotlabs/Module/Xchan.php:10
+msgid "Xchan Lookup"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:168
-msgid "Welcome to Rendezvous!"
+#: ../../Zotlabs/Module/Xchan.php:13
+msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:169
+#: ../../Zotlabs/Module/Affinity.php:35
+msgid "Affinity Tool settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Affinity.php:47
 msgid ""
-"Enter your name to join this rendezvous. To begin sharing your location with "
-"the other members, tap the GPS control. When your location is discovered, a "
-"red dot will appear and others will be able to see you on the map."
+"This app presents a slider control in your connection editor and also on "
+"your network page. The slider represents your degree of friendship "
+"(affinity) with each connection. It allows you to zoom in or out and display "
+"conversations from only your closest friends or everybody in your stream."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:171
-msgid "Let's meet here"
+#: ../../Zotlabs/Module/Affinity.php:52
+msgid "Affinity Tool App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:174
-msgid "New marker"
+#: ../../Zotlabs/Module/Affinity.php:57
+msgid ""
+"The numbers below represent the minimum and maximum slider default positions "
+"for your network/stream page as a percentage."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:175
-msgid "Edit marker"
+#: ../../Zotlabs/Module/Affinity.php:64
+msgid "Default maximum affinity level"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:176
-msgid "New identity"
+#: ../../Zotlabs/Module/Affinity.php:64
+msgid "0-99 default 99"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:177
-msgid "Delete marker"
+#: ../../Zotlabs/Module/Affinity.php:70
+msgid "Default minimum affinity level"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:178
-msgid "Delete member"
+#: ../../Zotlabs/Module/Affinity.php:70
+msgid "0-99 - default 0"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:179
-msgid "Edit proximity alert"
+#: ../../Zotlabs/Module/Affinity.php:76
+msgid "Persistent affinity levels"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:180
+#: ../../Zotlabs/Module/Affinity.php:76
 msgid ""
-"A proximity alert will be issued when this member is within a certain radius "
-"of you.<br><br>Enter a radius in meters (0 to disable):"
+"If disabled the max and min levels will be reset to default after page reload"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:180
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:185
-msgid "distance"
+#: ../../Zotlabs/Module/Affinity.php:84
+msgid "Affinity Tool Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:181
-msgid "Proximity alert distance (meters)"
+#: ../../Zotlabs/Module/Settings/Network.php:42
+#: ../../Zotlabs/Module/Settings/Channel_home.php:46
+msgid "Max height of content (in pixels)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:182
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:184
-msgid ""
-"A proximity alert will be issued when you are within a certain radius of the "
-"marker location.<br><br>Enter a radius in meters (0 to disable):"
+#: ../../Zotlabs/Module/Settings/Network.php:44
+#: ../../Zotlabs/Module/Settings/Channel_home.php:48
+msgid "Click to expand content exceeding this height"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
+#: ../../Zotlabs/Module/Settings/Network.php:59
+msgid "Stream Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:186
-msgid "Reminder note"
+#: ../../Zotlabs/Module/Settings/Features.php:45
+msgid "Additional Features"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:187
-msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
+#: ../../Zotlabs/Module/Settings/Channel.php:329
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
+#: ../../Zotlabs/Module/Settings/Channel.php:330
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:200
-msgid ""
-"Create a new rendezvous and share the access link with those you wish to "
-"invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or "
-"share their own locations with the group."
+#: ../../Zotlabs/Module/Settings/Channel.php:331
+msgid "Approved connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:232
-msgid "You have no rendezvous. Press the button above to create a rendezvous!"
+#: ../../Zotlabs/Module/Settings/Channel.php:332
+msgid "Any connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32
-msgid "Skeleton App"
+#: ../../Zotlabs/Module/Settings/Channel.php:333
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:33
-msgid "A skeleton for addons, you can copy/paste"
+#: ../../Zotlabs/Module/Settings/Channel.php:334
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:40
-msgid "Some setting"
+#: ../../Zotlabs/Module/Settings/Channel.php:335
+msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:40
-msgid "A setting"
+#: ../../Zotlabs/Module/Settings/Channel.php:336
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:48
-msgid "Skeleton Settings"
+#: ../../Zotlabs/Module/Settings/Channel.php:411
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/redred.php:50
-msgid "Post to Hubzilla"
+#: ../../Zotlabs/Module/Settings/Channel.php:416
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:24
-msgid "Channel is required."
+#: ../../Zotlabs/Module/Settings/Channel.php:429
+msgid "Your channel address is"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:38
-msgid "Hubzilla Crosspost Connector Settings saved."
+#: ../../Zotlabs/Module/Settings/Channel.php:432
+msgid "Your files/photos are accessible via WebDAV at"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:50
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:146
-msgid "Hubzilla Crosspost Connector App"
+#: ../../Zotlabs/Module/Settings/Channel.php:472
+msgid "Automatic membership approval"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:51
-msgid "Relay public postings to another Hubzilla channel"
+#: ../../Zotlabs/Module/Settings/Channel.php:472
+#: ../../Zotlabs/Module/Defperms.php:256
+msgid ""
+"If enabled, connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63
-msgid "Send public postings to Hubzilla channel by default"
+#: ../../Zotlabs/Module/Settings/Channel.php:493
+msgid "Channel Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:67
-msgid "Hubzilla API Path"
+#: ../../Zotlabs/Module/Settings/Channel.php:500
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:67
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:53
-msgid "https://{sitename}/api"
+#: ../../Zotlabs/Module/Settings/Channel.php:502
+msgid "Email Address:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:71
-msgid "Hubzilla login name"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75
-msgid "Hubzilla channel name"
+#: ../../Zotlabs/Module/Settings/Channel.php:504
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:54
-msgid "Nickname"
+#: ../../Zotlabs/Module/Settings/Channel.php:504
+msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:79
-msgid "Hubzilla password"
+#: ../../Zotlabs/Module/Settings/Channel.php:505
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:87
-msgid "Hubzilla Crosspost Connector"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "Adult Content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:23
-msgid "TOTP Two-Step Verification"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:24
-msgid "Enter the 2-step verification generated by your authenticator app:"
+#: ../../Zotlabs/Module/Settings/Channel.php:509
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:25
-msgid "Success!"
+#: ../../Zotlabs/Module/Settings/Channel.php:511
+msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:26
-msgid "Invalid code, please try again."
+#: ../../Zotlabs/Module/Settings/Channel.php:513
+msgid "Hide my online presence"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:27
-msgid "Too many invalid codes..."
+#: ../../Zotlabs/Module/Settings/Channel.php:513
+msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:28
-msgid "Verify"
+#: ../../Zotlabs/Module/Settings/Channel.php:515
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:90
+#: ../../Zotlabs/Module/Settings/Channel.php:516
 msgid ""
-"You haven't set a TOTP secret yet.\n"
-"Please click the button below to generate one and register this site\n"
-"with your preferred authenticator app."
-msgstr ""
-
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:93
-msgid "Your TOTP secret is"
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:94
+#: ../../Zotlabs/Module/Settings/Channel.php:517
 msgid ""
-"Be sure to save it somewhere in case you lose or replace your mobile "
-"device.\n"
-"Use your mobile device to scan the QR code below to register this site\n"
-"with your preferred authenticator app."
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:99
-msgid "Test"
+#: ../../Zotlabs/Module/Settings/Channel.php:518
+msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:100
-msgid "Generate New Secret"
+#: ../../Zotlabs/Module/Settings/Channel.php:519
+msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:101
-msgid "Go"
+#: ../../Zotlabs/Module/Settings/Channel.php:521
+msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:102
-msgid "Enter your password"
+#: ../../Zotlabs/Module/Settings/Channel.php:521
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:103
-msgid "enter TOTP code from your device"
+#: ../../Zotlabs/Module/Settings/Channel.php:523
+msgid "Channel Permission Limits"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:104
-msgid "Pass!"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:105
-msgid "Fail"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:106
-msgid "Incorrect password, try again."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+#, php-format
+msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:107
-msgid "Record your new TOTP secret and rescan the QR code above."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:115
-msgid "TOTP Settings"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/testdrive/testdrive.php:104
-#, php-format
-msgid "Your account on %s will expire in a few days."
+#: ../../Zotlabs/Module/Settings/Channel.php:526
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/testdrive/testdrive.php:105
-msgid "Your $Productname test account is about to expire."
+#: ../../Zotlabs/Module/Settings/Channel.php:526
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:70
-msgid "An account has been created for you."
+#: ../../Zotlabs/Module/Settings/Channel.php:527
+msgid "Default Privacy Group"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:77
-msgid "Authentication successful but rejected: account creation is disabled."
+#: ../../Zotlabs/Module/Settings/Channel.php:529
+msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:252
-msgid "DB Cleanup Failure"
+#: ../../Zotlabs/Module/Settings/Channel.php:538
+msgid "Default permissions category"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:674
-msgid "[cart] Item Added"
+#: ../../Zotlabs/Module/Settings/Channel.php:544
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1063
-msgid "Order already checked out."
+#: ../../Zotlabs/Module/Settings/Channel.php:544
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1368
-msgid "Drop database tables when uninstalling."
+#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Lib/Enotify.php:68
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1375
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:129
-msgid "Cart Settings"
+#: ../../Zotlabs/Module/Settings/Channel.php:548
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1387
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1390
-msgid "Shop"
+#: ../../Zotlabs/Module/Settings/Channel.php:549
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1446
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:112
-msgid "Order Not Found"
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1507
-msgid "Cart utilities for orders and payments"
+#: ../../Zotlabs/Module/Settings/Channel.php:551
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1545
-msgid "You must be logged into the Grid to shop."
+#: ../../Zotlabs/Module/Settings/Channel.php:552
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1578
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:409
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:392
-#: ../../extend/addon/hubzilla-addons/cart/manual_payments.php:68
-msgid "Order not found."
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "You receive a connection request"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1592
-msgid "Access denied."
+#: ../../Zotlabs/Module/Settings/Channel.php:554
+msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1644
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1787
-msgid "No Order Found"
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1653
-msgid "An unknown error has occurred Please start again."
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1796
-msgid "Requirements not met."
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1796
-msgid "Review your order and complete any needed requirements."
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1822
-msgid "Invalid Payment Type.  Please start again."
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/cart.php:1829
-msgid "Order not found"
+#: ../../Zotlabs/Module/Settings/Channel.php:560
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:70
-msgid "Enable Order/Item Options"
+#: ../../Zotlabs/Module/Settings/Channel.php:562
+msgid "Someone likes your post/comment"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:333
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:357
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:433
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:457
-msgid "Label"
+#: ../../Zotlabs/Module/Settings/Channel.php:565
+msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:336
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:360
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:436
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:460
-msgid "Instructions"
+#: ../../Zotlabs/Module/Settings/Channel.php:567
+msgid "Unseen stream activity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:63
-msgid "Enable Hubzilla Services Module"
+#: ../../Zotlabs/Module/Settings/Channel.php:568
+msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:162
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:172
-msgid "New Sku"
+#: ../../Zotlabs/Module/Settings/Channel.php:569
+msgid "Unseen private messages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:197
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:208
-msgid "Cannot save edits to locked item."
+#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "Recommended"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:246
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:333
-msgid "SKU not found."
+#: ../../Zotlabs/Module/Settings/Channel.php:570
+msgid "Upcoming events"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:299
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:303
-msgid "Invalid Activation Directive."
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+msgid "Events today"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:374
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:378
-msgid "Invalid Deactivation Directive."
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:564
-msgid "Add to this privacy group"
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Not available in all themes"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:580
-msgid "Set user service class"
+#: ../../Zotlabs/Module/Settings/Channel.php:573
+msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:607
-msgid "You must be using a local account to purchase this service."
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+msgid "System info messages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:647
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:252
-msgid "Changes Locked"
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+msgid "System critical alerts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:651
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:256
-msgid "Item available for purchase."
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "New connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:658
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:263
-#: ../../extend/addon/hubzilla-addons/cart/widgets/catalogitem.php:57
-msgid "Price"
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+msgid "System Registrations"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:661
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:266
-msgid "Photo URL"
+#: ../../Zotlabs/Module/Settings/Channel.php:578
+msgid "Unseen shared files"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:665
-msgid "Add buyer to privacy group"
+#: ../../Zotlabs/Module/Settings/Channel.php:579
+msgid "Unseen public stream activity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:670
-msgid "Add buyer as connection"
+#: ../../Zotlabs/Module/Settings/Channel.php:580
+msgid "Unseen likes and dislikes"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:678
-#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:720
-msgid "Set Service Class"
+#: ../../Zotlabs/Module/Settings/Channel.php:581
+msgid "Unseen forum posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:151
-msgid "Enable Subscription Management Module"
+#: ../../Zotlabs/Module/Settings/Channel.php:582
+msgid "Email notification hub (hostname)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:223
+#: ../../Zotlabs/Module/Settings/Channel.php:582
+#, php-format
 msgid ""
-"Cannot include subscription items with different terms in the same order."
-msgstr ""
-
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:372
-msgid "Select Subscription to Edit"
+"If your channel is mirrored to multiple hubs, set this to your preferred "
+"location. This will prevent duplicate email notifications. Example: %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:380
-msgid "Edit Subscriptions"
+#: ../../Zotlabs/Module/Settings/Channel.php:583
+msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:414
-msgid "Subscription SKU"
+#: ../../Zotlabs/Module/Settings/Channel.php:584
+msgid ""
+"Desktop notifications are unavailable because the required browser "
+"permission has not been granted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:419
-msgid "Catalog Description"
+#: ../../Zotlabs/Module/Settings/Channel.php:585
+msgid "Grant permission"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:423
-msgid "Subscription available for purchase."
+#: ../../Zotlabs/Module/Settings/Channel.php:586
+msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:428
-msgid "Maximum active subscriptions to this item per account."
+#: ../../Zotlabs/Module/Settings/Channel.php:586
+msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:431
-msgid "Subscription price."
+#: ../../Zotlabs/Module/Settings/Channel.php:591
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:435
-msgid "Quantity"
+#: ../../Zotlabs/Module/Settings/Channel.php:592
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:439
-msgid "Term"
+#: ../../Zotlabs/Module/Settings/Channel.php:594
+msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:86
-msgid "Enable Paypal Button Module (API-v2)"
+#: ../../Zotlabs/Module/Settings/Channel.php:595
+msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:94
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:93
-msgid "Use Production Key"
+#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:596
+msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:101
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:100
-msgid "Paypal Sandbox Client Key"
+#: ../../Zotlabs/Module/Settings/Channel.php:596
+msgid "Default file upload folder"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:108
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:107
-msgid "Paypal Sandbox Secret Key"
+#: ../../Zotlabs/Module/Settings/Channel.php:598
+msgid "Remove this channel."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:114
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:113
-msgid "Paypal Production Client Key"
+#: ../../Zotlabs/Module/Settings/Account.php:21
+msgid "Not valid email."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:121
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:120
-msgid "Paypal Production Secret Key"
+#: ../../Zotlabs/Module/Settings/Account.php:24
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:264
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:252
-msgid "Paypal button payments are not enabled."
+#: ../../Zotlabs/Module/Settings/Account.php:33
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:282
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:270
-msgid ""
-"Paypal button payments are not properly configured.  Please choose another "
-"payment option."
+#: ../../Zotlabs/Module/Settings/Account.php:51
+msgid "Password verification failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:85
-msgid "Enable Paypal Button Module"
+#: ../../Zotlabs/Module/Settings/Account.php:58
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:61
-msgid "Enable Manual Cart Module"
+#: ../../Zotlabs/Module/Settings/Account.php:62
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:30
-msgid "Access Denied."
+#: ../../Zotlabs/Module/Settings/Account.php:76
+msgid "Password changed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:189
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:223
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:271
-#: ../../extend/addon/hubzilla-addons/cart/myshop.php:329
-msgid "Invalid Item"
+#: ../../Zotlabs/Module/Settings/Account.php:78
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/manual_payments.php:7
-msgid "Error: order mismatch. Please try again."
+#: ../../Zotlabs/Module/Settings/Account.php:103
+msgid "Account Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/manual_payments.php:61
-msgid "Manual payments are not enabled."
+#: ../../Zotlabs/Module/Settings/Account.php:104
+msgid "Current Password"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/manual_payments.php:77
-msgid "Finished"
+#: ../../Zotlabs/Module/Settings/Account.php:105
+msgid "Enter New Password"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:58
-msgid "Enable Test Catalog"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Confirm New Password"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:70
-msgid "Enable Manual Payments"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:90
-msgid "Base Merchant Currency"
+#: ../../Zotlabs/Module/Settings/Account.php:108
+msgid "DId2 or Email Address:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/openid.php:49
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+#: ../../Zotlabs/Module/Settings/Account.php:110
+msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/openid.php:49
-msgid "The error message was:"
+#: ../../Zotlabs/Module/Settings/Featured.php:25
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:52
-msgid "First Name"
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "Addon Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:53
-msgid "Last Name"
+#: ../../Zotlabs/Module/Settings/Featured.php:35
+msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:55
-msgid "Full Name"
+#: ../../Zotlabs/Module/Settings/Events.php:40
+msgid "Events Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:61
-msgid "Profile Photo 16px"
+#: ../../Zotlabs/Module/Settings/Manage.php:41
+msgid "Channel Manager Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:62
-msgid "Profile Photo 32px"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:61
+msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:63
-msgid "Profile Photo 48px"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:88
+msgid "Channel Home Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:64
-msgid "Profile Photo 64px"
+#: ../../Zotlabs/Module/Settings/Calendar.php:40
+msgid "Calendar Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:65
-msgid "Profile Photo 80px"
+#: ../../Zotlabs/Module/Settings/Display.php:127
+#, php-format
+msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:66
-msgid "Profile Photo 128px"
+#: ../../Zotlabs/Module/Settings/Display.php:183
+msgid "Display Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:70
-msgid "Birth Year"
+#: ../../Zotlabs/Module/Settings/Display.php:184
+msgid "Theme Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:71
-msgid "Birth Month"
+#: ../../Zotlabs/Module/Settings/Display.php:185
+msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:72
-msgid "Birth Day"
+#: ../../Zotlabs/Module/Settings/Display.php:186
+msgid "Content Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:73
-msgid "Birthdate"
+#: ../../Zotlabs/Module/Settings/Display.php:192
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:30
-msgid "OpenID protocol error. No ID returned."
+#: ../../Zotlabs/Module/Settings/Display.php:193
+msgid "Select scheme"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:81
-msgid "Hubzilla File Storage Import"
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:82
-msgid "This will import all your cloud files from another server."
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:83
-msgid "Hubzilla Server base URL"
+#: ../../Zotlabs/Module/Settings/Display.php:196
+msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:84
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:140
-msgid "Since modified date yyyy-mm-dd"
+#: ../../Zotlabs/Module/Settings/Display.php:197
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:85
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:141
-msgid "Until modified date yyyy-mm-dd"
+#: ../../Zotlabs/Module/Settings/Display.php:197
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:43
-msgid "Diaspora Protocol Settings updated."
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:52
-msgid ""
-"The diaspora protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Maximum of 30 items"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:58
-msgid "Diaspora Protocol App"
+#: ../../Zotlabs/Module/Settings/Display.php:199
+msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:77
-msgid "Allow any Diaspora member to comment or like your public posts"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Provide channel menu in navigation bar"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:77
-msgid ""
-"If this setting is disabled only your contacts will be able to comment or "
-"like your public posts"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Default: channel menu located in app menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:81
-msgid "Prevent your hashtags from being redirected to other sites"
+#: ../../Zotlabs/Module/Settings/Display.php:201
+msgid "Link post titles to source"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:85
-msgid "Sign and forward posts and comments with no existing Diaspora signature"
+#: ../../Zotlabs/Module/Settings/Display.php:203
+msgid "Display new member quick links menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:90
-msgid "Followed hashtags (comma separated, do not include the #)"
+#: ../../Zotlabs/Module/Settings/Directory.php:40
+msgid "Directory Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:99
-msgid "Diaspora Protocol"
+#: ../../Zotlabs/Module/Settings/Editor.php:40
+msgid "Editor Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:19
-msgid "No username found in import file."
+#: ../../Zotlabs/Module/Settings/Connections.php:40
+msgid "Connections Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1599
-#, php-format
-msgid "%1$s dislikes %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Photos.php:40
+msgid "Photos Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:70
-msgid ""
-"Please install the statistics addon to be able to configure a diaspora relay"
+#: ../../Zotlabs/Module/Settings/Profiles.php:49
+msgid "Profiles Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80
-msgid "Diaspora Relay Handle"
+#: ../../Zotlabs/Module/Settings/Conversation.php:23
+msgid "Settings saved."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80
-msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
+#: ../../Zotlabs/Module/Settings/Conversation.php:25
+msgid "Settings saved. Reload page please."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:100
-msgid "Diaspora relay could not be imported"
+#: ../../Zotlabs/Module/Settings/Conversation.php:47
+msgid "Conversation Settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:94
-msgid "Hubzilla Directory Stats"
+#: ../../Zotlabs/Module/Menu.php:68
+msgid "Unable to update menu."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:95
-msgid "Total Hubs"
+#: ../../Zotlabs/Module/Menu.php:79
+msgid "Unable to create menu."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:97
-msgid "Hubzilla Hubs"
+#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
+msgid "Menu Name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:99
-msgid "Friendica Hubs"
+#: ../../Zotlabs/Module/Menu.php:161
+msgid "Unique name (not visible on webpage) - required"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:101
-msgid "Diaspora Pods"
+#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
+msgid "Menu Title"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:103
-msgid "Hubzilla Channels"
+#: ../../Zotlabs/Module/Menu.php:162
+msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:105
-msgid "Friendica Channels"
+#: ../../Zotlabs/Module/Menu.php:163
+msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:107
-msgid "Diaspora Channels"
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:109
-msgid "Aged 35 and above"
+#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
+msgid "Submit and proceed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:111
-msgid "Aged 34 and under"
+#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:129
+msgid "Drop"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:113
-msgid "Average Age"
+#: ../../Zotlabs/Module/Menu.php:181
+msgid "Bookmarks allowed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:115
-msgid "Known Chatrooms"
+#: ../../Zotlabs/Module/Menu.php:183
+msgid "Delete this menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:117
-msgid "Known Tags"
+#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
+msgid "Edit menu contents"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:119
-msgid ""
-"Please note Diaspora and Friendica statistics are merely those **this "
-"directory** is aware of, and not all those known in the network.  This also "
-"applies to chatrooms,"
+#: ../../Zotlabs/Module/Menu.php:185
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upload_limits/upload_limits.php:25
-msgid "Show Upload Limits"
+#: ../../Zotlabs/Module/Menu.php:201
+msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upload_limits/upload_limits.php:27
-msgid "Hubzilla configured maximum size: "
+#: ../../Zotlabs/Module/Menu.php:214
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upload_limits/upload_limits.php:28
-msgid "PHP upload_max_filesize: "
+#: ../../Zotlabs/Module/Menu.php:218
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upload_limits/upload_limits.php:29
-msgid "PHP post_max_size (must be larger than upload_max_filesize): "
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Menu name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:23
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:27
-msgid "Hide Aside App"
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:24
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:28
-msgid "Fade out aside areas after a while when using endless scroll"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:27
-#: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:23
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:26
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:33
-#: ../../extend/addon/hubzilla-addons/nsabait/Mod_Nsabait.php:24
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:26
-msgid "Installed"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/randpost/randpost.php:99
-msgid "You're welcome."
+#: ../../Zotlabs/Module/Menu.php:222
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/randpost/randpost.php:100
-msgid "Ah shucks..."
+#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/randpost/randpost.php:101
-msgid "Don't mention it."
+#: ../../Zotlabs/Module/Defperms.php:190
+msgid "Default Permissions App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/randpost/randpost.php:102
-msgid "&lt;blush&gt;"
+#: ../../Zotlabs/Module/Defperms.php:191
+msgid "Set custom default permissions for new connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:133
-msgid "View Larger"
+#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:852
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:156
-msgid "Tile Server URL"
+#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:853
+msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:156
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
+#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:854
+msgid "Permission role"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:157
-msgid "Nominatim (reverse geocoding) Server URL"
+#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:855
+msgid "Add permission role"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:157
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:868
 msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
-"\"_blank\">Nominatim servers</a>"
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:158
-msgid "Default zoom"
+#: ../../Zotlabs/Module/Defperms.php:263
+msgid "Automatic approval settings"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:158
+#: ../../Zotlabs/Module/Defperms.php:271
 msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+"Some individual permissions may have been preset or locked based on your "
+"channel type and privacy settings."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:159
-msgid "Include marker on map"
+#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
+msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:159
-msgid "Include a marker on the map."
+#: ../../Zotlabs/Module/Pconfig.php:57
+msgid "Configuration Editor"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:38
-msgid "Livejournal Crosspost Connector App"
+#: ../../Zotlabs/Module/Pconfig.php:58
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:39
-msgid "Relay public posts to Livejournal"
+#: ../../Zotlabs/Module/Oauth2.php:54
+msgid "Name and Secret are required"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:55
-msgid "Livejournal username"
+#: ../../Zotlabs/Module/Oauth2.php:106
+msgid "OAuth2 Apps Manager App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:59
-msgid "Livejournal password"
+#: ../../Zotlabs/Module/Oauth2.php:107
+msgid "OAuth2 authenticatication tokens for mobile and remote apps"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:63
-msgid "Post to Livejournal by default"
+#: ../../Zotlabs/Module/Oauth2.php:115
+msgid "Add OAuth2 application"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:67
-msgid "Send wall-to-wall posts to Livejournal"
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
+msgid "Grant Types"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:71
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:65
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:94
-msgid "Add link to original post"
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
+msgid "leave blank unless your application sepcifically requires this"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:79
-msgid "Livejournal Crosspost Connector"
+#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
+msgid "Authorization scope"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/ljpost.php:49
-msgid "Post to Livejournal"
+#: ../../Zotlabs/Module/Oauth2.php:134
+msgid "OAuth2 Application not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ljpost/ljpost.php:127
-msgid "Posted by"
+#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
+msgid "leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:222
-msgid "Workflow user."
+#: ../../Zotlabs/Module/Oauth2.php:192
+msgid "Connected OAuth2 Apps"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:272
-msgid "This channel"
+#: ../../Zotlabs/Module/Randprof.php:29
+msgid "Random Channel App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:541
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1437
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1456
-msgid "Workflow"
+#: ../../Zotlabs/Module/Randprof.php:30
+msgid "Visit a random channel in the $Projectname network"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1425
-msgid "No Workflows Available"
+#: ../../Zotlabs/Module/Dreport.php:59
+msgid "Invalid message"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1455
-msgid "Add item to which workflow"
+#: ../../Zotlabs/Module/Dreport.php:92
+msgid "no results"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1515
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1634
-msgid "Create Workflow Item"
+#: ../../Zotlabs/Module/Dreport.php:106
+msgid "channel sync processed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2596
-msgid "Link"
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "queued"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2598
-msgid "Web link."
+#: ../../Zotlabs/Module/Dreport.php:114
+msgid "posted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2619
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2680
-msgid "Brief description or title"
+#: ../../Zotlabs/Module/Dreport.php:118
+msgid "accepted for delivery"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2627
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2688
-msgid "Notes and Info"
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "updated"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2686
-msgid "Body"
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "update ignored"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/workflow/Settings/Mod_WorkflowSettings.php:101
-msgid "Workflow Settings"
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "permission denied"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:44
-msgid "Jabber BOSH host"
+#: ../../Zotlabs/Module/Dreport.php:132
+msgid "recipient not found"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:45
-msgid "Use central userbase"
+#: ../../Zotlabs/Module/Dreport.php:135
+msgid "mail recalled"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:45
-msgid ""
-"If enabled, members will automatically login to an ejabberd server that has "
-"to be installed on this machine with synchronized credentials via the "
-"\"auth_ejabberd.php\" script."
+#: ../../Zotlabs/Module/Dreport.php:138
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:23
-msgid "XMPP settings updated."
+#: ../../Zotlabs/Module/Dreport.php:141
+msgid "mail delivered"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:35
-msgid "XMPP App"
+#: ../../Zotlabs/Module/Dreport.php:161
+#, php-format
+msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:36
-msgid "Embedded XMPP (Jabber) client"
+#: ../../Zotlabs/Module/Dreport.php:166
+msgid "Redeliver"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:52
-msgid "Individual credentials"
+#: ../../Zotlabs/Module/Thing.php:122
+msgid "Thing updated"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:58
-msgid "Jabber BOSH server"
+#: ../../Zotlabs/Module/Thing.php:174
+msgid "Object store: failed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:67
-msgid "XMPP Settings"
+#: ../../Zotlabs/Module/Thing.php:178
+msgid "Thing added"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:21
-msgid "Superblock App"
+#: ../../Zotlabs/Module/Thing.php:204
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:22
-msgid "Block channels"
+#: ../../Zotlabs/Module/Thing.php:267
+msgid "Show Thing"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:64
-msgid "superblock settings updated"
+#: ../../Zotlabs/Module/Thing.php:274
+msgid "item not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:88
-msgid "Currently blocked"
+#: ../../Zotlabs/Module/Thing.php:307
+msgid "Edit Thing"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:90
-msgid "No channels currently blocked"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
+msgid "Select a profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/superblock/superblock.php:337
-msgid "Block Completely"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Post an activity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:20
-#: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:23
-msgid "Random Planet App"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:25
-msgid ""
-"Set a random planet from the Star Wars Empire as your location when posting"
+#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
+msgid "Name of thing e.g. something"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/nsfw.php:152
-msgid "Possible adult content"
+#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
+msgid "URL of thing (optional)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/nsfw.php:167
-#, php-format
-msgid "%s - view"
+#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
+msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:22
-msgid "NSFW Settings saved."
+#: ../../Zotlabs/Module/Thing.php:364
+msgid "Add Thing to your Profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:33
-msgid "NSFW App"
+#: ../../Zotlabs/Module/Rmagic.php:46
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:34
-msgid "Collapse content that contains predefined words"
+#: ../../Zotlabs/Module/Pdledit.php:27
+msgid "Layout updated."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:44
-msgid ""
-"This app looks in posts for the words/text you specify below, and collapses "
-"any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW.  This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
+#: ../../Zotlabs/Module/Pdledit.php:43
+msgid "PDL Editor App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:49
-msgid "Comma separated list of keywords to hide"
+#: ../../Zotlabs/Module/Pdledit.php:44
+msgid "Provides the ability to edit system page layouts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:49
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
+#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100
+msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:58
-msgid "NSFW"
+#: ../../Zotlabs/Module/Pdledit.php:78
+msgid "(modified)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
+#: ../../Zotlabs/Module/Pdledit.php:95
+msgid "Layout not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
+#: ../../Zotlabs/Module/Pdledit.php:101
+msgid "Module Name:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:59
-msgid "New game"
+#: ../../Zotlabs/Module/Pdledit.php:102
+msgid "Layout Help"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:60
-msgid "New game with handicap"
+#: ../../Zotlabs/Module/Pdledit.php:103
+msgid "Edit another layout"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:61
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../Zotlabs/Module/Pdledit.php:104
+msgid "System layout"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:62
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+#: ../../Zotlabs/Module/Wiki.php:52
+msgid "Wiki App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:64
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
+#: ../../Zotlabs/Module/Wiki.php:53
+msgid "Provide a wiki for your channel"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:183
-msgid "You go first..."
+#: ../../Zotlabs/Module/Wiki.php:132
+msgid "Error retrieving wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:188
-msgid "I'm going first this time..."
+#: ../../Zotlabs/Module/Wiki.php:139
+msgid "Error creating zip file export folder"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:194
-msgid "You won!"
+#: ../../Zotlabs/Module/Wiki.php:190
+msgid "Error downloading wiki: "
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:200
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:225
-msgid "\"Cat\" game!"
+#: ../../Zotlabs/Module/Wiki.php:215
+msgid "Wiki name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/tictac/tictac.php:223
-msgid "I won!"
+#: ../../Zotlabs/Module/Wiki.php:216
+msgid "Content type"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:27
-msgid "Photo Cache settings saved."
+#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
+msgid "Type"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:36
-msgid ""
-"Photo Cache addon saves a copy of images from external sites locally to "
-"increase your anonymity in the web."
+#: ../../Zotlabs/Module/Wiki.php:219
+msgid "Any&nbsp;type"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:42
-msgid "Photo Cache App"
+#: ../../Zotlabs/Module/Wiki.php:226
+msgid "Lock content type"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:53
-msgid "Minimal photo size for caching"
+#: ../../Zotlabs/Module/Wiki.php:227
+msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:55
-msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
+#: ../../Zotlabs/Module/Wiki.php:228
+msgid "Edit Wiki Name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:64
-msgid "Photo Cache"
+#: ../../Zotlabs/Module/Wiki.php:273
+msgid "Wiki not found"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/opensearch/opensearch.php:26
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
+#: ../../Zotlabs/Module/Wiki.php:299
+msgid "Rename page"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
+#: ../../Zotlabs/Module/Wiki.php:320
+msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/opensearch/opensearch.php:43
-msgid "Search $Projectname"
+#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330
+msgid "New page"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:25
-msgid "Libertree Crosspost Connector Settings saved."
+#: ../../Zotlabs/Module/Wiki.php:365
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:35
-msgid "Libertree Crosspost Connector App"
+#: ../../Zotlabs/Module/Wiki.php:373
+msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:36
-msgid "Relay public posts to Libertree"
+#: ../../Zotlabs/Module/Wiki.php:393
+msgid "New page name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:51
-msgid "Libertree API token"
+#: ../../Zotlabs/Module/Wiki.php:398
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:55
-msgid "Libertree site URL"
+#: ../../Zotlabs/Module/Wiki.php:409
+msgid "History"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:59
-msgid "Post to Libertree by default"
+#: ../../Zotlabs/Module/Wiki.php:487
+msgid "Error creating wiki. Invalid name."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/Mod_Libertree.php:67
-msgid "Libertree Crosspost Connector"
+#: ../../Zotlabs/Module/Wiki.php:494
+msgid "A wiki with this name already exists."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/libertree/libertree.php:43
-msgid "Post to Libertree"
+#: ../../Zotlabs/Module/Wiki.php:507
+msgid "Wiki created, but error creating Home page."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
+#: ../../Zotlabs/Module/Wiki.php:514
+msgid "Error creating wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/adultphotoflag/adultphotoflag.php:25
-msgid ""
-"Provide photo edit option to hide inappropriate photos from default album "
-"view"
+#: ../../Zotlabs/Module/Wiki.php:538
+msgid "Error updating wiki. Invalid name."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:145
-msgid "Post to GNU social"
+#: ../../Zotlabs/Module/Wiki.php:557
+msgid "Error updating wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:594
-msgid "API URL"
+#: ../../Zotlabs/Module/Wiki.php:572
+msgid "Wiki delete permission denied."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:597
-msgid "Application name"
+#: ../../Zotlabs/Module/Wiki.php:582
+msgid "Error deleting wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:61
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
+#: ../../Zotlabs/Module/Wiki.php:615
+msgid "New page created"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:98
-msgid "We could not contact the GNU social API with the Path you entered."
+#: ../../Zotlabs/Module/Wiki.php:741
+msgid "Cannot delete Home"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:130
-msgid "GNU social settings updated."
+#: ../../Zotlabs/Module/Wiki.php:817
+msgid "Current Revision"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:147
-msgid ""
-"Relay public postings to a connected GNU social account (formerly StatusNet)"
+#: ../../Zotlabs/Module/Wiki.php:817
+msgid "Selected Revision"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:181
-msgid "Globally Available GNU social OAuthKeys"
+#: ../../Zotlabs/Module/Wiki.php:872
+msgid "You must be authenticated."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:183
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU social servers "
-"available. If you are using one of them, please use these credentials.<br /"
-">If not feel free to connect to any other GNU social instance (see below)."
+#: ../../Zotlabs/Module/Home.php:104
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:198
-msgid "Provide your own OAuth Credentials"
+#: ../../Zotlabs/Module/Suggest.php:40
+msgid "Suggest Channels App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:200
+#: ../../Zotlabs/Module/Suggest.php:41
 msgid ""
-"No consumer key pair for GNU social found. Register your Hubzilla Account as "
-"an desktop client on your GNU social account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Hubzilla installation at your favourite GNU social installation."
+"Suggestions for channels in the $Projectname network you might be interested "
+"in"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:204
-msgid "OAuth Consumer Key"
+#: ../../Zotlabs/Module/Suggest.php:54
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:208
-msgid "OAuth Consumer Secret"
+#: ../../Zotlabs/Module/Connedit.php:121
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:212
-msgid "Base API Path"
+#: ../../Zotlabs/Module/Connedit.php:262
+msgid "Connection updated."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:212
-msgid "Remember the trailing /"
+#: ../../Zotlabs/Module/Connedit.php:264
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:216
-msgid "GNU social application name"
+#: ../../Zotlabs/Module/Connedit.php:307
+msgid "is now connected to"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:239
-msgid ""
-"To connect to your GNU social account click the button below to get a "
-"security code from GNU social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU social."
+#: ../../Zotlabs/Module/Connedit.php:432
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:241
-msgid "Log in with GNU social"
+#: ../../Zotlabs/Module/Connedit.php:480
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:244
-msgid "Copy the security code from GNU social here"
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:254
-msgid "Cancel Connection Process"
+#: ../../Zotlabs/Module/Connedit.php:553
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:256
-msgid "Current GNU social API is"
+#: ../../Zotlabs/Module/Connedit.php:596
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:260
-msgid "Cancel GNU social Connection"
+#: ../../Zotlabs/Module/Connedit.php:600
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:272
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:147
-msgid "Currently connected to: "
+#: ../../Zotlabs/Module/Connedit.php:603
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:277
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
+#: ../../Zotlabs/Module/Connedit.php:607
+msgid "Refresh Photo"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
-msgid "Post to GNU social by default"
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Fetch updated photo"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
-msgid ""
-"If enabled your public postings will be posted to the associated GNU-social "
-"account by default"
+#: ../../Zotlabs/Module/Connedit.php:617
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:291
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:171
-msgid "Clear OAuth configuration"
+#: ../../Zotlabs/Module/Connedit.php:624
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:303
-msgid "GNU-Social Crosspost Connector"
+#: ../../Zotlabs/Module/Connedit.php:625
+msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wholikesme/wholikesme.php:29
-msgid "Who likes me?"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Unignore"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:25
-msgid "ActivityPub Protocol Settings updated."
+#: ../../Zotlabs/Module/Connedit.php:632
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:34
-msgid ""
-"The activitypub protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
+#: ../../Zotlabs/Module/Connedit.php:633
+msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:40
-msgid "Activitypub Protocol App"
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "Unarchive"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:50
-msgid "Deliver to ActivityPub recipients in privacy groups"
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "Archive"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:50
+#: ../../Zotlabs/Module/Connedit.php:640
 msgid ""
-"May result in a large number of mentions and expose all the members of your "
-"privacy group"
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:54
-msgid "Send multi-media HTML articles"
+#: ../../Zotlabs/Module/Connedit.php:641
+msgid "This connection is archived!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:54
-msgid "Not supported by some microblog services such as Mastodon"
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Unhide"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:62
-msgid "Activitypub Protocol"
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Hide"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/ijpost.php:44
-msgid "Post to Insane Journal"
+#: ../../Zotlabs/Module/Connedit.php:648
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:23
-msgid "Insane Journal Crosspost Connector Settings saved."
+#: ../../Zotlabs/Module/Connedit.php:649
+msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:35
-msgid "Insane Journal Crosspost Connector App"
+#: ../../Zotlabs/Module/Connedit.php:656
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:36
-msgid "Relay public postings to Insane Journal"
+#: ../../Zotlabs/Module/Connedit.php:664
+msgid "Fetch Vcard"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:53
-msgid "InsaneJournal username"
+#: ../../Zotlabs/Module/Connedit.php:667
+msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:57
-msgid "InsaneJournal password"
+#: ../../Zotlabs/Module/Connedit.php:678
+msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:61
-msgid "Post to InsaneJournal by default"
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Affinity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ijpost/Mod_Ijpost.php:69
-msgid "Insane Journal Crosspost Connector"
+#: ../../Zotlabs/Module/Connedit.php:704
+msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:77
-msgid "Max queueworker threads"
+#: ../../Zotlabs/Module/Connedit.php:741
+msgid "Filter"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:79
-msgid "Minimum 4, default 4"
+#: ../../Zotlabs/Module/Connedit.php:744
+msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:90
-msgid "Assume workers dead after"
+#: ../../Zotlabs/Module/Connedit.php:781
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:92
-msgid "Minimum 120, default 300 seconds"
+#: ../../Zotlabs/Module/Connedit.php:781
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:103
-msgid "Pause before starting next task"
+#: ../../Zotlabs/Module/Connedit.php:786
+msgid "Set Affinity"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:105
-msgid "Minimum 100, default 100 microseconds"
+#: ../../Zotlabs/Module/Connedit.php:789
+msgid "Set Profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:113
-msgid "Queueworker Settings"
+#: ../../Zotlabs/Module/Connedit.php:792
+msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:218
-msgid "Not allowed."
+#: ../../Zotlabs/Module/Connedit.php:840
+msgid "This connection is unreachable from this location."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:123
-msgid "generic profile image"
+#: ../../Zotlabs/Module/Connedit.php:841
+msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:124
-msgid "random geometric pattern"
+#: ../../Zotlabs/Module/Connedit.php:843
+msgid "Location independence is not supported by their network."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:125
-msgid "monster face"
+#: ../../Zotlabs/Module/Connedit.php:849
+msgid ""
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:126
-msgid "computer generated face"
+#: ../../Zotlabs/Module/Connedit.php:853
+msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:127
-msgid "retro arcade style face"
+#: ../../Zotlabs/Module/Connedit.php:862
+msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:128
-msgid "Hub default profile photo"
+#: ../../Zotlabs/Module/Connedit.php:863
+msgid "Available locations:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:143
-msgid "Information"
+#: ../../Zotlabs/Module/Connedit.php:869
+msgid "Connection Tools"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:143
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
+#: ../../Zotlabs/Module/Connedit.php:871
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:151
-msgid "Default avatar image"
+#: ../../Zotlabs/Module/Connedit.php:873
+msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:151
-msgid "Select default avatar image if none was found at Gravatar. See README"
+#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879
+msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:152
-msgid "Rating of images"
+#: ../../Zotlabs/Module/Connedit.php:876
+msgid "Custom Filter"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:152
-msgid "Select the appropriate avatar rating for your site. See README"
+#: ../../Zotlabs/Module/Connedit.php:877
+msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:165
-msgid "Gravatar settings updated."
+#: ../../Zotlabs/Module/Connedit.php:878
+msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:104
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:176
-msgid "Network error"
+#: ../../Zotlabs/Module/Connedit.php:880
+msgid "This information is public!"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:108
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:180
-msgid "API error"
+#: ../../Zotlabs/Module/Connedit.php:885
+msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:112
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:184
-msgid "Unknown issue"
+#: ../../Zotlabs/Module/Connedit.php:890
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:168
-msgid "Unable to login using email address "
+#: ../../Zotlabs/Module/Connedit.php:897
+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 ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:202
-msgid "Sign in to Hubzilla using a social account"
+#: ../../Zotlabs/Module/Connedit.php:898
+msgid "Last update:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:207
-msgid "Social Authentication using your social media account"
+#: ../../Zotlabs/Module/Connedit.php:906
+msgid "Details"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:211
-msgid ""
-"This app enables one or more social provider sign-in buttons on the login "
-"page."
+#: ../../Zotlabs/Module/Notifications.php:106
+#: ../../Zotlabs/Module/Notify.php:69
+msgid "No more system notifications."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:229
-msgid "Add an identity provider"
+#: ../../Zotlabs/Module/Notifications.php:110
+#: ../../Zotlabs/Module/Notify.php:73
+msgid "System Notifications"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:256
-msgid "Enable "
+#: ../../Zotlabs/Module/Notifications.php:111
+#: ../../Zotlabs/Lib/ThreadItem.php:484
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:263
-msgid "Key"
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:263
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:268
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:284
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:297
-msgid "Word"
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:268
-msgid "Secret"
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:297
-msgid "Add a custom provider"
+#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
+msgid "Location not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:317
-msgid "Remove an identity provider"
+#: ../../Zotlabs/Module/Locs.php:74
+msgid "Location lookup failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:327
-msgid "Social authentication"
+#: ../../Zotlabs/Module/Locs.php:78
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:366
-msgid "Error while saving provider settings"
+#: ../../Zotlabs/Module/Locs.php:106
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:382
-msgid "Custom provider already exists"
+#: ../../Zotlabs/Module/Locs.php:115
+msgid "No locations found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:399
-msgid "Social authentication settings saved."
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:14
-msgid "Send your identity to all websites"
+#: ../../Zotlabs/Module/Locs.php:131
+msgid "Sync Now"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:20
-msgid "Sendzid App"
+#: ../../Zotlabs/Module/Locs.php:132
+msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:32
-msgid "Send ZID"
+#: ../../Zotlabs/Module/Locs.php:133
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:106
-msgid "Photos imported"
+#: ../../Zotlabs/Module/Locs.php:134
+msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:129
-msgid "Redmatrix Photo Album Import"
+#: ../../Zotlabs/Module/Sources.php:41
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:130
-msgid "This will import all your Redmatrix photo albums to this channel."
+#: ../../Zotlabs/Module/Sources.php:57
+msgid "Source created."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:131
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:121
-msgid "Redmatrix Server base URL"
+#: ../../Zotlabs/Module/Sources.php:70
+msgid "Source updated."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:132
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:122
-msgid "Redmatrix Login Username"
+#: ../../Zotlabs/Module/Sources.php:88
+msgid "Sources App"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:133
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:123
-msgid "Redmatrix Login Password"
+#: ../../Zotlabs/Module/Sources.php:89
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:134
-msgid "Import just this album"
+#: ../../Zotlabs/Module/Sources.php:101
+msgid "*"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:134
-msgid "Leave blank to import all albums"
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:369
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:135
-msgid "Maximum count to import"
+#: ../../Zotlabs/Module/Sources.php:108
+msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:135
-msgid "0 or blank to import all available"
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
+msgid "New Source"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:65
-msgid "Twitter settings updated."
+#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:78
-msgid "Twitter Crosspost Connector App"
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:79
-msgid "Relay public posts to Twitter"
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:103
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
+msgid "Channel Name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:125
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
 msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+"Add the following categories to posts imported from this source (comma "
+"separated)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:127
-msgid "Log in with Twitter"
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+msgid "Resend posts with this channel as author"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:130
-msgid "Copy the PIN from Twitter here"
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+msgid "Copyrights may apply"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:152
-msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
+#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
+msgid "Source not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:157
-msgid "Twitter post length"
+#: ../../Zotlabs/Module/Sources.php:151
+msgid "Edit Source"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:157
-msgid "Maximum tweet length"
+#: ../../Zotlabs/Module/Sources.php:152
+msgid "Delete Source"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:162
-msgid "Send public postings to Twitter by default"
+#: ../../Zotlabs/Module/Sources.php:182
+msgid "Source removed"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:162
-msgid ""
-"If enabled your public postings will be posted to the associated Twitter "
-"account by default"
+#: ../../Zotlabs/Module/Sources.php:184
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:181
-msgid "Twitter Crosspost Connector"
+#: ../../Zotlabs/Module/Rbmark.php:93
+msgid "Select a bookmark folder"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:109
-msgid "Post to Twitter"
+#: ../../Zotlabs/Module/Rbmark.php:98
+msgid "Save Bookmark"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:21
-msgid "Project Servers and Resources"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "URL of bookmark"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:22
-msgid "Project Creator and Tech Lead"
+#: ../../Zotlabs/Module/Rbmark.php:104
+msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:49
+#: ../../Zotlabs/Lib/AccessList.php:28
 msgid ""
-"And the hundreds of other people and organisations who helped make the "
-"Hubzilla possible."
+"A deleted list with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this list and any future members. If this is "
+"not what you intended, please create another list with a different name."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:52
-msgid ""
-"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
-"their time and expertise - and often paying out of pocket for services they "
-"share with others."
+#: ../../Zotlabs/Lib/AccessList.php:286
+msgid "Add new connections to this access list"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:53
-msgid ""
-"There is no corporate funding and no ads, and we do not collect and sell "
-"your personal information. (We don't control your personal information - "
-"<strong>you do</strong>.)"
+#: ../../Zotlabs/Lib/AccessList.php:331
+msgid "Lists"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:54
-msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and "
-"privacy."
+#: ../../Zotlabs/Lib/AccessList.php:332
+msgid "Edit list"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:56
-msgid ""
-"Your donations keep servers and services running and also helps us to "
-"provide innovative new features and continued development."
+#: ../../Zotlabs/Lib/AccessList.php:333
+msgid "Create new list"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:59
-msgid "Donate"
+#: ../../Zotlabs/Lib/AccessList.php:334
+msgid "Channels not in any access list"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:61
-msgid ""
-"Choose a project, developer, or public hub to support with a one-time "
-"donation"
+#: ../../Zotlabs/Lib/Permcat.php:82
+msgctxt "permcat"
+msgid "default"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:62
-msgid "Donate Now"
+#: ../../Zotlabs/Lib/Permcat.php:133
+msgctxt "permcat"
+msgid "follower"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:63
-msgid ""
-"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
+#: ../../Zotlabs/Lib/Permcat.php:137
+msgctxt "permcat"
+msgid "contributor"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:64
-msgid ""
-"Please indicate if you would like your first name or full name (or nothing) "
-"to appear in our sponsor listing"
+#: ../../Zotlabs/Lib/Permcat.php:141
+msgctxt "permcat"
+msgid "publisher"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:65
-msgid "Sponsor"
+#: ../../Zotlabs/Lib/Activity.php:2157
+#, php-format
+msgid "Likes %1$s's %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/donate/donate.php:68
-msgid "Special thanks to: "
+#: ../../Zotlabs/Lib/Activity.php:2160
+#, php-format
+msgid "Doesn't like %1$s's %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:26
-msgid "Dreamwidth Crosspost Connector Settings saved."
+#: ../../Zotlabs/Lib/Activity.php:2166
+#, php-format
+msgid "Will attend %s's event"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:39
-msgid "Dreamwidth Crosspost Connector App"
+#: ../../Zotlabs/Lib/Activity.php:2169
+#, php-format
+msgid "Will not attend %s's event"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:40
-msgid "Relay public posts to Dreamwidth"
+#: ../../Zotlabs/Lib/Activity.php:2172
+#, php-format
+msgid "May attend %s's event"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:53
-msgid "Dreamwidth username"
+#: ../../Zotlabs/Lib/Activity.php:2175
+#, php-format
+msgid "May not attend %s's event"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:57
-msgid "Dreamwidth password"
+#: ../../Zotlabs/Lib/Enotify.php:60
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:61
-msgid "Post to Dreamwidth by default"
+#: ../../Zotlabs/Lib/Enotify.php:63
+msgid "Thank You,"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:69
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:98
-msgid "Link description (default:"
+#: ../../Zotlabs/Lib/Enotify.php:66
+#, php-format
+msgid "This email was sent by %1$s at %2$s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:77
-msgid "Dreamwidth Crosspost Connector"
+#: ../../Zotlabs/Lib/Enotify.php:67
+#, php-format
+msgid ""
+"To stop receiving these messages, please adjust your Notification Settings "
+"at %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/dwpost/dwpost.php:49
-msgid "Post to Dreamwidth"
+#: ../../Zotlabs/Lib/Enotify.php:68
+#, php-format
+msgid "To stop receiving these messages, please adjust your %s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:21
-msgid "nofed Settings saved."
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:33
-msgid "No Federation App"
+#: ../../Zotlabs/Lib/Enotify.php:128
+#, php-format
+msgid "[$Projectname:Notify] New direct message received at %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:34
-msgid ""
-"Prevent posting from being federated to anybody. It will exist only on your "
-"channel page."
+#: ../../Zotlabs/Lib/Enotify.php:130
+#, php-format
+msgid "%1$s sent you a new direct message at %2$s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:42
-msgid "Federate posts by default"
+#: ../../Zotlabs/Lib/Enotify.php:131
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:50
-msgid "No Federation"
+#: ../../Zotlabs/Lib/Enotify.php:131
+msgid "a direct message"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nofed/nofed.php:47
-msgid "Federate"
+#: ../../Zotlabs/Lib/Enotify.php:132
+#, php-format
+msgid "Please visit %s to view and/or reply to your direct messages."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:15
-msgid "WYSIWYG status editor"
+#: ../../Zotlabs/Lib/Enotify.php:145
+msgid "commented on"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:21
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:26
-msgid "WYSIWYG Status App"
+#: ../../Zotlabs/Lib/Enotify.php:158
+msgid "liked"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/hsse/Mod_Hsse.php:34
-msgid "WYSIWYG Status"
+#: ../../Zotlabs/Lib/Enotify.php:161
+msgid "disliked"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:27
-msgid "No server specified"
+#: ../../Zotlabs/Lib/Enotify.php:166
+msgid "voted on"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:73
-msgid "Posts imported"
+#: ../../Zotlabs/Lib/Enotify.php:209
+#, php-format
+msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:113
-msgid "Files imported"
+#: ../../Zotlabs/Lib/Enotify.php:217
+#, php-format
+msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:122
-msgid ""
-"This addon app copies existing content and file storage to a cloned/copied "
-"channel. Once the app is installed, visit the newly installed app. This will "
-"allow you to set the location of your original channel and an optional date "
-"range of files/conversations to copy."
+#: ../../Zotlabs/Lib/Enotify.php:226
+#, php-format
+msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:136
-msgid ""
-"This will import all your conversations and cloud files from a cloned "
-"channel on another server. This may take a while if you have lots of posts "
-"and or files."
+#: ../../Zotlabs/Lib/Enotify.php:238
+#, php-format
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:137
-msgid "Include posts"
+#: ../../Zotlabs/Lib/Enotify.php:240
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:137
-msgid "Conversations, Articles, Cards, and other posted content"
+#: ../../Zotlabs/Lib/Enotify.php:241
+#, php-format
+msgid "%1$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:138
-msgid "Include files"
+#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:324
+#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:364
+#: ../../Zotlabs/Lib/Enotify.php:381 ../../Zotlabs/Lib/Enotify.php:394
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:138
-msgid "Files, Photos and other cloud storage"
+#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:139
-msgid "Original Server base URL"
+#: ../../Zotlabs/Lib/Enotify.php:306
+#, php-format
+msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:48
-msgid "Your channel has been upgraded to $Projectname version"
+#: ../../Zotlabs/Lib/Enotify.php:320
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:50
-msgid "Please have a look at the"
+#: ../../Zotlabs/Lib/Enotify.php:321
+#, php-format
+msgid "%1$s liked an item/conversation you created."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:52
-msgid "git history"
+#: ../../Zotlabs/Lib/Enotify.php:332
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:54
-msgid "change log"
+#: ../../Zotlabs/Lib/Enotify.php:334
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:55
-msgid "for further info."
+#: ../../Zotlabs/Lib/Enotify.php:336
+#, php-format
+msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:60
-msgid "Upgrade Info"
+#: ../../Zotlabs/Lib/Enotify.php:358
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/upgrade_info/upgrade_info.php:64
-msgid "Do not show this again"
+#: ../../Zotlabs/Lib/Enotify.php:359
+#, php-format
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:22
-msgid "pageheader Settings saved."
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:34
-msgid "Page Header App"
+#: ../../Zotlabs/Lib/Enotify.php:371
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:35
-msgid "Inserts a page header"
+#: ../../Zotlabs/Lib/Enotify.php:372
+#, php-format
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:43
-msgid "Message to display on every page on this server"
+#: ../../Zotlabs/Lib/Enotify.php:373
+#, php-format
+msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:51
-msgid "Page Header"
+#: ../../Zotlabs/Lib/Enotify.php:388
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/visage/Mod_Visage.php:21
-msgid "Who viewed my channel/profile"
+#: ../../Zotlabs/Lib/Enotify.php:389
+#, php-format
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/visage/Mod_Visage.php:25
-msgid "Recent Channel/Profile Viewers"
+#: ../../Zotlabs/Lib/Enotify.php:390
+#, php-format
+msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/visage/Mod_Visage.php:36
-msgid "No entries."
+#: ../../Zotlabs/Lib/Enotify.php:401
+msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:40
-msgid "Messages"
+#: ../../Zotlabs/Lib/Enotify.php:402
+#, php-format
+msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:53
-msgid "message"
+#: ../../Zotlabs/Lib/Enotify.php:403
+#, php-format
+msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:93
-msgid "Message recalled."
+#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:106
-msgid "Conversation removed."
+#: ../../Zotlabs/Lib/Enotify.php:408
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:121
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:242
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../Zotlabs/Lib/Enotify.php:415
+msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:149
-msgid "Requested channel is not in this network"
+#: ../../Zotlabs/Lib/Enotify.php:416
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:157
-msgid "Send Private Message"
+#: ../../Zotlabs/Lib/Enotify.php:417
+#, php-format
+msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:158
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:301
-msgid "To:"
+#: ../../Zotlabs/Lib/Enotify.php:422
+msgid "Name:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:166
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:309
-msgid "Attach file"
+#: ../../Zotlabs/Lib/Enotify.php:423
+msgid "Photo:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:168
-msgid "Send"
+#: ../../Zotlabs/Lib/Enotify.php:426
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:272
-msgid "Delete message"
+#: ../../Zotlabs/Lib/Enotify.php:651
+msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:273
-msgid "Delivery report"
+#: ../../Zotlabs/Lib/Enotify.php:819
+msgid "created a new poll"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:274
-msgid "Recall message"
+#: ../../Zotlabs/Lib/Enotify.php:819
+msgid "created a new post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:276
-msgid "Message has been recalled."
+#: ../../Zotlabs/Lib/Enotify.php:820
+#, php-format
+msgid "voted on %s's poll"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:294
-msgid "Delete Conversation"
+#: ../../Zotlabs/Lib/Enotify.php:820
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:296
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../Zotlabs/Lib/Enotify.php:824
+#, php-format
+msgid "repeated %s's post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:300
-msgid "Send Reply"
+#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:927
+msgid "shared a file with you"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:305
+#: ../../Zotlabs/Lib/Enotify.php:837
 #, php-format
-msgid "Your message for %s (%s):"
+msgid "edited a post dated %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:385
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Lib/Enotify.php:840
+#, php-format
+msgid "edited a comment dated %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:392
-msgid "Unable to communicate with requested channel."
+#: ../../Zotlabs/Lib/Enotify.php:912
+msgid "added your channel"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:399
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Lib/Enotify.php:942
+msgid "sent you a direct message"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:417
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Lib/Enotify.php:949
+msgid "g A l F d"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:50
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:128
-msgid "System defaults:"
+#: ../../Zotlabs/Lib/Enotify.php:952
+msgid "[today]"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54
-msgid "Preferred Clipart IDs"
+#: ../../Zotlabs/Lib/Enotify.php:962
+msgid "created an event"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54
-msgid "List of preferred clipart ids. These will be shown first."
+#: ../../Zotlabs/Lib/Enotify.php:977
+msgid "status verified"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55
-msgid "Default Search Term"
+#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55
-msgid "The default search term. These will be shown second."
+#: ../../Zotlabs/Lib/Connect.php:51
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56
-msgid "Return After"
+#: ../../Zotlabs/Lib/Connect.php:103
+msgid "Remote channel or protocol unavailable."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56
-msgid "Page to load after image selection."
+#: ../../Zotlabs/Lib/Connect.php:137
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:59
-msgid "Profile List"
+#: ../../Zotlabs/Lib/Connect.php:155
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61
-msgid "Order of Preferred"
+#: ../../Zotlabs/Lib/Connect.php:167
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61
-msgid "Sort order of preferred clipart ids."
+#: ../../Zotlabs/Lib/Connect.php:271
+msgid "error saving data"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68
-msgid "Newest first"
+#: ../../Zotlabs/Lib/Chatroom.php:25
+msgid "Missing room name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:65
-msgid "As entered"
+#: ../../Zotlabs/Lib/Chatroom.php:34
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67
-msgid "Order of other"
+#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67
-msgid "Sort order of other clipart ids."
+#: ../../Zotlabs/Lib/Chatroom.php:124
+msgid "Room not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:69
-msgid "Most downloaded first"
+#: ../../Zotlabs/Lib/Chatroom.php:145
+msgid "Room is full"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70
-msgid "Most liked first"
+#: ../../Zotlabs/Lib/NativeWiki.php:146
+msgid "Wiki updated successfully"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72
-msgid "Preferred IDs Message"
+#: ../../Zotlabs/Lib/NativeWiki.php:206
+msgid "Wiki files deleted successfully"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72
-msgid "Message to display above preferred results."
+#: ../../Zotlabs/Lib/Apps.php:324
+msgid "Apps"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78
-msgid "Uploaded by: "
+#: ../../Zotlabs/Lib/Apps.php:325
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78
-msgid "Drawn by: "
+#: ../../Zotlabs/Lib/Apps.php:328
+msgid "Site Admin"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:182
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:194
-msgid "Use this image"
+#: ../../Zotlabs/Lib/Apps.php:332
+msgid "Content Filter"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:192
-msgid "Or select from a free OpenClipart.org image:"
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:195
-msgid "Search Term"
+#: ../../Zotlabs/Lib/Apps.php:336
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:232
-msgid "Unknown error. Please try again later."
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Stream"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:308
-msgid "Profile photo updated successfully."
+#: ../../Zotlabs/Lib/Apps.php:350
+msgid "Mail"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gallery/gallery.php:43
-#: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:136
-msgid "Gallery"
+#: ../../Zotlabs/Lib/Apps.php:353
+msgid "Chat"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gallery/gallery.php:46
-msgid "Photo Gallery"
+#: ../../Zotlabs/Lib/Apps.php:355
+msgid "Probe"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:58
-msgid "Gallery App"
+#: ../../Zotlabs/Lib/Apps.php:356
+msgid "Suggest"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:59
-msgid "A simple gallery for your photo albums"
+#: ../../Zotlabs/Lib/Apps.php:357
+msgid "Random Channel"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:35
-msgid "Smileybutton App"
+#: ../../Zotlabs/Lib/Apps.php:358
+msgid "Invite"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:36
-msgid "Adds a smileybutton to the jot editor"
+#: ../../Zotlabs/Lib/Apps.php:361 ../../Zotlabs/Storage/Browser.php:407
+msgid "Post"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:44
-msgid "Hide the button and show the smilies directly."
+#: ../../Zotlabs/Lib/Apps.php:366
+msgid "Notifications"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:52
-msgid "Smileybutton Settings"
+#: ../../Zotlabs/Lib/Apps.php:367
+msgid "Order Apps"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/rtof.php:51
-msgid "Post to Friendica"
+#: ../../Zotlabs/Lib/Apps.php:368
+msgid "CardDAV"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:24
-msgid "Friendica Crosspost Connector Settings saved."
+#: ../../Zotlabs/Lib/Apps.php:370
+msgid "Guest Access"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:36
-msgid "Friendica Crosspost Connector App"
+#: ../../Zotlabs/Lib/Apps.php:372
+msgid "OAuth Apps Manager"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:37
-msgid "Relay public postings to a connected Friendica account"
+#: ../../Zotlabs/Lib/Apps.php:373
+msgid "OAuth2 Apps Manager"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:49
-msgid "Send public postings to Friendica by default"
+#: ../../Zotlabs/Lib/Apps.php:374
+msgid "PDL Editor"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:53
-msgid "Friendica API Path"
+#: ../../Zotlabs/Lib/Apps.php:377
+msgid "My Chatrooms"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:57
-msgid "Friendica login name"
+#: ../../Zotlabs/Lib/Apps.php:378
+msgid "Channel Export"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:61
-msgid "Friendica password"
+#: ../../Zotlabs/Lib/Apps.php:555
+msgid "Purchase"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:69
-msgid "Friendica Crosspost Connector"
+#: ../../Zotlabs/Lib/Apps.php:560
+msgid "Undelete"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:36
-msgid "Logfile archive directory"
+#: ../../Zotlabs/Lib/Apps.php:570
+msgid "Add to app-tray"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:36
-msgid "Directory to store rotated logs"
+#: ../../Zotlabs/Lib/Apps.php:571
+msgid "Remove from app-tray"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:37
-msgid "Logfile size in bytes before rotating"
+#: ../../Zotlabs/Lib/Apps.php:572
+msgid "Pin to navbar"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/logrot/logrot.php:38
-msgid "Number of logfiles to retain"
+#: ../../Zotlabs/Lib/Apps.php:573
+msgid "Unpin from navbar"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:46
-msgid "Post to WordPress"
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:30
-msgid "Wordpress Settings saved."
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:43
-msgid "Wordpress Post App"
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:44
-msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:69
-msgid "WordPress username"
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:73
-msgid "WordPress password"
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:77
-msgid "WordPress API URL"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:42
+#: ../../Zotlabs/Lib/NativeWikiPage.php:94
+msgid "(No Title)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:78
-msgid "Typically https://your-blog.tld/xmlrpc.php"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:109
+msgid "Wiki page create failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:81
-msgid "WordPress blogid"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:123
+msgid "Wiki not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:82
-msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:134
+msgid "Destination name already exists"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:86
-msgid "Post to WordPress by default"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:167
+#: ../../Zotlabs/Lib/NativeWikiPage.php:368
+msgid "Page not found"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:90
-msgid "Forward comments (requires hubzilla_wp plugin)"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:200
+msgid "Error reading page content"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:106
-msgid "Wordpress Post"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Zotlabs/Lib/NativeWikiPage.php:409
+#: ../../Zotlabs/Lib/NativeWikiPage.php:480
+#: ../../Zotlabs/Lib/NativeWikiPage.php:522
+msgid "Error reading wiki"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:22
-msgid ""
-"Allow magic authentication only to websites of your immediate connections"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:396
+msgid "Page update failed."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:28
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:33
-msgid "Authchoose App"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:431
+msgid "Nothing deleted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:39
-msgid "Authchoose"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:501
+msgid "Compare: object not found."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:19
-msgid "bitchslap"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+msgid "Page updated"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:19
-msgid "bitchslapped"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:511
+msgid "Untitled"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:20
-msgid "shag"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:517
+msgid "Wiki resource_id required for git commit"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:20
-msgid "shagged"
+#: ../../Zotlabs/Lib/Libzotdir.php:163
+msgid "Directory Options"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:21
-msgid "patent"
+#: ../../Zotlabs/Lib/Libzotdir.php:165
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:21
-msgid "patented"
+#: ../../Zotlabs/Lib/Libzotdir.php:166
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:22
-msgid "hug"
+#: ../../Zotlabs/Lib/Libzotdir.php:168
+msgid "This Website Only"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:22
-msgid "hugged"
+#: ../../Zotlabs/Lib/Libzot.php:655
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:23
-msgid "murder"
+#: ../../Zotlabs/Lib/ThreadItem.php:131
+msgid "Privacy conflict. Discretion advised."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:23
-msgid "murdered"
+#: ../../Zotlabs/Lib/ThreadItem.php:175 ../../Zotlabs/Storage/Browser.php:369
+msgid "Admin Delete"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:24
-msgid "worship"
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "Reply on this comment"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:24
-msgid "worshipped"
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "reply"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:25
-msgid "kiss"
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "Reply to"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:25
-msgid "kissed"
+#: ../../Zotlabs/Lib/ThreadItem.php:340
+msgid "Delivery Report"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:26
-msgid "tempt"
+#: ../../Zotlabs/Lib/ThreadItem.php:359
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+#, php-format
+msgid "%d unseen"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:26
-msgid "tempted"
+#: ../../Zotlabs/Lib/ThreadItem.php:413
+msgid "to"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:27
-msgid "raise eyebrows at"
+#: ../../Zotlabs/Lib/ThreadItem.php:415
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:27
-msgid "raised their eyebrows at"
+#: ../../Zotlabs/Lib/ThreadItem.php:416
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:28
-msgid "insult"
+#: ../../Zotlabs/Lib/ThreadItem.php:444
+msgid "Attend"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:28
-msgid "insulted"
+#: ../../Zotlabs/Lib/ThreadItem.php:462
+msgid "Go to previous comment"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:29
-msgid "praise"
+#: ../../Zotlabs/Lib/ThreadItem.php:475
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:29
-msgid "praised"
+#: ../../Zotlabs/Lib/ThreadItem.php:833
+msgid "Image"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:30
-msgid "be dubious of"
+#: ../../Zotlabs/Lib/ThreadItem.php:835
+msgid "Insert Link"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:30
-msgid "was dubious of"
+#: ../../Zotlabs/Lib/ThreadItem.php:836
+msgid "Video"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:31
-msgid "eat"
+#: ../../Zotlabs/Lib/ThreadItem.php:846
+msgid "Your full name (required)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:31
-msgid "ate"
+#: ../../Zotlabs/Lib/ThreadItem.php:847
+msgid "Your email address (required)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:32
-msgid "giggle and fawn at"
+#: ../../Zotlabs/Lib/ThreadItem.php:848
+msgid "Your website URL (optional)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:32
-msgid "giggled and fawned at"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:67
+msgid "Source code of failed update: "
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:33
-msgid "doubt"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:88
+#, php-format
+msgid "Update Error at %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:33
-msgid "doubted"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:94
+#, php-format
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:34
-msgid "glare"
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:34
-msgid "glared at"
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:35
-msgid "fuck"
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:35
-msgid "fucked"
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:36
-msgid "bonk"
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:36
-msgid "bonked"
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:37
-msgid "declare undying love for"
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/morepokes/morepokes.php:37
-msgid "declared undying love for"
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/notifyadmin/notifyadmin.php:34
-msgid "New registration"
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
+msgid ""
+"This is your default setting for who can view your default channel profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/notifyadmin/notifyadmin.php:42
-#, php-format
-msgid "Message sent to %s. New account registration: %s"
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:40
-msgid "Pump.io Settings saved."
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your file storage and photos"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:53
-msgid "Pump.io Crosspost Connector App"
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:54
-msgid "Relay public posts to pump.io"
+#: ../../Zotlabs/Lib/Libsync.php:737
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:73
-msgid "Pump.io servername"
+#: ../../Zotlabs/Access/PermissionRoles.php:287
+msgid "Social Networking"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:73
-msgid "Without \"http://\" or \"https://\""
+#: ../../Zotlabs/Access/PermissionRoles.php:288
+msgid "Social - Federation"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:77
-msgid "Pump.io username"
+#: ../../Zotlabs/Access/PermissionRoles.php:289
+msgid "Social - Mostly Public"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:77
-msgid "Without the servername"
+#: ../../Zotlabs/Access/PermissionRoles.php:290
+msgid "Social - Restricted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:88
-msgid "You are not authenticated to pumpio"
+#: ../../Zotlabs/Access/PermissionRoles.php:291
+msgid "Social - Private"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:90
-msgid "(Re-)Authenticate your pump.io connection"
+#: ../../Zotlabs/Access/PermissionRoles.php:294
+msgid "Community Forum"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:94
-msgid "Post to pump.io by default"
+#: ../../Zotlabs/Access/PermissionRoles.php:295
+msgid "Forum - Mostly Public"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
-msgid "Should posts be public"
+#: ../../Zotlabs/Access/PermissionRoles.php:296
+msgid "Forum - Restricted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
-msgid "Mirror all public posts"
+#: ../../Zotlabs/Access/PermissionRoles.php:297
+msgid "Forum - Private"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:112
-msgid "Pump.io Crosspost Connector"
+#: ../../Zotlabs/Access/PermissionRoles.php:300
+msgid "Feed Republish"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:152
-msgid "You are now authenticated to pumpio."
+#: ../../Zotlabs/Access/PermissionRoles.php:301
+msgid "Feed - Mostly Public"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:153
-msgid "return to the featured settings page"
+#: ../../Zotlabs/Access/PermissionRoles.php:302
+msgid "Feed - Restricted"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:168
-msgid "Post to Pump.io"
+#: ../../Zotlabs/Access/PermissionRoles.php:305
+msgid "Special Purpose"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsabait/Mod_Nsabait.php:20
-#: ../../extend/addon/hubzilla-addons/nsabait/Mod_Nsabait.php:24
-msgid "NSA Bait App"
+#: ../../Zotlabs/Access/PermissionRoles.php:306
+msgid "Special - Celebrity/Soapbox"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/nsabait/Mod_Nsabait.php:26
-msgid "Make yourself a political target"
+#: ../../Zotlabs/Access/PermissionRoles.php:307
+msgid "Special - Group Repository"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:15
-msgid "Add some colour to tag clouds"
+#: ../../Zotlabs/Access/PermissionRoles.php:311
+msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:21
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:26
-msgid "Rainbow Tag App"
+#: ../../Zotlabs/Access/Permissions.php:56
+msgid "Can view my channel stream and posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/rainbowtag/Mod_Rainbowtag.php:34
-msgid "Rainbow Tag"
+#: ../../Zotlabs/Access/Permissions.php:57
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:19
-msgid "Send test email"
+#: ../../Zotlabs/Access/Permissions.php:58
+msgid "Can view my default channel profile"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:66
-msgid "Mail sent."
+#: ../../Zotlabs/Access/Permissions.php:59
+msgid "Can view my connections"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:68
-msgid "Sending of mail failed."
+#: ../../Zotlabs/Access/Permissions.php:60
+msgid "Can view my file storage and photos"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mailtest/mailtest.php:77
-msgid "Mail Test"
+#: ../../Zotlabs/Access/Permissions.php:61
+msgid "Can upload/modify my file storage and photos"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:119
-msgid "Redmatrix File Storage Import"
+#: ../../Zotlabs/Access/Permissions.php:62
+msgid "Can view my channel webpages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:120
-msgid "This will import all your Redmatrix cloud files to this channel."
+#: ../../Zotlabs/Access/Permissions.php:63
+msgid "Can view my wiki pages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:42
-msgid "Use markdown for editing posts"
+#: ../../Zotlabs/Access/Permissions.php:64
+msgid "Can create/edit my channel webpages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:22
-msgid "Fuzzloc Settings updated."
+#: ../../Zotlabs/Access/Permissions.php:65
+msgid "Can write to my wiki pages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:34
-msgid "Fuzzy Location App"
+#: ../../Zotlabs/Access/Permissions.php:66
+msgid "Can post on my channel (wall) page"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:35
-msgid ""
-"Blur your precise location if your channel uses browser location mapping"
+#: ../../Zotlabs/Access/Permissions.php:67
+msgid "Can comment on or like my posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:40
-msgid "Minimum offset in meters"
+#: ../../Zotlabs/Access/Permissions.php:68
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:44
-msgid "Maximum offset in meters"
+#: ../../Zotlabs/Access/Permissions.php:69
+msgid "Can like/dislike profiles and profile things"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:53
-msgid "Fuzzy Location"
+#: ../../Zotlabs/Access/Permissions.php:70
+msgid "Can forward to all my channel connections via ! mentions in posts"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:50
-msgid "Startpage App"
+#: ../../Zotlabs/Access/Permissions.php:71
+msgid "Can chat with me"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:51
-msgid "Set a preferred page to load on login from home page"
+#: ../../Zotlabs/Access/Permissions.php:72
+msgid "Can source my public posts in derived channels"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:62
-msgid "Page to load after login"
+#: ../../Zotlabs/Access/Permissions.php:73
+msgid "Can administer my channel"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:62
-msgid ""
-"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
-"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
-"blank for default network page (grid)."
+#: ../../Zotlabs/Storage/Browser.php:292
+msgid "Change filename to"
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:70
-msgid "Startpage"
+#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
+msgid "Select a target location"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:16
-#: ../../view/theme/redbasic/php/config.php:19
-msgid "Focus (Hubzilla default)"
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
+msgid "Copy to target location"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:98
-msgid "Theme settings"
+#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
+msgid "Set permissions for all files and sub folders"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Narrow navbar"
+#: ../../Zotlabs/Storage/Browser.php:312
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:100
-msgid "Navigation bar background color"
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "File category"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:101
-msgid "Navigation bar icon color "
+#: ../../Zotlabs/Storage/Browser.php:362
+msgid "Total"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:102
-msgid "Navigation bar active icon color "
+#: ../../Zotlabs/Storage/Browser.php:364
+msgid "Shared"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:103
-msgid "Link color"
+#: ../../Zotlabs/Storage/Browser.php:366
+msgid "Add Files"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:104
-msgid "Set font-color for banner"
+#: ../../Zotlabs/Storage/Browser.php:381
+msgid "parent"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:105
-msgid "Set the background color"
+#: ../../Zotlabs/Storage/Browser.php:399
+msgid "Select All"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Set the background image"
+#: ../../Zotlabs/Storage/Browser.php:400
+msgid "Bulk Actions"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:107
-msgid "Set the background color of items"
+#: ../../Zotlabs/Storage/Browser.php:401
+msgid "Adjust Permissions"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:108
-msgid "Set the background color of comments"
+#: ../../Zotlabs/Storage/Browser.php:402
+msgid "Move or Copy"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Set font-size for the entire application"
+#: ../../Zotlabs/Storage/Browser.php:405
+msgid "Info"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Examples: 1rem, 100%, 16px"
+#: ../../Zotlabs/Storage/Browser.php:406
+msgid "Rename"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:110
-msgid "Set font-color for posts and comments"
+#: ../../Zotlabs/Storage/Browser.php:408
+msgid "Attachment BBcode"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Set radius of corners"
+#: ../../Zotlabs/Storage/Browser.php:409
+msgid "Embed BBcode"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Example: 4px"
+#: ../../Zotlabs/Storage/Browser.php:410
+msgid "Link BBcode"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Set shadow depth of photos"
+#: ../../Zotlabs/Storage/Browser.php:480
+#, php-format
+msgid "You are using %1$s of your available file storage."
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Set maximum width of content region in pixel"
+#: ../../Zotlabs/Storage/Browser.php:485
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Leave empty for default width"
+#: ../../Zotlabs/Storage/Browser.php:496
+msgid "WARNING:"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Set size of conversation author photo"
+#: ../../Zotlabs/Storage/Browser.php:537
+msgid "Create new folder"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Set size of followup author photos"
+#: ../../Zotlabs/Storage/Browser.php:539
+msgid "Upload file"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:116
-msgid "Show advanced settings"
+#: ../../Zotlabs/Storage/Browser.php:551
+msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: ../../boot.php:1695
+#: ../../Zotlabs/Storage/Browser.php:554
+msgid ""
+"You can select files via the upload button or drop them right here or into "
+"an existing folder."
+msgstr ""
+
+#: ../../boot.php:1697
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1719
-msgid "Login/Email"
+#: ../../boot.php:1715
+msgid "Email or nickname"
 msgstr ""
 
-#: ../../boot.php:1720
+#: ../../boot.php:1725
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1721
+#: ../../boot.php:1726
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1724
+#: ../../boot.php:1729
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2603
+#: ../../boot.php:2608
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2608
+#: ../../boot.php:2613
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2724
+#: ../../boot.php:2729
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2729
+#: ../../boot.php:2734
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
diff --git a/util/pconfig b/util/pconfig
index c2027adaf..13fd1e99b 100755
--- a/util/pconfig
+++ b/util/pconfig
@@ -14,7 +14,6 @@ if(!file_exists('include/cli_startup.php')) {
 
 
 require_once('include/cli_startup.php');
-require_once('include/zot.php');
 
 cli_startup();
 
@@ -36,7 +35,7 @@ Usage: util/pconfig
 	Displays all of the the channel's config entries
 
   util/pconfig <channel_id> <family>
-	Displays all of the channel's config entries for the specified family 
+	Displays all of the channel's config entries for the specified family
 	(system, database, etc)
 
   util/pconfig <channel_id> <family> <key>
diff --git a/vendor/commerceguys/intl/.travis.yml b/vendor/commerceguys/intl/.travis.yml
index 368b63291..6d1cecaa5 100644
--- a/vendor/commerceguys/intl/.travis.yml
+++ b/vendor/commerceguys/intl/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: php
 
 php:
@@ -5,8 +6,13 @@ php:
   - 7.3
   - 7.2
   - 7.1
-  - 7.0
 
 install:
   - composer self-update
   - composer install
+
+script:
+  - XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./phpunit.xml --coverage-text
+
+matrix:
+  fast_finish: true
diff --git a/vendor/commerceguys/intl/README.md b/vendor/commerceguys/intl/README.md
index 06235c45a..593805264 100644
--- a/vendor/commerceguys/intl/README.md
+++ b/vendor/commerceguys/intl/README.md
@@ -3,7 +3,7 @@ intl
 
 [![Build Status](https://travis-ci.org/commerceguys/intl.svg?branch=master)](https://travis-ci.org/commerceguys/intl)
 
-A PHP 7.0+ internationalization library, powered by CLDR data.
+A PHP 7.1+ internationalization library, powered by CLDR data.
 
 Features:
 - NumberFormatter and CurrencyFormatter, inspired by [intl](http://php.net/manual/en/class.numberformatter.php).
diff --git a/vendor/commerceguys/intl/composer.json b/vendor/commerceguys/intl/composer.json
index 2685c8283..acd44066f 100644
--- a/vendor/commerceguys/intl/composer.json
+++ b/vendor/commerceguys/intl/composer.json
@@ -4,10 +4,10 @@
     "description": "Internationalization library powered by CLDR data.",
     "license": "MIT",
     "require": {
-        "php": ">=7.0.8"
+        "php": ">=7.1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^7.5",
         "mikey179/vfsstream": "1.*"
     },
     "autoload": {
diff --git a/vendor/commerceguys/intl/resources/currency/af.json b/vendor/commerceguys/intl/resources/currency/af.json
index 22c13e69d..02ad48858 100644
--- a/vendor/commerceguys/intl/resources/currency/af.json
+++ b/vendor/commerceguys/intl/resources/currency/af.json
@@ -481,7 +481,7 @@
 	},
 	"XOF": {
 		"name": "Wes-Afrikaanse CFA-frank",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ISK": {
 		"name": "Yslandse kroon"
diff --git a/vendor/commerceguys/intl/resources/currency/ar.json b/vendor/commerceguys/intl/resources/currency/ar.json
index aac5acfd0..286959c2c 100644
--- a/vendor/commerceguys/intl/resources/currency/ar.json
+++ b/vendor/commerceguys/intl/resources/currency/ar.json
@@ -367,7 +367,7 @@
 	},
 	"XOF": {
 		"name": "�رنك غرب أ�ريقي",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"GNF": {
 		"name": "�رنك غينيا"
diff --git a/vendor/commerceguys/intl/resources/currency/as.json b/vendor/commerceguys/intl/resources/currency/as.json
index 3803ee65b..e7820e162 100644
--- a/vendor/commerceguys/intl/resources/currency/as.json
+++ b/vendor/commerceguys/intl/resources/currency/as.json
@@ -294,7 +294,7 @@
 	},
 	"XOF": {
 		"name": "পশ�চিম আফ�ৰিকান CFA ফ�ৰেংক",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "পাকিস�তানী ৰ�পী"
diff --git a/vendor/commerceguys/intl/resources/currency/ast.json b/vendor/commerceguys/intl/resources/currency/ast.json
index eb3afccd7..179e89777 100644
--- a/vendor/commerceguys/intl/resources/currency/ast.json
+++ b/vendor/commerceguys/intl/resources/currency/ast.json
@@ -188,7 +188,7 @@
 	},
 	"XOF": {
 		"name": "francu CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Francu CFA centroafricanu",
diff --git a/vendor/commerceguys/intl/resources/currency/az.json b/vendor/commerceguys/intl/resources/currency/az.json
index 1c3749e66..5d6ac7b1d 100644
--- a/vendor/commerceguys/intl/resources/currency/az.json
+++ b/vendor/commerceguys/intl/resources/currency/az.json
@@ -135,7 +135,7 @@
 	},
 	"XOF": {
 		"name": "Fil Dişi Sahili Frankı",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PHP": {
 		"name": "Filippin Pesosu"
diff --git a/vendor/commerceguys/intl/resources/currency/be.json b/vendor/commerceguys/intl/resources/currency/be.json
index 18ae8df72..6670849af 100644
--- a/vendor/commerceguys/intl/resources/currency/be.json
+++ b/vendor/commerceguys/intl/resources/currency/be.json
@@ -164,7 +164,7 @@
 	},
 	"XOF": {
 		"name": "заходнеафрыкан�кі франк КФ�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"JOD": {
 		"name": "іардан�кі дынар"
diff --git a/vendor/commerceguys/intl/resources/currency/bg.json b/vendor/commerceguys/intl/resources/currency/bg.json
index 3ebf8d528..bba50d073 100644
--- a/vendor/commerceguys/intl/resources/currency/bg.json
+++ b/vendor/commerceguys/intl/resources/currency/bg.json
@@ -150,7 +150,7 @@
 	},
 	"XOF": {
 		"name": "Западноафрикан�ки франк",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ZWL": {
 		"name": "Зимбабвий�ки долар (2009)"
@@ -255,7 +255,7 @@
 		"name": "Македон�ки денар"
 	},
 	"MWK": {
-		"name": "Малавий�ка квача"
+		"name": "Малавий�ка куача"
 	},
 	"MYR": {
 		"name": "Малайзий�ки рингит"
@@ -273,13 +273,13 @@
 		"name": "Мек�икан�ко пе�о"
 	},
 	"MMK": {
-		"name": "Мианмар�ки ки�т"
+		"name": "Мианмар�ки киат"
 	},
 	"MZN": {
 		"name": "Мозамбик�ки метикал"
 	},
 	"MDL": {
-		"name": "Молдов�ко леу"
+		"name": "Молдов�ка ле�"
 	},
 	"MNT": {
 		"name": "Монгол�ки тугрик"
@@ -405,7 +405,7 @@
 		"name": "Узбек�ки �ум"
 	},
 	"UAH": {
-		"name": "Украин�ка хривн�"
+		"name": "Украин�ка гривн�"
 	},
 	"HUF": {
 		"name": "Унгар�ки форинт"
@@ -420,7 +420,7 @@
 		"name": "Филипин�ко пе�о"
 	},
 	"FKP": {
-		"name": "Фолкленд�ка лира"
+		"name": "Фолкланд�ка лира"
 	},
 	"HTG": {
 		"name": "Хаит�ки гурд"
diff --git a/vendor/commerceguys/intl/resources/currency/bn.json b/vendor/commerceguys/intl/resources/currency/bn.json
index 8a12a7311..927202b39 100644
--- a/vendor/commerceguys/intl/resources/currency/bn.json
+++ b/vendor/commerceguys/intl/resources/currency/bn.json
@@ -245,7 +245,7 @@
 	},
 	"XOF": {
 		"name": "পশ�চিম আফ�রিকান [CFA] ফ�র�যাঙ�ক",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "পাকিস�তানি র�পি"
diff --git a/vendor/commerceguys/intl/resources/currency/brx.json b/vendor/commerceguys/intl/resources/currency/brx.json
index 0103a6079..8159a6424 100644
--- a/vendor/commerceguys/intl/resources/currency/brx.json
+++ b/vendor/commerceguys/intl/resources/currency/brx.json
@@ -269,7 +269,8 @@
 		"name": "फ़िजी का डॉलर"
 	},
 	"PHP": {
-		"name": "फ़िलिपीन का पेसो"
+		"name": "फ़िलिपीन का पेसो",
+		"symbol": "₱"
 	},
 	"XPF": {
 		"name": "फ�रानसीसी फेदेरेशनी फ�रा�",
@@ -277,7 +278,7 @@
 	},
 	"XOF": {
 		"name": "फ�रानसीसी फेदेरेशनी बीसी�आओ फ�रा�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"BMD": {
 		"name": "बरम�डी डॉलर"
diff --git a/vendor/commerceguys/intl/resources/currency/bs-Cyrl.json b/vendor/commerceguys/intl/resources/currency/bs-Cyrl.json
index e4e38ab00..7249a849d 100644
--- a/vendor/commerceguys/intl/resources/currency/bs-Cyrl.json
+++ b/vendor/commerceguys/intl/resources/currency/bs-Cyrl.json
@@ -440,7 +440,8 @@
 		"name": "Уругвај�ки пезо�"
 	},
 	"PHP": {
-		"name": "Филипин�ки пезо�"
+		"name": "Филипин�ки пезо�",
+		"symbol": "₱"
 	},
 	"FJD": {
 		"name": "Фиџи долар"
@@ -485,7 +486,7 @@
 	},
 	"XOF": {
 		"name": "CFA франак BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA франак BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/bs.json b/vendor/commerceguys/intl/resources/currency/bs.json
index d61de915b..593bf85c6 100644
--- a/vendor/commerceguys/intl/resources/currency/bs.json
+++ b/vendor/commerceguys/intl/resources/currency/bs.json
@@ -477,7 +477,7 @@
 	},
 	"XOF": {
 		"name": "Zapadnoafri�ki franak (CFA)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"CVE": {
 		"name": "Zelenortski eskudo"
diff --git a/vendor/commerceguys/intl/resources/currency/ca.json b/vendor/commerceguys/intl/resources/currency/ca.json
index ceaf59540..8a3ced75e 100644
--- a/vendor/commerceguys/intl/resources/currency/ca.json
+++ b/vendor/commerceguys/intl/resources/currency/ca.json
@@ -181,7 +181,7 @@
 	},
 	"XOF": {
 		"name": "franc CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franc CFA BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/ce.json b/vendor/commerceguys/intl/resources/currency/ce.json
index 844849763..60052cda0 100644
--- a/vendor/commerceguys/intl/resources/currency/ce.json
+++ b/vendor/commerceguys/intl/resources/currency/ce.json
@@ -279,7 +279,7 @@
 	},
 	"XOF": {
 		"name": "Малхбузен �фрикан КФ� франк",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"MVR": {
 		"name": "Мальдивийн руфи"
diff --git a/vendor/commerceguys/intl/resources/currency/cs.json b/vendor/commerceguys/intl/resources/currency/cs.json
index 21c3be746..fd0219fbf 100644
--- a/vendor/commerceguys/intl/resources/currency/cs.json
+++ b/vendor/commerceguys/intl/resources/currency/cs.json
@@ -83,7 +83,7 @@
 	},
 	"XOF": {
 		"name": "CFA\/BCEAO frank",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA\/BEAC frank",
diff --git a/vendor/commerceguys/intl/resources/currency/cy.json b/vendor/commerceguys/intl/resources/currency/cy.json
index c02d5f10d..a8d95e277 100644
--- a/vendor/commerceguys/intl/resources/currency/cy.json
+++ b/vendor/commerceguys/intl/resources/currency/cy.json
@@ -177,7 +177,7 @@
 	},
 	"XOF": {
 		"name": "Ffranc CFA Gorllewin Affrica",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "Ffranc CFP",
@@ -307,7 +307,7 @@
 		"name": "Paʻanga Tonga"
 	},
 	"MOP": {
-		"name": "Pataca Macau"
+		"name": "pataca Macau"
 	},
 	"CUP": {
 		"name": "Peso Ciwba"
diff --git a/vendor/commerceguys/intl/resources/currency/da.json b/vendor/commerceguys/intl/resources/currency/da.json
index 501dc97fe..061701f9f 100644
--- a/vendor/commerceguys/intl/resources/currency/da.json
+++ b/vendor/commerceguys/intl/resources/currency/da.json
@@ -94,7 +94,7 @@
 	},
 	"XOF": {
 		"name": "CFA-franc BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "CFP-franc",
@@ -134,9 +134,6 @@
 	"STN": {
 		"name": "dobra fra Sao Tome og Principe"
 	},
-	"TTD": {
-		"name": "dollar fra Trinidad og Tobago"
-	},
 	"DOP": {
 		"name": "dominikansk peso"
 	},
@@ -445,6 +442,9 @@
 	"TOP": {
 		"name": "tongansk paʻanga"
 	},
+	"TTD": {
+		"name": "trinidadisk dollar"
+	},
 	"TND": {
 		"name": "tunesisk dinar"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/de-CH.json b/vendor/commerceguys/intl/resources/currency/de-CH.json
index fd79f4e53..ae8822463 100644
--- a/vendor/commerceguys/intl/resources/currency/de-CH.json
+++ b/vendor/commerceguys/intl/resources/currency/de-CH.json
@@ -57,9 +57,6 @@
 	"BOB": {
 		"name": "Bolivianischer Boliviano"
 	},
-	"BAM": {
-		"name": "Bosnien und Herzegowina Konvertierbare Mark"
-	},
 	"BWP": {
 		"name": "Botswanischer Pula"
 	},
@@ -85,7 +82,7 @@
 	},
 	"XOF": {
 		"name": "CFA-Franc (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA-Franc (BEAC)",
@@ -220,6 +217,9 @@
 	"CDF": {
 		"name": "Kongo-Franc"
 	},
+	"BAM": {
+		"name": "Konvertible Mark Bosnien und Herzegowina"
+	},
 	"HRK": {
 		"name": "Kroatischer Kuna"
 	},
@@ -336,7 +336,7 @@
 		"name": "Panamaischer Balboa"
 	},
 	"PGK": {
-		"name": "Papua-Neuguineischer Kina"
+		"name": "Papua-neuguineischer Kina"
 	},
 	"PYG": {
 		"name": "Paraguayischer Guaraní"
@@ -403,7 +403,7 @@
 		"name": "Sri-Lanka-Rupie"
 	},
 	"SHP": {
-		"name": "St. Helena-Pfund"
+		"name": "St.-Helena-Pfund"
 	},
 	"ZAR": {
 		"name": "Südafrikanischer Rand"
@@ -441,7 +441,7 @@
 		"name": "Tongaischer Paʻanga"
 	},
 	"TTD": {
-		"name": "Trinidad und Tobago-Dollar"
+		"name": "Trinidad-und-Tobago-Dollar"
 	},
 	"CZK": {
 		"name": "Tschechische Krone"
diff --git a/vendor/commerceguys/intl/resources/currency/de.json b/vendor/commerceguys/intl/resources/currency/de.json
index 84c9309b5..712bae1e7 100644
--- a/vendor/commerceguys/intl/resources/currency/de.json
+++ b/vendor/commerceguys/intl/resources/currency/de.json
@@ -57,9 +57,6 @@
 	"BOB": {
 		"name": "Bolivianischer Boliviano"
 	},
-	"BAM": {
-		"name": "Bosnien und Herzegowina Konvertierbare Mark"
-	},
 	"BWP": {
 		"name": "Botswanischer Pula"
 	},
@@ -85,7 +82,7 @@
 	},
 	"XOF": {
 		"name": "CFA-Franc (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA-Franc (BEAC)",
@@ -221,6 +218,9 @@
 	"CDF": {
 		"name": "Kongo-Franc"
 	},
+	"BAM": {
+		"name": "Konvertible Mark Bosnien und Herzegowina"
+	},
 	"HRK": {
 		"name": "Kroatischer Kuna"
 	},
@@ -337,7 +337,7 @@
 		"name": "Panamaischer Balboa"
 	},
 	"PGK": {
-		"name": "Papua-Neuguineischer Kina"
+		"name": "Papua-neuguineischer Kina"
 	},
 	"PYG": {
 		"name": "Paraguayischer Guaraní"
@@ -404,7 +404,7 @@
 		"name": "Sri-Lanka-Rupie"
 	},
 	"SHP": {
-		"name": "St. Helena-Pfund"
+		"name": "St.-Helena-Pfund"
 	},
 	"ZAR": {
 		"name": "Südafrikanischer Rand"
@@ -442,7 +442,7 @@
 		"name": "Tongaischer Paʻanga"
 	},
 	"TTD": {
-		"name": "Trinidad und Tobago-Dollar"
+		"name": "Trinidad-und-Tobago-Dollar"
 	},
 	"CZK": {
 		"name": "Tschechische Krone"
diff --git a/vendor/commerceguys/intl/resources/currency/dz.json b/vendor/commerceguys/intl/resources/currency/dz.json
index 381687529..b52b81fa0 100644
--- a/vendor/commerceguys/intl/resources/currency/dz.json
+++ b/vendor/commerceguys/intl/resources/currency/dz.json
@@ -246,7 +246,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
@@ -342,7 +342,8 @@
 		"name": "པོ་ལེནཌ་ཀྱི་དངུལ ཛ྄ལོ་ཊི"
 	},
 	"PHP": {
-		"name": "ཕི་ལི་པིནས་གྱི་དངུལ་ པེ་སོ"
+		"name": "ཕི་ལི་པིནས་གྱི་དངུལ་ པེ་སོ",
+		"symbol": "₱"
 	},
 	"BMD": {
 		"name": "བར་མུ་ཌ་གི་དངུལ་ ཌོ་ལར"
diff --git a/vendor/commerceguys/intl/resources/currency/el.json b/vendor/commerceguys/intl/resources/currency/el.json
index d67d56947..5121f9056 100644
--- a/vendor/commerceguys/intl/resources/currency/el.json
+++ b/vendor/commerceguys/intl/resources/currency/el.json
@@ -478,7 +478,7 @@
 	},
 	"XOF": {
 		"name": "Φ�άγκο CFA Δυτικής Αφ�ικής",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Φ�άγκο CFA Κεντ�ικής Αφ�ικής",
diff --git a/vendor/commerceguys/intl/resources/currency/en-001.json b/vendor/commerceguys/intl/resources/currency/en-001.json
index ce24303cf..ac353e93d 100644
--- a/vendor/commerceguys/intl/resources/currency/en-001.json
+++ b/vendor/commerceguys/intl/resources/currency/en-001.json
@@ -46,7 +46,7 @@
 		"name": "Belize Dollar"
 	},
 	"BMD": {
-		"name": "Bermudan Dollar"
+		"name": "Bermudian Dollar"
 	},
 	"BTN": {
 		"name": "Bhutanese Ngultrum"
@@ -343,7 +343,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Peso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -482,7 +483,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/en-AU.json b/vendor/commerceguys/intl/resources/currency/en-AU.json
index 5749df5d9..f750967bd 100644
--- a/vendor/commerceguys/intl/resources/currency/en-AU.json
+++ b/vendor/commerceguys/intl/resources/currency/en-AU.json
@@ -332,7 +332,7 @@
 		"name": "Peso Uruguayo"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Peso"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
diff --git a/vendor/commerceguys/intl/resources/currency/en-GG.json b/vendor/commerceguys/intl/resources/currency/en-GG.json
index 785d94390..7465255a3 100644
--- a/vendor/commerceguys/intl/resources/currency/en-GG.json
+++ b/vendor/commerceguys/intl/resources/currency/en-GG.json
@@ -46,7 +46,7 @@
 		"name": "Belize Dollar"
 	},
 	"BMD": {
-		"name": "Bermudan Dollar"
+		"name": "Bermudian Dollar"
 	},
 	"BTN": {
 		"name": "Bhutanese Ngultrum"
@@ -339,7 +339,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Peso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -482,7 +483,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/en-IM.json b/vendor/commerceguys/intl/resources/currency/en-IM.json
index 785d94390..7465255a3 100644
--- a/vendor/commerceguys/intl/resources/currency/en-IM.json
+++ b/vendor/commerceguys/intl/resources/currency/en-IM.json
@@ -46,7 +46,7 @@
 		"name": "Belize Dollar"
 	},
 	"BMD": {
-		"name": "Bermudan Dollar"
+		"name": "Bermudian Dollar"
 	},
 	"BTN": {
 		"name": "Bhutanese Ngultrum"
@@ -339,7 +339,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Peso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -482,7 +483,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/en-JE.json b/vendor/commerceguys/intl/resources/currency/en-JE.json
index 785d94390..7465255a3 100644
--- a/vendor/commerceguys/intl/resources/currency/en-JE.json
+++ b/vendor/commerceguys/intl/resources/currency/en-JE.json
@@ -46,7 +46,7 @@
 		"name": "Belize Dollar"
 	},
 	"BMD": {
-		"name": "Bermudan Dollar"
+		"name": "Bermudian Dollar"
 	},
 	"BTN": {
 		"name": "Bhutanese Ngultrum"
@@ -339,7 +339,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Peso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -482,7 +483,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/en.json b/vendor/commerceguys/intl/resources/currency/en.json
index a6c443334..c4921b070 100644
--- a/vendor/commerceguys/intl/resources/currency/en.json
+++ b/vendor/commerceguys/intl/resources/currency/en.json
@@ -343,7 +343,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Piso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -482,7 +483,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/es-US.json b/vendor/commerceguys/intl/resources/currency/es-US.json
index e9409dd1c..57623ac3d 100644
--- a/vendor/commerceguys/intl/resources/currency/es-US.json
+++ b/vendor/commerceguys/intl/resources/currency/es-US.json
@@ -12,7 +12,7 @@
 		"name": "bat"
 	},
 	"ETB": {
-		"name": "bir"
+		"name": "birr"
 	},
 	"VES": {
 		"name": "bolívar venezolano"
@@ -96,7 +96,7 @@
 		"name": "dírham marroquí"
 	},
 	"STN": {
-		"name": "dobra santotomense"
+		"name": "dobra"
 	},
 	"AUD": {
 		"name": "dólar australiano"
@@ -434,7 +434,7 @@
 		"name": "sol peruano"
 	},
 	"KGS": {
-		"name": "som kirguís"
+		"name": "som"
 	},
 	"TJS": {
 		"name": "somoni tayiko"
diff --git a/vendor/commerceguys/intl/resources/currency/es.json b/vendor/commerceguys/intl/resources/currency/es.json
index a9902c411..09b1b640c 100644
--- a/vendor/commerceguys/intl/resources/currency/es.json
+++ b/vendor/commerceguys/intl/resources/currency/es.json
@@ -43,7 +43,7 @@
 		"name": "colón salvadoreño"
 	},
 	"NIO": {
-		"name": "córdoba nicaragüense"
+		"name": "córdoba oro"
 	},
 	"CZK": {
 		"name": "corona checa"
@@ -111,15 +111,14 @@
 	"BZD": {
 		"name": "dólar beliceño"
 	},
+	"BMD": {
+		"name": "dólar bermudeño"
+	},
 	"BND": {
 		"name": "dólar bruneano"
 	},
 	"CAD": {
-		"name": "dólar canadiense",
-		"symbol": "CA$"
-	},
-	"BMD": {
-		"name": "dólar de Bermudas"
+		"name": "dólar canadiense"
 	},
 	"KYD": {
 		"name": "dólar de las Islas Caimán"
@@ -184,12 +183,12 @@
 		"name": "euro",
 		"symbol": "€"
 	},
+	"ANG": {
+		"name": "florín antillano"
+	},
 	"AWG": {
 		"name": "florín arubeño"
 	},
-	"ANG": {
-		"name": "florín de las Antillas Neerlandesas"
-	},
 	"HUF": {
 		"name": "forinto húngaro"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/et.json b/vendor/commerceguys/intl/resources/currency/et.json
index 59d5fea56..e39b6c2f3 100644
--- a/vendor/commerceguys/intl/resources/currency/et.json
+++ b/vendor/commerceguys/intl/resources/currency/et.json
@@ -263,7 +263,7 @@
 	},
 	"XOF": {
 		"name": "Lääne-Aafrika CFA frank",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"MOP": {
 		"name": "Macau pataaka"
diff --git a/vendor/commerceguys/intl/resources/currency/eu.json b/vendor/commerceguys/intl/resources/currency/eu.json
index 2a3c2ce6c..88ce30f63 100644
--- a/vendor/commerceguys/intl/resources/currency/eu.json
+++ b/vendor/commerceguys/intl/resources/currency/eu.json
@@ -8,7 +8,7 @@
 	},
 	"XOF": {
 		"name": "Afrika mendebaldeko CFA frankoa",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"AED": {
 		"name": "Arabiar Emirerri Batuetako dirhama"
@@ -40,7 +40,7 @@
 		"symbol": "CFPF"
 	},
 	"NIO": {
-		"name": "córdoba nikaraguarra"
+		"name": "cordoba nikaraguarra"
 	},
 	"CRC": {
 		"name": "Costa Ricako colona"
@@ -114,6 +114,9 @@
 		"name": "dolar hongkongtarra",
 		"symbol": "HK$"
 	},
+	"JMD": {
+		"name": "dolar jamaikarra"
+	},
 	"KYD": {
 		"name": "dolar kaimandarra"
 	},
@@ -168,9 +171,6 @@
 	"IDR": {
 		"name": "errupia indonesiarra"
 	},
-	"MVR": {
-		"name": "errupia maldivarra"
-	},
 	"MUR": {
 		"name": "errupia mauriziarra"
 	},
@@ -229,8 +229,8 @@
 	"ANG": {
 		"name": "Holandarren Antilletako florina"
 	},
-	"JMD": {
-		"name": "Jamaikako dolarra"
+	"UAH": {
+		"name": "hryvnia ukrainarra"
 	},
 	"XCD": {
 		"name": "Karibe ekialdeko dolarra",
@@ -351,6 +351,9 @@
 	"BTN": {
 		"name": "ngultrum bhutandarra"
 	},
+	"TOP": {
+		"name": "paʻanga tongatarra"
+	},
 	"MOP": {
 		"name": "pataca macauarra"
 	},
@@ -409,6 +412,9 @@
 	"SAR": {
 		"name": "riyal saudiarabiarra"
 	},
+	"MVR": {
+		"name": "rufiyaa maldivarra"
+	},
 	"SVC": {
 		"name": "Salvadoran Colón"
 	},
@@ -440,9 +446,6 @@
 	"KZT": {
 		"name": "tenge kazakhstandarra"
 	},
-	"TOP": {
-		"name": "Tongako Paʻanga"
-	},
 	"TTD": {
 		"name": "Trinidad eta Tobagoko dolarra"
 	},
@@ -464,9 +467,6 @@
 	"MRU": {
 		"name": "uguiya mauritaniarra"
 	},
-	"UAH": {
-		"name": "Ukrainako hryvnia"
-	},
 	"UYW": {
 		"name": "Uruguayan Nominal Wage Index Unit"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/fa-AF.json b/vendor/commerceguys/intl/resources/currency/fa-AF.json
index c477c916e..276cb4211 100644
--- a/vendor/commerceguys/intl/resources/currency/fa-AF.json
+++ b/vendor/commerceguys/intl/resources/currency/fa-AF.json
@@ -345,7 +345,7 @@
 	},
 	"XOF": {
 		"name": "�رانک CFA غرب ا�ریقا",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "�رانک CFA مرکز ا�ریقا",
diff --git a/vendor/commerceguys/intl/resources/currency/fa.json b/vendor/commerceguys/intl/resources/currency/fa.json
index a1d6c3a7c..d8f5535b4 100644
--- a/vendor/commerceguys/intl/resources/currency/fa.json
+++ b/vendor/commerceguys/intl/resources/currency/fa.json
@@ -345,7 +345,7 @@
 	},
 	"XOF": {
 		"name": "�رانک CFA غرب ا�ریقا",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "�رانک CFA مرکز ا�ریقا",
diff --git a/vendor/commerceguys/intl/resources/currency/fi.json b/vendor/commerceguys/intl/resources/currency/fi.json
index cb9faf1c6..abaeef912 100644
--- a/vendor/commerceguys/intl/resources/currency/fi.json
+++ b/vendor/commerceguys/intl/resources/currency/fi.json
@@ -79,7 +79,7 @@
 	},
 	"XOF": {
 		"name": "CFA-frangi BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA-frangi BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/fil.json b/vendor/commerceguys/intl/resources/currency/fil.json
index 0d73bae4e..1ee6f2ac3 100644
--- a/vendor/commerceguys/intl/resources/currency/fil.json
+++ b/vendor/commerceguys/intl/resources/currency/fil.json
@@ -69,7 +69,7 @@
 	},
 	"XOF": {
 		"name": "CFA Franc ng Kanlurang Africa",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "CFP Franc",
@@ -403,7 +403,7 @@
 		"name": "Samoan Tala"
 	},
 	"STN": {
-		"name": "São Tomé & Príncipe Dobra (2018)"
+		"name": "São Tomé & Príncipe Dobra"
 	},
 	"SAR": {
 		"name": "Saudi Riyal"
diff --git a/vendor/commerceguys/intl/resources/currency/fr-CA.json b/vendor/commerceguys/intl/resources/currency/fr-CA.json
index a257ad79a..74340acbf 100644
--- a/vendor/commerceguys/intl/resources/currency/fr-CA.json
+++ b/vendor/commerceguys/intl/resources/currency/fr-CA.json
@@ -107,7 +107,7 @@
 	},
 	"CAD": {
 		"name": "dollar canadien",
-		"symbol": "$"
+		"symbol": "$ CA"
 	},
 	"HKD": {
 		"name": "dollar de Hong Kong",
@@ -271,7 +271,7 @@
 		"name": "livre de Sainte-Hélène"
 	},
 	"FKP": {
-		"name": "livre des ÃŽles Malouines"
+		"name": "livre des îles Malouines"
 	},
 	"EGP": {
 		"name": "livre égyptienne"
diff --git a/vendor/commerceguys/intl/resources/currency/fr.json b/vendor/commerceguys/intl/resources/currency/fr.json
index e1b57a8a5..610c689f4 100644
--- a/vendor/commerceguys/intl/resources/currency/fr.json
+++ b/vendor/commerceguys/intl/resources/currency/fr.json
@@ -119,6 +119,10 @@
 		"name": "dollar de Singapour",
 		"symbol": "$SG"
 	},
+	"TTD": {
+		"name": "dollar de Trinité-et-Tobago",
+		"symbol": "$TT"
+	},
 	"XCD": {
 		"name": "dollar des Caraïbes orientales"
 	},
@@ -158,10 +162,6 @@
 		"name": "dollar surinamais",
 		"symbol": "$SR"
 	},
-	"TTD": {
-		"name": "dollar trinidadien",
-		"symbol": "$TT"
-	},
 	"ZWL": {
 		"name": "dollar zimbabwéen (2009)"
 	},
@@ -193,7 +193,7 @@
 	},
 	"XOF": {
 		"name": "franc CFA (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franc CFA (BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/ga.json b/vendor/commerceguys/intl/resources/currency/ga.json
index cc18a81d6..6b3423e81 100644
--- a/vendor/commerceguys/intl/resources/currency/ga.json
+++ b/vendor/commerceguys/intl/resources/currency/ga.json
@@ -179,7 +179,7 @@
 	},
 	"XOF": {
 		"name": "Franc CFA Iarthar na hAfraice",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Franc CFA na hAfraice Láir",
@@ -323,7 +323,8 @@
 		"name": "Peso na hAirgintíne"
 	},
 	"PHP": {
-		"name": "Peso na nOileán Filipíneach"
+		"name": "Peso na nOileán Filipíneach",
+		"symbol": "₱"
 	},
 	"DOP": {
 		"name": "Peso na Poblachta Doiminicí"
diff --git a/vendor/commerceguys/intl/resources/currency/gd.json b/vendor/commerceguys/intl/resources/currency/gd.json
index 8d76692e6..78252d8fd 100644
--- a/vendor/commerceguys/intl/resources/currency/gd.json
+++ b/vendor/commerceguys/intl/resources/currency/gd.json
@@ -3,7 +3,7 @@
 		"name": "Afghani Afghanach"
 	},
 	"UYW": {
-		"name": "aonad inneacs tuarastail ainmeach Uruguaidh"
+		"name": "Aonad inneacs tuarastail ainmeach Uruguaidh"
 	},
 	"MGA": {
 		"name": "Ariary Madagasgarach"
@@ -176,7 +176,7 @@
 	},
 	"XOF": {
 		"name": "Franc CFA Afraga an Iar",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Franc CFA Meadhan-Afragach",
diff --git a/vendor/commerceguys/intl/resources/currency/gl.json b/vendor/commerceguys/intl/resources/currency/gl.json
index 6beec93ba..38bb5763e 100644
--- a/vendor/commerceguys/intl/resources/currency/gl.json
+++ b/vendor/commerceguys/intl/resources/currency/gl.json
@@ -183,7 +183,7 @@
 	},
 	"XOF": {
 		"name": "franco CFA (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franco CFA (BEAC)",
@@ -262,7 +262,7 @@
 		"name": "leone de Serra Leoa"
 	},
 	"MDL": {
-		"name": "Leu moldavo"
+		"name": "leu moldavo"
 	},
 	"RON": {
 		"name": "leu romanés"
@@ -299,7 +299,7 @@
 		"name": "libra xibraltareña"
 	},
 	"SZL": {
-		"name": "lilangeni de Eswatini"
+		"name": "lilangeni de Swazilandia"
 	},
 	"TRY": {
 		"name": "lira turca"
diff --git a/vendor/commerceguys/intl/resources/currency/gsw.json b/vendor/commerceguys/intl/resources/currency/gsw.json
index f3c415c01..9e6f2c866 100644
--- a/vendor/commerceguys/intl/resources/currency/gsw.json
+++ b/vendor/commerceguys/intl/resources/currency/gsw.json
@@ -79,7 +79,7 @@
 	},
 	"XOF": {
 		"name": "CFA-Franc (Wescht)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "CFP-Franc",
@@ -333,7 +333,8 @@
 		"symbol": "£"
 	},
 	"PHP": {
-		"name": "Philippiinische Peso"
+		"name": "Philippiinische Peso",
+		"symbol": "₱"
 	},
 	"GTQ": {
 		"name": "Quetzal"
diff --git a/vendor/commerceguys/intl/resources/currency/gu.json b/vendor/commerceguys/intl/resources/currency/gu.json
index 3a22f3e43..607bf1493 100644
--- a/vendor/commerceguys/intl/resources/currency/gu.json
+++ b/vendor/commerceguys/intl/resources/currency/gu.json
@@ -243,7 +243,7 @@
 	},
 	"XOF": {
 		"name": "પશ�ચિમી આફ�રિકન [CFA] ફ�રેંક",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "પાકિસ�તાની રૂપી"
diff --git a/vendor/commerceguys/intl/resources/currency/he.json b/vendor/commerceguys/intl/resources/currency/he.json
index 1b058ceb9..b659e20e8 100644
--- a/vendor/commerceguys/intl/resources/currency/he.json
+++ b/vendor/commerceguys/intl/resources/currency/he.json
@@ -371,7 +371,7 @@
 	},
 	"XOF": {
 		"name": "פרנק CFA מערב �פריקני",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "פרנק CFA מרכז �פריקני",
diff --git a/vendor/commerceguys/intl/resources/currency/hi.json b/vendor/commerceguys/intl/resources/currency/hi.json
index c8e72bca4..87a55d02a 100644
--- a/vendor/commerceguys/intl/resources/currency/hi.json
+++ b/vendor/commerceguys/intl/resources/currency/hi.json
@@ -237,7 +237,7 @@
 	},
 	"XOF": {
 		"name": "पश�चिमी अफ़�रीकी CFA फ़�रैंक",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "पाकिस�तानी र�पया"
diff --git a/vendor/commerceguys/intl/resources/currency/hr.json b/vendor/commerceguys/intl/resources/currency/hr.json
index e92749979..7ff996417 100644
--- a/vendor/commerceguys/intl/resources/currency/hr.json
+++ b/vendor/commerceguys/intl/resources/currency/hr.json
@@ -76,7 +76,7 @@
 	},
 	"XOF": {
 		"name": "CFA franak BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA franak BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/hu.json b/vendor/commerceguys/intl/resources/currency/hu.json
index 88d37acec..7aed06a73 100644
--- a/vendor/commerceguys/intl/resources/currency/hu.json
+++ b/vendor/commerceguys/intl/resources/currency/hu.json
@@ -71,12 +71,9 @@
 	"BIF": {
 		"name": "burundi frank"
 	},
-	"CVE": {
-		"name": "Cape Verde-i escudo"
-	},
 	"XOF": {
 		"name": "CFA frank BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA frank BEAC",
@@ -477,5 +474,8 @@
 	},
 	"ZWL": {
 		"name": "Zimbabwei dollár (2009)"
+	},
+	"CVE": {
+		"name": "Zöld-foki escudo"
 	}
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/hy.json b/vendor/commerceguys/intl/resources/currency/hy.json
index c279de863..7eee595d2 100644
--- a/vendor/commerceguys/intl/resources/currency/hy.json
+++ b/vendor/commerceguys/intl/resources/currency/hy.json
@@ -34,7 +34,7 @@
 	},
 	"XOF": {
 		"name": "Ô±Ö€Ö‡Õ´Õ¿ÕµÕ¡Õ¶ Ô±Ö†Ö€Õ«Õ¯Õ¡ÕµÕ« Ô¿Õ–Ô± Ö†Ö€Õ¡Õ¶Õ¯",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"AFN": {
 		"name": "Õ¡Ö†Õ²Õ¡Õ¶Õ¡Õ¯Õ¡Õ¶ Õ¡Ö†Õ²Õ¡Õ¶Õ«"
diff --git a/vendor/commerceguys/intl/resources/currency/id.json b/vendor/commerceguys/intl/resources/currency/id.json
index 920a86971..1db96868f 100644
--- a/vendor/commerceguys/intl/resources/currency/id.json
+++ b/vendor/commerceguys/intl/resources/currency/id.json
@@ -40,7 +40,7 @@
 		"name": "Denar Makedonia"
 	},
 	"DZD": {
-		"name": "Dinar Algeria"
+		"name": "Dinar Aljazair"
 	},
 	"BHD": {
 		"name": "Dinar Bahrain"
@@ -172,11 +172,11 @@
 		"name": "Franc Burundi"
 	},
 	"XOF": {
-		"name": "Franc CFA BCEAO",
-		"symbol": "CFA"
+		"name": "Franc CFA Afrika Barat",
+		"symbol": "F CFA"
 	},
 	"XAF": {
-		"name": "Franc CFA BEAC",
+		"name": "Franc CFA Afrika Tengah",
 		"symbol": "FCFA"
 	},
 	"XPF": {
@@ -220,7 +220,7 @@
 		"name": "Kip Laos"
 	},
 	"CZK": {
-		"name": "Koruna Cheska"
+		"name": "Koruna Ceko"
 	},
 	"ISK": {
 		"name": "Krona Islandia"
@@ -283,7 +283,7 @@
 		"name": "Manat Azerbaijan"
 	},
 	"TMT": {
-		"name": "Manat Turkimenistan"
+		"name": "Manat Turkmenistan"
 	},
 	"BAM": {
 		"name": "Mark Konvertibel Bosnia-Herzegovina"
@@ -337,9 +337,6 @@
 	"UYU": {
 		"name": "Peso Uruguay"
 	},
-	"PLN": {
-		"name": "Polandia Zloty"
-	},
 	"GIP": {
 		"name": "Pound Gibraltar"
 	},
@@ -454,7 +451,7 @@
 		"name": "Sol Peru"
 	},
 	"KGS": {
-		"name": "Som Kirgistan"
+		"name": "Som Kirgizstan"
 	},
 	"UZS": {
 		"name": "Som Uzbekistan"
@@ -469,7 +466,7 @@
 		"name": "Tala Samoa"
 	},
 	"KZT": {
-		"name": "Tenge Kazakstan"
+		"name": "Tenge Kazakhstan"
 	},
 	"MNT": {
 		"name": "Tugrik Mongolia"
@@ -494,5 +491,8 @@
 	"CNY": {
 		"name": "Yuan Tiongkok",
 		"symbol": "CNÂ¥"
+	},
+	"PLN": {
+		"name": "Zloty Polandia"
 	}
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/is.json b/vendor/commerceguys/intl/resources/currency/is.json
index 0cf39e5a6..a6117f1ca 100644
--- a/vendor/commerceguys/intl/resources/currency/is.json
+++ b/vendor/commerceguys/intl/resources/currency/is.json
@@ -302,7 +302,7 @@
 		"name": "nígerísk næra"
 	},
 	"NIO": {
-		"name": "níkaraögsk kordóva"
+		"name": "níkarögsk kordóva"
 	},
 	"KPW": {
 		"name": "norðurkóreskt vonn"
@@ -473,7 +473,7 @@
 	},
 	"XOF": {
 		"name": "vesturafrískur franki",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"VND": {
 		"name": "víetnamskt dong"
diff --git a/vendor/commerceguys/intl/resources/currency/it.json b/vendor/commerceguys/intl/resources/currency/it.json
index 16c75b6de..39aff7e37 100644
--- a/vendor/commerceguys/intl/resources/currency/it.json
+++ b/vendor/commerceguys/intl/resources/currency/it.json
@@ -51,9 +51,6 @@
 	"GMD": {
 		"name": "dalasi gambiano"
 	},
-	"MKD": {
-		"name": "denar macedone"
-	},
 	"DZD": {
 		"name": "dinaro algerino"
 	},
@@ -72,6 +69,9 @@
 	"LYD": {
 		"name": "dinaro libico"
 	},
+	"MKD": {
+		"name": "dinaro macedone"
+	},
 	"RSD": {
 		"name": "dinaro serbo"
 	},
@@ -158,8 +158,7 @@
 		"name": "dollaro zimbabwiano (2009)"
 	},
 	"VND": {
-		"name": "dong vietnamita",
-		"symbol": "â‚«"
+		"name": "dong vietnamita"
 	},
 	"AMD": {
 		"name": "dram armeno"
@@ -182,7 +181,7 @@
 	},
 	"XOF": {
 		"name": "franco CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franco CFA BEAC",
@@ -231,12 +230,12 @@
 	"HRK": {
 		"name": "kuna croata"
 	},
-	"ZMW": {
-		"name": "kwacha dello Zambia"
-	},
 	"MWK": {
 		"name": "kwacha malawiano"
 	},
+	"ZMW": {
+		"name": "kwacha zambiano"
+	},
 	"AOA": {
 		"name": "kwanza angolano"
 	},
@@ -335,7 +334,8 @@
 		"name": "peso dominicano"
 	},
 	"PHP": {
-		"name": "peso filippino"
+		"name": "peso filippino",
+		"symbol": "₱"
 	},
 	"MXN": {
 		"name": "peso messicano"
@@ -396,8 +396,7 @@
 		"name": "rupia di Sri Lanka"
 	},
 	"INR": {
-		"name": "rupia indiana",
-		"symbol": "₹"
+		"name": "rupia indiana"
 	},
 	"IDR": {
 		"name": "rupia indonesiana"
diff --git a/vendor/commerceguys/intl/resources/currency/ja.json b/vendor/commerceguys/intl/resources/currency/ja.json
index 326926e46..aa0d4cc72 100644
--- a/vendor/commerceguys/intl/resources/currency/ja.json
+++ b/vendor/commerceguys/intl/resources/currency/ja.json
@@ -25,7 +25,7 @@
 		"name": "アルゼン�ン ペソ"
 	},
 	"AWG": {
-		"name": "アル� ギルダー"
+		"name": "アル� フロリン"
 	},
 	"ALL": {
 		"name": "アル�ニア レク"
@@ -462,7 +462,7 @@
 	},
 	"XOF": {
 		"name": "西アフリカ CFA フラン",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "中央アフリカ CFA フラン",
diff --git a/vendor/commerceguys/intl/resources/currency/ka.json b/vendor/commerceguys/intl/resources/currency/ka.json
index 5f44bcb11..635a4c852 100644
--- a/vendor/commerceguys/intl/resources/currency/ka.json
+++ b/vendor/commerceguys/intl/resources/currency/ka.json
@@ -113,7 +113,7 @@
 	},
 	"XOF": {
 		"name": "დ�ს�ვლეთ �ფრიკული CFA ფრ�ნკი",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"DOP": {
 		"name": "დ�მინიკური პეს�"
@@ -281,7 +281,7 @@
 		"name": "ნიდერლ�ნდების �ნტილების გულდენი"
 	},
 	"NIO": {
-		"name": "ნიკ�რ�გუული კ�რდ�ბ�"
+		"name": "ნიკ�რ�გუ�ს �ქრ�ს კ�რდ�ბ�"
 	},
 	"NOK": {
 		"name": "ნ�რვეგიული კრ�ნ�"
diff --git a/vendor/commerceguys/intl/resources/currency/kk.json b/vendor/commerceguys/intl/resources/currency/kk.json
index add9dded9..61076f187 100644
--- a/vendor/commerceguys/intl/resources/currency/kk.json
+++ b/vendor/commerceguys/intl/resources/currency/kk.json
@@ -227,7 +227,7 @@
 	},
 	"XOF": {
 		"name": "КФ� ВСЕ�О франкі",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "КФП франкі",
diff --git a/vendor/commerceguys/intl/resources/currency/km.json b/vendor/commerceguys/intl/resources/currency/km.json
index 90edab51a..ac93071c2 100644
--- a/vendor/commerceguys/intl/resources/currency/km.json
+++ b/vendor/commerceguys/intl/resources/currency/km.json
@@ -27,7 +27,7 @@
 		"name": "ក្វាន់ហ្សា​អង់ហ្គោឡា"
 	},
 	"NIO": {
-		"name": "�ឌូបា​នីការ៉ាហ្គា"
+		"name": "�ឌូបា​នីការ៉ាហ្កា"
 	},
 	"PGK": {
 		"name": "គីណាប៉ាពួញូហ្គីណ�"
@@ -98,7 +98,7 @@
 		"name": "ដុល្លារ​ប�លី"
 	},
 	"BND": {
-		"name": "ដុល្លារ​ប្រុយណ�"
+		"name": "ដុល្លារព្រុយណ�"
 	},
 	"LRD": {
 		"name": "ដុល្លារ​លីប៊ី"
@@ -281,7 +281,7 @@
 		"name": "មីទី�ល​ម៉ូសំប៊ិក"
 	},
 	"CNY": {
-		"name": "យ៉ន់​ចិន",
+		"name": "យ�នចិន",
 		"symbol": "CNÂ¥"
 	},
 	"JPY": {
@@ -431,7 +431,7 @@
 	},
 	"XOF": {
 		"name": "ហ្វ្រង់ CFA អាហ្វ្រិក�ាងលិច",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "ហ្វ្រង់ CFP",
diff --git a/vendor/commerceguys/intl/resources/currency/ko.json b/vendor/commerceguys/intl/resources/currency/ko.json
index 7348a3378..d8eadf5bd 100644
--- a/vendor/commerceguys/intl/resources/currency/ko.json
+++ b/vendor/commerceguys/intl/resources/currency/ko.json
@@ -194,7 +194,7 @@
 	},
 	"XOF": {
 		"name": "서아프리카 CFA 프랑",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"RSD": {
 		"name": "세르비아 디나르"
@@ -284,6 +284,10 @@
 	"SVC": {
 		"name": "엘살바�르 콜론"
 	},
+	"GBP": {
+		"name": "�국 파운드",
+		"symbol": "£"
+	},
 	"YER": {
 		"name": "예멘 리알"
 	},
@@ -447,10 +451,6 @@
 	"PYG": {
 		"name": "파�과� 과�니"
 	},
-	"GBP": {
-		"name": "파운드",
-		"symbol": "£"
-	},
 	"PKR": {
 		"name": "파키스탄 루피"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/kok.json b/vendor/commerceguys/intl/resources/currency/kok.json
index eaa4b0d47..e43f429fb 100644
--- a/vendor/commerceguys/intl/resources/currency/kok.json
+++ b/vendor/commerceguys/intl/resources/currency/kok.json
@@ -25,7 +25,7 @@
 	},
 	"XOF": {
 		"name": "अस�तंत आफ�रिकी सी�फ� फ�र�क",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ISK": {
 		"name": "आईस�लान�डिक क�रोना"
diff --git a/vendor/commerceguys/intl/resources/currency/ks.json b/vendor/commerceguys/intl/resources/currency/ks.json
index 86c5cc5b6..a6b0f71b5 100644
--- a/vendor/commerceguys/intl/resources/currency/ks.json
+++ b/vendor/commerceguys/intl/resources/currency/ks.json
@@ -151,7 +151,8 @@
 		"name": "پٔریوٗو�یَن سولٕز"
 	},
 	"PHP": {
-		"name": "پھ�ل�پای�ٔن پؠسو"
+		"name": "پھ�ل�پای�ٔن پؠسو",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "پول�ش زلوٹی"
@@ -292,7 +293,7 @@
 	},
 	"XOF": {
 		"name": "سی ای� اے �رینک بی سی ایٖ اے او",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "سی ای� پی �رینک",
diff --git a/vendor/commerceguys/intl/resources/currency/ky.json b/vendor/commerceguys/intl/resources/currency/ky.json
index ef77c6a32..f78b00403 100644
--- a/vendor/commerceguys/intl/resources/currency/ky.json
+++ b/vendor/commerceguys/intl/resources/currency/ky.json
@@ -221,7 +221,7 @@
 	},
 	"XOF": {
 		"name": "КФ� франкы",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "КФП франкы",
@@ -402,7 +402,7 @@
 		"name": "туни� динары"
 	},
 	"KPW": {
-		"name": "Түндүк Коре� уону"
+		"name": "Түндүк Коре� вону"
 	},
 	"TRY": {
 		"name": "Түрки� лира�ы"
@@ -414,7 +414,7 @@
 		"name": "Түштүк �фрика ранды"
 	},
 	"KRW": {
-		"name": "Түштүк Коре� уону"
+		"name": "Түштүк Коре� вону"
 	},
 	"SSP": {
 		"name": "Түштүк Судан фунту"
diff --git a/vendor/commerceguys/intl/resources/currency/lb.json b/vendor/commerceguys/intl/resources/currency/lb.json
index 254295146..d875fb0b8 100644
--- a/vendor/commerceguys/intl/resources/currency/lb.json
+++ b/vendor/commerceguys/intl/resources/currency/lb.json
@@ -79,7 +79,7 @@
 	},
 	"XOF": {
 		"name": "CFA-Frang (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA-Frang (BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/lo.json b/vendor/commerceguys/intl/resources/currency/lo.json
index ff18da6b5..91e478ab6 100644
--- a/vendor/commerceguys/intl/resources/currency/lo.json
+++ b/vendor/commerceguys/intl/resources/currency/lo.json
@@ -306,7 +306,7 @@
 	},
 	"XOF": {
 		"name": "ຟັງເຊຟານ ອາຟຣິ�າຕາເວັນຕົ�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"FJD": {
 		"name": "ຟິ​ຈຽນ ໂດ​ລ່າ"
diff --git a/vendor/commerceguys/intl/resources/currency/lv.json b/vendor/commerceguys/intl/resources/currency/lv.json
index 299ace7a4..25da2109c 100644
--- a/vendor/commerceguys/intl/resources/currency/lv.json
+++ b/vendor/commerceguys/intl/resources/currency/lv.json
@@ -366,7 +366,7 @@
 	},
 	"XOF": {
 		"name": "Rietum�frikas CFA franks",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"RWF": {
 		"name": "Ruandas franks"
diff --git a/vendor/commerceguys/intl/resources/currency/mg.json b/vendor/commerceguys/intl/resources/currency/mg.json
index bfe45e63f..8e24c9644 100644
--- a/vendor/commerceguys/intl/resources/currency/mg.json
+++ b/vendor/commerceguys/intl/resources/currency/mg.json
@@ -162,7 +162,7 @@
 	},
 	"XOF": {
 		"name": "Farantsa CFA (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Farantsa CFA (BEAC)",
@@ -358,7 +358,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Piso",
+		"symbol": "₱"
 	},
 	"BWP": {
 		"name": "Pola botsoaney"
diff --git a/vendor/commerceguys/intl/resources/currency/mk.json b/vendor/commerceguys/intl/resources/currency/mk.json
index 675da11ce..cdc386c7d 100644
--- a/vendor/commerceguys/intl/resources/currency/mk.json
+++ b/vendor/commerceguys/intl/resources/currency/mk.json
@@ -115,9 +115,6 @@
 	"STN": {
 		"name": "Добра на Сао Томе и Прин�ипе"
 	},
-	"KYD": {
-		"name": "Долар на кајман�ки о�трови"
-	},
 	"TTD": {
 		"name": "Долар на Тринидад и Тобаго"
 	},
@@ -145,7 +142,7 @@
 	},
 	"XOF": {
 		"name": "Западноафрикан�ки франк",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"CVE": {
 		"name": "Зелено’рт�ки е�кудо"
@@ -169,7 +166,7 @@
 		"name": "И�ланд�ка крона"
 	},
 	"XCD": {
-		"name": "И�точно карип�ки долар",
+		"name": "И�точнокарип�ки долар",
 		"symbol": "EC$"
 	},
 	"JMD": {
@@ -196,6 +193,9 @@
 	"KZT": {
 		"name": "Казах�тан�ка тенга"
 	},
+	"KYD": {
+		"name": "Кајман�ки долар"
+	},
 	"KHR": {
 		"name": "Камбоџи�ки рел"
 	},
@@ -227,12 +227,12 @@
 	"CRC": {
 		"name": "Ко�тарикан�ки колон"
 	},
+	"CUC": {
+		"name": "Кубан�ки конвертибилен пезо�"
+	},
 	"CUP": {
 		"name": "Кубан�ки пезо�"
 	},
-	"CUC": {
-		"name": "Кубан�ки пезо� (конвертибилен)"
-	},
 	"KWD": {
 		"name": "Кувајт�ки динар"
 	},
@@ -271,7 +271,7 @@
 		"name": "Малага�и�ки ариари"
 	},
 	"MVR": {
-		"name": "Малдиви�ка руфија"
+		"name": "Малдив�ка руфија"
 	},
 	"MYR": {
 		"name": "Малези�ки рингит"
diff --git a/vendor/commerceguys/intl/resources/currency/ml.json b/vendor/commerceguys/intl/resources/currency/ml.json
index 1ac372c97..dbfde135e 100644
--- a/vendor/commerceguys/intl/resources/currency/ml.json
+++ b/vendor/commerceguys/intl/resources/currency/ml.json
@@ -249,7 +249,7 @@
 	},
 	"XOF": {
 		"name": "പശ�ചിമ ആഫ�രിക�കൻ [CFA] ഫ�രാങ�ക�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "പാക�കിസ�ഥാനി റ�പ�പീ"
diff --git a/vendor/commerceguys/intl/resources/currency/mn.json b/vendor/commerceguys/intl/resources/currency/mn.json
index 356d47506..c46ccc87a 100644
--- a/vendor/commerceguys/intl/resources/currency/mn.json
+++ b/vendor/commerceguys/intl/resources/currency/mn.json
@@ -48,7 +48,7 @@
 	},
 	"XOF": {
 		"name": "Баруун �фрикийн франк",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"BHD": {
 		"name": "Бахрейн динар"
diff --git a/vendor/commerceguys/intl/resources/currency/mr.json b/vendor/commerceguys/intl/resources/currency/mr.json
index 7cb16eb90..711015fb1 100644
--- a/vendor/commerceguys/intl/resources/currency/mr.json
+++ b/vendor/commerceguys/intl/resources/currency/mr.json
@@ -106,7 +106,7 @@
 		"name": "कोलंबियन पेसो"
 	},
 	"CRC": {
-		"name": "कोस�टा रिका कोलोन"
+		"name": "कोस�टारिकन कोलोन"
 	},
 	"CUP": {
 		"name": "क�यूबन पेसो"
@@ -239,7 +239,7 @@
 	},
 	"XOF": {
 		"name": "पश�चिम आफ�रिकन [CFA] फ�र�क",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "पाकिस�तानी र�पया"
diff --git a/vendor/commerceguys/intl/resources/currency/ms.json b/vendor/commerceguys/intl/resources/currency/ms.json
index e08b4e2b3..d4adc3f74 100644
--- a/vendor/commerceguys/intl/resources/currency/ms.json
+++ b/vendor/commerceguys/intl/resources/currency/ms.json
@@ -167,7 +167,7 @@
 	},
 	"XOF": {
 		"name": "Franc CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Franc CFA BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/my.json b/vendor/commerceguys/intl/resources/currency/my.json
index 09c403d7f..5d6cf2e24 100644
--- a/vendor/commerceguys/intl/resources/currency/my.json
+++ b/vendor/commerceguys/intl/resources/currency/my.json
@@ -272,7 +272,7 @@
 		"name": "ဘဟားမား ဒေါ်လာ"
 	},
 	"BBD": {
-		"name": "ဘာဘေးဒီယန်း ဒေါ်လာ"
+		"name": "ဘာဘေးဒိုးစ် ဒေါ်လာ"
 	},
 	"BMD": {
 		"name": "ဘာမြူဒါ ဒေါ်လာ"
@@ -407,7 +407,7 @@
 	},
 	"XOF": {
 		"name": "အနောက် အာဖရိက CFA ဖရန့်",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"USD": {
 		"name": "အမေရိကန် ဒေါ်လာ",
diff --git a/vendor/commerceguys/intl/resources/currency/nb.json b/vendor/commerceguys/intl/resources/currency/nb.json
index 2ee10b39f..bf461de2c 100644
--- a/vendor/commerceguys/intl/resources/currency/nb.json
+++ b/vendor/commerceguys/intl/resources/currency/nb.json
@@ -463,7 +463,7 @@
 	},
 	"XOF": {
 		"name": "vestafrikanske CFA-franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"VND": {
 		"name": "vietnamesiske dong"
diff --git a/vendor/commerceguys/intl/resources/currency/ne.json b/vendor/commerceguys/intl/resources/currency/ne.json
index 5e528a83b..4bda1ea35 100644
--- a/vendor/commerceguys/intl/resources/currency/ne.json
+++ b/vendor/commerceguys/intl/resources/currency/ne.json
@@ -437,7 +437,7 @@
 	},
 	"XOF": {
 		"name": "सी�फ�‌� फ�रान�क बीसीइ�ओ",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "सी�फ�‌पी फ�रान�क",
diff --git a/vendor/commerceguys/intl/resources/currency/nl.json b/vendor/commerceguys/intl/resources/currency/nl.json
index ec4117a89..d68be3398 100644
--- a/vendor/commerceguys/intl/resources/currency/nl.json
+++ b/vendor/commerceguys/intl/resources/currency/nl.json
@@ -40,6 +40,9 @@
 	"BBD": {
 		"name": "Barbadaanse dollar"
 	},
+	"BYN": {
+		"name": "Belarussische roebel"
+	},
 	"BZD": {
 		"name": "Belizaanse dollar"
 	},
@@ -87,7 +90,7 @@
 	},
 	"XOF": {
 		"name": "CFA-franc BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA-frank",
@@ -470,9 +473,6 @@
 		"name": "Vietnamese dong",
 		"symbol": "â‚«"
 	},
-	"BYN": {
-		"name": "Wit-Russische roebel"
-	},
 	"ZMW": {
 		"name": "Zambiaanse kwacha"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/nn.json b/vendor/commerceguys/intl/resources/currency/nn.json
index c80800fdf..9e90caf83 100644
--- a/vendor/commerceguys/intl/resources/currency/nn.json
+++ b/vendor/commerceguys/intl/resources/currency/nn.json
@@ -104,6 +104,9 @@
 	"ERN": {
 		"name": "eritreiske nakfa"
 	},
+	"SZL": {
+		"name": "eswatinisk lilangeni"
+	},
 	"ETB": {
 		"name": "etiopiske birr"
 	},
@@ -165,9 +168,6 @@
 	"ISK": {
 		"name": "islandske kroner"
 	},
-	"ILS": {
-		"name": "israelske nye sheklar"
-	},
 	"JMD": {
 		"name": "jamaikanske dollar"
 	},
@@ -225,9 +225,6 @@
 	"KWD": {
 		"name": "kuwaitiske dinarar"
 	},
-	"BYN": {
-		"name": "kviterussiske rublar"
-	},
 	"LAK": {
 		"name": "laotiske kip"
 	},
@@ -268,7 +265,7 @@
 		"name": "mauritanske ouguiya"
 	},
 	"MUR": {
-		"name": "mauritanske rupiar"
+		"name": "mauritiske rupiar"
 	},
 	"MXN": {
 		"name": "meksikanske pesos"
@@ -307,6 +304,12 @@
 		"name": "norske kroner",
 		"symbol": "kr"
 	},
+	"ILS": {
+		"name": "nye israelske sheklar"
+	},
+	"BYN": {
+		"name": "nye kviterussiske rublar"
+	},
 	"TWD": {
 		"name": "nye taiwanske dollar"
 	},
@@ -397,9 +400,6 @@
 	"SEK": {
 		"name": "svenske kroner"
 	},
-	"SZL": {
-		"name": "swazilandske lilangeni"
-	},
 	"SYP": {
 		"name": "syriske pund"
 	},
@@ -465,7 +465,7 @@
 	},
 	"XOF": {
 		"name": "vestafrikanske CFA-franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"VND": {
 		"name": "vietnamesiske dong"
@@ -474,6 +474,6 @@
 		"name": "zambiske kwacha"
 	},
 	"ZWL": {
-		"name": "Zimbabwean Dollar (2009)"
+		"name": "zimbabwisk dollar (2009)"
 	}
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/no.json b/vendor/commerceguys/intl/resources/currency/no.json
new file mode 100644
index 000000000..bf461de2c
--- /dev/null
+++ b/vendor/commerceguys/intl/resources/currency/no.json
@@ -0,0 +1,480 @@
+{
+	"AFN": {
+		"name": "afghanske afghani"
+	},
+	"ALL": {
+		"name": "albanske lek"
+	},
+	"DZD": {
+		"name": "algeriske dinarer"
+	},
+	"USD": {
+		"name": "amerikanske dollar"
+	},
+	"AOA": {
+		"name": "angolanske kwanza"
+	},
+	"ARS": {
+		"name": "argentinske pesos"
+	},
+	"AMD": {
+		"name": "armenske dram"
+	},
+	"AWG": {
+		"name": "arubiske floriner"
+	},
+	"AZN": {
+		"name": "aserbajdsjanske manat"
+	},
+	"AUD": {
+		"name": "australske dollar"
+	},
+	"BSD": {
+		"name": "bahamanske dollar"
+	},
+	"BHD": {
+		"name": "bahrainske dinarer"
+	},
+	"BDT": {
+		"name": "bangladeshiske taka"
+	},
+	"BBD": {
+		"name": "barbadiske dollar"
+	},
+	"BZD": {
+		"name": "beliziske dollar"
+	},
+	"BMD": {
+		"name": "bermudiske dollar"
+	},
+	"BTN": {
+		"name": "bhutanske ngultrum"
+	},
+	"BOB": {
+		"name": "bolivianske boliviano"
+	},
+	"BAM": {
+		"name": "bosnisk-hercegovinske konvertible mark"
+	},
+	"BWP": {
+		"name": "botswanske pula"
+	},
+	"BRL": {
+		"name": "brasilianske real"
+	},
+	"GBP": {
+		"name": "britiske pund",
+		"symbol": "£"
+	},
+	"BND": {
+		"name": "bruneiske dollar"
+	},
+	"BGN": {
+		"name": "bulgarske lev"
+	},
+	"BIF": {
+		"name": "burundiske franc"
+	},
+	"KYD": {
+		"name": "caymanske dollar"
+	},
+	"XPF": {
+		"name": "CFP-franc"
+	},
+	"CLP": {
+		"name": "chilenske pesos"
+	},
+	"COP": {
+		"name": "colombianske pesos"
+	},
+	"CRC": {
+		"name": "costaricanske colón"
+	},
+	"DKK": {
+		"name": "danske kroner"
+	},
+	"DJF": {
+		"name": "djiboutiske franc"
+	},
+	"DOP": {
+		"name": "dominikanske pesos"
+	},
+	"EGP": {
+		"name": "egyptiske pund"
+	},
+	"AED": {
+		"name": "emiratarabiske dirham"
+	},
+	"ERN": {
+		"name": "eritreiske nakfa"
+	},
+	"ETB": {
+		"name": "etiopiske birr"
+	},
+	"EUR": {
+		"name": "euro",
+		"symbol": "€"
+	},
+	"FKP": {
+		"name": "falklandspund"
+	},
+	"FJD": {
+		"name": "fijianske dollar"
+	},
+	"PHP": {
+		"name": "filippinske pesos"
+	},
+	"GMD": {
+		"name": "gambiske dalasi"
+	},
+	"GEL": {
+		"name": "georgiske lari"
+	},
+	"GHS": {
+		"name": "ghanesiske cedi"
+	},
+	"GIP": {
+		"name": "gibraltarske pund"
+	},
+	"GTQ": {
+		"name": "guatemalanske quetzal"
+	},
+	"GNF": {
+		"name": "guineanske franc"
+	},
+	"GYD": {
+		"name": "guyanske dollar"
+	},
+	"HTG": {
+		"name": "haitiske gourde"
+	},
+	"HNL": {
+		"name": "honduranske lempira"
+	},
+	"HKD": {
+		"name": "Hongkong-dollar"
+	},
+	"INR": {
+		"name": "indiske rupier"
+	},
+	"IDR": {
+		"name": "indonesiske rupier"
+	},
+	"IQD": {
+		"name": "irakske dinarer"
+	},
+	"IRR": {
+		"name": "iranske rialer"
+	},
+	"ISK": {
+		"name": "islandske kroner"
+	},
+	"JMD": {
+		"name": "jamaikanske dollar"
+	},
+	"JPY": {
+		"name": "japanske yen"
+	},
+	"YER": {
+		"name": "jemenittiske rialer"
+	},
+	"JOD": {
+		"name": "jordanske dinarer"
+	},
+	"KHR": {
+		"name": "kambodsjanske riel"
+	},
+	"CAD": {
+		"name": "kanadiske dollar"
+	},
+	"CVE": {
+		"name": "kappverdiske escudos"
+	},
+	"KZT": {
+		"name": "kasakhstanske tenge"
+	},
+	"KES": {
+		"name": "kenyanske shilling"
+	},
+	"CNY": {
+		"name": "kinesiske yuan"
+	},
+	"KGS": {
+		"name": "kirgisiske som"
+	},
+	"KMF": {
+		"name": "komoriske franc"
+	},
+	"CDF": {
+		"name": "kongolesiske franc"
+	},
+	"HRK": {
+		"name": "kroatiske kuna"
+	},
+	"CUC": {
+		"name": "kubanske konvertible pesos"
+	},
+	"CUP": {
+		"name": "kubanske pesos"
+	},
+	"KWD": {
+		"name": "kuwaitiske dinarer"
+	},
+	"LAK": {
+		"name": "laotiske kip"
+	},
+	"LSL": {
+		"name": "lesothiske loti"
+	},
+	"LBP": {
+		"name": "libanesiske pund"
+	},
+	"LRD": {
+		"name": "liberiske dollar"
+	},
+	"LYD": {
+		"name": "libyske dinarer"
+	},
+	"MGA": {
+		"name": "madagassiske ariary"
+	},
+	"MOP": {
+		"name": "makaoiske pataca"
+	},
+	"MKD": {
+		"name": "makedonske denarer"
+	},
+	"MWK": {
+		"name": "malawiske kwacha"
+	},
+	"MYR": {
+		"name": "malaysiske ringgit"
+	},
+	"MVR": {
+		"name": "maldiviske rufiyaa"
+	},
+	"MAD": {
+		"name": "marokkanske dirham"
+	},
+	"MRU": {
+		"name": "mauritanske ouguiya"
+	},
+	"MUR": {
+		"name": "mauritiske rupier"
+	},
+	"MXN": {
+		"name": "meksikanske pesos"
+	},
+	"MDL": {
+		"name": "moldovske leu"
+	},
+	"MNT": {
+		"name": "mongolske tugrik"
+	},
+	"MZN": {
+		"name": "mosambikiske metical"
+	},
+	"MMK": {
+		"name": "myanmarske kyat"
+	},
+	"NAD": {
+		"name": "namibiske dollar"
+	},
+	"ANG": {
+		"name": "nederlandske antillegylden"
+	},
+	"NPR": {
+		"name": "nepalske rupier"
+	},
+	"NZD": {
+		"name": "newzealandske dollar"
+	},
+	"NIO": {
+		"name": "nicaraguanske córdoba"
+	},
+	"NGN": {
+		"name": "nigerianske naira"
+	},
+	"KPW": {
+		"name": "nordkoreanske won"
+	},
+	"NOK": {
+		"name": "norske kroner",
+		"symbol": "kr"
+	},
+	"BYN": {
+		"name": "nye hviterussiske rubler"
+	},
+	"ILS": {
+		"name": "nye israelske shekler"
+	},
+	"TWD": {
+		"name": "nye taiwanske dollar"
+	},
+	"OMR": {
+		"name": "omanske rialer"
+	},
+	"PKR": {
+		"name": "pakistanske rupier"
+	},
+	"PAB": {
+		"name": "panamanske balboa"
+	},
+	"PGK": {
+		"name": "papuanske kina"
+	},
+	"PYG": {
+		"name": "paraguayanske guarani"
+	},
+	"PEN": {
+		"name": "peruanske sol"
+	},
+	"PLN": {
+		"name": "polske zloty"
+	},
+	"QAR": {
+		"name": "qatarske rialer"
+	},
+	"RON": {
+		"name": "rumenske leu"
+	},
+	"RUB": {
+		"name": "russiske rubler"
+	},
+	"RWF": {
+		"name": "rwandiske franc"
+	},
+	"SBD": {
+		"name": "salomonske dollar"
+	},
+	"SVC": {
+		"name": "salvadoranske colon"
+	},
+	"WST": {
+		"name": "samoanske tala"
+	},
+	"SHP": {
+		"name": "sankthelenske pund"
+	},
+	"STN": {
+		"name": "saotomesiske dobra"
+	},
+	"SAR": {
+		"name": "saudiarabiske riyaler"
+	},
+	"XAF": {
+		"name": "sentralafrikanske CFA-franc"
+	},
+	"RSD": {
+		"name": "serbiske dinarer"
+	},
+	"SCR": {
+		"name": "seychelliske rupier"
+	},
+	"SLL": {
+		"name": "sierraleonske leone"
+	},
+	"SGD": {
+		"name": "singaporske dollar"
+	},
+	"SOS": {
+		"name": "somaliske shilling"
+	},
+	"LKR": {
+		"name": "srilankiske rupier"
+	},
+	"SDG": {
+		"name": "sudanske pund"
+	},
+	"SRD": {
+		"name": "surinamske dollar"
+	},
+	"CHF": {
+		"name": "sveitsiske franc"
+	},
+	"SEK": {
+		"name": "svenske kroner"
+	},
+	"SZL": {
+		"name": "swazilandske lilangeni"
+	},
+	"SYP": {
+		"name": "syriske pund"
+	},
+	"ZAR": {
+		"name": "sørafrikanske rand"
+	},
+	"KRW": {
+		"name": "sørkoreanske won"
+	},
+	"SSP": {
+		"name": "sørsudanske pund"
+	},
+	"TJS": {
+		"name": "tadsjikiske somoni"
+	},
+	"TZS": {
+		"name": "tanzanianske shilling"
+	},
+	"THB": {
+		"name": "thailandske baht"
+	},
+	"TOP": {
+		"name": "tonganske paʻanga"
+	},
+	"TTD": {
+		"name": "trinidadiske dollar"
+	},
+	"CZK": {
+		"name": "tsjekkiske koruna"
+	},
+	"TND": {
+		"name": "tunisiske dinarer"
+	},
+	"TMT": {
+		"name": "turkmenske manat"
+	},
+	"TRY": {
+		"name": "tyrkiske lire"
+	},
+	"UGX": {
+		"name": "ugandiske shilling"
+	},
+	"UAH": {
+		"name": "ukrainske hryvnia"
+	},
+	"HUF": {
+		"name": "ungarske forinter"
+	},
+	"UYW": {
+		"name": "Uruguayan Nominal Wage Index Unit"
+	},
+	"UYU": {
+		"name": "uruguayanske pesos"
+	},
+	"UZS": {
+		"name": "usbekiske som"
+	},
+	"VUV": {
+		"name": "vanuatiske vatu"
+	},
+	"VES": {
+		"name": "venezuelanske bolivar"
+	},
+	"XOF": {
+		"name": "vestafrikanske CFA-franc",
+		"symbol": "F CFA"
+	},
+	"VND": {
+		"name": "vietnamesiske dong"
+	},
+	"ZMW": {
+		"name": "zambiske kwacha"
+	},
+	"ZWL": {
+		"name": "zimbabwisk dollar (2009)"
+	},
+	"XCD": {
+		"name": "østkaribiske dollar"
+	}
+}
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/pa.json b/vendor/commerceguys/intl/resources/currency/pa.json
index 6f58520fe..dd1219c44 100644
--- a/vendor/commerceguys/intl/resources/currency/pa.json
+++ b/vendor/commerceguys/intl/resources/currency/pa.json
@@ -297,7 +297,7 @@
 	},
 	"XOF": {
 		"name": "ਪੱਛਮੀ ਅਫ਼ਰੀਕੀ (CFA) ਫ�ਰੈਂਕ",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PAB": {
 		"name": "ਪਨਾਮੇਨੀਅਨ ਬਾਲਬੋਆ"
diff --git a/vendor/commerceguys/intl/resources/currency/pl.json b/vendor/commerceguys/intl/resources/currency/pl.json
index 7114ec8ad..82cf3282d 100644
--- a/vendor/commerceguys/intl/resources/currency/pl.json
+++ b/vendor/commerceguys/intl/resources/currency/pl.json
@@ -81,7 +81,7 @@
 		"name": "dolar bahamski"
 	},
 	"BBD": {
-		"name": "dolar Barbadosu"
+		"name": "dolar barbadoski"
 	},
 	"BZD": {
 		"name": "dolar belizeński"
@@ -126,7 +126,7 @@
 		"name": "dolar surinamski"
 	},
 	"TTD": {
-		"name": "dolar Trynidadu i Tobago"
+		"name": "dolar trynidadzki"
 	},
 	"XCD": {
 		"name": "dolar wschodniokaraibski",
@@ -162,7 +162,7 @@
 	},
 	"XOF": {
 		"name": "frank CFA",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "frank CFA BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/ps.json b/vendor/commerceguys/intl/resources/currency/ps.json
index 52bc3b3c8..1319a7fe9 100644
--- a/vendor/commerceguys/intl/resources/currency/ps.json
+++ b/vendor/commerceguys/intl/resources/currency/ps.json
@@ -146,6 +146,9 @@
 	"THB": {
 		"name": "تهايي بات"
 	},
+	"TND": {
+		"name": "تيونس� دينار"
+	},
 	"TTD": {
 		"name": "ټرينيډاډ او ټوباګو ډالر"
 	},
@@ -168,6 +171,9 @@
 	"JMD": {
 		"name": "جمايکايي ډالر"
 	},
+	"SSP": {
+		"name": "جنوب سوډاني پونډ"
+	},
 	"ZAR": {
 		"name": "جنوبي ا�ريقا�ي رنډ"
 	},
@@ -187,7 +193,7 @@
 	},
 	"XOF": {
 		"name": "ختي� ا�ريقايي CFA �رانک",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XCD": {
 		"name": "ختي� کربين ډالر",
@@ -275,7 +281,8 @@
 		"name": "�جي ډالر"
 	},
 	"PHP": {
-		"name": "�لپاين� پسو"
+		"name": "�لپاين� پسو",
+		"symbol": "₱"
 	},
 	"KZT": {
 		"name": "قازقستاني ټينج"
@@ -375,6 +382,9 @@
 	"EGP": {
 		"name": "مصري پونډ"
 	},
+	"MOP": {
+		"name": "مکانيس پټاکا"
+	},
 	"MGA": {
 		"name": "ملاګاسي ارياري"
 	},
@@ -476,18 +486,9 @@
 	"LSL": {
 		"name": "Lesotho Loti"
 	},
-	"MOP": {
-		"name": "Macanese Pataca"
-	},
 	"SVC": {
 		"name": "Salvadoran Colón"
 	},
-	"SSP": {
-		"name": "South Sudanese Pound"
-	},
-	"TND": {
-		"name": "Tunisian Dinar"
-	},
 	"UYW": {
 		"name": "Uruguayan Nominal Wage Index Unit"
 	},
diff --git a/vendor/commerceguys/intl/resources/currency/pt-PT.json b/vendor/commerceguys/intl/resources/currency/pt-PT.json
index 959351a46..2653c035b 100644
--- a/vendor/commerceguys/intl/resources/currency/pt-PT.json
+++ b/vendor/commerceguys/intl/resources/currency/pt-PT.json
@@ -187,7 +187,7 @@
 	},
 	"XOF": {
 		"name": "franco CFA (BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franco CFA (BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/pt.json b/vendor/commerceguys/intl/resources/currency/pt.json
index 6d888b9b2..5c90a205d 100644
--- a/vendor/commerceguys/intl/resources/currency/pt.json
+++ b/vendor/commerceguys/intl/resources/currency/pt.json
@@ -187,7 +187,7 @@
 	},
 	"XOF": {
 		"name": "Franco CFA de BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Franco CFA de BEAC",
@@ -343,7 +343,7 @@
 		"name": "Paʻanga tonganesa"
 	},
 	"MOP": {
-		"name": "Pataca de Macau"
+		"name": "Pataca macaense"
 	},
 	"ARS": {
 		"name": "Peso argentino"
@@ -380,7 +380,7 @@
 		"name": "Quetzal guatemalteco"
 	},
 	"MMK": {
-		"name": "Quiat de Myanmar"
+		"name": "Quiate mianmarense"
 	},
 	"ZAR": {
 		"name": "Rand sul-africano"
@@ -417,7 +417,7 @@
 		"name": "Rublo russo"
 	},
 	"LKR": {
-		"name": "Rupia do Sri Lanka"
+		"name": "Rupia cingalesa"
 	},
 	"INR": {
 		"name": "Rupia indiana",
diff --git a/vendor/commerceguys/intl/resources/currency/rn.json b/vendor/commerceguys/intl/resources/currency/rn.json
index 4ad691033..fdc0ac52a 100644
--- a/vendor/commerceguys/intl/resources/currency/rn.json
+++ b/vendor/commerceguys/intl/resources/currency/rn.json
@@ -393,7 +393,8 @@
 		"name": "Peruvian Sol"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Piso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -486,7 +487,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/ro.json b/vendor/commerceguys/intl/resources/currency/ro.json
index dc28a2712..bdc7db864 100644
--- a/vendor/commerceguys/intl/resources/currency/ro.json
+++ b/vendor/commerceguys/intl/resources/currency/ro.json
@@ -15,22 +15,22 @@
 		"name": "birr etiopian"
 	},
 	"VES": {
-		"name": "bolivar venezuelean"
+		"name": "bolívar soberano"
 	},
 	"BOB": {
-		"name": "boliviano bolivian"
+		"name": "boliviano"
 	},
 	"GHS": {
 		"name": "cedi ghanez"
 	},
 	"CRC": {
-		"name": "colon costarican"
+		"name": "colón costarican"
 	},
 	"SVC": {
 		"name": "colon El Salvador"
 	},
 	"NIO": {
-		"name": "cordoba nicaraguană"
+		"name": "córdoba oro"
 	},
 	"CZK": {
 		"name": "coroană cehă"
@@ -50,6 +50,9 @@
 	"GMD": {
 		"name": "dalasi din Gambia"
 	},
+	"MKD": {
+		"name": "denar"
+	},
 	"DZD": {
 		"name": "dinar algerian"
 	},
@@ -68,9 +71,6 @@
 	"LYD": {
 		"name": "dinar libian"
 	},
-	"MKD": {
-		"name": "dinar macedonean"
-	},
 	"RSD": {
 		"name": "dinar sârbesc"
 	},
@@ -110,9 +110,6 @@
 	"BND": {
 		"name": "dolar din Brunei"
 	},
-	"XCD": {
-		"name": "dolar din Caraibele de Est"
-	},
 	"HKD": {
 		"name": "dolar din Hong Kong"
 	},
@@ -123,7 +120,10 @@
 		"name": "dolar din Insulele Solomon"
 	},
 	"TTD": {
-		"name": "dolar din Trinidad-Tobago"
+		"name": "dolar din Trinidad și Tobago"
+	},
+	"XCD": {
+		"name": "dolar est-caraib"
 	},
 	"FJD": {
 		"name": "dolar fijian"
@@ -171,14 +171,14 @@
 		"name": "florin aruban"
 	},
 	"HUF": {
-		"name": "forint maghiar"
+		"name": "forint"
 	},
 	"BIF": {
 		"name": "franc burundez"
 	},
 	"XOF": {
 		"name": "franc CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "franc CFA BEAC",
@@ -209,14 +209,14 @@
 	"HTG": {
 		"name": "gourde din Haiti"
 	},
+	"UAH": {
+		"name": "grivnă"
+	},
 	"PYG": {
-		"name": "guarani paraguayan"
+		"name": "guarani"
 	},
 	"ANG": {
-		"name": "gulden din Antilele Olandeze"
-	},
-	"UAH": {
-		"name": "hryvna ucraineană"
+		"name": "gulden neerlandez antilez"
 	},
 	"PGK": {
 		"name": "kina din Papua-Noua Guinee"
@@ -225,7 +225,7 @@
 		"name": "kip laoțian"
 	},
 	"HRK": {
-		"name": "kuna croată"
+		"name": "kuna"
 	},
 	"MWK": {
 		"name": "kwacha malawiană"
@@ -243,7 +243,7 @@
 		"name": "lari georgian"
 	},
 	"ALL": {
-		"name": "leka albaneză"
+		"name": "lek"
 	},
 	"HNL": {
 		"name": "lempira honduriană"
@@ -258,7 +258,7 @@
 		"name": "leu românesc"
 	},
 	"BGN": {
-		"name": "leva bulgărească"
+		"name": "leva"
 	},
 	"SZL": {
 		"name": "lilangeni din Swaziland"
@@ -303,7 +303,7 @@
 		"name": "manat turkmen"
 	},
 	"BAM": {
-		"name": "marcă convertibilă din Bosnia și Herțegovina"
+		"name": "marcă convertibilă"
 	},
 	"MZN": {
 		"name": "metical mozambican"
@@ -363,7 +363,7 @@
 		"name": "rand sud-african"
 	},
 	"BRL": {
-		"name": "real brazilian"
+		"name": "real"
 	},
 	"IRR": {
 		"name": "rial iranian"
@@ -417,7 +417,7 @@
 		"name": "rupie srilankeză"
 	},
 	"PEN": {
-		"name": "sol peruvian"
+		"name": "sol"
 	},
 	"KGS": {
 		"name": "som kârgâz"
@@ -474,6 +474,6 @@
 		"name": "yuan chinezesc"
 	},
 	"PLN": {
-		"name": "zlot polonez"
+		"name": "zlot"
 	}
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/ru.json b/vendor/commerceguys/intl/resources/currency/ru.json
index 76ddd20ac..10f4caac7 100644
--- a/vendor/commerceguys/intl/resources/currency/ru.json
+++ b/vendor/commerceguys/intl/resources/currency/ru.json
@@ -431,7 +431,7 @@
 	},
 	"XOF": {
 		"name": "франк КФ� ВСЕ�О",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "франк КФ� BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/sd.json b/vendor/commerceguys/intl/resources/currency/sd.json
index 27a73929b..2c4fd3473 100644
--- a/vendor/commerceguys/intl/resources/currency/sd.json
+++ b/vendor/commerceguys/intl/resources/currency/sd.json
@@ -76,7 +76,7 @@
 	},
 	"XOF": {
 		"name": "اولهه آ�ريڪا �رينڪ",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ETB": {
 		"name": "ايٿوپيائي بر"
diff --git a/vendor/commerceguys/intl/resources/currency/sk.json b/vendor/commerceguys/intl/resources/currency/sk.json
index 26ebab8ae..9853daeec 100644
--- a/vendor/commerceguys/intl/resources/currency/sk.json
+++ b/vendor/commerceguys/intl/resources/currency/sk.json
@@ -475,7 +475,7 @@
 	},
 	"XOF": {
 		"name": "západoafrický frank",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ZWL": {
 		"name": "zimbabwiansky dolár (2009)"
diff --git a/vendor/commerceguys/intl/resources/currency/sl.json b/vendor/commerceguys/intl/resources/currency/sl.json
index f26d7687b..3dda208d9 100644
--- a/vendor/commerceguys/intl/resources/currency/sl.json
+++ b/vendor/commerceguys/intl/resources/currency/sl.json
@@ -244,7 +244,7 @@
 		"name": "komorski frank"
 	},
 	"CDF": {
-		"name": "kongoški frank"
+		"name": "kongovski frank"
 	},
 	"CRC": {
 		"name": "kostariški kolon"
@@ -474,7 +474,7 @@
 	},
 	"XOF": {
 		"name": "zahodnoafriški frank CFA",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ZMW": {
 		"name": "zambijska kva�a"
diff --git a/vendor/commerceguys/intl/resources/currency/so.json b/vendor/commerceguys/intl/resources/currency/so.json
index 24e0d46ef..155a20422 100644
--- a/vendor/commerceguys/intl/resources/currency/so.json
+++ b/vendor/commerceguys/intl/resources/currency/so.json
@@ -46,7 +46,8 @@
 		"name": "Birta Itoobbiya"
 	},
 	"PHP": {
-		"name": "Biso Filibin"
+		"name": "Biso Filibin",
+		"symbol": "₱"
 	},
 	"VES": {
 		"name": "Bolifarada Fenesuwela"
@@ -220,7 +221,7 @@
 	},
 	"XOF": {
 		"name": "Faranka CFA Galbeedka Afrika",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "Faranka CFP",
diff --git a/vendor/commerceguys/intl/resources/currency/sq.json b/vendor/commerceguys/intl/resources/currency/sq.json
index 4f2a13838..78375fb54 100644
--- a/vendor/commerceguys/intl/resources/currency/sq.json
+++ b/vendor/commerceguys/intl/resources/currency/sq.json
@@ -158,7 +158,7 @@
 	},
 	"XOF": {
 		"name": "Franga e Bregut të Fildishtë",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XPF": {
 		"name": "Franga franceze e Polinezisë",
diff --git a/vendor/commerceguys/intl/resources/currency/sr-Cyrl-BA.json b/vendor/commerceguys/intl/resources/currency/sr-Cyrl-BA.json
new file mode 100644
index 000000000..2ce408333
--- /dev/null
+++ b/vendor/commerceguys/intl/resources/currency/sr-Cyrl-BA.json
@@ -0,0 +1,493 @@
+{
+	"AFN": {
+		"name": "�вгани�тан�ки авгани"
+	},
+	"AZN": {
+		"name": "�зербејџан�ки манат"
+	},
+	"ALL": {
+		"name": "�лбан�ки лек"
+	},
+	"DZD": {
+		"name": "�лжир�ки динар"
+	},
+	"USD": {
+		"name": "�мерички долар",
+		"symbol": "US$"
+	},
+	"AOA": {
+		"name": "�нгол�ка кванза"
+	},
+	"ARS": {
+		"name": "�ргентин�ки пезо�"
+	},
+	"AWG": {
+		"name": "�рубан�ки флорин"
+	},
+	"AUD": {
+		"name": "�у�тралиј�ки долар"
+	},
+	"BDT": {
+		"name": "Бангладешка така"
+	},
+	"BBD": {
+		"name": "Барбадошки долар"
+	},
+	"BSD": {
+		"name": "Бахам�ки долар"
+	},
+	"BHD": {
+		"name": "Бахреин�ки динар"
+	},
+	"BZD": {
+		"name": "Бели�ки долар"
+	},
+	"BMD": {
+		"name": "Бермуд�ки долар"
+	},
+	"BYN": {
+		"name": "Бјелору�ка рубља"
+	},
+	"BOB": {
+		"name": "Боливиј�ки боливијано"
+	},
+	"BAM": {
+		"name": "Бо�ан�кохерцеговачка конвертибилна марка",
+		"symbol": "КМ"
+	},
+	"BWP": {
+		"name": "Боцван�ка пула"
+	},
+	"BRL": {
+		"name": "Бразил�ки реал",
+		"symbol": "R$"
+	},
+	"GBP": {
+		"name": "Британ�ка фунта",
+		"symbol": "£"
+	},
+	"BND": {
+		"name": "Брунеј�ки долар"
+	},
+	"BGN": {
+		"name": "Бугар�ки лев"
+	},
+	"BIF": {
+		"name": "Бурунд�ки франак"
+	},
+	"BTN": {
+		"name": "Бутан�ки нгултрум"
+	},
+	"VUV": {
+		"name": "Вануат�ки вату"
+	},
+	"VES": {
+		"name": "Венецуелан�ки боливар"
+	},
+	"VND": {
+		"name": "Вијетнам�ки донг"
+	},
+	"GMD": {
+		"name": "Гамбиј�ки дала�и"
+	},
+	"GHS": {
+		"name": "Ган�ки �еди"
+	},
+	"GYD": {
+		"name": "Гвајан�ки долар"
+	},
+	"GTQ": {
+		"name": "Гватемал�ки кецал"
+	},
+	"GNF": {
+		"name": "Гвинеј�ки франак"
+	},
+	"GIP": {
+		"name": "Гибралтар�ка фунта"
+	},
+	"GEL": {
+		"name": "Грузиј�ки лари"
+	},
+	"DKK": {
+		"name": "Дан�ка круна"
+	},
+	"DOP": {
+		"name": "Доминикан�ки пезо�"
+	},
+	"EUR": {
+		"name": "Евро",
+		"symbol": "€"
+	},
+	"EGP": {
+		"name": "Египат�ка фунта"
+	},
+	"ETB": {
+		"name": "Етиоп�ки бир"
+	},
+	"ZMW": {
+		"name": "Замбиј�ка квача"
+	},
+	"CVE": {
+		"name": "Зеленорт�ки е�кудо"
+	},
+	"ZWL": {
+		"name": "Зимбабвеан�ки долар (2009)"
+	},
+	"ILS": {
+		"name": "Израел�ки нови шекел",
+		"symbol": "₪"
+	},
+	"INR": {
+		"name": "Индиј�ка рупија",
+		"symbol": "₹"
+	},
+	"IDR": {
+		"name": "Индонежан�ка рупија"
+	},
+	"IRR": {
+		"name": "Иран�ки риjал"
+	},
+	"IQD": {
+		"name": "Ирачки динар"
+	},
+	"ISK": {
+		"name": "И�ланд�ка круна"
+	},
+	"XCD": {
+		"name": "И�точнокарип�ки долар",
+		"symbol": "EC$"
+	},
+	"JMD": {
+		"name": "Јамајчан�ки долар"
+	},
+	"JPY": {
+		"name": "Јапан�ки јен",
+		"symbol": "Â¥"
+	},
+	"YER": {
+		"name": "Јемен�ки риjал"
+	},
+	"AMD": {
+		"name": "Јермен�ки драм"
+	},
+	"JOD": {
+		"name": "Јордан�ки динар"
+	},
+	"ZAR": {
+		"name": "Јужноафрички ранд"
+	},
+	"KRW": {
+		"name": "Јужнокореј�ки вон"
+	},
+	"SSP": {
+		"name": "Јужно�удан�ка фунта"
+	},
+	"KZT": {
+		"name": "Казах�тан�ки тенге"
+	},
+	"KYD": {
+		"name": "Кајман�ки долар"
+	},
+	"CAD": {
+		"name": "Канад�ки долар",
+		"symbol": "CA$"
+	},
+	"QAR": {
+		"name": "Катар�ки ријал"
+	},
+	"KES": {
+		"name": "Кениј�ки шилинг"
+	},
+	"CNY": {
+		"name": "Кине�ки јуан",
+		"symbol": "CNÂ¥"
+	},
+	"KGS": {
+		"name": "Кирги�тан�ки �ом"
+	},
+	"COP": {
+		"name": "Колумбиј�ки пезо�"
+	},
+	"KMF": {
+		"name": "Комор�ки франак"
+	},
+	"CDF": {
+		"name": "Конгоан�ки франак"
+	},
+	"CRC": {
+		"name": "Ко�тарикан�ки колон"
+	},
+	"CUC": {
+		"name": "Кубан�ки конвертибилни пезо�"
+	},
+	"CUP": {
+		"name": "Кубан�ки пезо�"
+	},
+	"KWD": {
+		"name": "Кувајт�ки динар"
+	},
+	"LAK": {
+		"name": "Лаошки кип"
+	},
+	"LSL": {
+		"name": "Ле�ото лоти"
+	},
+	"LBP": {
+		"name": "Либан�ка фунта"
+	},
+	"LRD": {
+		"name": "Либериј�ки долар"
+	},
+	"LYD": {
+		"name": "Либиј�ки динар"
+	},
+	"MGA": {
+		"name": "Мадага�кар�ки ариари"
+	},
+	"HUF": {
+		"name": "Мађар�ка форинта"
+	},
+	"MOP": {
+		"name": "Макао�ка патака"
+	},
+	"MKD": {
+		"name": "Македон�ки денар"
+	},
+	"MWK": {
+		"name": "Малавиј�ка квача"
+	},
+	"MVR": {
+		"name": "Малдив�ка руфија"
+	},
+	"MYR": {
+		"name": "Малезиј�ки рингит"
+	},
+	"MAD": {
+		"name": "Марокан�ки дирхам"
+	},
+	"MRU": {
+		"name": "Мауритан�ка огија"
+	},
+	"MUR": {
+		"name": "Маурициј�ка рупија"
+	},
+	"MXN": {
+		"name": "Мек�ички пезо�",
+		"symbol": "MX$"
+	},
+	"MMK": {
+		"name": "Мјанмар�ки кјат"
+	},
+	"MZN": {
+		"name": "Мозамбички метикал"
+	},
+	"MDL": {
+		"name": "Молдав�ки леј"
+	},
+	"MNT": {
+		"name": "Монгол�ки тугрик"
+	},
+	"NAD": {
+		"name": "�амибиј�ки долар"
+	},
+	"NPR": {
+		"name": "�епал�кa рупиja"
+	},
+	"NGN": {
+		"name": "�игериј�ка наира"
+	},
+	"NIO": {
+		"name": "�икарагван�ка златна кордоба"
+	},
+	"TWD": {
+		"name": "�ови тајван�ки долар",
+		"symbol": "NT$"
+	},
+	"NZD": {
+		"name": "�овозеланд�ки долар"
+	},
+	"NOK": {
+		"name": "�орвешка круна"
+	},
+	"OMR": {
+		"name": "Оман�ки ријал"
+	},
+	"PKR": {
+		"name": "Паки�тан�кa рупиja"
+	},
+	"PAB": {
+		"name": "Панам�ка балбоа"
+	},
+	"PGK": {
+		"name": "Папуан�ка кина"
+	},
+	"PYG": {
+		"name": "Парагвај�ки гварани"
+	},
+	"PEN": {
+		"name": "Перуан�ки �ол"
+	},
+	"PLN": {
+		"name": "Пољ�ки злот"
+	},
+	"RWF": {
+		"name": "Руанд�ки франак"
+	},
+	"RON": {
+		"name": "Румун�ки леј"
+	},
+	"RUB": {
+		"name": "Ру�ка рубља"
+	},
+	"SVC": {
+		"name": "Салвадор�ки колон"
+	},
+	"WST": {
+		"name": "Самоан�ка тала"
+	},
+	"STN": {
+		"name": "Саотом�ка добра"
+	},
+	"SAR": {
+		"name": "Саудиј�ки ријал"
+	},
+	"SZL": {
+		"name": "Свазиленд�ки лилангени"
+	},
+	"SHP": {
+		"name": "Свете Јелене фунта"
+	},
+	"SCR": {
+		"name": "Сејшел�ка рупија"
+	},
+	"SLL": {
+		"name": "Сијералеон�ки леоне"
+	},
+	"SGD": {
+		"name": "Сингапур�ки долар"
+	},
+	"SYP": {
+		"name": "Сириј�ка фунта"
+	},
+	"KPW": {
+		"name": "Сјевернокореј�ки вон"
+	},
+	"SBD": {
+		"name": "Соломон�ки долар"
+	},
+	"SOS": {
+		"name": "Сомалиј�ки шилинг"
+	},
+	"RSD": {
+		"name": "Срп�ки динар"
+	},
+	"SDG": {
+		"name": "Судан�ка фунта"
+	},
+	"SRD": {
+		"name": "Суринам�ки долар"
+	},
+	"THB": {
+		"name": "Тајланд�ки бат"
+	},
+	"TZS": {
+		"name": "Танзаниј�ки шилинг"
+	},
+	"TJS": {
+		"name": "Таџики�тан�ки �омон"
+	},
+	"TOP": {
+		"name": "Тонган�ка панга"
+	},
+	"TTD": {
+		"name": "Тринидад-тобагошки долар"
+	},
+	"TND": {
+		"name": "Туни�ки динар"
+	},
+	"TMT": {
+		"name": "Туркмени�тан�ки манат"
+	},
+	"TRY": {
+		"name": "Тур�ка лира"
+	},
+	"AED": {
+		"name": "У�Е дирхам"
+	},
+	"UGX": {
+		"name": "Уганд�ки шилинг"
+	},
+	"UZS": {
+		"name": "Узбеки�тан�ки �ом"
+	},
+	"UAH": {
+		"name": "Украјин�ка хривња"
+	},
+	"UYU": {
+		"name": "Уругвај�ки пезо�"
+	},
+	"PHP": {
+		"name": "Филипин�ки пезо�"
+	},
+	"FJD": {
+		"name": "Фиџиј�ки долар"
+	},
+	"FKP": {
+		"name": "Фокланд�ка фунта"
+	},
+	"HTG": {
+		"name": "Хаићан�ки гурд"
+	},
+	"ANG": {
+		"name": "Холанд�коантил�ки гулден"
+	},
+	"HKD": {
+		"name": "Хонгконшки долар",
+		"symbol": "HK$"
+	},
+	"HNL": {
+		"name": "Хондурашка лемпира"
+	},
+	"HRK": {
+		"name": "Хрват�ка куна"
+	},
+	"XOF": {
+		"name": "ЦФ� франак БЦЕ�О",
+		"symbol": "F CFA"
+	},
+	"CZK": {
+		"name": "Чешка круна"
+	},
+	"CLP": {
+		"name": "Чилеан�ки пезо�"
+	},
+	"DJF": {
+		"name": "�ибут�ки франак"
+	},
+	"CHF": {
+		"name": "Швајцар�ки франак"
+	},
+	"SEK": {
+		"name": "Швед�ка круна"
+	},
+	"LKR": {
+		"name": "Шриланкан�кa рупиja"
+	},
+	"XAF": {
+		"name": "CFA франак BEAC",
+		"symbol": "FCFA"
+	},
+	"XPF": {
+		"name": "CFP франак",
+		"symbol": "CFPF"
+	},
+	"ERN": {
+		"name": "Eритреј�ка накфa"
+	},
+	"KHR": {
+		"name": "Kамбоџан�ки ријел"
+	},
+	"UYW": {
+		"name": "Uruguayan Nominal Wage Index Unit"
+	}
+}
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/sr-Latn-BA.json b/vendor/commerceguys/intl/resources/currency/sr-Latn-BA.json
new file mode 100644
index 000000000..ba9360d9e
--- /dev/null
+++ b/vendor/commerceguys/intl/resources/currency/sr-Latn-BA.json
@@ -0,0 +1,493 @@
+{
+	"ALL": {
+		"name": "Albanski lek"
+	},
+	"DZD": {
+		"name": "Alžirski dinar"
+	},
+	"USD": {
+		"name": "Ameri�ki dolar",
+		"symbol": "US$"
+	},
+	"AOA": {
+		"name": "Angolska kvanza"
+	},
+	"ARS": {
+		"name": "Argentinski pezos"
+	},
+	"AWG": {
+		"name": "Arubanski florin"
+	},
+	"AUD": {
+		"name": "Australijski dolar"
+	},
+	"AFN": {
+		"name": "Avganistanski avgani"
+	},
+	"AZN": {
+		"name": "Azerbejdžanski manat"
+	},
+	"BSD": {
+		"name": "Bahamski dolar"
+	},
+	"BHD": {
+		"name": "Bahreinski dinar"
+	},
+	"BDT": {
+		"name": "Bangladeška taka"
+	},
+	"BBD": {
+		"name": "Barbadoški dolar"
+	},
+	"BZD": {
+		"name": "Beliski dolar"
+	},
+	"BMD": {
+		"name": "Bermudski dolar"
+	},
+	"BYN": {
+		"name": "Bjeloruska rublja"
+	},
+	"BWP": {
+		"name": "Bocvanska pula"
+	},
+	"BOB": {
+		"name": "Bolivijski bolivijano"
+	},
+	"BAM": {
+		"name": "Bosanskohercegova�ka konvertibilna marka",
+		"symbol": "KM"
+	},
+	"BRL": {
+		"name": "Brazilski real",
+		"symbol": "R$"
+	},
+	"GBP": {
+		"name": "Britanska funta",
+		"symbol": "£"
+	},
+	"BND": {
+		"name": "Brunejski dolar"
+	},
+	"BGN": {
+		"name": "Bugarski lev"
+	},
+	"BIF": {
+		"name": "Burundski franak"
+	},
+	"BTN": {
+		"name": "Butanski ngultrum"
+	},
+	"XOF": {
+		"name": "CFA franak BCEAO",
+		"symbol": "F CFA"
+	},
+	"XAF": {
+		"name": "CFA franak BEAC",
+		"symbol": "FCFA"
+	},
+	"XPF": {
+		"name": "CFP franak",
+		"symbol": "CFPF"
+	},
+	"CZK": {
+		"name": "Češka kruna"
+	},
+	"CLP": {
+		"name": "ÄŒileanski pezos"
+	},
+	"DKK": {
+		"name": "Danska kruna"
+	},
+	"DOP": {
+		"name": "Dominikanski pezos"
+	},
+	"DJF": {
+		"name": "Džibutski franak"
+	},
+	"EGP": {
+		"name": "Egipatska funta"
+	},
+	"ERN": {
+		"name": "Eritrejska nakfa"
+	},
+	"ETB": {
+		"name": "Etiopski bir"
+	},
+	"EUR": {
+		"name": "Evro",
+		"symbol": "€"
+	},
+	"FJD": {
+		"name": "Fidžijski dolar"
+	},
+	"PHP": {
+		"name": "Filipinski pezos"
+	},
+	"FKP": {
+		"name": "Foklandska funta"
+	},
+	"GMD": {
+		"name": "Gambijski dalasi"
+	},
+	"GHS": {
+		"name": "Ganski sedi"
+	},
+	"GIP": {
+		"name": "Gibraltarska funta"
+	},
+	"GEL": {
+		"name": "Gruzijski lari"
+	},
+	"GYD": {
+		"name": "Gvajanski dolar"
+	},
+	"GTQ": {
+		"name": "Gvatemalski kecal"
+	},
+	"GNF": {
+		"name": "Gvinejski franak"
+	},
+	"HTG": {
+		"name": "Haićanski gurd"
+	},
+	"ANG": {
+		"name": "Holandskoantilski gulden"
+	},
+	"HNL": {
+		"name": "Honduraška lempira"
+	},
+	"HKD": {
+		"name": "Hongkonški dolar",
+		"symbol": "HK$"
+	},
+	"HRK": {
+		"name": "Hrvatska kuna"
+	},
+	"INR": {
+		"name": "Indijska rupija",
+		"symbol": "₹"
+	},
+	"IDR": {
+		"name": "Indonežanska rupija"
+	},
+	"IQD": {
+		"name": "Ira�ki dinar"
+	},
+	"IRR": {
+		"name": "Iranski rijal"
+	},
+	"ISK": {
+		"name": "Islandska kruna"
+	},
+	"XCD": {
+		"name": "Isto�nokaripski dolar",
+		"symbol": "EC$"
+	},
+	"ILS": {
+		"name": "Izraelski novi Å¡ekel",
+		"symbol": "₪"
+	},
+	"JMD": {
+		"name": "Jamaj�anski dolar"
+	},
+	"JPY": {
+		"name": "Japanski jen",
+		"symbol": "Â¥"
+	},
+	"YER": {
+		"name": "Jemenski rijal"
+	},
+	"AMD": {
+		"name": "Jermenski dram"
+	},
+	"JOD": {
+		"name": "Jordanski dinar"
+	},
+	"ZAR": {
+		"name": "Južnoafri�ki rand"
+	},
+	"KRW": {
+		"name": "Južnokorejski von"
+	},
+	"SSP": {
+		"name": "Južnosudanska funta"
+	},
+	"KYD": {
+		"name": "Kajmanski dolar"
+	},
+	"KHR": {
+		"name": "Kambodžanski rijel"
+	},
+	"CAD": {
+		"name": "Kanadski dolar",
+		"symbol": "CA$"
+	},
+	"QAR": {
+		"name": "Katarski rijal"
+	},
+	"KZT": {
+		"name": "Kazahstanski tenge"
+	},
+	"KES": {
+		"name": "Kenijski Å¡iling"
+	},
+	"CNY": {
+		"name": "Kineski juan",
+		"symbol": "CNÂ¥"
+	},
+	"KGS": {
+		"name": "Kirgistanski som"
+	},
+	"COP": {
+		"name": "Kolumbijski pezos"
+	},
+	"KMF": {
+		"name": "Komorski franak"
+	},
+	"CDF": {
+		"name": "Kongoanski franak"
+	},
+	"CRC": {
+		"name": "Kostarikanski kolon"
+	},
+	"CUC": {
+		"name": "Kubanski konvertibilni pezos"
+	},
+	"CUP": {
+		"name": "Kubanski pezos"
+	},
+	"KWD": {
+		"name": "Kuvajtski dinar"
+	},
+	"LAK": {
+		"name": "Laoški kip"
+	},
+	"LSL": {
+		"name": "Lesoto loti"
+	},
+	"LBP": {
+		"name": "Libanska funta"
+	},
+	"LRD": {
+		"name": "Liberijski dolar"
+	},
+	"LYD": {
+		"name": "Libijski dinar"
+	},
+	"MGA": {
+		"name": "Madagaskarski ariari"
+	},
+	"HUF": {
+		"name": "Mađarska forinta"
+	},
+	"MOP": {
+		"name": "Makaoska pataka"
+	},
+	"MKD": {
+		"name": "Makedonski denar"
+	},
+	"MWK": {
+		"name": "Malavijska kva�a"
+	},
+	"MVR": {
+		"name": "Maldivska rufija"
+	},
+	"MYR": {
+		"name": "Malezijski ringit"
+	},
+	"MAD": {
+		"name": "Marokanski dirham"
+	},
+	"MUR": {
+		"name": "Mauricijska rupija"
+	},
+	"MRU": {
+		"name": "Mauritanska ogija"
+	},
+	"MXN": {
+		"name": "Meksi�ki pezos",
+		"symbol": "MX$"
+	},
+	"MMK": {
+		"name": "Mjanmarski kjat"
+	},
+	"MDL": {
+		"name": "Moldavski lej"
+	},
+	"MNT": {
+		"name": "Mongolski tugrik"
+	},
+	"MZN": {
+		"name": "Mozambi�ki metikal"
+	},
+	"NAD": {
+		"name": "Namibijski dolar"
+	},
+	"NPR": {
+		"name": "Nepalska rupija"
+	},
+	"NGN": {
+		"name": "Nigerijska naira"
+	},
+	"NIO": {
+		"name": "Nikaragvanska zlatna kordoba"
+	},
+	"NOK": {
+		"name": "Norveška kruna"
+	},
+	"TWD": {
+		"name": "Novi tajvanski dolar",
+		"symbol": "NT$"
+	},
+	"NZD": {
+		"name": "Novozelandski dolar"
+	},
+	"OMR": {
+		"name": "Omanski rijal"
+	},
+	"PKR": {
+		"name": "Pakistanska rupija"
+	},
+	"PAB": {
+		"name": "Panamska balboa"
+	},
+	"PGK": {
+		"name": "Papuanska kina"
+	},
+	"PYG": {
+		"name": "Paragvajski gvarani"
+	},
+	"PEN": {
+		"name": "Peruanski sol"
+	},
+	"PLN": {
+		"name": "Poljski zlot"
+	},
+	"RWF": {
+		"name": "Ruandski franak"
+	},
+	"RON": {
+		"name": "Rumunski lej"
+	},
+	"RUB": {
+		"name": "Ruska rublja"
+	},
+	"SVC": {
+		"name": "Salvadorski kolon"
+	},
+	"WST": {
+		"name": "Samoanska tala"
+	},
+	"STN": {
+		"name": "Saotomska dobra"
+	},
+	"SAR": {
+		"name": "Saudijski rijal"
+	},
+	"SCR": {
+		"name": "Sejšelska rupija"
+	},
+	"SLL": {
+		"name": "Sijeraleonski leone"
+	},
+	"SGD": {
+		"name": "Singapurski dolar"
+	},
+	"SYP": {
+		"name": "Sirijska funta"
+	},
+	"KPW": {
+		"name": "Sjevernokorejski von"
+	},
+	"SBD": {
+		"name": "Solomonski dolar"
+	},
+	"SOS": {
+		"name": "Somalijski Å¡iling"
+	},
+	"RSD": {
+		"name": "Srpski dinar"
+	},
+	"SDG": {
+		"name": "Sudanska funta"
+	},
+	"SRD": {
+		"name": "Surinamski dolar"
+	},
+	"SZL": {
+		"name": "Svazilendski lilangeni"
+	},
+	"SHP": {
+		"name": "Svete Jelene funta"
+	},
+	"LKR": {
+		"name": "Å rilankanska rupija"
+	},
+	"CHF": {
+		"name": "Å vajcarski franak"
+	},
+	"SEK": {
+		"name": "Å vedska kruna"
+	},
+	"TJS": {
+		"name": "Tadžikistanski somon"
+	},
+	"THB": {
+		"name": "Tajlandski bat"
+	},
+	"TZS": {
+		"name": "Tanzanijski Å¡iling"
+	},
+	"TOP": {
+		"name": "Tonganska panga"
+	},
+	"TTD": {
+		"name": "Trinidad-tobagoški dolar"
+	},
+	"TND": {
+		"name": "Tuniski dinar"
+	},
+	"TMT": {
+		"name": "Turkmenistanski manat"
+	},
+	"TRY": {
+		"name": "Turska lira"
+	},
+	"AED": {
+		"name": "UAE dirham"
+	},
+	"UGX": {
+		"name": "Ugandski Å¡iling"
+	},
+	"UAH": {
+		"name": "Ukrajinska hrivnja"
+	},
+	"UYW": {
+		"name": "Uruguayan Nominal Wage Index Unit"
+	},
+	"UYU": {
+		"name": "Urugvajski pezos"
+	},
+	"UZS": {
+		"name": "Uzbekistanski som"
+	},
+	"VUV": {
+		"name": "Vanuatski vatu"
+	},
+	"VES": {
+		"name": "Venecuelanski bolivar"
+	},
+	"VND": {
+		"name": "Vijetnamski dong"
+	},
+	"ZMW": {
+		"name": "Zambijska kva�a"
+	},
+	"CVE": {
+		"name": "Zelenortski eskudo"
+	},
+	"ZWL": {
+		"name": "Zimbabveanski dolar (2009)"
+	}
+}
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/currency/sr-Latn.json b/vendor/commerceguys/intl/resources/currency/sr-Latn.json
index ea7bd30be..9aad3027c 100644
--- a/vendor/commerceguys/intl/resources/currency/sr-Latn.json
+++ b/vendor/commerceguys/intl/resources/currency/sr-Latn.json
@@ -80,7 +80,7 @@
 	},
 	"XOF": {
 		"name": "CFA franak BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "CFA franak BEAC",
diff --git a/vendor/commerceguys/intl/resources/currency/sr.json b/vendor/commerceguys/intl/resources/currency/sr.json
index a7e2cb290..0acb81b88 100644
--- a/vendor/commerceguys/intl/resources/currency/sr.json
+++ b/vendor/commerceguys/intl/resources/currency/sr.json
@@ -453,7 +453,7 @@
 	},
 	"XOF": {
 		"name": "ЦФ� франак БЦЕ�О",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"CZK": {
 		"name": "Чешка круна"
diff --git a/vendor/commerceguys/intl/resources/currency/sv.json b/vendor/commerceguys/intl/resources/currency/sv.json
index 70a2f8a75..aed2411e3 100644
--- a/vendor/commerceguys/intl/resources/currency/sv.json
+++ b/vendor/commerceguys/intl/resources/currency/sv.json
@@ -8,9 +8,16 @@
 	"DZD": {
 		"name": "algerisk dinar"
 	},
+	"USD": {
+		"name": "amerikansk dollar",
+		"symbol": "US$"
+	},
 	"AOA": {
 		"name": "angolansk kwanza"
 	},
+	"ANG": {
+		"name": "Antillergulden"
+	},
 	"ARS": {
 		"name": "argentinsk peso"
 	},
@@ -37,7 +44,7 @@
 		"name": "bangladeshisk taka"
 	},
 	"BBD": {
-		"name": "Barbados-dollar",
+		"name": "barbadisk dollar",
 		"symbol": "Bds$"
 	},
 	"BZD": {
@@ -45,7 +52,7 @@
 		"symbol": "BZ$"
 	},
 	"BMD": {
-		"name": "Bermuda-dollar",
+		"name": "bermudisk dollar",
 		"symbol": "BM$"
 	},
 	"BTN": {
@@ -77,7 +84,7 @@
 		"name": "burundisk franc"
 	},
 	"KYD": {
-		"name": "Cayman-dollar"
+		"name": "caymansk dollar"
 	},
 	"XAF": {
 		"name": "centralafrikansk franc",
@@ -111,6 +118,9 @@
 		"name": "egyptiskt pund",
 		"symbol": "EG£"
 	},
+	"AED": {
+		"name": "emiratisk dirham"
+	},
 	"ERN": {
 		"name": "eritreansk nakfa"
 	},
@@ -130,9 +140,6 @@
 	"PHP": {
 		"name": "filippinsk peso"
 	},
-	"AED": {
-		"name": "Förenade Arabemiratens dirham"
-	},
 	"GMD": {
 		"name": "gambisk dalasi"
 	},
@@ -184,7 +191,7 @@
 		"symbol": "₪"
 	},
 	"JMD": {
-		"name": "Jamaica-dollar",
+		"name": "jamaicansk dollar",
 		"symbol": "JM$"
 	},
 	"JPY": {
@@ -297,9 +304,6 @@
 	"NAD": {
 		"name": "namibisk dollar"
 	},
-	"ANG": {
-		"name": "Nederländska Antillernas gulden"
-	},
 	"NPR": {
 		"name": "nepalesisk rupie"
 	},
@@ -352,15 +356,15 @@
 	"RUB": {
 		"name": "rysk rubel"
 	},
-	"SHP": {
-		"name": "S:t Helena-pund"
-	},
 	"SBD": {
 		"name": "Salomondollar"
 	},
 	"SVC": {
 		"name": "salvadoransk colón"
 	},
+	"SHP": {
+		"name": "sankthelenskt pund"
+	},
 	"STN": {
 		"name": "saotomeansk dobra"
 	},
@@ -417,7 +421,7 @@
 		"name": "tadzjikisk somoni"
 	},
 	"TWD": {
-		"name": "Taiwandollar"
+		"name": "taiwanesisk dollar"
 	},
 	"TZS": {
 		"name": "tanzanisk shilling"
@@ -432,7 +436,7 @@
 		"name": "tongansk paʻanga"
 	},
 	"TTD": {
-		"name": "Trinidad och Tobago-dollar"
+		"name": "Trinidaddollar"
 	},
 	"TND": {
 		"name": "tunisisk dinar"
@@ -458,10 +462,6 @@
 	"UYU": {
 		"name": "uruguayansk peso"
 	},
-	"USD": {
-		"name": "US-dollar",
-		"symbol": "US$"
-	},
 	"UZS": {
 		"name": "uzbekisk sum"
 	},
@@ -479,7 +479,7 @@
 	},
 	"XOF": {
 		"name": "västafrikansk franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"WST": {
 		"name": "västsamoansk tala"
diff --git a/vendor/commerceguys/intl/resources/currency/sw-CD.json b/vendor/commerceguys/intl/resources/currency/sw-CD.json
index 39b1dd53a..edda13468 100644
--- a/vendor/commerceguys/intl/resources/currency/sw-CD.json
+++ b/vendor/commerceguys/intl/resources/currency/sw-CD.json
@@ -25,37 +25,37 @@
 		"name": "Cedi ya Ghana"
 	},
 	"CRC": {
-		"name": "Colon ya Costa Rica"
+		"name": "Colon ya Kostarika"
 	},
 	"BAM": {
 		"name": "Convertible Mark ya Bosnia na Hezegovina"
 	},
 	"NIO": {
-		"name": "Cordoba ya Nicaragua"
+		"name": "Cordoba ya Nikaragwa"
 	},
 	"GMD": {
 		"name": "Dalasi ya Gambia"
 	},
 	"MKD": {
-		"name": "Denar ya Macedonia"
+		"name": "Denar ya Masedonia"
 	},
 	"DZD": {
 		"name": "Dinar ya Aljeria"
 	},
+	"RSD": {
+		"name": "Dinar ya Serbia"
+	},
 	"BHD": {
-		"name": "Dinar ya Bahrain"
+		"name": "Dinari ya Bahareni"
 	},
 	"IQD": {
-		"name": "Dinar ya Iraq"
+		"name": "Dinari ya Iraki"
 	},
 	"JOD": {
-		"name": "Dinar ya Jordan"
+		"name": "Dinari ya Jordan"
 	},
 	"KWD": {
-		"name": "Dinar ya Kuwait"
-	},
-	"RSD": {
-		"name": "Dinar ya Serbia"
+		"name": "Dinari ya Kuwait"
 	},
 	"LYD": {
 		"name": "Dinari ya Libya"
@@ -67,7 +67,7 @@
 		"name": "Dirham ya Falme za Kiarabu"
 	},
 	"MAD": {
-		"name": "Dirham ya Morocco"
+		"name": "Dirham ya Moroko"
 	},
 	"STN": {
 		"name": "Dobra ya Sao Tome na Principe"
@@ -95,10 +95,6 @@
 		"name": "Dola ya Canada",
 		"symbol": "CA$"
 	},
-	"XCD": {
-		"name": "Dola ya Caribbean Mashariki",
-		"symbol": "EC$"
-	},
 	"FJD": {
 		"name": "Dola ya Fiji"
 	},
@@ -110,7 +106,11 @@
 		"symbol": "HK$"
 	},
 	"JMD": {
-		"name": "Dola ya Jamaica"
+		"name": "Dola ya Jamaika"
+	},
+	"XCD": {
+		"name": "Dola ya Karibi Mashariki",
+		"symbol": "EC$"
 	},
 	"LRD": {
 		"name": "Dola ya Liberia"
@@ -123,7 +123,7 @@
 		"name": "Dola ya Namibia"
 	},
 	"NZD": {
-		"name": "Dola ya New Zealand",
+		"name": "Dola ya Nyuzilandi",
 		"symbol": "NZ$"
 	},
 	"SGD": {
@@ -157,7 +157,7 @@
 	},
 	"XOF": {
 		"name": "Faranga CFA BCEAO",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Faranga CFA BEAC",
@@ -170,14 +170,14 @@
 		"name": "Faranga ya CFP",
 		"symbol": "CFPF"
 	},
-	"KMF": {
-		"name": "Faranga ya Comoros"
+	"GNF": {
+		"name": "Faranga ya Guinea"
 	},
 	"DJF": {
-		"name": "Faranga ya Djibouti"
+		"name": "Faranga ya Jibuti"
 	},
-	"GNF": {
-		"name": "Faranga ya Guinea"
+	"KMF": {
+		"name": "Faranga ya Komoro"
 	},
 	"CDF": {
 		"name": "Faranga ya Kongo",
@@ -199,7 +199,7 @@
 		"name": "Gourde ya Haiti"
 	},
 	"PYG": {
-		"name": "Guarani ya Paraguay"
+		"name": "Guarani ya Paragwai"
 	},
 	"ANG": {
 		"name": "Guilder ya Antili za Kiholanzi"
@@ -214,7 +214,7 @@
 		"name": "Kip ya Laosi"
 	},
 	"CZK": {
-		"name": "koruna ya Jamhuri ya Czech"
+		"name": "Koruna ya Jamhuri ya Czech"
 	},
 	"ISK": {
 		"name": "Krona ya Aisilandi"
@@ -226,10 +226,10 @@
 		"name": "Krone ya Denmark"
 	},
 	"NOK": {
-		"name": "Krone ya Norway"
+		"name": "Krone ya Norwe"
 	},
 	"HRK": {
-		"name": "Kuna ya Croatia"
+		"name": "Kuna ya Korasia"
 	},
 	"MWK": {
 		"name": "Kwacha ya Malawi"
@@ -244,7 +244,7 @@
 		"name": "Kyat ya Myanmar"
 	},
 	"GEL": {
-		"name": "Lari ya Georgia"
+		"name": "Lari ya Jojia"
 	},
 	"ALL": {
 		"name": "Lek ya Albania"
@@ -253,7 +253,7 @@
 		"name": "Lempira ya Hondurasi"
 	},
 	"SLL": {
-		"name": "Leone"
+		"name": "Leone ya Siera Leoni"
 	},
 	"MDL": {
 		"name": "Leu ya Moldova"
@@ -265,7 +265,7 @@
 		"name": "Lev ya Bulgaria"
 	},
 	"SZL": {
-		"name": "Lilangeni"
+		"name": "Lilangeni ya Uswazi"
 	},
 	"TRY": {
 		"name": "Lira ya Uturuki"
@@ -326,32 +326,32 @@
 		"name": "Pauni ya Visiwa vya Falkland"
 	},
 	"ARS": {
-		"name": "Peso ya Argentina"
+		"name": "Peso ya Ajentina"
 	},
 	"CLP": {
 		"name": "Peso ya Chile"
 	},
+	"DOP": {
+		"name": "Peso ya Dominika"
+	},
 	"COP": {
-		"name": "Peso ya Colombia"
+		"name": "Peso ya Kolombia"
 	},
 	"CUP": {
-		"name": "Peso ya Cuba"
+		"name": "Peso ya Kuba"
 	},
 	"CUC": {
-		"name": "Peso ya Cuba Inayoweza Kubadilishwa"
-	},
-	"DOP": {
-		"name": "Peso ya Dominica"
+		"name": "Peso ya Kuba Inayoweza Kubadilishwa"
 	},
 	"MXN": {
-		"name": "Peso ya Mexico",
+		"name": "Peso ya Meksiko",
 		"symbol": "MX$"
 	},
 	"PHP": {
 		"name": "Peso ya Ufilipino"
 	},
 	"UYU": {
-		"name": "Peso ya Uruguay"
+		"name": "Peso ya Urugwai"
 	},
 	"BWP": {
 		"name": "Pula ya Botswana"
@@ -379,7 +379,7 @@
 		"name": "Rial ya Yemen"
 	},
 	"KHR": {
-		"name": "Riel ya Cambodia"
+		"name": "Riel ya Kambodia"
 	},
 	"MYR": {
 		"name": "Ringgit ya Malaysia"
@@ -401,7 +401,7 @@
 		"symbol": "₹"
 	},
 	"MUR": {
-		"name": "Rupia ya Mauritius"
+		"name": "Rupia ya Morisi"
 	},
 	"NPR": {
 		"name": "Rupia ya Nepal"
diff --git a/vendor/commerceguys/intl/resources/currency/sw-KE.json b/vendor/commerceguys/intl/resources/currency/sw-KE.json
index 5584ff7fb..426ca78b7 100644
--- a/vendor/commerceguys/intl/resources/currency/sw-KE.json
+++ b/vendor/commerceguys/intl/resources/currency/sw-KE.json
@@ -154,7 +154,7 @@
 	},
 	"XOF": {
 		"name": "Faranga ya CFA ya Afrika Magharibi",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Faranga ya CFA ya Afrika ya Kati",
@@ -288,7 +288,7 @@
 		"name": "Ngultrumi ya Bhutani"
 	},
 	"MRU": {
-		"name": "Ouguiya ya Mauritania"
+		"name": "Ouguiya ya Moritania"
 	},
 	"TOP": {
 		"name": "Paʻanga ya Tonga"
@@ -403,7 +403,7 @@
 		"name": "Rupia ya Indonesia"
 	},
 	"MUR": {
-		"name": "Rupia ya Mauritius"
+		"name": "Rupia ya Morisi"
 	},
 	"NPR": {
 		"name": "Rupia ya Nepali"
diff --git a/vendor/commerceguys/intl/resources/currency/sw.json b/vendor/commerceguys/intl/resources/currency/sw.json
index 269544cd2..3672d6904 100644
--- a/vendor/commerceguys/intl/resources/currency/sw.json
+++ b/vendor/commerceguys/intl/resources/currency/sw.json
@@ -3,7 +3,7 @@
 		"name": "Afghani ya Afghanistan"
 	},
 	"MGA": {
-		"name": "Ariari ya Madagascar"
+		"name": "Ariari ya Madagaska"
 	},
 	"THB": {
 		"name": "Baht ya Tailandi",
@@ -25,37 +25,37 @@
 		"name": "Cedi ya Ghana"
 	},
 	"CRC": {
-		"name": "Colon ya Costa Rica"
+		"name": "Colon ya Kostarika"
 	},
 	"BAM": {
 		"name": "Convertible Mark ya Bosnia na Hezegovina"
 	},
 	"NIO": {
-		"name": "Cordoba ya Nicaragua"
+		"name": "Cordoba ya Nikaragwa"
 	},
 	"GMD": {
 		"name": "Dalasi ya Gambia"
 	},
 	"MKD": {
-		"name": "Denar ya Macedonia"
+		"name": "Denar ya Masedonia"
 	},
 	"DZD": {
 		"name": "Dinar ya Aljeria"
 	},
+	"RSD": {
+		"name": "Dinar ya Serbia"
+	},
 	"BHD": {
-		"name": "Dinar ya Bahrain"
+		"name": "Dinari ya Bahareni"
 	},
 	"IQD": {
-		"name": "Dinar ya Iraq"
+		"name": "Dinari ya Iraki"
 	},
 	"JOD": {
-		"name": "Dinar ya Jordan"
+		"name": "Dinari ya Jordan"
 	},
 	"KWD": {
-		"name": "Dinar ya Kuwait"
-	},
-	"RSD": {
-		"name": "Dinar ya Serbia"
+		"name": "Dinari ya Kuwait"
 	},
 	"LYD": {
 		"name": "Dinari ya Libya"
@@ -67,7 +67,7 @@
 		"name": "Dirham ya Falme za Kiarabu"
 	},
 	"MAD": {
-		"name": "Dirham ya Morocco"
+		"name": "Dirham ya Moroko"
 	},
 	"STN": {
 		"name": "Dobra ya Sao Tome na Principe"
@@ -95,10 +95,6 @@
 		"name": "Dola ya Canada",
 		"symbol": "CA$"
 	},
-	"XCD": {
-		"name": "Dola ya Caribbean Mashariki",
-		"symbol": "EC$"
-	},
 	"FJD": {
 		"name": "Dola ya Fiji"
 	},
@@ -110,7 +106,11 @@
 		"symbol": "HK$"
 	},
 	"JMD": {
-		"name": "Dola ya Jamaica"
+		"name": "Dola ya Jamaika"
+	},
+	"XCD": {
+		"name": "Dola ya Karibi Mashariki",
+		"symbol": "EC$"
 	},
 	"LRD": {
 		"name": "Dola ya Liberia"
@@ -123,7 +123,7 @@
 		"name": "Dola ya Namibia"
 	},
 	"NZD": {
-		"name": "Dola ya New Zealand",
+		"name": "Dola ya Nyuzilandi",
 		"symbol": "NZ$"
 	},
 	"SGD": {
@@ -157,7 +157,7 @@
 	},
 	"XOF": {
 		"name": "Faranga ya Afrika Magharibi CFA",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Faranga ya Afrika ya Kati CFA",
@@ -170,14 +170,14 @@
 		"name": "Faranga ya CFP",
 		"symbol": "CFPF"
 	},
-	"KMF": {
-		"name": "Faranga ya Comoros"
+	"GNF": {
+		"name": "Faranga ya Guinea"
 	},
 	"DJF": {
-		"name": "Faranga ya Djibouti"
+		"name": "Faranga ya Jibuti"
 	},
-	"GNF": {
-		"name": "Faranga ya Guinea"
+	"KMF": {
+		"name": "Faranga ya Komoro"
 	},
 	"CDF": {
 		"name": "Faranga ya Kongo"
@@ -198,7 +198,7 @@
 		"name": "Gourde ya Haiti"
 	},
 	"PYG": {
-		"name": "Guarani ya Paraguay"
+		"name": "Guarani ya Paragwai"
 	},
 	"ANG": {
 		"name": "Guilder ya Antili za Kiholanzi"
@@ -213,7 +213,7 @@
 		"name": "Kip ya Laosi"
 	},
 	"CZK": {
-		"name": "koruna ya Jamhuri ya Czech"
+		"name": "Koruna ya Jamhuri ya Czech"
 	},
 	"ISK": {
 		"name": "Krona ya Aisilandi"
@@ -225,10 +225,10 @@
 		"name": "Krone ya Denmark"
 	},
 	"NOK": {
-		"name": "Krone ya Norway"
+		"name": "Krone ya Norwe"
 	},
 	"HRK": {
-		"name": "Kuna ya Croatia"
+		"name": "Kuna ya Korasia"
 	},
 	"MWK": {
 		"name": "Kwacha ya Malawi"
@@ -243,7 +243,7 @@
 		"name": "Kyat ya Myanmar"
 	},
 	"GEL": {
-		"name": "Lari ya Georgia"
+		"name": "Lari ya Jojia"
 	},
 	"ALL": {
 		"name": "Lek ya Albania"
@@ -252,7 +252,7 @@
 		"name": "Lempira ya Hondurasi"
 	},
 	"SLL": {
-		"name": "Leone"
+		"name": "Leone ya Siera Leoni"
 	},
 	"MDL": {
 		"name": "Leu ya Moldova"
@@ -264,7 +264,7 @@
 		"name": "Lev ya Bulgaria"
 	},
 	"SZL": {
-		"name": "Lilangeni"
+		"name": "Lilangeni ya Uswazi"
 	},
 	"TRY": {
 		"name": "Lira ya Uturuki"
@@ -291,7 +291,7 @@
 		"name": "Ngultrum ya Bhutan"
 	},
 	"MRU": {
-		"name": "Ouguiya ya Mauritania"
+		"name": "Ouguiya ya Moritania"
 	},
 	"TOP": {
 		"name": "Paʻanga ya Tonga"
@@ -328,32 +328,32 @@
 		"name": "Pauni ya Visiwa vya Falkland"
 	},
 	"ARS": {
-		"name": "Peso ya Argentina"
+		"name": "Peso ya Ajentina"
 	},
 	"CLP": {
 		"name": "Peso ya Chile"
 	},
+	"DOP": {
+		"name": "Peso ya Dominika"
+	},
 	"COP": {
-		"name": "Peso ya Colombia"
+		"name": "Peso ya Kolombia"
 	},
 	"CUP": {
-		"name": "Peso ya Cuba"
+		"name": "Peso ya Kuba"
 	},
 	"CUC": {
-		"name": "Peso ya Cuba Inayoweza Kubadilishwa"
-	},
-	"DOP": {
-		"name": "Peso ya Dominica"
+		"name": "Peso ya Kuba Inayoweza Kubadilishwa"
 	},
 	"MXN": {
-		"name": "Peso ya Mexico",
+		"name": "Peso ya Meksiko",
 		"symbol": "MX$"
 	},
 	"PHP": {
 		"name": "Peso ya Ufilipino"
 	},
 	"UYU": {
-		"name": "Peso ya Uruguay"
+		"name": "Peso ya Urugwai"
 	},
 	"BWP": {
 		"name": "Pula ya Botswana"
@@ -381,7 +381,7 @@
 		"name": "Rial ya Yemen"
 	},
 	"KHR": {
-		"name": "Riel ya Cambodia"
+		"name": "Riel ya Kambodia"
 	},
 	"MYR": {
 		"name": "Ringgit ya Malaysia"
@@ -403,7 +403,7 @@
 		"symbol": "₹"
 	},
 	"MUR": {
-		"name": "Rupia ya Mauritius"
+		"name": "Rupia ya Morisi"
 	},
 	"NPR": {
 		"name": "Rupia ya Nepal"
@@ -479,7 +479,7 @@
 		"symbol": "â‚©"
 	},
 	"JPY": {
-		"name": "Yen ya Ujapani",
+		"name": "Yen ya Japani",
 		"symbol": "JPÂ¥"
 	},
 	"CNY": {
diff --git a/vendor/commerceguys/intl/resources/currency/ta.json b/vendor/commerceguys/intl/resources/currency/ta.json
index 8cacec3be..ee1f21ca5 100644
--- a/vendor/commerceguys/intl/resources/currency/ta.json
+++ b/vendor/commerceguys/intl/resources/currency/ta.json
@@ -392,7 +392,7 @@
 	},
 	"XOF": {
 		"name": "மேற�க� ஆப�பிரிக�க CFA ஃப�ராங�க�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"MZN": {
 		"name": "மொசாம�பிகன� மெடிகல�"
diff --git a/vendor/commerceguys/intl/resources/currency/te.json b/vendor/commerceguys/intl/resources/currency/te.json
index 10eb8f8ba..bc70df4c9 100644
--- a/vendor/commerceguys/intl/resources/currency/te.json
+++ b/vendor/commerceguys/intl/resources/currency/te.json
@@ -255,7 +255,7 @@
 	},
 	"XOF": {
 		"name": "పశ�చిమ ఆఫ�రికన� సి�ఫ�� ఫ�రాంక�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"PKR": {
 		"name": "పాకిస�థాన� రూపాయి"
diff --git a/vendor/commerceguys/intl/resources/currency/th.json b/vendor/commerceguys/intl/resources/currency/th.json
index 81f887834..95a47fda8 100644
--- a/vendor/commerceguys/intl/resources/currency/th.json
+++ b/vendor/commerceguys/intl/resources/currency/th.json
@@ -329,7 +329,7 @@
 	},
 	"XOF": {
 		"name": "ฟรัง�์เซฟาธนาคาร�ลางรั��อฟริ�าตะวันต�",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "ฟรัง�์เซฟาธนาคารรั��อฟริ�า�ลาง",
diff --git a/vendor/commerceguys/intl/resources/currency/tk.json b/vendor/commerceguys/intl/resources/currency/tk.json
index bdecdd714..c9027d230 100644
--- a/vendor/commerceguys/intl/resources/currency/tk.json
+++ b/vendor/commerceguys/intl/resources/currency/tk.json
@@ -212,7 +212,7 @@
 	},
 	"XOF": {
 		"name": "KFA BCEAO franky",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "KFA BEAC franky",
diff --git a/vendor/commerceguys/intl/resources/currency/tr.json b/vendor/commerceguys/intl/resources/currency/tr.json
index 7538a4a84..37c155683 100644
--- a/vendor/commerceguys/intl/resources/currency/tr.json
+++ b/vendor/commerceguys/intl/resources/currency/tr.json
@@ -39,7 +39,7 @@
 	},
 	"XOF": {
 		"name": "Batı Afrika CFA Frangı",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"BYN": {
 		"name": "Belarus Rublesi"
diff --git a/vendor/commerceguys/intl/resources/currency/uk.json b/vendor/commerceguys/intl/resources/currency/uk.json
index 82aa458e6..916bfa342 100644
--- a/vendor/commerceguys/intl/resources/currency/uk.json
+++ b/vendor/commerceguys/intl/resources/currency/uk.json
@@ -132,7 +132,7 @@
 		"name": "долар СШ�"
 	},
 	"TTD": {
-		"name": "долар Трінідаду і Тобаґо"
+		"name": "долар Тринідаду і Тобаго"
 	},
 	"DOP": {
 		"name": "домінікан�ький пе�о"
@@ -160,7 +160,7 @@
 	},
 	"XOF": {
 		"name": "західноафрикан�ький франк",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"ZWL": {
 		"name": "зімбабвій�ький долар (2009)"
@@ -403,7 +403,7 @@
 		"name": "танзаній�ький шилінг"
 	},
 	"TOP": {
-		"name": "тонґан�ька паанга"
+		"name": "тонган�ька паанга"
 	},
 	"TND": {
 		"name": "туні�ький динар"
diff --git a/vendor/commerceguys/intl/resources/currency/ur-IN.json b/vendor/commerceguys/intl/resources/currency/ur-IN.json
index 92314fdab..0d4c1e51f 100644
--- a/vendor/commerceguys/intl/resources/currency/ur-IN.json
+++ b/vendor/commerceguys/intl/resources/currency/ur-IN.json
@@ -250,7 +250,7 @@
 		"name": "سینٹ �یلینا پاؤنڈ"
 	},
 	"SLL": {
-		"name": "سیئرا لیون لیون"
+		"name": "سیئرا لیونین لیون"
 	},
 	"SYP": {
 		"name": "شامی پونڈ"
@@ -379,7 +379,7 @@
 	},
 	"XOF": {
 		"name": "مغربی ا�ریقی [CFA] �رانک",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"MKD": {
 		"name": "مقدونیائی دینار"
diff --git a/vendor/commerceguys/intl/resources/currency/ur.json b/vendor/commerceguys/intl/resources/currency/ur.json
index 93bdb14f3..dab9464c3 100644
--- a/vendor/commerceguys/intl/resources/currency/ur.json
+++ b/vendor/commerceguys/intl/resources/currency/ur.json
@@ -9,7 +9,7 @@
 		"name": "اروبن �لور�ن"
 	},
 	"ERN": {
-		"name": "اریٹیریا کا نا�کا"
+		"name": "اریٹیریائی ناک�ا"
 	},
 	"UZS": {
 		"name": "ازبکستانی سوم"
@@ -251,7 +251,7 @@
 		"name": "سینٹ �یلینا پاؤنڈ"
 	},
 	"SLL": {
-		"name": "سیئرا لیون لیون"
+		"name": "سیئرا لیونین لیون"
 	},
 	"SYP": {
 		"name": "شامی پونڈ"
@@ -380,7 +380,7 @@
 	},
 	"XOF": {
 		"name": "مغربی ا�ریقی [CFA] �رانک",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"MKD": {
 		"name": "مقدونیائی دینار"
diff --git a/vendor/commerceguys/intl/resources/currency/uz-Cyrl.json b/vendor/commerceguys/intl/resources/currency/uz-Cyrl.json
index 01a959ec9..4b14a49f6 100644
--- a/vendor/commerceguys/intl/resources/currency/uz-Cyrl.json
+++ b/vendor/commerceguys/intl/resources/currency/uz-Cyrl.json
@@ -220,7 +220,8 @@
 		"name": "Papua New Guinean Kina"
 	},
 	"PHP": {
-		"name": "Philippine Piso"
+		"name": "Philippine Piso",
+		"symbol": "₱"
 	},
 	"PLN": {
 		"name": "Polish Zloty"
@@ -338,7 +339,7 @@
 	},
 	"XOF": {
 		"name": "West African CFA Franc",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"YER": {
 		"name": "Yemeni Rial"
diff --git a/vendor/commerceguys/intl/resources/currency/uz.json b/vendor/commerceguys/intl/resources/currency/uz.json
index c0c663226..d20643d6a 100644
--- a/vendor/commerceguys/intl/resources/currency/uz.json
+++ b/vendor/commerceguys/intl/resources/currency/uz.json
@@ -470,7 +470,7 @@
 	},
 	"XOF": {
 		"name": "G‘arbiy Afrika CFA franki",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XCD": {
 		"name": "Sharqiy Karib dollari",
diff --git a/vendor/commerceguys/intl/resources/currency/vi.json b/vendor/commerceguys/intl/resources/currency/vi.json
index e151a1c15..3a4ee43e6 100644
--- a/vendor/commerceguys/intl/resources/currency/vi.json
+++ b/vendor/commerceguys/intl/resources/currency/vi.json
@@ -201,7 +201,7 @@
 	},
 	"XOF": {
 		"name": "Franc CFA Tây Phi",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "Franc CFA Trung Phi",
@@ -489,7 +489,7 @@
 	},
 	"JPY": {
 		"name": "Yên Nhật",
-		"symbol": "JPÂ¥"
+		"symbol": "Â¥"
 	},
 	"PLN": {
 		"name": "Zloty Ba Lan"
diff --git a/vendor/commerceguys/intl/resources/currency/yue-Hans.json b/vendor/commerceguys/intl/resources/currency/yue-Hans.json
index 499e55222..9ed5a13a1 100644
--- a/vendor/commerceguys/intl/resources/currency/yue-Hans.json
+++ b/vendor/commerceguys/intl/resources/currency/yue-Hans.json
@@ -108,7 +108,7 @@
 	},
 	"XOF": {
 		"name": "法郎 (CFA–BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "法郎 (CFA–BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/yue.json b/vendor/commerceguys/intl/resources/currency/yue.json
index 05e3d8145..287e98d0d 100644
--- a/vendor/commerceguys/intl/resources/currency/yue.json
+++ b/vendor/commerceguys/intl/resources/currency/yue.json
@@ -178,7 +178,7 @@
 	},
 	"XOF": {
 		"name": "法郎 (CFA–BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "法郎 (CFA–BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/zh-Hans-HK.json b/vendor/commerceguys/intl/resources/currency/zh-Hans-HK.json
index 6186f6ce1..109470cde 100644
--- a/vendor/commerceguys/intl/resources/currency/zh-Hans-HK.json
+++ b/vendor/commerceguys/intl/resources/currency/zh-Hans-HK.json
@@ -424,7 +424,7 @@
 	},
 	"XOF": {
 		"name": "西�法郎",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"SGD": {
 		"name": "新加�元"
diff --git a/vendor/commerceguys/intl/resources/currency/zh-Hant-HK.json b/vendor/commerceguys/intl/resources/currency/zh-Hant-HK.json
index 9eb20aec4..09f48e010 100644
--- a/vendor/commerceguys/intl/resources/currency/zh-Hant-HK.json
+++ b/vendor/commerceguys/intl/resources/currency/zh-Hant-HK.json
@@ -144,7 +144,7 @@
 	},
 	"XOF": {
 		"name": "多哥�洲共�體法郎",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"AOA": {
 		"name": "安哥拉寬扎"
diff --git a/vendor/commerceguys/intl/resources/currency/zh-Hant.json b/vendor/commerceguys/intl/resources/currency/zh-Hant.json
index 8de16e158..d615d0c72 100644
--- a/vendor/commerceguys/intl/resources/currency/zh-Hant.json
+++ b/vendor/commerceguys/intl/resources/currency/zh-Hant.json
@@ -175,7 +175,7 @@
 	},
 	"XOF": {
 		"name": "法郎 (CFA–BCEAO)",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"XAF": {
 		"name": "法郎 (CFA–BEAC)",
diff --git a/vendor/commerceguys/intl/resources/currency/zh.json b/vendor/commerceguys/intl/resources/currency/zh.json
index 884946bb5..a1b2e5b15 100644
--- a/vendor/commerceguys/intl/resources/currency/zh.json
+++ b/vendor/commerceguys/intl/resources/currency/zh.json
@@ -424,7 +424,7 @@
 	},
 	"XOF": {
 		"name": "西�法郎",
-		"symbol": "CFA"
+		"symbol": "F CFA"
 	},
 	"SGD": {
 		"name": "新加�元"
diff --git a/vendor/commerceguys/intl/resources/language/af.json b/vendor/commerceguys/intl/resources/language/af.json
index 4f801a509..e2daba336 100644
--- a/vendor/commerceguys/intl/resources/language/af.json
+++ b/vendor/commerceguys/intl/resources/language/af.json
@@ -31,6 +31,7 @@
 	"zh-Hant": "Chinees (Tradisioneel)",
 	"zh-Hans": "Chinees (Vereenvoudig)",
 	"da": "Deens",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"de": "Duits",
 	"de-AT": "Duits (Oostenryk)",
@@ -108,12 +109,14 @@
 	"lb": "Luxemburgs",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"ml": "Malabaars",
 	"ms": "Maleis",
 	"mg": "Malgassies",
 	"mt": "Maltees",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -131,9 +134,11 @@
 	"ne": "Nepalees",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigeriese Pidgin",
 	"lrc": "Noord-Luri",
 	"nd": "Noord-Ndebele",
 	"se": "Noord-Sami",
+	"no": "Noors",
 	"nus": "Nuer",
 	"nn": "Nuwe Noors",
 	"nyn": "Nyankole",
@@ -163,6 +168,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santalies",
 	"seh": "Sena",
 	"tzm": "Sentraal-Atlas-Tamazight",
 	"sr": "Serwies",
@@ -181,6 +188,7 @@
 	"es-419": "Spaans (Latyns-Amerika)",
 	"es-MX": "Spaans (Meksiko)",
 	"zgh": "Standaard Marokkaanse Tamazight",
+	"su": "Sundanees",
 	"sw": "Swahili",
 	"sw-CD": "Swahili (Demokratiese Republiek van die Kongo)",
 	"sv": "Sweeds",
diff --git a/vendor/commerceguys/intl/resources/language/ar-EG.json b/vendor/commerceguys/intl/resources/language/ar-EG.json
index a89347ad5..768358325 100644
--- a/vendor/commerceguys/intl/resources/language/ar-EG.json
+++ b/vendor/commerceguys/intl/resources/language/ar-EG.json
@@ -41,6 +41,7 @@
 	"bas": "الباسا",
 	"eu": "الباسكية",
 	"bm": "البامبارا",
+	"pcm": "البدجنية النيجيرية",
 	"pt": "البرتغالية",
 	"pt-PT": "البرتغالية الأوروبية",
 	"br": "البريتونية",
@@ -71,6 +72,7 @@
 	"km": "الخميرية",
 	"xh": "الخوسا",
 	"da": "الدنماركية",
+	"doi": "الدوجرية",
 	"dua": "الديولا",
 	"rn": "الرندي",
 	"rwk": "الروا",
@@ -82,15 +84,18 @@
 	"zu": "الزولو",
 	"dz": "الزونخاية",
 	"sah": "الساخيّة",
+	"sat": "السانتالية",
 	"sg": "السانجو",
 	"nds-NL": "السكسونية الس�لى",
 	"sk": "السلو�اكية",
 	"sl": "السلو�انية",
 	"sd": "السندية",
+	"sa": "السنسكريتية",
 	"si": "السنهالية",
 	"sw": "السواحلية",
 	"ckb": "السورانية الكردية",
 	"xog": "السوغا",
+	"su": "السوندانية",
 	"sv": "السويدية",
 	"ceb": "السيبيوانية",
 	"ii": "السيتشيون يي",
@@ -157,7 +162,9 @@
 	"ml": "المالايالامية",
 	"mt": "المالطية",
 	"ms": "الماليزية",
+	"mni": "المانيبورية",
 	"mi": "الماورية",
+	"mai": "المايثيلي",
 	"mk": "المقدونية",
 	"mg": "الملغاشي",
 	"mn": "المنغولية",
@@ -165,6 +172,7 @@
 	"ro-MD": "المولدو�ية",
 	"mer": "الميرو",
 	"nd": "النديبيل الشمالية",
+	"no": "النرويجية",
 	"nb": "النرويجية بوكمال",
 	"nn": "النرويجية نينورسك",
 	"nus": "النوير",
diff --git a/vendor/commerceguys/intl/resources/language/ar-LY.json b/vendor/commerceguys/intl/resources/language/ar-LY.json
index 6095c088e..a66fd3d56 100644
--- a/vendor/commerceguys/intl/resources/language/ar-LY.json
+++ b/vendor/commerceguys/intl/resources/language/ar-LY.json
@@ -41,6 +41,7 @@
 	"bas": "الباسا",
 	"eu": "الباسكية",
 	"bm": "البامبارا",
+	"pcm": "البدجنية النيجيرية",
 	"pt": "البرتغالية",
 	"pt-PT": "البرتغالية الأوروبية",
 	"br": "البريتونية",
@@ -71,6 +72,7 @@
 	"km": "الخميرية",
 	"xh": "الخوسا",
 	"da": "الدانمركية",
+	"doi": "الدوجرية",
 	"dua": "الديولا",
 	"rn": "الرندي",
 	"rwk": "الروا",
@@ -82,16 +84,19 @@
 	"zu": "الزولو",
 	"dz": "الزونخاية",
 	"sah": "الساخيّة",
+	"sat": "السانتالية",
 	"sg": "السانجو",
 	"nds-NL": "السكسونية الس�لى",
 	"sk": "السلو�اكية",
 	"sl": "السلو�انية",
 	"sd": "السندية",
+	"sa": "السنسكريتية",
 	"si": "السنهالية",
 	"sw": "السواحيلية",
 	"sw-CD": "السواحيلية الكونغولية",
 	"ckb": "السورانية الكردية",
 	"xog": "السوغا",
+	"su": "السوندانية",
 	"sv": "السويدية",
 	"ceb": "السيبيوانية",
 	"ii": "السيتشيون يي",
@@ -156,7 +161,9 @@
 	"ml": "المالايالامية",
 	"mt": "المالطية",
 	"ms": "الماليزية",
+	"mni": "المانيبورية",
 	"mi": "الماورية",
+	"mai": "المايثيلي",
 	"mk": "المقدونية",
 	"mg": "الملغاشي",
 	"mn": "المنغولية",
@@ -164,6 +171,7 @@
 	"ro-MD": "المولدو�ية",
 	"mer": "الميرو",
 	"nd": "النديبيل الشمالية",
+	"no": "النرويجية",
 	"nb": "النرويجية بوكمال",
 	"nn": "النرويجية نينورسك",
 	"nus": "النوير",
diff --git a/vendor/commerceguys/intl/resources/language/ar-SA.json b/vendor/commerceguys/intl/resources/language/ar-SA.json
index 2781ab3d5..cef1ccf1b 100644
--- a/vendor/commerceguys/intl/resources/language/ar-SA.json
+++ b/vendor/commerceguys/intl/resources/language/ar-SA.json
@@ -41,6 +41,7 @@
 	"bas": "الباسا",
 	"eu": "الباسكية",
 	"bm": "البامبارا",
+	"pcm": "البدجنية النيجيرية",
 	"pt": "البرتغالية",
 	"pt-PT": "البرتغالية الأوروبية",
 	"br": "البريتونية",
@@ -71,6 +72,7 @@
 	"km": "الخميرية",
 	"xh": "الخوسا",
 	"da": "الدانمركية",
+	"doi": "الدوجرية",
 	"dua": "الديولا",
 	"rn": "الرندي",
 	"rwk": "الروا",
@@ -82,16 +84,19 @@
 	"zu": "الزولو",
 	"dz": "الزونخاية",
 	"sah": "الساخيّة",
+	"sat": "السانتالية",
 	"sg": "السانجو",
 	"nds-NL": "السكسونية الس�لى",
 	"sk": "السلو�اكية",
 	"sl": "السلو�انية",
 	"sd": "السندية",
+	"sa": "السنسكريتية",
 	"si": "السنهالية",
 	"sw": "السواحيلية",
 	"sw-CD": "السواحيلية الكونغولية",
 	"ckb": "السورانية الكردية",
 	"xog": "السوغا",
+	"su": "السوندانية",
 	"sv": "السويدية",
 	"ceb": "السيبيوانية",
 	"ii": "السيتشيون يي",
@@ -156,7 +161,9 @@
 	"ml": "المالايالامية",
 	"mt": "المالطية",
 	"ms": "الماليزية",
+	"mni": "المانيبورية",
 	"mi": "الماورية",
+	"mai": "المايثيلي",
 	"mk": "المقدونية",
 	"mg": "الملغاشي",
 	"mn": "المنغولية",
@@ -164,6 +171,7 @@
 	"ro-MD": "المولدو�ية",
 	"mer": "الميرو",
 	"nd": "النديبيل الشمالية",
+	"no": "النرويجية",
 	"nb": "النرويجية بوكمال",
 	"nn": "النرويجية نينورسك",
 	"nus": "النوير",
diff --git a/vendor/commerceguys/intl/resources/language/ar.json b/vendor/commerceguys/intl/resources/language/ar.json
index bef20a7fb..a775401ae 100644
--- a/vendor/commerceguys/intl/resources/language/ar.json
+++ b/vendor/commerceguys/intl/resources/language/ar.json
@@ -41,6 +41,7 @@
 	"bas": "الباسا",
 	"eu": "الباسكية",
 	"bm": "البامبارا",
+	"pcm": "البدجنية النيجيرية",
 	"pt": "البرتغالية",
 	"pt-PT": "البرتغالية الأوروبية",
 	"br": "البريتونية",
@@ -71,6 +72,7 @@
 	"km": "الخميرية",
 	"xh": "الخوسا",
 	"da": "الدانمركية",
+	"doi": "الدوجرية",
 	"dua": "الديولا",
 	"rn": "الرندي",
 	"rwk": "الروا",
@@ -82,15 +84,18 @@
 	"zu": "الزولو",
 	"dz": "الزونخاية",
 	"sah": "الساخيّة",
+	"sat": "السانتالية",
 	"sg": "السانجو",
 	"nds-NL": "السكسونية الس�لى",
 	"sk": "السلو�اكية",
 	"sl": "السلو�انية",
 	"sd": "السندية",
+	"sa": "السنسكريتية",
 	"si": "السنهالية",
 	"sw": "السواحلية",
 	"ckb": "السورانية الكردية",
 	"xog": "السوغا",
+	"su": "السوندانية",
 	"sv": "السويدية",
 	"ceb": "السيبيوانية",
 	"ii": "السيتشيون يي",
@@ -157,7 +162,9 @@
 	"ml": "المالايالامية",
 	"mt": "المالطية",
 	"ms": "الماليزية",
+	"mni": "المانيبورية",
 	"mi": "الماورية",
+	"mai": "المايثيلي",
 	"mk": "المقدونية",
 	"mg": "الملغاشي",
 	"mn": "المنغولية",
@@ -165,6 +172,7 @@
 	"ro-MD": "المولدو�ية",
 	"mer": "الميرو",
 	"nd": "النديبيل الشمالية",
+	"no": "النرويجية",
 	"nb": "النرويجية بوكمال",
 	"nn": "النرويجية نينورسك",
 	"nus": "النوير",
diff --git a/vendor/commerceguys/intl/resources/language/as.json b/vendor/commerceguys/intl/resources/language/as.json
index d34922a86..63da73d1b 100644
--- a/vendor/commerceguys/intl/resources/language/as.json
+++ b/vendor/commerceguys/intl/resources/language/as.json
@@ -70,6 +70,7 @@
 	"gu": "গ�জৰাটী",
 	"gl": "গেলিচিয়ান",
 	"el": "গ�ৰীক",
+	"sat": "চাওতালি",
 	"ksb": "চাম�বালা",
 	"cgg": "চিগা",
 	"ceb": "চিব�ৱানো",
@@ -90,6 +91,7 @@
 	"fr-CH": "ছ�ইচ ফ�ৰেন�স",
 	"de-CH": "ছ�ইচ হাই জাৰ�মান",
 	"sv": "ছ�ইডিচ",
+	"su": "ছ�ণ�ডানীজ",
 	"seh": "ছেনা",
 	"xog": "ছোগা",
 	"so": "ছোমালি",
@@ -121,6 +123,7 @@
 	"jgo": "নগোম�বা",
 	"nn": "নৰৱেজিয়ান নায়নোৰ�স�ক",
 	"nb": "নৰৱেজিয়ান বোকমাল",
+	"pcm": "নাইজেৰিয়ান পিজিন",
 	"naq": "নামা",
 	"nnh": "নিয়েম�বোন",
 	"nus": "ন�য়েৰ",
@@ -157,6 +160,7 @@
 	"vi": "ভিয়েটনামী",
 	"vun": "ভ�ঞ�জ�",
 	"mn": "মংগোলীয়",
+	"mni": "মণিপ�ৰী",
 	"mfe": "মৰিছিয়ান",
 	"mi": "মাওৰি",
 	"kde": "মাকোণ�ড",
@@ -174,6 +178,7 @@
 	"mk": "মেচিডোনীয়",
 	"mgo": "মেটা",
 	"mer": "মেৰ�",
+	"mai": "মৈথিলী",
 	"ro-MD": "মোল�ডাভিয়ান",
 	"yav": "য়াংবেন",
 	"rwk": "ৰৱা",
@@ -204,6 +209,7 @@
 	"sk": "শ�লোভাক",
 	"sl": "শ�লোভেনিয়ান",
 	"zgh": "ষ�টেণ�ডাৰ�ড মোৰোক�কান তামাজাইট",
+	"sa": "সংস�কৃত",
 	"zh-Hans": "সৰলীকৃত চীনা",
 	"si": "সিংহলা",
 	"sd": "সিন�ধী",
@@ -215,5 +221,7 @@
 	"haw": "হাৱাই",
 	"hi": "হিন�দী",
 	"he": "হিব�ৰ�",
-	"xh": "হোছা"
+	"xh": "হোছা",
+	"doi": "Dogri",
+	"no": "Norwegian"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ast.json b/vendor/commerceguys/intl/resources/language/ast.json
index 2265c5662..338441c13 100644
--- a/vendor/commerceguys/intl/resources/language/ast.json
+++ b/vendor/commerceguys/intl/resources/language/ast.json
@@ -50,6 +50,7 @@
 	"hr": "croata",
 	"ku": "curdu",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embú",
@@ -122,12 +123,14 @@
 	"luy": "luyia",
 	"mk": "macedoniu",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayu",
 	"mg": "malgaxe",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "marathi",
 	"mas": "masái",
@@ -144,6 +147,8 @@
 	"ne": "nepalés",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nixerianu simplificáu",
+	"no": "noruegu",
 	"nb": "noruegu Bokmål",
 	"nn": "noruegu Nynorsk",
 	"nus": "nuer",
@@ -169,6 +174,8 @@
 	"se": "sami del norte",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscritu",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbiu",
 	"ksb": "shambala",
@@ -176,6 +183,7 @@
 	"sd": "sindhi",
 	"xog": "soga",
 	"so": "somalín",
+	"su": "sondanés",
 	"sw": "suaḥili",
 	"sw-CD": "suaḥili del Congu",
 	"sv": "suecu",
diff --git a/vendor/commerceguys/intl/resources/language/az-Cyrl.json b/vendor/commerceguys/intl/resources/language/az-Cyrl.json
index f2ea178f7..3efc85473 100644
--- a/vendor/commerceguys/intl/resources/language/az-Cyrl.json
+++ b/vendor/commerceguys/intl/resources/language/az-Cyrl.json
@@ -1,5 +1,7 @@
 {
+	"doi": "Dogri",
 	"nds": "Low German",
+	"no": "Norwegian",
 	"ii": "Sichuan Yi",
 	"en-AU": "�в�тралија ин�или�ҹә�и",
 	"de-AT": "�в�трија алманҹа�ы",
@@ -114,12 +116,14 @@
 	"luo": "луо",
 	"lb": "лүк�ембург",
 	"mzn": "мазандаран",
+	"mai": "маитили",
 	"mk": "македон",
 	"kde": "маконде",
 	"mg": "малага�",
 	"ms": "малај",
 	"ml": "малајалам",
 	"mt": "малта",
+	"mni": "манипүри",
 	"mi": "маори",
 	"mr": "маратһи",
 	"mas": "ма�ај",
@@ -136,6 +140,7 @@
 	"naq": "нама",
 	"jgo": "нгомба",
 	"ne": "непал",
+	"pcm": "ни�ер креол",
 	"nyn": "нјанкол",
 	"nnh": "н�иембоон",
 	"nus": "нуер",
@@ -160,6 +165,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антал",
 	"sah": "�аха",
 	"ceb": "�ебуан",
 	"seh": "�ена",
@@ -172,6 +179,7 @@
 	"so": "�омали",
 	"ckb": "�оран",
 	"sw": "�уаһили",
+	"su": "�ундан",
 	"dav": "таита",
 	"th": "тај",
 	"zgh": "тамази",
diff --git a/vendor/commerceguys/intl/resources/language/az.json b/vendor/commerceguys/intl/resources/language/az.json
index 7d5685848..829c0e74b 100644
--- a/vendor/commerceguys/intl/resources/language/az.json
+++ b/vendor/commerceguys/intl/resources/language/az.json
@@ -36,6 +36,7 @@
 	"zh": "çin",
 	"da": "danimarka",
 	"dyo": "diola",
+	"doi": "doqri",
 	"dua": "duala",
 	"dz": "dzonqxa",
 	"ebu": "embu",
@@ -120,12 +121,14 @@
 	"hu": "macar",
 	"jmc": "maçam",
 	"mgh": "maxuva-meetto",
+	"mai": "maitili",
 	"mk": "makedon",
 	"kde": "makond",
 	"mg": "malaqas",
 	"ms": "malay",
 	"ml": "malayalam",
 	"mt": "malta",
+	"mni": "manipüri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masay",
@@ -142,7 +145,9 @@
 	"naq": "nama",
 	"ne": "nepal",
 	"nnh": "ngiemboon",
+	"pcm": "niger kreol",
 	"jgo": "nqomba",
+	"no": "norveç",
 	"nus": "nuer",
 	"nn": "nünorsk norveç",
 	"nyn": "nyankol",
@@ -166,6 +171,8 @@
 	"saq": "samburu",
 	"sg": "sanqo",
 	"sbp": "sanqu",
+	"sa": "sanskrit",
+	"sat": "santal",
 	"ceb": "sebuan",
 	"seh": "sena",
 	"sr": "serb",
@@ -177,6 +184,7 @@
 	"xog": "soqa",
 	"so": "somali",
 	"sw": "suahili",
+	"su": "sundan",
 	"ksb": "ÅŸambala",
 	"lrc": "ÅŸimali luri",
 	"nd": "ÅŸimali ndebele",
diff --git a/vendor/commerceguys/intl/resources/language/be.json b/vendor/commerceguys/intl/resources/language/be.json
index 3a07944c4..8d5698b5a 100644
--- a/vendor/commerceguys/intl/resources/language/be.json
+++ b/vendor/commerceguys/intl/resources/language/be.json
@@ -106,6 +106,7 @@
 	"mi": "маары",
 	"mas": "маа�ай",
 	"mzn": "мазанд�ран�ка�",
+	"mai": "майтхілі",
 	"mk": "македон�ка�",
 	"kde": "маконд�",
 	"mgh": "макуўа-меета",
@@ -118,17 +119,20 @@
 	"mr": "маратхі",
 	"mfe": "мары�ьен",
 	"jmc": "мачамб�",
+	"mni": "мейт�й",
 	"es-MX": "мек�ікан�ка� і�пан�ка�",
 	"mer": "меру",
 	"mgo": "мета",
 	"mua": "мунданг",
 	"naq": "нама",
+	"no": "нарвеж�ка�",
 	"nb": "нарвеж�ка� (букмол)",
 	"nn": "нарвеж�ка� (нюношк)",
 	"nnh": "нг’ембон",
 	"jgo": "нгомба",
 	"nmg": "нгумба",
 	"ne": "непаль�ка�",
+	"pcm": "нігерый�кі піджын",
 	"nl": "нід�рланд�ка�",
 	"nds": "ніжнен�мецка�",
 	"nds-NL": "ніжне�ак�он�ка�",
@@ -155,6 +159,8 @@
 	"saq": "�амбуру",
 	"sg": "�анга",
 	"sbp": "�ангу",
+	"sa": "�ан�крыт",
+	"sat": "�анталі",
 	"ceb": "�ебуана",
 	"seh": "�ена",
 	"sr": "�ерб�ка�",
@@ -165,6 +171,7 @@
 	"xog": "�ога",
 	"zgh": "�тандартна� маракан�ка� тамазіхт",
 	"sw": "�уахілі",
+	"su": "�унда",
 	"ii": "�ычуань�ка� йі",
 	"tzm": "��р�днеатла�ка� тамазігхт",
 	"tg": "таджык�ка�",
@@ -215,5 +222,6 @@
 	"jv": "�ван�ка�",
 	"sah": "�куцка�",
 	"yav": "�нгб�н",
-	"ja": "�пон�ка�"
+	"ja": "�пон�ка�",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/bg.json b/vendor/commerceguys/intl/resources/language/bg.json
index 46b79c821..6cc5e62ce 100644
--- a/vendor/commerceguys/intl/resources/language/bg.json
+++ b/vendor/commerceguys/intl/resources/language/bg.json
@@ -1,13 +1,11 @@
 {
+	"en-AU": "ав�тралий�ки англий�ки",
 	"agq": "агем",
 	"az": "азербайджан�ки",
 	"ak": "акан",
 	"sq": "албан�ки",
 	"am": "амхар�ки",
 	"en": "англий�ки",
-	"en-AU": "англий�ки (�в�трали�)",
-	"en-CA": "англий�ки (Канада)",
-	"en-GB": "англий�ки (Обединено крал�тво)",
 	"ar": "араб�ки",
 	"hy": "армен�ки",
 	"as": "а�ам�ки",
@@ -26,6 +24,7 @@
 	"brx": "бодо",
 	"bs": "бо�нен�ки",
 	"br": "бретон�ки",
+	"en-GB": "британ�ки англий�ки",
 	"bg": "българ�ки",
 	"vai": "ваи",
 	"wae": "валзер�ки нем�ки",
@@ -44,6 +43,7 @@
 	"da": "дат�ки",
 	"dz": "дзонгкха",
 	"dyo": "диола-фони",
+	"doi": "догри",
 	"dsb": "долнолужишки",
 	"nds": "долнонем�ки",
 	"nds-NL": "долно�ак�он�ки",
@@ -73,6 +73,7 @@
 	"kkj": "како",
 	"kln": "календжин",
 	"kam": "камба",
+	"en-CA": "канад�ки англий�ки",
 	"kn": "каннада",
 	"yue": "кантон�ки",
 	"ca": "каталон�ки",
@@ -91,8 +92,8 @@
 	"kok": "конкани",
 	"ko": "корей�ки",
 	"kw": "корнуол�ки",
-	"xh": "к�о�а",
 	"km": "кхмер�ки",
+	"xh": "кхо�а",
 	"ksh": "кьолн�ки",
 	"ku": "кюрд�ки",
 	"ckb": "кюрд�ки (централен)",
@@ -107,6 +108,7 @@
 	"luy": "лух�",
 	"lb": "люк�ембург�ки",
 	"mzn": "мазандеран�ки",
+	"mai": "майтхили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макуа мето",
@@ -114,6 +116,7 @@
 	"ml": "мала�лам",
 	"mg": "малгашки",
 	"mt": "малтий�ки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ай�ки",
@@ -131,7 +134,9 @@
 	"de-AT": "нем�ки (�в�три�)",
 	"de-CH": "нем�ки (Швейцари�)",
 	"ne": "непал�ки",
+	"pcm": "нигерий�ки пиджин",
 	"nl": "нидерланд�ки",
+	"no": "норвежки",
 	"nb": "норвежки (букмол)",
 	"nn": "норвежки (нюношк)",
 	"nus": "нуер",
@@ -151,10 +156,12 @@
 	"ro": "румън�ки",
 	"rn": "рунди",
 	"ru": "ру�ки",
-	"sah": "�акха",
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
+	"sah": "�аха",
 	"ceb": "�ебуан�ки",
 	"lrc": "�еверен лури",
 	"nd": "�еверен ндебеле",
@@ -169,6 +176,7 @@
 	"sr": "�ръб�ки",
 	"zgh": "�тандартен марокан�ки тамазигт",
 	"sw": "�уахили",
+	"su": "�ундан�ки",
 	"ii": "�ъчуан�ки йи",
 	"tg": "таджик�ки",
 	"dav": "таита",
diff --git a/vendor/commerceguys/intl/resources/language/bn-IN.json b/vendor/commerceguys/intl/resources/language/bn-IN.json
index 3149a9292..849d5a8d4 100644
--- a/vendor/commerceguys/intl/resources/language/bn-IN.json
+++ b/vendor/commerceguys/intl/resources/language/bn-IN.json
@@ -96,6 +96,7 @@
 	"xh": "জোসা",
 	"to": "টোঙ�গান",
 	"da": "ডেনিশ",
+	"doi": "ডোগরি",
 	"dav": "তাইতা",
 	"shi": "তাচেলহিত",
 	"tg": "তাজিক",
@@ -110,8 +111,10 @@
 	"teo": "তেসো",
 	"th": "থাই",
 	"dua": "দ�য়ালা",
+	"nn": "নরওয়েজিয়ান নিনর�স�ক",
 	"nb": "নরওয়েজিয়ান বোকমাল",
-	"nn": "নরওয়েজীয়ান নিনর�স�ক",
+	"no": "নরওয়েজীয়",
+	"pcm": "নাইজেরিয় পিজিন",
 	"naq": "নামা",
 	"nnh": "নিঙ�গেম�ব�ন",
 	"nds": "নিম�ন জার�মানি",
@@ -150,6 +153,7 @@
 	"vi": "ভিয়েতনামী",
 	"vun": "ভ�ঞ�জো",
 	"mn": "মঙ�গোলিয়",
+	"mni": "মণিপ�রী",
 	"ckb": "মধ�য ক�র�দিশ",
 	"mfe": "মরিসিয়ান",
 	"ro-MD": "মলদাভিয়",
@@ -167,6 +171,7 @@
 	"mua": "ম�দাঙ�গ",
 	"mgo": "মেটা",
 	"mer": "মের�",
+	"mai": "মৈথিলি",
 	"es-MX": "ম�যাক�সিকান স�প�যানিশ",
 	"mk": "ম�যাসিডোনীয়",
 	"rof": "রম�বো",
@@ -190,7 +195,9 @@
 	"sah": "শাখা",
 	"ksb": "শাম�বালা",
 	"sn": "শোনা",
+	"sa": "সংস�কৃত",
 	"zh-Hans": "সরলীকৃত চীনা",
+	"sat": "সা�ওতালি",
 	"sbp": "সাঙ�গ�",
 	"sg": "সাঙ�গো",
 	"saq": "সামব�র�",
@@ -202,6 +209,7 @@
 	"gsw": "স�ইস জার�মান",
 	"fr-CH": "স�ইস ফরাসি",
 	"de-CH": "স�ইস হাই জার�মান",
+	"su": "স�দানী",
 	"seh": "সেনা",
 	"tzm": "সেন�ট�রাল আটলাস তামাজিগাত",
 	"xog": "সোগা",
diff --git a/vendor/commerceguys/intl/resources/language/bn.json b/vendor/commerceguys/intl/resources/language/bn.json
index 53c5c3152..1243433c3 100644
--- a/vendor/commerceguys/intl/resources/language/bn.json
+++ b/vendor/commerceguys/intl/resources/language/bn.json
@@ -96,6 +96,7 @@
 	"xh": "জোসা",
 	"to": "টোঙ�গান",
 	"da": "ডেনিশ",
+	"doi": "ডোগরি",
 	"dav": "তাইতা",
 	"shi": "তাচেলহিত",
 	"tg": "তাজিক",
@@ -110,8 +111,10 @@
 	"teo": "তেসো",
 	"th": "থাই",
 	"dua": "দ�য়ালা",
+	"nn": "নরওয়েজিয়ান নিনর�স�ক",
 	"nb": "নরওয়েজিয়ান বোকমাল",
-	"nn": "নরওয়েজীয়ান নিনর�স�ক",
+	"no": "নরওয়েজীয়",
+	"pcm": "নাইজেরিয় পিজিন",
 	"naq": "নামা",
 	"nnh": "নিঙ�গেম�ব�ন",
 	"nds": "নিম�ন জার�মানি",
@@ -150,6 +153,7 @@
 	"vi": "ভিয়েতনামী",
 	"vun": "ভ�ঞ�জো",
 	"mn": "মঙ�গোলিয়",
+	"mni": "মণিপ�রী",
 	"ckb": "মধ�য ক�র�দিশ",
 	"mfe": "মরিসিয়ান",
 	"ro-MD": "মলদাভিয়",
@@ -167,6 +171,7 @@
 	"mua": "ম�দাঙ�গ",
 	"mgo": "মেটা",
 	"mer": "মের�",
+	"mai": "মৈথিলি",
 	"es-MX": "ম�যাক�সিকান স�প�যানিশ",
 	"mk": "ম�যাসিডোনীয়",
 	"rof": "রম�বো",
@@ -190,7 +195,9 @@
 	"sah": "শাখা",
 	"ksb": "শাম�বালা",
 	"sn": "শোনা",
+	"sa": "সংস�কৃত",
 	"zh-Hans": "সরলীকৃত চীনা",
+	"sat": "সা�ওতালি",
 	"sbp": "সাঙ�গ�",
 	"sg": "সাঙ�গো",
 	"saq": "সামব�র�",
@@ -202,6 +209,7 @@
 	"gsw": "স�ইস জার�মান",
 	"fr-CH": "স�ইস ফরাসি",
 	"de-CH": "স�ইস হাই জার�মান",
+	"su": "স�দানী",
 	"seh": "সেনা",
 	"tzm": "সেন�ট�রাল আটলাস তামাজিগাত",
 	"xog": "সোগা",
diff --git a/vendor/commerceguys/intl/resources/language/brx.json b/vendor/commerceguys/intl/resources/language/brx.json
index afe43b66c..3d011acc4 100644
--- a/vendor/commerceguys/intl/resources/language/brx.json
+++ b/vendor/commerceguys/intl/resources/language/brx.json
@@ -32,6 +32,7 @@
 	"naq": "Nama",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"lrc": "Northern Luri",
 	"nus": "Nuer",
 	"rof": "Rombo",
@@ -122,6 +123,7 @@
 	"nl": "डच�",
 	"dua": "ड�आला",
 	"da": "डैनीश�",
+	"doi": "डोगरी",
 	"ta": "तमिळ",
 	"tg": "ताजिक�",
 	"ti": "तिग�रीन�या",
@@ -134,6 +136,7 @@
 	"nds-NL": "नीजी स�तरिय जर�मन (नेदरलैण�ड)",
 	"ne": "नेपाली",
 	"nn": "नॉर�वेजियन� नीनॉर�स�क�",
+	"no": "नॉर�वेजीयन�",
 	"nb": "नोर�वेगी बोकमाल",
 	"nyn": "न�यानकोले",
 	"ps": "पख़�त�",
@@ -164,6 +167,7 @@
 	"bs": "बोस�नियाई",
 	"br": "ब�रटों",
 	"dz": "भ�टानी",
+	"mni": "मणीप�री",
 	"mr": "मराठी",
 	"ml": "मलयालम",
 	"ms": "मलाय",
@@ -171,6 +175,7 @@
 	"mi": "माओरी",
 	"mt": "मालटीज़�",
 	"mg": "मालागासी",
+	"mai": "मैथीली",
 	"mk": "मैसेडोनियन�",
 	"mn": "मोंगोलियन",
 	"ro-MD": "मोल�डेवियन�",
@@ -195,11 +200,14 @@
 	"cy": "वैल�श�",
 	"wo": "वोलोफ",
 	"sn": "शोना",
+	"sat": "संताली",
 	"sr": "सर�बियन�",
+	"sa": "संस�कृत�",
 	"sg": "सांग�रो",
 	"sd": "सिंधी",
 	"ii": "सीच�आन� यी",
 	"si": "सींहाला",
+	"su": "स�न�दानी",
 	"so": "सोमाली",
 	"dsb": "सोर�बियन�",
 	"gd": "स�कॉट�स� गैलिक�",
diff --git a/vendor/commerceguys/intl/resources/language/bs-Cyrl.json b/vendor/commerceguys/intl/resources/language/bs-Cyrl.json
index 412a742d4..47b2cf618 100644
--- a/vendor/commerceguys/intl/resources/language/bs-Cyrl.json
+++ b/vendor/commerceguys/intl/resources/language/bs-Cyrl.json
@@ -38,6 +38,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"dsb": "доњолужичко�рп�ки",
 	"dua": "дуала",
 	"ee": "еве",
@@ -105,6 +106,7 @@
 	"luo": "луо",
 	"hu": "мађар�ки",
 	"mzn": "мазандерани",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макуа-мето",
@@ -112,6 +114,7 @@
 	"ml": "малајалам",
 	"ms": "малај�ки",
 	"mt": "малтешки",
+	"mni": "манипури",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�аи",
@@ -128,6 +131,7 @@
 	"ne": "непал�ки",
 	"nds": "ни�ки њемачки",
 	"nds-NL": "ни�ки њемачки (Холандија)",
+	"no": "норвешки",
 	"nb": "норвешки бокмал",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
@@ -153,6 +157,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sw": "�вахили",
 	"sw-CD": "�вахили (Демократ�ка Република Конго)",
 	"seh": "�ена",
@@ -168,6 +174,7 @@
 	"so": "�омал�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандардни марокан�ки тамазихт",
+	"su": "�ундан�ки",
 	"dav": "таита",
 	"th": "тајланд�ки",
 	"ta": "тамил�ки",
@@ -215,5 +222,6 @@
 	"sn": "шона",
 	"es": "шпан�ки",
 	"es-419": "шпан�ки (Латин�ка �мерика)",
-	"es-MX": "шпан�ки (Мек�ико)"
+	"es-MX": "шпан�ки (Мек�ико)",
+	"pcm": "Nigerian Pidgin"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/bs.json b/vendor/commerceguys/intl/resources/language/bs.json
index f51f33bdb..fdff16da9 100644
--- a/vendor/commerceguys/intl/resources/language/bs.json
+++ b/vendor/commerceguys/intl/resources/language/bs.json
@@ -31,6 +31,7 @@
 	"cs": "�eški",
 	"cgg": "�iga",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�kosrpski",
 	"nds": "donjonjema�ki",
 	"nds-NL": "donjosaksonski",
@@ -117,6 +118,7 @@
 	"lb": "luksemburški",
 	"luo": "Luo",
 	"hu": "mađarski",
+	"mai": "maitili",
 	"jmc": "makame",
 	"mk": "makedonski",
 	"kde": "makonde",
@@ -125,6 +127,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipuri",
 	"mi": "maorski",
 	"mr": "marati",
 	"mas": "masai",
@@ -139,6 +142,8 @@
 	"ne": "nepalski",
 	"nnh": "ngiembon",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
+	"no": "norveški",
 	"nb": "norveški (Bokmal)",
 	"nn": "norveški (Nynorsk)",
 	"nus": "nuer",
@@ -164,6 +169,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"seh": "sena",
 	"ii": "si�uan ji",
 	"sd": "sindi",
@@ -177,6 +184,7 @@
 	"so": "somalski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamazigt",
+	"su": "sundanski",
 	"sw": "svahili",
 	"sw-CD": "svahili (Demokratska Republika Kongo)",
 	"ksb": "Å¡ambala",
diff --git a/vendor/commerceguys/intl/resources/language/ca.json b/vendor/commerceguys/intl/resources/language/ca.json
index 326128f54..be4fc4fa9 100644
--- a/vendor/commerceguys/intl/resources/language/ca.json
+++ b/vendor/commerceguys/intl/resources/language/ca.json
@@ -51,6 +51,7 @@
 	"hr": "croat",
 	"da": "danès",
 	"dyo": "diola",
+	"doi": "dogri",
 	"dua": "douala",
 	"dz": "dzongka",
 	"ebu": "embu",
@@ -78,7 +79,7 @@
 	"lg": "ganda",
 	"ka": "georgià",
 	"el": "grec",
-	"kl": "grenlandès",
+	"kl": "groenlandès",
 	"gu": "gujarati",
 	"guz": "gusí",
 	"ha": "haussa",
@@ -121,12 +122,14 @@
 	"luy": "luyia",
 	"mk": "macedoni",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-metto",
 	"kde": "makonde",
 	"ms": "malai",
 	"ml": "malaiàlam",
 	"mg": "malgaix",
 	"mt": "maltès",
+	"mni": "manipurí",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "massai",
@@ -143,6 +146,7 @@
 	"ne": "nepalès",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruec",
 	"nb": "noruec bokmål",
 	"nn": "noruec nynorsk",
 	"nus": "nuer",
@@ -154,6 +158,7 @@
 	"pa": "panjabi",
 	"asa": "pare",
 	"fa": "persa",
+	"pcm": "pidgin de Nigèria",
 	"pl": "polonès",
 	"pt": "portuguès",
 	"pt-PT": "portuguès de Portugal",
@@ -170,6 +175,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sànscrit",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbi",
 	"ksb": "shambala",
@@ -178,6 +185,7 @@
 	"si": "singalès",
 	"xog": "soga",
 	"so": "somali",
+	"su": "sondanès",
 	"ses": "songhai oriental",
 	"sw": "suahili",
 	"sw-CD": "suahili del Congo",
diff --git a/vendor/commerceguys/intl/resources/language/ce.json b/vendor/commerceguys/intl/resources/language/ce.json
index 402e779ba..7b4cf3c3b 100644
--- a/vendor/commerceguys/intl/resources/language/ce.json
+++ b/vendor/commerceguys/intl/resources/language/ce.json
@@ -1,4 +1,6 @@
 {
+	"doi": "Dogri",
+	"no": "Norwegian",
 	"en-AU": "�в�тралин ингал�ан",
 	"de-AT": "ав�трин немцойн",
 	"agq": "агхӀем",
@@ -109,6 +111,7 @@
 	"lb": "люк�ембургхойн",
 	"mfe": "маврикин креолийн",
 	"mzn": "мазандеранхойн",
+	"mai": "майтхили",
 	"mk": "македонхойн",
 	"kde": "маконде",
 	"mgh": "макуа-меетто",
@@ -117,6 +120,7 @@
 	"ml": "мала�лам",
 	"fy": "малхбузен-фризийн",
 	"mt": "мальтойн",
+	"mni": "манипурийн",
 	"mi": "маори",
 	"mr": "маратхи",
 	"mas": "ма�аи",
@@ -133,6 +137,7 @@
 	"jgo": "нгомба",
 	"de": "немцойн",
 	"ne": "непалхойн",
+	"pcm": "нигерийн-креолийн",
 	"nb": "норвегийн букмол",
 	"nn": "норвегийн нюнор�к",
 	"ce": "нохчийн",
@@ -153,6 +158,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"ceb": "�ебуано",
 	"seh": "�ена",
 	"sr": "�ербийн",
@@ -165,6 +172,7 @@
 	"dsb": "�орбийн",
 	"sw": "�уахили",
 	"sw-CD": "�уахили (Конго)",
+	"su": "�унданхойн",
 	"ii": "�ычуань",
 	"tg": "таджикийн",
 	"dav": "таита",
diff --git a/vendor/commerceguys/intl/resources/language/cs.json b/vendor/commerceguys/intl/resources/language/cs.json
index 4efa09e32..a26a0ed0f 100644
--- a/vendor/commerceguys/intl/resources/language/cs.json
+++ b/vendor/commerceguys/intl/resources/language/cs.json
@@ -35,6 +35,7 @@
 	"zh-Hant": "�ínština (tradi�ní)",
 	"zh-Hans": "�ínština (zjednodušená)",
 	"da": "dánština",
+	"doi": "dogarština",
 	"dsb": "dolnolužická srbština",
 	"nds": "dolnoněm�ina",
 	"nds-NL": "dolnosaština",
@@ -116,6 +117,7 @@
 	"luo": "luoština",
 	"lrc": "lúrština (severní)",
 	"hu": "ma�arština",
+	"mai": "maithiliština",
 	"mk": "makedonština",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -123,6 +125,7 @@
 	"ms": "malajština",
 	"mg": "malgaština",
 	"mt": "maltština",
+	"mni": "manipurština",
 	"mi": "maorština",
 	"mr": "maráthština",
 	"mas": "masajština",
@@ -145,7 +148,9 @@
 	"ne": "nepálština",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigerijský pidžin",
 	"nl": "nizozemština",
+	"no": "norština",
 	"nb": "norština (bokmål)",
 	"nn": "norština (nynorsk)",
 	"nus": "nuerština",
@@ -168,6 +173,8 @@
 	"se": "sámština (severní)",
 	"sbp": "sangoština",
 	"sg": "sangština",
+	"sa": "sanskrt",
+	"sat": "santálština",
 	"seh": "sena",
 	"sd": "sindhština",
 	"si": "sinhálština",
@@ -177,6 +184,7 @@
 	"xog": "sogština",
 	"so": "somálština",
 	"sr": "srbština",
+	"su": "sundština",
 	"sw": "svahilština",
 	"sw-CD": "svahilština (Kongo)",
 	"ksb": "Å¡ambala",
diff --git a/vendor/commerceguys/intl/resources/language/cy.json b/vendor/commerceguys/intl/resources/language/cy.json
index 490fedbb1..8d858c8d0 100644
--- a/vendor/commerceguys/intl/resources/language/cy.json
+++ b/vendor/commerceguys/intl/resources/language/cy.json
@@ -48,6 +48,7 @@
 	"km": "Chmereg",
 	"da": "Daneg",
 	"dua": "Diwaleg",
+	"doi": "Dogri",
 	"dz": "Dzongkha",
 	"it": "Eidaleg",
 	"ebu": "Embw",
@@ -115,11 +116,13 @@
 	"br": "Llydaweg",
 	"mk": "Macedoneg",
 	"kde": "Macondeg",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"mg": "Malagaseg",
 	"ml": "Malayalam",
 	"ms": "Maleieg",
 	"mt": "Malteg",
+	"mni": "Manipwri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,6 +138,7 @@
 	"nd": "Ndebele Gogleddol",
 	"ne": "Nepaleg",
 	"nyn": "Niancole",
+	"no": "Norwyeg",
 	"nb": "Norwyeg Bokmål",
 	"nn": "Norwyeg Nynorsk",
 	"nus": "Nŵereg",
@@ -144,8 +148,9 @@
 	"os": "Oseteg",
 	"ps": "Pashto",
 	"fa": "Perseg",
-	"pt": "Portiwgeeg",
-	"pt-PT": "Portiwgeeg Ewrop",
+	"pcm": "Pidgin Nigeria",
+	"pt": "Portiwgaleg",
+	"pt-PT": "Portiwgaleg Ewrop",
 	"pa": "Pwnjabeg",
 	"pl": "Pwyleg",
 	"qu": "Quechua",
@@ -165,6 +170,8 @@
 	"sah": "Sakha",
 	"saq": "Sambŵrw",
 	"se": "Sami Gogleddol",
+	"sa": "Sansgrit",
+	"sat": "Santali",
 	"dje": "Sarmaeg",
 	"es": "Sbaeneg",
 	"es-419": "Sbaeneg America Ladin",
@@ -185,10 +192,11 @@
 	"sw-CD": "Swahili’r Congo",
 	"sv": "Swedeg",
 	"zu": "Swlw",
+	"su": "Swndaneg",
 	"shi": "Tachelhit",
 	"dav": "Taita",
 	"tg": "Tajiceg",
-	"zgh": "Tamaseit Safonol",
+	"zgh": "Tamaseit Moroco Safonol",
 	"tzm": "Tamazight Canol yr Atlas",
 	"ta": "Tamileg",
 	"twq": "Tasawaq",
diff --git a/vendor/commerceguys/intl/resources/language/da.json b/vendor/commerceguys/intl/resources/language/da.json
index ed719000a..f5c971f59 100644
--- a/vendor/commerceguys/intl/resources/language/da.json
+++ b/vendor/commerceguys/intl/resources/language/da.json
@@ -19,6 +19,7 @@
 	"bez": "bena",
 	"bn": "bengali",
 	"brx": "bodo",
+	"nb": "bokmål",
 	"bs": "bosnisk",
 	"br": "bretonsk",
 	"en-GB": "britisk engelsk",
@@ -34,6 +35,7 @@
 	"sw-CD": "congolesisk swahili",
 	"kw": "cornisk",
 	"da": "dansk",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"smn": "enaresamisk",
@@ -47,7 +49,7 @@
 	"nl-BE": "flamsk",
 	"zh-Hans": "forenklet kinesisk",
 	"fr": "fransk",
-	"fur": "friulian",
+	"fur": "friulisk",
 	"ff": "fulah",
 	"fo": "færøsk",
 	"gl": "galicisk",
@@ -66,9 +68,9 @@
 	"ig": "igbo",
 	"id": "indonesisk",
 	"ga": "irsk",
-	"xh": "isiXhosa",
 	"is": "islandsk",
 	"it": "italiensk",
+	"sah": "jakutisk",
 	"ja": "japansk",
 	"jv": "javanesisk",
 	"yi": "jiddisch",
@@ -108,6 +110,7 @@
 	"lb": "luxembourgsk",
 	"luy": "luyana",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mk": "makedonsk",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -115,6 +118,7 @@
 	"ms": "malajisk",
 	"ml": "malayalam",
 	"mt": "maltesisk",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathisk",
 	"mas": "masai",
@@ -133,10 +137,11 @@
 	"ne": "nepalesisk",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigeriansk pidgin",
 	"lrc": "nordluri",
 	"nd": "nordndebele",
 	"se": "nordsamisk",
-	"nb": "norsk bokmål",
+	"no": "norsk",
 	"nus": "nuer",
 	"nyn": "nyankole",
 	"nn": "nynorsk",
@@ -158,6 +163,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"de-CH": "schweizerhøjtysk",
 	"gsw": "schweizertysk",
 	"fr-CH": "schweizisk fransk",
@@ -175,6 +182,7 @@
 	"so": "somali",
 	"ckb": "sorani",
 	"es": "spansk",
+	"su": "sundanesisk",
 	"sv": "svensk",
 	"sw": "swahili",
 	"shi": "tachelhit",
@@ -209,7 +217,7 @@
 	"cy": "walisisk",
 	"wae": "walsertysk",
 	"wo": "wolof",
-	"sah": "yakut",
+	"xh": "xhosa",
 	"yav": "yangben",
 	"yo": "yoruba",
 	"dje": "zarma",
diff --git a/vendor/commerceguys/intl/resources/language/de-AT.json b/vendor/commerceguys/intl/resources/language/de-AT.json
index 661028680..f6088abd9 100644
--- a/vendor/commerceguys/intl/resources/language/de-AT.json
+++ b/vendor/commerceguys/intl/resources/language/de-AT.json
@@ -8,12 +8,13 @@
 	"hy": "Armenisch",
 	"az": "Aserbaidschanisch",
 	"as": "Assamesisch",
-	"ast": "Asturianisch",
+	"ast": "Asturisch",
 	"asa": "Asu",
 	"ksf": "Bafia",
 	"bm": "Bambara",
-	"bas": "Basaa",
 	"eu": "Baskisch",
+	"bas": "Bassa",
+	"be": "Belarussisch",
 	"bem": "Bemba",
 	"bez": "Bena",
 	"bn": "Bengalisch",
@@ -30,6 +31,7 @@
 	"da": "Dänisch",
 	"de": "Deutsch",
 	"dyo": "Diola",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -50,6 +52,7 @@
 	"fur": "Friulanisch",
 	"ff": "Ful",
 	"gl": "Galicisch",
+	"gd": "Gälisch (Schottland)",
 	"lg": "Ganda",
 	"ka": "Georgisch",
 	"el": "Griechisch",
@@ -105,9 +108,10 @@
 	"luo": "Luo",
 	"lb": "Luxemburgisch",
 	"jmc": "Machame",
-	"mg": "Madagassisch",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
+	"mg": "Malagasy",
 	"ms": "Malaiisch",
 	"ml": "Malayalam",
 	"mt": "Maltesisch",
@@ -116,6 +120,7 @@
 	"mzn": "Masanderanisch",
 	"mas": "Massai",
 	"mk": "Mazedonisch",
+	"mni": "Meithei",
 	"mer": "Meru",
 	"mgo": "Meta’",
 	"ro-MD": "Moldauisch",
@@ -130,11 +135,13 @@
 	"nl": "Niederländisch",
 	"nds-NL": "Niedersächsisch",
 	"dsb": "Niedersorbisch",
+	"pcm": "Nigerianisches Pidgin",
 	"nd": "Nord-Ndebele",
 	"lrc": "Nördliches Luri",
 	"se": "Nordsamisch",
-	"nb": "Norwegisch Bokmål",
-	"nn": "Norwegisch Nynorsk",
+	"no": "Norwegisch",
+	"nb": "Norwegisch (Bokmål)",
+	"nn": "Norwegisch (Nynorsk)",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"hsb": "Obersorbisch",
@@ -159,7 +166,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
-	"gd": "Schottisches Gälisch",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"sv": "Schwedisch",
 	"de-CH": "Schweizer Hochdeutsch",
 	"gsw": "Schweizerdeutsch",
@@ -177,6 +185,7 @@
 	"es-419": "Spanisch (Lateinamerika)",
 	"es-MX": "Spanisch (Mexiko)",
 	"sw": "Suaheli",
+	"su": "Sundanesisch",
 	"tg": "Tadschikisch",
 	"dav": "Taita",
 	"zgh": "Tamazight",
@@ -205,7 +214,6 @@
 	"cy": "Walisisch",
 	"wae": "Walliserdeutsch",
 	"wa": "Wallonisch",
-	"be": "Weißrussisch",
 	"fy": "Westfriesisch",
 	"wo": "Wolof",
 	"xh": "Xhosa",
diff --git a/vendor/commerceguys/intl/resources/language/de-CH.json b/vendor/commerceguys/intl/resources/language/de-CH.json
index 40b0e9502..fa26088ac 100644
--- a/vendor/commerceguys/intl/resources/language/de-CH.json
+++ b/vendor/commerceguys/intl/resources/language/de-CH.json
@@ -8,12 +8,13 @@
 	"hy": "Armenisch",
 	"az": "Aserbaidschanisch",
 	"as": "Assamesisch",
-	"ast": "Asturianisch",
+	"ast": "Asturisch",
 	"asa": "Asu",
 	"ksf": "Bafia",
 	"bm": "Bambara",
 	"bas": "Basaa-Sprache",
 	"eu": "Baskisch",
+	"be": "Belarussisch",
 	"bem": "Bemba",
 	"bez": "Bena",
 	"bn": "Bengalisch",
@@ -30,6 +31,7 @@
 	"da": "Dänisch",
 	"de": "Deutsch",
 	"dyo": "Diola",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -50,6 +52,7 @@
 	"fur": "Friaulisch",
 	"ff": "Ful",
 	"gl": "Galicisch",
+	"gd": "Gälisch (Schottland)",
 	"lg": "Ganda",
 	"ka": "Georgisch",
 	"el": "Griechisch",
@@ -105,9 +108,10 @@
 	"luo": "Luo",
 	"lb": "Luxemburgisch",
 	"jmc": "Machame",
-	"mg": "Madagassisch",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
+	"mg": "Malagasy",
 	"ms": "Malaiisch",
 	"ml": "Malayalam",
 	"mt": "Maltesisch",
@@ -116,6 +120,7 @@
 	"mzn": "Masanderanisch",
 	"mas": "Massai",
 	"mk": "Mazedonisch",
+	"mni": "Meithei",
 	"mer": "Meru",
 	"mgo": "Meta’",
 	"ro-MD": "Moldauisch",
@@ -130,11 +135,13 @@
 	"nl": "Niederländisch",
 	"nds-NL": "Niedersächsisch",
 	"dsb": "Niedersorbisch",
+	"pcm": "Nigerianisches Pidgin",
 	"nd": "Nord-Ndebele",
 	"lrc": "Nördliches Luri",
 	"se": "Nordsamisch",
-	"nb": "Norwegisch Bokmål",
-	"nn": "Norwegisch Nynorsk",
+	"no": "Norwegisch",
+	"nb": "Norwegisch (Bokmål)",
+	"nn": "Norwegisch (Nynorsk)",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"hsb": "Obersorbisch",
@@ -159,7 +166,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
-	"gd": "Schottisches Gälisch",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"sv": "Schwedisch",
 	"de-CH": "Schweizer Hochdeutsch",
 	"gsw": "Schweizerdeutsch",
@@ -177,6 +185,7 @@
 	"es-419": "Spanisch (Lateinamerika)",
 	"es-MX": "Spanisch (Mexiko)",
 	"sw": "Suaheli",
+	"su": "Sundanesisch",
 	"tg": "Tadschikisch",
 	"dav": "Taita",
 	"zgh": "Tamazight",
@@ -205,7 +214,6 @@
 	"cy": "Walisisch",
 	"wae": "Walliserdeutsch",
 	"wa": "Wallonisch",
-	"be": "Weissrussisch",
 	"fy": "Westfriesisch",
 	"wo": "Wolof",
 	"xh": "Xhosa",
diff --git a/vendor/commerceguys/intl/resources/language/de-LU.json b/vendor/commerceguys/intl/resources/language/de-LU.json
deleted file mode 100644
index fa7f656af..000000000
--- a/vendor/commerceguys/intl/resources/language/de-LU.json
+++ /dev/null
@@ -1,219 +0,0 @@
-{
-	"af": "Afrikaans",
-	"agq": "Aghem",
-	"ak": "Akan",
-	"sq": "Albanisch",
-	"am": "Amharisch",
-	"ar": "Arabisch",
-	"hy": "Armenisch",
-	"az": "Aserbaidschanisch",
-	"as": "Assamesisch",
-	"ast": "Asturianisch",
-	"asa": "Asu",
-	"ksf": "Bafia",
-	"bm": "Bambara",
-	"bas": "Basaa",
-	"eu": "Baskisch",
-	"be": "Belarussisch",
-	"bem": "Bemba",
-	"bez": "Bena",
-	"bn": "Bengalisch",
-	"my": "Birmanisch",
-	"brx": "Bodo",
-	"bs": "Bosnisch",
-	"br": "Bretonisch",
-	"bg": "Bulgarisch",
-	"ceb": "Cebuano",
-	"chr": "Cherokee",
-	"zh": "Chinesisch",
-	"zh-Hant": "Chinesisch (traditionell)",
-	"zh-Hans": "Chinesisch (vereinfacht)",
-	"da": "Dänisch",
-	"de": "Deutsch",
-	"dyo": "Diola",
-	"dua": "Duala",
-	"dz": "Dzongkha",
-	"ebu": "Embu",
-	"en": "Englisch",
-	"en-AU": "Englisch (Australien)",
-	"en-CA": "Englisch (Kanada)",
-	"en-GB": "Englisch (Vereinigtes Königreich)",
-	"et": "Estnisch",
-	"ee": "Ewe",
-	"ewo": "Ewondo",
-	"fo": "Färöisch",
-	"fil": "Filipino",
-	"fi": "Finnisch",
-	"nl-BE": "Flämisch",
-	"fr": "Französisch",
-	"fr-CA": "Französisch (Kanada)",
-	"fr-CH": "Französisch (Schweiz)",
-	"fur": "Friaulisch",
-	"ff": "Ful",
-	"gl": "Galicisch",
-	"lg": "Ganda",
-	"ka": "Georgisch",
-	"el": "Griechisch",
-	"kl": "Grönländisch",
-	"gu": "Gujarati",
-	"guz": "Gusii",
-	"ha": "Haussa",
-	"haw": "Hawaiisch",
-	"he": "Hebräisch",
-	"hi": "Hindi",
-	"ig": "Igbo",
-	"smn": "Inari-Samisch",
-	"id": "Indonesisch",
-	"ga": "Irisch",
-	"is": "Isländisch",
-	"it": "Italienisch",
-	"sah": "Jakutisch",
-	"ja": "Japanisch",
-	"jv": "Javanisch",
-	"yi": "Jiddisch",
-	"kea": "Kabuverdianu",
-	"kab": "Kabylisch",
-	"kkj": "Kako",
-	"kln": "Kalenjin",
-	"kam": "Kamba",
-	"kn": "Kannada",
-	"yue": "Kantonesisch",
-	"kk": "Kasachisch",
-	"ks": "Kaschmiri",
-	"ca": "Katalanisch",
-	"km": "Khmer",
-	"ki": "Kikuyu",
-	"rw": "Kinyarwanda",
-	"ky": "Kirgisisch",
-	"ksh": "Kölsch",
-	"sw-CD": "Kongo-Swahili",
-	"kok": "Konkani",
-	"ko": "Koreanisch",
-	"kw": "Kornisch",
-	"khq": "Koyra Chiini",
-	"ses": "Koyra Senni",
-	"hr": "Kroatisch",
-	"ku": "Kurdisch",
-	"nmg": "Kwasio",
-	"lkt": "Lakota",
-	"lag": "Langi",
-	"lo": "Laotisch",
-	"lv": "Lettisch",
-	"ln": "Lingala",
-	"lt": "Litauisch",
-	"lu": "Luba-Katanga",
-	"luy": "Luhya",
-	"luo": "Luo",
-	"lb": "Luxemburgisch",
-	"jmc": "Machame",
-	"mg": "Madagassisch",
-	"mgh": "Makhuwa-Meetto",
-	"kde": "Makonde",
-	"ms": "Malaiisch",
-	"ml": "Malayalam",
-	"mt": "Maltesisch",
-	"mi": "Maori",
-	"mr": "Marathi",
-	"mzn": "Masanderanisch",
-	"mas": "Massai",
-	"mk": "Mazedonisch",
-	"mer": "Meru",
-	"mgo": "Meta’",
-	"ro-MD": "Moldauisch",
-	"mn": "Mongolisch",
-	"mfe": "Morisyen",
-	"mua": "Mundang",
-	"naq": "Nama",
-	"ne": "Nepalesisch",
-	"nnh": "Ngiemboon",
-	"jgo": "Ngomba",
-	"nds": "Niederdeutsch",
-	"nl": "Niederländisch",
-	"nds-NL": "Niedersächsisch",
-	"dsb": "Niedersorbisch",
-	"nd": "Nord-Ndebele",
-	"lrc": "Nördliches Luri",
-	"se": "Nordsamisch",
-	"nb": "Norwegisch Bokmål",
-	"nn": "Norwegisch Nynorsk",
-	"nus": "Nuer",
-	"nyn": "Nyankole",
-	"hsb": "Obersorbisch",
-	"or": "Oriya",
-	"om": "Oromo",
-	"os": "Ossetisch",
-	"de-AT": "Österreichisches Deutsch",
-	"ps": "Paschtu",
-	"fa": "Persisch",
-	"pl": "Polnisch",
-	"pt": "Portugiesisch",
-	"pt-PT": "Portugiesisch (Portugal)",
-	"pa": "Punjabi",
-	"qu": "Quechua",
-	"rm": "Rätoromanisch",
-	"rof": "Rombo",
-	"cgg": "Rukiga",
-	"ro": "Rumänisch",
-	"rn": "Rundi",
-	"ru": "Russisch",
-	"rwk": "Rwa",
-	"saq": "Samburu",
-	"sg": "Sango",
-	"sbp": "Sangu",
-	"gd": "Schottisches Gälisch",
-	"sv": "Schwedisch",
-	"de-CH": "Schweizer Hochdeutsch",
-	"gsw": "Schweizerdeutsch",
-	"seh": "Sena",
-	"sr": "Serbisch",
-	"ksb": "Shambala",
-	"sn": "Shona",
-	"sd": "Sindhi",
-	"si": "Singhalesisch",
-	"sk": "Slowakisch",
-	"sl": "Slowenisch",
-	"xog": "Soga",
-	"so": "Somali",
-	"es": "Spanisch",
-	"es-419": "Spanisch (Lateinamerika)",
-	"es-MX": "Spanisch (Mexiko)",
-	"sw": "Suaheli",
-	"tg": "Tadschikisch",
-	"dav": "Taita",
-	"zgh": "Tamazight",
-	"ta": "Tamil",
-	"twq": "Tasawaq",
-	"shi": "Taschelhit",
-	"tt": "Tatarisch",
-	"te": "Telugu",
-	"teo": "Teso",
-	"th": "Thailändisch",
-	"bo": "Tibetisch",
-	"ti": "Tigrinya",
-	"to": "Tongaisch",
-	"cs": "Tschechisch",
-	"ce": "Tschetschenisch",
-	"tr": "Türkisch",
-	"tk": "Turkmenisch",
-	"ug": "Uigurisch",
-	"uk": "Ukrainisch",
-	"hu": "Ungarisch",
-	"ur": "Urdu",
-	"uz": "Usbekisch",
-	"vai": "Vai",
-	"vi": "Vietnamesisch",
-	"vun": "Vunjo",
-	"cy": "Walisisch",
-	"wae": "Walliserdeutsch",
-	"wa": "Wallonisch",
-	"fy": "Westfriesisch",
-	"wo": "Wolof",
-	"xh": "Xhosa",
-	"yav": "Yangben",
-	"ii": "Yi",
-	"yo": "Yoruba",
-	"dje": "Zarma",
-	"tzm": "Zentralatlas-Tamazight",
-	"ckb": "Zentralkurdisch",
-	"zu": "Zulu"
-}
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/de.json b/vendor/commerceguys/intl/resources/language/de.json
index a03589bac..6d2d5a57c 100644
--- a/vendor/commerceguys/intl/resources/language/de.json
+++ b/vendor/commerceguys/intl/resources/language/de.json
@@ -8,12 +8,13 @@
 	"hy": "Armenisch",
 	"az": "Aserbaidschanisch",
 	"as": "Assamesisch",
-	"ast": "Asturianisch",
+	"ast": "Asturisch",
 	"asa": "Asu",
 	"ksf": "Bafia",
 	"bm": "Bambara",
-	"bas": "Basaa",
 	"eu": "Baskisch",
+	"bas": "Bassa",
+	"be": "Belarussisch",
 	"bem": "Bemba",
 	"bez": "Bena",
 	"bn": "Bengalisch",
@@ -30,6 +31,7 @@
 	"da": "Dänisch",
 	"de": "Deutsch",
 	"dyo": "Diola",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -50,6 +52,7 @@
 	"fur": "Friaulisch",
 	"ff": "Ful",
 	"gl": "Galicisch",
+	"gd": "Gälisch (Schottland)",
 	"lg": "Ganda",
 	"ka": "Georgisch",
 	"el": "Griechisch",
@@ -105,9 +108,10 @@
 	"luo": "Luo",
 	"lb": "Luxemburgisch",
 	"jmc": "Machame",
-	"mg": "Madagassisch",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
+	"mg": "Malagasy",
 	"ms": "Malaiisch",
 	"ml": "Malayalam",
 	"mt": "Maltesisch",
@@ -116,6 +120,7 @@
 	"mzn": "Masanderanisch",
 	"mas": "Massai",
 	"mk": "Mazedonisch",
+	"mni": "Meithei",
 	"mer": "Meru",
 	"mgo": "Meta’",
 	"ro-MD": "Moldauisch",
@@ -130,11 +135,13 @@
 	"nl": "Niederländisch",
 	"nds-NL": "Niedersächsisch",
 	"dsb": "Niedersorbisch",
+	"pcm": "Nigerianisches Pidgin",
 	"nd": "Nord-Ndebele",
 	"lrc": "Nördliches Luri",
 	"se": "Nordsamisch",
-	"nb": "Norwegisch Bokmål",
-	"nn": "Norwegisch Nynorsk",
+	"no": "Norwegisch",
+	"nb": "Norwegisch (Bokmål)",
+	"nn": "Norwegisch (Nynorsk)",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"hsb": "Obersorbisch",
@@ -159,7 +166,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
-	"gd": "Schottisches Gälisch",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"sv": "Schwedisch",
 	"de-CH": "Schweizer Hochdeutsch",
 	"gsw": "Schweizerdeutsch",
@@ -177,6 +185,7 @@
 	"es-419": "Spanisch (Lateinamerika)",
 	"es-MX": "Spanisch (Mexiko)",
 	"sw": "Suaheli",
+	"su": "Sundanesisch",
 	"tg": "Tadschikisch",
 	"dav": "Taita",
 	"zgh": "Tamazight",
@@ -205,7 +214,6 @@
 	"cy": "Walisisch",
 	"wae": "Walliserdeutsch",
 	"wa": "Wallonisch",
-	"be": "Weißrussisch",
 	"fy": "Westfriesisch",
 	"wo": "Wolof",
 	"xh": "Xhosa",
diff --git a/vendor/commerceguys/intl/resources/language/dz.json b/vendor/commerceguys/intl/resources/language/dz.json
index c0367cd20..95d7a3233 100644
--- a/vendor/commerceguys/intl/resources/language/dz.json
+++ b/vendor/commerceguys/intl/resources/language/dz.json
@@ -19,6 +19,7 @@
 	"cgg": "Chiga",
 	"ksh": "Colognian",
 	"kw": "Cornish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"ebu": "Embu",
 	"ee": "Ewe",
@@ -50,8 +51,10 @@
 	"luo": "Luo",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
+	"mni": "Manipuri",
 	"mas": "Masai",
 	"mzn": "Mazanderani",
 	"mer": "Meru",
@@ -63,6 +66,7 @@
 	"nds-NL": "nds� (ནེ་དར་ལནཌས྄�)",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
@@ -77,6 +81,7 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"ksb": "Shambala",
@@ -129,6 +134,7 @@
 	"th": "�ཱའི་�",
 	"fy": "ནུབ་ཕྼི་སི་ཡན་�",
 	"ne": "ནེ་པཱལི་�",
+	"no": "ནོར་�ི་ཇི་ཡན་�",
 	"nn": "ནོར་�ེ་ཇི་ཡཱན་ནོརསཀ་�",
 	"nb": "ནོར་�ེ་ཇི་ཡཱན་བོཀ་མཱལ་�",
 	"fa": "པར་ཤི་ཡཱན་�",
@@ -178,6 +184,7 @@
 	"zh-Hant": "སྔ་དུས་ཀྱི་རྒྱ་མི་�",
 	"sw": "སྭཱ་ཧི་ལི་�",
 	"sw-CD": "སྭཱ་ཧི་ལི་�� (ཀོང་གྷོ ཀིན་ཤ་ས�)",
+	"sa": "སཾས�ྲྀ�་�",
 	"sr": "སཱར་བྷི་ཡཱན་�",
 	"si": "སིང་ཧ་ལ་�",
 	"sd": "སིན་དཱི་�",
@@ -187,6 +194,7 @@
 	"sk": "སུ་ལོ་བཱཀ་�",
 	"sl": "སུ་ལོ་བི་ནི་ཡཱན་�",
 	"sv": "སུའི་ཌིཤ་�",
+	"su": "སཱུན་ད་ནིས་�",
 	"so": "སོ་མ་ལི་�",
 	"haw": "ཧ་�་ཡིའི་�",
 	"ha": "ཧ�་ས་�",
diff --git a/vendor/commerceguys/intl/resources/language/el.json b/vendor/commerceguys/intl/resources/language/el.json
index 0dbb8c5db..5bee2cb38 100644
--- a/vendor/commerceguys/intl/resources/language/el.json
+++ b/vendor/commerceguys/intl/resources/language/el.json
@@ -110,13 +110,14 @@
 	"luo": "Λο�ο",
 	"luy": "Λο�χια",
 	"mzn": "Μαζαντε�άνι",
-	"mk": "Μακεδονικά",
+	"mai": "Μαϊτχίλι",
 	"kde": "Μακόντε",
 	"mgh": "Μακο�βα-Μέτο",
 	"ml": "Μαλαγιαλαμικά",
 	"ms": "Μαλαισιανά",
 	"mg": "Μαλγασικά",
 	"mt": "Μαλτεζικά",
+	"mni": "Μανιπο��ι",
 	"mi": "Μαο�ί",
 	"mr": "Μα�αθικά",
 	"mas": "Μασάι",
@@ -138,10 +139,12 @@
 	"jgo": "�γκόμπα",
 	"ne": "�επαλικά",
 	"nyn": "�ιανκόλε",
+	"no": "�ο�βηγικά",
 	"nb": "�ο�βηγικά Μποκμάλ",
 	"nn": "�ο�βηγικά �ινό�σκ",
 	"nus": "�ο�ε�",
 	"dz": "�τζόνγκχα",
+	"doi": "�τόγκ�ι",
 	"dua": "�τουάλα",
 	"nl": "Ολλανδικά",
 	"or": "Όντια",
@@ -150,13 +153,14 @@
 	"cy": "Ουαλικά",
 	"hu": "Ουγγ�ικά",
 	"uz": "Ουζμπεκικά",
-	"ug": "Ουιγκου�ικά",
+	"ug": "Ουιγου�ικά",
 	"uk": "Ουκ�ανικά",
 	"ur": "Ου�ντο�",
 	"pa": "Παντζαπικά",
 	"zh-Hant": "Πα�αδοσιακά Κινεζικά",
 	"ps": "Πάστο",
 	"fa": "Πε�σικά",
+	"pcm": "Πίτζιν �ιγη�ίας",
 	"pl": "Πολωνικά",
 	"pt": "Πο�τογαλικά",
 	"pt-PT": "Πο�τογαλικά Ευ�ώπης",
@@ -170,6 +174,8 @@
 	"saq": "Σαμπο��ου",
 	"sg": "Σάνγκο",
 	"sbp": "Σάνγκου",
+	"sa": "Σανσκ�ιτικά",
+	"sat": "Σαντάλι",
 	"sah": "Σαχά",
 	"ceb": "Σεμπουάνο",
 	"seh": "Σένα",
@@ -178,6 +184,7 @@
 	"si": "Σινχαλεζικά",
 	"ii": "Σίτσουαν Γι",
 	"gd": "Σκωτικά Κελτικά",
+	"mk": "Σλαβομακεδονικά",
 	"sk": "Σλοβακικά",
 	"sl": "Σλοβενικά",
 	"xog": "Σόγκα",
@@ -185,6 +192,7 @@
 	"sn": "Σόνα",
 	"sw": "Σουαχίλι",
 	"sv": "Σουηδικά",
+	"su": "Σουνδανικά",
 	"th": "Ταϊλανδικά",
 	"dav": "Τάιτα",
 	"tzm": "Ταμαζίτ Κεντ�ικο� Μα�όκο",
diff --git a/vendor/commerceguys/intl/resources/language/en-001.json b/vendor/commerceguys/intl/resources/language/en-001.json
index 408e0bd7d..e4b4cb314 100644
--- a/vendor/commerceguys/intl/resources/language/en-001.json
+++ b/vendor/commerceguys/intl/resources/language/en-001.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -114,12 +115,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,9 +138,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -157,10 +162,11 @@
 	"rn": "Rundi",
 	"ru": "Russian",
 	"rwk": "Rwa",
-	"sah": "Sakha",
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -176,6 +182,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
@@ -211,6 +218,7 @@
 	"fy": "Western Frisian",
 	"wo": "Wolof",
 	"xh": "Xhosa",
+	"sah": "Yakut",
 	"yav": "Yangben",
 	"yi": "Yiddish",
 	"yo": "Yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/en-AU.json b/vendor/commerceguys/intl/resources/language/en-AU.json
index 03732caaf..a7ef07c43 100644
--- a/vendor/commerceguys/intl/resources/language/en-AU.json
+++ b/vendor/commerceguys/intl/resources/language/en-AU.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -114,12 +115,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,9 +138,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -157,10 +162,11 @@
 	"rn": "Rundi",
 	"ru": "Russian",
 	"rwk": "Rwa",
-	"sah": "Sakha",
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -176,6 +182,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
@@ -211,6 +218,7 @@
 	"fy": "Western Frisian",
 	"wo": "Wolof",
 	"xh": "Xhosa",
+	"sah": "Yakut",
 	"yav": "Yangben",
 	"yi": "Yiddish",
 	"yo": "Yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/en-CA.json b/vendor/commerceguys/intl/resources/language/en-CA.json
index e4caacc6d..bd04bad74 100644
--- a/vendor/commerceguys/intl/resources/language/en-CA.json
+++ b/vendor/commerceguys/intl/resources/language/en-CA.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -114,12 +115,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,9 +138,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -157,10 +162,11 @@
 	"rn": "Rundi",
 	"ru": "Russian",
 	"rwk": "Rwa",
-	"sah": "Sakha",
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -176,6 +182,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
@@ -211,6 +218,7 @@
 	"fy": "Western Frisian",
 	"wo": "Wolof",
 	"xh": "Xhosa",
+	"sah": "Yakut",
 	"yav": "Yangben",
 	"yi": "Yiddish",
 	"yo": "Yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/en-IN.json b/vendor/commerceguys/intl/resources/language/en-IN.json
index e5cea9323..e9c87982a 100644
--- a/vendor/commerceguys/intl/resources/language/en-IN.json
+++ b/vendor/commerceguys/intl/resources/language/en-IN.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -114,12 +115,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,9 +138,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -157,10 +162,11 @@
 	"rn": "Rundi",
 	"ru": "Russian",
 	"rwk": "Rwa",
-	"sah": "Sakha",
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -176,6 +182,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
@@ -211,6 +218,7 @@
 	"fy": "Western Frisian",
 	"wo": "Wolof",
 	"xh": "Xhosa",
+	"sah": "Yakut",
 	"yav": "Yangben",
 	"yi": "Yiddish",
 	"yo": "Yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/en-NZ.json b/vendor/commerceguys/intl/resources/language/en-NZ.json
index d7dc9e64b..114fe6e02 100644
--- a/vendor/commerceguys/intl/resources/language/en-NZ.json
+++ b/vendor/commerceguys/intl/resources/language/en-NZ.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -114,12 +115,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "M�ori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -135,9 +138,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -157,10 +162,11 @@
 	"rn": "Rundi",
 	"ru": "Russian",
 	"rwk": "Rwa",
-	"sah": "Sakha",
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -176,6 +182,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
@@ -211,6 +218,7 @@
 	"fy": "Western Frisian",
 	"wo": "Wolof",
 	"xh": "Xhosa",
+	"sah": "Yakut",
 	"yav": "Yangben",
 	"yi": "Yiddish",
 	"yo": "Yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/en.json b/vendor/commerceguys/intl/resources/language/en.json
index 50f754ed1..46da5d206 100644
--- a/vendor/commerceguys/intl/resources/language/en.json
+++ b/vendor/commerceguys/intl/resources/language/en.json
@@ -43,6 +43,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -115,12 +116,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -136,9 +139,11 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -162,6 +167,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -177,6 +184,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"fr-CH": "Swiss French",
diff --git a/vendor/commerceguys/intl/resources/language/es-419.json b/vendor/commerceguys/intl/resources/language/es-419.json
index 1e1fa5dd4..029b3d65a 100644
--- a/vendor/commerceguys/intl/resources/language/es-419.json
+++ b/vendor/commerceguys/intl/resources/language/es-419.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -126,12 +127,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -147,6 +150,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"pa": "panyabí",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -172,6 +177,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -180,6 +187,7 @@
 	"xog": "soga",
 	"so": "somalí",
 	"sv": "sueco",
+	"su": "sundanés",
 	"sw": "swahili",
 	"sw-CD": "swahili (Congo)",
 	"th": "tailandés",
diff --git a/vendor/commerceguys/intl/resources/language/es-AR.json b/vendor/commerceguys/intl/resources/language/es-AR.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-AR.json
+++ b/vendor/commerceguys/intl/resources/language/es-AR.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-BO.json b/vendor/commerceguys/intl/resources/language/es-BO.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-BO.json
+++ b/vendor/commerceguys/intl/resources/language/es-BO.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-CL.json b/vendor/commerceguys/intl/resources/language/es-CL.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-CL.json
+++ b/vendor/commerceguys/intl/resources/language/es-CL.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-CO.json b/vendor/commerceguys/intl/resources/language/es-CO.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-CO.json
+++ b/vendor/commerceguys/intl/resources/language/es-CO.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-CR.json b/vendor/commerceguys/intl/resources/language/es-CR.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-CR.json
+++ b/vendor/commerceguys/intl/resources/language/es-CR.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-DO.json b/vendor/commerceguys/intl/resources/language/es-DO.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-DO.json
+++ b/vendor/commerceguys/intl/resources/language/es-DO.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-EC.json b/vendor/commerceguys/intl/resources/language/es-EC.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-EC.json
+++ b/vendor/commerceguys/intl/resources/language/es-EC.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-GT.json b/vendor/commerceguys/intl/resources/language/es-GT.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-GT.json
+++ b/vendor/commerceguys/intl/resources/language/es-GT.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-HN.json b/vendor/commerceguys/intl/resources/language/es-HN.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-HN.json
+++ b/vendor/commerceguys/intl/resources/language/es-HN.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-MX.json b/vendor/commerceguys/intl/resources/language/es-MX.json
index 0d600c2fa..476a91017 100644
--- a/vendor/commerceguys/intl/resources/language/es-MX.json
+++ b/vendor/commerceguys/intl/resources/language/es-MX.json
@@ -4,7 +4,7 @@
 	"ak": "akan",
 	"sq": "albanés",
 	"de": "alemán",
-	"de-AT": "alemán austriaco",
+	"de-AT": "alemán austríaco",
 	"gsw": "alemán suizo",
 	"de-CH": "alto alemán suizo",
 	"hsb": "alto sorbio",
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-NI.json b/vendor/commerceguys/intl/resources/language/es-NI.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-NI.json
+++ b/vendor/commerceguys/intl/resources/language/es-NI.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-PA.json b/vendor/commerceguys/intl/resources/language/es-PA.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-PA.json
+++ b/vendor/commerceguys/intl/resources/language/es-PA.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-PE.json b/vendor/commerceguys/intl/resources/language/es-PE.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-PE.json
+++ b/vendor/commerceguys/intl/resources/language/es-PE.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-PR.json b/vendor/commerceguys/intl/resources/language/es-PR.json
index 4c63b9691..0c4023387 100644
--- a/vendor/commerceguys/intl/resources/language/es-PR.json
+++ b/vendor/commerceguys/intl/resources/language/es-PR.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -126,12 +127,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -147,6 +150,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"pa": "panyabí",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -172,6 +177,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -180,6 +187,7 @@
 	"xog": "soga",
 	"so": "somalí",
 	"sv": "sueco",
+	"su": "sundanés",
 	"sw": "swahili",
 	"sw-CD": "swahili (Congo)",
 	"th": "tailandés",
diff --git a/vendor/commerceguys/intl/resources/language/es-PY.json b/vendor/commerceguys/intl/resources/language/es-PY.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-PY.json
+++ b/vendor/commerceguys/intl/resources/language/es-PY.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es-SV.json b/vendor/commerceguys/intl/resources/language/es-SV.json
index 4c63b9691..0c4023387 100644
--- a/vendor/commerceguys/intl/resources/language/es-SV.json
+++ b/vendor/commerceguys/intl/resources/language/es-SV.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -126,12 +127,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -147,6 +150,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"pa": "panyabí",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -172,6 +177,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -180,6 +187,7 @@
 	"xog": "soga",
 	"so": "somalí",
 	"sv": "sueco",
+	"su": "sundanés",
 	"sw": "swahili",
 	"sw-CD": "swahili (Congo)",
 	"th": "tailandés",
diff --git a/vendor/commerceguys/intl/resources/language/es-US.json b/vendor/commerceguys/intl/resources/language/es-US.json
index 5abe4fb0a..853bb9ceb 100644
--- a/vendor/commerceguys/intl/resources/language/es-US.json
+++ b/vendor/commerceguys/intl/resources/language/es-US.json
@@ -20,7 +20,7 @@
 	"nds-NL": "bajo sajón",
 	"dsb": "bajo sorbio",
 	"bm": "bambara",
-	"bas": "basa",
+	"bas": "basaa",
 	"bem": "bemba",
 	"bez": "bena",
 	"bn": "bengalí",
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -106,7 +107,7 @@
 	"ki": "kikuyu",
 	"rw": "kinyarwanda",
 	"ky": "kirguís",
-	"rn": "kiroundi",
+	"rn": "kirundi",
 	"ksh": "kölsch",
 	"kok": "konkaní",
 	"khq": "koyra chiini",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -158,6 +162,7 @@
 	"pa": "panyabí",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -181,6 +188,7 @@
 	"xog": "soga",
 	"so": "somalí",
 	"sv": "sueco",
+	"su": "sundanés",
 	"sw": "swahili",
 	"sw-CD": "swahili del Congo",
 	"th": "tailandés",
@@ -208,7 +216,7 @@
 	"vi": "vietnamita",
 	"vun": "vunjo",
 	"wae": "walser",
-	"wo": "wolof",
+	"wo": "wólof",
 	"xh": "xhosa",
 	"yav": "yangben",
 	"ii": "yi de Sichuán",
diff --git a/vendor/commerceguys/intl/resources/language/es-VE.json b/vendor/commerceguys/intl/resources/language/es-VE.json
index e5e7bb0fc..ffcd98e5c 100644
--- a/vendor/commerceguys/intl/resources/language/es-VE.json
+++ b/vendor/commerceguys/intl/resources/language/es-VE.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/es.json b/vendor/commerceguys/intl/resources/language/es.json
index fb6adb420..5e06f3ae2 100644
--- a/vendor/commerceguys/intl/resources/language/es.json
+++ b/vendor/commerceguys/intl/resources/language/es.json
@@ -50,6 +50,7 @@
 	"mfe": "criollo mauriciano",
 	"hr": "croata",
 	"da": "danés",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -127,12 +128,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayo",
 	"mg": "malgache",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masái",
@@ -148,6 +151,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruego",
 	"nb": "noruego bokmal",
 	"nn": "noruego nynorsk",
 	"nus": "nuer",
@@ -157,6 +161,7 @@
 	"os": "osético",
 	"ps": "pastún",
 	"fa": "persa",
+	"pcm": "pidgin de Nigeria",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -173,6 +178,8 @@
 	"se": "sami septentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -183,6 +190,7 @@
 	"sw": "suajili",
 	"sw-CD": "suajili del Congo",
 	"sv": "sueco",
+	"su": "sundanés",
 	"th": "tailandés",
 	"dav": "taita",
 	"tzm": "tamazight del Atlas Central",
diff --git a/vendor/commerceguys/intl/resources/language/et.json b/vendor/commerceguys/intl/resources/language/et.json
index d7cce82ef..ae8ff3a44 100644
--- a/vendor/commerceguys/intl/resources/language/et.json
+++ b/vendor/commerceguys/intl/resources/language/et.json
@@ -28,6 +28,7 @@
 	"en-GB": "Briti inglise",
 	"bg": "bulgaaria",
 	"dav": "davida",
+	"doi": "dogri",
 	"dz": "dzongkha",
 	"dua": "duala",
 	"et": "eesti",
@@ -110,6 +111,7 @@
 	"luo": "Luo",
 	"lv": "läti",
 	"fy": "läänefriisi",
+	"mai": "maithili",
 	"mk": "makedoonia",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -117,6 +119,7 @@
 	"ms": "malai",
 	"ml": "malajalami",
 	"mt": "malta",
+	"mni": "manipuri",
 	"mi": "maoori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -133,7 +136,9 @@
 	"ne": "nepali",
 	"nnh": "ngiembooni",
 	"jgo": "ngomba",
+	"pcm": "Nigeeria pidžinkeel",
 	"nyn": "njankole",
+	"no": "norra",
 	"nb": "norra bokmål",
 	"nus": "nueri",
 	"ii": "nuosu",
@@ -160,6 +165,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskriti",
+	"sat": "santali",
 	"ceb": "sebu",
 	"seh": "sena",
 	"sr": "serbia",
@@ -172,6 +179,7 @@
 	"fi": "soome",
 	"ckb": "sorani",
 	"sw": "suahiili",
+	"su": "sunda",
 	"zu": "suulu",
 	"ksb": "Å¡ambala",
 	"shi": "Å¡ilha",
diff --git a/vendor/commerceguys/intl/resources/language/eu.json b/vendor/commerceguys/intl/resources/language/eu.json
index e2fd1b215..4278a76bb 100644
--- a/vendor/commerceguys/intl/resources/language/eu.json
+++ b/vendor/commerceguys/intl/resources/language/eu.json
@@ -36,6 +36,7 @@
 	"ceb": "cebuera",
 	"cgg": "chigera",
 	"da": "daniera",
+	"doi": "Dogri",
 	"dua": "dualera",
 	"dz": "dzongkha",
 	"ebu": "embua",
@@ -127,12 +128,14 @@
 	"luo": "luoera",
 	"lb": "luxenburgera",
 	"jmc": "machame",
+	"mai": "maithilera",
 	"mgh": "makhuwa-meettoera",
 	"kde": "makondeera",
 	"ml": "malabarera",
 	"ms": "malaysiera",
 	"mg": "malgaxe",
 	"mt": "maltera",
+	"mni": "manipurera",
 	"mi": "maoriera",
 	"mr": "marathera",
 	"mas": "masaiera",
@@ -150,6 +153,8 @@
 	"ne": "nepalera",
 	"nnh": "ngiemboonera",
 	"jgo": "ngomba",
+	"pcm": "Nigeriako pidgina",
+	"no": "norvegiera",
 	"nus": "nuerera",
 	"nn": "nynorsk (norvegiera)",
 	"or": "oriya",
@@ -167,6 +172,8 @@
 	"saq": "samburuera",
 	"sg": "sango",
 	"sbp": "sanguera",
+	"sa": "sanskrito",
+	"sat": "santalera",
 	"seh": "senera",
 	"sr": "serbiera",
 	"ksb": "shambalera",
@@ -180,6 +187,7 @@
 	"gsw": "Suitzako aleman",
 	"de-CH": "Suitzako aleman garai",
 	"fr-CH": "Suitzako frantses",
+	"su": "sundanera",
 	"sw": "swahilia",
 	"shi": "tachelhit",
 	"dav": "taitera",
@@ -199,7 +207,7 @@
 	"chr": "txerokiera",
 	"ce": "txetxenera",
 	"zh": "txinera",
-	"zh-Hans": "txinera soildua",
+	"zh-Hans": "txinera sinplifikatu",
 	"zh-Hant": "txinera tradizionala",
 	"ug": "uigurrera",
 	"uk": "ukrainera",
diff --git a/vendor/commerceguys/intl/resources/language/fa-AF.json b/vendor/commerceguys/intl/resources/language/fa-AF.json
index 50d87410b..5dfec0c17 100644
--- a/vendor/commerceguys/intl/resources/language/fa-AF.json
+++ b/vendor/commerceguys/intl/resources/language/fa-AF.json
@@ -77,7 +77,7 @@
 	"ja": "جاپانی",
 	"jv": "جاوه‌ای",
 	"ce": "چچنی",
-	"chr": "چروکیایی",
+	"chr": "چروکی",
 	"cs": "چکی",
 	"cgg": "چیگا",
 	"zh": "چینی",
@@ -88,6 +88,7 @@
 	"da": "دانمارکی",
 	"dz": "دزونگخا",
 	"dua": "دوآلایی",
+	"doi": "دوگری",
 	"dyo": "دیولا �ونی",
 	"rwk": "روایی",
 	"ru": "روسی",
@@ -100,6 +101,8 @@
 	"nds-NL": "ساکسونی س�لی",
 	"saq": "سامبورو",
 	"se": "سامی شمالی",
+	"sat": "سانتالی",
+	"sa": "سانسکریت",
 	"sg": "سانگو",
 	"sbp": "سانگویی",
 	"ceb": "سبویی",
@@ -109,6 +112,7 @@
 	"sw-CD": "سواحیلی کنگو",
 	"xog": "سوگایی",
 	"so": "سومالیایی",
+	"su": "سوندایی",
 	"sv": "سویدنی",
 	"si": "سینهالی",
 	"ksb": "شامبالا",
@@ -123,7 +127,7 @@
 	"fr": "�رانسوی",
 	"fr-CH": "�رانسوی سوئیس",
 	"fr-CA": "�رانسوی کانادا",
-	"fy": "�ریزی غربی",
+	"fy": "�ریسی غربی",
 	"fur": "�ریولیایی",
 	"nl-BE": "�لمیش",
 	"fi": "�نلندی",
@@ -176,12 +180,14 @@
 	"mas": "ماسایی",
 	"mgh": "ماکوا متو",
 	"kde": "ماکونده",
-	"mg": "مالاگاسیایی",
+	"mg": "مالاگاسی",
 	"ml": "مالایالامی",
 	"ms": "مالایی",
 	"mt": "مالتی",
 	"mua": "ماندانگی",
-	"mi": "مائوریایی",
+	"mni": "مانیپوری",
+	"mai": "مایتیلی",
+	"mi": "مائوری",
 	"mgo": "متایی",
 	"hu": "مجاری",
 	"mr": "مراتی",
@@ -190,6 +196,7 @@
 	"mk": "مقدونی",
 	"mfe": "موریسین",
 	"ro-MD": "مولداویایی",
+	"no": "نارویژی",
 	"naq": "نامایی",
 	"nb": "نروژی کتابی",
 	"nn": "نروژی نو",
@@ -198,11 +205,12 @@
 	"nnh": "نیامبون",
 	"nyn": "نیانکوله‌ای",
 	"ne": "نیپالی",
+	"pcm": "نیم‌زبان نیجریه‌ای",
 	"nl": "هالندی",
-	"haw": "هاوائیایی",
+	"haw": "هاوایی",
 	"es": "هسپانوی",
 	"hi": "هندی",
-	"ha": "هوسیایی",
+	"ha": "هوسایی",
 	"wae": "والسر",
 	"wa": "والونی",
 	"cy": "ولزی",
diff --git a/vendor/commerceguys/intl/resources/language/fa.json b/vendor/commerceguys/intl/resources/language/fa.json
index 31f5effcf..ba1dd753c 100644
--- a/vendor/commerceguys/intl/resources/language/fa.json
+++ b/vendor/commerceguys/intl/resources/language/fa.json
@@ -76,7 +76,7 @@
 	"ti": "تیگرینیایی",
 	"jv": "جاوه‌ای",
 	"ce": "چچنی",
-	"chr": "چروکیایی",
+	"chr": "چروکی",
 	"cs": "چکی",
 	"cgg": "چیگا",
 	"zh": "چینی",
@@ -87,6 +87,7 @@
 	"da": "دانمارکی",
 	"dz": "دزونگخا",
 	"dua": "دوآلایی",
+	"doi": "دوگری",
 	"dyo": "دیولا �ونی",
 	"rwk": "روایی",
 	"ru": "روسی",
@@ -94,13 +95,14 @@
 	"ro": "رومانیایی",
 	"rof": "رومبویی",
 	"rn": "روندیایی",
-	"ksh": "ریپواری",
 	"dje": "زرما",
 	"zu": "زولویی",
 	"ja": "ژاپنی",
 	"nds-NL": "ساکسونی س�لی",
 	"saq": "سامبورو",
 	"se": "سامی شمالی",
+	"sat": "سانتالی",
+	"sa": "سانسکریت",
 	"sg": "سانگو",
 	"sbp": "سانگویی",
 	"ceb": "سبویی",
@@ -111,6 +113,7 @@
 	"sv": "سوئدی",
 	"xog": "سوگایی",
 	"so": "سومالیایی",
+	"su": "سوندایی",
 	"si": "سینهالی",
 	"ksb": "شامبالا",
 	"sn": "شونایی",
@@ -124,7 +127,7 @@
 	"fr": "�رانسوی",
 	"fr-CH": "�رانسوی سوئیس",
 	"fr-CA": "�رانسوی کانادا",
-	"fy": "�ریزی غربی",
+	"fy": "�ریسی غربی",
 	"fur": "�ریولیایی",
 	"nl-BE": "�لمنگی",
 	"fi": "�نلاندی",
@@ -143,13 +146,14 @@
 	"qu": "کچوایی",
 	"ku": "کردی",
 	"ckb": "کردی مرکزی",
-	"kw": "کرنوالی",
 	"hr": "کروات",
 	"ko": "کره‌ای",
 	"ks": "کشمیری",
 	"kok": "کنکانی",
 	"nmg": "کوازیو",
 	"khq": "کوجراچینی",
+	"kw": "کورنی",
+	"ksh": "کولش",
 	"ses": "کویرابورا سنی",
 	"ki": "کیکویویی",
 	"rw": "کینیارواندایی",
@@ -172,17 +176,19 @@
 	"pl": "لهستانی",
 	"lt": "لیتوانیایی",
 	"ln": "لینگالا",
-	"mi": "مائوریایی",
+	"mi": "مائوری",
 	"jmc": "ماچامه‌ای",
 	"mzn": "مازندرانی",
 	"mas": "ماسایی",
 	"mgh": "ماکوا متو",
 	"kde": "ماکونده",
-	"mg": "مالاگاسیایی",
+	"mg": "مالاگاسی",
 	"ml": "مالایالامی",
 	"ms": "مالایی",
 	"mt": "مالتی",
 	"mua": "ماندانگی",
+	"mni": "مانیپوری",
+	"mai": "مایدیلی",
 	"mgo": "متایی",
 	"hu": "مجاری",
 	"mr": "مراتی",
@@ -193,12 +199,14 @@
 	"ro-MD": "مولداویایی",
 	"naq": "نامایی",
 	"ne": "نپالی",
+	"no": "نروژی",
 	"nb": "نروژی بوک‌م�ل",
 	"nn": "نروژی نی‌ن�شک",
 	"jgo": "نگومبا",
 	"nus": "نویر",
 	"nnh": "نیامبون",
 	"nyn": "نیانکوله‌ای",
+	"pcm": "نیم‌زبان نیجریه‌ای",
 	"wae": "والسر",
 	"wa": "والونی",
 	"cy": "ولزی",
@@ -206,10 +214,10 @@
 	"vun": "ونجو",
 	"vai": "ویایی",
 	"vi": "ویتنامی",
-	"haw": "هاوائیایی",
+	"haw": "هاوایی",
 	"nl": "هلندی",
 	"hi": "هندی",
-	"ha": "هوسیایی",
+	"ha": "هوسایی",
 	"sah": "یاقوتی",
 	"yav": "یانگبنی",
 	"yi": "یدی",
diff --git a/vendor/commerceguys/intl/resources/language/fi.json b/vendor/commerceguys/intl/resources/language/fi.json
index 039cd3de2..069acd906 100644
--- a/vendor/commerceguys/intl/resources/language/fi.json
+++ b/vendor/commerceguys/intl/resources/language/fi.json
@@ -31,6 +31,7 @@
 	"ceb": "cebuano",
 	"chr": "cherokee",
 	"dje": "djerma",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -87,6 +88,8 @@
 	"km": "khmer",
 	"cgg": "kiga",
 	"zh": "kiina",
+	"zh-Hant": "kiina (perinteinen)",
+	"zh-Hans": "kiina (yksinkertaistettu)",
 	"ki": "kikuju",
 	"sw-CD": "kingwana",
 	"ky": "kirgiisi",
@@ -113,6 +116,7 @@
 	"fy": "länsifriisi",
 	"mas": "maasai",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mk": "makedonia",
 	"kde": "makonde",
 	"mgh": "makua-meetto",
@@ -120,6 +124,7 @@
 	"ms": "malaiji",
 	"ml": "malajalam",
 	"mt": "malta",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mzn": "mazandarani",
@@ -134,6 +139,8 @@
 	"ne": "nepali",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigerianpidgin",
+	"no": "norja",
 	"nb": "norjan bokmål",
 	"nn": "norjan nynorsk",
 	"nus": "nuer",
@@ -143,7 +150,6 @@
 	"os": "osseetti",
 	"pa": "pandžabi",
 	"ps": "paštu",
-	"zh-Hant": "perinteinen kiina",
 	"fa": "persia",
 	"nd": "pohjois-ndebele",
 	"lrc": "pohjoisluri",
@@ -162,6 +168,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbia",
 	"ksb": "shambala",
@@ -173,7 +181,8 @@
 	"xog": "soga",
 	"so": "somali",
 	"sn": "Å¡ona",
-	"ckb": "sorani",
+	"ckb": "soranî",
+	"su": "sunda",
 	"fi": "suomi",
 	"fr-CH": "sveitsinranska",
 	"gsw": "sveitsinsaksa",
@@ -213,7 +222,6 @@
 	"wo": "wolof",
 	"xh": "xhosa",
 	"yav": "yangben",
-	"zh-Hans": "yksinkertaistettu kiina",
 	"hsb": "yläsorbi",
 	"zu": "zulu"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/fil.json b/vendor/commerceguys/intl/resources/language/fil.json
index 5d58eca77..1604445ef 100644
--- a/vendor/commerceguys/intl/resources/language/fil.json
+++ b/vendor/commerceguys/intl/resources/language/fil.json
@@ -39,6 +39,7 @@
 	"hr": "Croatian",
 	"cs": "Czech",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Dutch",
 	"dz": "Dzongkha",
@@ -76,7 +77,7 @@
 	"id": "Indonesian",
 	"en": "Ingles",
 	"en-GB": "Ingles na British",
-	"en-AU": "Ingles ng Australya",
+	"en-AU": "Ingles ng Australia",
 	"en-CA": "Ingles sa Canada",
 	"ga": "Irish",
 	"it": "Italian",
@@ -119,12 +120,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -138,6 +141,8 @@
 	"mua": "Mundang",
 	"naq": "Nama",
 	"ne": "Nepali",
+	"pcm": "Nigerian Pidgin",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -162,6 +167,8 @@
 	"rwk": "Rwa",
 	"sah": "Sakha",
 	"saq": "Samburu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"sg": "Sango",
 	"sbp": "Sangu",
 	"gd": "Scottish Gaelic",
@@ -178,6 +185,7 @@
 	"so": "Somali",
 	"es": "Spanish",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw": "Swahili",
 	"sv": "Swedish",
 	"gsw": "Swiss German",
diff --git a/vendor/commerceguys/intl/resources/language/fr-BE.json b/vendor/commerceguys/intl/resources/language/fr-BE.json
index b3359b5d6..86f47c255 100644
--- a/vendor/commerceguys/intl/resources/language/fr-BE.json
+++ b/vendor/commerceguys/intl/resources/language/fr-BE.json
@@ -18,7 +18,7 @@
 	"as": "assamais",
 	"ast": "asturien",
 	"asa": "asu",
-	"az": "azéri",
+	"az": "azerbaïdjanais",
 	"ksf": "bafia",
 	"bm": "bambara",
 	"nds": "bas-allemand",
@@ -27,7 +27,7 @@
 	"eu": "basque",
 	"bas": "bassa",
 	"bem": "bemba",
-	"bez": "béna",
+	"bez": "bena",
 	"bn": "bengali",
 	"be": "biélorusse",
 	"my": "birman",
@@ -53,9 +53,10 @@
 	"hr": "croate",
 	"da": "danois",
 	"dyo": "diola-fogny",
+	"doi": "dogri",
 	"dua": "douala",
 	"dz": "dzongkha",
-	"ebu": "embou",
+	"ebu": "embu",
 	"es": "espagnol",
 	"es-419": "espagnol d’Amérique latine",
 	"es-MX": "espagnol du Mexique",
@@ -69,7 +70,6 @@
 	"fr": "français",
 	"fr-CA": "français canadien",
 	"fr-CH": "français suisse",
-	"ksh": "francique ripuaire",
 	"fur": "frioulan",
 	"fy": "frison occidental",
 	"gd": "gaélique écossais",
@@ -107,6 +107,7 @@
 	"ki": "kikuyu",
 	"rw": "kinyarwanda",
 	"ky": "kirghize",
+	"ksh": "kölsch",
 	"kok": "konkani",
 	"khq": "koyra chiini",
 	"ses": "koyraboro senni",
@@ -124,12 +125,14 @@
 	"luy": "luyia",
 	"mas": "maasaï",
 	"mk": "macédonien",
+	"mai": "maïthili",
 	"kde": "makondé",
 	"mgh": "makua",
 	"ms": "malais",
 	"ml": "malayalam",
 	"mg": "malgache",
 	"mt": "maltais",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"jmc": "matchamé",
@@ -146,6 +149,7 @@
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
 	"nmg": "ngoumba",
+	"no": "norvégien",
 	"nb": "norvégien bokmål",
 	"nn": "norvégien nynorsk",
 	"nus": "nuer",
@@ -160,6 +164,7 @@
 	"pa": "pendjabi",
 	"fa": "persan",
 	"ff": "peul",
+	"pcm": "pidgin nigérian",
 	"pl": "polonais",
 	"pt": "portugais",
 	"pt-PT": "portugais européen",
@@ -174,6 +179,8 @@
 	"smn": "same d’Inari",
 	"se": "same du Nord",
 	"sg": "sango",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"sr": "serbe",
 	"ksb": "shambala",
 	"sn": "shona",
@@ -183,6 +190,7 @@
 	"xog": "soga",
 	"so": "somali",
 	"ckb": "sorani",
+	"su": "soundanais",
 	"sv": "suédois",
 	"gsw": "suisse allemand",
 	"sw": "swahili",
diff --git a/vendor/commerceguys/intl/resources/language/fr-CA.json b/vendor/commerceguys/intl/resources/language/fr-CA.json
index a7e239d73..a19553bed 100644
--- a/vendor/commerceguys/intl/resources/language/fr-CA.json
+++ b/vendor/commerceguys/intl/resources/language/fr-CA.json
@@ -14,8 +14,8 @@
 	"en-CA": "anglais canadien",
 	"ar": "arabe",
 	"hy": "arménien",
+	"asa": "asou",
 	"as": "assamais",
-	"asa": "assou",
 	"ast": "asturien",
 	"az": "azerbaïdjanais",
 	"ksf": "bafia",
@@ -52,6 +52,7 @@
 	"hr": "croate",
 	"da": "danois",
 	"dyo": "diola-fogny",
+	"doi": "dogri",
 	"dua": "douala",
 	"dz": "dzongkha",
 	"ebu": "embou",
@@ -125,12 +126,14 @@
 	"luy": "luyia",
 	"mas": "maasaï",
 	"mk": "macédonien",
+	"mai": "maïthili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makondé",
 	"ms": "malais",
 	"ml": "malayalam",
 	"mg": "malgache",
 	"mt": "maltais",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathe",
 	"jmc": "matchamé",
@@ -147,6 +150,7 @@
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
 	"nyn": "nkole",
+	"no": "norvégien",
 	"nb": "norvégien bokmål",
 	"nn": "norvégien nynorsk",
 	"nus": "nuer",
@@ -160,6 +164,7 @@
 	"pa": "pendjabi",
 	"fa": "persan",
 	"ff": "peul",
+	"pcm": "pidgin nigérian",
 	"pl": "polonais",
 	"pt": "portugais",
 	"pt-PT": "portugais européen",
@@ -175,6 +180,8 @@
 	"smn": "sami d’Inari",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"sr": "serbe",
 	"sn": "shona",
 	"sd": "sindhi",
@@ -182,6 +189,7 @@
 	"sl": "slovène",
 	"xog": "soga",
 	"so": "somali",
+	"su": "soundanais",
 	"sv": "suédois",
 	"gsw": "suisse allemand",
 	"sw": "swahili",
diff --git a/vendor/commerceguys/intl/resources/language/fr-CH.json b/vendor/commerceguys/intl/resources/language/fr-CH.json
index 31670eb93..294885318 100644
--- a/vendor/commerceguys/intl/resources/language/fr-CH.json
+++ b/vendor/commerceguys/intl/resources/language/fr-CH.json
@@ -18,7 +18,7 @@
 	"as": "assamais",
 	"ast": "asturien",
 	"asa": "asu",
-	"az": "azéri",
+	"az": "azerbaïdjanais",
 	"ksf": "bafia",
 	"bm": "bambara",
 	"nds": "bas-allemand",
@@ -27,7 +27,7 @@
 	"eu": "basque",
 	"bas": "bassa",
 	"bem": "bemba",
-	"bez": "béna",
+	"bez": "bena",
 	"bn": "bengali",
 	"be": "biélorusse",
 	"my": "birman",
@@ -53,9 +53,10 @@
 	"hr": "croate",
 	"da": "danois",
 	"dyo": "diola-fogny",
+	"doi": "dogri",
 	"dua": "douala",
 	"dz": "dzongkha",
-	"ebu": "embou",
+	"ebu": "embu",
 	"es": "espagnol",
 	"es-419": "espagnol d’Amérique latine",
 	"es-MX": "espagnol du Mexique",
@@ -69,7 +70,6 @@
 	"fr": "français",
 	"fr-CA": "français canadien",
 	"fr-CH": "français suisse",
-	"ksh": "francique ripuaire",
 	"fur": "frioulan",
 	"fy": "frison occidental",
 	"gd": "gaélique écossais",
@@ -107,6 +107,7 @@
 	"ki": "kikuyu",
 	"rw": "kinyarwanda",
 	"ky": "kirghize",
+	"ksh": "kölsch",
 	"kok": "konkani",
 	"khq": "koyra chiini",
 	"ses": "koyraboro senni",
@@ -124,12 +125,14 @@
 	"luy": "luyia",
 	"mas": "maasaï",
 	"mk": "macédonien",
+	"mai": "maïthili",
 	"kde": "makondé",
 	"mgh": "makua",
 	"ms": "malais",
 	"ml": "malayalam",
 	"mg": "malgache",
 	"mt": "maltais",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"jmc": "matchamé",
@@ -146,6 +149,7 @@
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
 	"nmg": "ngoumba",
+	"no": "norvégien",
 	"nb": "norvégien bokmål",
 	"nn": "norvégien nynorsk",
 	"nus": "nuer",
@@ -160,6 +164,7 @@
 	"pa": "pendjabi",
 	"fa": "persan",
 	"ff": "peul",
+	"pcm": "pidgin nigérian",
 	"pl": "polonais",
 	"pt": "portugais",
 	"pt-PT": "portugais européen",
@@ -174,6 +179,8 @@
 	"smn": "same d’Inari",
 	"se": "same du Nord",
 	"sg": "sango",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"sr": "serbe",
 	"ksb": "shambala",
 	"sn": "shona",
@@ -183,6 +190,7 @@
 	"xog": "soga",
 	"so": "somali",
 	"ckb": "sorani",
+	"su": "soundanais",
 	"sv": "suédois",
 	"gsw": "suisse allemand",
 	"sw": "swahili",
diff --git a/vendor/commerceguys/intl/resources/language/fr.json b/vendor/commerceguys/intl/resources/language/fr.json
index 7661af19b..c305f03dd 100644
--- a/vendor/commerceguys/intl/resources/language/fr.json
+++ b/vendor/commerceguys/intl/resources/language/fr.json
@@ -18,7 +18,7 @@
 	"as": "assamais",
 	"ast": "asturien",
 	"asa": "asu",
-	"az": "azéri",
+	"az": "azerbaïdjanais",
 	"ksf": "bafia",
 	"bm": "bambara",
 	"nds": "bas-allemand",
@@ -27,7 +27,7 @@
 	"eu": "basque",
 	"bas": "bassa",
 	"bem": "bemba",
-	"bez": "béna",
+	"bez": "bena",
 	"bn": "bengali",
 	"be": "biélorusse",
 	"my": "birman",
@@ -53,9 +53,10 @@
 	"hr": "croate",
 	"da": "danois",
 	"dyo": "diola-fogny",
+	"doi": "dogri",
 	"dua": "douala",
 	"dz": "dzongkha",
-	"ebu": "embou",
+	"ebu": "embu",
 	"es": "espagnol",
 	"es-419": "espagnol d’Amérique latine",
 	"es-MX": "espagnol du Mexique",
@@ -69,7 +70,6 @@
 	"fr": "français",
 	"fr-CA": "français canadien",
 	"fr-CH": "français suisse",
-	"ksh": "francique ripuaire",
 	"fur": "frioulan",
 	"fy": "frison occidental",
 	"gd": "gaélique écossais",
@@ -77,7 +77,7 @@
 	"cy": "gallois",
 	"lg": "ganda",
 	"ka": "géorgien",
-	"gu": "goudjerati",
+	"gu": "goudjarati",
 	"el": "grec",
 	"kl": "groenlandais",
 	"guz": "gusii",
@@ -107,6 +107,7 @@
 	"ki": "kikuyu",
 	"rw": "kinyarwanda",
 	"ky": "kirghize",
+	"ksh": "kölsch",
 	"kok": "konkani",
 	"khq": "koyra chiini",
 	"ses": "koyraboro senni",
@@ -124,12 +125,14 @@
 	"luy": "luyia",
 	"mas": "maasaï",
 	"mk": "macédonien",
+	"mai": "maïthili",
 	"kde": "makondé",
 	"mgh": "makua",
 	"ms": "malais",
 	"ml": "malayalam",
 	"mg": "malgache",
 	"mt": "maltais",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"jmc": "matchamé",
@@ -146,6 +149,7 @@
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
 	"nmg": "ngoumba",
+	"no": "norvégien",
 	"nb": "norvégien bokmål",
 	"nn": "norvégien nynorsk",
 	"nus": "nuer",
@@ -160,6 +164,7 @@
 	"pa": "pendjabi",
 	"fa": "persan",
 	"ff": "peul",
+	"pcm": "pidgin nigérian",
 	"pl": "polonais",
 	"pt": "portugais",
 	"pt-PT": "portugais européen",
@@ -174,6 +179,8 @@
 	"smn": "same d’Inari",
 	"se": "same du Nord",
 	"sg": "sango",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"sr": "serbe",
 	"ksb": "shambala",
 	"sn": "shona",
@@ -183,6 +190,7 @@
 	"xog": "soga",
 	"so": "somali",
 	"ckb": "sorani",
+	"su": "soundanais",
 	"sv": "suédois",
 	"gsw": "suisse allemand",
 	"sw": "swahili",
diff --git a/vendor/commerceguys/intl/resources/language/ga.json b/vendor/commerceguys/intl/resources/language/ga.json
index 4ef08e88d..9c6c0a3f5 100644
--- a/vendor/commerceguys/intl/resources/language/ga.json
+++ b/vendor/commerceguys/intl/resources/language/ga.json
@@ -11,9 +11,9 @@
 	"az": "Asarbaiseáinis",
 	"ast": "Astúiris",
 	"asa": "Asu",
-	"ksf": "Bafia",
+	"ksf": "Baifiais",
 	"bm": "Bambairis",
-	"bas": "Basaa",
+	"bas": "Basáis",
 	"eu": "Bascais",
 	"be": "Bealarúisis",
 	"bn": "Beangáilis",
@@ -22,13 +22,14 @@
 	"en-GB": "Béarla Briotanach",
 	"en-CA": "Béarla Ceanadach",
 	"bem": "Beimbis",
-	"bez": "Bena",
-	"brx": "Bodo",
+	"bez": "Béinis",
+	"brx": "Bódóis",
 	"bs": "Boisnis",
 	"cy": "Breatnais",
 	"br": "Briotáinis",
 	"bg": "Bulgáiris",
 	"my": "Burmais",
+	"kkj": "Cacóis",
 	"kab": "Caibílis",
 	"ks": "Caismíris",
 	"kam": "Cambais",
@@ -37,26 +38,29 @@
 	"kk": "Casaicis",
 	"ca": "Catalóinis",
 	"qu": "Ceatsuais",
-	"cgg": "Chiga",
+	"cgg": "Cígis",
 	"km": "Ciméiris",
 	"rw": "Ciniaruaindis",
 	"ki": "Ciocúis",
 	"ky": "Cirgisis",
+	"ksh": "Coilsis",
 	"ku": "Coirdis",
 	"ckb": "Coirdis Lárnach",
 	"ko": "Cóiréis",
 	"kw": "Coirnis",
 	"xh": "Cóisis",
-	"ksh": "Colognian",
 	"kok": "Concáinis",
+	"kea": "Criól Cabo Verde",
 	"hr": "Cróitis",
+	"nmg": "Cuaiseois",
 	"da": "Danmhairgis",
+	"doi": "Dogri",
 	"dua": "Duailis",
 	"ee": "Éabhais",
 	"ewo": "Éabhandóis",
 	"he": "Eabhrais",
+	"ebu": "Eambúis",
 	"et": "Eastóinis",
-	"ebu": "Embu",
 	"fo": "Faróis",
 	"fil": "Filipínis",
 	"fi": "Fionlainnis",
@@ -76,7 +80,7 @@
 	"yi": "Giúdais",
 	"el": "Gréigis",
 	"gu": "Gúisearáitis",
-	"guz": "Gusii",
+	"guz": "Gúisis",
 	"ha": "Hásais",
 	"haw": "Haváis",
 	"hi": "Hiondúis",
@@ -85,19 +89,16 @@
 	"id": "Indinéisis",
 	"it": "Iodáilis",
 	"ig": "�ogbóis",
+	"dyo": "Ióla-Fainís",
+	"no": "Ioruais",
 	"nb": "Ioruais Bokmål",
 	"is": "�oslainnis",
-	"dyo": "Jola-Fonyi",
-	"kea": "Kabuverdianu",
-	"kkj": "Kako",
+	"ii": "�s Shichuan",
 	"kl": "Kalaallisut",
 	"kln": "Kalenjin",
-	"khq": "Koyra Chiini",
-	"ses": "Koyraboro Senni",
-	"nmg": "Kwasio",
+	"lkt": "Lacótais",
+	"lag": "Láingis",
 	"lv": "Laitvis",
-	"lkt": "Lakota",
-	"lag": "Langi",
 	"lo": "Laoisis",
 	"ln": "Liongáilis",
 	"lt": "Liotuáinis",
@@ -110,15 +111,17 @@
 	"mk": "Macadóinis",
 	"jmc": "Machame",
 	"ml": "Mailéalaimis",
+	"mai": "Maitilis",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"ms": "Malaeis",
 	"mg": "Malagáisis",
 	"mt": "Máltais",
+	"mni": "Manapúiris",
 	"mi": "Maorais",
 	"mr": "Maraitis",
 	"mas": "Másais",
-	"mzn": "Mazanderani",
+	"mzn": "Mázandaráinis",
 	"mer": "Meru",
 	"mgo": "Metaʼ",
 	"ro-MD": "Moldáivis",
@@ -132,13 +135,14 @@
 	"jgo": "Ngomba",
 	"nyn": "Niancóilis",
 	"nn": "Nua-Ioruais",
-	"nus": "Nuer",
+	"nus": "Nuairis",
 	"or": "Oirísis",
 	"os": "Oiséitis",
 	"nl": "Ollainnis",
 	"om": "Oraimis",
 	"ps": "Paistis",
 	"fa": "Peirsis",
+	"pcm": "pidsean na Nigéire",
 	"nl-BE": "Pléimeannais",
 	"pl": "Polainnis",
 	"pt": "Portaingéilis",
@@ -157,6 +161,8 @@
 	"saq": "Samburu",
 	"sg": "Sangóis",
 	"sbp": "Sangu",
+	"sa": "Sanscrait",
+	"sat": "Santáilis",
 	"ceb": "Seabúáinis",
 	"ja": "Seapáinis",
 	"cs": "Seicis",
@@ -168,7 +174,6 @@
 	"sn": "Seoinis",
 	"ka": "Seoirsis",
 	"ksb": "Shambala",
-	"ii": "Sichuan Yi",
 	"sd": "Sindis",
 	"zh": "Sínis",
 	"zh-Hans": "Sínis Shimplithe",
@@ -178,6 +183,8 @@
 	"sk": "Slóvaicis",
 	"xog": "Soga",
 	"so": "Somáilis",
+	"khq": "Songais Iartharach",
+	"ses": "Songais Oirthearach",
 	"dsb": "Sorbais �ochtarach",
 	"hsb": "Sorbais Uachtarach",
 	"es": "Spáinnis",
@@ -185,14 +192,15 @@
 	"es-419": "Spáinnis Mheiriceá Laidinigh",
 	"sv": "Sualainnis",
 	"zu": "Súlúis",
+	"su": "Sundais",
 	"sw": "Svahaílis",
 	"sw-CD": "Svahaílis an Chongó",
 	"shi": "Tachelhit",
 	"tg": "Táidsícis",
 	"dav": "Taita",
 	"ta": "Tamailis",
+	"zgh": "Tamaisis Chaighdeánach Mharacó",
 	"tzm": "Tamazight Atlais Láir",
-	"zgh": "Tamazight Caighdeánach Mharacó",
 	"twq": "Tasawaq",
 	"tt": "Tatairis",
 	"th": "Téalainnis",
diff --git a/vendor/commerceguys/intl/resources/language/gd.json b/vendor/commerceguys/intl/resources/language/gd.json
index 2c23de45b..311c76875 100644
--- a/vendor/commerceguys/intl/resources/language/gd.json
+++ b/vendor/commerceguys/intl/resources/language/gd.json
@@ -23,6 +23,7 @@
 	"en-AU": "Beurla Astràilia",
 	"en-GB": "Beurla Bhreatainn",
 	"en-CA": "Beurla Chanada",
+	"pcm": "Beurla Nigèiriach",
 	"vi": "Bhiet-Namais",
 	"brx": "Bodo",
 	"nb": "Bokmål na Nirribhidh",
@@ -34,6 +35,7 @@
 	"ks": "Caismiris",
 	"haw": "Cànan Hawai’i",
 	"th": "Cànan nan Tàidh",
+	"su": "Cànan Sunda",
 	"yue": "Cantonais",
 	"kk": "Casachais",
 	"ca": "Catalanais",
@@ -51,6 +53,7 @@
 	"da": "Danmhairgis",
 	"jv": "Deàbhanais",
 	"ce": "Deideanais",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"nl": "Duitsis",
 	"dz": "Dzongkha",
@@ -119,12 +122,14 @@
 	"luy": "Luyia",
 	"mas": "Maasai",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasais",
 	"ms": "Malaidhis",
 	"ml": "Malayalam",
 	"mt": "Maltais",
+	"mni": "Manipuri",
 	"mi": "M�ori",
 	"mr": "Marathi",
 	"mk": "Masadonais",
@@ -140,6 +145,7 @@
 	"ne": "Neapàlais",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"no": "Nirribhis",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"nn": "Nynorsk na Nirribhidh",
@@ -165,6 +171,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"ja": "Seapanais",
 	"cs": "Seicis",
 	"sr": "Sèirbis",
diff --git a/vendor/commerceguys/intl/resources/language/gl.json b/vendor/commerceguys/intl/resources/language/gl.json
index 1a41367f1..da381af78 100644
--- a/vendor/commerceguys/intl/resources/language/gl.json
+++ b/vendor/commerceguys/intl/resources/language/gl.json
@@ -48,6 +48,7 @@
 	"mfe": "crioulo mauriciano",
 	"hr": "croata",
 	"da": "dinamarqués",
+	"doi": "Dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -125,12 +126,14 @@
 	"luy": "luyia",
 	"mk": "macedonio",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malabar",
 	"ms": "malaio",
 	"mg": "malgaxe",
 	"mt": "maltés",
+	"mni": "manipuri",
 	"mi": "maorí",
 	"mr": "marathi",
 	"mas": "masai",
@@ -146,6 +149,7 @@
 	"ne": "nepalí",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "noruegués",
 	"nb": "noruegués bokmål",
 	"nn": "noruegués nynorsk",
 	"nus": "nuer",
@@ -156,6 +160,7 @@
 	"pa": "panxabí",
 	"ps": "paxto",
 	"fa": "persa",
+	"pcm": "pidgin nixeriano",
 	"pl": "polaco",
 	"pt": "portugués",
 	"pt-PT": "portugués de Portugal",
@@ -171,6 +176,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sánscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbio",
 	"ksb": "shambala",
@@ -181,6 +188,7 @@
 	"sw": "suahili",
 	"sw-CD": "suahili congolés",
 	"sv": "sueco",
+	"su": "sundanés",
 	"shi": "tachelhit",
 	"th": "tailandés",
 	"dav": "taita",
diff --git a/vendor/commerceguys/intl/resources/language/gsw.json b/vendor/commerceguys/intl/resources/language/gsw.json
index b87533db7..825347bb6 100644
--- a/vendor/commerceguys/intl/resources/language/gsw.json
+++ b/vendor/commerceguys/intl/resources/language/gsw.json
@@ -104,6 +104,7 @@
 	"luy": "Luyia",
 	"jmc": "Machame",
 	"mg": "Madagassisch",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"ms": "Malaiisch",
@@ -114,6 +115,7 @@
 	"mas": "Massai-Schpraach",
 	"mzn": "Mazanderani",
 	"mk": "Mazedonisch",
+	"mni": "Meithei-Schpraach",
 	"mer": "Meru",
 	"mgo": "Metaʼ",
 	"ro-MD": "Moldawisch",
@@ -128,9 +130,11 @@
 	"dsb": "Nidersorbisch",
 	"nds": "Nidertüütsch",
 	"nds-NL": "Nidertüütsch (Holland)",
+	"pcm": "Nigerian Pidgin",
 	"nd": "Nord-Ndebele-Schpraach",
 	"se": "Nord-Samisch",
 	"lrc": "Northern Luri",
+	"no": "Norwegisch",
 	"nb": "Norwegisch Bokmål",
 	"nn": "Norwegisch Nynorsk",
 	"nus": "Nuer",
@@ -156,6 +160,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanschkrit",
+	"sat": "Santali",
 	"sn": "Schhona",
 	"gd": "Schottisch-Gäälisch",
 	"es": "Schpanisch",
@@ -177,6 +183,7 @@
 	"zgh": "Standard Moroccan Tamazight",
 	"sw": "Suaheli",
 	"sw-CD": "Suaheli (Temokraatischi Republik Kongo)",
+	"su": "Sundanesisch",
 	"shi": "Tachelhit",
 	"tg": "Tadschikisch",
 	"dav": "Taita",
@@ -189,6 +196,7 @@
 	"th": "Thailändisch",
 	"bo": "Tibeetisch",
 	"ti": "Tigrinja",
+	"doi": "Togri",
 	"to": "Tongaisch",
 	"zh-Hant": "Tradizionells Chineesisch",
 	"cs": "Tschechisch",
diff --git a/vendor/commerceguys/intl/resources/language/gu.json b/vendor/commerceguys/intl/resources/language/gu.json
index efcb14752..bc8b47422 100644
--- a/vendor/commerceguys/intl/resources/language/gu.json
+++ b/vendor/commerceguys/intl/resources/language/gu.json
@@ -83,6 +83,7 @@
 	"to": "ટોંગાન",
 	"nl": "ડચ",
 	"da": "ડેનિશ",
+	"doi": "ડોગ�રી",
 	"dz": "ડ��ોંગ�ખા",
 	"tt": "તતાર",
 	"ta": "તમિલ",
@@ -98,9 +99,11 @@
 	"dua": "દ�આલા",
 	"jgo": "નગોમ�બા",
 	"naq": "નમા",
+	"pcm": "નાઇજેરિયન પીજીન",
 	"nnh": "ની�મબ�ન",
 	"nus": "ન��ર",
 	"ne": "નેપાળી",
+	"no": "નૉર�વેજીયન",
 	"nn": "નોર�વેજિયન નાયનૉર�સ�ક",
 	"nb": "નોર�વેજિયન બોકમાલ",
 	"nyn": "ન�યાનકોલ",
@@ -135,6 +138,7 @@
 	"jmc": "મકામે",
 	"kde": "મકોન�ડે",
 	"mzn": "મ�ાન�દેરાની",
+	"mni": "મણિપ�રી",
 	"mr": "મરાઠી",
 	"ms": "મલય",
 	"ml": "મલયાલમ",
@@ -149,6 +153,7 @@
 	"mgo": "મેતા",
 	"mer": "મેર�",
 	"mk": "મેસેડોનિયન",
+	"mai": "મૈથિલી",
 	"mn": "મોંગોલિયન",
 	"mfe": "મોરીસ�યેન",
 	"ro-MD": "મોલડાવિયન",
@@ -187,6 +192,9 @@
 	"ksb": "શમ�બાલા",
 	"chr": "શેરોકી",
 	"sn": "શોના",
+	"su": "સંડેની�",
+	"sat": "સંતાલી",
+	"sa": "સંસ�કૃત",
 	"sah": "સખા",
 	"saq": "સમ�બ�ર�",
 	"zh-Hans": "સરળીકૃત ચાઇની�",
diff --git a/vendor/commerceguys/intl/resources/language/he.json b/vendor/commerceguys/intl/resources/language/he.json
index 9d5be34dd..05ab7514c 100644
--- a/vendor/commerceguys/intl/resources/language/he.json
+++ b/vendor/commerceguys/intl/resources/language/he.json
@@ -53,10 +53,11 @@
 	"kl": "גרינלנדית",
 	"de": "גרמנית",
 	"de-AT": "גרמנית (�וסטריה)",
-	"gsw": "גרמנית (בשוויץ)",
 	"de-CH": "גרמנית (שוויץ)",
+	"gsw": "גרמנית שוויצרית",
 	"nds": "גרמנית תחתית",
 	"dua": "דו�לה",
+	"doi": "דוגרי",
 	"dz": "דזונקה",
 	"da": "דנית",
 	"ha": "ה�וסה",
@@ -106,6 +107,7 @@
 	"lkt": "לקוטה",
 	"mi": "מ�ורית",
 	"mzn": "מ�ז�נדר�ני",
+	"mai": "מ�יטילית",
 	"jmc": "מ�ק�מה",
 	"mgh": "מ�קוו�ה מטו",
 	"ro-MD": "מולדבית",
@@ -116,6 +118,7 @@
 	"mg": "מלגשית",
 	"mt": "מלטית",
 	"ml": "מלי�ל��",
+	"mni": "מניפורית",
 	"mas": "מס�ית",
 	"mk": "מקדונית",
 	"kde": "מקונדה",
@@ -126,17 +129,21 @@
 	"nnh": "נגי�מבון",
 	"nd": "נדבלה צפונית",
 	"nus": "נו�ר",
+	"no": "נורווגית",
 	"nn": "נורווגית חדשה",
 	"nb": "נורווגית ספרותית",
 	"nyn": "ני�נקולה",
+	"pcm": "ניגרית פידג׳ית",
 	"ne": "נפ�לית",
 	"sah": "ס�חה",
 	"sbp": "ס�נגו",
+	"sat": "ס�נט�לי",
 	"ceb": "סבו�נו",
 	"xog": "סוגה",
 	"sw": "סווהילי",
 	"sw-CD": "סווהילי קונגו",
 	"so": "סומלית",
+	"su": "סונדנזית",
 	"hsb": "סורבית עילית",
 	"dsb": "סורבית תחתית",
 	"sd": "סינדהית",
@@ -150,6 +157,7 @@
 	"se": "סמי צפונית",
 	"sg": "סנגו",
 	"seh": "סנה",
+	"sa": "סנסקריט",
 	"es": "ספרדית",
 	"es-419": "ספרדית (�מריקה הלטינית)",
 	"es-MX": "ספרדית (מקסיקו)",
diff --git a/vendor/commerceguys/intl/resources/language/hi.json b/vendor/commerceguys/intl/resources/language/hi.json
index 8bab949ce..3e5c234bc 100644
--- a/vendor/commerceguys/intl/resources/language/hi.json
+++ b/vendor/commerceguys/intl/resources/language/hi.json
@@ -83,6 +83,7 @@
 	"to": "टोंगन",
 	"nl": "डच",
 	"da": "डेनिश",
+	"doi": "डोग�री",
 	"ta": "तमिल",
 	"tg": "ताजिक",
 	"tt": "तातार",
@@ -96,6 +97,7 @@
 	"th": "थाई",
 	"dua": "द�आला",
 	"jgo": "नगोंबा",
+	"pcm": "नाइजीरियाई पिडगिन",
 	"naq": "नामा",
 	"nds": "निचला जर�मन",
 	"dsb": "निचला सॉर�बियन",
@@ -103,6 +105,7 @@
 	"nus": "न��र",
 	"ne": "नेपाली",
 	"se": "नॉर�दन सामी",
+	"no": "नॉर�वेजियाई",
 	"nn": "नॉर�वेजियाई नॉयनॉर�स�क",
 	"nb": "नॉर�वेजियाई बोकमाल",
 	"nyn": "न�यानकोल",
@@ -136,6 +139,7 @@
 	"br": "ब�रेटन",
 	"mn": "मंगोलियाई",
 	"mk": "मकदूनियाई",
+	"mni": "मणिप�री",
 	"tzm": "मध�य �टलस तमाज़ित",
 	"mr": "मराठी",
 	"ms": "मलय",
@@ -153,6 +157,7 @@
 	"kde": "मैकोंड",
 	"es-MX": "मैक�सिकन स�पेनिश",
 	"mgh": "मैख�वा-मीट�टो",
+	"mai": "मैथिली",
 	"mfe": "मोरीस�येन",
 	"ro-MD": "मोलडावियन",
 	"yi": "यहूदी",
@@ -189,6 +194,8 @@
 	"ksb": "शम�बाला",
 	"cgg": "शिगा",
 	"sn": "शोणा",
+	"sat": "संथाली",
+	"sa": "संस�कृत",
 	"zh-Hans": "सरलीकृत चीनी",
 	"sr": "सर�बियाई",
 	"sg": "सांगो",
@@ -196,6 +203,7 @@
 	"si": "सिंहली",
 	"ii": "सिच�आन यी",
 	"ceb": "सिब�आनो",
+	"su": "स�ंडानी",
 	"seh": "सेना",
 	"sbp": "सैंग�",
 	"saq": "सैम�ब�र�",
diff --git a/vendor/commerceguys/intl/resources/language/hr.json b/vendor/commerceguys/intl/resources/language/hr.json
index 3042cff8d..dd3d930cc 100644
--- a/vendor/commerceguys/intl/resources/language/hr.json
+++ b/vendor/commerceguys/intl/resources/language/hr.json
@@ -32,6 +32,7 @@
 	"chr": "�erokijski",
 	"cs": "�eški",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�ki",
 	"nds": "donjonjema�ki",
 	"nds-NL": "donjosaksonski",
@@ -116,6 +117,7 @@
 	"luy": "luyia",
 	"jmc": "machame",
 	"hu": "mađarski",
+	"mai": "maithili",
 	"mk": "makedonski",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -123,6 +125,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipurski",
 	"mi": "maorski",
 	"mr": "marathski",
 	"mas": "masajski",
@@ -138,7 +141,9 @@
 	"ne": "nepalski",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
 	"nl": "nizozemski",
+	"no": "norveški",
 	"nb": "norveški bokmål",
 	"nn": "norveški nynorsk",
 	"nus": "nuerski",
@@ -161,6 +166,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrtski",
+	"sat": "santalski",
 	"seh": "sena",
 	"ksb": "shambala",
 	"sn": "shona",
@@ -177,6 +184,7 @@
 	"ckb": "soranski kurdski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamašek",
+	"su": "sundanski",
 	"sw": "svahili",
 	"gd": "Å¡kotski gaelski",
 	"es": "Å¡panjolski",
diff --git a/vendor/commerceguys/intl/resources/language/hu.json b/vendor/commerceguys/intl/resources/language/hu.json
index a83d34ef4..794e8b873 100644
--- a/vendor/commerceguys/intl/resources/language/hu.json
+++ b/vendor/commerceguys/intl/resources/language/hu.json
@@ -32,6 +32,7 @@
 	"cs": "cseh",
 	"chr": "cseroki",
 	"da": "dán",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzsonga",
 	"zh-Hans": "egyszerűsített kínai",
@@ -121,12 +122,14 @@
 	"mk": "macedón",
 	"jmc": "machame",
 	"hu": "magyar",
+	"mai": "maithili",
 	"kde": "makonde",
 	"mgh": "makua-metó",
 	"ms": "maláj",
 	"ml": "malajálam",
 	"mg": "malgas",
 	"mt": "máltai",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "maráthi",
 	"zgh": "marokkói tamazight",
@@ -144,6 +147,8 @@
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
 	"nmg": "ngumba",
+	"pcm": "nigériai pidgin",
+	"no": "norvég",
 	"nb": "norvég (bokmål)",
 	"nn": "norvég (nynorsk)",
 	"nus": "nuer",
@@ -177,6 +182,8 @@
 	"saq": "szamburu",
 	"sg": "szangó",
 	"sbp": "szangu",
+	"sa": "szanszkrit",
+	"sat": "szantáli",
 	"twq": "szavák",
 	"ceb": "szebuano",
 	"ii": "szecsuán ji",
@@ -189,6 +196,7 @@
 	"xog": "szoga",
 	"so": "szomáli",
 	"sw": "szuahéli",
+	"su": "szundanéz",
 	"shi": "tachelhit",
 	"tg": "tadzsik",
 	"dav": "taita",
diff --git a/vendor/commerceguys/intl/resources/language/hy.json b/vendor/commerceguys/intl/resources/language/hy.json
index ddc341577..08b9f9c87 100644
--- a/vendor/commerceguys/intl/resources/language/hy.json
+++ b/vendor/commerceguys/intl/resources/language/hy.json
@@ -115,6 +115,8 @@
 	"mt": "Õ´Õ¡Õ¬Õ©Õ¡ÕµÕ¥Ö€Õ¥Õ¶",
 	"mk": "Õ´Õ¡Õ¯Õ¥Õ¤Õ¸Õ¶Õ¥Ö€Õ¥Õ¶",
 	"kde": "Õ´Õ¡Õ¯Õ¸Õ¶Õ¤Õ¥",
+	"mai": "Õ´Õ¡ÕµÕ©Õ«Õ¬Õ«",
+	"mni": "Õ´Õ¡Õ¶Õ«ÕºÕ¸Ö‚Ö€Õ«",
 	"jmc": "Õ´Õ¡Õ·Õ¡Õ´Õ¥",
 	"mi": "Õ´Õ¡Õ¸Ö€Õ«",
 	"mas": "Õ´Õ¡Õ½Õ¡Õ«",
@@ -134,8 +136,10 @@
 	"nnh": "Õ¶Õ£Õ«Õ¥Õ´Õ¢Õ¸Ö‚Õ¶",
 	"jgo": "Õ¶Õ£Õ¸Õ´Õ¢Õ¡",
 	"ne": "Õ¶Õ¥ÕºÕ¡Õ¬Õ¥Ö€Õ¥Õ¶",
+	"pcm": "Õ¶Õ«Õ£Õ¥Ö€ÕµÕ¡Õ¶ Õ¯Ö€Õ¥Õ¸Õ¬Õ¥Ö€Õ¥Õ¶",
 	"nyn": "Õ¶ÕµÕ¡Õ¶Õ¯Õ¸Õ¬Õ¥",
 	"nn": "Õ¶Õ¸Ö€ Õ¶Õ¸Ö€Õ¾Õ¥Õ£Õ¥Ö€Õ¥Õ¶",
+	"no": "Õ¶Õ¸Ö€Õ¾Õ¥Õ£Õ¥Ö€Õ¥Õ¶",
 	"nus": "Õ¶Õ¸Ö‚Õ¥Ö€",
 	"ksb": "Õ·Õ¡Õ´Õ¢Õ¡Õ¬Õ¡",
 	"sn": "Õ·Õ¸Õ¶Õ¡",
@@ -169,6 +173,8 @@
 	"saq": "Õ½Õ¡Õ´Õ¢Õ¸Ö‚Ö€Õ¸Ö‚",
 	"sg": "Õ½Õ¡Õ¶Õ£Õ¸",
 	"sbp": "Õ½Õ¡Õ¶Õ£Õ¸Ö‚",
+	"sa": "Õ½Õ¡Õ¶Õ½Õ¯Ö€Õ«Õ¿",
+	"sat": "Õ½Õ¡Õ¶Õ¿Õ¡Õ¬Õ«",
 	"ceb": "Õ½Õ¥Õ¢Õ¸Ö‚Õ¥Ö€Õ¥Õ¶",
 	"seh": "Õ½Õ¥Õ¶Õ¡",
 	"sr": "Õ½Õ¥Ö€Õ¢Õ¥Ö€Õ¥Õ¶",
@@ -181,6 +187,7 @@
 	"so": "Õ½Õ¸Õ´Õ¡Õ¬Õ«Õ¥Ö€Õ¥Õ¶",
 	"ckb": "Õ½Õ¸Ö€Õ¡Õ¶Õ« Ö„Ö€Õ¤Õ¥Ö€Õ¥Õ¶",
 	"sw": "Õ½Õ¸Ö‚Õ¡Õ°Õ«Õ¬Õ«",
+	"su": "Õ½Õ¸Ö‚Õ¶Õ¤Õ¡Õ¶Õ¥Ö€Õ¥Õ¶",
 	"nds": "Õ½Õ¿Õ¸Ö€Õ«Õ¶ Õ£Õ¥Ö€Õ´Õ¡Õ¶Õ¥Ö€Õ¥Õ¶",
 	"nds-NL": "Õ½Õ¿Õ¸Ö€Õ«Õ¶ Õ½Õ¡Ö„Õ½Õ¸Õ¶Õ¥Ö€Õ¥Õ¶",
 	"dsb": "Õ½Õ¿Õ¸Ö€Õ«Õ¶ Õ½Õ¸Ö€Õ¢Õ¥Ö€Õ¥Õ¶",
@@ -215,5 +222,6 @@
 	"nl-BE": "Ö†Õ¬Õ¡Õ´Õ¡Õ¶Õ¤Õ¥Ö€Õ¥Õ¶",
 	"ff": "Ö†Õ¸Ö‚Õ¬Õ¡Õ°",
 	"fr": "Ö†Ö€Õ¡Õ¶Õ½Õ¥Ö€Õ¥Õ¶",
-	"fur": "Ö†Ö€Õ«Õ¸Ö‚Õ¬Õ«Õ¥Ö€Õ¥Õ¶"
+	"fur": "Ö†Ö€Õ«Õ¸Ö‚Õ¬Õ«Õ¥Ö€Õ¥Õ¶",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/id.json b/vendor/commerceguys/intl/resources/language/id.json
index e1a65bf3c..a69c3117d 100644
--- a/vendor/commerceguys/intl/resources/language/id.json
+++ b/vendor/commerceguys/intl/resources/language/id.json
@@ -32,6 +32,7 @@
 	"cs": "Cheska",
 	"da": "Dansk",
 	"ksh": "Dialek Kolsch",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -110,12 +111,14 @@
 	"lrc": "Luri Utara",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mk": "Makedonia",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasi",
 	"ml": "Malayalam",
 	"mt": "Malta",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -132,6 +135,7 @@
 	"ne": "Nepali",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"no": "Norwegia",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"nn": "Nynorsk Norwegia",
@@ -139,13 +143,14 @@
 	"om": "Oromo",
 	"os": "Ossetia",
 	"ps": "Pashto",
-	"fr-CA": "Perancis (Kanada)",
-	"fr-CH": "Perancis (Swiss)",
 	"fa": "Persia",
+	"pcm": "Pidgin Nigeria",
 	"pl": "Polski",
 	"pt": "Portugis",
 	"pt-PT": "Portugis (Eropa)",
 	"fr": "Prancis",
+	"fr-CA": "Prancis (Kanada)",
+	"fr-CH": "Prancis (Swiss)",
 	"pa": "Punjabi",
 	"qu": "Quechua",
 	"rm": "Reto-Roman",
@@ -159,6 +164,8 @@
 	"se": "Sami Utara",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskerta",
+	"sat": "Santali",
 	"seh": "Sena",
 	"sr": "Serbia",
 	"ksb": "Shambala",
@@ -175,6 +182,7 @@
 	"es": "Spanyol",
 	"es-419": "Spanyol (Amerika Latin)",
 	"es-MX": "Spanyol (Meksiko)",
+	"su": "Sunda",
 	"fi": "Suomi",
 	"sw": "Swahili",
 	"sw-CD": "Swahili (Kongo)",
@@ -193,8 +201,8 @@
 	"bo": "Tibet",
 	"ti": "Tigrinya",
 	"zh": "Tionghoa",
-	"zh-Hans": "Tionghoa (Aksara Sederhana)",
-	"zh-Hant": "Tionghoa (Aksara Tradisional)",
+	"zh-Hans": "Tionghoa (Sederhana)",
+	"zh-Hant": "Tionghoa (Tradisional)",
 	"to": "Tonga",
 	"tr": "Turki",
 	"tk": "Turkmen",
diff --git a/vendor/commerceguys/intl/resources/language/is.json b/vendor/commerceguys/intl/resources/language/is.json
index 1d5c6c20a..d4889902b 100644
--- a/vendor/commerceguys/intl/resources/language/is.json
+++ b/vendor/commerceguys/intl/resources/language/is.json
@@ -23,10 +23,11 @@
 	"brx": "bódó",
 	"en-GB": "bresk enska",
 	"br": "bretónska",
-	"my": "burmneska",
 	"bg": "búlgarska",
+	"my": "búrmneska",
 	"chr": "Cherokee-mál",
 	"da": "danska",
+	"doi": "dogrí",
 	"dz": "dsongka",
 	"dua": "dúala",
 	"et": "eistneska",
@@ -43,7 +44,7 @@
 	"fur": "fríúlska",
 	"ff": "fúla",
 	"fo": "færeyska",
-	"gl": "galíanska",
+	"gl": "galisíska",
 	"lg": "ganda",
 	"ka": "georgíska",
 	"el": "gríska",
@@ -113,6 +114,7 @@
 	"lu": "lúbakatanga",
 	"luo": "lúó",
 	"lb": "lúxemborgíska",
+	"mai": "maítílí",
 	"mk": "makedónska",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -120,6 +122,7 @@
 	"ms": "malaíska",
 	"ml": "malajalam",
 	"mt": "maltneska",
+	"mni": "manípúrí",
 	"mi": "maorí",
 	"mr": "maratí",
 	"mas": "masaí",
@@ -136,9 +139,11 @@
 	"ne": "nepalska",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nígerískt pidgin",
 	"nd": "norður-ndebele",
 	"lrc": "norðurlúrí",
 	"se": "norðursamíska",
+	"no": "norska",
 	"nb": "norskt bókmál",
 	"nus": "núer",
 	"nyn": "nyankole",
@@ -161,6 +166,8 @@
 	"saq": "sambúrú",
 	"sg": "sangó",
 	"sbp": "sangú",
+	"sa": "sanskrít",
+	"sat": "santalí",
 	"seh": "sena",
 	"sr": "serbneska",
 	"sn": "shona",
@@ -178,6 +185,7 @@
 	"es": "spænska",
 	"zgh": "staðlað marokkóskt tamazight",
 	"zu": "súlú",
+	"su": "súndanska",
 	"sw": "svahílí",
 	"fr-CH": "svissnesk franska",
 	"de-CH": "svissnesk háþýska",
diff --git a/vendor/commerceguys/intl/resources/language/it.json b/vendor/commerceguys/intl/resources/language/it.json
index 75fba9d8a..215e042ad 100644
--- a/vendor/commerceguys/intl/resources/language/it.json
+++ b/vendor/commerceguys/intl/resources/language/it.json
@@ -47,6 +47,7 @@
 	"ku": "curdo",
 	"ckb": "curdo sorani",
 	"da": "danese",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"he": "ebraico",
@@ -115,12 +116,14 @@
 	"luy": "luyia",
 	"mk": "macedone",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malese",
 	"mg": "malgascio",
 	"mt": "maltese",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -135,6 +138,7 @@
 	"ne": "nepalese",
 	"jgo": "ngamambo",
 	"nnh": "ngiemboon",
+	"no": "norvegese",
 	"nb": "norvegese bokmål",
 	"nn": "norvegese nynorsk",
 	"nus": "nuer",
@@ -145,6 +149,7 @@
 	"os": "ossetico",
 	"ps": "pashto",
 	"fa": "persiano",
+	"pcm": "pidgin nigeriano",
 	"pl": "polacco",
 	"pt": "portoghese",
 	"pt-PT": "portoghese europeo",
@@ -156,11 +161,14 @@
 	"rn": "rundi",
 	"ru": "russo",
 	"rwk": "rwa",
+	"sah": "sacha",
 	"saq": "samburu",
 	"se": "sami del nord",
 	"smn": "sami di Inari",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbo",
 	"ksb": "shambala",
@@ -175,6 +183,7 @@
 	"es": "spagnolo",
 	"es-419": "spagnolo latinoamericano",
 	"es-MX": "spagnolo messicano",
+	"su": "sundanese",
 	"sv": "svedese",
 	"sw": "swahili",
 	"sw-CD": "swahili del Congo",
@@ -210,7 +219,6 @@
 	"bem": "wemba",
 	"wo": "wolof",
 	"xh": "xhosa",
-	"sah": "yakut",
 	"yav": "yangben",
 	"yi": "yiddish",
 	"yo": "yoruba",
diff --git a/vendor/commerceguys/intl/resources/language/ja.json b/vendor/commerceguys/intl/resources/language/ja.json
index 16b6a0125..b627eaf09 100644
--- a/vendor/commerceguys/intl/resources/language/ja.json
+++ b/vendor/commerceguys/intl/resources/language/ja.json
@@ -71,6 +71,8 @@
 	"dje": "ザルマ語",
 	"sbp": "サング語",
 	"sg": "サンゴ語",
+	"sa": "サンスクリット語",
+	"sat": "サンターリー語",
 	"ksb": "サン�ー語",
 	"saq": "サンブル語",
 	"jv": "ジャワ語",
@@ -89,6 +91,7 @@
 	"sk": "スロ�キア語",
 	"sl": "スロベニア語",
 	"sw": "スワヒリ語",
+	"su": "スンダ語",
 	"seh": "セナ語",
 	"ceb": "セブアノ語",
 	"sr": "セルビア語",
@@ -114,13 +117,16 @@
 	"de": "ドイツ語",
 	"de-AT": "ドイツ語 (オーストリア)",
 	"dua": "ドゥアラ語",
+	"doi": "ドーグリー語",
 	"tk": "トルクメン語",
 	"tr": "トルコ語",
 	"to": "トンガ語",
+	"pcm": "ナイジェリア・ピジン語",
 	"naq": "ナマ語",
 	"nyn": "ニャンコレ語",
 	"nus": "ヌエル語",
 	"ne": "�パール語",
+	"no": "ノルウェー語",
 	"nn": "ノルウェー語(ニーノシュク)",
 	"nb": "ノルウェー語(ブークモール)",
 	"ha": "�ウサ語",
@@ -136,6 +142,7 @@
 	"fil": "フィリピノ語",
 	"fi": "フィンランド語",
 	"fo": "フェロー語",
+	"nl-BE": "フラマン語",
 	"fr": "フランス語",
 	"fr-CA": "フランス語 (カナダ)",
 	"fr-CH": "フランス語 (スイス)",
@@ -143,7 +150,6 @@
 	"fur": "フリウリ語",
 	"bg": "ブルガリア語",
 	"br": "ブルトン語",
-	"nl-BE": "フレミッシュ語",
 	"vi": "ベトナム語",
 	"bez": "ベナ語",
 	"he": "ヘブライ語",
@@ -157,6 +163,7 @@
 	"pt": "�ルトガル語",
 	"pt-PT": "�ルトガル語 (イベリア�島)",
 	"mzn": "マーザンダラーン語",
+	"mai": "マイティリー語",
 	"mi": "マオリ語",
 	"mgh": "マクア・ミート語",
 	"mk": "マケドニア語",
@@ -164,6 +171,7 @@
 	"mas": "マサイ語",
 	"mg": "マダガスカル語",
 	"jmc": "マ�ャメ語",
+	"mni": "マニプリ語",
 	"mr": "マラーティー語",
 	"ml": "マラヤーラム語",
 	"mt": "マルタ語",
diff --git a/vendor/commerceguys/intl/resources/language/ka.json b/vendor/commerceguys/intl/resources/language/ka.json
index 467b4c54b..1380a98f3 100644
--- a/vendor/commerceguys/intl/resources/language/ka.json
+++ b/vendor/commerceguys/intl/resources/language/ka.json
@@ -15,7 +15,7 @@
 	"bas": "ბ�ს�",
 	"eu": "ბ�სკური",
 	"ksf": "ბ�ფი�",
-	"be": "ბელ�რუსული",
+	"be": "ბელ�რუსული",
 	"bem": "ბემბ�",
 	"bez": "ბენ�",
 	"bn": "ბენგ�ლური",
@@ -36,6 +36,7 @@
 	"kl": "დ�ს�ვლეთ გრენლ�ნდიური",
 	"fy": "დ�ს�ვლეთფრიზიული",
 	"dyo": "დი�ლ�",
+	"doi": "დ�გრი",
 	"dua": "დუ�ლ�",
 	"he": "ებრ�ული",
 	"ee": "ევე",
@@ -103,12 +104,14 @@
 	"lb": "ლუქსემბურგული",
 	"luy": "ლუჰი�",
 	"mzn": "მ�ზ�ნდერ�ნული",
+	"mai": "მ�ითილი",
 	"mk": "მ�კედ�ნური",
 	"kde": "მ�კ�ნდე",
 	"mg": "მ�ლ�გ�სიური",
 	"ml": "მ�ლ�ი�ლ�მური",
 	"ms": "მ�ლ�იური",
 	"mt": "მ�ლტური",
+	"mni": "მ�ნიპური",
 	"mi": "მ��რი",
 	"mr": "მ�რ�თჰი",
 	"mas": "მ�ს�ი",
@@ -125,7 +128,9 @@
 	"jgo": "ნგ�მბ�",
 	"ne": "ნეპ�ლური",
 	"nyn": "ნი�ნკ�ლე",
+	"pcm": "ნიგერიული კრე�ლური",
 	"nl": "ნიდერლ�ნდური",
+	"no": "ნ�რვეგიული",
 	"nb": "ნ�რვეგიული ბუკმ�ლი",
 	"nn": "ნ�რვეგიული ნიუნ�რსკი",
 	"nus": "ნუერი",
@@ -145,6 +150,8 @@
 	"saq": "ს�მბურუ",
 	"sg": "ს�ნგ�",
 	"sbp": "ს�ნგუ",
+	"sa": "ს�ნსკრიტი",
+	"sat": "ს�ნტ�ლი",
 	"ceb": "სებუ�ნ�",
 	"seh": "სენ�",
 	"sr": "სერბული",
@@ -159,6 +166,7 @@
 	"fa": "სპ�რსული",
 	"zgh": "სტ�ნდ�რტული მ�რ�კ�ული ტ�მ�ზიგხტი",
 	"sw": "სუ�ჰილი",
+	"su": "სუნდური",
 	"th": "ტ�ი",
 	"dav": "ტ�იტ�",
 	"ta": "ტ�მილური",
diff --git a/vendor/commerceguys/intl/resources/language/kk.json b/vendor/commerceguys/intl/resources/language/kk.json
index 865d1b843..fbb78db24 100644
--- a/vendor/commerceguys/intl/resources/language/kk.json
+++ b/vendor/commerceguys/intl/resources/language/kk.json
@@ -106,6 +106,7 @@
 	"luy": "лухиа тілі",
 	"lb": "люк�ембург тілі",
 	"mzn": "мазандеран тілі",
+	"mai": "майтхили тілі",
 	"mk": "македон тілі",
 	"kde": "маконде тілі",
 	"mgh": "макуа-меетто тілі",
@@ -113,6 +114,7 @@
 	"ms": "малай тілі",
 	"ml": "мала�лам тілі",
 	"mt": "мальта тілі",
+	"mni": "манипури тілі",
 	"mi": "маори тілі",
 	"mr": "маратхи тілі",
 	"zgh": "марокколық �тандартты тамазигхт тілі",
@@ -131,7 +133,9 @@
 	"de": "немі� тілі",
 	"ne": "непал тілі",
 	"nyn": "нианколе тілі",
+	"pcm": "нигери�лық пиджин тілі",
 	"nl": "нидерланд тілі",
+	"no": "норвег тілі",
 	"nb": "норвеги�лық букмол тілі",
 	"nn": "норвеги�лық нюнор�к тілі",
 	"nus": "ну�р тілі",
@@ -154,6 +158,8 @@
 	"saq": "�амбуру тілі",
 	"sg": "�анго тілі",
 	"sbp": "�ангу тілі",
+	"sa": "�ан�крит тілі",
+	"sat": "�антали тілі",
 	"sah": "�аха тілі",
 	"ceb": "�ебуано тілі",
 	"seh": "�ена тілі",
@@ -169,6 +175,7 @@
 	"so": "�омали тілі",
 	"ckb": "�орани тілі",
 	"sw": "�уахили тілі",
+	"su": "�ундан тілі",
 	"ii": "�ычуан и тілі",
 	"dav": "таита тілі",
 	"th": "тай тілі",
@@ -215,5 +222,6 @@
 	"ebu": "�мбу тілі",
 	"et": "��тон тілі",
 	"jv": "�ва тілі",
-	"yav": "�нгбен тілі"
+	"yav": "�нгбен тілі",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/km.json b/vendor/commerceguys/intl/resources/language/km.json
index de9a466db..ba684b51f 100644
--- a/vendor/commerceguys/intl/resources/language/km.json
+++ b/vendor/commerceguys/intl/resources/language/km.json
@@ -38,7 +38,7 @@
 	"ja": "ជប៉ុន",
 	"jv": "ជ្វា",
 	"ce": "ឈីឆ�ន",
-	"cgg": "ឈីហ្គា",
+	"cgg": "ឈីហ្កា",
 	"da": "ដាណឺម៉ាក",
 	"dz": "ដុង�ា",
 	"dua": "ឌួលឡា",
@@ -60,6 +60,7 @@
 	"bo": "ទីប�",
 	"ti": "ទីហ្គ្រីញ៉ា",
 	"tr": "ទួរគី",
+	"no": "ន�រវែស",
 	"nn": "ន�រវែស នីនូស",
 	"nb": "ន�រវែស បុកម៉ាល់",
 	"nus": "នូអ�រ",
@@ -75,22 +76,24 @@
 	"ps": "បាស្�ូ",
 	"ksf": "បាហ្វៀ",
 	"pa": "បឹនជាពិ",
-	"bg": "ប៊ុលហ្គារី",
+	"bg": "ប៊ុលហ្ការី",
 	"brx": "បូដូ",
 	"bs": "បូស្នី",
 	"pl": "ប៉ូឡូញ",
 	"bez": "ប�ណា",
 	"bem": "ប�មបា",
 	"be": "ប�ឡារុស",
-	"br": "ប្រីស្�ុន",
+	"br": "ប្រ៊ីស្�ុន",
 	"nl-BE": "ផ្លាមីស",
 	"pt": "ព�រទុយហ្គាល់",
 	"pt-PT": "ព�រទុយហ្គាល់ (អឺរ៉ុប)",
+	"pcm": "ភាសាទំនាក់ទំនងនីហ្ស�រីយ៉ា",
 	"fa": "ភឺសៀន",
 	"my": "ភូមា",
 	"mgh": "ម៉ាកគូវ៉ាមី�ូ",
 	"kde": "ម៉ាកូនដ�",
 	"jmc": "ម៉ាឆាំ",
+	"mni": "ម៉ានីពូរី",
 	"mr": "ម៉ារ៉ាធី",
 	"mt": "ម៉ាល់�ា",
 	"mk": "ម៉ាស�ដូនី",
@@ -105,6 +108,7 @@
 	"mfe": "ម៉ូរីស៊ីន",
 	"mgo": "ម��ា",
 	"mer": "ម�រូ",
+	"mai": "ម៉ៃធីលី",
 	"mi": "ម៉ោរី",
 	"yo": "យរូបា",
 	"yav": "យ៉ាងប�ន",
@@ -130,6 +134,7 @@
 	"wae": "វ�លសឺ",
 	"vai": "វៃ",
 	"sah": "សា�ា",
+	"sat": "សាន់�ាលី",
 	"sbp": "សានហ្គូ",
 	"sg": "សានហ្គោ",
 	"ksb": "សាមបាឡា",
@@ -140,30 +145,32 @@
 	"sd": "ស៊ីនឌី",
 	"ceb": "ស៊ីប៊ូអាណូ",
 	"sv": "ស៊ុយអែ�",
+	"su": "ស៊ូដង់",
 	"sn": "សូណា",
 	"dsb": "សូប៊ីក្រោម",
 	"hsb": "សូប៊ីលើ",
 	"so": "សូម៉ាលី",
 	"xog": "សូហ្គា",
 	"sr": "ស៊ែប",
+	"sa": "សំស្ក្រឹ�",
 	"gd": "ស្កុ�ហ្កែលិគ",
 	"si": "ស្រីលង្កា",
 	"sk": "ស្លូវ៉ាគី",
 	"sl": "ស្លូវ៉ានី",
 	"sw": "ស្វាហ៊ីលី",
-	"haw": "ហាវៃ",
+	"haw": "ហាវ៉ៃ",
 	"hi": "ហិណ្ឌី",
 	"hu": "ហុងគ្រី",
 	"ha": "ហូសា",
 	"nl": "ហូឡង់",
 	"he": "ហ�ប្រឺ",
-	"gu": "ហ្កុយ៉ារាទី",
-	"lg": "ហ្គាន់ដា",
-	"gl": "ហ្គាលីស្យាន",
+	"lg": "ហ្កាន់ដា",
+	"gl": "ហ្កាលីស្យាន",
 	"qu": "ហ្គិកឈួ",
+	"gu": "ហ្គុយ៉ារ៉ាទី",
 	"guz": "ហ្គូស៊ី",
 	"fo": "ហ្វារូស",
-	"fil": "ហ្វីលីពីន",
+	"fil": "ហ្វ៊ីលីពីន",
 	"ff": "ហ្វ៊ូឡា",
 	"fi": "ហ្វាំងឡង់",
 	"fy": "ហ្វ្រីស៊ាន�ាងលិច",
@@ -197,7 +204,7 @@
 	"af": "អាហ្វ្រិកាន",
 	"id": "ឥណ្ឌូណ�ស៊ី",
 	"ig": "អ៊ីកបូ",
-	"smn": "អ៊ីណារីសាម៉ី",
+	"smn": "អ៊ីណារីសាមី",
 	"it": "អ៊ី�ាលី",
 	"ee": "អ៊ីវ",
 	"ewo": "អ៊ីវ៉ុនដូ",
@@ -215,5 +222,6 @@
 	"es": "អ�ស្ប៉ាញ",
 	"es-MX": "អ�ស្ប៉ាញ (ម៉ិកស៊ិក)",
 	"es-419": "អ�ស្ប៉ាញ (អាម�រិក​ឡាទីន)",
-	"am": "អាំហារិក"
+	"am": "អាំហារិក",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ko.json b/vendor/commerceguys/intl/resources/language/ko.json
index dc6cec792..ee49779c5 100644
--- a/vendor/commerceguys/intl/resources/language/ko.json
+++ b/vendor/commerceguys/intl/resources/language/ko.json
@@ -9,14 +9,17 @@
 	"el": "그리스어",
 	"kl": "그린란드어",
 	"naq": "나마어",
+	"pcm": "나�지리아 피진어",
 	"nl": "네�란드어",
 	"ne": "네팔어",
+	"no": "노르웨�어",
 	"nn": "노르웨�어(니노르스�)",
 	"nb": "노르웨�어(보��)",
 	"nus": "누�르어",
 	"nnh": "�기엠본어",
 	"nyn": "니안콜어",
 	"da": "�마�어",
+	"doi": "�그리어",
 	"de": "��어",
 	"gsw": "��어(스위스)",
 	"de-AT": "��어(오스트리아)",
@@ -38,9 +41,11 @@
 	"rw": "르완다어",
 	"lt": "리투아니아어",
 	"ln": "�갈�어",
+	"mni": "마니푸리어",
 	"mr": "마�티어",
 	"mas": "마사�어",
 	"mi": "마오리어",
+	"mai": "마�틸리어",
 	"mzn": "마잔��니어",
 	"jmc": "마차메어",
 	"mk": "마케�니아어",
@@ -76,6 +81,8 @@
 	"bg": "불가리아어",
 	"br": "브르타뉴어",
 	"sg": "ì‚°ê³ ì–´",
+	"sa": "산스�리트어",
+	"sat": "산탈리어",
 	"saq": "삼부루어",
 	"sbp": "�구어",
 	"ksb": "샴발�어",
@@ -87,7 +94,7 @@
 	"ckb": "소�니 쿠르드어",
 	"so": "소�리아어",
 	"sn": "쇼나어",
-	"si": "스리랑카어",
+	"su": "순다어",
 	"sw": "스와�리어",
 	"sv": "스웨�어",
 	"gd": "스코틀랜드 게�어",
@@ -97,6 +104,7 @@
 	"sk": "슬로바키아어",
 	"sl": "슬로베니아어",
 	"sd": "신디어",
+	"si": "싱할�어",
 	"ii": "쓰촨 �어",
 	"agq": "아그햄어",
 	"ar": "아�어",
@@ -118,8 +126,8 @@
 	"ebu": "엠부어",
 	"en": "�어",
 	"en-GB": "�어(�국)",
+	"en-AU": "�어(오스트레�리아)",
 	"en-CA": "�어(�나다)",
-	"en-AU": "�어(호주)",
 	"om": "오로모어",
 	"or": "오리야어",
 	"os": "오세트어",
diff --git a/vendor/commerceguys/intl/resources/language/kok.json b/vendor/commerceguys/intl/resources/language/kok.json
index ad678bfb7..7a64b4d06 100644
--- a/vendor/commerceguys/intl/resources/language/kok.json
+++ b/vendor/commerceguys/intl/resources/language/kok.json
@@ -102,11 +102,13 @@
 	"th": "थाई",
 	"nyn": "नानकोले",
 	"naq": "नामा",
+	"pcm": "नाय�ेरियन पिडगीन",
 	"nds": "निम�न जर�मन",
 	"nds-NL": "निम�न जर�मन (नॅदरल�ड)",
 	"ne": "नेपाळी",
-	"nb": "नोर�वेजियन बोकमाल",
-	"nn": "नोर�वोजियन नायनोर�स�क",
+	"nn": "नॉर�वेजियन नायनोर�स�क",
+	"nb": "नॉर�वेजियन बोकमाल",
+	"no": "नोर�वेजियन",
 	"nnh": "न�गेबून",
 	"jgo": "न�गोंबा",
 	"nus": "न�य�यर",
@@ -142,6 +144,7 @@
 	"mn": "मंगोलियन",
 	"jmc": "मचामे",
 	"mzn": "म�ांडेराणी",
+	"mni": "मणिप�री",
 	"ckb": "मध�य ख�र�दीश",
 	"mr": "मराठी",
 	"ms": "मलय",
@@ -157,6 +160,7 @@
 	"es-MX": "मॅक�सिकन स�पॅनीश",
 	"mgo": "मेटा",
 	"mer": "मेरू",
+	"mai": "मैथिली",
 	"mfe": "मोरिसेन",
 	"ro-MD": "मोल�डावियन�",
 	"yav": "यांगबेन",
@@ -189,6 +193,8 @@
 	"cy": "वेळ�ष�",
 	"ksb": "शांबाला",
 	"sn": "शोना",
+	"sat": "संथाली",
+	"sa": "संस�कृत",
 	"sah": "सखा",
 	"sr": "सर�बियन",
 	"sbp": "सांगू",
@@ -198,6 +204,7 @@
 	"ii": "सिच�य�आन यी",
 	"si": "सिनहालीस",
 	"ceb": "सिबौना",
+	"su": "स�ंदनीस",
 	"seh": "सेना",
 	"zh-Hans": "सोंपी चिनी",
 	"xog": "सोगा",
@@ -215,5 +222,6 @@
 	"haw": "हवायियान",
 	"hi": "हिन�दी",
 	"he": "हिब�रू",
-	"ha": "हौसा"
+	"ha": "हौसा",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ks.json b/vendor/commerceguys/intl/resources/language/ks.json
index bde1c2933..ec514965f 100644
--- a/vendor/commerceguys/intl/resources/language/ks.json
+++ b/vendor/commerceguys/intl/resources/language/ks.json
@@ -32,6 +32,7 @@
 	"naq": "Nama",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"lrc": "Northern Luri",
 	"nus": "Nuer",
 	"rof": "Rombo",
@@ -115,6 +116,7 @@
 	"km": "خَمیر",
 	"dua": "د�والا",
 	"nl": "ÚˆÙŽÚ†",
+	"doi": "ڈوگری",
 	"da": "ڈین�ش",
 	"rn": "ر�ندی",
 	"zh-Hant": "ر�وٲجی چیٖنی",
@@ -130,7 +132,10 @@
 	"gd": "سکوٹ�ش گیےل�ک",
 	"sk": "سلووَک",
 	"sl": "سلووینیَن",
+	"sat": "سَنتالی",
 	"sd": "س�ندی",
+	"su": "سَنڈَنیٖز",
+	"sa": "سَنسکرٕت",
 	"sg": "سَنگو",
 	"si": "س�ن�الا",
 	"sw": "سوا��لی",
@@ -195,8 +200,11 @@
 	"ml": "مٔلیالَم",
 	"ms": "Ù…ÙŽÙ„ÙŽÛ’",
 	"mn": "مَنگولی",
+	"mni": "مَنیپوٗری",
 	"ro-MD": "مولداو�یَن",
+	"mai": "میتَھلی",
 	"mk": "میکَڈونیَن",
+	"no": "ناروییَن",
 	"nb": "ناروییَن بوکمال",
 	"nn": "ناروییَن نَے نورسک",
 	"ne": "نیپٲل�",
diff --git a/vendor/commerceguys/intl/resources/language/ku.json b/vendor/commerceguys/intl/resources/language/ku.json
index 0e31c3e07..bfc42f910 100644
--- a/vendor/commerceguys/intl/resources/language/ku.json
+++ b/vendor/commerceguys/intl/resources/language/ku.json
@@ -28,6 +28,7 @@
 	"chr": "çerokî",
 	"da": "danmarkî",
 	"dua": "diwalayî",
+	"doi": "Dogri",
 	"sq": "elbanî",
 	"de": "elmanî",
 	"de-AT": "elmanî (Awistirya)",
@@ -108,6 +109,7 @@
 	"lrc": "luriya bakur",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mk": "makedonî",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
@@ -115,6 +117,7 @@
 	"ml": "malayalamî",
 	"ms": "malezî",
 	"mt": "maltayî",
+	"mni": "Manipuri",
 	"mi": "maorî",
 	"mr": "maratî",
 	"mas": "masayî",
@@ -130,9 +133,11 @@
 	"ne": "nepalî",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"nb": "norwecî (bokmål)",
 	"nn": "norwecî (nynorsk)",
+	"no": "Norwegian",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"or": "oriyayî",
@@ -160,6 +165,8 @@
 	"smn": "samiya înarî",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "sanskrîtî",
+	"sat": "Santali",
 	"ceb": "sebwanoyî",
 	"seh": "Sena",
 	"ksb": "Shambala",
@@ -177,6 +184,7 @@
 	"es-419": "spanî (Amerîkaya Latînî)",
 	"es-MX": "spanî (Meksîk)",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "sundanî",
 	"sw": "swahîlî",
 	"sw-CD": "swahîlî (Kongo - Kînşasa)",
 	"sv": "swêdî",
diff --git a/vendor/commerceguys/intl/resources/language/ky.json b/vendor/commerceguys/intl/resources/language/ky.json
index 930e00cea..13fdee8b9 100644
--- a/vendor/commerceguys/intl/resources/language/ky.json
+++ b/vendor/commerceguys/intl/resources/language/ky.json
@@ -10,6 +10,7 @@
 	"en-CA": "англи�че (Канада)",
 	"en-GB": "англи�че (Улуу Британи�)",
 	"ar": "арабча",
+	"pcm": "аргындашкан тил (�игери�)",
 	"hy": "арм�нча",
 	"as": "а��амча",
 	"ast": "а�турийче",
@@ -75,7 +76,7 @@
 	"kam": "камбача",
 	"kn": "каннадача",
 	"yue": "кантончо",
-	"ca": "каталонча",
+	"ca": "каталончо",
 	"ks": "кашмирче",
 	"nmg": "ква�иочо",
 	"qu": "кечуача",
@@ -105,6 +106,7 @@
 	"luy": "лухи�ча",
 	"lb": "люк�ембургча",
 	"mzn": "мазандераниче",
+	"mai": "маитиличе",
 	"mk": "македончо",
 	"kde": "макондече",
 	"mgh": "макуача",
@@ -112,6 +114,7 @@
 	"ml": "малайаламча",
 	"ms": "малайча",
 	"mt": "малтизче",
+	"mni": "манипуриче",
 	"mi": "маориче",
 	"mr": "маратиче",
 	"zgh": "марокко тамазигт адабий тилинде",
@@ -130,6 +133,7 @@
 	"de-AT": "неми�че (�в�три�)",
 	"gsw": "неми�че (Швейцари�)",
 	"ne": "непалча",
+	"no": "норвежче",
 	"nb": "норвежче (букмал)",
 	"nn": "норвежче (нинор�к)",
 	"nus": "нуерче",
@@ -153,6 +157,8 @@
 	"saq": "�амбуруча",
 	"sg": "�ангочо",
 	"sbp": "�ангуча",
+	"sa": "�ан�критче",
+	"sat": "�анталиче",
 	"sah": "�ахача",
 	"ceb": "�ебуанча",
 	"seh": "�енача",
@@ -164,6 +170,7 @@
 	"xog": "�огача",
 	"so": "�омаличе",
 	"sw": "�уахиличе",
+	"su": "�унданча",
 	"ii": "�ычуань йиче",
 	"tg": "тажикче",
 	"dav": "таитача",
@@ -215,5 +222,6 @@
 	"ewo": "�вондочо",
 	"ebu": "�мбуча",
 	"et": "��тончо",
-	"yav": "�нгбенче"
+	"yav": "�нгбенче",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/lb.json b/vendor/commerceguys/intl/resources/language/lb.json
index 709e0db88..a5df8488f 100644
--- a/vendor/commerceguys/intl/resources/language/lb.json
+++ b/vendor/commerceguys/intl/resources/language/lb.json
@@ -32,6 +32,7 @@
 	"zh-Hans": "Chinesesch (vereinfacht)",
 	"de": "Däitsch",
 	"da": "Dänesch",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"de-AT": "Éisträichescht Däitsch",
 	"en": "Englesch",
@@ -107,6 +108,7 @@
 	"lu": "Luba-Katanga",
 	"luo": "Luo-Sprooch",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagassi-Sprooch",
@@ -119,6 +121,7 @@
 	"mas": "Massai-Sprooch",
 	"mzn": "Mazandarani",
 	"mk": "Mazedonesch",
+	"mni": "Meithei-Sprooch",
 	"mer": "Meru-Sprooch",
 	"mgo": "Meta’",
 	"tzm": "Mëttlert-Atlas-Tamazight",
@@ -134,9 +137,11 @@
 	"nds": "Nidderdäitsch",
 	"nds-NL": "Nidderdäitsch (Holland)",
 	"dsb": "Niddersorbesch",
+	"pcm": "Nigerian Pidgin",
 	"nd": "Nord-Ndebele-Sprooch",
 	"se": "Nordsamesch",
 	"lrc": "Northern Luri",
+	"no": "Norwegesch",
 	"nb": "Norwegesch Bokmål",
 	"nn": "Norwegesch Nynorsk",
 	"nus": "Nuer",
@@ -161,6 +166,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Schottescht Gällesch",
 	"fr-CH": "Schwäizer Franséisch",
 	"de-CH": "Schwäizer Héichdäitsch",
@@ -180,6 +187,7 @@
 	"ckb": "Sorani",
 	"es": "Spuenesch",
 	"sw": "Suaheli",
+	"su": "Sundanesesch",
 	"tg": "Tadschikesch",
 	"dav": "Taita",
 	"ta": "Tamilesch",
diff --git a/vendor/commerceguys/intl/resources/language/lo.json b/vendor/commerceguys/intl/resources/language/lo.json
index 356956e4d..1d8478cbf 100644
--- a/vendor/commerceguys/intl/resources/language/lo.json
+++ b/vendor/commerceguys/intl/resources/language/lo.json
@@ -45,14 +45,17 @@
 	"gsw": "ສະວິສ ເຈີ�ມນ",
 	"de-CH": "ສະວິສ ໄຮ ເຈີ�ມນ",
 	"sv": "ສະວີດິຊ",
+	"sa": "ສັນສະ�ຣິດ",
 	"sd": "ສິນທິ",
 	"si": "ສິນຫາລາ",
+	"ii": "ເສສວນ ອີ",
 	"hsb": "ຊ�ບຽນ ທາງຕອນເໜືອ",
 	"dsb": "ຊ�ບຽນຕ�່�ວ່າ",
 	"sw": "ຊວາຮີລິ",
 	"sah": "ຊາ�າ",
 	"nds-NL": "ຊາຊອນ ຕອນໄຕ",
 	"sbp": "ຊານ�ູ",
+	"sat": "ຊານທາລິ",
 	"dje": "ຊາມາ",
 	"se": "ຊາມິເໜືອ",
 	"ksb": "ຊຳບາລ້າ",
@@ -62,9 +65,9 @@
 	"seh": "ຊີນາ",
 	"ceb": "ຊີບູໂນ",
 	"chr": "ຊີໂຣ�ີ",
+	"su": "ຊຸນ�ດນນີສ",
 	"zu": "ຊູລູ",
 	"cs": "ເຊ�",
-	"ii": "ເຊສວ�ຢີ",
 	"sr": "ເຊີບຽນ",
 	"sg": "�ຊງໂ�",
 	"xog": "ໂຊ�າ",
@@ -73,6 +76,7 @@
 	"ckb": "ໂຊຣານິ ເຄີດິຊ",
 	"ja": "�ີ່ປຸ່ນ",
 	"yav": "��ງເບນ",
+	"doi": "ດອ�ຣີ",
 	"nl": "ດັຊ",
 	"dz": "ດີຊອງຄາ",
 	"dua": "ດົວລາ",
@@ -93,10 +97,12 @@
 	"th": "ໄທ",
 	"nn": "ນ�ເວຈຽນ ນີນອ�",
 	"nb": "ນ�ເວຈຽນ ບັອ�ມອລ",
+	"no": "ນ�ເວ�",
 	"nyn": "ນານຄອນ",
 	"naq": "ນາມາ",
 	"ne": "ເນປາລີ",
 	"nus": "ເນີ",
+	"pcm": "ໄນຈີຣຽນພິດ�ິນ",
 	"bs": "ບອສນຽນ",
 	"bg": "ບັງ�າຣຽນ",
 	"eu": "ບັສ�ີ",
@@ -134,6 +140,7 @@
 	"mzn": "ມາ�ຊນເດີລັງ",
 	"jmc": "ມາ�ຊມ",
 	"mas": "ມາໄຊ",
+	"mni": "ມານີພູຣິ",
 	"mr": "ມາຣາທີ",
 	"mg": "ມາລາ�າສຊີ",
 	"ms": "ມາເລ",
@@ -146,6 +153,7 @@
 	"mk": "�ມຊິໂດນຽນ",
 	"ro-MD": "ໂມດາວຽນ",
 	"zgh": "ໂມຣັອ��ຄນ ທາມາຊີ� ມາດຕະຖານ",
+	"mai": "ໄມທີລິ",
 	"yi": "ຢິວ",
 	"uk": "ຢູເຄຣນຽນ",
 	"de": "ເຢ�ລະມັນ",
diff --git a/vendor/commerceguys/intl/resources/language/lt.json b/vendor/commerceguys/intl/resources/language/lt.json
index d92860fe6..a144d9a45 100644
--- a/vendor/commerceguys/intl/resources/language/lt.json
+++ b/vendor/commerceguys/intl/resources/language/lt.json
@@ -36,6 +36,7 @@
 	"cgg": "�igų",
 	"da": "danų",
 	"en-GB": "Didžiosios Britanijos anglų",
+	"doi": "dogri",
 	"dua": "dualų",
 	"dyo": "džiola-foni",
 	"ebu": "embu",
@@ -111,6 +112,7 @@
 	"luy": "luja",
 	"luo": "Luo",
 	"jmc": "ma�amų",
+	"mai": "maithili",
 	"mk": "makedonų",
 	"kde": "makondų",
 	"mgh": "makua-maeto",
@@ -118,6 +120,7 @@
 	"ml": "malajalių",
 	"ms": "malajie�ių",
 	"mt": "maltie�ių",
+	"mni": "manipurių",
 	"mi": "maorių",
 	"mr": "maratų",
 	"mas": "masajų",
@@ -136,6 +139,8 @@
 	"nnh": "ngiembūnų",
 	"jgo": "ngombų",
 	"nyn": "niankolų",
+	"pcm": "Nigerijos pidžinų",
+	"no": "norvegų",
 	"nb": "norvegų bukmolas",
 	"nus": "nuerų",
 	"or": "odijų",
@@ -156,6 +161,8 @@
 	"saq": "sambūrų",
 	"sg": "sango",
 	"sbp": "sangų",
+	"sa": "sanskritas",
+	"sat": "santalių",
 	"ceb": "sebuanų",
 	"seh": "senų",
 	"sr": "serbų",
@@ -169,6 +176,7 @@
 	"ckb": "soranių kurdų",
 	"zgh": "standartinė Maroko tamazigtų",
 	"sw": "suahilių",
+	"su": "sundų",
 	"fi": "suomių",
 	"zh-Hans": "supaprastintoji kinų",
 	"ksb": "šambalų",
diff --git a/vendor/commerceguys/intl/resources/language/lv.json b/vendor/commerceguys/intl/resources/language/lv.json
index 954957b04..dfb449e3a 100644
--- a/vendor/commerceguys/intl/resources/language/lv.json
+++ b/vendor/commerceguys/intl/resources/language/lv.json
@@ -36,6 +36,7 @@
 	"chr": "�iroku",
 	"da": "d�ņu",
 	"dyo": "diola-fonjī",
+	"doi": "dogru",
 	"dua": "dualu",
 	"dz": "dzongke",
 	"ewo": "evondu",
@@ -119,6 +120,7 @@
 	"lb": "luksemburgiešu",
 	"luo": "Luo",
 	"jmc": "ma�amu",
+	"mai": "maithili",
 	"kde": "makonde",
 	"mgh": "makua",
 	"mk": "maķedoniešu",
@@ -126,6 +128,7 @@
 	"ml": "malajalu",
 	"ms": "malajiešu",
 	"mt": "maltiešu",
+	"mni": "manipūru",
 	"mi": "maoru",
 	"mr": "marathu",
 	"mas": "masaju",
@@ -140,6 +143,8 @@
 	"ne": "nep�liešu",
 	"nnh": "ngjembūnu",
 	"jgo": "ngomba",
+	"pcm": "Nigērijas pidžinvaloda",
+	"no": "norvēģu",
 	"nb": "norvēģu bukmols",
 	"nus": "nueru",
 	"nyn": "ņankolu",
@@ -161,6 +166,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrits",
+	"sat": "santalu",
 	"ceb": "sebu�ņu",
 	"seh": "senu",
 	"sr": "serbu",
@@ -215,5 +222,6 @@
 	"nd": "ziemeļndebelu",
 	"se": "ziemeļs�mu",
 	"zu": "zulu",
+	"su": "zundu",
 	"sv": "zviedru"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/mg.json b/vendor/commerceguys/intl/resources/language/mg.json
index 43f51c56c..6962989b6 100644
--- a/vendor/commerceguys/intl/resources/language/mg.json
+++ b/vendor/commerceguys/intl/resources/language/mg.json
@@ -42,6 +42,7 @@
 	"kw": "Cornish",
 	"hr": "Croatian",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -113,12 +114,14 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -133,9 +136,11 @@
 	"ne": "Nepale",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -164,6 +169,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -181,6 +188,7 @@
 	"sv": "Soisa",
 	"so": "Somalianina",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw-CD": "sw (Repoblikan’i Kongo)",
 	"sw": "Swahili",
 	"gsw": "Swiss German",
diff --git a/vendor/commerceguys/intl/resources/language/mk.json b/vendor/commerceguys/intl/resources/language/mk.json
index 1ccb82853..2a6b17588 100644
--- a/vendor/commerceguys/intl/resources/language/mk.json
+++ b/vendor/commerceguys/intl/resources/language/mk.json
@@ -42,6 +42,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"nds": "долногерман�ки",
 	"dsb": "долнолужички",
 	"nds-NL": "долно�ак�он�ки",
@@ -56,7 +57,7 @@
 	"zu": "зулу",
 	"dz": "ѕонгка",
 	"ig": "игбо",
-	"smn": "инари �ами",
+	"smn": "инари�ки �ами",
 	"id": "индонези�ки",
 	"ga": "ир�ки",
 	"is": "и�ланд�ки",
@@ -108,6 +109,7 @@
 	"lb": "лук�ембуршки",
 	"luo": "луо",
 	"mzn": "мазендеран�ки",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -115,6 +117,7 @@
 	"ms": "малај�ки",
 	"mg": "малгашки",
 	"mt": "малтешки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ај�ки",
@@ -130,6 +133,8 @@
 	"nnh": "нгиембун",
 	"jgo": "нгомба",
 	"ne": "непал�ки",
+	"pcm": "нигери�ки пиџин",
+	"no": "норвешки",
 	"nb": "норвешки букмол",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
@@ -143,7 +148,7 @@
 	"zh-Hans": "поедно�тавен кине�ки",
 	"pl": "пол�ки",
 	"pt": "португал�ки",
-	"pt-PT": "португал�ки (во Европа)",
+	"pt-PT": "португал�ки (Европа)",
 	"rm": "ретороман�ки",
 	"ro": "роман�ки",
 	"rof": "ромбо",
@@ -154,6 +159,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sw": "�вахили",
 	"ceb": "�ебуан�ки",
 	"nd": "�еверен ндебеле",
@@ -169,6 +176,7 @@
 	"so": "�омали�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандарден марокан�ки тамазит�ки",
+	"su": "�унд�ки",
 	"twq": "тазавак",
 	"dav": "таита",
 	"th": "тајланд�ки",
@@ -204,13 +212,13 @@
 	"hr": "хрват�ки",
 	"tzm": "централноатлан�ки тамазит�ки",
 	"ckb": "централнокурд�ки",
-	"chr": "чероки�ки",
+	"chr": "чероки",
 	"ce": "чечен�ки",
 	"cs": "чешки",
 	"cgg": "чига",
 	"ksb": "шамбала",
-	"de-CH": "швајцар�ки ви�око-герман�ки",
 	"gsw": "швајцар�ки герман�ки",
+	"de-CH": "швајцар�ки горногерман�ки",
 	"fr-CH": "швајцар�ки францу�ки",
 	"sv": "швед�ки",
 	"gd": "шкот�ки гел�ки",
diff --git a/vendor/commerceguys/intl/resources/language/ml.json b/vendor/commerceguys/intl/resources/language/ml.json
index ddb80ebf9..2cf36c090 100644
--- a/vendor/commerceguys/intl/resources/language/ml.json
+++ b/vendor/commerceguys/intl/resources/language/ml.json
@@ -72,7 +72,7 @@
 	"zh": "ചൈനീസ�",
 	"de": "ജർമ�മൻ",
 	"ja": "ജാപ�പനീസ�",
-	"jv": "ജാവാനീസ�",
+	"jv": "ജാവനീസ�",
 	"ka": "ജോർജിയൻ",
 	"tr": "ടർക�കിഷ�",
 	"twq": "ടസവാക�ക�",
@@ -83,6 +83,7 @@
 	"to": "ടോംഗൻ",
 	"nl": "ഡച�ച�",
 	"da": "ഡാനിഷ�",
+	"doi": "ഡോഗ�രി",
 	"ta": "തമിഴ�",
 	"shi": "താച�ചലിറ�റ�",
 	"tg": "താജിക�",
@@ -95,7 +96,9 @@
 	"naq": "നാമ",
 	"nus": "ന�വേർ",
 	"ne": "നേപ�പാളി",
+	"pcm": "നൈജീരിയൻ പിഡ�‌ഗിൻ",
 	"nd": "നോർത�ത� ഡെബിൾ",
+	"no": "നോർവീജിയൻ",
 	"nn": "നോർവീജിയൻ നൈനോർക�‌സ�",
 	"nb": "നോർവീജിയൻ ബ�ക�‌മൽ",
 	"nyn": "ന�യാൻകോൾ",
@@ -129,6 +132,7 @@
 	"br": "ബ�രെട�ടൺ",
 	"kde": "മക�കോണ�ടെ",
 	"jmc": "മചേം",
+	"mni": "മണിപ�പൂരി",
 	"tzm": "മധ�യ അറ�റ�‌ലസ� ടമാസൈറ�റ�",
 	"mn": "മംഗോളിയൻ",
 	"mg": "മലഗാസി",
@@ -145,6 +149,7 @@
 	"es-MX": "മെക�സിക�കൻ സ�പാനിഷ�",
 	"mgo": "മേത�താ",
 	"mer": "മേര�",
+	"mai": "മൈഥിലി",
 	"mfe": "മൊറിസിൻ",
 	"ro-MD": "മോൾഡാവിയൻ",
 	"yav": "യാംഗ�ബെൻ",
@@ -181,13 +186,16 @@
 	"ii": "ഷ�വാൻയി",
 	"chr": "ഷെരോക�കി",
 	"sn": "ഷോണ",
+	"sat": "സന�താലി",
 	"sbp": "സംഗ�",
 	"saq": "സംബ�ര�",
+	"sa": "സംസ�‌കൃതം",
 	"sah": "സാഖ",
 	"sg": "സാംഗോ",
 	"dje": "സാർമ�മ",
 	"sd": "സിന�ധി",
 	"si": "സിംഹള",
+	"su": "സ�ണ�ടാനീസ�",
 	"zu": "സ�ല�",
 	"ckb": "സെൻട�രൽ ക�ർദിഷ�",
 	"ceb": "സെബ�വാനോ",
diff --git a/vendor/commerceguys/intl/resources/language/mn.json b/vendor/commerceguys/intl/resources/language/mn.json
index cd6c9da22..137bfc64e 100644
--- a/vendor/commerceguys/intl/resources/language/mn.json
+++ b/vendor/commerceguys/intl/resources/language/mn.json
@@ -100,6 +100,7 @@
 	"lb": "люк�ембург",
 	"hu": "мажар",
 	"mzn": "мазандерани",
+	"mai": "май",
 	"mk": "македон",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -107,6 +108,7 @@
 	"ms": "малай",
 	"ml": "мала�лам",
 	"mt": "малта",
+	"mni": "манипури",
 	"mi": "маори",
 	"mr": "марати",
 	"mas": "ма�ай",
@@ -120,7 +122,9 @@
 	"naq": "нама",
 	"nnh": "нгиембүүн",
 	"jgo": "нгомба",
+	"pcm": "нигерийн пиджин",
 	"nl": "нидерланд",
+	"no": "норвеги",
 	"nb": "норвегийн букмол",
 	"nn": "норвегийн нинор�к",
 	"nus": "нуер",
@@ -143,6 +147,8 @@
 	"saq": "�амбүрү",
 	"sg": "�анго",
 	"sbp": "�ангү",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"sw": "�вахили",
 	"ceb": "�ебуано",
@@ -156,6 +162,7 @@
 	"ko": "�олонго�",
 	"so": "�омали",
 	"zgh": "�тандарт тамазайт (Морокко)",
+	"su": "�ундан",
 	"ii": "�ычуань и",
 	"tg": "тажик",
 	"th": "тай",
@@ -215,5 +222,6 @@
 	"et": "��тони",
 	"jv": "�ва",
 	"yav": "�нгбен",
-	"ja": "�пон"
+	"ja": "�пон",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/mr.json b/vendor/commerceguys/intl/resources/language/mr.json
index 369473d33..85e0da13b 100644
--- a/vendor/commerceguys/intl/resources/language/mr.json
+++ b/vendor/commerceguys/intl/resources/language/mr.json
@@ -77,7 +77,7 @@
 	"jv": "जावानीज",
 	"nnh": "जि�म�बून",
 	"ka": "जॉर�जियन",
-	"dyo": "जोला-फोंयी",
+	"dyo": "जोला-फॉन�यी",
 	"dje": "�ार�मा",
 	"zu": "��लू",
 	"cs": "�ेक",
@@ -85,6 +85,7 @@
 	"to": "टोंगन",
 	"nl": "डच",
 	"da": "डॅनिश",
+	"doi": "डोगरी",
 	"tg": "ताजिक",
 	"tt": "तातर",
 	"ta": "तामिळ",
@@ -100,10 +101,12 @@
 	"th": "थाई",
 	"dua": "द�आला",
 	"naq": "नामा",
+	"pcm": "नायजिरिअन पिजिन",
 	"nus": "न��र",
 	"ne": "नेपाळी",
 	"nn": "नॉर�वेजियन न�योर�स�क",
 	"nb": "नॉर�वेजियन बोकमाल",
+	"no": "नोर�वेजियन",
 	"nyn": "न�यानकोल",
 	"pa": "पंजाबी",
 	"fy": "पश�चिमी फ�रिशियन",
@@ -135,7 +138,8 @@
 	"en-GB": "ब�रिटिश इंग�रजी",
 	"br": "ब�रेतॉन",
 	"mn": "मंगोलियन",
-	"tzm": "मध�य �टलास तॅमॅ�ायट",
+	"mni": "मणिप�री",
+	"tzm": "मध�य अ�ॅटलास तॅमा�ाइट",
 	"ckb": "मध�य क�र�दिश",
 	"mr": "मराठी",
 	"ms": "मलय",
@@ -153,6 +157,7 @@
 	"mk": "मॅसेडोनियन",
 	"es-MX": "मेक�सिकन स�पॅनिश",
 	"mer": "मेरू",
+	"mai": "मैथिली",
 	"mfe": "मोरिस�येन",
 	"ro-MD": "मोल�डाव�हियन",
 	"yav": "यांगबेन",
@@ -189,6 +194,8 @@
 	"vi": "व�हि�तनामी",
 	"ksb": "शांबाला",
 	"sn": "शोना",
+	"sat": "संताली",
+	"sa": "संस�कृत",
 	"zh-Hans": "सरलीकृत चीनी",
 	"sr": "सर�बियन",
 	"sbp": "सांग�",
@@ -199,10 +206,11 @@
 	"si": "सिंहला",
 	"ii": "सिच�आन यी",
 	"ceb": "सिब�आनो",
+	"su": "स�ंदानीज",
 	"seh": "सेना",
 	"xog": "सोगा",
 	"so": "सोमाली",
-	"gd": "स�कॉट�स गेलिक",
+	"gd": "स�कॉटिश गेलिक",
 	"es": "स�पॅनिश",
 	"sk": "स�लोव�हाक",
 	"sl": "स�लोव�हेनियन",
diff --git a/vendor/commerceguys/intl/resources/language/ms.json b/vendor/commerceguys/intl/resources/language/ms.json
index 790eaaf85..56c9d1643 100644
--- a/vendor/commerceguys/intl/resources/language/ms.json
+++ b/vendor/commerceguys/intl/resources/language/ms.json
@@ -18,7 +18,7 @@
 	"be": "Belarus",
 	"bem": "Bemba",
 	"bez": "Bena",
-	"bn": "Benggala",
+	"bn": "Benggali",
 	"brx": "Bodo",
 	"nb": "Bokmål Norway",
 	"bs": "Bosnia",
@@ -39,6 +39,7 @@
 	"hr": "Croatia",
 	"cs": "Czech",
 	"da": "Denmark",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -115,11 +116,13 @@
 	"luy": "Luyia",
 	"mk": "Macedonia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ml": "Malayalam",
 	"mt": "Malta",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -136,6 +139,8 @@
 	"ne": "Nepal",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
+	"no": "Norway",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"nn": "Nynorsk Norway",
@@ -163,6 +168,8 @@
 	"se": "Sami Utara",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"nds-NL": "Saxon Rendah",
 	"gd": "Scots Gaelic",
 	"seh": "Sena",
@@ -181,6 +188,7 @@
 	"so": "Somali",
 	"hsb": "Sorbian Atas",
 	"dsb": "Sorbian Rendah",
+	"su": "Sunda",
 	"sw": "Swahili",
 	"sv": "Sweden",
 	"shi": "Tachelhit",
diff --git a/vendor/commerceguys/intl/resources/language/mt.json b/vendor/commerceguys/intl/resources/language/mt.json
index 9293cf0b7..56543a56d 100644
--- a/vendor/commerceguys/intl/resources/language/mt.json
+++ b/vendor/commerceguys/intl/resources/language/mt.json
@@ -33,6 +33,7 @@
 	"chr": "Cherokee",
 	"cgg": "Chiga",
 	"da": "Daniż",
+	"doi": "Dogri",
 	"dua": "Dwala",
 	"dz": "Dzongkha",
 	"he": "Ebrajk",
@@ -115,12 +116,14 @@
 	"luy": "Luyia",
 	"mk": "Maċedonjan",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ms": "Malay",
 	"ml": "Malayalam",
 	"mt": "Malti",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -137,6 +140,7 @@
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
 	"nn": "Ninorsk Norveġiż",
+	"no": "Norveġiż",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
 	"or": "Odia",
@@ -145,6 +149,7 @@
 	"os": "Ossettiku",
 	"ps": "Pashto",
 	"fa": "Persjan",
+	"pcm": "Pidgin Niġerjan",
 	"pl": "Pollakk",
 	"pt": "Portugiż",
 	"pt-PT": "Portugiż Ewropew",
@@ -161,6 +166,8 @@
 	"se": "Sami tat-Tramuntana",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"nds-NL": "Sassonu Komuni",
 	"seh": "Sena",
 	"sr": "Serb",
@@ -178,6 +185,7 @@
 	"es": "Spanjol",
 	"es-419": "Spanjol Latin Amerikan",
 	"es-MX": "Spanjol tal-Messiku",
+	"su": "Sundaniż",
 	"sw": "Swahili",
 	"sw-CD": "Swahili tar-Repubblika Demokratika tal-Kongo",
 	"shi": "Tachelhit",
diff --git a/vendor/commerceguys/intl/resources/language/my.json b/vendor/commerceguys/intl/resources/language/my.json
index b0eb35ac3..9ca59eab0 100644
--- a/vendor/commerceguys/intl/resources/language/my.json
+++ b/vendor/commerceguys/intl/resources/language/my.json
@@ -22,7 +22,7 @@
 	"nmg": "ကွာစီအို",
 	"kok": "ကွန်ကနီ",
 	"sw-CD": "ကွန်ဂို ဆွာဟီလီ",
-	"yue": "ကွမ်�ုံ",
+	"yue": "ကွမ်း�ုံ",
 	"km": "�မာ",
 	"hr": "�ရိုအေးရှား",
 	"qu": "�ီ�ျူ�ါအို�ါ",
@@ -57,12 +57,14 @@
 	"sl": "ဆလိုဗေးနီးယား",
 	"sk": "ဆလိုဗက်",
 	"sr": "ဆားဘီးယား",
+	"su": "ဆူဒန်",
 	"xog": "ဆိုဂါ",
 	"so": "ဆိုမာလီ",
 	"ckb": "ဆိုရာနီ",
 	"hsb": "ဆက္ကဆိုနီ",
 	"sbp": "ဆန်ဂု",
 	"sg": "ဆန်ဂို",
+	"sat": "ဆန်�ာလီ",
 	"saq": "ဆမ်ဘူရူ",
 	"sw": "ဆွာဟီလီ",
 	"sv": "ဆွီဒင်",
@@ -99,6 +101,8 @@
 	"nus": "နူအာ",
 	"nn": "နော်�ေ နီးနောစ်",
 	"nb": "နော်�ေ ဘွ�်�်မော်လ်",
+	"no": "နော်�ေး",
+	"pcm": "နိုင်ဂျီးရီးယား ပစ်ဂျင်",
 	"fa": "ပါရှန်",
 	"pt": "ပေါ်�ူဂီ",
 	"pl": "ပိုလန်",
@@ -128,6 +132,7 @@
 	"bm": "ဘန်ဘာရာ",
 	"bem": "ဘိန်ဘာ",
 	"jmc": "မ�ျာမီ",
+	"mni": "မနိပူရ",
 	"ml": "မလေယာလမ်",
 	"ms": "မလေး",
 	"mgh": "မာ�ူ�ါ-မီအီ�ို",
@@ -144,6 +149,7 @@
 	"mt": "မော်လ်�ာ",
 	"zgh": "မိုရိုကို �မဇိုက်",
 	"mk": "မက်ဆီဒိုးနီးယား",
+	"mai": "မိုင်သီလီ",
 	"se": "မြောက် ဆာမိ",
 	"nd": "မြောက် အွန်န်ဒီဘီလီ",
 	"lrc": "မြောက်လူရီ",
@@ -176,6 +182,7 @@
 	"wo": "�ူလိုဖ်",
 	"cy": "�ေလ",
 	"wae": "�ေါလ်ဆာ",
+	"sa": "သင်္သကရိုက်",
 	"haw": "ဟာ�ိုင်ယီ",
 	"ha": "ဟာဥစာ",
 	"he": "ဟီးဘရူး",
@@ -200,12 +207,12 @@
 	"pt-PT": "ဥရောပ ပေါ်�ူဂီ",
 	"ur": "အူရ်ဒူ",
 	"de-AT": "ဩစ�ြီးယား ဂျာမန်",
-	"en-AU": "ဩစ�ြေးလျှ အင်္ဂလိပ်",
+	"en-AU": "ဩစ�ြေးလျ အင်္ဂလိပ်",
 	"os": "အိုဆဲ�စ်�်",
 	"or": "အိုရီရာ",
 	"om": "အိုရိုမို",
-	"ast": "အက်စ�ူရီယန်း",
 	"et": "အက်စ်�ိုးနီးယား",
+	"ast": "အက်စ်�ိုးရီးယား",
 	"is": "အိုက်စ်လန်",
 	"agq": "အာဂ်ဟိန်း",
 	"en": "အင်္ဂလိပ်",
@@ -215,5 +222,6 @@
 	"ebu": "အမ်ဘူ",
 	"am": "အမ်ဟာရစ်�်",
 	"sq": "အယ်လ်ဘေးနီးယား",
-	"nnh": "အွန်ရဲဘွန်း"
+	"nnh": "အွန်ရဲဘွန်း",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/nb.json b/vendor/commerceguys/intl/resources/language/nb.json
index 82a5c877e..bf64b513e 100644
--- a/vendor/commerceguys/intl/resources/language/nb.json
+++ b/vendor/commerceguys/intl/resources/language/nb.json
@@ -25,6 +25,7 @@
 	"ceb": "cebuansk",
 	"chr": "cherokesisk",
 	"da": "dansk",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"smn": "enaresamisk",
@@ -109,12 +110,14 @@
 	"luo": "Luo",
 	"lb": "luxemburgsk",
 	"jmc": "machame",
+	"mai": "maithili",
 	"mk": "makedonsk",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayisk",
 	"mt": "maltesisk",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -132,9 +135,11 @@
 	"ne": "nepali",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigeriansk pidginspråk",
 	"lrc": "nord-luri",
 	"nd": "nord-ndebele",
 	"se": "nordsamisk",
+	"no": "norsk",
 	"nb": "norsk bokmål",
 	"nn": "norsk nynorsk",
 	"nus": "nuer",
@@ -159,6 +164,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"seh": "sena",
 	"tzm": "sentralmarokkansk tamazight",
 	"sr": "serbisk",
@@ -176,6 +183,7 @@
 	"es-419": "spansk (Latin-Amerika)",
 	"es-MX": "spansk (Mexico)",
 	"zgh": "standard marrokansk tamazight",
+	"su": "sundanesisk",
 	"gsw": "sveitsertysk",
 	"sv": "svensk",
 	"sw": "swahili",
diff --git a/vendor/commerceguys/intl/resources/language/ne.json b/vendor/commerceguys/intl/resources/language/ne.json
index d9a4fd21d..faae314d0 100644
--- a/vendor/commerceguys/intl/resources/language/ne.json
+++ b/vendor/commerceguys/intl/resources/language/ne.json
@@ -8,7 +8,6 @@
 	"ast": "अस�ट�रियाली",
 	"de-AT": "अस�ट�रि�न जर�मन",
 	"en-AU": "अस�ट�रेलियाली अङ�ग�रेजी",
-	"os": "अोस�सेटिक",
 	"ga": "आइरिस",
 	"is": "आइसल�यान�डियाली",
 	"ak": "आकान",
@@ -32,6 +31,7 @@
 	"ur": "उर�द�",
 	"ebu": "�म�ब�",
 	"om": "ओरोमो",
+	"os": "ओस�सेटिक",
 	"sw-CD": "कङ�गो स�वाहिली",
 	"kn": "कन�नाडा",
 	"kkj": "काको",
@@ -88,6 +88,7 @@
 	"to": "टोङ�गन",
 	"nl": "डच",
 	"da": "डेनिस",
+	"doi": "डोगरी",
 	"nds": "तल�लो जर�मन",
 	"nds-NL": "तल�लो साक�सन",
 	"dsb": "तल�लो सोर�बियन",
@@ -100,8 +101,10 @@
 	"te": "तेल�ग�",
 	"th": "थाई",
 	"dua": "द�वाला",
+	"no": "नर�वेली",
 	"nn": "नर�वेली नाइनोर�स�क",
 	"nb": "नर�वेली बोकमाल",
+	"pcm": "नाइजेरियाली पिड�जिन",
 	"naq": "नामा",
 	"nus": "न��र",
 	"ne": "नेपाली",
@@ -142,6 +145,7 @@
 	"mn": "मङ�गोलियाली",
 	"mzn": "मजानडेरानी",
 	"ckb": "मध�यवर�ती क�र�दिस",
+	"mni": "मनिप�री",
 	"mr": "मराठी",
 	"ml": "मलयालम",
 	"mg": "मलागासी",
@@ -158,6 +162,7 @@
 	"es-MX": "मेक�सिकन स�पेनी",
 	"mgo": "मेटा",
 	"mer": "मेरू",
+	"mai": "मैथिली",
 	"mfe": "मोरिसेन",
 	"ro-MD": "मोल�डाभियाली",
 	"mk": "म�यासेडोनियन",
@@ -191,13 +196,16 @@
 	"sn": "शोना",
 	"zh-Hans": "सरलिकृत चिनिया�",
 	"sr": "सर�बियाली",
+	"sa": "संस�कृत",
 	"sah": "साखा",
 	"sbp": "साङ�ग�",
 	"sg": "साङ�गो",
+	"sat": "सान�ताली",
 	"saq": "साम�ब�रू",
 	"ii": "सिच�आन यि",
 	"sd": "सिन�धी",
 	"si": "सिन�हाली",
+	"su": "स�डानी",
 	"seh": "सेना",
 	"ceb": "सेब�आनो",
 	"xog": "सोगा",
diff --git a/vendor/commerceguys/intl/resources/language/nl.json b/vendor/commerceguys/intl/resources/language/nl.json
index 5ad7f8349..ee1b22710 100644
--- a/vendor/commerceguys/intl/resources/language/nl.json
+++ b/vendor/commerceguys/intl/resources/language/nl.json
@@ -15,6 +15,7 @@
 	"bm": "Bambara",
 	"bas": "Basa",
 	"eu": "Baskisch",
+	"be": "Belarussisch",
 	"bem": "Bemba",
 	"bez": "Bena",
 	"bn": "Bengaals",
@@ -32,6 +33,7 @@
 	"zh-Hans": "Chinees (vereenvoudigd)",
 	"kw": "Cornish",
 	"da": "Deens",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"de": "Duits",
 	"de-AT": "Duits (Oostenrijk)",
@@ -111,6 +113,7 @@
 	"mas": "Maa",
 	"mk": "Macedonisch",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagassisch",
@@ -120,6 +123,7 @@
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mzn": "Mazanderani",
+	"mni": "Meitei",
 	"mer": "Meru",
 	"mgo": "Meta’",
 	"mn": "Mongools",
@@ -135,9 +139,11 @@
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
 	"nmg": "Ngumba",
+	"pcm": "Nigeriaans Pidgin",
 	"nd": "Noord-Ndebele",
 	"se": "Noord-Samisch",
 	"lrc": "Noordelijk Luri",
+	"no": "Noors",
 	"nb": "Noors - Bokmål",
 	"nn": "Noors - Nynorsk",
 	"nus": "Nuer",
@@ -164,6 +170,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskriet",
+	"sat": "Santali",
 	"gd": "Schots-Gaelisch",
 	"seh": "Sena",
 	"sr": "Servisch",
@@ -173,6 +181,7 @@
 	"si": "Singalees",
 	"sl": "Sloveens",
 	"sk": "Slowaaks",
+	"su": "Soendanees",
 	"xog": "Soga",
 	"so": "Somalisch",
 	"ckb": "Soranî",
@@ -206,7 +215,6 @@
 	"wa": "Waals",
 	"wae": "Walser",
 	"cy": "Welsh",
-	"be": "Wit-Russisch",
 	"wo": "Wolof",
 	"xh": "Xhosa",
 	"yav": "Yangben",
diff --git a/vendor/commerceguys/intl/resources/language/nn.json b/vendor/commerceguys/intl/resources/language/nn.json
index b8bd4ce21..8dd7d1b92 100644
--- a/vendor/commerceguys/intl/resources/language/nn.json
+++ b/vendor/commerceguys/intl/resources/language/nn.json
@@ -18,15 +18,14 @@
 	"bez": "bena (Tanzania)",
 	"bn": "bengali",
 	"brx": "bodo",
-	"nb": "bokmål",
 	"bs": "bosnisk",
 	"br": "bretonsk",
-	"en-GB": "britisk engelsk",
 	"bg": "bulgarsk",
 	"my": "burmesisk",
 	"ceb": "cebuano",
 	"chr": "cherokee",
 	"da": "dansk",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -34,6 +33,7 @@
 	"en": "engelsk",
 	"en-AU": "engelsk (Australia)",
 	"en-CA": "engelsk (Canada)",
+	"en-GB": "engelsk (Storbritannia)",
 	"et": "estisk",
 	"ee": "ewe",
 	"ewo": "ewondo",
@@ -47,7 +47,7 @@
 	"fur": "friulisk",
 	"ff": "fulfulde",
 	"fo": "færøysk",
-	"gl": "galicisk",
+	"gl": "galisisk",
 	"lg": "ganda",
 	"ka": "georgisk",
 	"el": "gresk",
@@ -85,11 +85,12 @@
 	"zh": "kinesisk",
 	"rw": "kinjarwanda",
 	"ky": "kirgisisk",
+	"sw-CD": "kongolesisk swahili",
 	"kok": "konkani",
 	"ko": "koreansk",
 	"kw": "kornisk",
 	"khq": "koyra chiini",
-	"ses": "Koyraboro Senni",
+	"ses": "koyraboro senni",
 	"hr": "kroatisk",
 	"ku": "kurdisk",
 	"be": "kviterussisk",
@@ -109,12 +110,14 @@
 	"nds": "lågtysk",
 	"jmc": "machame",
 	"mg": "madagassisk",
+	"mai": "maithili",
 	"mk": "makedonsk",
-	"mgh": "Makhuwa-Meetto",
+	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ml": "malayalam",
 	"ms": "malayisk",
 	"mt": "maltesisk",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -130,12 +133,15 @@
 	"ne": "nepalsk",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigeriansk pidgin",
 	"lrc": "nord-lurisk",
 	"nd": "nord-ndebele",
 	"se": "nordsamisk",
+	"no": "norsk",
+	"nb": "norsk bokmål",
+	"nn": "norsk nynorsk",
 	"nus": "nuer",
 	"nyn": "nyankole",
-	"nn": "nynorsk",
 	"or": "odia",
 	"luy": "olulujia",
 	"om": "oromo",
@@ -157,6 +163,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"seh": "sena",
 	"tzm": "sentral-tamazight",
 	"sr": "serbisk",
@@ -175,10 +183,10 @@
 	"es-419": "spansk (Latin-Amerika)",
 	"es-MX": "spansk (Mexico)",
 	"zgh": "standard marokkansk tamazight",
+	"su": "sundanesisk",
 	"gsw": "sveitsertysk",
 	"sv": "svensk",
 	"sw": "swahili",
-	"sw-CD": "swahili (Kongo-Kinshasa)",
 	"shi": "tachelhit",
 	"tg": "tadsjikisk",
 	"dav": "taita",
diff --git a/vendor/commerceguys/intl/resources/language/no.json b/vendor/commerceguys/intl/resources/language/no.json
new file mode 100644
index 000000000..bf64b513e
--- /dev/null
+++ b/vendor/commerceguys/intl/resources/language/no.json
@@ -0,0 +1,227 @@
+{
+	"af": "afrikaans",
+	"agq": "aghem",
+	"ak": "akan",
+	"sq": "albansk",
+	"am": "amharisk",
+	"ar": "arabisk",
+	"hy": "armensk",
+	"az": "aserbajdsjansk",
+	"as": "assamesisk",
+	"ast": "asturisk",
+	"asa": "asu",
+	"ksf": "bafia",
+	"bm": "bambara",
+	"eu": "baskisk",
+	"bas": "basaa",
+	"bem": "bemba",
+	"bez": "bena",
+	"bn": "bengali",
+	"brx": "bodo",
+	"bs": "bosnisk",
+	"br": "bretonsk",
+	"bg": "bulgarsk",
+	"my": "burmesisk",
+	"ceb": "cebuansk",
+	"chr": "cherokesisk",
+	"da": "dansk",
+	"doi": "dogri",
+	"dua": "duala",
+	"dz": "dzongkha",
+	"smn": "enaresamisk",
+	"en": "engelsk",
+	"en-AU": "engelsk (Australia)",
+	"en-CA": "engelsk (Canada)",
+	"en-GB": "engelsk (Storbritannia)",
+	"et": "estisk",
+	"ee": "ewe",
+	"ewo": "ewondo",
+	"fil": "filipino",
+	"fi": "finsk",
+	"nl-BE": "flamsk",
+	"zh-Hans": "forenklet kinesisk",
+	"fr": "fransk",
+	"fr-CA": "fransk (Canada)",
+	"fr-CH": "fransk (Sveits)",
+	"fur": "friuliansk",
+	"ff": "fulfulde",
+	"fo": "færøysk",
+	"gl": "galisisk",
+	"lg": "ganda",
+	"mg": "gassisk",
+	"ka": "georgisk",
+	"el": "gresk",
+	"kl": "grønlandsk",
+	"gu": "gujarati",
+	"guz": "gusii",
+	"ha": "hausa",
+	"haw": "hawaiisk",
+	"he": "hebraisk",
+	"hi": "hindi",
+	"be": "hviterussisk",
+	"hsb": "høysorbisk",
+	"ig": "ibo",
+	"id": "indonesisk",
+	"ga": "irsk",
+	"is": "islandsk",
+	"it": "italiensk",
+	"ja": "japansk",
+	"jv": "javanesisk",
+	"yi": "jiddisk",
+	"dyo": "jola-fonyi",
+	"yo": "joruba",
+	"kab": "kabylsk",
+	"kkj": "kako",
+	"kln": "kalenjin",
+	"kam": "kamba",
+	"kn": "kannada",
+	"yue": "kantonesisk",
+	"kea": "kappverdisk",
+	"kk": "kasakhisk",
+	"ks": "kasjmiri",
+	"ca": "katalansk",
+	"km": "khmer",
+	"ebu": "kiembu",
+	"cgg": "kiga",
+	"ki": "kikuyu",
+	"zh": "kinesisk",
+	"rw": "kinyarwanda",
+	"ky": "kirgisisk",
+	"sw-CD": "kongolesisk swahili",
+	"kok": "konkani",
+	"ko": "koreansk",
+	"kw": "kornisk",
+	"khq": "koyra chiini",
+	"ses": "koyraboro senni",
+	"hr": "kroatisk",
+	"ku": "kurdisk",
+	"ckb": "kurdisk (sorani)",
+	"nmg": "kwasio",
+	"ksh": "kølnsk",
+	"lkt": "lakota",
+	"lag": "langi",
+	"lo": "laotisk",
+	"lv": "latvisk",
+	"dsb": "lavsorbisk",
+	"ln": "lingala",
+	"lt": "litauisk",
+	"lu": "luba-katanga",
+	"luy": "luhya",
+	"luo": "Luo",
+	"lb": "luxemburgsk",
+	"jmc": "machame",
+	"mai": "maithili",
+	"mk": "makedonsk",
+	"mgh": "makhuwa-meetto",
+	"kde": "makonde",
+	"ml": "malayalam",
+	"ms": "malayisk",
+	"mt": "maltesisk",
+	"mni": "manipuri",
+	"mi": "maori",
+	"mr": "marathi",
+	"mas": "masai",
+	"mfe": "mauritisk-kreolsk",
+	"mzn": "mazandarani",
+	"mer": "meru",
+	"mgo": "meta’",
+	"ro-MD": "moldovsk",
+	"mn": "mongolsk",
+	"mua": "mundang",
+	"naq": "nama",
+	"nl": "nederlandsk",
+	"nds-NL": "nedersaksisk",
+	"nds": "nedertysk",
+	"ne": "nepali",
+	"nnh": "ngiemboon",
+	"jgo": "ngomba",
+	"pcm": "nigeriansk pidginspråk",
+	"lrc": "nord-luri",
+	"nd": "nord-ndebele",
+	"se": "nordsamisk",
+	"no": "norsk",
+	"nb": "norsk bokmål",
+	"nn": "norsk nynorsk",
+	"nus": "nuer",
+	"nyn": "nyankole",
+	"or": "odia",
+	"om": "oromo",
+	"os": "ossetisk",
+	"pa": "panjabi",
+	"ps": "pashto",
+	"fa": "persisk",
+	"pl": "polsk",
+	"pt": "portugisisk",
+	"pt-PT": "portugisisk (Portugal)",
+	"qu": "quechua",
+	"rm": "retoromansk",
+	"rof": "rombo",
+	"ro": "rumensk",
+	"rn": "rundi",
+	"ru": "russisk",
+	"rwk": "rwa",
+	"sah": "sakha",
+	"saq": "samburu",
+	"sg": "sango",
+	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
+	"seh": "sena",
+	"tzm": "sentralmarokkansk tamazight",
+	"sr": "serbisk",
+	"ksb": "shambala",
+	"sn": "shona",
+	"ii": "sichuan-yi",
+	"sd": "sindhi",
+	"si": "singalesisk",
+	"gd": "skotsk-gælisk",
+	"sk": "slovakisk",
+	"sl": "slovensk",
+	"xog": "soga",
+	"so": "somali",
+	"es": "spansk",
+	"es-419": "spansk (Latin-Amerika)",
+	"es-MX": "spansk (Mexico)",
+	"zgh": "standard marrokansk tamazight",
+	"su": "sundanesisk",
+	"gsw": "sveitsertysk",
+	"sv": "svensk",
+	"sw": "swahili",
+	"shi": "tachelhit",
+	"tg": "tadsjikisk",
+	"dav": "taita",
+	"ta": "tamil",
+	"twq": "tasawaq",
+	"tt": "tatarisk",
+	"te": "telugu",
+	"teo": "teso",
+	"th": "thai",
+	"bo": "tibetansk",
+	"ti": "tigrinja",
+	"to": "tongansk",
+	"zh-Hant": "tradisjonell kinesisk",
+	"cs": "tsjekkisk",
+	"ce": "tsjetsjensk",
+	"tk": "turkmensk",
+	"tr": "tyrkisk",
+	"de": "tysk",
+	"de-CH": "tysk (Sveits)",
+	"de-AT": "tysk (Østerrike)",
+	"ug": "uigurisk",
+	"uk": "ukrainsk",
+	"hu": "ungarsk",
+	"ur": "urdu",
+	"uz": "usbekisk",
+	"vai": "Vai",
+	"wa": "vallonsk",
+	"fy": "vestfrisisk",
+	"vi": "vietnamesisk",
+	"vun": "vunjo",
+	"cy": "walisisk",
+	"wae": "walsertysk",
+	"wo": "wolof",
+	"xh": "xhosa",
+	"yav": "yangben",
+	"dje": "zarma",
+	"zu": "zulu"
+}
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/pa.json b/vendor/commerceguys/intl/resources/language/pa.json
index 2b27b6a4b..5b937d36d 100644
--- a/vendor/commerceguys/intl/resources/language/pa.json
+++ b/vendor/commerceguys/intl/resources/language/pa.json
@@ -34,7 +34,9 @@
 	"ebu": "ਇੰਬੂ",
 	"ewo": "ਇਵੋਂਡੋ",
 	"ee": "ਈਵਈ",
+	"sa": "ਸੰਸਕ�ਰਿਤ",
 	"gd": "ਸਕਾਟਿਸ਼ ਗੇਲਿਕ",
+	"sat": "ਸੰਥਾਲੀ",
 	"es": "ਸਪੇਨੀ",
 	"es-MX": "ਸਪੇਨੀ (ਮੈਕਸੀਕੀ)",
 	"es-419": "ਸਪੇਨੀ (ਲਾਤੀਨੀ ਅਮਰੀਕੀ)",
@@ -51,6 +53,7 @@
 	"ii": "ਸਿਚ�ਆਨ ਯੀ",
 	"sd": "ਸਿੰਧੀ",
 	"ceb": "ਸੀਬੂਆਨੋ",
+	"su": "ਸੂੰਡਾਨੀ",
 	"sbp": "ਸੇਂਗੋ",
 	"seh": "ਸੇਨਾ",
 	"xog": "ਸੋਗਾ",
@@ -70,7 +73,7 @@
 	"kab": "ਕਬਾਇਲ",
 	"kl": "ਕਲਾਅੱਲੀਸ�ਟ",
 	"kln": "ਕਲੇਜਿਨ",
-	"ksh": "ਕਲੋਗਨੀਅਨ",
+	"ksh": "ਕਲੋਨੀਅਨ",
 	"nmg": "ਕਵਾਸਿਓ",
 	"hr": "ਕ�ਰੋ�ਸ਼ਿਆਈ",
 	"kkj": "ਕਾਕੋ",
@@ -95,8 +98,8 @@
 	"gu": "ਗ�ਜਰਾਤੀ",
 	"gl": "ਗੈਲਿਸ਼ਿਅਨ",
 	"cgg": "ਚੀਗਾ",
+	"zh": "ਚੀਨੀ",
 	"zh-Hans": "ਚੀਨੀ (ਸਰਲ)",
-	"zh": "ਚੀਨੀ (ਮੈਂਡਰਿਨ)",
 	"zh-Hant": "ਚੀਨੀ (ਰਵਾਇਤੀ)",
 	"ce": "ਚੇਚਨ",
 	"chr": "ਚੇਰੋਕੀ",
@@ -129,7 +132,9 @@
 	"te": "ਤੇਲਗੂ",
 	"th": "ਥਾਈ",
 	"jgo": "ਨਗੋਂਬਾ",
+	"pcm": "ਨਾਇਜੀਰੀਆਈ ਪਿਡਗਿਨ",
 	"naq": "ਨਾਮਾ",
+	"no": "ਨਾਰਵੇਜਿਆਈ",
 	"nn": "ਨਾਰਵੇਜਿਆਈ ਨਿਓਨੌਰਸਕ",
 	"nb": "ਨਾਰਵੇਜਿਆਈ ਬੋਕਮਲ",
 	"nnh": "ਨਿਓਮਬੂਨ",
@@ -171,6 +176,7 @@
 	"mn": "ਮੰਗੋਲੀ",
 	"jmc": "ਮਚਾਮੇ",
 	"tzm": "ਮੱਧ �ਟਲਸ ਤਮਾਜ਼ਿਤ",
+	"mni": "ਮਨੀਪ�ਰੀ",
 	"mr": "ਮਰਾਠੀ",
 	"ms": "ਮਲਯ",
 	"ml": "ਮਲਿਆਲਮ",
@@ -183,6 +189,7 @@
 	"mgo": "ਮੇਟਾ",
 	"mer": "ਮੇਰੂ",
 	"mk": "ਮੈਕਡੋਨੀਆਈ",
+	"mai": "ਮੈਥਲੀ",
 	"mfe": "ਮੋਰੀਸਿਅਨ",
 	"ro-MD": "ਮੋਲਡਾਵੀਆਈ",
 	"yav": "ਯਾਂਗਬੇਨ",
@@ -215,5 +222,6 @@
 	"vi": "ਵੀਅਤਨਾਮੀ",
 	"vun": "ਵੂੰਜੋ",
 	"cy": "ਵੈਲਸ਼",
-	"wo": "ਵੋਲੋਫ"
+	"wo": "ਵੋਲੋਫ",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/pl.json b/vendor/commerceguys/intl/resources/language/pl.json
index 23f308f40..42e9f557f 100644
--- a/vendor/commerceguys/intl/resources/language/pl.json
+++ b/vendor/commerceguys/intl/resources/language/pl.json
@@ -6,13 +6,14 @@
 	"es-419": "amerykański hiszpański",
 	"am": "amharski",
 	"en": "angielski",
+	"en-AU": "angielski australijski",
+	"en-GB": "angielski brytyjski",
+	"en-CA": "angielski kanadyjski",
 	"ar": "arabski",
 	"as": "asamski",
 	"ast": "asturyjski",
 	"asa": "asu",
 	"teo": "ateso",
-	"en-AU": "australijski angielski",
-	"de-AT": "austriacki niemiecki",
 	"az": "azerbejdżański",
 	"ksf": "bafia",
 	"bm": "bambara",
@@ -26,9 +27,8 @@
 	"brx": "bodo",
 	"bs": "bośniacki",
 	"br": "bretoński",
-	"en-GB": "brytyjski angielski",
 	"bg": "bułgarski",
-	"ceb": "cebuano",
+	"ceb": "cebuański",
 	"cgg": "chiga",
 	"zh": "chiński",
 	"zh-Hant": "chiński tradycyjny",
@@ -38,6 +38,7 @@
 	"cs": "czeski",
 	"chr": "czirokeski",
 	"dyo": "diola",
+	"doi": "dogri",
 	"dsb": "dolnołużycki",
 	"nds": "dolnoniemiecki",
 	"nds-NL": "dolnosaksoński",
@@ -51,10 +52,12 @@
 	"ee": "ewe",
 	"ewo": "ewondo",
 	"fo": "farerski",
-	"fil": "filipino",
+	"fil": "filipiński",
 	"fi": "fiński",
 	"nl-BE": "flamandzki",
 	"fr": "francuski",
+	"fr-CA": "francuski kanadyjski",
+	"fr-CH": "francuski szwajcarski",
 	"fur": "friulski",
 	"ff": "fulani",
 	"gl": "galicyjski",
@@ -85,8 +88,6 @@
 	"kkj": "kako",
 	"kln": "kalenjin",
 	"kam": "kamba",
-	"en-CA": "kanadyjski angielski",
-	"fr-CA": "kanadyjski francuski",
 	"kn": "kannada",
 	"yue": "kantoński",
 	"ks": "kaszmirski",
@@ -120,12 +121,14 @@
 	"lv": "Å‚otewski",
 	"mk": "macedoński",
 	"jmc": "machame",
+	"mai": "maithili",
 	"kde": "makonde",
 	"mgh": "makua",
 	"ml": "malajalam",
 	"ms": "malajski",
 	"mg": "malgaski",
 	"mt": "maltański",
+	"mni": "manipuri",
 	"mi": "maoryjski",
 	"mr": "marathi",
 	"mas": "masajski",
@@ -144,6 +147,8 @@
 	"nmg": "ngumba",
 	"nl": "niderlandzki",
 	"de": "niemiecki",
+	"de-AT": "niemiecki austriacki",
+	"no": "norweski",
 	"nb": "norweski (bokmål)",
 	"nn": "norweski (nynorsk)",
 	"nus": "nuer",
@@ -155,6 +160,7 @@
 	"ps": "paszto",
 	"pa": "pendżabski",
 	"fa": "perski",
+	"pcm": "pidżyn nigeryjski",
 	"pl": "polski",
 	"pt": "portugalski",
 	"se": "północnolapoński",
@@ -168,6 +174,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskryt",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "serbski",
 	"sn": "shona",
@@ -179,12 +187,11 @@
 	"ckb": "sorani",
 	"zgh": "standardowy marokański tamazight",
 	"sw": "suahili",
+	"su": "sundajski",
 	"ii": "syczuański",
 	"si": "syngaleski",
 	"gd": "szkocki gaelicki",
-	"fr-CH": "szwajcarski francuski",
 	"gsw": "szwajcarski niemiecki",
-	"de-CH": "szwajcarski wysokoniemiecki",
 	"sv": "szwedzki",
 	"tg": "tadżycki",
 	"dav": "taita",
@@ -213,6 +220,7 @@
 	"vi": "wietnamski",
 	"it": "włoski",
 	"wo": "wolof",
+	"de-CH": "wysokoniemiecki szwajcarski",
 	"yav": "yangben",
 	"fy": "zachodniofryzyjski",
 	"zu": "zulu"
diff --git a/vendor/commerceguys/intl/resources/language/ps-PK.json b/vendor/commerceguys/intl/resources/language/ps-PK.json
index 666a88900..f2cfbe225 100644
--- a/vendor/commerceguys/intl/resources/language/ps-PK.json
+++ b/vendor/commerceguys/intl/resources/language/ps-PK.json
@@ -96,13 +96,16 @@
 	"sk": "سلوواکي",
 	"sl": "سلوواني",
 	"saq": "سمبورو",
+	"sat": "سنتالي",
 	"sd": "سندهي",
+	"sa": "سنسکریټ",
 	"sw": "سواه�لي",
+	"su": "سوډاني",
 	"xog": "سوګا",
 	"so": "سومالي",
 	"sv": "سویډنی",
 	"gsw": "سویس جرمن",
-	"de-CH": "سوئس لوی جرمن",
+	"de-CH": "سویس های جرمن",
 	"fr-CH": "سويسي �رانسوي",
 	"ceb": "سیبوانوي",
 	"ii": "سیچیان یی",
@@ -174,7 +177,9 @@
 	"mas": "ماسائي",
 	"ml": "مالايالم",
 	"mt": "مالټايي",
+	"mni": "مانی پوری",
 	"mi": "ماوري",
+	"mai": "مایتھلي",
 	"mr": "مراټهي",
 	"tzm": "مرکزی اطلس تمازائيٹ",
 	"mzn": "مزاندراني",
@@ -192,8 +197,10 @@
 	"es-MX": "ميکسيکي هسپانوي",
 	"kde": "ميکونډي",
 	"nb": "ناروے بوکمال",
+	"no": "نارو�ئي",
 	"nn": "نارو�ئي (نائنورسک)",
 	"naq": "ناما",
+	"pcm": "نائجیریا پیدجن",
 	"nnh": "نایجیمون",
 	"jgo": "نګومبا",
 	"nus": "نویر",
@@ -202,7 +209,7 @@
 	"nl": "هال�نډي",
 	"es": "هسپانوي",
 	"hi": "هندي",
-	"hu": "هنگري",
+	"hu": "هنګري",
 	"haw": "هوایی",
 	"ha": "هوسا",
 	"wa": "والون",
@@ -215,5 +222,6 @@
 	"yi": "يديش",
 	"yav": "ینګبین",
 	"yo": "یوروبا",
-	"el": "یوناني"
+	"el": "یوناني",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ps.json b/vendor/commerceguys/intl/resources/language/ps.json
index 107a9a8ad..1490bfd9e 100644
--- a/vendor/commerceguys/intl/resources/language/ps.json
+++ b/vendor/commerceguys/intl/resources/language/ps.json
@@ -96,13 +96,16 @@
 	"sk": "سلوواکي",
 	"sl": "سلوواني",
 	"saq": "سمبورو",
+	"sat": "سنتالي",
 	"sd": "سندهي",
+	"sa": "سنسکریټ",
 	"sw": "سواه�لي",
+	"su": "سوډاني",
 	"xog": "سوګا",
 	"so": "سومالي",
 	"sv": "سویډنی",
 	"gsw": "سویس جرمن",
-	"de-CH": "سوئس لوی جرمن",
+	"de-CH": "سویس های جرمن",
 	"fr-CH": "سويسي �رانسوي",
 	"ceb": "سیبوانوي",
 	"ii": "سیچیان یی",
@@ -174,7 +177,9 @@
 	"mas": "ماسائي",
 	"ml": "مالايالم",
 	"mt": "مالټايي",
+	"mni": "مانی پوری",
 	"mi": "ماوري",
+	"mai": "مایتھلي",
 	"mr": "مراټهي",
 	"tzm": "مرکزی اطلس تمازائيٹ",
 	"mzn": "مزاندراني",
@@ -191,9 +196,11 @@
 	"mer": "ميرو",
 	"es-MX": "ميکسيکي هسپانوي",
 	"kde": "ميکونډي",
-	"nb": "نارو� بوکمال",
+	"no": "نارو�ئي",
+	"nb": "نارو�ئي (بوکمال)",
 	"nn": "نارو�ئي (نائنورسک)",
 	"naq": "ناما",
+	"pcm": "نائجیریا پیدجن",
 	"nnh": "نایجیمون",
 	"jgo": "نګومبا",
 	"nus": "نویر",
@@ -202,7 +209,7 @@
 	"nl": "هال�نډي",
 	"es": "هسپانوي",
 	"hi": "هندي",
-	"hu": "هنگري",
+	"hu": "هنګري",
 	"haw": "هوایی",
 	"ha": "هوسا",
 	"wa": "والون",
@@ -215,5 +222,6 @@
 	"yi": "يديش",
 	"yav": "ینګبین",
 	"yo": "یوروبا",
-	"el": "یوناني"
+	"el": "یوناني",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/pt-PT.json b/vendor/commerceguys/intl/resources/language/pt-PT.json
index 202f2a95d..175e397a1 100644
--- a/vendor/commerceguys/intl/resources/language/pt-PT.json
+++ b/vendor/commerceguys/intl/resources/language/pt-PT.json
@@ -49,9 +49,12 @@
 	"ko": "coreano",
 	"kw": "córnico",
 	"kea": "crioulo cabo-verdiano",
+	"mfe": "crioulo mauriciano",
 	"hr": "croata",
 	"ku": "curdo",
+	"ckb": "curdo central",
 	"da": "dinamarquês",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzonga",
 	"ebu": "embu",
@@ -126,10 +129,12 @@
 	"jmc": "machame",
 	"kde": "maconde",
 	"mgh": "macua",
+	"mai": "maithili",
 	"ml": "malaiala",
 	"ms": "malaio",
 	"mg": "malgaxe",
 	"mt": "maltês",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marata",
 	"mas": "massai",
@@ -138,7 +143,6 @@
 	"mgo": "meta’",
 	"ro-MD": "moldávio",
 	"mn": "mongol",
-	"mfe": "morisyen",
 	"mua": "mundang",
 	"naq": "nama",
 	"nd": "ndebele do norte",
@@ -146,16 +150,18 @@
 	"ne": "nepalês",
 	"nnh": "ngiemboon",
 	"jgo": "nguemba",
+	"no": "norueguês",
 	"nb": "norueguês bokmål",
 	"nn": "norueguês nynorsk",
 	"nus": "nuer",
 	"nyn": "nyankole",
-	"or": "oriya",
+	"or": "oriá",
 	"om": "oromo",
 	"os": "ossético",
 	"pa": "panjabi",
 	"ps": "pastó",
 	"fa": "persa",
+	"pcm": "pidgin nigeriano",
 	"pl": "polaco",
 	"pt": "português",
 	"pt-PT": "português europeu",
@@ -174,6 +180,8 @@
 	"se": "sami do norte",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sânscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "sérvio",
 	"ksb": "shambala",
@@ -182,16 +190,16 @@
 	"sd": "sindi",
 	"xog": "soga",
 	"so": "somali",
-	"ckb": "sorani curdo",
 	"sw": "suaíli",
 	"sw-CD": "suaíli do Congo",
 	"sv": "sueco",
+	"su": "sundanês",
 	"shi": "tachelhit",
 	"th": "tailandês",
 	"dav": "taita",
 	"tg": "tajique",
-	"tzm": "tamazight do Atlas Central",
 	"zgh": "tamazight marroquino padrão",
+	"tzm": "tamazigue do Atlas Central",
 	"ta": "tâmil",
 	"twq": "tasawaq",
 	"tt": "tatar",
diff --git a/vendor/commerceguys/intl/resources/language/pt.json b/vendor/commerceguys/intl/resources/language/pt.json
index 2f6e307e9..1bfa5f841 100644
--- a/vendor/commerceguys/intl/resources/language/pt.json
+++ b/vendor/commerceguys/intl/resources/language/pt.json
@@ -53,6 +53,7 @@
 	"ku": "curdo",
 	"ckb": "curdo central",
 	"da": "dinamarquês",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzonga",
 	"ebu": "embu",
@@ -62,7 +63,7 @@
 	"es-419": "espanhol (América Latina)",
 	"es-MX": "espanhol (México)",
 	"et": "estoniano",
-	"ee": "eve",
+	"ee": "ewe",
 	"ewo": "ewondo",
 	"fo": "feroês",
 	"fil": "filipino",
@@ -114,6 +115,7 @@
 	"lkt": "lacota",
 	"lag": "langi",
 	"lo": "laosiano",
+	"smn": "lapão de Inari",
 	"lv": "letão",
 	"ln": "lingala",
 	"lt": "lituano",
@@ -128,10 +130,12 @@
 	"jmc": "machame",
 	"kde": "maconde",
 	"mgh": "macua",
+	"mai": "maithili",
 	"ml": "malaiala",
 	"ms": "malaio",
 	"mg": "malgaxe",
 	"mt": "maltês",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marati",
 	"mas": "massai",
@@ -147,6 +151,7 @@
 	"ne": "nepalês",
 	"nnh": "ngiemboon",
 	"jgo": "nguemba",
+	"no": "norueguês",
 	"nus": "nuer",
 	"nyn": "nyankole",
 	"nn": "nynorsk norueguês",
@@ -156,6 +161,7 @@
 	"pa": "panjabi",
 	"ps": "pashto",
 	"fa": "persa",
+	"pcm": "pidgin nigeriano",
 	"pl": "polonês",
 	"pt": "português",
 	"pt-PT": "português (Portugal)",
@@ -171,10 +177,11 @@
 	"rwk": "rwa",
 	"sah": "sakha",
 	"saq": "samburu",
-	"smn": "sami de Inari",
 	"se": "sami setentrional",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sânscrito",
+	"sat": "santali",
 	"seh": "sena",
 	"sr": "sérvio",
 	"ksb": "shambala",
@@ -184,11 +191,12 @@
 	"sw": "suaíli",
 	"sw-CD": "suaíli do Congo",
 	"sv": "sueco",
+	"su": "sundanês",
 	"shi": "tachelhit",
 	"tg": "tadjique",
 	"th": "tailandês",
 	"dav": "taita",
-	"tzm": "tamazirte do Atlas Central",
+	"tzm": "tamazight do Atlas Central",
 	"zgh": "tamazirte marroqino padrão",
 	"ta": "tâmil",
 	"tt": "tártaro",
diff --git a/vendor/commerceguys/intl/resources/language/rn.json b/vendor/commerceguys/intl/resources/language/rn.json
index ab311873a..91ab6f8e0 100644
--- a/vendor/commerceguys/intl/resources/language/rn.json
+++ b/vendor/commerceguys/intl/resources/language/rn.json
@@ -28,6 +28,7 @@
 	"kw": "Cornish",
 	"hr": "Croatian",
 	"da": "Danish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -139,11 +140,13 @@
 	"luy": "Luyia",
 	"mk": "Macedonian",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
 	"ml": "Malayalam",
 	"mt": "Maltese",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mr": "Marathi",
 	"mas": "Masai",
@@ -157,9 +160,11 @@
 	"nds-NL": "nds (Ubuholandi)",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
+	"no": "Norwegian",
 	"nb": "Norwegian Bokmål",
 	"nn": "Norwegian Nynorsk",
 	"nus": "Nuer",
@@ -176,6 +181,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"gd": "Scottish Gaelic",
 	"seh": "Sena",
 	"sr": "Serbian",
@@ -188,6 +195,7 @@
 	"sl": "Slovenian",
 	"xog": "Soga",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw-CD": "sw (Repubulika Iharanira Demokarasi ya Kongo)",
 	"sw": "Swahili",
 	"gsw": "Swiss German",
diff --git a/vendor/commerceguys/intl/resources/language/ro-MD.json b/vendor/commerceguys/intl/resources/language/ro-MD.json
index 52c647f04..94addd86a 100644
--- a/vendor/commerceguys/intl/resources/language/ro-MD.json
+++ b/vendor/commerceguys/intl/resources/language/ro-MD.json
@@ -38,6 +38,7 @@
 	"kw": "cornică",
 	"hr": "croată",
 	"da": "daneză",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"he": "ebraică",
@@ -49,7 +50,7 @@
 	"et": "estonă",
 	"ee": "ewe",
 	"ewo": "ewondo",
-	"fo": "faroeză",
+	"fo": "feroeză",
 	"fil": "filipineză",
 	"fi": "finlandeză",
 	"nl-BE": "flamandă",
@@ -118,12 +119,14 @@
 	"mk": "macedoneană",
 	"jmc": "machame",
 	"hu": "maghiară",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ms": "malaeză",
 	"ml": "malayalam",
 	"mg": "malgașă",
 	"mt": "malteză",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -139,6 +142,7 @@
 	"ne": "nepaleză",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "norvegiană",
 	"nb": "norvegiană bokmål",
 	"nn": "norvegiană nynorsk",
 	"nus": "nuer",
@@ -148,6 +152,7 @@
 	"os": "osetă",
 	"ps": "paștună",
 	"fa": "persană",
+	"pcm": "pidgin nigerian",
 	"pl": "poloneză",
 	"pt": "portugheză",
 	"pt-PT": "portugheză (Europa)",
@@ -165,6 +170,8 @@
 	"smn": "sami inari",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanscrită",
+	"sat": "santali",
 	"nds-NL": "saxona de jos",
 	"sr": "sârbă",
 	"seh": "sena",
@@ -182,12 +189,13 @@
 	"es-419": "spaniolă (America Latină)",
 	"es-MX": "spaniolă (Mexic)",
 	"sv": "suedeză",
+	"su": "sundaneză",
 	"sw": "swahili",
 	"sw-CD": "swahili (R. D. Congo)",
 	"shi": "tachelhit",
 	"tg": "tadjică",
 	"dav": "taita",
-	"tzm": "tamazight din Altasul Central",
+	"tzm": "tamazight din Atlasul Central",
 	"zgh": "tamazight standard marocană",
 	"ta": "tamilă",
 	"twq": "tasawaq",
diff --git a/vendor/commerceguys/intl/resources/language/ro.json b/vendor/commerceguys/intl/resources/language/ro.json
index 8faa641b8..383fddc43 100644
--- a/vendor/commerceguys/intl/resources/language/ro.json
+++ b/vendor/commerceguys/intl/resources/language/ro.json
@@ -38,6 +38,7 @@
 	"kw": "cornică",
 	"hr": "croată",
 	"da": "daneză",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"he": "ebraică",
@@ -49,7 +50,7 @@
 	"et": "estonă",
 	"ee": "ewe",
 	"ewo": "ewondo",
-	"fo": "faroeză",
+	"fo": "feroeză",
 	"fil": "filipineză",
 	"fi": "finlandeză",
 	"nl-BE": "flamandă",
@@ -118,12 +119,14 @@
 	"mk": "macedoneană",
 	"jmc": "machame",
 	"hu": "maghiară",
+	"mai": "maithili",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
 	"ms": "malaeză",
 	"ml": "malayalam",
 	"mg": "malgașă",
 	"mt": "malteză",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"mas": "masai",
@@ -139,6 +142,7 @@
 	"ne": "nepaleză",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"no": "norvegiană",
 	"nb": "norvegiană bokmål",
 	"nn": "norvegiană nynorsk",
 	"nus": "nuer",
@@ -148,6 +152,7 @@
 	"os": "osetă",
 	"ps": "paștună",
 	"fa": "persană",
+	"pcm": "pidgin nigerian",
 	"pl": "poloneză",
 	"pt": "portugheză",
 	"pt-PT": "portugheză (Europa)",
@@ -165,6 +170,8 @@
 	"smn": "sami inari",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanscrită",
+	"sat": "santali",
 	"nds-NL": "saxona de jos",
 	"sr": "sârbă",
 	"seh": "sena",
@@ -182,12 +189,13 @@
 	"es-419": "spaniolă (America Latină)",
 	"es-MX": "spaniolă (Mexic)",
 	"sv": "suedeză",
+	"su": "sundaneză",
 	"sw": "swahili",
 	"sw-CD": "swahili (R.D. Congo)",
 	"shi": "tachelhit",
 	"tg": "tadjică",
 	"dav": "taita",
-	"tzm": "tamazight din Altasul Central",
+	"tzm": "tamazight din Atlasul Central",
 	"zgh": "tamazight standard marocană",
 	"ta": "tamilă",
 	"twq": "tasawaq",
diff --git a/vendor/commerceguys/intl/resources/language/ru.json b/vendor/commerceguys/intl/resources/language/ru.json
index 279c175f8..9f023dd79 100644
--- a/vendor/commerceguys/intl/resources/language/ru.json
+++ b/vendor/commerceguys/intl/resources/language/ru.json
@@ -49,6 +49,7 @@
 	"dje": "джерма",
 	"dz": "дзонг-к�",
 	"dyo": "диола-фоньи",
+	"doi": "догри",
 	"dua": "дуала",
 	"pt-PT": "европей�кий португаль�кий",
 	"fy": "западнофриз�кий",
@@ -108,6 +109,7 @@
 	"lb": "люк�ембург�кий",
 	"mfe": "маврикий�кий креоль�кий",
 	"mzn": "мазандеран�кий",
+	"mai": "майтхили",
 	"mk": "македон�кий",
 	"kde": "маконде",
 	"mgh": "макуа-меетто",
@@ -115,6 +117,7 @@
 	"ms": "малай�кий",
 	"ml": "мала�лам",
 	"mt": "мальтий�кий",
+	"mni": "манипур�кий",
 	"mi": "маори",
 	"mr": "маратхи",
 	"mas": "ма�аи",
@@ -130,10 +133,12 @@
 	"jgo": "нгомба",
 	"de": "немецкий",
 	"ne": "непаль�кий",
+	"pcm": "нигерий�ко-креоль�кий",
 	"nl": "нидерланд�кий",
 	"dsb": "нижнелужицкий",
 	"nds": "нижненемецкий",
 	"nds-NL": "нижне�ак�он�кий",
+	"no": "норвеж�кий",
 	"nb": "норвеж�кий букмол",
 	"ii": "но�у",
 	"nus": "ну�р",
@@ -156,6 +161,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"ceb": "�ебуано",
 	"lrc": "�евернолур�кий",
@@ -172,6 +179,7 @@
 	"ckb": "�орани",
 	"tzm": "�реднеатла��кий тамазигхт�кий",
 	"sw": "�уахили",
+	"su": "�ундан�кий",
 	"tg": "таджик�кий",
 	"dav": "таита",
 	"th": "тай�кий",
diff --git a/vendor/commerceguys/intl/resources/language/rw.json b/vendor/commerceguys/intl/resources/language/rw.json
index d3d2f568a..c2c432572 100644
--- a/vendor/commerceguys/intl/resources/language/rw.json
+++ b/vendor/commerceguys/intl/resources/language/rw.json
@@ -20,6 +20,7 @@
 	"zh": "Chinese",
 	"ksh": "Colognian",
 	"kw": "Cornish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -60,6 +61,7 @@
 	"pl": "Igipolone",
 	"pt": "Igiporutugali",
 	"pa": "Igipunjabi",
+	"sa": "Igisansikiri",
 	"sr": "Igiseribe",
 	"is": "Igisilande",
 	"sk": "Igisilovaki",
@@ -95,6 +97,7 @@
 	"ne": "Ikinepali",
 	"nl": "Ikinerilande",
 	"nl-BE": "Ikinerilande (BE)",
+	"no": "Ikinoruveji",
 	"fil": "Ikinyafilipine",
 	"af": "Ikinyafurikaneri",
 	"lv": "Ikinyaletoviyani",
@@ -128,6 +131,7 @@
 	"fa": "Inyeperisi",
 	"pt-PT": "Inyeporutigali (Igiporutigali)",
 	"si": "Inyesimpaleze",
+	"su": "Inyesudani",
 	"tk": "Inyeturukimeni",
 	"yi": "Inyeyidishi",
 	"ur": "Inyeyurudu",
@@ -158,9 +162,11 @@
 	"lb": "Luxembourgish",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mg": "Malagasy",
+	"mni": "Manipuri",
 	"mi": "Maori",
 	"mas": "Masai",
 	"mzn": "Mazanderani",
@@ -172,6 +178,7 @@
 	"nds-NL": "nds (NL)",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"se": "Northern Sami",
@@ -189,6 +196,7 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sat": "Santali",
 	"seh": "Sena",
 	"ksb": "Shambala",
 	"sn": "Shona",
diff --git a/vendor/commerceguys/intl/resources/language/sd.json b/vendor/commerceguys/intl/resources/language/sd.json
index 4cf9dcc32..e555eff52 100644
--- a/vendor/commerceguys/intl/resources/language/sd.json
+++ b/vendor/commerceguys/intl/resources/language/sd.json
@@ -1,4 +1,6 @@
 {
+	"doi": "Dogri",
+	"no": "Norwegian",
 	"ga": "آئرش",
 	"is": "آئيس لينڊڪ",
 	"az": "آزربائيجاني",
@@ -14,7 +16,6 @@
 	"ur": "اردو",
 	"hy": "ارماني",
 	"uz": "ازبڪ",
-	"es": "اسپيني",
 	"ast": "اسٽورين",
 	"gd": "اسڪاٽش گيلڪ",
 	"asa": "اسو",
@@ -36,7 +37,7 @@
 	"ebu": "ايمبيو",
 	"ee": "ايو",
 	"bas": "باسا",
-	"eu": "باسڪي",
+	"eu": "باسق",
 	"ksf": "با�يا",
 	"en-GB": "برطانوي انگريزي",
 	"my": "برمي",
@@ -54,12 +55,12 @@
 	"pt": "پورٽگليز",
 	"pl": "پولش",
 	"dav": "تائيتا",
-	"tt": "تاتري",
-	"tg": "تاجڪي",
+	"tt": "تاتار",
+	"tg": "تاجڪ",
 	"ta": "تامل",
 	"bo": "تبيتائي",
-	"tr": "ترڪ",
-	"tk": "ترڪماني",
+	"tr": "ترڪش",
+	"tk": "ترڪمين",
 	"twq": "تساوڪي",
 	"ti": "تگرينيائي",
 	"te": "تلگو",
@@ -68,7 +69,7 @@
 	"teo": "تيسو",
 	"th": "ٿائي",
 	"ja": "جاپاني",
-	"ka": "جارجين",
+	"ka": "جارجيائي",
 	"jv": "جاونيز",
 	"de": "جرمن",
 	"dyo": "جولا �وني",
@@ -100,15 +101,18 @@
 	"sr": "سربيائي",
 	"sk": "سلواڪي",
 	"sl": "سلوويني",
+	"sat": "سنتالي",
 	"sd": "سنڌي",
+	"sa": "سنسڪرت",
 	"si": "سنهالا",
 	"gsw": "سوئس جرمن",
 	"fr-CH": "سوئس �رانسيسي",
 	"de-CH": "سوئس هائي جرمن",
 	"sw": "سواحيلي",
+	"su": "سوڊاني",
 	"xog": "سوگا",
 	"so": "سومالي",
-	"sv": "سويڊني",
+	"sv": "سويڊش",
 	"saq": "سيمبورو",
 	"seh": "سينا",
 	"ksb": "شمبالا",
@@ -117,7 +121,7 @@
 	"ar": "عربي",
 	"fa": "�ارسي",
 	"fur": "�رائي لئين",
-	"fr": "�رانسي",
+	"fr": "�رانسيسي",
 	"ff": "�لاهه",
 	"fil": "�لپائني",
 	"nl-BE": "�لیمش",
@@ -170,6 +174,7 @@
 	"mi": "مائوري",
 	"mt": "مالٽي",
 	"ro-MD": "مالديوي",
+	"mni": "ماني پوري",
 	"mgh": "مخووا ميتو",
 	"mr": "مراٺي",
 	"ckb": "مرڪزي ڪردش",
@@ -185,10 +190,12 @@
 	"mn": "منگولي",
 	"mfe": "موریسیین",
 	"mgo": "ميتا",
+	"mai": "ميٿلي",
 	"mer": "ميرو",
 	"mk": "ميسي ڊونيائي",
 	"es-MX": "ميڪسيڪين اسپيني",
 	"jmc": "ميڪم",
+	"pcm": "نائيجرين پجن",
 	"nb": "نارويائي بوڪمال",
 	"nn": "نارويائي نيوناسڪ",
 	"naq": "ناما",
@@ -197,6 +204,7 @@
 	"nnh": "نغيمبون",
 	"ne": "نيپالي",
 	"nus": "نيور",
+	"es": "هسپانوي",
 	"hi": "هندي",
 	"hu": "هنگري",
 	"haw": "هوائي",
@@ -205,7 +213,7 @@
 	"tzm": "وچ اٽلس تمازائيٽ",
 	"wa": "ولون",
 	"vun": "ونجو",
-	"wo": "وول�",
+	"wo": "وولو�",
 	"vi": "ويتنامي",
 	"cy": "ويلش",
 	"vai": "يا",
diff --git a/vendor/commerceguys/intl/resources/language/si.json b/vendor/commerceguys/intl/resources/language/si.json
index 59d3bfc12..3b0ec5426 100644
--- a/vendor/commerceguys/intl/resources/language/si.json
+++ b/vendor/commerceguys/intl/resources/language/si.json
@@ -5,7 +5,7 @@
 	"ar": "අර�බි",
 	"az": "අසර්බයිජ�න්",
 	"asa": "අසු",
-	"af": "අෆ්රික�න්ස්",
+	"af": "අෆ්�රික�න්ස්",
 	"hy": "ආර්මේනිය�නු",
 	"agq": "ඇගම්",
 	"am": "ඇම්හ�රික්",
@@ -96,6 +96,7 @@
 	"nyn": "නයන්ක�ලෙ",
 	"naq": "න�ම�",
 	"ne": "නේප�ල",
+	"pcm": "නෛජීරියන් පෙන්ගින්",
 	"jgo": "නොම්බ�",
 	"nus": "නොයර්",
 	"nn": "න�ර්වීජිය�නු නයින�ර්ස්ක්",
@@ -128,6 +129,8 @@
 	"br": "බ්�රේටොන්",
 	"mgh": "මඛුව�-මීට�",
 	"tzm": "මධ්�යම ඇට්ලස් ටමසිට්",
+	"mni": "මනිපුරි",
+	"mai": "මයිතිලි",
 	"mr": "මර�ති",
 	"mg": "මලග�සි",
 	"ml": "මලය�ලම්",
@@ -180,14 +183,17 @@
 	"sn": "��න�",
 	"xh": "��ස�",
 	"sbp": "සංගු",
+	"sa": "සංස්කෘත",
 	"sah": "සඛ�",
 	"sg": "සන්ග්�ර�",
+	"su": "සන්ඩනීසිය�නු",
 	"saq": "සම්බුරු",
 	"zgh": "සම්මත මොරොක්ක� ටමසිග්ත්",
 	"zh-Hans": "සරල චීන",
 	"sr": "සර්බිය�නු",
 	"dje": "සර්ම�",
 	"zh-Hant": "ස�ම්ප්�රද�යික චීන",
+	"sat": "සෑන්ටලි",
 	"si": "සිංහල",
 	"ii": "සිචුආන් යී",
 	"sd": "සින්ධි",
@@ -215,5 +221,7 @@
 	"fi": "ෆින්ලන්ත",
 	"ff": "ෆුල�හ්",
 	"fur": "ෆ්�රියුලියන්",
-	"nl-BE": "ෆ්ලෙමි�්"
+	"nl-BE": "ෆ්ලෙමි�්",
+	"doi": "Dogri",
+	"no": "Norwegian"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/sk.json b/vendor/commerceguys/intl/resources/language/sk.json
index 4972a5328..e454fb8ff 100644
--- a/vendor/commerceguys/intl/resources/language/sk.json
+++ b/vendor/commerceguys/intl/resources/language/sk.json
@@ -35,6 +35,7 @@
 	"zh-Hant": "�ínština (tradi�ná)",
 	"zh-Hans": "�ínština (zjednodušená)",
 	"da": "dán�ina",
+	"doi": "dógrí",
 	"nds": "dolná nem�ina",
 	"nds-NL": "dolná saština",
 	"dsb": "dolnolužická srb�ina",
@@ -113,12 +114,14 @@
 	"lb": "luxembur�ina",
 	"mk": "macedón�ina",
 	"hu": "ma�ar�ina",
+	"mai": "maithil�ina",
 	"kde": "makonde",
 	"mgh": "makua-meetto",
 	"ml": "malajálam�ina",
 	"ms": "malaj�ina",
 	"mg": "malgaština",
 	"mt": "malt�ina",
+	"mni": "manípur�ina",
 	"mi": "maorij�ina",
 	"mr": "maráth�ina",
 	"mas": "masaj�ina",
@@ -140,6 +143,8 @@
 	"ne": "nepál�ina",
 	"nnh": "ngiemboon",
 	"jgo": "ngomba",
+	"pcm": "nigerijský pidžin",
+	"no": "nór�ina",
 	"nb": "nór�ina (bokmal)",
 	"nn": "nór�ina (nynorsk)",
 	"nus": "nuer",
@@ -164,6 +169,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santal�ina",
 	"seh": "sena",
 	"lrc": "severné luri",
 	"sd": "sindh�ina",
@@ -173,6 +180,7 @@
 	"xog": "soga",
 	"so": "somál�ina",
 	"sr": "srb�ina",
+	"su": "sund�ina",
 	"sw-CD": "svahil�ina (konžská)",
 	"sw": "swahil�ina",
 	"ksb": "Å¡ambala",
@@ -186,6 +194,7 @@
 	"shi": "tachelhit",
 	"dav": "taita",
 	"it": "talian�ina",
+	"tzm": "tamazight (stredomarocký)",
 	"ta": "tamil�ina",
 	"twq": "tasawaq",
 	"tt": "tatár�ina",
@@ -196,7 +205,6 @@
 	"ti": "tigriňa",
 	"to": "tong�ina",
 	"zgh": "tuareg�ina (marocká štandardná)",
-	"tzm": "tuareg�ina (stredomarocká)",
 	"tr": "ture�tina",
 	"tk": "turkmén�ina",
 	"ug": "ujgur�ina",
diff --git a/vendor/commerceguys/intl/resources/language/sl.json b/vendor/commerceguys/intl/resources/language/sl.json
index ca372cbaa..d67afee4d 100644
--- a/vendor/commerceguys/intl/resources/language/sl.json
+++ b/vendor/commerceguys/intl/resources/language/sl.json
@@ -5,7 +5,6 @@
 	"sq": "albanš�ina",
 	"am": "amharš�ina",
 	"en": "angleš�ina",
-	"en-GB": "angleš�ina (VB)",
 	"ar": "arabš�ina",
 	"hy": "armenš�ina",
 	"as": "asamš�ina",
@@ -26,12 +25,14 @@
 	"bg": "bolgarš�ina",
 	"bs": "bosanš�ina",
 	"br": "bretonš�ina",
+	"en-GB": "britanska angleš�ina",
 	"my": "burmanš�ina",
 	"ce": "�e�enš�ina",
 	"chr": "�erokeš�ina",
 	"cs": "�eš�ina",
 	"cgg": "�igajš�ina",
 	"da": "danš�ina",
+	"doi": "dogri",
 	"dsb": "dolnja lužiška srbš�ina",
 	"dua": "duala",
 	"dz": "dzonka",
@@ -58,7 +59,7 @@
 	"haw": "havajš�ina",
 	"ha": "havš�ina",
 	"he": "hebrejš�ina",
-	"hi": "hindujš�ina",
+	"hi": "hindijš�ina",
 	"hr": "hrvaš�ina",
 	"ig": "igboš�ina",
 	"smn": "inarska samijš�ina",
@@ -104,6 +105,7 @@
 	"lkt": "lakotš�ina",
 	"lag": "langijš�ina",
 	"lo": "laoš�ina",
+	"es-419": "latinskoameriška španš�ina",
 	"lv": "latvijš�ina",
 	"ln": "lingala",
 	"lt": "litovš�ina",
@@ -113,13 +115,15 @@
 	"luo": "Luo",
 	"jmc": "ma�amejš�ina",
 	"hu": "madžarš�ina",
+	"mai": "maitili",
 	"mk": "makedonš�ina",
 	"kde": "makondš�ina",
 	"mgh": "makuva-meto",
-	"mg": "malagaš�ina",
 	"ml": "malajalamš�ina",
 	"ms": "malajš�ina",
+	"mg": "malgaš�ina",
 	"mt": "malteš�ina",
+	"mni": "manipurš�ina",
 	"mi": "maorš�ina",
 	"mr": "maratš�ina",
 	"mas": "masajš�ina",
@@ -136,10 +140,12 @@
 	"ne": "nepalš�ina",
 	"nnh": "ngiemboonš�ina",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
 	"nds": "nizka nemš�ina",
 	"nds-NL": "nizka saš�ina",
 	"nl": "nizozemš�ina",
 	"nyn": "njankole",
+	"no": "norveš�ina",
 	"nn": "novonorveš�ina",
 	"nus": "nuerš�ina",
 	"or": "odijš�ina",
@@ -161,6 +167,8 @@
 	"saq": "samburš�ina",
 	"sg": "sango",
 	"sbp": "sangujš�ina",
+	"sa": "sanskrt",
+	"sat": "santalš�ina",
 	"ceb": "sebuanš�ina",
 	"ii": "se�uanska jiš�ina",
 	"seh": "sena",
@@ -176,12 +184,12 @@
 	"ckb": "soranska kurdš�ina",
 	"sr": "srbš�ina",
 	"zgh": "standardni maroški tamazig",
+	"su": "sundanš�ina",
 	"sw": "svahili",
 	"ksb": "Å¡ambala",
 	"gd": "škotska gelš�ina",
 	"sn": "šonš�ina",
 	"es": "španš�ina",
-	"es-419": "španš�ina (Latinska Amerika)",
 	"sv": "švedš�ina",
 	"fr-CH": "švicarska francoš�ina",
 	"tg": "tadžiš�ina",
diff --git a/vendor/commerceguys/intl/resources/language/so.json b/vendor/commerceguys/intl/resources/language/so.json
index ddf9ef1da..469ce3ad9 100644
--- a/vendor/commerceguys/intl/resources/language/so.json
+++ b/vendor/commerceguys/intl/resources/language/so.json
@@ -23,6 +23,7 @@
 	"be": "Beleruusiyaan",
 	"bem": "Bemba",
 	"bez": "Bena",
+	"pcm": "Bidjinka Nayjeeriya",
 	"br": "Biriton",
 	"brx": "Bodo",
 	"pl": "Boolish",
@@ -36,7 +37,9 @@
 	"jmc": "Chaga",
 	"he": "Cibraani",
 	"dz": "D’zongqa",
+	"mai": "Dadka Maithili",
 	"da": "Dhaanish",
+	"doi": "Dogri",
 	"dua": "Duaala",
 	"ee": "Eewe",
 	"ewo": "Eewondho",
@@ -48,6 +51,7 @@
 	"fr-CA": "Faransiiska Kanada",
 	"fo": "Farowsi",
 	"vi": "Fiitnaamays",
+	"fil": "Filibiino",
 	"fi": "Finishka",
 	"fy": "Firiisiyan Galbeed",
 	"fur": "Firiyuuliyaan",
@@ -140,6 +144,7 @@
 	"ml": "Malayalam",
 	"mt": "Maltiis",
 	"mn": "Mangooli",
+	"mni": "Maniburi",
 	"mas": "Masaay",
 	"mk": "Masadooniyaan",
 	"mzn": "Masanderaani",
@@ -151,6 +156,7 @@
 	"naq": "Nama",
 	"ne": "Nebaali",
 	"nb": "Noorwijiyaan Bokma",
+	"no": "Norwegian",
 	"nn": "Nowrwejiyan (naynoroski)",
 	"nus": "Nuweer",
 	"or": "Oodhiya",
@@ -169,6 +175,8 @@
 	"saq": "Sambuuru",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"dje": "Sarma",
 	"sw": "Sawaaxili",
 	"sw-CD": "Sawaaxili (Jamhuuriyadda Dimuquraadiga Kongo)",
@@ -188,11 +196,11 @@
 	"so": "Soomaali",
 	"dsb": "Soorbiyaanka Hoose",
 	"hsb": "Sorobiyaanka Sare",
+	"su": "Suudaaniis",
 	"sv": "Swiidhis",
 	"tg": "Taajik",
 	"tt": "Taatar",
 	"th": "Taaylandays",
-	"fil": "Tagalog",
 	"dav": "Taiita",
 	"it": "Talyaani",
 	"ta": "Tamiil",
diff --git a/vendor/commerceguys/intl/resources/language/sq.json b/vendor/commerceguys/intl/resources/language/sq.json
index 5b5ee3f22..98690526e 100644
--- a/vendor/commerceguys/intl/resources/language/sq.json
+++ b/vendor/commerceguys/intl/resources/language/sq.json
@@ -31,6 +31,7 @@
 	"chr": "çerokisht",
 	"cgg": "çigisht",
 	"da": "danisht",
+	"doi": "Dogri",
 	"dua": "dualaisht",
 	"ebu": "embuisht",
 	"et": "estonisht",
@@ -116,11 +117,13 @@
 	"lrc": "lurishte veriore",
 	"jmc": "maçamisht",
 	"mg": "madagaskarisht",
+	"mai": "maitilisht",
 	"kde": "makondisht",
 	"mgh": "makua-mitoisht",
 	"ml": "malajalamisht",
 	"ms": "malajisht",
 	"mt": "maltisht",
+	"mni": "manipurisht",
 	"mi": "maorisht",
 	"mk": "maqedonisht",
 	"mr": "maratisht",
@@ -138,6 +141,7 @@
 	"nnh": "ngiembunisht",
 	"jgo": "ngombisht",
 	"nyn": "niankolisht",
+	"no": "norvegjisht",
 	"nb": "norvegjishte letrare",
 	"nn": "norvegjishte nynorsk",
 	"nus": "nuerisht",
@@ -146,6 +150,7 @@
 	"os": "osetisht",
 	"ps": "pashtoisht",
 	"fa": "persisht",
+	"pcm": "pixhinishte nigeriane",
 	"pl": "polonisht",
 	"pt": "portugalisht",
 	"pt-PT": "portugalishte evropiane",
@@ -162,6 +167,8 @@
 	"se": "samishte veriore",
 	"sg": "sangoisht",
 	"sbp": "sanguisht",
+	"sa": "sanskritisht",
+	"sat": "santalisht",
 	"ceb": "sebuanisht",
 	"seh": "senaisht",
 	"ses": "senishte kojrabore",
@@ -181,6 +188,7 @@
 	"sw": "suahilisht",
 	"sw-CD": "suahilishte kongoleze",
 	"sv": "suedisht",
+	"su": "sundanisht",
 	"ksb": "shambalisht",
 	"sn": "shonisht",
 	"sq": "shqip",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Cyrl-BA.json b/vendor/commerceguys/intl/resources/language/sr-Cyrl-BA.json
index 5aed917b3..0448510d2 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Cyrl-BA.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Cyrl-BA.json
@@ -8,6 +8,7 @@
 	"as": "а�ам�ки",
 	"ast": "а�туриј�ки",
 	"asa": "а�у",
+	"de-AT": "ау�триј�ки немачки",
 	"af": "африкан�",
 	"bm": "бамананкан",
 	"bn": "бангла",
@@ -38,6 +39,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"dsb": "доњолужичко�рп�ки",
 	"dua": "дуала",
 	"ee": "еве",
@@ -103,6 +105,7 @@
 	"luo": "луо",
 	"hu": "мађар�ки",
 	"mzn": "мазандеран�ки",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -110,6 +113,7 @@
 	"ms": "малај�ки",
 	"mg": "малгашки",
 	"mt": "малтешки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ај�ки",
@@ -123,15 +127,17 @@
 	"naq": "нама",
 	"nnh": "нгиембун",
 	"jgo": "нгомба",
-	"de": "немачки",
-	"de-AT": "немачки (�у�трија)",
 	"ne": "непал�ки",
-	"nds": "ни�конемачки",
+	"pcm": "нигериј�ки пиџин",
+	"nds": "ни�коњемачки",
 	"nds-NL": "ни�ко�ак�он�ки",
+	"no": "норвешки",
 	"nb": "норвешки букмол",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
 	"nyn": "њанколе",
+	"de": "њемачки",
+	"gsw": "њемачки (Швајцар�ка)",
 	"or": "одија",
 	"om": "оромо",
 	"os": "о�етин�ки",
@@ -150,22 +156,25 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"sw": "�вахили",
 	"ceb": "�ебуан�ки",
-	"lrc": "�еверни лури",
-	"nd": "�еверни ндебеле",
-	"se": "�еверни �ами",
 	"seh": "�ена",
 	"ii": "�ечуан�ки ји",
 	"sd": "�инди",
 	"si": "�инхал�ки",
+	"lrc": "�јеверни лури",
+	"nd": "�јеверни ндебеле",
+	"se": "�јеверни �ами",
 	"sk": "�ловачки",
 	"sl": "�ловеначки",
 	"xog": "�ога",
 	"so": "�омал�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандардни марокан�ки тамашек",
+	"su": "�ундан�ки",
 	"dav": "таита",
 	"th": "тај�ки",
 	"ta": "тамил�ки",
@@ -209,7 +218,6 @@
 	"dz": "џонга",
 	"ksb": "шамбала",
 	"de-CH": "швајцар�ки ви�оки немачки",
-	"gsw": "швајцар�ки немачки",
 	"sv": "швед�ки",
 	"gd": "шкот�ки гел�ки",
 	"sn": "шона",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Cyrl-ME.json b/vendor/commerceguys/intl/resources/language/sr-Cyrl-ME.json
index fc41c4fbf..4d9451457 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Cyrl-ME.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Cyrl-ME.json
@@ -8,6 +8,7 @@
 	"as": "а�ам�ки",
 	"ast": "а�туриј�ки",
 	"asa": "а�у",
+	"de-AT": "ау�триј�ки немачки",
 	"af": "африкан�",
 	"bm": "бамананкан",
 	"bn": "бангла",
@@ -38,6 +39,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"dsb": "доњолужичко�рп�ки",
 	"dua": "дуала",
 	"ee": "еве",
@@ -103,6 +105,7 @@
 	"luo": "луо",
 	"hu": "мађар�ки",
 	"mzn": "мазандеран�ки",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -110,6 +113,7 @@
 	"ms": "малај�ки",
 	"mg": "малгашки",
 	"mt": "малтешки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ај�ки",
@@ -124,11 +128,12 @@
 	"nnh": "нгиембун",
 	"jgo": "нгомба",
 	"de": "немачки",
-	"de-AT": "немачки (�у�трија)",
 	"gsw": "немачки (Швајцар�ка)",
 	"ne": "непал�ки",
+	"pcm": "нигериј�ки пиџин",
 	"nds": "ни�конемачки",
 	"nds-NL": "ни�ко�ак�он�ки",
+	"no": "норвешки",
 	"nb": "норвешки букмол",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
@@ -151,6 +156,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"sw": "�вахили",
 	"ceb": "�ебуан�ки",
@@ -167,6 +174,7 @@
 	"so": "�омал�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандардни марокан�ки тамашек",
+	"su": "�ундан�ки",
 	"dav": "таита",
 	"th": "тај�ки",
 	"ta": "тамил�ки",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Cyrl-XK.json b/vendor/commerceguys/intl/resources/language/sr-Cyrl-XK.json
index 8bb5363d2..4383b6a7e 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Cyrl-XK.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Cyrl-XK.json
@@ -8,6 +8,7 @@
 	"as": "а�ам�ки",
 	"ast": "а�туриј�ки",
 	"asa": "а�у",
+	"de-AT": "ау�триј�ки немачки",
 	"af": "африкан�",
 	"bm": "бамананкан",
 	"bn": "бангла",
@@ -38,6 +39,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"dsb": "доњолужичко�рп�ки",
 	"dua": "дуала",
 	"ee": "еве",
@@ -103,6 +105,7 @@
 	"luo": "луо",
 	"hu": "мађар�ки",
 	"mzn": "мазандеран�ки",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -110,6 +113,7 @@
 	"ms": "малај�ки",
 	"mg": "малгашки",
 	"mt": "малтешки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ај�ки",
@@ -124,10 +128,11 @@
 	"nnh": "нгиембун",
 	"jgo": "нгомба",
 	"de": "немачки",
-	"de-AT": "немачки (�у�трија)",
 	"ne": "непал�ки",
+	"pcm": "нигериј�ки пиџин",
 	"nds": "ни�конемачки",
 	"nds-NL": "ни�ко�ак�он�ки",
+	"no": "норвешки",
 	"nb": "норвешки букмол",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
@@ -150,6 +155,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"sw": "�вахили",
 	"ceb": "�ебуан�ки",
@@ -166,6 +173,7 @@
 	"so": "�омал�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандардни марокан�ки тамашек",
+	"su": "�ундан�ки",
 	"dav": "таита",
 	"th": "тај�ки",
 	"ta": "тамил�ки",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Latn-BA.json b/vendor/commerceguys/intl/resources/language/sr-Latn-BA.json
index 224715dbe..0fe4e7dd2 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Latn-BA.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Latn-BA.json
@@ -8,6 +8,7 @@
 	"as": "asamski",
 	"ast": "asturijski",
 	"asa": "asu",
+	"de-AT": "austrijski nema�ki",
 	"az": "azerbejdžanski",
 	"ksf": "bafija",
 	"bm": "bamanankan",
@@ -29,6 +30,7 @@
 	"cs": "�eški",
 	"cgg": "�iga",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�kosrpski",
 	"dua": "duala",
 	"dyo": "džola fonji",
@@ -116,6 +118,7 @@
 	"luo": "Luo",
 	"jmc": "ma�ame",
 	"hu": "mađarski",
+	"mai": "maitili",
 	"mk": "makedonski",
 	"kde": "makonde",
 	"mgh": "makuva-mito",
@@ -123,6 +126,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipurski",
 	"mi": "maorski",
 	"mr": "marati",
 	"mas": "masajski",
@@ -134,17 +138,19 @@
 	"mfe": "morisjen",
 	"mua": "mundang",
 	"naq": "nama",
-	"de": "nema�ki",
-	"de-AT": "nema�ki (Austrija)",
 	"ne": "nepalski",
 	"nnh": "ngiembun",
 	"jgo": "ngomba",
-	"nds": "niskonema�ki",
+	"pcm": "nigerijski pidžin",
+	"nds": "niskonjema�ki",
 	"nds-NL": "niskosaksonski",
+	"no": "norveški",
 	"nb": "norveški bukmol",
 	"nn": "norveški ninorsk",
 	"nus": "nuer",
 	"nyn": "njankole",
+	"de": "njema�ki",
+	"gsw": "njema�ki (Švajcarska)",
 	"or": "odija",
 	"om": "oromo",
 	"os": "osetinski",
@@ -164,20 +170,23 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"ceb": "sebuanski",
 	"ii": "se�uanski ji",
 	"seh": "sena",
-	"lrc": "severni luri",
-	"nd": "severni ndebele",
-	"se": "severni sami",
 	"sd": "sindi",
 	"si": "sinhalski",
+	"lrc": "sjeverni luri",
+	"nd": "sjeverni ndebele",
+	"se": "sjeverni sami",
 	"sk": "slova�ki",
 	"sl": "slovena�ki",
 	"xog": "soga",
 	"so": "somalski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamašek",
+	"su": "sundanski",
 	"sw": "svahili",
 	"ksb": "Å¡ambala",
 	"gd": "Å¡kotski gelski",
@@ -185,7 +194,6 @@
 	"es": "Å¡panski",
 	"es-419": "Å¡panski (Latinska Amerika)",
 	"es-MX": "Å¡panski (Meksiko)",
-	"gsw": "švajcarski nema�ki",
 	"de-CH": "švajcarski visoki nema�ki",
 	"sv": "Å¡vedski",
 	"tg": "tadži�ki",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Latn-ME.json b/vendor/commerceguys/intl/resources/language/sr-Latn-ME.json
index 578b9876e..b9758e1c7 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Latn-ME.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Latn-ME.json
@@ -8,6 +8,7 @@
 	"as": "asamski",
 	"ast": "asturijski",
 	"asa": "asu",
+	"de-AT": "austrijski nema�ki",
 	"az": "azerbejdžanski",
 	"ksf": "bafija",
 	"bm": "bamanankan",
@@ -29,6 +30,7 @@
 	"cs": "�eški",
 	"cgg": "�iga",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�kosrpski",
 	"dua": "duala",
 	"dyo": "džola fonji",
@@ -116,6 +118,7 @@
 	"luo": "Luo",
 	"jmc": "ma�ame",
 	"hu": "mađarski",
+	"mai": "maitili",
 	"mk": "makedonski",
 	"kde": "makonde",
 	"mgh": "makuva-mito",
@@ -123,6 +126,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipurski",
 	"mi": "maorski",
 	"mr": "marati",
 	"mas": "masajski",
@@ -135,13 +139,14 @@
 	"mua": "mundang",
 	"naq": "nama",
 	"de": "nema�ki",
-	"de-AT": "nema�ki (Austrija)",
 	"gsw": "nema�ki (Švajcarska)",
 	"ne": "nepalski",
 	"nnh": "ngiembun",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
 	"nds": "niskonema�ki",
 	"nds-NL": "niskosaksonski",
+	"no": "norveški",
 	"nb": "norveški bukmol",
 	"nn": "norveški ninorsk",
 	"nus": "nuer",
@@ -165,6 +170,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"ceb": "sebuanski",
 	"ii": "se�uanski ji",
 	"seh": "sena",
@@ -179,6 +186,7 @@
 	"so": "somalski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamašek",
+	"su": "sundanski",
 	"sw": "svahili",
 	"ksb": "Å¡ambala",
 	"gd": "Å¡kotski gelski",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Latn-XK.json b/vendor/commerceguys/intl/resources/language/sr-Latn-XK.json
index 80bdc29d1..05d0d19ba 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Latn-XK.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Latn-XK.json
@@ -8,6 +8,7 @@
 	"as": "asamski",
 	"ast": "asturijski",
 	"asa": "asu",
+	"de-AT": "austrijski nema�ki",
 	"az": "azerbejdžanski",
 	"ksf": "bafija",
 	"bm": "bamanankan",
@@ -29,6 +30,7 @@
 	"cs": "�eški",
 	"cgg": "�iga",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�kosrpski",
 	"dua": "duala",
 	"dyo": "džola fonji",
@@ -116,6 +118,7 @@
 	"luo": "Luo",
 	"jmc": "ma�ame",
 	"hu": "mađarski",
+	"mai": "maitili",
 	"mk": "makedonski",
 	"kde": "makonde",
 	"mgh": "makuva-mito",
@@ -123,6 +126,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipurski",
 	"mi": "maorski",
 	"mr": "marati",
 	"mas": "masajski",
@@ -135,12 +139,13 @@
 	"mua": "mundang",
 	"naq": "nama",
 	"de": "nema�ki",
-	"de-AT": "nema�ki (Austrija)",
 	"ne": "nepalski",
 	"nnh": "ngiembun",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
 	"nds": "niskonema�ki",
 	"nds-NL": "niskosaksonski",
+	"no": "norveški",
 	"nb": "norveški bukmol",
 	"nn": "norveški ninorsk",
 	"nus": "nuer",
@@ -164,6 +169,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"ceb": "sebuanski",
 	"ii": "se�uanski ji",
 	"seh": "sena",
@@ -178,6 +185,7 @@
 	"so": "somalski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamašek",
+	"su": "sundanski",
 	"sw": "svahili",
 	"ksb": "Å¡ambala",
 	"gd": "Å¡kotski gelski",
diff --git a/vendor/commerceguys/intl/resources/language/sr-Latn.json b/vendor/commerceguys/intl/resources/language/sr-Latn.json
index 86f0005ed..dd843aa7a 100644
--- a/vendor/commerceguys/intl/resources/language/sr-Latn.json
+++ b/vendor/commerceguys/intl/resources/language/sr-Latn.json
@@ -8,6 +8,7 @@
 	"as": "asamski",
 	"ast": "asturijski",
 	"asa": "asu",
+	"de-AT": "austrijski nema�ki",
 	"az": "azerbejdžanski",
 	"ksf": "bafija",
 	"bm": "bambara",
@@ -29,6 +30,7 @@
 	"cs": "�eški",
 	"cgg": "�iga",
 	"da": "danski",
+	"doi": "dogri",
 	"dsb": "donjoluži�kosrpski",
 	"dua": "duala",
 	"dyo": "džola fonji",
@@ -114,6 +116,7 @@
 	"luo": "Luo",
 	"jmc": "ma�ame",
 	"hu": "mađarski",
+	"mai": "maitili",
 	"mk": "makedonski",
 	"kde": "makonde",
 	"mgh": "makuva-mito",
@@ -121,6 +124,7 @@
 	"ms": "malajski",
 	"mg": "malgaški",
 	"mt": "malteški",
+	"mni": "manipurski",
 	"mi": "maorski",
 	"mr": "marati",
 	"mas": "masajski",
@@ -133,13 +137,14 @@
 	"mua": "mundang",
 	"naq": "nama",
 	"de": "nema�ki",
-	"de-AT": "nema�ki (Austrija)",
 	"gsw": "nema�ki (Švajcarska)",
 	"ne": "nepalski",
 	"nnh": "ngiembun",
 	"jgo": "ngomba",
+	"pcm": "nigerijski pidžin",
 	"nds": "niskonema�ki",
 	"nds-NL": "niskosaksonski",
+	"no": "norveški",
 	"nb": "norveški bukmol",
 	"nn": "norveški ninorsk",
 	"nus": "nuer",
@@ -163,6 +168,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"ceb": "sebuanski",
 	"ii": "se�uanski ji",
 	"seh": "sena",
@@ -177,6 +184,7 @@
 	"so": "somalski",
 	"sr": "srpski",
 	"zgh": "standardni marokanski tamazigt",
+	"su": "sundanski",
 	"sw": "svahili",
 	"ksb": "Å¡ambala",
 	"gd": "Å¡kotski gelski",
diff --git a/vendor/commerceguys/intl/resources/language/sr.json b/vendor/commerceguys/intl/resources/language/sr.json
index f767ba0e9..aab97bfdc 100644
--- a/vendor/commerceguys/intl/resources/language/sr.json
+++ b/vendor/commerceguys/intl/resources/language/sr.json
@@ -8,6 +8,7 @@
 	"as": "а�ам�ки",
 	"ast": "а�туриј�ки",
 	"asa": "а�у",
+	"de-AT": "ау�триј�ки немачки",
 	"af": "африкан�",
 	"bm": "бамбара",
 	"bas": "ба�а",
@@ -38,6 +39,7 @@
 	"guz": "гу�и",
 	"gu": "гуџарати",
 	"da": "дан�ки",
+	"doi": "догри",
 	"dsb": "доњолужичко�рп�ки",
 	"dua": "дуала",
 	"ee": "еве",
@@ -102,6 +104,7 @@
 	"luo": "луо",
 	"hu": "мађар�ки",
 	"mzn": "мазандеран�ки",
+	"mai": "маитили",
 	"mk": "македон�ки",
 	"kde": "маконде",
 	"mgh": "макува-мито",
@@ -109,6 +112,7 @@
 	"ms": "малај�ки",
 	"mg": "малгашки",
 	"mt": "малтешки",
+	"mni": "манипур�ки",
 	"mi": "маор�ки",
 	"mr": "марати",
 	"mas": "ма�ај�ки",
@@ -123,11 +127,12 @@
 	"nnh": "нгиембун",
 	"jgo": "нгомба",
 	"de": "немачки",
-	"de-AT": "немачки (�у�трија)",
 	"gsw": "немачки (Швајцар�ка)",
 	"ne": "непал�ки",
+	"pcm": "нигериј�ки пиџин",
 	"nds": "ни�конемачки",
 	"nds-NL": "ни�ко�ак�он�ки",
+	"no": "норвешки",
 	"nb": "норвешки букмол",
 	"nn": "норвешки нинор�к",
 	"nus": "нуер",
@@ -150,6 +155,8 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"sw": "�вахили",
 	"ceb": "�ебуан�ки",
@@ -166,6 +173,7 @@
 	"so": "�омал�ки",
 	"sr": "�рп�ки",
 	"zgh": "�тандардни марокан�ки тамазигт",
+	"su": "�ундан�ки",
 	"dav": "таита",
 	"th": "тај�ки",
 	"ta": "тамил�ки",
diff --git a/vendor/commerceguys/intl/resources/language/sv.json b/vendor/commerceguys/intl/resources/language/sv.json
index 3d5df7ce8..9fabdb92b 100644
--- a/vendor/commerceguys/intl/resources/language/sv.json
+++ b/vendor/commerceguys/intl/resources/language/sv.json
@@ -31,6 +31,7 @@
 	"chr": "cherokesiska",
 	"cgg": "chiga",
 	"da": "danska",
+	"doi": "dogri",
 	"dua": "duala",
 	"dz": "dzongkha",
 	"ebu": "embu",
@@ -49,7 +50,6 @@
 	"fo": "färöiska",
 	"zh-Hans": "förenklad kinesiska",
 	"gl": "galiciska",
-	"ses": "Gao-songhai",
 	"ka": "georgiska",
 	"el": "grekiska",
 	"kl": "grönländska",
@@ -112,6 +112,7 @@
 	"nds-NL": "lågsaxiska",
 	"dsb": "lågsorbiska",
 	"nds": "lågtyska",
+	"mai": "maithili",
 	"mk": "makedonska",
 	"mgh": "makhuwa-meetto",
 	"kde": "makonde",
@@ -119,6 +120,7 @@
 	"ms": "malajiska",
 	"ml": "malayalam",
 	"mt": "maltesiska",
+	"mni": "manipuri",
 	"mi": "maori",
 	"mr": "marathi",
 	"zgh": "marockansk standard-tamazight",
@@ -136,9 +138,11 @@
 	"nl": "nederländska",
 	"ne": "nepalesiska",
 	"jgo": "ngomba",
+	"pcm": "nigeriansk pidgin",
 	"lrc": "nordluri",
 	"nd": "nordndebele",
 	"se": "nordsamiska",
+	"no": "norska",
 	"nb": "norskt bokmål",
 	"nus": "nuer",
 	"nyn": "nyankole",
@@ -160,6 +164,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"gsw": "schweizertyska",
 	"fr-CH": "schweizisk franska",
 	"de-CH": "schweizisk högtyska",
@@ -172,8 +178,10 @@
 	"sk": "slovakiska",
 	"sl": "slovenska",
 	"so": "somaliska",
+	"ses": "songhai",
 	"ckb": "soranisk kurdiska",
 	"es": "spanska",
+	"su": "sundanesiska",
 	"sv": "svenska",
 	"sw": "swahili",
 	"ii": "szezuan i",
diff --git a/vendor/commerceguys/intl/resources/language/sw-CD.json b/vendor/commerceguys/intl/resources/language/sw-CD.json
index 30dbd2c6c..4090449fc 100644
--- a/vendor/commerceguys/intl/resources/language/sw-CD.json
+++ b/vendor/commerceguys/intl/resources/language/sw-CD.json
@@ -1,4 +1,5 @@
 {
+	"doi": "Dogri",
 	"af": "Kiafrikana",
 	"agq": "Kiaghem",
 	"fa": "Kiajemi",
@@ -99,10 +100,11 @@
 	"ky": "Kikirigizi",
 	"guz": "Kikisii",
 	"kok": "Kikonkani",
+	"hr": "Kikorasia",
 	"ko": "Kikorea",
 	"kw": "Kikorni",
 	"khq": "Kikoyra Chiini",
-	"hr": "Kikroeshia",
+	"ses": "Kikoyraboro Senni",
 	"ku": "Kikurdi",
 	"ckb": "Kikurdi cha Sorani",
 	"nmg": "Kikwasio",
@@ -117,12 +119,14 @@
 	"lrc": "Kiluri cha Kaskazini",
 	"mas": "Kimaasai",
 	"jmc": "Kimachame",
+	"mai": "Kimaithili",
 	"mgh": "Kimakhuwa-Meetto",
 	"kde": "Kimakonde",
 	"mg": "Kimalagasi",
 	"ml": "Kimalayalamu",
 	"ms": "Kimalei",
 	"mt": "Kimalta",
+	"mni": "Kimanipuri",
 	"mi": "Kimaori",
 	"mr": "Kimarathi",
 	"mk": "Kimasedonia",
@@ -138,6 +142,7 @@
 	"ne": "Kinepali",
 	"nnh": "Kingiemboon",
 	"jgo": "Kingomba",
+	"no": "Kinorwe",
 	"nb": "Kinorwe cha Bokmal",
 	"nn": "Kinorwe cha Nynorsk",
 	"nus": "Kinuer",
@@ -166,6 +171,8 @@
 	"se": "Kisami cha Kaskazini",
 	"sg": "Kisango",
 	"sbp": "Kisangu",
+	"sa": "Kisanskriti",
+	"sat": "Kisantali",
 	"seh": "Kisena",
 	"sr": "Kiserbia",
 	"sn": "Kishona",
@@ -177,6 +184,7 @@
 	"hsb": "Kisobia cha Ukanda wa Juu",
 	"xog": "Kisoga",
 	"so": "Kisomali",
+	"su": "Kisunda",
 	"sw": "Kiswahili",
 	"sw-CD": "Kiswahili (Jamhuri ya Kidemokrasia ya Kongo)",
 	"sv": "Kiswidi",
@@ -185,7 +193,7 @@
 	"tg": "Kitajiki",
 	"tzm": "Kitamazighati cha Atlasi ya Kati",
 	"ta": "Kitamili",
-	"twq": "Kitasawaq",
+	"twq": "Kitasawak",
 	"tt": "Kitatari",
 	"te": "Kitelugu",
 	"teo": "Kiteso",
@@ -214,6 +222,6 @@
 	"dje": "Kizarma",
 	"dz": "Kizongkha",
 	"zu": "Kizulu",
-	"ses": "Koyraboro Senni",
-	"rwk": "Lugha ya Rwa"
+	"rwk": "Lugha ya Rwa",
+	"pcm": "Pijini ya Nijeria"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/sw-KE.json b/vendor/commerceguys/intl/resources/language/sw-KE.json
index 1ec174675..fd5a91a11 100644
--- a/vendor/commerceguys/intl/resources/language/sw-KE.json
+++ b/vendor/commerceguys/intl/resources/language/sw-KE.json
@@ -1,4 +1,5 @@
 {
+	"doi": "Dogri",
 	"af": "Kiafrikana",
 	"agq": "Kiaghem",
 	"fa": "Kiajemi",
@@ -98,11 +99,11 @@
 	"ki": "Kikikuyu",
 	"guz": "Kikisii",
 	"kok": "Kikonkani",
+	"hr": "Kikorasia",
 	"ko": "Kikorea",
 	"kw": "Kikorni",
 	"ses": "Kikoyraborosenni",
 	"khq": "Kikoyrachiini",
-	"hr": "Kikroeshia",
 	"ku": "Kikurdi",
 	"ckb": "Kikurdi cha Sorani",
 	"nmg": "Kikwasio",
@@ -119,12 +120,14 @@
 	"lrc": "Kiluri cha Kaskazini",
 	"mas": "Kimaasai",
 	"jmc": "Kimachame",
+	"mai": "Kimaithili",
 	"mgh": "Kimakhuwa-Meetto",
 	"kde": "Kimakonde",
 	"mg": "Kimalagasi",
 	"ml": "Kimalayalamu",
 	"ms": "Kimalei",
 	"mt": "Kimalta",
+	"mni": "Kimanipuri",
 	"mi": "Kimaori",
 	"mr": "Kimarathi",
 	"mk": "Kimasedonia",
@@ -139,6 +142,7 @@
 	"nd": "Kindebele cha Kaskazini",
 	"ne": "Kinepali",
 	"jgo": "Kingomba",
+	"no": "Kinorwe",
 	"nb": "Kinorwe cha Bokmal",
 	"nn": "Kinorwe cha Nynorsk",
 	"nus": "Kinuer",
@@ -148,6 +152,7 @@
 	"om": "Kioromo",
 	"os": "Kiosetia",
 	"ps": "Kipashto",
+	"pcm": "Kipijini cha Nigeria",
 	"pl": "Kipolandi",
 	"pa": "Kipunjabi",
 	"pt": "Kireno",
@@ -166,6 +171,8 @@
 	"se": "Kisami cha Kaskazini",
 	"sg": "Kisango",
 	"sbp": "Kisangu",
+	"sa": "Kisanskriti",
+	"sat": "Kisantali",
 	"seh": "Kisena",
 	"sr": "Kiserbia",
 	"sn": "Kishona",
@@ -177,6 +184,7 @@
 	"xog": "Kisoga",
 	"so": "Kisomali",
 	"hsb": "Kisorbia cha Juu",
+	"su": "Kisunda",
 	"sw": "Kiswahili",
 	"sw-CD": "Kiswahili cha Kongo",
 	"sv": "Kiswidi",
diff --git a/vendor/commerceguys/intl/resources/language/sw.json b/vendor/commerceguys/intl/resources/language/sw.json
index 9aadf5e34..24ffb1d29 100644
--- a/vendor/commerceguys/intl/resources/language/sw.json
+++ b/vendor/commerceguys/intl/resources/language/sw.json
@@ -1,4 +1,5 @@
 {
+	"doi": "Dogri",
 	"af": "Kiafrikana",
 	"agq": "Kiaghem",
 	"fa": "Kiajemi",
@@ -97,9 +98,11 @@
 	"ki": "Kikikuyu",
 	"guz": "Kikisii",
 	"kok": "Kikonkani",
+	"hr": "Kikorasia",
 	"ko": "Kikorea",
 	"kw": "Kikorni",
-	"hr": "Kikroeshia",
+	"khq": "Kikoyra Chiini",
+	"ses": "Kikoyraboro Senni",
 	"ku": "Kikurdi",
 	"ckb": "Kikurdi cha Sorani",
 	"nmg": "Kikwasio",
@@ -116,12 +119,14 @@
 	"mas": "Kimaasai",
 	"mk": "Kimacedonia",
 	"jmc": "Kimachame",
+	"mai": "Kimaithili",
 	"mgh": "Kimakhuwa-Meetto",
 	"kde": "Kimakonde",
 	"mg": "Kimalagasi",
 	"ml": "Kimalayalamu",
 	"ms": "Kimalei",
 	"mt": "Kimalta",
+	"mni": "Kimanipuri",
 	"mi": "Kimaori",
 	"mr": "Kimarathi",
 	"mzn": "Kimazanderani",
@@ -135,6 +140,7 @@
 	"nd": "Kindebele cha Kaskazini",
 	"ne": "Kinepali",
 	"jgo": "Kingomba",
+	"no": "Kinorwe",
 	"nb": "Kinorwe cha Bokmal",
 	"nn": "Kinorwe cha Nynorsk",
 	"nus": "Kinuer",
@@ -163,6 +169,8 @@
 	"se": "Kisami cha Kaskazini",
 	"sg": "Kisango",
 	"sbp": "Kisangu",
+	"sa": "Kisanskriti",
+	"sat": "Kisantali",
 	"seh": "Kisena",
 	"sr": "Kiserbia",
 	"sn": "Kishona",
@@ -174,6 +182,7 @@
 	"hsb": "Kisobia cha Ukanda wa Juu",
 	"xog": "Kisoga",
 	"so": "Kisomali",
+	"su": "Kisunda",
 	"sw": "Kiswahili",
 	"sw-CD": "Kiswahili (Jamhuri ya Kidemokrasia ya Kongo)",
 	"sv": "Kiswidi",
@@ -182,7 +191,7 @@
 	"tg": "Kitajiki",
 	"tzm": "Kitamazighati cha Atlasi ya Kati",
 	"ta": "Kitamili",
-	"twq": "Kitasawaq",
+	"twq": "Kitasawak",
 	"tt": "Kitatari",
 	"te": "Kitelugu",
 	"teo": "Kiteso",
@@ -211,9 +220,8 @@
 	"dje": "Kizarma",
 	"dz": "Kizongkha",
 	"zu": "Kizulu",
-	"khq": "Koyra Chiini",
-	"ses": "Koyraboro Senni",
 	"kkj": "Lugha ya Kako",
 	"nnh": "Lugha ya Ngiemboon",
-	"rwk": "Lugha ya Rwa"
+	"rwk": "Lugha ya Rwa",
+	"pcm": "Pijini ya Nigeria"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ta.json b/vendor/commerceguys/intl/resources/language/ta.json
index 9fb23e594..8a0c065ef 100644
--- a/vendor/commerceguys/intl/resources/language/ta.json
+++ b/vendor/commerceguys/intl/resources/language/ta.json
@@ -78,12 +78,15 @@
 	"sah": "சக�கா",
 	"sbp": "சங�க�",
 	"saq": "சம�ப�ர�",
+	"sa": "சமஸ�கிர�தம�",
 	"sg": "சாங�கோ",
+	"sat": "சான�டாலி",
 	"cgg": "சிகா",
 	"si": "சிங�களம�",
 	"ii": "சிச�வான� ஈ",
 	"sd": "சிந�தி",
 	"zh": "சீனம�",
+	"su": "ச�ண�டானீஸ�",
 	"cs": "செக�",
 	"ce": "செச�சென�",
 	"ceb": "செப�வானோ",
@@ -100,6 +103,7 @@
 	"teo": "டெசோ",
 	"da": "டேனிஷ�",
 	"dav": "டைடா",
+	"doi": "டோக�ரி",
 	"to": "டோங�கான�",
 	"shi": "தசேஹித�",
 	"ta": "தமிழ�",
@@ -111,12 +115,14 @@
 	"te": "தெல�ங�க�",
 	"jgo": "நகொம�பா",
 	"naq": "நாமா",
+	"no": "நார�வேஜியன�",
 	"nn": "நார�வேஜியன� நியூநார�ஸ�க�",
 	"nb": "நார�வேஜியன� பொக�மால�",
 	"nyn": "நியான�கோலே",
 	"nus": "நியூர�",
 	"nnh": "நெகெய�ம�பூன�",
 	"ne": "நேபாளி",
+	"pcm": "நைஜீரியன� பிட�கின�",
 	"pa": "பஞ�சாபி",
 	"bm": "பம�பாரா",
 	"my": "பர�மீஸ�",
@@ -142,6 +148,7 @@
 	"kde": "மகொண�டே",
 	"mn": "மங�கோலியன�",
 	"mzn": "மசந�தேரனி",
+	"mni": "மணிப�ப�ரி",
 	"tzm": "மத�திய அட�லஸ� டமசைட�",
 	"ckb": "மத�திய க�ர�திஷ�",
 	"mr": "மராத�தி",
@@ -157,6 +164,7 @@
 	"mer": "மெர�",
 	"mgo": "மேடா",
 	"fy": "மேற�க� ஃப�ரிஷியன�",
+	"mai": "மைதிலி",
 	"mfe": "மொரிசியன�",
 	"ro-MD": "மோல�டாவியன�",
 	"mi": "மௌரி",
diff --git a/vendor/commerceguys/intl/resources/language/te.json b/vendor/commerceguys/intl/resources/language/te.json
index 55161daa6..6436d4036 100644
--- a/vendor/commerceguys/intl/resources/language/te.json
+++ b/vendor/commerceguys/intl/resources/language/te.json
@@ -8,12 +8,12 @@
 	"sq": "అల�బేనియన�",
 	"asa": "అస�",
 	"as": "అస�సామీస�",
-	"en": "ఆంగ�లం",
 	"af": "ఆఫ�రికాన�స�",
 	"hy": "ఆర�మేనియన�",
 	"ast": "ఆస�టూరియన�",
 	"de-AT": "ఆస�ట�రియన� జర�మన�",
 	"en-AU": "ఆస�ట�రేలియన� ఇంగ�లీష�",
+	"en": "ఇంగ�లీష�",
 	"id": "ఇండోనేషియన�",
 	"ebu": "ఇంబ�",
 	"ig": "ఇగ�బో",
@@ -70,11 +70,11 @@
 	"guz": "గ�స�సీ",
 	"jgo": "గోంబా",
 	"el": "గ�రీక�",
+	"cgg": "à°šà°¿à°—à°¾",
 	"cs": "చెక�",
 	"ce": "చెచెన�",
 	"chr": "చెరోకీ",
 	"zh": "చైనీస�",
-	"cgg": "ఛిగా",
 	"ja": "జపనీస�",
 	"de": "జర�మన�",
 	"ka": "జార�జియన�",
@@ -94,6 +94,7 @@
 	"dav": "టైటా",
 	"nl": "డచ�",
 	"da": "డానిష�",
+	"doi": "డోగ�రి",
 	"dua": "డ�యూలా",
 	"tg": "తజిక�",
 	"ta": "తమిళమ�",
@@ -101,9 +102,11 @@
 	"te": "తెల�గ�",
 	"th": "థాయ�",
 	"naq": "నమ",
+	"no": "నార�వేజియన�",
 	"nb": "నార�వేజియన� బొక�మాల�",
 	"nn": "నార�వేజియాన� న�యోర�స�క�",
 	"ne": "నేపాలి",
+	"pcm": "నైజీరియా పిడ�గిన�",
 	"nyn": "న�యాన�కోలె",
 	"nus": "న�య�ర�",
 	"pa": "పంజాబీ",
@@ -139,6 +142,7 @@
 	"kde": "మకొండే",
 	"jmc": "మకొమ�",
 	"mgh": "మక�వా-మిట�టో",
+	"mni": "మణిప�రి",
 	"mr": "మరాఠీ",
 	"mg": "మలగాసి",
 	"ml": "మలయాళం",
@@ -151,6 +155,7 @@
 	"es-MX": "మెక�సికన� స�పానిష�",
 	"mgo": "మెటా",
 	"mer": "మెర�",
+	"mai": "మైథిలి",
 	"mfe": "మొరిస�యేన�",
 	"ro-MD": "మొల�డావియన�",
 	"yav": "యాంగ�‌బెన�",
@@ -187,7 +192,10 @@
 	"ii": "శిష�వన� ఈ",
 	"sn": "షోన",
 	"xh": "షోసా",
+	"su": "సండానీస�",
+	"sat": "సంతాలి",
 	"saq": "సంబ�ర�",
+	"sa": "సంస�కృతం",
 	"zh-Hans": "సరళీకృత చైనీస�",
 	"sbp": "సాంగ�",
 	"sg": "సాంగో",
diff --git a/vendor/commerceguys/intl/resources/language/tg.json b/vendor/commerceguys/intl/resources/language/tg.json
index 971200802..56d600e88 100644
--- a/vendor/commerceguys/intl/resources/language/tg.json
+++ b/vendor/commerceguys/intl/resources/language/tg.json
@@ -13,6 +13,7 @@
 	"cgg": "Chiga",
 	"ksh": "Colognian",
 	"kw": "Cornish",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"ebu": "Embu",
 	"ee": "Ewe",
@@ -40,6 +41,7 @@
 	"luo": "Luo",
 	"luy": "Luyia",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
 	"mas": "Masai",
@@ -52,6 +54,7 @@
 	"nds-NL": "nds (�идерланди�)",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nigerian Pidgin",
 	"nd": "North Ndebele",
 	"lrc": "Northern Luri",
 	"nb": "Norwegian Bokmål",
@@ -71,6 +74,7 @@
 	"ii": "Sichuan Yi",
 	"xog": "Soga",
 	"zgh": "Standard Moroccan Tamazight",
+	"su": "Sundanese",
 	"sw-CD": "sw (CD)",
 	"sw": "Swahili",
 	"gsw": "Swiss German",
@@ -148,6 +152,7 @@
 	"ms": "малайӣ",
 	"ml": "мала�ламӣ",
 	"mt": "малтӣ",
+	"mni": "манипурӣ",
 	"mi": "маорӣ",
 	"mr": "маратҳӣ",
 	"hu": "маҷорӣ",
@@ -156,6 +161,7 @@
 	"de-AT": "неми�ии ав�три�гӣ",
 	"de-CH": "неми�ии швей�арии болоӣ",
 	"ne": "непалӣ",
+	"no": "норвегӣ",
 	"or": "оди�",
 	"az": "озарбойҷонӣ",
 	"om": "оромо",
@@ -168,6 +174,8 @@
 	"ro-MD": "руминӣ (Молдова)",
 	"ru": "ру�ӣ",
 	"se": "�амии шимолӣ",
+	"sa": "�ан�крит",
+	"sat": "�анталӣ",
 	"sah": "�аха",
 	"ceb": "�ебуано",
 	"sr": "�ербӣ",
@@ -179,7 +187,7 @@
 	"sl": "�ловенӣ",
 	"so": "�омалӣ",
 	"th": "тайӣ",
-	"tzm": "тамазайти атла�и марказӣ",
+	"tzm": "тамазайти �тла�и Марказӣ",
 	"ta": "тамилӣ",
 	"te": "телугу",
 	"bo": "тибетӣ",
diff --git a/vendor/commerceguys/intl/resources/language/th.json b/vendor/commerceguys/intl/resources/language/th.json
index 0325d2264..72ed46974 100644
--- a/vendor/commerceguys/intl/resources/language/th.json
+++ b/vendor/commerceguys/intl/resources/language/th.json
@@ -33,8 +33,8 @@
 	"ksh": "โคโล�",
 	"ka": "จอร์เจีย",
 	"zh": "จีน",
-	"zh-Hant": "จีนดั้งเดิม",
-	"zh-Hans": "จีนประยุ�ต์",
+	"zh-Hant": "จีนตัวเต็ม",
+	"zh-Hans": "จีนตัวย่อ",
 	"nnh": "จีมบูน",
 	"dyo": "โจลา-ฟอนยี",
 	"jv": "ชวา",
@@ -51,6 +51,7 @@
 	"se": "ซามิเหนือ",
 	"smn": "ซามิอีนารี",
 	"dje": "ซาร์มา",
+	"su": "ซุนดา",
 	"zu": "ซูลู",
 	"seh": "เซนา",
 	"ceb": "เซบู",
@@ -61,6 +62,7 @@
 	"xog": "โซ�า",
 	"so": "โซมาลี",
 	"ja": "�ี่ปุ่น",
+	"doi": "โฑครี",
 	"nl": "ดัตช์",
 	"dua": "ดัวลา",
 	"da": "เดนมาร์�",
@@ -80,6 +82,7 @@
 	"bo": "ทิเบต",
 	"dav": "ไททา",
 	"th": "ไทย",
+	"no": "นอร์เวย์",
 	"nn": "นอร์เวย์นีนอส�์",
 	"nb": "นอร์เวย์บุคมอล",
 	"naq": "นามา",
@@ -108,6 +111,7 @@
 	"fr-CH": "�รั่งเศส (สวิส)",
 	"my": "พม่า",
 	"ps": "พัชโต",
+	"pcm": "พิดจิน",
 	"brx": "โพโฑ",
 	"fy": "ฟริเซียนตะวันต�",
 	"fur": "ฟรูลี",
@@ -116,6 +120,7 @@
 	"ff": "ฟูลาห์",
 	"nl-BE": "เฟลมิช",
 	"fo": "�ฟโร",
+	"mni": "มณีปุระ",
 	"mr": "มรา�ี",
 	"mn": "มองโ�เลีย",
 	"mfe": "มอริสเยน",
@@ -134,6 +139,7 @@
 	"mgo": "เมตา",
 	"mer": "เมรู",
 	"mi": "เมารี",
+	"mai": "ไมถิลี",
 	"yi": "ยิดดิช",
 	"lg": "ยู�ันดา",
 	"uk": "ยูเครน",
@@ -176,6 +182,8 @@
 	"sw": "สวาฮีลี",
 	"sw-CD": "สวาฮีลี - คองโ�",
 	"sv": "สวีเดน",
+	"sat": "สันตาลี",
+	"sa": "สันส�ฤต",
 	"si": "สิงหล",
 	"sd": "สินธิ",
 	"ii": "เสฉวนยี่",
diff --git a/vendor/commerceguys/intl/resources/language/tk.json b/vendor/commerceguys/intl/resources/language/tk.json
index 121635f0d..d346e444a 100644
--- a/vendor/commerceguys/intl/resources/language/tk.json
+++ b/vendor/commerceguys/intl/resources/language/tk.json
@@ -24,7 +24,7 @@
 	"my": "birma dili",
 	"brx": "bodo dili",
 	"bg": "bolgar dili",
-	"bs": "boÅŸnak dili",
+	"bs": "bosniýa dili",
 	"br": "breton dili",
 	"ce": "çeçen dili",
 	"cs": "çeh dili",
@@ -33,6 +33,7 @@
 	"lrc": "demirgazyk luri dili",
 	"nd": "demirgazyk ndebele dili",
 	"se": "demirgazyk saam dili",
+	"doi": "Dogri",
 	"dua": "duala dili",
 	"dz": "dzong-ke dili",
 	"ebu": "embu dili",
@@ -98,7 +99,7 @@
 	"ko": "koreý dili",
 	"kw": "korn dili",
 	"xh": "kosa dili",
-	"khq": "koýra-Çini dili",
+	"khq": "koýra-çini dili",
 	"ses": "koýraboro-senni dili",
 	"ku": "kürt dili",
 	"nmg": "kwasio dili",
@@ -120,9 +121,11 @@
 	"ms": "malaý dili",
 	"ml": "malaýalam dili",
 	"mt": "malta dili",
+	"mni": "manipuri dili",
 	"mi": "maori dili",
 	"mr": "marathi dili",
 	"mas": "masai dili",
+	"mai": "maýthili dili",
 	"mzn": "mazanderan dili",
 	"ckb": "merkezi kürt dili",
 	"mer": "meru dili",
@@ -139,6 +142,8 @@
 	"nnh": "ngembun dili",
 	"jgo": "ngomba dili",
 	"nl": "niderland dili",
+	"pcm": "nigeriýa-pijin dili",
+	"no": "Norwegian",
 	"nb": "norwegiýa bukmol dili",
 	"nn": "norwegiýa nýunorsk dili",
 	"nus": "nuer dili",
@@ -163,6 +168,8 @@
 	"saq": "samburu dili",
 	"sg": "sango dili",
 	"sbp": "sangu dili",
+	"sa": "sanskrit dili",
+	"sat": "santali dili",
 	"ceb": "sebuan dili",
 	"seh": "sena dili",
 	"sr": "serb dili",
@@ -174,6 +181,7 @@
 	"so": "somali dili",
 	"zgh": "standart Marokko tamazight dili",
 	"sw": "suahili dili",
+	"su": "sundan dili",
 	"ii": "syçuan-i dili",
 	"ksb": "ÅŸambala dili",
 	"sn": "ÅŸona dili",
diff --git a/vendor/commerceguys/intl/resources/language/to.json b/vendor/commerceguys/intl/resources/language/to.json
index 7fbf94021..b988c2f5e 100644
--- a/vendor/commerceguys/intl/resources/language/to.json
+++ b/vendor/commerceguys/intl/resources/language/to.json
@@ -67,12 +67,14 @@
 	"luo": "lea fakaluo",
 	"lu": "lea fakalupa-katanga",
 	"ru": "lea fakalūsia",
+	"mai": "lea fakamaitili",
 	"kde": "lea fakamak�nite",
 	"mgh": "lea fakamakūa-meʻeto",
 	"mg": "lea fakamalakasi",
 	"mr": "lea fakamalati",
 	"ms": "lea fakamalei",
 	"mt": "lea fakamalita",
+	"mni": "lea fakamanipuli",
 	"mas": "lea fakamasai",
 	"jmc": "lea fakamasame",
 	"mzn": "lea fakamasanitelani",
@@ -84,12 +86,14 @@
 	"ro-MD": "lea fakamolit�via",
 	"mn": "lea fakamongok�lia",
 	"mua": "lea fakamunitangi",
+	"pcm": "lea fakanaisilia",
 	"naq": "lea fakanama",
 	"ne": "lea fakanepali",
 	"nd": "lea fakanetepele-tokelau",
 	"nyn": "lea fakanianikole",
 	"jgo": "lea fakanik�mipa",
 	"nn": "lea fakanoauē-ninosiki",
+	"no": "lea fakanouaē",
 	"nb": "lea fakanouaē-pokimali",
 	"nus": "lea fakanueli",
 	"nnh": "lea fakangiemip�ni",
@@ -121,6 +125,8 @@
 	"se": "lea fakasami-tokelau",
 	"smn": "lea fakasami-ʻinali",
 	"saq": "lea fakasamipulu",
+	"sa": "lea fakasanisukuliti",
+	"sat": "lea fakasanitali",
 	"sg": "lea fakasangik�",
 	"sbp": "lea fakasangu",
 	"jv": "lea fakasava",
@@ -144,9 +150,9 @@
 	"sd": "lea fakasīniti",
 	"si": "lea fakasingihala",
 	"sn": "lea fakasiona",
+	"es-419": "lea fakasipeini-l�tini-ʻamelika",
+	"es-MX": "lea fakasipeini-mekisikou",
 	"es": "lea fakasipēnisi",
-	"es-419": "lea fakasipēnisi l�tini-ʻamelika",
-	"es-MX": "lea fakasipēnisi-mekisikou",
 	"ii": "lea fakasisiuani-Ä«",
 	"xog": "lea fakasoka",
 	"sk": "lea fakasol�vaki",
@@ -158,6 +164,7 @@
 	"sw-CD": "lea fakasuahili-kongik�",
 	"sv": "lea fakasuēteni",
 	"zu": "lea fakasulu",
+	"su": "lea fakasunit�",
 	"th": "lea fakatailani",
 	"dav": "lea fakataita",
 	"zgh": "lea fakatamasaiti-moloko",
@@ -175,6 +182,7 @@
 	"dje": "lea fakatis�ma",
 	"dz": "lea fakatis�ngika",
 	"tr": "lea fakatoake",
+	"doi": "lea fakatokili",
 	"to": "lea fakatonga",
 	"xh": "lea fakat�sa",
 	"dua": "lea fakatuala",
diff --git a/vendor/commerceguys/intl/resources/language/tr.json b/vendor/commerceguys/intl/resources/language/tr.json
index cd5f329f6..750dac0ae 100644
--- a/vendor/commerceguys/intl/resources/language/tr.json
+++ b/vendor/commerceguys/intl/resources/language/tr.json
@@ -37,6 +37,7 @@
 	"chr": "Çerokice",
 	"zh": "Çince",
 	"da": "Danca",
+	"doi": "Dogri",
 	"dua": "Duala",
 	"dz": "Dzongkha",
 	"ebu": "Embu",
@@ -127,6 +128,7 @@
 	"lb": "Lüksemburgca",
 	"hu": "Macarca",
 	"jmc": "Machame",
+	"mai": "Maithili",
 	"mk": "Makedonca",
 	"mgh": "Makhuwa-Meetto",
 	"kde": "Makonde",
@@ -134,6 +136,7 @@
 	"ms": "Malayca",
 	"mg": "Malgaşça",
 	"mt": "Maltaca",
+	"mni": "Manipuri dili",
 	"mi": "Maori dili",
 	"mr": "Marathi dili",
 	"mas": "Masai",
@@ -149,11 +152,13 @@
 	"ne": "Nepalce",
 	"nnh": "Ngiemboon",
 	"jgo": "Ngomba",
+	"pcm": "Nijerya Pidgin dili",
+	"no": "Norveççe",
 	"nb": "Norveççe Bokmål",
 	"nn": "Norveççe Nynorsk",
 	"nus": "Nuer",
 	"nyn": "Nyankole",
-	"or": "Oriya Dili",
+	"or": "Oriya dili",
 	"om": "Oromo dili",
 	"tzm": "Orta Atlas Tamazigti",
 	"ckb": "Orta Kürtçe",
@@ -170,6 +175,8 @@
 	"saq": "Samburu",
 	"sg": "Sango",
 	"sbp": "Sangu",
+	"sa": "Sanskrit",
+	"sat": "Santali",
 	"ceb": "Sebuano dili",
 	"seh": "Sena",
 	"sr": "Sırpça",
@@ -181,6 +188,7 @@
 	"xog": "Soga",
 	"so": "Somalice",
 	"zgh": "Standart Fas Tamazigti",
+	"su": "Sunda dili",
 	"sw": "Svahili dili",
 	"ksb": "Åžambala",
 	"sn": "Åžona dili",
diff --git a/vendor/commerceguys/intl/resources/language/uk.json b/vendor/commerceguys/intl/resources/language/uk.json
index 66e867212..8072ef0fa 100644
--- a/vendor/commerceguys/intl/resources/language/uk.json
+++ b/vendor/commerceguys/intl/resources/language/uk.json
@@ -9,16 +9,16 @@
 	"en": "англій�ька",
 	"ar": "араб�ька",
 	"as": "а�ам�ька",
-	"ast": "а�тур�ька",
+	"ast": "а�турій�ька",
 	"asa": "а�у",
 	"af": "африкаан�",
 	"bm": "бамбара",
-	"bn": "банґла",
 	"bas": "ба�а",
 	"eu": "ба�к�ька",
 	"ksf": "бафіа",
 	"bem": "бемба",
 	"bez": "бена",
+	"bn": "бенгаль�ька",
 	"be": "білору�ька",
 	"my": "бірман�ька",
 	"brx": "бодо",
@@ -27,17 +27,15 @@
 	"br": "бретон�ька",
 	"en-GB": "британ�ька англій�ька",
 	"vai": "ваї",
-	"wae": "валзер�ька",
 	"cy": "валлій�ька",
 	"wa": "валлон�ька",
+	"wae": "вальзер�ька",
 	"hsb": "верхньолужицька",
-	"de-CH": "верхньонімецька (Швейцарі�)",
 	"hy": "вірмен�ька",
 	"wo": "волоф",
 	"vun": "вуньо",
 	"vi": "вʼєтнам�ька",
 	"haw": "гавай�ька",
-	"gd": "гаель�ька",
 	"gl": "галі�ій�ька",
 	"lg": "ганда",
 	"hi": "гінді",
@@ -48,13 +46,14 @@
 	"da": "дан�ька",
 	"dje": "джерма",
 	"dz": "дзонг-ке",
+	"doi": "догрі",
 	"dua": "дуала",
 	"dyo": "дьола-фоні",
 	"ee": "еве",
 	"ewo": "евондо",
 	"ebu": "ембу",
 	"et": "е�тон�ька",
-	"pt-PT": "європей�ька портуґаль�ька",
+	"pt-PT": "європей�ька португаль�ька",
 	"fy": "західнофризька",
 	"zu": "зулу�ька",
 	"he": "іврит",
@@ -80,6 +79,7 @@
 	"ca": "каталон�ька",
 	"ks": "кашмір�ька",
 	"nmg": "квазіо",
+	"ksh": "кельн�ька",
 	"qu": "кечуа",
 	"ky": "киргизька",
 	"zh": "китай�ька",
@@ -90,18 +90,17 @@
 	"rw": "кінь�руанда",
 	"khq": "койра чіїні",
 	"ses": "койраборо �ені",
-	"ksh": "колоніан",
 	"kok": "конкані",
 	"ko": "корей�ька",
-	"kw": "корній�ька",
+	"kw": "корн�ька",
 	"ku": "курд�ька",
 	"km": "кхмер�ька",
 	"xh": "кхо�а",
 	"lkt": "лакота",
 	"lag": "лангі",
 	"lo": "лао�ька",
-	"lv": "латвій�ька",
 	"es-419": "латиноамерикан�ька і�пан�ька",
+	"lv": "лати�ька",
 	"lt": "литов�ька",
 	"ln": "лінгала",
 	"lu": "луба-катанга",
@@ -110,6 +109,7 @@
 	"lb": "люк�ембурзька",
 	"mfe": "маврикій�ька креоль�ька",
 	"mzn": "мазандеран�ька",
+	"mai": "майтхілі",
 	"mk": "македон�ька",
 	"kde": "маконде",
 	"mgh": "макува-меето",
@@ -117,6 +117,7 @@
 	"ms": "малай�ька",
 	"ml": "мала�лам",
 	"mt": "мальтій�ька",
+	"mni": "маніпурі",
 	"mi": "маорі",
 	"mr": "маратхі",
 	"mas": "ма�аї",
@@ -134,9 +135,10 @@
 	"dsb": "нижньолужицька",
 	"nds": "нижньонімецька",
 	"nds-NL": "нижньо�ак�он�ька",
+	"pcm": "нігерій�ько-креоль�ька",
 	"nl": "нідерланд�ька",
 	"de": "німецька",
-	"gsw": "німецька (Швейцарі�)",
+	"no": "норвезька",
 	"nb": "норвезька (букмол)",
 	"nn": "норвезька (нюношк)",
 	"nus": "нуер",
@@ -150,7 +152,7 @@
 	"lrc": "північнолур�ька",
 	"se": "північно�аам�ька",
 	"pl": "поль�ька",
-	"pt": "портуґаль�ька",
+	"pt": "португаль�ька",
 	"ps": "пушту",
 	"rwk": "рва",
 	"rm": "ретороман�ька",
@@ -162,12 +164,15 @@
 	"saq": "�амбуру",
 	"sg": "�анго",
 	"sbp": "�ангу",
+	"sa": "�ан�крит",
+	"sat": "�анталь�ька",
+	"sah": "�аха",
 	"ceb": "�ебуан�ька",
 	"seh": "�ена",
 	"sr": "�ерб�ька",
 	"si": "�ингаль�ька",
-	"ii": "�ичуань",
-	"sd": "�індхі",
+	"sd": "�индхі",
+	"ii": "�ичуань�ька ї",
 	"sk": "�ловацька",
 	"sl": "�ловен�ька",
 	"xog": "�ога",
@@ -175,6 +180,7 @@
 	"zgh": "�тандартна мароккан�ька бербер�ька",
 	"sw": "�уахілі",
 	"sw-CD": "�уахілі (Конго)",
+	"su": "�ундан�ька",
 	"tg": "таджицька",
 	"dav": "таіта",
 	"th": "тай�ька",
@@ -186,7 +192,7 @@
 	"teo": "те�о",
 	"bo": "тибет�ька",
 	"ti": "тигринь�",
-	"to": "тонґан�ька",
+	"to": "тонган�ька",
 	"tr": "турецька",
 	"tk": "туркмен�ька",
 	"hu": "угор�ька",
@@ -210,10 +216,12 @@
 	"ce": "чечен�ька",
 	"ksb": "шамбала",
 	"sv": "швед�ька",
+	"de-CH": "швейцар�ька верхньонімецька",
+	"gsw": "швейцар�ька німецька",
 	"fr-CH": "швейцар�ька французька",
 	"sn": "шона",
+	"gd": "шотланд�ька гель�ька",
 	"jv": "�ван�ька",
-	"sah": "�кут�ька",
 	"yav": "�нгбен",
 	"ja": "�пон�ька"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ur-IN.json b/vendor/commerceguys/intl/resources/language/ur-IN.json
index 373f9e33b..67bc19994 100644
--- a/vendor/commerceguys/intl/resources/language/ur-IN.json
+++ b/vendor/commerceguys/intl/resources/language/ur-IN.json
@@ -29,8 +29,8 @@
 	"de-AT": "آسٹریائی جرمن",
 	"en-AU": "آسٹریلیائی انگریزی",
 	"asa": "آسو",
+	"ga": "آئرش",
 	"is": "آئس لینڈک",
-	"ga": "آئیر�ش",
 	"bas": "باسا",
 	"eu": "باسکی",
 	"ksf": "با�يا",
@@ -98,7 +98,10 @@
 	"gd": "سکاٹش گیلک",
 	"sk": "سلوواک",
 	"sl": "سلووینیائی",
+	"sat": "سنتالی",
 	"sd": "سندھی",
+	"su": "سنڈانیز",
+	"sa": "سنسکرت",
 	"si": "سن�الا",
 	"sw": "سواحلی",
 	"ckb": "سورانی کردی",
@@ -185,13 +188,17 @@
 	"mg": "ملاگاسی",
 	"mua": "منڈانگ",
 	"mn": "منگولین",
+	"mni": "منی پوری",
 	"mfe": "موریسیین",
+	"mai": "میتھیلی",
 	"mgo": "میٹا",
 	"mer": "میرو",
 	"es-MX": "میکسیکن �سپانوی",
+	"no": "نارویجین",
 	"nb": "نارویجین بوکمل",
 	"nn": "نارویجین نینورسک",
 	"naq": "ناما",
+	"pcm": "نائجیریائی پڈگن",
 	"jgo": "نگومبا",
 	"nnh": "نگیمبون",
 	"nus": "نویر",
@@ -215,5 +222,6 @@
 	"yo": "یوروبا",
 	"uk": "یوکرینیائی",
 	"el": "یونانی",
-	"ug": "یوئگ�ر"
+	"ug": "یوئگ�ر",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/ur.json b/vendor/commerceguys/intl/resources/language/ur.json
index e299e84b9..1200d8639 100644
--- a/vendor/commerceguys/intl/resources/language/ur.json
+++ b/vendor/commerceguys/intl/resources/language/ur.json
@@ -29,8 +29,8 @@
 	"de-AT": "آسٹریائی جرمن",
 	"en-AU": "آسٹریلیائی انگریزی",
 	"asa": "آسو",
+	"ga": "آئرش",
 	"is": "آئس لینڈک",
-	"ga": "آئیر�ش",
 	"bas": "باسا",
 	"eu": "باسکی",
 	"ksf": "با�يا",
@@ -99,7 +99,10 @@
 	"gd": "سکاٹش گیلک",
 	"sk": "سلوواک",
 	"sl": "سلووینیائی",
+	"sat": "سنتالی",
 	"sd": "سندھی",
+	"su": "سنڈانیز",
+	"sa": "سنسکرت",
 	"si": "سن�الا",
 	"sw": "سواحلی",
 	"xog": "سوگا",
@@ -185,13 +188,17 @@
 	"mg": "ملاگاسی",
 	"mua": "منڈانگ",
 	"mn": "منگولین",
+	"mni": "منی پوری",
 	"mfe": "موریسیین",
+	"mai": "میتھیلی",
 	"mgo": "میٹا",
 	"mer": "میرو",
 	"es-MX": "میکسیکن �سپانوی",
+	"no": "نارویجین",
 	"nb": "نارویجین بوکمل",
 	"nn": "نارویجین نینورسک",
 	"naq": "ناما",
+	"pcm": "نائجیریائی پڈگن",
 	"jgo": "نگومبا",
 	"nnh": "نگیمبون",
 	"nus": "نویر",
@@ -215,5 +222,6 @@
 	"yo": "یوروبا",
 	"uk": "یوکرینیائی",
 	"el": "یونانی",
-	"ug": "یوئگ�ر"
+	"ug": "یوئگ�ر",
+	"doi": "Dogri"
 }
\ No newline at end of file
diff --git a/vendor/commerceguys/intl/resources/language/uz-Cyrl.json b/vendor/commerceguys/intl/resources/language/uz-Cyrl.json
index 9158dfa90..6b0142d3e 100644
--- a/vendor/commerceguys/intl/resources/language/uz-Cyrl.json
+++ b/vendor/commerceguys/intl/resources/language/uz-Cyrl.json
@@ -1,7 +1,11 @@
 {
+	"doi": "Dogri",
 	"nds": "Low German",
 	"luo": "Luo",
+	"mai": "Maithili",
 	"nds-NL": "nds (�идерланди�)",
+	"pcm": "Nigerian Pidgin",
+	"no": "Norwegian",
 	"os": "Ossetic",
 	"ii": "Sichuan Yi",
 	"wa": "Walloon",
@@ -107,6 +111,7 @@
 	"ms": "малай тил",
 	"ml": "мала�лам",
 	"mt": "малтача",
+	"mni": "манипурча",
 	"mi": "маори",
 	"mr": "маратхи",
 	"tzm": "марказий атла� тамазигхт",
@@ -123,8 +128,8 @@
 	"jgo": "нгомба",
 	"de": "неми�ча",
 	"de-AT": "неми�ча (�в�три�)",
-	"gsw": "неми�ча (Швейцари�)",
 	"de-CH": "неми�ча (Швейцари�)",
+	"gsw": "неми�ча (Швейцари�)",
 	"ne": "непалча",
 	"nb": "норвегча бокмал",
 	"nn": "норвегча нюнор�к",
@@ -148,6 +153,8 @@
 	"saq": "�амбуруча",
 	"sg": "�анго",
 	"sbp": "�ангуча",
+	"sa": "�ан�крит",
+	"sat": "�антали",
 	"sah": "�аха",
 	"ceb": "�ебуанча",
 	"seh": "�ена",
@@ -161,6 +168,7 @@
 	"so": "�омалича",
 	"ckb": "�орани-курдча",
 	"sw": "�уахили",
+	"su": "�унданча",
 	"dav": "таитача",
 	"th": "тайча",
 	"zgh": "тамазигхт",
diff --git a/vendor/commerceguys/intl/resources/language/uz.json b/vendor/commerceguys/intl/resources/language/uz.json
index 8177083f4..fccaf004a 100644
--- a/vendor/commerceguys/intl/resources/language/uz.json
+++ b/vendor/commerceguys/intl/resources/language/uz.json
@@ -24,6 +24,7 @@
 	"br": "breton",
 	"da": "dan",
 	"dyo": "diola-fogni",
+	"doi": "Dogri",
 	"dua": "duala",
 	"dz": "dzongka",
 	"ebu": "embu",
@@ -81,6 +82,7 @@
 	"kw": "korn",
 	"khq": "koyra-chiini",
 	"ses": "koyraboro-senni",
+	"pcm": "kreol (Nigeriya)",
 	"ku": "kurdcha",
 	"nmg": "kvasio",
 	"xh": "kxosa",
@@ -101,11 +103,13 @@
 	"ms": "malay",
 	"ml": "malayalam",
 	"mt": "maltiy",
+	"mni": "manipur",
 	"mi": "maori",
 	"mr": "maratxi",
 	"tzm": "markaziy atlas tamazigxt",
 	"mas": "masay",
 	"mgh": "maxuva-mitto",
+	"mai": "maythili",
 	"jmc": "machame",
 	"mer": "meru",
 	"mgo": "meta",
@@ -124,6 +128,7 @@
 	"nl": "niderland",
 	"nb": "norveg-bokmal",
 	"nn": "norveg-nyunorsk",
+	"no": "Norwegian",
 	"nus": "nuer",
 	"nyn": "nyankole",
 	"or": "oriya",
@@ -149,6 +154,8 @@
 	"saq": "samburu",
 	"sg": "sango",
 	"sbp": "sangu",
+	"sa": "sanskrit",
+	"sat": "santali",
 	"sah": "saxa",
 	"ceb": "sebuan",
 	"seh": "sena",
@@ -163,6 +170,7 @@
 	"ckb": "sorani-kurd",
 	"sw": "suaxili",
 	"sw-CD": "suaxili (Kongo)",
+	"su": "sundan",
 	"dav": "taita",
 	"zgh": "tamazigxt",
 	"ta": "tamil",
diff --git a/vendor/commerceguys/intl/resources/language/vi.json b/vendor/commerceguys/intl/resources/language/vi.json
index 3be1e15a7..54db88990 100644
--- a/vendor/commerceguys/intl/resources/language/vi.json
+++ b/vendor/commerceguys/intl/resources/language/vi.json
@@ -41,6 +41,7 @@
 	"hr": "Tiếng Croatia",
 	"ii": "Tiếng Di Tứ Xuyên",
 	"he": "Tiếng Do Thái",
+	"doi": "Tiếng Dogri",
 	"dua": "Tiếng Duala",
 	"dz": "Tiếng Dzongkha",
 	"da": "Tiếng �an Mạch",
@@ -112,11 +113,13 @@
 	"ms": "Tiếng Mã Lai",
 	"mk": "Tiếng Macedonia",
 	"jmc": "Tiếng Machame",
+	"mai": "Tiếng Maithili",
 	"mgh": "Tiếng Makhuwa-Meetto",
 	"kde": "Tiếng Makonde",
 	"mg": "Tiếng Malagasy",
 	"ml": "Tiếng Malayalam",
 	"mt": "Tiếng Malta",
+	"mni": "Tiếng Manipuri",
 	"mi": "Tiếng Maori",
 	"mr": "Tiếng Marathi",
 	"mas": "Tiếng Masai",
@@ -128,6 +131,7 @@
 	"mfe": "Tiếng Morisyen",
 	"mn": "Tiếng Mông Cổ",
 	"mua": "Tiếng Mundang",
+	"no": "Tiếng Na Uy",
 	"nb": "Tiếng Na Uy (Bokmål)",
 	"nn": "Tiếng Na Uy (Nynorsk)",
 	"naq": "Tiếng Nama",
@@ -137,12 +141,14 @@
 	"nnh": "Tiếng Ngiemboon",
 	"jgo": "Tiếng Ngomba",
 	"ja": "Tiếng Nhật",
+	"pcm": "Tiếng Nigeria Pidgin",
 	"nus": "Tiếng Nuer",
 	"nyn": "Tiếng Nyankole",
 	"or": "Tiếng Odia",
 	"om": "Tiếng Oromo",
 	"os": "Tiếng Ossetic",
 	"ps": "Tiếng Pashto",
+	"sa": "Tiếng Phạn",
 	"fr": "Tiếng Pháp",
 	"fr-CA": "Tiếng Pháp (Canada)",
 	"fr-CH": "Tiếng Pháp (Thụy Sĩ)",
@@ -161,6 +167,7 @@
 	"se": "Tiếng Sami Mi�n Bắc",
 	"sg": "Tiếng Sango",
 	"sbp": "Tiếng Sangu",
+	"sat": "Tiếng Santali",
 	"cs": "Tiếng Séc",
 	"seh": "Tiếng Sena",
 	"sr": "Tiếng Serbia",
@@ -172,6 +179,7 @@
 	"sl": "Tiếng Slovenia",
 	"xog": "Tiếng Soga",
 	"so": "Tiếng Somali",
+	"su": "Tiếng Sunda",
 	"sw": "Tiếng Swahili",
 	"sw-CD": "Tiếng Swahili Congo",
 	"shi": "Tiếng Tachelhit",
diff --git a/vendor/commerceguys/intl/resources/language/yue-Hans.json b/vendor/commerceguys/intl/resources/language/yue-Hans.json
index 883ffb136..757657509 100644
--- a/vendor/commerceguys/intl/resources/language/yue-Hans.json
+++ b/vendor/commerceguys/intl/resources/language/yue-Hans.json
@@ -44,6 +44,7 @@
 	"to": "东加文",
 	"ses": "东桑海文",
 	"dua": "�亚拉文",
+	"doi": "多格�文",
 	"ru": "ä¿„æ–‡",
 	"ebu": "�布文",
 	"nnh": "�甘澎文",
@@ -53,6 +54,7 @@
 	"fr-CA": "法文 (加拿大)",
 	"fr-CH": "法文 (瑞士)",
 	"zh-Hant": "�体中文",
+	"sa": "梵文",
 	"fil": "�律宾文",
 	"fi": "芬兰文",
 	"fur": "弗留利文",
@@ -117,6 +119,8 @@
 	"jmc": "马�美文",
 	"mas": "马赛文",
 	"mzn": "马赞德兰文",
+	"mai": "迈蒂利文",
+	"mni": "曼尼普里文",
 	"mi": "毛利文",
 	"mer": "梅�文",
 	"mgo": "美塔文",
@@ -129,8 +133,10 @@
 	"nn": "�诺斯克挪�文",
 	"af": "���兰文",
 	"ne": "尼泊尔文",
+	"pcm": "尼日利亚皮钦语",
 	"nyn": "尼扬科莱文",
 	"nus": "努埃尔文",
+	"no": "挪�文",
 	"or": "欧利亚文",
 	"pa": "��普文",
 	"pt": "葡�牙文",
@@ -144,6 +150,7 @@
 	"sr": "塞尔维亚文",
 	"sn": "塞内加尔文",
 	"seh": "赛纳文",
+	"sat": "散塔利文",
 	"sg": "桑戈文",
 	"sbp": "桑�文",
 	"si": "僧伽罗文",
@@ -191,6 +198,7 @@
 	"haw": "��夷文",
 	"sd": "ä¿¡å¾·æ–‡",
 	"hu": "匈牙利文",
+	"su": "巽他文",
 	"sah": "雅库特文",
 	"agq": "亚罕文",
 	"hy": "亚美尼亚文",
diff --git a/vendor/commerceguys/intl/resources/language/yue.json b/vendor/commerceguys/intl/resources/language/yue.json
index 8c4584de1..c5633cec3 100644
--- a/vendor/commerceguys/intl/resources/language/yue.json
+++ b/vendor/commerceguys/intl/resources/language/yue.json
@@ -32,6 +32,7 @@
 	"sw": "�瓦希里文",
 	"sw-CD": "�瓦希里文（剛果）",
 	"ii": "四��文",
+	"pcm": "尼日利亞皮欽語",
 	"ne": "尼泊爾文",
 	"nyn": "尼�科�文",
 	"br": "布列塔尼文",
@@ -48,6 +49,7 @@
 	"id": "�尼文",
 	"ki": "�庫尤文",
 	"ky": "�爾�斯文",
+	"doi": "多格來文",
 	"nmg": "夸西奧文",
 	"dyo": "朱拉文",
 	"fy": "西弗里西亞文",
@@ -121,6 +123,7 @@
 	"ebu": "�布文",
 	"nnh": "�甘澎文",
 	"jgo": "�格姆巴文",
+	"no": "挪�文",
 	"pa": "��普文",
 	"lag": "朗�文",
 	"chr": "柴羅基文",
@@ -156,13 +159,17 @@
 	"ceb": "宿霧文",
 	"kw": "康瓦耳文",
 	"cs": "�克文",
+	"mni": "曼尼普裡文",
 	"mer": "梅魯文",
+	"sa": "梵文",
 	"nl": "�蘭文",
 	"brx": "�多文",
 	"ks": "喀什米爾文",
 	"ka": "喬治亞文",
 	"ff": "富拉文",
+	"su": "巽他文",
 	"ti": "�格利尼亞文",
+	"sat": "散塔利文",
 	"sk": "斯洛�克文",
 	"sl": "斯洛維尼亞文",
 	"ps": "普什圖文",
@@ -206,6 +213,7 @@
 	"luo": "盧奧文",
 	"zh-Hant": "�體中文",
 	"seh": "賽�文",
+	"mai": "�蒂利文",
 	"ko": "韓文",
 	"zh-Hans": "簡體中文",
 	"saq": "薩布魯文",
diff --git a/vendor/commerceguys/intl/resources/language/zh-Hant-HK.json b/vendor/commerceguys/intl/resources/language/zh-Hant-HK.json
index 87f16ba29..b30718a4d 100644
--- a/vendor/commerceguys/intl/resources/language/zh-Hant-HK.json
+++ b/vendor/commerceguys/intl/resources/language/zh-Hant-HK.json
@@ -36,6 +36,7 @@
 	"dav": "�塔文",
 	"sw": "�瓦希里文",
 	"ii": "四��文",
+	"pcm": "尼日利亞皮欽文",
 	"ne": "尼泊爾文",
 	"nyn": "尼�科�文",
 	"br": "布里多尼文",
@@ -53,6 +54,7 @@
 	"hi": "�地文",
 	"ki": "�庫尤文",
 	"ky": "�爾�斯文",
+	"doi": "多格來文",
 	"nmg": "夸西奧文",
 	"dyo": "朱拉文",
 	"lo": "�撾文",
@@ -120,6 +122,7 @@
 	"ebu": "�布文",
 	"nnh": "�甘澎文",
 	"jgo": "�格姆巴文",
+	"no": "挪�文",
 	"pa": "��普文",
 	"lag": "朗�文",
 	"chr": "柴羅基文",
@@ -127,6 +130,7 @@
 	"ka": "格魯�亞文",
 	"sg": "桑戈文",
 	"sbp": "桑�文",
+	"sat": "桑塔利文",
 	"th": "æ³°æ–‡",
 	"ta": "泰米爾文",
 	"te": "泰盧固文",
@@ -155,11 +159,14 @@
 	"ceb": "宿霧文",
 	"kw": "康瓦耳文",
 	"cs": "�克文",
+	"mni": "曼尼普爾文",
 	"mer": "梅魯文",
+	"sa": "梵文",
 	"nl": "�蘭文",
 	"brx": "�多文",
 	"ks": "喀什米爾文",
 	"ff": "富拉文",
+	"su": "巽他文",
 	"ti": "�格利尼亞文",
 	"sl": "斯洛文尼亞文",
 	"sk": "斯洛�克文",
@@ -206,6 +213,7 @@
 	"luo": "盧�文",
 	"zh-Hant": "�體中文",
 	"seh": "賽�文",
+	"mai": "�蒂利文",
 	"ko": "韓文",
 	"zh-Hans": "簡體中文",
 	"saq": "薩布魯文",
diff --git a/vendor/commerceguys/intl/resources/language/zh-Hant.json b/vendor/commerceguys/intl/resources/language/zh-Hant.json
index 321bd5120..8c45d81fe 100644
--- a/vendor/commerceguys/intl/resources/language/zh-Hant.json
+++ b/vendor/commerceguys/intl/resources/language/zh-Hant.json
@@ -50,6 +50,7 @@
 	"hi": "�地文",
 	"ki": "�庫尤文",
 	"ky": "�爾�斯文",
+	"doi": "多格來文",
 	"nmg": "夸西奧文",
 	"dyo": "朱拉文",
 	"fy": "西弗里西亞文",
@@ -78,6 +79,7 @@
 	"ewo": "�汪都文",
 	"ta": "�米爾文",
 	"cgg": "奇加文",
+	"pcm": "奈�利亞皮欽文",
 	"bn": "孟加拉文",
 	"dz": "宗�文",
 	"ksb": "尚巴拉文",
@@ -123,12 +125,14 @@
 	"ebu": "�布文",
 	"nnh": "�甘澎文",
 	"jgo": "�格姆巴文",
+	"no": "挪�文",
 	"pa": "��普文",
 	"lag": "朗�文",
 	"chr": "柴羅基文",
 	"kl": "格陵蘭文",
 	"sg": "桑戈文",
 	"sbp": "桑�文",
+	"sat": "桑塔利文",
 	"th": "æ³°æ–‡",
 	"te": "泰盧固文",
 	"uk": "�克蘭文",
@@ -157,13 +161,16 @@
 	"ceb": "宿霧文",
 	"kw": "康瓦耳文",
 	"cs": "�克文",
+	"mni": "曼尼普爾文",
 	"mer": "梅魯文",
+	"sa": "梵文",
 	"sn": "紹�文",
 	"nl": "�蘭文",
 	"brx": "�多文",
 	"ks": "喀什米爾文",
 	"ka": "喬治亞文",
 	"ff": "富拉文",
+	"su": "巽他文",
 	"ti": "�格利尼亞文",
 	"sk": "斯洛�克文",
 	"sl": "斯洛維尼亞文",
@@ -206,6 +213,7 @@
 	"luo": "盧奧文",
 	"zh-Hant": "�體中文",
 	"seh": "賽�文",
+	"mai": "�蒂利文",
 	"ko": "韓文",
 	"zh-Hans": "簡體中文",
 	"saq": "薩布魯文",
diff --git a/vendor/commerceguys/intl/resources/language/zh.json b/vendor/commerceguys/intl/resources/language/zh.json
index 05af30323..df6fb5f30 100644
--- a/vendor/commerceguys/intl/resources/language/zh.json
+++ b/vendor/commerceguys/intl/resources/language/zh.json
@@ -7,6 +7,7 @@
 	"az": "阿塞拜疆语",
 	"ast": "阿斯图里亚斯语",
 	"ee": "埃维语",
+	"ewo": "埃�多语",
 	"ga": "爱尔兰语",
 	"et": "爱沙尼亚语",
 	"de-AT": "奥地利德语",
@@ -41,7 +42,8 @@
 	"nds": "低地德语",
 	"nds-NL": "低�克森语",
 	"ses": "东桑海语",
-	"dua": "都阿拉语",
+	"dua": "�阿拉语",
+	"doi": "多格拉语",
 	"ru": "俄语",
 	"ebu": "�布语",
 	"nnh": "�甘澎语",
@@ -49,6 +51,7 @@
 	"fo": "法罗语",
 	"fr": "法语",
 	"zh-Hant": "�体中文",
+	"sa": "梵语",
 	"fil": "�律宾语",
 	"fi": "芬兰语",
 	"nl-BE": "弗拉芒语",
@@ -116,6 +119,8 @@
 	"jmc": "马切姆语",
 	"mas": "马赛语",
 	"mzn": "马赞德兰语",
+	"mai": "迈蒂利语",
+	"mni": "曼尼普尔语",
 	"mfe": "毛里求斯克里奥尔语",
 	"mi": "毛利语",
 	"mer": "梅�语",
@@ -130,8 +135,10 @@
 	"af": "���兰语",
 	"nyn": "尼昂科勒语",
 	"ne": "尼泊尔语",
+	"pcm": "尼日利亚皮钦语",
 	"nus": "努埃尔语",
 	"nn": "挪�尼诺斯克语",
+	"no": "挪�语",
 	"pt-PT": "欧洲葡�牙语",
 	"asa": "帕雷语",
 	"pa": "��普语",
@@ -150,6 +157,7 @@
 	"saq": "桑布�语",
 	"sg": "桑戈语",
 	"sbp": "桑�语",
+	"sat": "桑塔利语",
 	"si": "僧伽罗语",
 	"hsb": "上索布语",
 	"sn": "�纳语",
@@ -176,7 +184,6 @@
 	"wae": "瓦尔瑟语",
 	"wa": "瓦隆语",
 	"vai": "瓦伊语",
-	"ewo": "旺�语",
 	"cy": "�尔士语",
 	"ug": "维�尔语",
 	"vun": "温旧语",
@@ -195,6 +202,7 @@
 	"ksb": "香巴拉语",
 	"sd": "信德语",
 	"hu": "匈牙利语",
+	"su": "巽他语",
 	"agq": "亚罕语",
 	"hy": "亚美尼亚语",
 	"yav": "洋�语",
diff --git a/vendor/commerceguys/intl/scripts/fetch_data.sh b/vendor/commerceguys/intl/scripts/fetch_data.sh
index 804ecc1a1..1b3a339a5 100644..100755
--- a/vendor/commerceguys/intl/scripts/fetch_data.sh
+++ b/vendor/commerceguys/intl/scripts/fetch_data.sh
@@ -6,14 +6,12 @@ rm -fR assets
 mkdir assets
 cd assets
 
-git clone https://github.com/unicode-cldr/cldr-core.git
-git clone https://github.com/unicode-cldr/cldr-numbers-full.git
-git clone https://github.com/unicode-cldr/cldr-localenames-full.git
+git clone https://github.com/unicode-org/cldr-json.git cldr
 
 if command -v wget >/dev/null 2>&1;
 then
     wget $URL -O c2.xml
-else 
+else
     if command -v curl >/dev/null 2>&1;
     then
         curl $URL > c2.xml
diff --git a/vendor/commerceguys/intl/scripts/generate_base.php b/vendor/commerceguys/intl/scripts/generate_base.php
index 6932b32f4..102a2cfae 100644
--- a/vendor/commerceguys/intl/scripts/generate_base.php
+++ b/vendor/commerceguys/intl/scripts/generate_base.php
@@ -4,12 +4,10 @@ require __DIR__ . '/../vendor/autoload.php';
 
 // Downloaded from http://www.currency-iso.org/en/home/tables/table-a1.html
 $isoCurrencies = __DIR__ . '/assets/c2.xml';
-// Downloaded from https://github.com/unicode-cldr/cldr-core.git
-$currencyData = __DIR__ . '/assets/cldr-core/supplemental/currencyData.json';
-// Downloaded from https://github.com/unicode-cldr/cldr-localenames-full.git
-$localeDirectory = __DIR__ . '/assets/cldr-localenames-full/main/';
-// Downloaded from https://github.com/unicode-cldr/cldr-numbers-full.git
-$numbersDirectory = __DIR__ . '/assets/cldr-numbers-full/main/';
+// Downloaded from https://github.com/unicode-org/cldr-json.git
+$currencyData = __DIR__ . '/assets/cldr/cldr-json/cldr-core/supplemental/currencyData.json';
+$localeDirectory = __DIR__ . '/assets/cldr/cldr-json/cldr-localenames-full/main/';
+$numbersDirectory = __DIR__ . '/assets/cldr/cldr-json/cldr-numbers-full/main/';
 
 // Preflight checks.
 if (!file_exists($currencyData)) {
diff --git a/vendor/commerceguys/intl/scripts/generate_locale_data.php b/vendor/commerceguys/intl/scripts/generate_locale_data.php
index d1e77b8d8..67240fd7e 100644
--- a/vendor/commerceguys/intl/scripts/generate_locale_data.php
+++ b/vendor/commerceguys/intl/scripts/generate_locale_data.php
@@ -6,7 +6,7 @@
 
 require __DIR__ . '/generate_base.php';
 
-$parentLocales = __DIR__ . '/assets/cldr-core/supplemental/parentLocales.json';
+$parentLocales = __DIR__ . '/assets/cldr/cldr-json/cldr-core/supplemental/parentLocales.json';
 $parentLocales = json_decode(file_get_contents($parentLocales), true);
 $parentLocales = $parentLocales['supplemental']['parentLocales']['parentLocale'];
 foreach ($parentLocales as $locale => $parentLocale) {
diff --git a/vendor/commerceguys/intl/src/Currency/CurrencyRepository.php b/vendor/commerceguys/intl/src/Currency/CurrencyRepository.php
index 97f3ee3dd..ad06ce5c0 100644
--- a/vendor/commerceguys/intl/src/Currency/CurrencyRepository.php
+++ b/vendor/commerceguys/intl/src/Currency/CurrencyRepository.php
@@ -51,11 +51,11 @@ class CurrencyRepository implements CurrencyRepositoryInterface
         'fr-CA', 'ga', 'gd', 'gl', 'gsw', 'gu', 'he', 'hi', 'hr', 'hu', 'hy',
         'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'ko', 'kok', 'ks', 'ky', 'lb',
         'lo', 'lt', 'lv', 'mg', 'mk', 'ml', 'mn', 'mr', 'ms', 'my', 'nb', 'ne',
-        'nl', 'nn', 'pa', 'pl', 'ps', 'pt', 'pt-PT', 'rn', 'ro', 'ru', 'sd',
-        'si', 'sk', 'sl', 'so', 'sq', 'sr', 'sr-Latn', 'sv', 'sw', 'sw-CD',
-        'sw-KE', 'ta', 'te', 'th', 'tk', 'tr', 'uk', 'ur', 'ur-IN', 'uz',
-        'uz-Cyrl', 'vi', 'yue', 'yue-Hans', 'zh', 'zh-Hans-HK', 'zh-Hant',
-        'zh-Hant-HK',
+        'nl', 'nn', 'no', 'pa', 'pl', 'ps', 'pt', 'pt-PT', 'rn', 'ro', 'ru',
+        'sd', 'si', 'sk', 'sl', 'so', 'sq', 'sr', 'sr-Cyrl-BA', 'sr-Latn',
+        'sr-Latn-BA', 'sv', 'sw', 'sw-CD', 'sw-KE', 'ta', 'te', 'th', 'tk',
+        'tr', 'uk', 'ur', 'ur-IN', 'uz', 'uz-Cyrl', 'vi', 'yue', 'yue-Hans',
+        'zh', 'zh-Hans-HK', 'zh-Hant', 'zh-Hant-HK'
     ];
 
     /**
diff --git a/vendor/commerceguys/intl/src/Language/LanguageRepository.php b/vendor/commerceguys/intl/src/Language/LanguageRepository.php
index 7c33a40ab..285381848 100644
--- a/vendor/commerceguys/intl/src/Language/LanguageRepository.php
+++ b/vendor/commerceguys/intl/src/Language/LanguageRepository.php
@@ -46,20 +46,20 @@ class LanguageRepository implements LanguageRepositoryInterface
     protected $availableLocales = [
         'af', 'ar', 'ar-EG', 'ar-LY', 'ar-SA', 'as', 'ast', 'az', 'az-Cyrl',
         'be', 'bg', 'bn', 'bn-IN', 'brx', 'bs', 'bs-Cyrl', 'ca', 'ce', 'cs',
-        'cy', 'da', 'de', 'de-AT', 'de-CH', 'de-LU', 'dz', 'el', 'en', 'en-001',
-        'en-AU', 'en-CA', 'en-IN', 'en-NZ', 'es', 'es-419', 'es-AR', 'es-BO',
-        'es-CL', 'es-CO', 'es-CR', 'es-DO', 'es-EC', 'es-GT', 'es-HN', 'es-MX',
-        'es-NI', 'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV', 'es-US', 'es-VE',
-        'et', 'eu', 'fa', 'fa-AF', 'fi', 'fil', 'fr', 'fr-BE', 'fr-CA', 'fr-CH',
-        'ga', 'gd', 'gl', 'gsw', 'gu', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is',
-        'it', 'ja', 'ka', 'kk', 'km', 'ko', 'kok', 'ks', 'ku', 'ky', 'lb', 'lo',
-        'lt', 'lv', 'mg', 'mk', 'ml', 'mn', 'mr', 'ms', 'mt', 'my', 'nb', 'ne',
-        'nl', 'nn', 'pa', 'pl', 'ps', 'ps-PK', 'pt', 'pt-PT', 'rn', 'ro',
+        'cy', 'da', 'de', 'de-AT', 'de-CH', 'dz', 'el', 'en', 'en-001', 'en-AU',
+        'en-CA', 'en-IN', 'en-NZ', 'es', 'es-419', 'es-AR', 'es-BO', 'es-CL',
+        'es-CO', 'es-CR', 'es-DO', 'es-EC', 'es-GT', 'es-HN', 'es-MX', 'es-NI',
+        'es-PA', 'es-PE', 'es-PR', 'es-PY', 'es-SV', 'es-US', 'es-VE', 'et',
+        'eu', 'fa', 'fa-AF', 'fi', 'fil', 'fr', 'fr-BE', 'fr-CA', 'fr-CH', 'ga',
+        'gd', 'gl', 'gsw', 'gu', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it',
+        'ja', 'ka', 'kk', 'km', 'ko', 'kok', 'ks', 'ku', 'ky', 'lb', 'lo', 'lt',
+        'lv', 'mg', 'mk', 'ml', 'mn', 'mr', 'ms', 'mt', 'my', 'nb', 'ne', 'nl',
+        'nn', 'no', 'pa', 'pl', 'ps', 'ps-PK', 'pt', 'pt-PT', 'rn', 'ro',
         'ro-MD', 'ru', 'rw', 'sd', 'si', 'sk', 'sl', 'so', 'sq', 'sr',
         'sr-Cyrl-BA', 'sr-Cyrl-ME', 'sr-Cyrl-XK', 'sr-Latn', 'sr-Latn-BA',
         'sr-Latn-ME', 'sr-Latn-XK', 'sv', 'sw', 'sw-CD', 'sw-KE', 'ta', 'te',
         'tg', 'th', 'tk', 'to', 'tr', 'uk', 'ur', 'ur-IN', 'uz', 'uz-Cyrl',
-        'vi', 'yue', 'yue-Hans', 'zh', 'zh-Hant', 'zh-Hant-HK',
+        'vi', 'yue', 'yue-Hans', 'zh', 'zh-Hant', 'zh-Hant-HK'
     ];
 
     /**
diff --git a/vendor/commerceguys/intl/src/Locale.php b/vendor/commerceguys/intl/src/Locale.php
index f985f321a..f9948e7e6 100644
--- a/vendor/commerceguys/intl/src/Locale.php
+++ b/vendor/commerceguys/intl/src/Locale.php
@@ -179,6 +179,8 @@ final class Locale
         'es-US' => 'es-419',
         'es-UY' => 'es-419',
         'es-VE' => 'es-419',
+        'nb' => 'no',
+        'nn' => 'no',
         'pt-AO' => 'pt-PT',
         'pt-CH' => 'pt-PT',
         'pt-CV' => 'pt-PT',
diff --git a/vendor/commerceguys/intl/src/NumberFormat/NumberFormatRepository.php b/vendor/commerceguys/intl/src/NumberFormat/NumberFormatRepository.php
index 987ceda89..8fc2f5c99 100644
--- a/vendor/commerceguys/intl/src/NumberFormat/NumberFormatRepository.php
+++ b/vendor/commerceguys/intl/src/NumberFormat/NumberFormatRepository.php
@@ -239,6 +239,9 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'accounting_currency_pattern' => '#,##0.00 ¤',
                 'grouping_separator' => '’',
             ],
+            'doi' => [
+                'accounting_currency_pattern' => '¤#,##0.00',
+            ],
             'dz' => [
                 'decimal_pattern' => '#,##,##0.###',
                 'percent_pattern' => '#,##,##0 %',
@@ -534,6 +537,7 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'accounting_currency_pattern' => '#,##0.00 ¤',
                 'decimal_separator' => ',',
                 'grouping_separator' => '.',
+                'minus_sign' => '−',
             ],
             'hu' => [
                 'currency_pattern' => '#,##0.00 ¤',
@@ -644,6 +648,10 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'decimal_separator' => ',',
                 'grouping_separator' => ' ',
             ],
+            'mai' => [
+                'currency_pattern' => '¤ #,##0.00',
+                'accounting_currency_pattern' => '¤ #,##0.00',
+            ],
             'mg' => [
                 'currency_pattern' => '¤ #,##0.00',
                 'accounting_currency_pattern' => '¤#,##0.00',
@@ -662,6 +670,11 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'currency_pattern' => '¤ #,##0.00',
                 'accounting_currency_pattern' => '¤ #,##0.00',
             ],
+            'mni' => [
+                'numbering_system' => 'beng',
+                'currency_pattern' => '¤ #,##0.00',
+                'accounting_currency_pattern' => '¤ #,##0.00',
+            ],
             'mr' => [
                 'numbering_system' => 'deva',
                 'decimal_pattern' => '#,##,##0.###',
@@ -672,6 +685,11 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'decimal_separator' => ',',
                 'grouping_separator' => '.',
             ],
+            'ms-ID' => [
+                'accounting_currency_pattern' => '¤#,##0.00',
+                'decimal_separator' => ',',
+                'grouping_separator' => '.',
+            ],
             'mt' => [
                 'accounting_currency_pattern' => '¤#,##0.00',
             ],
@@ -708,6 +726,14 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'grouping_separator' => ' ',
                 'minus_sign' => '−',
             ],
+            'no' => [
+                'percent_pattern' => '#,##0 %',
+                'currency_pattern' => '¤ #,##0.00',
+                'accounting_currency_pattern' => '¤ #,##0.00',
+                'decimal_separator' => ',',
+                'grouping_separator' => ' ',
+                'minus_sign' => '−',
+            ],
             'pa' => [
                 'decimal_pattern' => '#,##,##0.###',
                 'percent_pattern' => '#,##,##0%',
@@ -778,6 +804,10 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'decimal_separator' => ',',
                 'grouping_separator' => '.',
             ],
+            'sat' => [
+                'currency_pattern' => '¤ #,##0.00',
+                'accounting_currency_pattern' => '¤ #,##0.00',
+            ],
             'sd' => [
                 'numbering_system' => 'arab',
                 'currency_pattern' => '#,##0.00 ¤',
@@ -788,6 +818,10 @@ class NumberFormatRepository implements NumberFormatRepositoryInterface
                 'minus_sign' => '؜-',
                 'percent_sign' => '٪؜',
             ],
+            'sd-Deva' => [
+                'currency_pattern' => '¤ #,##0.00',
+                'accounting_currency_pattern' => '¤ #,##0.00',
+            ],
             'si' => [],
             'sk' => [
                 'percent_pattern' => '#,##0 %',
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 247294d66..6d0c3f2d0 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -338,7 +338,7 @@ class ClassLoader
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -347,6 +347,8 @@ class ClassLoader
 
             return true;
         }
+
+        return null;
     }
 
     /**
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 0e6b84d2a..337b81d14 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -12,6 +12,7 @@
 
 namespace Composer;
 
+use Composer\Autoload\ClassLoader;
 use Composer\Semver\VersionParser;
 
 
@@ -19,6 +20,8 @@ use Composer\Semver\VersionParser;
 
 
 
+
+
 class InstalledVersions
 {
 private static $installed = array (
@@ -29,7 +32,7 @@ private static $installed = array (
     'aliases' => 
     array (
     ),
-    'reference' => '6fae291cc8ec69a74d0c1673186b3d8f319378d4',
+    'reference' => '3e18efd89fd1bd67f3cef22114f7d74ac7c0021c',
     'name' => 'zotlabs/hubzilla',
   ),
   'versions' => 
@@ -63,12 +66,12 @@ private static $installed = array (
     ),
     'commerceguys/intl' => 
     array (
-      'pretty_version' => 'v1.0.7',
-      'version' => '1.0.7.0',
+      'pretty_version' => 'v1.1.0',
+      'version' => '1.1.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1',
+      'reference' => '90b4f75c4917927a1960c0dcaa002a91ab97f5d5',
     ),
     'desandro/imagesloaded' => 
     array (
@@ -90,12 +93,12 @@ private static $installed = array (
     ),
     'league/html-to-markdown' => 
     array (
-      'pretty_version' => '4.10.0',
-      'version' => '4.10.0.0',
+      'pretty_version' => '5.0.0',
+      'version' => '5.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0868ae7a552e809e5cd8f93ba022071640408e88',
+      'reference' => 'c4dbebbebe0fe454b6b38e6c683a977615bd7dc2',
     ),
     'lukasreschke/id3parser' => 
     array (
@@ -135,12 +138,12 @@ private static $installed = array (
     ),
     'psr/log' => 
     array (
-      'pretty_version' => '1.1.3',
-      'version' => '1.1.3.0',
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
     'ramsey/collection' => 
     array (
@@ -232,21 +235,21 @@ private static $installed = array (
     ),
     'smarty/smarty' => 
     array (
-      'pretty_version' => 'v3.1.38',
-      'version' => '3.1.38.0',
+      'pretty_version' => 'v3.1.39',
+      'version' => '3.1.39.0',
       'aliases' => 
       array (
       ),
-      'reference' => '63b3c0aed0f614880cda21a5c08c606e97b489bb',
+      'reference' => 'e27da524f7bcd7361e3ea5cdfa99c4378a7b5419',
     ),
     'symfony/polyfill-ctype' => 
     array (
-      'pretty_version' => 'v1.22.0',
-      'version' => '1.22.0.0',
+      'pretty_version' => 'v1.23.0',
+      'version' => '1.23.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c6c942b1ac76c82448322025e084cadc56048b4e',
+      'reference' => '46cd95797e9df938fdd2b03693b5fca5e64b01ce',
     ),
     'twbs/bootstrap' => 
     array (
@@ -271,10 +274,12 @@ private static $installed = array (
       'aliases' => 
       array (
       ),
-      'reference' => '6fae291cc8ec69a74d0c1673186b3d8f319378d4',
+      'reference' => '3e18efd89fd1bd67f3cef22114f7d74ac7c0021c',
     ),
   ),
 );
+private static $canGetVendors;
+private static $installedByVendor = array();
 
 
 
@@ -284,7 +289,16 @@ private static $installed = array (
 
 public static function getInstalledPackages()
 {
-return array_keys(self::$installed['versions']);
+$packages = array();
+foreach (self::getInstalled() as $installed) {
+$packages[] = array_keys($installed['versions']);
+}
+
+if (1 === \count($packages)) {
+return $packages[0];
+}
+
+return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
 }
 
 
@@ -297,7 +311,13 @@ return array_keys(self::$installed['versions']);
 
 public static function isInstalled($packageName)
 {
-return isset(self::$installed['versions'][$packageName]);
+foreach (self::getInstalled() as $installed) {
+if (isset($installed['versions'][$packageName])) {
+return true;
+}
+}
+
+return false;
 }
 
 
@@ -332,42 +352,50 @@ return $provided->matches($constraint);
 
 public static function getVersionRanges($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+foreach (self::getInstalled() as $installed) {
+if (!isset($installed['versions'][$packageName])) {
+continue;
 }
 
 $ranges = array();
-if (isset(self::$installed['versions'][$packageName]['pretty_version'])) {
-$ranges[] = self::$installed['versions'][$packageName]['pretty_version'];
+if (isset($installed['versions'][$packageName]['pretty_version'])) {
+$ranges[] = $installed['versions'][$packageName]['pretty_version'];
 }
-if (array_key_exists('aliases', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']);
+if (array_key_exists('aliases', $installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
 }
-if (array_key_exists('replaced', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']);
+if (array_key_exists('replaced', $installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
 }
-if (array_key_exists('provided', self::$installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']);
+if (array_key_exists('provided', $installed['versions'][$packageName])) {
+$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
 }
 
 return implode(' || ', $ranges);
 }
 
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+}
+
 
 
 
 
 public static function getVersion($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+foreach (self::getInstalled() as $installed) {
+if (!isset($installed['versions'][$packageName])) {
+continue;
 }
 
-if (!isset(self::$installed['versions'][$packageName]['version'])) {
+if (!isset($installed['versions'][$packageName]['version'])) {
 return null;
 }
 
-return self::$installed['versions'][$packageName]['version'];
+return $installed['versions'][$packageName]['version'];
+}
+
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
 }
 
 
@@ -376,15 +404,19 @@ return self::$installed['versions'][$packageName]['version'];
 
 public static function getPrettyVersion($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+foreach (self::getInstalled() as $installed) {
+if (!isset($installed['versions'][$packageName])) {
+continue;
 }
 
-if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) {
+if (!isset($installed['versions'][$packageName]['pretty_version'])) {
 return null;
 }
 
-return self::$installed['versions'][$packageName]['pretty_version'];
+return $installed['versions'][$packageName]['pretty_version'];
+}
+
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
 }
 
 
@@ -393,15 +425,19 @@ return self::$installed['versions'][$packageName]['pretty_version'];
 
 public static function getReference($packageName)
 {
-if (!isset(self::$installed['versions'][$packageName])) {
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
+foreach (self::getInstalled() as $installed) {
+if (!isset($installed['versions'][$packageName])) {
+continue;
 }
 
-if (!isset(self::$installed['versions'][$packageName]['reference'])) {
+if (!isset($installed['versions'][$packageName]['reference'])) {
 return null;
 }
 
-return self::$installed['versions'][$packageName]['reference'];
+return $installed['versions'][$packageName]['reference'];
+}
+
+throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
 }
 
 
@@ -410,7 +446,9 @@ return self::$installed['versions'][$packageName]['reference'];
 
 public static function getRootPackage()
 {
-return self::$installed['root'];
+$installed = self::getInstalled();
+
+return $installed[0]['root'];
 }
 
 
@@ -419,8 +457,11 @@ return self::$installed['root'];
 
 
 
+
 public static function getRawData()
 {
+@trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
+
 return self::$installed;
 }
 
@@ -430,6 +471,17 @@ return self::$installed;
 
 
 
+public static function getAllRawData()
+{
+return self::getInstalled();
+}
+
+
+
+
+
+
+
 
 
 
@@ -445,5 +497,33 @@ return self::$installed;
 public static function reload($data)
 {
 self::$installed = $data;
+self::$installedByVendor = array();
+}
+
+
+
+
+
+private static function getInstalled()
+{
+if (null === self::$canGetVendors) {
+self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
+}
+
+$installed = array();
+
+if (self::$canGetVendors) {
+foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+if (isset(self::$installedByVendor[$vendorDir])) {
+$installed[] = self::$installedByVendor[$vendorDir];
+} elseif (is_file($vendorDir.'/composer/installed.php')) {
+$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+}
+}
+}
+
+$installed[] = self::$installed;
+
+return $installed;
 }
 }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 19900534d..22fed00c2 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -299,12 +299,14 @@ return array(
     'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ListItemConverter.php',
     'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/ParagraphConverter.php',
     'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/PreformattedConverter.php',
+    'League\\HTMLToMarkdown\\Converter\\TableConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TableConverter.php',
     'League\\HTMLToMarkdown\\Converter\\TextConverter' => $vendorDir . '/league/html-to-markdown/src/Converter/TextConverter.php',
     'League\\HTMLToMarkdown\\Element' => $vendorDir . '/league/html-to-markdown/src/Element.php',
     'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php',
     'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php',
     'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php',
     'League\\HTMLToMarkdown\\HtmlConverterInterface' => $vendorDir . '/league/html-to-markdown/src/HtmlConverterInterface.php',
+    'League\\HTMLToMarkdown\\PreConverterInterface' => $vendorDir . '/league/html-to-markdown/src/PreConverterInterface.php',
     'Michelf\\Markdown' => $vendorDir . '/michelf/php-markdown/Michelf/Markdown.php',
     'Michelf\\MarkdownExtra' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownExtra.php',
     'Michelf\\MarkdownInterface' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownInterface.php',
@@ -1105,7 +1107,6 @@ return array(
     'Zotlabs\\Daemon\\Onepoll' => $baseDir . '/Zotlabs/Daemon/Onepoll.php',
     'Zotlabs\\Daemon\\Poller' => $baseDir . '/Zotlabs/Daemon/Poller.php',
     'Zotlabs\\Daemon\\Queue' => $baseDir . '/Zotlabs/Daemon/Queue.php',
-    'Zotlabs\\Daemon\\Ratenotif' => $baseDir . '/Zotlabs/Daemon/Ratenotif.php',
     'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php',
     'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php',
     'Zotlabs\\Extend\\Route' => $baseDir . '/Zotlabs/Extend/Route.php',
@@ -1229,7 +1230,6 @@ return array(
     'Zotlabs\\Module\\Embed' => $baseDir . '/Zotlabs/Module/Embed.php',
     'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
     'Zotlabs\\Module\\Event' => $baseDir . '/Zotlabs/Module/Event.php',
-    'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php',
     'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
     'Zotlabs\\Module\\Feed' => $baseDir . '/Zotlabs/Module/Feed.php',
     'Zotlabs\\Module\\Fhubloc_id_url' => $baseDir . '/Zotlabs/Module/Fhubloc_id_url.php',
@@ -1266,7 +1266,6 @@ return array(
     'Zotlabs\\Module\\Magic' => $baseDir . '/Zotlabs/Module/Magic.php',
     'Zotlabs\\Module\\Manage' => $baseDir . '/Zotlabs/Module/Manage.php',
     'Zotlabs\\Module\\Menu' => $baseDir . '/Zotlabs/Module/Menu.php',
-    'Zotlabs\\Module\\Message' => $baseDir . '/Zotlabs/Module/Message.php',
     'Zotlabs\\Module\\Mitem' => $baseDir . '/Zotlabs/Module/Mitem.php',
     'Zotlabs\\Module\\Moderate' => $baseDir . '/Zotlabs/Module/Moderate.php',
     'Zotlabs\\Module\\Mood' => $baseDir . '/Zotlabs/Module/Mood.php',
@@ -1294,14 +1293,10 @@ return array(
     'Zotlabs\\Module\\Photo' => $baseDir . '/Zotlabs/Module/Photo.php',
     'Zotlabs\\Module\\Photos' => $baseDir . '/Zotlabs/Module/Photos.php',
     'Zotlabs\\Module\\Pin' => $baseDir . '/Zotlabs/Module/Pin.php',
-    'Zotlabs\\Module\\Ping' => $baseDir . '/Zotlabs/Module/Ping.php',
     'Zotlabs\\Module\\Poco' => $baseDir . '/Zotlabs/Module/Poco.php',
     'Zotlabs\\Module\\Poke' => $baseDir . '/Zotlabs/Module/Poke.php',
-    'Zotlabs\\Module\\Post' => $baseDir . '/Zotlabs/Module/Post.php',
     'Zotlabs\\Module\\Poster' => $baseDir . '/Zotlabs/Module/Poster.php',
-    'Zotlabs\\Module\\Prate' => $baseDir . '/Zotlabs/Module/Prate.php',
     'Zotlabs\\Module\\Pretheme' => $baseDir . '/Zotlabs/Module/Pretheme.php',
-    'Zotlabs\\Module\\Probe' => $baseDir . '/Zotlabs/Module/Probe.php',
     'Zotlabs\\Module\\Profile' => $baseDir . '/Zotlabs/Module/Profile.php',
     'Zotlabs\\Module\\Profile_photo' => $baseDir . '/Zotlabs/Module/Profile_photo.php',
     'Zotlabs\\Module\\Profiles' => $baseDir . '/Zotlabs/Module/Profiles.php',
@@ -1309,9 +1304,6 @@ return array(
     'Zotlabs\\Module\\Pubsites' => $baseDir . '/Zotlabs/Module/Pubsites.php',
     'Zotlabs\\Module\\Pubstream' => $baseDir . '/Zotlabs/Module/Pubstream.php',
     'Zotlabs\\Module\\Randprof' => $baseDir . '/Zotlabs/Module/Randprof.php',
-    'Zotlabs\\Module\\Rate' => $baseDir . '/Zotlabs/Module/Rate.php',
-    'Zotlabs\\Module\\Ratings' => $baseDir . '/Zotlabs/Module/Ratings.php',
-    'Zotlabs\\Module\\Ratingsearch' => $baseDir . '/Zotlabs/Module/Ratingsearch.php',
     'Zotlabs\\Module\\Rbmark' => $baseDir . '/Zotlabs/Module/Rbmark.php',
     'Zotlabs\\Module\\React' => $baseDir . '/Zotlabs/Module/React.php',
     'Zotlabs\\Module\\Regate' => $baseDir . '/Zotlabs/Module/Regate.php',
@@ -1385,11 +1377,9 @@ return array(
     'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php',
     'Zotlabs\\Module\\Xref' => $baseDir . '/Zotlabs/Module/Xref.php',
     'Zotlabs\\Module\\Z6trans' => $baseDir . '/Zotlabs/Module/Z6trans.php',
-    'Zotlabs\\Module\\Zfinger' => $baseDir . '/Zotlabs/Module/Zfinger.php',
     'Zotlabs\\Module\\Zot' => $baseDir . '/Zotlabs/Module/Zot.php',
     'Zotlabs\\Module\\Zot_probe' => $baseDir . '/Zotlabs/Module/Zot_probe.php',
     'Zotlabs\\Module\\Zotfeed' => $baseDir . '/Zotlabs/Module/Zotfeed.php',
-    'Zotlabs\\Module\\Zping' => $baseDir . '/Zotlabs/Module/Zping.php',
     'Zotlabs\\Photo\\PhotoDriver' => $baseDir . '/Zotlabs/Photo/PhotoDriver.php',
     'Zotlabs\\Photo\\PhotoGd' => $baseDir . '/Zotlabs/Photo/PhotoGd.php',
     'Zotlabs\\Photo\\PhotoImagick' => $baseDir . '/Zotlabs/Photo/PhotoImagick.php',
@@ -1657,6 +1647,9 @@ return array(
     'Zotlabs\\Update\\_1242' => $baseDir . '/Zotlabs/Update/_1242.php',
     'Zotlabs\\Update\\_1243' => $baseDir . '/Zotlabs/Update/_1243.php',
     'Zotlabs\\Update\\_1244' => $baseDir . '/Zotlabs/Update/_1244.php',
+    'Zotlabs\\Update\\_1245' => $baseDir . '/Zotlabs/Update/_1245.php',
+    'Zotlabs\\Update\\_1246' => $baseDir . '/Zotlabs/Update/_1246.php',
+    'Zotlabs\\Update\\_1247' => $baseDir . '/Zotlabs/Update/_1247.php',
     'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
     'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
     'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php',
@@ -1703,6 +1696,7 @@ return array(
     'Zotlabs\\Widget\\Item' => $baseDir . '/Zotlabs/Widget/Item.php',
     'Zotlabs\\Widget\\Mailmenu' => $baseDir . '/Zotlabs/Widget/Mailmenu.php',
     'Zotlabs\\Widget\\Menu_preview' => $baseDir . '/Zotlabs/Widget/Menu_preview.php',
+    'Zotlabs\\Widget\\Messages' => $baseDir . '/Zotlabs/Widget/Messages.php',
     'Zotlabs\\Widget\\Newmember' => $baseDir . '/Zotlabs/Widget/Newmember.php',
     'Zotlabs\\Widget\\Notes' => $baseDir . '/Zotlabs/Widget/Notes.php',
     'Zotlabs\\Widget\\Notifications' => $baseDir . '/Zotlabs/Widget/Notifications.php',
@@ -1731,15 +1725,9 @@ return array(
     'Zotlabs\\Widget\\Wiki_page_history' => $baseDir . '/Zotlabs/Widget/Wiki_page_history.php',
     'Zotlabs\\Widget\\Wiki_pages' => $baseDir . '/Zotlabs/Widget/Wiki_pages.php',
     'Zotlabs\\Widget\\Zcard' => $baseDir . '/Zotlabs/Widget/Zcard.php',
-    'Zotlabs\\Zot6\\Finger' => $baseDir . '/Zotlabs/Zot6/Finger.php',
     'Zotlabs\\Zot6\\IHandler' => $baseDir . '/Zotlabs/Zot6/IHandler.php',
     'Zotlabs\\Zot6\\Receiver' => $baseDir . '/Zotlabs/Zot6/Receiver.php',
     'Zotlabs\\Zot6\\Zot6Handler' => $baseDir . '/Zotlabs/Zot6/Zot6Handler.php',
-    'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php',
-    'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php',
-    'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php',
-    'Zotlabs\\Zot\\Receiver' => $baseDir . '/Zotlabs/Zot/Receiver.php',
-    'Zotlabs\\Zot\\ZotHandler' => $baseDir . '/Zotlabs/Zot/ZotHandler.php',
     'phpseclib\\Crypt\\AES' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/AES.php',
     'phpseclib\\Crypt\\Base' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Base.php',
     'phpseclib\\Crypt\\Blowfish' => $vendorDir . '/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 2d71ba507..eb84f6fbb 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -489,12 +489,14 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'League\\HTMLToMarkdown\\Converter\\ListItemConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ListItemConverter.php',
         'League\\HTMLToMarkdown\\Converter\\ParagraphConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/ParagraphConverter.php',
         'League\\HTMLToMarkdown\\Converter\\PreformattedConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/PreformattedConverter.php',
+        'League\\HTMLToMarkdown\\Converter\\TableConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TableConverter.php',
         'League\\HTMLToMarkdown\\Converter\\TextConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/Converter/TextConverter.php',
         'League\\HTMLToMarkdown\\Element' => __DIR__ . '/..' . '/league/html-to-markdown/src/Element.php',
         'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php',
         'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php',
         'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php',
         'League\\HTMLToMarkdown\\HtmlConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverterInterface.php',
+        'League\\HTMLToMarkdown\\PreConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/PreConverterInterface.php',
         'Michelf\\Markdown' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/Markdown.php',
         'Michelf\\MarkdownExtra' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/MarkdownExtra.php',
         'Michelf\\MarkdownInterface' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/MarkdownInterface.php',
@@ -1295,7 +1297,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Daemon\\Onepoll' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Onepoll.php',
         'Zotlabs\\Daemon\\Poller' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Poller.php',
         'Zotlabs\\Daemon\\Queue' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Queue.php',
-        'Zotlabs\\Daemon\\Ratenotif' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Ratenotif.php',
         'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php',
         'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php',
         'Zotlabs\\Extend\\Route' => __DIR__ . '/../..' . '/Zotlabs/Extend/Route.php',
@@ -1419,7 +1420,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Embed' => __DIR__ . '/../..' . '/Zotlabs/Module/Embed.php',
         'Zotlabs\\Module\\Embedphotos' => __DIR__ . '/../..' . '/Zotlabs/Module/Embedphotos.php',
         'Zotlabs\\Module\\Event' => __DIR__ . '/../..' . '/Zotlabs/Module/Event.php',
-        'Zotlabs\\Module\\Events' => __DIR__ . '/../..' . '/Zotlabs/Module/Events.php',
         'Zotlabs\\Module\\Fbrowser' => __DIR__ . '/../..' . '/Zotlabs/Module/Fbrowser.php',
         'Zotlabs\\Module\\Feed' => __DIR__ . '/../..' . '/Zotlabs/Module/Feed.php',
         'Zotlabs\\Module\\Fhubloc_id_url' => __DIR__ . '/../..' . '/Zotlabs/Module/Fhubloc_id_url.php',
@@ -1456,7 +1456,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Magic' => __DIR__ . '/../..' . '/Zotlabs/Module/Magic.php',
         'Zotlabs\\Module\\Manage' => __DIR__ . '/../..' . '/Zotlabs/Module/Manage.php',
         'Zotlabs\\Module\\Menu' => __DIR__ . '/../..' . '/Zotlabs/Module/Menu.php',
-        'Zotlabs\\Module\\Message' => __DIR__ . '/../..' . '/Zotlabs/Module/Message.php',
         'Zotlabs\\Module\\Mitem' => __DIR__ . '/../..' . '/Zotlabs/Module/Mitem.php',
         'Zotlabs\\Module\\Moderate' => __DIR__ . '/../..' . '/Zotlabs/Module/Moderate.php',
         'Zotlabs\\Module\\Mood' => __DIR__ . '/../..' . '/Zotlabs/Module/Mood.php',
@@ -1484,14 +1483,10 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Photo' => __DIR__ . '/../..' . '/Zotlabs/Module/Photo.php',
         'Zotlabs\\Module\\Photos' => __DIR__ . '/../..' . '/Zotlabs/Module/Photos.php',
         'Zotlabs\\Module\\Pin' => __DIR__ . '/../..' . '/Zotlabs/Module/Pin.php',
-        'Zotlabs\\Module\\Ping' => __DIR__ . '/../..' . '/Zotlabs/Module/Ping.php',
         'Zotlabs\\Module\\Poco' => __DIR__ . '/../..' . '/Zotlabs/Module/Poco.php',
         'Zotlabs\\Module\\Poke' => __DIR__ . '/../..' . '/Zotlabs/Module/Poke.php',
-        'Zotlabs\\Module\\Post' => __DIR__ . '/../..' . '/Zotlabs/Module/Post.php',
         'Zotlabs\\Module\\Poster' => __DIR__ . '/../..' . '/Zotlabs/Module/Poster.php',
-        'Zotlabs\\Module\\Prate' => __DIR__ . '/../..' . '/Zotlabs/Module/Prate.php',
         'Zotlabs\\Module\\Pretheme' => __DIR__ . '/../..' . '/Zotlabs/Module/Pretheme.php',
-        'Zotlabs\\Module\\Probe' => __DIR__ . '/../..' . '/Zotlabs/Module/Probe.php',
         'Zotlabs\\Module\\Profile' => __DIR__ . '/../..' . '/Zotlabs/Module/Profile.php',
         'Zotlabs\\Module\\Profile_photo' => __DIR__ . '/../..' . '/Zotlabs/Module/Profile_photo.php',
         'Zotlabs\\Module\\Profiles' => __DIR__ . '/../..' . '/Zotlabs/Module/Profiles.php',
@@ -1499,9 +1494,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Pubsites' => __DIR__ . '/../..' . '/Zotlabs/Module/Pubsites.php',
         'Zotlabs\\Module\\Pubstream' => __DIR__ . '/../..' . '/Zotlabs/Module/Pubstream.php',
         'Zotlabs\\Module\\Randprof' => __DIR__ . '/../..' . '/Zotlabs/Module/Randprof.php',
-        'Zotlabs\\Module\\Rate' => __DIR__ . '/../..' . '/Zotlabs/Module/Rate.php',
-        'Zotlabs\\Module\\Ratings' => __DIR__ . '/../..' . '/Zotlabs/Module/Ratings.php',
-        'Zotlabs\\Module\\Ratingsearch' => __DIR__ . '/../..' . '/Zotlabs/Module/Ratingsearch.php',
         'Zotlabs\\Module\\Rbmark' => __DIR__ . '/../..' . '/Zotlabs/Module/Rbmark.php',
         'Zotlabs\\Module\\React' => __DIR__ . '/../..' . '/Zotlabs/Module/React.php',
         'Zotlabs\\Module\\Regate' => __DIR__ . '/../..' . '/Zotlabs/Module/Regate.php',
@@ -1575,11 +1567,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Xrd' => __DIR__ . '/../..' . '/Zotlabs/Module/Xrd.php',
         'Zotlabs\\Module\\Xref' => __DIR__ . '/../..' . '/Zotlabs/Module/Xref.php',
         'Zotlabs\\Module\\Z6trans' => __DIR__ . '/../..' . '/Zotlabs/Module/Z6trans.php',
-        'Zotlabs\\Module\\Zfinger' => __DIR__ . '/../..' . '/Zotlabs/Module/Zfinger.php',
         'Zotlabs\\Module\\Zot' => __DIR__ . '/../..' . '/Zotlabs/Module/Zot.php',
         'Zotlabs\\Module\\Zot_probe' => __DIR__ . '/../..' . '/Zotlabs/Module/Zot_probe.php',
         'Zotlabs\\Module\\Zotfeed' => __DIR__ . '/../..' . '/Zotlabs/Module/Zotfeed.php',
-        'Zotlabs\\Module\\Zping' => __DIR__ . '/../..' . '/Zotlabs/Module/Zping.php',
         'Zotlabs\\Photo\\PhotoDriver' => __DIR__ . '/../..' . '/Zotlabs/Photo/PhotoDriver.php',
         'Zotlabs\\Photo\\PhotoGd' => __DIR__ . '/../..' . '/Zotlabs/Photo/PhotoGd.php',
         'Zotlabs\\Photo\\PhotoImagick' => __DIR__ . '/../..' . '/Zotlabs/Photo/PhotoImagick.php',
@@ -1847,6 +1837,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Update\\_1242' => __DIR__ . '/../..' . '/Zotlabs/Update/_1242.php',
         'Zotlabs\\Update\\_1243' => __DIR__ . '/../..' . '/Zotlabs/Update/_1243.php',
         'Zotlabs\\Update\\_1244' => __DIR__ . '/../..' . '/Zotlabs/Update/_1244.php',
+        'Zotlabs\\Update\\_1245' => __DIR__ . '/../..' . '/Zotlabs/Update/_1245.php',
+        'Zotlabs\\Update\\_1246' => __DIR__ . '/../..' . '/Zotlabs/Update/_1246.php',
+        'Zotlabs\\Update\\_1247' => __DIR__ . '/../..' . '/Zotlabs/Update/_1247.php',
         'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php',
         'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php',
         'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php',
@@ -1893,6 +1886,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Widget\\Item' => __DIR__ . '/../..' . '/Zotlabs/Widget/Item.php',
         'Zotlabs\\Widget\\Mailmenu' => __DIR__ . '/../..' . '/Zotlabs/Widget/Mailmenu.php',
         'Zotlabs\\Widget\\Menu_preview' => __DIR__ . '/../..' . '/Zotlabs/Widget/Menu_preview.php',
+        'Zotlabs\\Widget\\Messages' => __DIR__ . '/../..' . '/Zotlabs/Widget/Messages.php',
         'Zotlabs\\Widget\\Newmember' => __DIR__ . '/../..' . '/Zotlabs/Widget/Newmember.php',
         'Zotlabs\\Widget\\Notes' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notes.php',
         'Zotlabs\\Widget\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notifications.php',
@@ -1921,15 +1915,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Widget\\Wiki_page_history' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_page_history.php',
         'Zotlabs\\Widget\\Wiki_pages' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_pages.php',
         'Zotlabs\\Widget\\Zcard' => __DIR__ . '/../..' . '/Zotlabs/Widget/Zcard.php',
-        'Zotlabs\\Zot6\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Finger.php',
         'Zotlabs\\Zot6\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot6/IHandler.php',
         'Zotlabs\\Zot6\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Receiver.php',
         'Zotlabs\\Zot6\\Zot6Handler' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Zot6Handler.php',
-        'Zotlabs\\Zot\\Auth' => __DIR__ . '/../..' . '/Zotlabs/Zot/Auth.php',
-        'Zotlabs\\Zot\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot/Finger.php',
-        'Zotlabs\\Zot\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/IHandler.php',
-        'Zotlabs\\Zot\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot/Receiver.php',
-        'Zotlabs\\Zot\\ZotHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/ZotHandler.php',
         'phpseclib\\Crypt\\AES' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/AES.php',
         'phpseclib\\Crypt\\Base' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Base.php',
         'phpseclib\\Crypt\\Blowfish' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ce3eae708..50378ffa9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -186,27 +186,27 @@
         },
         {
             "name": "commerceguys/intl",
-            "version": "v1.0.7",
-            "version_normalized": "1.0.7.0",
+            "version": "v1.1.0",
+            "version_normalized": "1.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/commerceguys/intl.git",
-                "reference": "0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1"
+                "reference": "90b4f75c4917927a1960c0dcaa002a91ab97f5d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/commerceguys/intl/zipball/0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1",
-                "reference": "0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1",
+                "url": "https://api.github.com/repos/commerceguys/intl/zipball/90b4f75c4917927a1960c0dcaa002a91ab97f5d5",
+                "reference": "90b4f75c4917927a1960c0dcaa002a91ab97f5d5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.8"
+                "php": ">=7.1.3"
             },
             "require-dev": {
                 "mikey179/vfsstream": "1.*",
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^7.5"
             },
-            "time": "2020-10-04T20:58:22+00:00",
+            "time": "2021-05-17T08:25:58+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -231,7 +231,7 @@
             "description": "Internationalization library powered by CLDR data.",
             "support": {
                 "issues": "https://github.com/commerceguys/intl/issues",
-                "source": "https://github.com/commerceguys/intl/tree/v1.0.7"
+                "source": "https://github.com/commerceguys/intl/tree/v1.1.0"
             },
             "install-path": "../commerceguys/intl"
         },
@@ -332,37 +332,40 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "4.10.0",
-            "version_normalized": "4.10.0.0",
+            "version": "5.0.0",
+            "version_normalized": "5.0.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "0868ae7a552e809e5cd8f93ba022071640408e88"
+                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/0868ae7a552e809e5cd8f93ba022071640408e88",
-                "reference": "0868ae7a552e809e5cd8f93ba022071640408e88",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
+                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-xml": "*",
-                "php": ">=5.3.3"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "mikehaertl/php-shellcommand": "~1.1.0",
-                "phpunit/phpunit": "^4.8|^5.7",
-                "scrutinizer/ocular": "~1.1"
-            },
-            "time": "2020-07-01T00:34:03+00:00",
+                "mikehaertl/php-shellcommand": "^1.1.0",
+                "phpstan/phpstan": "^0.12.82",
+                "phpunit/phpunit": "^8.5 || ^9.2",
+                "scrutinizer/ocular": "^1.6",
+                "unleashedtech/php-coding-standard": "^2.7",
+                "vimeo/psalm": "^4.6"
+            },
+            "time": "2021-03-29T01:29:08+00:00",
             "bin": [
                 "bin/html-to-markdown"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.10-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "installation-source": "dist",
@@ -395,6 +398,10 @@
                 "html",
                 "markdown"
             ],
+            "support": {
+                "issues": "https://github.com/thephpleague/html-to-markdown/issues",
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.0"
+            },
             "funding": [
                 {
                     "url": "https://www.colinodell.com/sponsor",
@@ -671,23 +678,23 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
-            "version_normalized": "1.1.3.0",
+            "version": "1.1.4",
+            "version_normalized": "1.1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2020-03-23T09:12:05+00:00",
+            "time": "2021-05-03T11:20:27+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -707,7 +714,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -717,6 +724,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "install-path": "../psr/log"
         },
         {
@@ -1437,17 +1447,17 @@
         },
         {
             "name": "smarty/smarty",
-            "version": "v3.1.38",
-            "version_normalized": "3.1.38.0",
+            "version": "v3.1.39",
+            "version_normalized": "3.1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "63b3c0aed0f614880cda21a5c08c606e97b489bb"
+                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/63b3c0aed0f614880cda21a5c08c606e97b489bb",
-                "reference": "63b3c0aed0f614880cda21a5c08c606e97b489bb",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
+                "reference": "e27da524f7bcd7361e3ea5cdfa99c4378a7b5419",
                 "shasum": ""
             },
             "require": {
@@ -1457,7 +1467,7 @@
                 "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
                 "smarty/smarty-lexer": "^3.1"
             },
-            "time": "2021-01-08T14:05:42+00:00",
+            "time": "2021-02-17T21:57:51+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1497,23 +1507,23 @@
                 "forum": "http://www.smarty.net/forums/",
                 "irc": "irc://irc.freenode.org/smarty",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v3.1.38"
+                "source": "https://github.com/smarty-php/smarty/tree/v3.1.39"
             },
             "install-path": "../smarty/smarty"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.0",
-            "version_normalized": "1.22.0.0",
+            "version": "v1.23.0",
+            "version_normalized": "1.23.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
@@ -1522,11 +1532,11 @@
             "suggest": {
                 "ext-ctype": "For best performance"
             },
-            "time": "2021-01-07T16:49:33+00:00",
+            "time": "2021-02-19T12:13:01+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1565,7 +1575,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
             },
             "funding": [
                 {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 151f3da50..41234ad84 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '6fae291cc8ec69a74d0c1673186b3d8f319378d4',
+    'reference' => '3e18efd89fd1bd67f3cef22114f7d74ac7c0021c',
     'name' => 'zotlabs/hubzilla',
   ),
   'versions' => 
@@ -40,12 +40,12 @@
     ),
     'commerceguys/intl' => 
     array (
-      'pretty_version' => 'v1.0.7',
-      'version' => '1.0.7.0',
+      'pretty_version' => 'v1.1.0',
+      'version' => '1.1.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0bf0beb12e37ef1a61e0d09dc66cdaa1a23e62e1',
+      'reference' => '90b4f75c4917927a1960c0dcaa002a91ab97f5d5',
     ),
     'desandro/imagesloaded' => 
     array (
@@ -67,12 +67,12 @@
     ),
     'league/html-to-markdown' => 
     array (
-      'pretty_version' => '4.10.0',
-      'version' => '4.10.0.0',
+      'pretty_version' => '5.0.0',
+      'version' => '5.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0868ae7a552e809e5cd8f93ba022071640408e88',
+      'reference' => 'c4dbebbebe0fe454b6b38e6c683a977615bd7dc2',
     ),
     'lukasreschke/id3parser' => 
     array (
@@ -112,12 +112,12 @@
     ),
     'psr/log' => 
     array (
-      'pretty_version' => '1.1.3',
-      'version' => '1.1.3.0',
+      'pretty_version' => '1.1.4',
+      'version' => '1.1.4.0',
       'aliases' => 
       array (
       ),
-      'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc',
+      'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
     ),
     'ramsey/collection' => 
     array (
@@ -209,21 +209,21 @@
     ),
     'smarty/smarty' => 
     array (
-      'pretty_version' => 'v3.1.38',
-      'version' => '3.1.38.0',
+      'pretty_version' => 'v3.1.39',
+      'version' => '3.1.39.0',
       'aliases' => 
       array (
       ),
-      'reference' => '63b3c0aed0f614880cda21a5c08c606e97b489bb',
+      'reference' => 'e27da524f7bcd7361e3ea5cdfa99c4378a7b5419',
     ),
     'symfony/polyfill-ctype' => 
     array (
-      'pretty_version' => 'v1.22.0',
-      'version' => '1.22.0.0',
+      'pretty_version' => 'v1.23.0',
+      'version' => '1.23.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c6c942b1ac76c82448322025e084cadc56048b4e',
+      'reference' => '46cd95797e9df938fdd2b03693b5fca5e64b01ce',
     ),
     'twbs/bootstrap' => 
     array (
@@ -248,7 +248,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '6fae291cc8ec69a74d0c1673186b3d8f319378d4',
+      'reference' => '3e18efd89fd1bd67f3cef22114f7d74ac7c0021c',
     ),
   ),
 );
diff --git a/vendor/league/html-to-markdown/.github/workflows/tests.yml b/vendor/league/html-to-markdown/.github/workflows/tests.yml
new file mode 100644
index 000000000..6abb2de3f
--- /dev/null
+++ b/vendor/league/html-to-markdown/.github/workflows/tests.yml
@@ -0,0 +1,104 @@
+name: Tests
+
+on:
+    push: ~
+    pull_request: ~
+
+jobs:
+    phpcs:
+        name: PHPCS
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 7.2
+                  extensions: curl, mbstring
+                  coverage: none
+                  tools: composer:v2, cs2pr
+
+            - run: composer update --no-progress
+
+            - run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
+
+    phpunit:
+        name: PHPUnit on ${{ matrix.php }} ${{ matrix.composer-flags }}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: ['7.2', '7.3', '7.4']
+                coverage: [true]
+                composer-flags: ['']
+                include:
+                    - php: '8.0'
+                      coverage: false
+                      composer-flags: '--ignore-platform-req=php'
+                    - php: '7.2'
+                      coverage: false
+                      composer-flags: '--prefer-lowest'
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  extensions: curl, mbstring
+                  coverage: pcov
+                  tools: composer:v2
+
+            - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+            - name: "Use PHPUnit 9.3+ on PHP 8"
+              run: composer require --no-update --dev phpunit/phpunit:^9.3
+              if: "matrix.php == '8.0'"
+
+            - run: composer update --no-progress ${{ matrix.composer-flags }}
+
+            - run: vendor/bin/phpunit --no-coverage
+              if: ${{ !matrix.coverage }}
+
+            - run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+              if: ${{ matrix.coverage }}
+
+            - run: php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+              if: ${{ matrix.coverage }}
+              continue-on-error: true
+
+    phpstan:
+        name: PHPStan
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 7.2
+                  extensions: curl, mbstring
+                  coverage: none
+                  tools: composer:v2
+
+            - run: composer update --no-progress
+
+            - run: vendor/bin/phpstan analyse --no-progress
+
+    psalm:
+        name: Psalm
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 7.2
+                  extensions: curl, mbstring
+                  coverage: none
+                  tools: composer:v2
+
+            - run: composer update --no-progress
+
+            - run: vendor/bin/psalm --no-progress --output-format=github
diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md
index c19cd9f69..71ae9c9a8 100644
--- a/vendor/league/html-to-markdown/CHANGELOG.md
+++ b/vendor/league/html-to-markdown/CHANGELOG.md
@@ -4,6 +4,31 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+## [5.0.0] - 2021-03-28
+
+### Added
+
+ - Added support for tables (#203)
+    - This feature is disable by default - see README for how to enable it
+ - Added new `strip_placeholder_links` option to strip `<a>` tags without `href` attributes (#196)
+ - Added new methods to `ElementInterface`:
+    - `hasParent()`
+    - `getNextSibling()`
+    - `getPreviousSibling()`
+    - `getListItemLevel()`
+ - Added several parameter and return types across all classes
+ - Added new `PreConverterInterface` to allow converters to perform any necessary pre-parsing
+
+### Changed
+
+ - Supported PHP versions increased to PHP 7.2 - 8.0
+ - `HtmlConverter::convert()` may now throw a `\RuntimeException` when unexpected `DOMDocument`-related errors occur
+
+### Fixed
+
+ - Fixed complex nested lists containing heading and paragraphs (#198)
+ - Fixed consecutive emphasis producing incorrect markdown (#202)
+
 ## [4.10.0] - 2020-06-30
 ### Added
 
@@ -268,7 +293,8 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce
 ### Added
  - Initial release
 
-[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.10.0...master
+[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/5.0.0...master
+[5.0.0]: https://github.com/thephpleague/html-to-markdown/compare/4.10.0...5.0.0
 [4.10.0]: https://github.com/thephpleague/html-to-markdown/compare/4.9.1...4.10.0
 [4.9.1]: https://github.com/thephpleague/html-to-markdown/compare/4.9.0...4.9.1
 [4.9.0]: https://github.com/thephpleague/html-to-markdown/compare/4.8.3...4.9.0
diff --git a/vendor/league/html-to-markdown/README.md b/vendor/league/html-to-markdown/README.md
index c1ac805ab..fcc256328 100644
--- a/vendor/league/html-to-markdown/README.md
+++ b/vendor/league/html-to-markdown/README.md
@@ -1,11 +1,9 @@
 HTML To Markdown for PHP
 ========================
 
-[![Join the chat at https://gitter.im/thephpleague/html-to-markdown](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/thephpleague/html-to-markdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 [![Latest Version](https://img.shields.io/packagist/v/league/html-to-markdown.svg?style=flat-square)](https://packagist.org/packages/league/html-to-markdown)
 [![Software License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![Build Status](https://img.shields.io/travis/thephpleague/html-to-markdown/master.svg?style=flat-square)](https://travis-ci.org/thephpleague/html-to-markdown)
+[![Build Status](https://img.shields.io/github/workflow/status/thephpleague/html-to-markdown/Tests/master.svg?style=flat-square)](https://github.com/thephpleague/html-to-markdown/actions?query=workflow%3ATests+branch%3Amaster)
 [![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/thephpleague/html-to-markdown.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown/code-structure)
 [![Quality Score](https://img.shields.io/scrutinizer/g/thephpleague/html-to-markdown.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/html-to-markdown)
 [![Total Downloads](https://img.shields.io/packagist/dt/league/html-to-markdown.svg?style=flat-square)](https://packagist.org/packages/league/html-to-markdown)
@@ -13,7 +11,7 @@ HTML To Markdown for PHP
 Library which converts HTML to [Markdown](http://daringfireball.net/projects/markdown/) for your sanity and convenience.
 
 
-**Requires**: PHP 5.3+ or PHP 7.0+
+**Requires**: PHP 7.2+
 
 **Lead Developer**: [@colinodell](http://twitter.com/colinodell)
 
@@ -113,6 +111,15 @@ $html = '<span>Turnips!</span><!-- Monkeys! --><!-- Eggs! -->';
 $markdown = $converter->convert($html); // $markdown now contains "Turnips!<!-- Eggs! -->"
 ```
 
+By default, placeholder links are preserved. To strip the placeholder links, use the `strip_placeholder_links` option, like this:
+
+```php
+$converter = new HtmlConverter(array('strip_placeholder_links' => true));
+
+$html = '<a>Github</a>';
+$markdown = $converter->convert($html); // $markdown now contains "Github"
+```
+
 ### Style options
 
 By default bold tags are converted using the asterisk syntax, and italic tags are converted using the underlined syntax. Change these by using the `bold_style` and `italic_style` options.
@@ -174,17 +181,24 @@ $html = '<h3>Header</h3>
 $markdown = $converter->convert($html); // $markdown now contains "### Header" and "<img src="" />"
 ```
 
-### Limitations
+### Table support
 
-- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown.
+Support for Markdown tables is not enabled by default because it is not part of the original Markdown syntax. To use tables add the converter explicitly:
 
-### Known issues
+```php
+use League\HTMLToMarkdown\HtmlConverter;
+use League\HTMLToMarkdown\Converter\TableConverter;
+
+$converter = new HtmlConverter();
+$converter->getEnvironment()->addConverter(new TableConverter());
+
+$html = "<table><tr><th>A</th></tr><tr><td>a</td></tr></table>";
+$markdown = $converter->convert($html);
+```
 
-- Nested lists and lists containing multiple paragraphs aren't converted correctly.
-- Lists inside blockquotes aren't converted correctly.
-- Any reported [open issues here](https://github.com/thephpleague/html-to-markdown/issues?state=open).
+### Limitations
 
-[Report your issue or request a feature here.](https://github.com/thephpleague/html-to-markdown/issues/new) Issues with patches or failing tests are especially welcome.
+- Markdown Extra, MultiMarkdown and other variants aren't supported – just Markdown.
 
 ### Style notes
 
diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json
index 7990bcace..af3e41058 100644
--- a/vendor/league/html-to-markdown/composer.json
+++ b/vendor/league/html-to-markdown/composer.json
@@ -30,19 +30,22 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": "^7.2.5 || ^8.0",
         "ext-dom": "*",
         "ext-xml": "*"
     },
     "require-dev": {
-        "mikehaertl/php-shellcommand": "~1.1.0",
-        "phpunit/phpunit": "^4.8|^5.7",
-        "scrutinizer/ocular": "~1.1"
+        "mikehaertl/php-shellcommand": "^1.1.0",
+        "phpstan/phpstan": "^0.12.82",
+        "phpunit/phpunit": "^8.5 || ^9.2",
+        "scrutinizer/ocular": "^1.6",
+        "unleashedtech/php-coding-standard": "^2.7",
+        "vimeo/psalm": "^4.6"
     },
     "bin": ["bin/html-to-markdown"],
     "extra": {
         "branch-alias": {
-            "dev-master": "4.10-dev"
+            "dev-master": "5.1-dev"
         }
     }
 }
diff --git a/vendor/league/html-to-markdown/phpcs.xml.dist b/vendor/league/html-to-markdown/phpcs.xml.dist
new file mode 100644
index 000000000..59f148473
--- /dev/null
+++ b/vendor/league/html-to-markdown/phpcs.xml.dist
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+
+    <!-- Ignore warnings, show progress of the run and show sniff names -->
+    <arg value="nps"/>
+
+    <!-- Directories to be checked -->
+    <file>src</file>
+    <file>tests</file>
+
+    <!-- Include full Unleashed Coding Standard -->
+    <rule ref="Unleashed"/>
+
+    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden">
+        <exclude-pattern>src/HtmlConverter*\.php</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectOrderOfAnnotationsGroup">
+        <exclude-pattern>src/HtmlConverter*\.php</exclude-pattern>
+    </rule>
+
+</ruleset>
diff --git a/vendor/league/html-to-markdown/phpstan.neon.dist b/vendor/league/html-to-markdown/phpstan.neon.dist
new file mode 100644
index 000000000..a1c637a78
--- /dev/null
+++ b/vendor/league/html-to-markdown/phpstan.neon.dist
@@ -0,0 +1,4 @@
+parameters:
+  level: max
+  paths:
+    - src
diff --git a/vendor/league/html-to-markdown/psalm.xml b/vendor/league/html-to-markdown/psalm.xml
new file mode 100644
index 000000000..729e9a919
--- /dev/null
+++ b/vendor/league/html-to-markdown/psalm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="false"
+    errorLevel="3"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php
index 5bc8d5503..7e1d71e68 100644
--- a/vendor/league/html-to-markdown/src/Configuration.php
+++ b/vendor/league/html-to-markdown/src/Configuration.php
@@ -1,15 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 class Configuration
 {
+    /** @var array<string, mixed> */
     protected $config;
 
     /**
-     * @param array $config
+     * @param array<string, mixed> $config
      */
-    public function __construct(array $config = array())
+    public function __construct(array $config = [])
     {
         $this->config = $config;
 
@@ -17,59 +20,60 @@ class Configuration
     }
 
     /**
-     * @param array $config
+     * @param array<string, mixed> $config
      */
-    public function merge(array $config = array())
+    public function merge(array $config = []): void
     {
         $this->checkForDeprecatedOptions($config);
-        $this->config = array_replace_recursive($this->config, $config);
+        $this->config = \array_replace_recursive($this->config, $config);
     }
 
     /**
-     * @param array $config
+     * @param array<string, mixed> $config
      */
-    public function replace(array $config = array())
+    public function replace(array $config = []): void
     {
         $this->checkForDeprecatedOptions($config);
         $this->config = $config;
     }
 
     /**
-     * @param string $key
-     * @param mixed  $value
+     * @param mixed $value
      */
-    public function setOption($key, $value)
+    public function setOption(string $key, $value): void
     {
-        $this->checkForDeprecatedOptions(array($key => $value));
+        $this->checkForDeprecatedOptions([$key => $value]);
         $this->config[$key] = $value;
     }
 
     /**
-     * @param string|null $key
-     * @param mixed|null  $default
+     * @param mixed|null $default
      *
      * @return mixed|null
      */
-    public function getOption($key = null, $default = null)
+    public function getOption(?string $key = null, $default = null)
     {
         if ($key === null) {
             return $this->config;
         }
 
-        if (!isset($this->config[$key])) {
+        if (! isset($this->config[$key])) {
             return $default;
         }
 
         return $this->config[$key];
     }
 
-    private function checkForDeprecatedOptions(array $config)
+    /**
+     * @param array<string, mixed> $config
+     */
+    private function checkForDeprecatedOptions(array $config): void
     {
         foreach ($config as $key => $value) {
             if ($key === 'bold_style' && $value !== '**') {
-                @trigger_error('Customizing the bold_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
+                @\trigger_error('Customizing the bold_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
             } elseif ($key === 'italic_style' && $value !== '*') {
-                @trigger_error('Customizing the italic_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
+                @\trigger_error('Customizing the italic_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
             }
         }
     }
diff --git a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php
index 8aca530be..50c004c4a 100644
--- a/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php
+++ b/vendor/league/html-to-markdown/src/ConfigurationAwareInterface.php
@@ -1,11 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 interface ConfigurationAwareInterface
 {
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config);
+    public function setConfig(Configuration $config): void;
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/BlockquoteConverter.php b/vendor/league/html-to-markdown/src/Converter/BlockquoteConverter.php
index eb2d09d17..65034db12 100644
--- a/vendor/league/html-to-markdown/src/Converter/BlockquoteConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/BlockquoteConverter.php
@@ -1,32 +1,30 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class BlockquoteConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         // Contents should have already been converted to Markdown by this point,
         // so we just need to add '>' symbols to each line.
 
         $markdown = '';
 
-        $quote_content = trim($element->getValue());
+        $quoteContent = \trim($element->getValue());
 
-        $lines = preg_split('/\r\n|\r|\n/', $quote_content);
+        $lines = \preg_split('/\r\n|\r|\n/', $quoteContent);
+        \assert(\is_array($lines));
 
-        $total_lines = count($lines);
+        $totalLines = \count($lines);
 
         foreach ($lines as $i => $line) {
             $markdown .= '> ' . $line . "\n";
-            if ($i + 1 === $total_lines) {
+            if ($i + 1 === $totalLines) {
                 $markdown .= "\n";
             }
         }
@@ -37,8 +35,8 @@ class BlockquoteConverter implements ConverterInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('blockquote');
+        return ['blockquote'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
index 39e6a7bc4..40eb7f85a 100644
--- a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
@@ -1,17 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class CodeConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         $language = '';
 
@@ -20,23 +17,24 @@ class CodeConverter implements ConverterInterface
 
         if ($classes) {
             // Since tags can have more than one class, we need to find the one that starts with 'language-'
-            $classes = explode(' ', $classes);
+            $classes = \explode(' ', $classes);
             foreach ($classes as $class) {
-                if (strpos($class, 'language-') !== false) {
+                if (\strpos($class, 'language-') !== false) {
                     // Found one, save it as the selected language and stop looping over the classes.
-                    $language = str_replace('language-', '', $class);
+                    $language = \str_replace('language-', '', $class);
                     break;
                 }
             }
         }
 
         $markdown = '';
-        $code = html_entity_decode($element->getChildrenAsString());
+        $code     = \html_entity_decode($element->getChildrenAsString());
 
         // In order to remove the code tags we need to search for them and, in the case of the opening tag
         // use a regular expression to find the tag and the other attributes it might have
-        $code = preg_replace('/<code\b[^>]*>/', '', $code);
-        $code = str_replace('</code>', '', $code);
+        $code = \preg_replace('/<code\b[^>]*>/', '', $code);
+        \assert($code !== null);
+        $code = \str_replace('</code>', '', $code);
 
         // Checking if it's a code block or span
         if ($this->shouldBeBlock($element, $code)) {
@@ -44,7 +42,7 @@ class CodeConverter implements ConverterInterface
             $markdown .= '```' . $language . "\n" . $code . "\n" . '```';
         } else {
             // One line of code, wrapping it on one backtick, removing new lines
-            $markdown .= '`' . preg_replace('/\r\n|\r|\n/', '', $code) . '`';
+            $markdown .= '`' . \preg_replace('/\r\n|\r|\n/', '', $code) . '`';
         }
 
         return $markdown;
@@ -53,27 +51,18 @@ class CodeConverter implements ConverterInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('code');
+        return ['code'];
     }
 
-    /**
-     * @param ElementInterface $element
-     * @param string $code
-     *
-     * @return bool
-     */
-    private function shouldBeBlock(ElementInterface $element, $code)
+    private function shouldBeBlock(ElementInterface $element, string $code): bool
     {
-        if ($element->getParent()->getTagName() == 'pre') {
-            return true;
-        }
-
-        if (preg_match('/[^\s]` `/', $code)) {
+        $parent = $element->getParent();
+        if ($parent !== null && $parent->getTagName() === 'pre') {
             return true;
         }
 
-        return false;
+        return \preg_match('/[^\s]` `/', $code) === 1;
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php
index 959381d1b..c69dea551 100644
--- a/vendor/league/html-to-markdown/src/Converter/CommentConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/CommentConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,55 +10,44 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class CommentConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         if ($this->shouldPreserve($element)) {
             return '<!--' . $element->getValue() . '-->';
         }
+
         return '';
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('#comment');
+        return ['#comment'];
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return bool
-     */
-    private function shouldPreserve(ElementInterface $element)
+    private function shouldPreserve(ElementInterface $element): bool
     {
         $preserve = $this->config->getOption('preserve_comments');
         if ($preserve === true) {
             return true;
         }
-        if (is_array($preserve)) {
-            $value = trim($element->getValue());
-            return in_array($value, $preserve);
+
+        if (\is_array($preserve)) {
+            $value = \trim($element->getValue());
+
+            return \in_array($value, $preserve, true);
         }
+
         return false;
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/ConverterInterface.php b/vendor/league/html-to-markdown/src/Converter/ConverterInterface.php
index 8530559a0..f10498578 100644
--- a/vendor/league/html-to-markdown/src/Converter/ConverterInterface.php
+++ b/vendor/league/html-to-markdown/src/Converter/ConverterInterface.php
@@ -1,20 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 interface ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element);
+    public function convert(ElementInterface $element): string;
 
     /**
      * @return string[]
      */
-    public function getSupportedTags();
+    public function getSupportedTags(): array;
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/DefaultConverter.php b/vendor/league/html-to-markdown/src/Converter/DefaultConverter.php
index 8de0af210..e71dd10cc 100644
--- a/vendor/league/html-to-markdown/src/Converter/DefaultConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/DefaultConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,27 +10,17 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class DefaultConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    const DEFAULT_CONVERTER = '_default';
+    public const DEFAULT_CONVERTER = '_default';
 
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         // If strip_tags is false (the default), preserve tags that don't have Markdown equivalents,
         // such as <span> nodes on their own. C14N() canonicalizes the node to a string.
@@ -37,8 +29,9 @@ class DefaultConverter implements ConverterInterface, ConfigurationAwareInterfac
             return $element->getValue();
         }
 
-        $markdown = html_entity_decode($element->getChildrenAsString());
+        $markdown = \html_entity_decode($element->getChildrenAsString());
 
+        // Tables are only handled here if TableConverter is not used
         if ($element->getTagName() === 'table') {
             $markdown .= "\n\n";
         }
@@ -49,8 +42,8 @@ class DefaultConverter implements ConverterInterface, ConfigurationAwareInterfac
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array(self::DEFAULT_CONVERTER);
+        return [self::DEFAULT_CONVERTER];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/DivConverter.php b/vendor/league/html-to-markdown/src/Converter/DivConverter.php
index 656a0ba4d..6453a2a27 100644
--- a/vendor/league/html-to-markdown/src/Converter/DivConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/DivConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,38 +10,28 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class DivConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         if ($this->config->getOption('strip_tags', false)) {
             return $element->getValue() . "\n\n";
         }
 
-        return html_entity_decode($element->getChildrenAsString());
+        return \html_entity_decode($element->getChildrenAsString());
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('div');
+        return ['div'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php
index 8fd4dd6e2..a122f4052 100644
--- a/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/EmphasisConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,50 +10,63 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class EmphasisConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    protected function getNormTag(?ElementInterface $element): string
+    {
+        if ($element !== null && ! $element->isText()) {
+            $tag = $element->getTagName();
+            if ($tag === 'i' || $tag === 'em') {
+                return 'em';
+            }
+
+            if ($tag === 'b' || $tag === 'strong') {
+                return 'strong';
+            }
+        }
+
+        return '';
+    }
+
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
-        $tag = $element->getTagName();
+        $tag   = $this->getNormTag($element);
         $value = $element->getValue();
 
-        if (!trim($value)) {
+        if (! \trim($value)) {
             return $value;
         }
 
-        if ($tag === 'i' || $tag === 'em') {
+        if ($tag === 'em') {
             $style = $this->config->getOption('italic_style');
         } else {
             $style = $this->config->getOption('bold_style');
         }
 
-        $prefix = ltrim($value) !== $value ? ' ' : '';
-        $suffix = rtrim($value) !== $value ? ' ' : '';
+        $prefix = \ltrim($value) !== $value ? ' ' : '';
+        $suffix = \rtrim($value) !== $value ? ' ' : '';
+
+        /* If this node is immediately preceded or followed by one of the same type don't emit
+         * the start or end $style, respectively. This prevents <em>foo</em><em>bar</em> from
+         * being converted to *foo**bar* which is incorrect. We want *foobar* instead.
+         */
+        $preStyle  = $this->getNormTag($element->getPreviousSibling()) === $tag ? '' : $style;
+        $postStyle = $this->getNormTag($element->getNextSibling()) === $tag ? '' : $style;
 
-        return $prefix . $style . trim($value) . $style . $suffix;
+        return $prefix . $preStyle . \trim($value) . $postStyle . $suffix;
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('em', 'i', 'strong', 'b');
+        return ['em', 'i', 'strong', 'b'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php
index 1be10bd63..45e89682e 100644
--- a/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/HardBreakConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,35 +10,25 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class HardBreakConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         $return = $this->config->getOption('hard_break') ? "\n" : "  \n";
 
         $next = $element->getNext();
         if ($next) {
-            $next_value = $next->getValue();
-            if ($next_value) {
-                if (in_array(substr($next_value, 0, 2), array('- ', '* ', '+ '))) {
+            $nextValue = $next->getValue();
+            if ($nextValue) {
+                if (\in_array(\substr($nextValue, 0, 2), ['- ', '* ', '+ '], true)) {
                     $parent = $element->getParent();
-                    if ($parent && $parent->getTagName() == 'li') {
+                    if ($parent && $parent->getTagName() === 'li') {
                         $return .= '\\';
                     }
                 }
@@ -49,8 +41,8 @@ class HardBreakConverter implements ConverterInterface, ConfigurationAwareInterf
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('br');
+        return ['br'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
index 353833263..e99dfa0f4 100644
--- a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,37 +10,27 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class HeaderConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    const STYLE_ATX = 'atx';
-    const STYLE_SETEXT = 'setext';
+    public const STYLE_ATX    = 'atx';
+    public const STYLE_SETEXT = 'setext';
 
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
-        $level = (int) substr($element->getTagName(), 1, 1);
+        $level = (int) \substr($element->getTagName(), 1, 1);
         $style = $this->config->getOption('header_style', self::STYLE_SETEXT);
 
-        if (strlen($element->getValue()) === 0) {
+        if (\strlen($element->getValue()) === 0) {
             return "\n";
         }
 
-        if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) {
+        if (($level === 1 || $level === 2) && ! $element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) {
             return $this->createSetextHeader($level, $element->getValue());
         }
 
@@ -48,34 +40,22 @@ class HeaderConverter implements ConverterInterface, ConfigurationAwareInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
+        return ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
     }
 
-    /**
-     * @param int    $level
-     * @param string $content
-     *
-     * @return string
-     */
-    private function createSetextHeader($level, $content)
+    private function createSetextHeader(int $level, string $content): string
     {
-        $length = function_exists('mb_strlen') ? mb_strlen($content, 'utf-8') : strlen($content);
-        $underline = ($level === 1) ? '=' : '-';
+        $length    = \function_exists('mb_strlen') ? \mb_strlen($content, 'utf-8') : \strlen($content);
+        $underline = $level === 1 ? '=' : '-';
 
-        return $content . "\n" . str_repeat($underline, $length) . "\n\n";
+        return $content . "\n" . \str_repeat($underline, $length) . "\n\n";
     }
 
-    /**
-     * @param int    $level
-     * @param string $content
-     *
-     * @return string
-     */
-    private function createAtxHeader($level, $content)
+    private function createAtxHeader(int $level, string $content): string
     {
-        $prefix = str_repeat('#', $level) . ' ';
+        $prefix = \str_repeat('#', $level) . ' ';
 
         return $prefix . $content . "\n\n";
     }
diff --git a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php
index 8f54f9397..ce280cc79 100644
--- a/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/HorizontalRuleConverter.php
@@ -1,17 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class HorizontalRuleConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         return "- - - - - -\n\n";
     }
@@ -19,8 +16,8 @@ class HorizontalRuleConverter implements ConverterInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('hr');
+        return ['hr'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/ImageConverter.php b/vendor/league/html-to-markdown/src/Converter/ImageConverter.php
index 657c769c2..5cd8aec67 100644
--- a/vendor/league/html-to-markdown/src/Converter/ImageConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/ImageConverter.php
@@ -1,20 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class ImageConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
-        $src = $element->getAttribute('src');
-        $alt = $element->getAttribute('alt');
+        $src   = $element->getAttribute('src');
+        $alt   = $element->getAttribute('alt');
         $title = $element->getAttribute('title');
 
         if ($title !== '') {
@@ -28,8 +25,8 @@ class ImageConverter implements ConverterInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('img');
+        return ['img'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
index ed52619d2..25a3540fe 100644
--- a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,28 +10,19 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class LinkConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config) {
+    public function setConfig(Configuration $config): void
+    {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
-        $href = $element->getAttribute('href');
+        $href  = $element->getAttribute('href');
         $title = $element->getAttribute('title');
-        $text = trim($element->getValue(), "\t\n\r\0\x0B");
+        $text  = \trim($element->getValue(), "\t\n\r\0\x0B");
 
         if ($title !== '') {
             $markdown = '[' . $text . '](' . $href . ' "' . $title . '")';
@@ -38,14 +31,19 @@ class LinkConverter implements ConverterInterface, ConfigurationAwareInterface
         } elseif ($href === 'mailto:' . $text && $this->isValidEmail($text)) {
             $markdown = '<' . $text . '>';
         } else {
-            if (stristr($href, ' ')) {
-                $href = '<'.$href.'>';
+            if (\stristr($href, ' ')) {
+                $href = '<' . $href . '>';
             }
+
             $markdown = '[' . $text . '](' . $href . ')';
         }
 
-        if (!$href) {
-            $markdown = html_entity_decode($element->getChildrenAsString());
+        if (! $href) {
+            if ($this->shouldStrip()) {
+                $markdown = $text;
+            } else {
+                $markdown = \html_entity_decode($element->getChildrenAsString());
+            }
         }
 
         return $markdown;
@@ -54,30 +52,26 @@ class LinkConverter implements ConverterInterface, ConfigurationAwareInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('a');
+        return ['a'];
     }
 
-    /**
-     * @param string $href
-     *
-     * @return bool
-     */
-    private function isValidAutolink($href)
+    private function isValidAutolink(string $href): bool
     {
         $useAutolinks = $this->config->getOption('use_autolinks');
-        return $useAutolinks && (preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1);
+
+        return $useAutolinks && (\preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1);
     }
 
-    /**
-     * @param string $email
-     *
-     * @return bool
-     */
-    private function isValidEmail($email)
+    private function isValidEmail(string $email): bool
     {
         // Email validation is messy business, but this should cover most cases
-        return filter_var($email, FILTER_VALIDATE_EMAIL);
+        return \filter_var($email, FILTER_VALIDATE_EMAIL) !== false;
+    }
+
+    private function shouldStrip(): bool
+    {
+        return $this->config->getOption('strip_placeholder_links') ?? false;
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php
index 07a4c85a9..ce7b94654 100644
--- a/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/ListBlockConverter.php
@@ -1,17 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class ListBlockConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         return $element->getValue() . "\n";
     }
@@ -19,8 +16,8 @@ class ListBlockConverter implements ConverterInterface
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('ol', 'ul');
+        return ['ol', 'ul'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php
index c56ab89cd..91b3b5dbe 100644
--- a/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/ListItemConverter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\Configuration;
@@ -8,39 +10,26 @@ use League\HTMLToMarkdown\ElementInterface;
 
 class ListItemConverter implements ConverterInterface, ConfigurationAwareInterface
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
-    /**
-     * @var string
-     */
+    /** @var string|null */
     protected $listItemStyle;
 
-    /**
-     * @param Configuration $config
-     */
-    public function setConfig(Configuration $config)
+    public function setConfig(Configuration $config): void
     {
         $this->config = $config;
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         // If parent is an ol, use numbers, otherwise, use dashes
-        $list_type = $element->getParent()->getTagName();
+        $listType = ($parent = $element->getParent()) ? $parent->getTagName() : 'ul';
 
         // Add spaces to start for nested list items
-        $level = $element->getListItemLevel($element);
+        $level = $element->getListItemLevel();
 
-        $prefixForParagraph = str_repeat('  ', $level + 1);
-        $value = trim(implode("\n" . $prefixForParagraph, explode("\n", trim($element->getValue()))));
+        $value = \trim(\implode("\n" . '  ', \explode("\n", \trim($element->getValue()))));
 
         // If list item is the first in a nested list, add a newline before it
         $prefix = '';
@@ -48,21 +37,21 @@ class ListItemConverter implements ConverterInterface, ConfigurationAwareInterfa
             $prefix = "\n";
         }
 
-        if ($list_type === 'ul') {
-            $list_item_style = $this->config->getOption('list_item_style', '-');
-            $list_item_style_alternate = $this->config->getOption('list_item_style_alternate');
-            if (!isset($this->listItemStyle)) {
-                $this->listItemStyle = $list_item_style_alternate ? $list_item_style_alternate : $list_item_style;
+        if ($listType === 'ul') {
+            $listItemStyle          = $this->config->getOption('list_item_style', '-');
+            $listItemStyleAlternate = $this->config->getOption('list_item_style_alternate');
+            if (! isset($this->listItemStyle)) {
+                $this->listItemStyle = $listItemStyleAlternate ?: $listItemStyle;
             }
 
-            if ($list_item_style_alternate && $level == 0 && $element->getSiblingPosition() === 1) {
-                $this->listItemStyle = $this->listItemStyle == $list_item_style ? $list_item_style_alternate : $list_item_style;
+            if ($listItemStyleAlternate && $level === 0 && $element->getSiblingPosition() === 1) {
+                $this->listItemStyle = $this->listItemStyle === $listItemStyle ? $listItemStyleAlternate : $listItemStyle;
             }
 
             return $prefix . $this->listItemStyle . ' ' . $value . "\n";
         }
 
-        if ($list_type === 'ol' && $start = $element->getParent()->getAttribute('start')) {
+        if ($listType === 'ol' && ($parent = $element->getParent()) && ($start = \intval($parent->getAttribute('start')))) {
             $number = $start + $element->getSiblingPosition() - 1;
         } else {
             $number = $element->getSiblingPosition();
@@ -74,8 +63,8 @@ class ListItemConverter implements ConverterInterface, ConfigurationAwareInterfa
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('li');
+        return ['li'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php
index 7207b81a6..65b37a4db 100644
--- a/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/ParagraphConverter.php
@@ -1,23 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class ParagraphConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         $value = $element->getValue();
 
         $markdown = '';
 
-        $lines = preg_split('/\r\n|\r|\n/', $value);
+        $lines = \preg_split('/\r\n|\r|\n/', $value);
+        \assert($lines !== false);
+
         foreach ($lines as $line) {
             /*
              * Some special characters need to be escaped based on the position that they appear
@@ -27,23 +26,18 @@ class ParagraphConverter implements ConverterInterface
             $markdown .= "\n";
         }
 
-        return trim($markdown) !== '' ? rtrim($markdown) . "\n\n" : '';
+        return \trim($markdown) !== '' ? \rtrim($markdown) . "\n\n" : '';
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('p');
+        return ['p'];
     }
 
-    /**
-     * @param string $line
-     *
-     * @return string
-     */
-    private function escapeSpecialCharacters($line)
+    private function escapeSpecialCharacters(string $line): string
     {
         $line = $this->escapeFirstCharacters($line);
         $line = $this->escapeOtherCharacters($line);
@@ -52,72 +46,61 @@ class ParagraphConverter implements ConverterInterface
         return $line;
     }
 
-    /**
-     * @param string $line
-     *
-     * @return string
-     */
-    private function escapeFirstCharacters($line)
+    private function escapeFirstCharacters(string $line): string
     {
-        $escapable = array(
+        $escapable = [
             '>',
             '- ',
             '+ ',
             '--',
             '~~~',
             '---',
-            '- - -'
-        );
+            '- - -',
+        ];
 
         foreach ($escapable as $i) {
-            if (strpos(ltrim($line), $i) === 0) {
+            if (\strpos(\ltrim($line), $i) === 0) {
                 // Found a character that must be escaped, adding a backslash before
-                return '\\' . ltrim($line);
+                return '\\' . \ltrim($line);
             }
         }
 
         return $line;
     }
 
-    /**
-     * @param string $line
-     *
-     * @return string
-     */
-    private function escapeOtherCharacters($line)
+    private function escapeOtherCharacters(string $line): string
     {
-        $escapable = array(
-            '<!--'
-        );
+        $escapable = [
+            '<!--',
+        ];
 
         foreach ($escapable as $i) {
-            if (strpos($line, $i) !== false) {
-                // Found an escapable character, escaping it
-                $line = substr_replace($line, '\\', strpos($line, $i), 0);
+            if (($pos = \strpos($line, $i)) === false) {
+                continue;
             }
+
+            // Found an escapable character, escaping it
+            $line = \substr_replace($line, '\\', $pos, 0);
         }
 
         return $line;
     }
 
-    /**
-     * @param string $line
-     *
-     * @return string
-     */
-    private function escapeOtherCharactersRegex($line)
+    private function escapeOtherCharactersRegex(string $line): string
     {
-        $regExs = array(
+        $regExs = [
             // Match numbers ending on ')' or '.' that are at the beginning of the line.
             // They will be escaped if immediately followed by a space or newline.
-            '/^[0-9]+(?=(\)|\.)( |$))/'
-        );
+            '/^[0-9]+(?=(\)|\.)( |$))/',
+        ];
 
         foreach ($regExs as $i) {
-            if (preg_match($i, $line, $match)) {
-                // Matched an escapable character, adding a backslash on the string before the offending character
-                $line = substr_replace($line, '\\', strlen($match[0]), 0);
+            if (! \preg_match($i, $line, $match)) {
+                continue;
             }
+
+            // Matched an escapable character, adding a backslash on the string before the offending character
+            $line = \substr_replace($line, '\\', \strlen($match[0]), 0);
         }
 
         return $line;
diff --git a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
index 321c898b1..7d8ccc132 100644
--- a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
@@ -1,20 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class PreformattedConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
-        $pre_content = html_entity_decode($element->getChildrenAsString());
-        $pre_content = str_replace(array('<pre>', '</pre>'), '', $pre_content);
+        $preContent = \html_entity_decode($element->getChildrenAsString());
+        $preContent = \str_replace(['<pre>', '</pre>'], '', $preContent);
 
         /*
          * Checking for the code tag.
@@ -23,36 +20,37 @@ class PreformattedConverter implements ConverterInterface
          * there's no more information to convert.
          */
 
-        $firstBacktick = strpos(trim($pre_content), '`');
-        $lastBacktick = strrpos(trim($pre_content), '`');
-        if ($firstBacktick === 0 && $lastBacktick === strlen(trim($pre_content)) - 1) {
-            return $pre_content . "\n\n";
+        $firstBacktick = \strpos(\trim($preContent), '`');
+        $lastBacktick  = \strrpos(\trim($preContent), '`');
+        if ($firstBacktick === 0 && $lastBacktick === \strlen(\trim($preContent)) - 1) {
+            return $preContent . "\n\n";
         }
 
         // If the execution reaches this point it means it's just a pre tag, with no code tag nested
 
         // Empty lines are a special case
-        if ($pre_content === '') {
+        if ($preContent === '') {
             return "```\n```\n\n";
         }
 
         // Normalizing new lines
-        $pre_content = preg_replace('/\r\n|\r|\n/', "\n", $pre_content);
+        $preContent = \preg_replace('/\r\n|\r|\n/', "\n", $preContent);
+        \assert(\is_string($preContent));
 
         // Ensure there's a newline at the end
-        if (strrpos($pre_content, "\n") !== strlen($pre_content) - strlen("\n")) {
-            $pre_content .= "\n";
+        if (\strrpos($preContent, "\n") !== \strlen($preContent) - \strlen("\n")) {
+            $preContent .= "\n";
         }
 
         // Use three backticks
-        return "```\n" . $pre_content . "```\n\n";
+        return "```\n" . $preContent . "```\n\n";
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('pre');
+        return ['pre'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/TableConverter.php b/vendor/league/html-to-markdown/src/Converter/TableConverter.php
new file mode 100644
index 000000000..2e63e9a5b
--- /dev/null
+++ b/vendor/league/html-to-markdown/src/Converter/TableConverter.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+
+namespace League\HTMLToMarkdown\Converter;
+
+use League\HTMLToMarkdown\Configuration;
+use League\HTMLToMarkdown\ConfigurationAwareInterface;
+use League\HTMLToMarkdown\ElementInterface;
+use League\HTMLToMarkdown\PreConverterInterface;
+
+class TableConverter implements ConverterInterface, PreConverterInterface, ConfigurationAwareInterface
+{
+    /** @var Configuration */
+    protected $config;
+
+    public function setConfig(Configuration $config): void
+    {
+        $this->config = $config;
+    }
+
+    /** @var array<string, string> */
+    private static $alignments = [
+        'left' => ':--',
+        'right' => '--:',
+        'center' => ':-:',
+    ];
+
+    /** @var array<int, string>|null */
+    private $columnAlignments = [];
+
+    /** @var string|null */
+    private $caption = null;
+
+    public function preConvert(ElementInterface $element): void
+    {
+        $tag = $element->getTagName();
+        // Only table cells and caption are allowed to contain content.
+        // Remove all text between other table elements.
+        if ($tag === 'th' || $tag === 'td' || $tag === 'caption') {
+            return;
+        }
+
+        foreach ($element->getChildren() as $child) {
+            if ($child->isText()) {
+                $child->setFinalMarkdown('');
+            }
+        }
+    }
+
+    public function convert(ElementInterface $element): string
+    {
+        $value = $element->getValue();
+
+        switch ($element->getTagName()) {
+            case 'table':
+                $this->columnAlignments = [];
+                if ($this->caption) {
+                    $side = $this->config->getOption('table_caption_side');
+                    if ($side === 'top') {
+                        $value = $this->caption . "\n" . $value;
+                    } elseif ($side === 'bottom') {
+                        $value .= $this->caption;
+                    }
+
+                    $this->caption = null;
+                }
+
+                return $value . "\n";
+            case 'caption':
+                $this->caption = \trim($value);
+
+                return '';
+            case 'tr':
+                $value .= "|\n";
+                if ($this->columnAlignments !== null) {
+                    $value .= '|' . \implode('|', $this->columnAlignments) . "|\n";
+
+                    $this->columnAlignments = null;
+                }
+
+                return $value;
+            case 'th':
+            case 'td':
+                if ($this->columnAlignments !== null) {
+                    $align = $element->getAttribute('align');
+
+                    $this->columnAlignments[] = self::$alignments[$align] ?? '---';
+                }
+
+                $value = \str_replace("\n", ' ', $value);
+                $value = \str_replace('|', $this->config->getOption('table_pipe_escape') ?? '\|', $value);
+
+                return '| ' . \trim($value) . ' ';
+            case 'thead':
+            case 'tbody':
+            case 'tfoot':
+            case 'colgroup':
+            case 'col':
+                return $value;
+            default:
+                return '';
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getSupportedTags(): array
+    {
+        return ['table', 'tr', 'th', 'td', 'thead', 'tbody', 'tfoot', 'colgroup', 'col', 'caption'];
+    }
+}
diff --git a/vendor/league/html-to-markdown/src/Converter/TextConverter.php b/vendor/league/html-to-markdown/src/Converter/TextConverter.php
index 6236a1e9d..465dd4883 100644
--- a/vendor/league/html-to-markdown/src/Converter/TextConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/TextConverter.php
@@ -1,48 +1,48 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown\Converter;
 
 use League\HTMLToMarkdown\ElementInterface;
 
 class TextConverter implements ConverterInterface
 {
-    /**
-     * @param ElementInterface $element
-     *
-     * @return string
-     */
-    public function convert(ElementInterface $element)
+    public function convert(ElementInterface $element): string
     {
         $markdown = $element->getValue();
 
         // Remove leftover \n at the beginning of the line
-        $markdown = ltrim($markdown, "\n");
+        $markdown = \ltrim($markdown, "\n");
 
         // Replace sequences of invisible characters with spaces
-        $markdown = preg_replace('~\s+~u', ' ', $markdown);
+        $markdown = \preg_replace('~\s+~u', ' ', $markdown);
+        \assert(\is_string($markdown));
 
         // Escape the following characters: '*', '_', '[', ']' and '\'
-        if ($element->getParent() && $element->getParent()->getTagName() !== 'div') {
-            $markdown = preg_replace('~([*_\\[\\]\\\\])~u', '\\\\$1', $markdown);
+        if (($parent = $element->getParent()) && $parent->getTagName() !== 'div') {
+            $markdown = \preg_replace('~([*_\\[\\]\\\\])~u', '\\\\$1', $markdown);
+            \assert(\is_string($markdown));
         }
 
-        $markdown = preg_replace('~^#~u', '\\\\#', $markdown);
+        $markdown = \preg_replace('~^#~u', '\\\\#', $markdown);
+        \assert(\is_string($markdown));
 
         if ($markdown === ' ') {
             $next = $element->getNext();
-            if (!$next || $next->isBlock()) {
+            if (! $next || $next->isBlock()) {
                 $markdown = '';
             }
         }
 
-        return htmlspecialchars($markdown, ENT_NOQUOTES, 'UTF-8');
+        return \htmlspecialchars($markdown, ENT_NOQUOTES, 'UTF-8');
     }
 
     /**
      * @return string[]
      */
-    public function getSupportedTags()
+    public function getSupportedTags(): array
     {
-        return array('#text');
+        return ['#text'];
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Element.php b/vendor/league/html-to-markdown/src/Element.php
index 80ae7a911..5407f1ffb 100644
--- a/vendor/league/html-to-markdown/src/Element.php
+++ b/vendor/league/html-to-markdown/src/Element.php
@@ -1,28 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 class Element implements ElementInterface
 {
-    /**
-     * @var \DOMNode
-     */
+    /** @var \DOMNode */
     protected $node;
 
-    /**
-     * @var ElementInterface|null
-     */
+    /** @var ElementInterface|null */
     private $nextCached;
 
+    /** @var \DOMNode|null */
+    private $previousSiblingCached;
+
     public function __construct(\DOMNode $node)
     {
         $this->node = $node;
+
+        $this->previousSiblingCached = $this->node->previousSibling;
     }
 
-    /**
-     * @return bool
-     */
-    public function isBlock()
+    public function isBlock(): bool
     {
         switch ($this->getTagName()) {
             case 'blockquote':
@@ -46,50 +46,47 @@ class Element implements ElementInterface
         }
     }
 
-    /**
-     * @return bool
-     */
-    public function isText()
+    public function isText(): bool
     {
         return $this->getTagName() === '#text';
     }
 
-    /**
-     * @return bool
-     */
-    public function isWhitespace()
+    public function isWhitespace(): bool
     {
-        return $this->getTagName() === '#text' && trim($this->getValue()) === '';
+        return $this->getTagName() === '#text' && \trim($this->getValue()) === '';
     }
 
-    /**
-     * @return string
-     */
-    public function getTagName()
+    public function getTagName(): string
     {
         return $this->node->nodeName;
     }
 
-    /**
-     * @return string
-     */
-    public function getValue()
+    public function getValue(): string
     {
         return $this->node->nodeValue;
     }
 
-    /**
-     * @return ElementInterface|null
-     */
-    public function getParent()
+    public function hasParent(): bool
     {
-        return new static($this->node->parentNode) ?: null;
+        return $this->node->parentNode !== null;
     }
 
-    /**
-     * @return bool
-     */
-    public function hasChildren()
+    public function getParent(): ?ElementInterface
+    {
+        return $this->node->parentNode ? new self($this->node->parentNode) : null;
+    }
+
+    public function getNextSibling(): ?ElementInterface
+    {
+        return $this->node->nextSibling !== null ? new self($this->node->nextSibling) : null;
+    }
+
+    public function getPreviousSibling(): ?ElementInterface
+    {
+        return $this->previousSiblingCached !== null ? new self($this->previousSiblingCached) : null;
+    }
+
+    public function hasChildren(): bool
     {
         return $this->node->hasChildNodes();
     }
@@ -97,39 +94,29 @@ class Element implements ElementInterface
     /**
      * @return ElementInterface[]
      */
-    public function getChildren()
+    public function getChildren(): array
     {
-        $ret = array();
-        /** @var \DOMNode $node */
+        $ret = [];
         foreach ($this->node->childNodes as $node) {
-            $ret[] = new static($node);
+            $ret[] = new self($node);
         }
 
         return $ret;
     }
 
-    /**
-     * @return ElementInterface|null
-     */
-    public function getNext()
+    public function getNext(): ?ElementInterface
     {
         if ($this->nextCached === null) {
             $nextNode = $this->getNextNode($this->node);
             if ($nextNode !== null) {
-                $this->nextCached = new static($nextNode);
+                $this->nextCached = new self($nextNode);
             }
         }
 
         return $this->nextCached;
     }
 
-    /**
-     * @param \DomNode $node
-     * @param bool $checkChildren
-     *
-     * @return \DomNode|null
-     */
-    private function getNextNode($node, $checkChildren = true)
+    private function getNextNode(\DomNode $node, bool $checkChildren = true): ?\DomNode
     {
         if ($checkChildren && $node->firstChild) {
             return $node->firstChild;
@@ -142,25 +129,25 @@ class Element implements ElementInterface
         if ($node->parentNode) {
             return $this->getNextNode($node->parentNode, false);
         }
+
+        return null;
     }
 
     /**
      * @param string[]|string $tagNames
-     *
-     * @return bool
      */
-    public function isDescendantOf($tagNames)
+    public function isDescendantOf($tagNames): bool
     {
-        if (!is_array($tagNames)) {
-            $tagNames = array($tagNames);
+        if (! \is_array($tagNames)) {
+            $tagNames = [$tagNames];
         }
 
         for ($p = $this->node->parentNode; $p !== false; $p = $p->parentNode) {
-            if (is_null($p)) {
+            if ($p === null) {
                 return false;
             }
 
-            if (in_array($p->nodeName, $tagNames)) {
+            if (\in_array($p->nodeName, $tagNames, true)) {
                 return true;
             }
         }
@@ -168,39 +155,43 @@ class Element implements ElementInterface
         return false;
     }
 
-    /**
-     * @param string $markdown
-     */
-    public function setFinalMarkdown($markdown)
+    public function setFinalMarkdown(string $markdown): void
     {
-        $markdown_node = $this->node->ownerDocument->createTextNode($markdown);
-        $this->node->parentNode->replaceChild($markdown_node, $this->node);
+        if ($this->node->ownerDocument === null) {
+            throw new \RuntimeException('Unowned node');
+        }
+
+        if ($this->node->parentNode === null) {
+            throw new \RuntimeException('Cannot setFinalMarkdown() on a node without a parent');
+        }
+
+        $markdownNode = $this->node->ownerDocument->createTextNode($markdown);
+        $this->node->parentNode->replaceChild($markdownNode, $this->node);
     }
 
-    /**
-     * @return string
-     */
-    public function getChildrenAsString()
+    public function getChildrenAsString(): string
     {
         return $this->node->C14N();
     }
 
-    /**
-     * @return int
-     */
-    public function getSiblingPosition()
+    public function getSiblingPosition(): int
     {
         $position = 0;
 
+        $parent = $this->getParent();
+        if ($parent === null) {
+            return $position;
+        }
+
         // Loop through all nodes and find the given $node
-        foreach ($this->getParent()->getChildren() as $current_node) {
-            if (!$current_node->isWhitespace()) {
+        foreach ($parent->getChildren() as $currentNode) {
+            if (! $currentNode->isWhitespace()) {
                 $position++;
             }
 
             // TODO: Need a less-buggy way of comparing these
             // Perhaps we can somehow ensure that we always have the exact same object and use === instead?
-            if ($this->equals($current_node)) {
+            if ($this->equals($currentNode)) {
                 break;
             }
         }
@@ -208,30 +199,23 @@ class Element implements ElementInterface
         return $position;
     }
 
-    /**
-     * @return int
-     */
-    public function getListItemLevel()
+    public function getListItemLevel(): int
     {
-        $level = 0;
+        $level  = 0;
         $parent = $this->getParent();
 
-        while ($parent !== null && $parent->node->parentNode) {
+        while ($parent !== null && $parent->hasParent()) {
             if ($parent->getTagName() === 'li') {
                 $level++;
             }
+
             $parent = $parent->getParent();
         }
 
         return $level;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    public function getAttribute($name)
+    public function getAttribute(string $name): string
     {
         if ($this->node instanceof \DOMElement) {
             return $this->node->getAttribute($name);
@@ -240,17 +224,12 @@ class Element implements ElementInterface
         return '';
     }
 
-    /**
-     * @param ElementInterface $element
-     *
-     * @return bool
-     */
-    public function equals(ElementInterface $element)
+    public function equals(ElementInterface $element): bool
     {
         if ($element instanceof self) {
             return $element->node === $this->node;
         }
 
-        return $element === $this;
+        return false;
     }
 }
diff --git a/vendor/league/html-to-markdown/src/ElementInterface.php b/vendor/league/html-to-markdown/src/ElementInterface.php
index 138ddf286..d8477cfae 100644
--- a/vendor/league/html-to-markdown/src/ElementInterface.php
+++ b/vendor/league/html-to-markdown/src/ElementInterface.php
@@ -1,80 +1,50 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 interface ElementInterface
 {
-    /**
-     * @return bool
-     */
-    public function isBlock();
+    public function isBlock(): bool;
 
-    /**
-     * @return bool
-     */
-    public function isText();
+    public function isText(): bool;
 
-    /**
-     * @return bool
-     */
-    public function isWhitespace();
+    public function isWhitespace(): bool;
 
-    /**
-     * @return string
-     */
-    public function getTagName();
+    public function getTagName(): string;
 
-    /**
-     * @return string
-     */
-    public function getValue();
+    public function getValue(): string;
 
-    /**
-     * @return ElementInterface|null
-     */
-    public function getParent();
+    public function hasParent(): bool;
+
+    public function getParent(): ?ElementInterface;
+
+    public function getNextSibling(): ?ElementInterface;
+
+    public function getPreviousSibling(): ?ElementInterface;
 
     /**
      * @param string|string[] $tagNames
-     *
-     * @return bool
      */
-    public function isDescendantOf($tagNames);
+    public function isDescendantOf($tagNames): bool;
 
-    /**
-     * @return bool
-     */
-    public function hasChildren();
+    public function hasChildren(): bool;
 
     /**
      * @return ElementInterface[]
      */
-    public function getChildren();
+    public function getChildren(): array;
 
-    /**
-     * @return ElementInterface|null
-     */
-    public function getNext();
+    public function getNext(): ?ElementInterface;
 
-    /**
-     * @return int
-     */
-    public function getSiblingPosition();
+    public function getSiblingPosition(): int;
 
-    /**
-     * @return string
-     */
-    public function getChildrenAsString();
+    public function getChildrenAsString(): string;
 
-    /**
-     * @param string $markdown
-     */
-    public function setFinalMarkdown($markdown);
+    public function setFinalMarkdown(string $markdown): void;
 
-    /**
-     * @param string $name
-     *
-     * @return string
-     */
-    public function getAttribute($name);
+    public function getListItemLevel(): int;
+
+    public function getAttribute(string $name): string;
 }
diff --git a/vendor/league/html-to-markdown/src/Environment.php b/vendor/league/html-to-markdown/src/Environment.php
index 560cfe613..7ea19d410 100644
--- a/vendor/league/html-to-markdown/src/Environment.php
+++ b/vendor/league/html-to-markdown/src/Environment.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 use League\HTMLToMarkdown\Converter\BlockquoteConverter;
@@ -22,34 +24,27 @@ use League\HTMLToMarkdown\Converter\TextConverter;
 
 final class Environment
 {
-    /**
-     * @var Configuration
-     */
+    /** @var Configuration */
     protected $config;
 
+    /** @var ConverterInterface[] */
+    protected $converters = [];
+
     /**
-     * @var ConverterInterface[]
+     * @param array<string, mixed> $config
      */
-    protected $converters = array();
-
-    public function __construct(array $config = array())
+    public function __construct(array $config = [])
     {
         $this->config = new Configuration($config);
         $this->addConverter(new DefaultConverter());
     }
 
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
+    public function getConfig(): Configuration
     {
         return $this->config;
     }
 
-    /**
-     * @param ConverterInterface $converter
-     */
-    public function addConverter(ConverterInterface $converter)
+    public function addConverter(ConverterInterface $converter): void
     {
         if ($converter instanceof ConfigurationAwareInterface) {
             $converter->setConfig($this->config);
@@ -60,12 +55,7 @@ final class Environment
         }
     }
 
-    /**
-     * @param string $tag
-     *
-     * @return ConverterInterface
-     */
-    public function getConverterByTag($tag)
+    public function getConverterByTag(string $tag): ConverterInterface
     {
         if (isset($this->converters[$tag])) {
             return $this->converters[$tag];
@@ -75,11 +65,9 @@ final class Environment
     }
 
     /**
-     * @param array $config
-     *
-     * @return Environment
+     * @param array<string, mixed> $config
      */
-    public static function createDefaultEnvironment(array $config = array())
+    public static function createDefaultEnvironment(array $config = []): Environment
     {
         $environment = new static($config);
 
diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/src/HtmlConverter.php
index 6f98e97b4..7cd543b34 100644
--- a/vendor/league/html-to-markdown/src/HtmlConverter.php
+++ b/vendor/league/html-to-markdown/src/HtmlConverter.php
@@ -1,10 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 /**
- * Class HtmlConverter
- *
  * A helper class to convert HTML to Markdown.
  *
  * @author Colin O'Dell <colinodell@gmail.com>
@@ -16,25 +16,24 @@ namespace League\HTMLToMarkdown;
  */
 class HtmlConverter implements HtmlConverterInterface
 {
-    /**
-     * @var Environment
-     */
+    /** @var Environment */
     protected $environment;
 
     /**
      * Constructor
      *
-     * @param Environment|array $options Environment object or configuration options
+     * @param Environment|array<string, mixed> $options Environment object or configuration options
      */
-    public function __construct($options = array())
+    public function __construct($options = [])
     {
         if ($options instanceof Environment) {
             $this->environment = $options;
-        } elseif (is_array($options)) {
-            $defaults = array(
+        } elseif (\is_array($options)) {
+            $defaults = [
                 'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2
                 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML
                 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output.
+                'strip_placeholder_links' => false, // Set to true to remove <a> that doesn't have href.
                 'bold_style' => '**', // DEPRECATED: Set to '__' if you prefer the underlined style
                 'italic_style' => '*', // DEPRECATED: Set to '_' if you prefer the underlined style
                 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: 'meta style script'
@@ -42,7 +41,9 @@ class HtmlConverter implements HtmlConverterInterface
                 'list_item_style' => '-', // Set the default character for each <li> in a <ul>. Can be '-', '*', or '+'
                 'preserve_comments' => false, // Set to true to preserve comments, or set to an array of strings to preserve specific comments
                 'use_autolinks' => true, // Set to true to use simple link syntax if possible. Will always use []() if set to false
-            );
+                'table_pipe_escape' => '\|', // Replacement string for pipe characters inside markdown table cells
+                'table_caption_side' => 'top', // Set to 'top' or 'bottom' to show <caption> content before or after table, null to suppress
+            ];
 
             $this->environment = Environment::createDefaultEnvironment($defaults);
 
@@ -50,18 +51,12 @@ class HtmlConverter implements HtmlConverterInterface
         }
     }
 
-    /**
-     * @return Environment
-     */
-    public function getEnvironment()
+    public function getEnvironment(): Environment
     {
         return $this->environment;
     }
 
-    /**
-     * @return Configuration
-     */
-    public function getConfig()
+    public function getConfig(): Configuration
     {
         return $this->environment->getConfig();
     }
@@ -71,11 +66,9 @@ class HtmlConverter implements HtmlConverterInterface
      *
      * @see HtmlConverter::convert
      *
-     * @param string $html
-     *
      * @return string The Markdown version of the html
      */
-    public function __invoke($html)
+    public function __invoke(string $html): string
     {
         return $this->convert($html);
     }
@@ -85,22 +78,20 @@ class HtmlConverter implements HtmlConverterInterface
      *
      * Loads HTML and passes to getMarkdown()
      *
-     * @param string $html
-     *
-     * @throws \InvalidArgumentException
-     *
      * @return string The Markdown version of the html
+     *
+     * @throws \InvalidArgumentException|\RuntimeException
      */
-    public function convert($html)
+    public function convert(string $html): string
     {
-        if (trim($html) === '') {
+        if (\trim($html) === '') {
             return '';
         }
 
         $document = $this->createDOMDocument($html);
 
         // Work on the entire DOM tree (including head and body)
-        if (!($root = $document->getElementsByTagName('html')->item(0))) {
+        if (! ($root = $document->getElementsByTagName('html')->item(0))) {
             throw new \InvalidArgumentException('Invalid HTML was provided');
         }
 
@@ -110,21 +101,20 @@ class HtmlConverter implements HtmlConverterInterface
         // Store the now-modified DOMDocument as a string
         $markdown = $document->saveHTML();
 
+        if ($markdown === false) {
+            throw new \RuntimeException('Unknown error occurred during HTML to Markdown conversion');
+        }
+
         return $this->sanitize($markdown);
     }
 
-    /**
-     * @param string $html
-     *
-     * @return \DOMDocument
-     */
-    private function createDOMDocument($html)
+    private function createDOMDocument(string $html): \DOMDocument
     {
         $document = new \DOMDocument();
 
         if ($this->getConfig()->getOption('suppress_errors')) {
             // Suppress conversion errors (from http://bit.ly/pCCRSX)
-            libxml_use_internal_errors(true);
+            \libxml_use_internal_errors(true);
         }
 
         // Hack to load utf-8 HTML (from http://bit.ly/pVDyCt)
@@ -132,7 +122,7 @@ class HtmlConverter implements HtmlConverterInterface
         $document->encoding = 'UTF-8';
 
         if ($this->getConfig()->getOption('suppress_errors')) {
-            libxml_clear_errors();
+            \libxml_clear_errors();
         }
 
         return $document;
@@ -145,17 +135,21 @@ class HtmlConverter implements HtmlConverterInterface
      *
      * Finds children of each node and convert those to #text nodes containing their Markdown equivalent,
      * starting with the innermost element and working up to the outermost element.
-     *
-     * @param ElementInterface $element
      */
-    private function convertChildren(ElementInterface $element)
+    private function convertChildren(ElementInterface $element): void
     {
         // Don't convert HTML code inside <code> and <pre> blocks to Markdown - that should stay as HTML
         // except if the current node is a code tag, which needs to be converted by the CodeConverter.
-        if ($element->isDescendantOf(array('pre', 'code')) && $element->getTagName() !== 'code') {
+        if ($element->isDescendantOf(['pre', 'code']) && $element->getTagName() !== 'code') {
             return;
         }
 
+        // Give converter a chance to inspect/modify the DOM before children are converted
+        $converter = $this->environment->getConverterByTag($element->getTagName());
+        if ($converter instanceof PreConverterInterface) {
+            $converter->preConvert($element);
+        }
+
         // If the node has children, convert those to Markdown first
         if ($element->hasChildren()) {
             foreach ($element->getChildren() as $child) {
@@ -179,18 +173,16 @@ class HtmlConverter implements HtmlConverterInterface
      *
      * Example: An <h3> node with text content of 'Title' becomes a text node with content of '### Title'
      *
-     * @param ElementInterface $element
-     *
      * @return string The converted HTML as Markdown
      */
-    protected function convertToMarkdown(ElementInterface $element)
+    protected function convertToMarkdown(ElementInterface $element): string
     {
         $tag = $element->getTagName();
 
         // Strip nodes named in remove_nodes
-        $tags_to_remove = explode(' ', $this->getConfig()->getOption('remove_nodes'));
-        if (in_array($tag, $tags_to_remove)) {
-            return false;
+        $tagsToRemove = \explode(' ', $this->getConfig()->getOption('remove_nodes') ?? '');
+        if (\in_array($tag, $tagsToRemove, true)) {
+            return '';
         }
 
         $converter = $this->environment->getConverterByTag($tag);
@@ -198,38 +190,34 @@ class HtmlConverter implements HtmlConverterInterface
         return $converter->convert($element);
     }
 
-    /**
-     * @param string $markdown
-     *
-     * @return string
-     */
-    protected function sanitize($markdown)
+    protected function sanitize(string $markdown): string
     {
-        $markdown = html_entity_decode($markdown, ENT_QUOTES, 'UTF-8');
-        $markdown = preg_replace('/<!DOCTYPE [^>]+>/', '', $markdown); // Strip doctype declaration
-        $markdown = trim($markdown); // Remove blank spaces at the beggining of the html
+        $markdown = \html_entity_decode($markdown, ENT_QUOTES, 'UTF-8');
+        $markdown = \preg_replace('/<!DOCTYPE [^>]+>/', '', $markdown); // Strip doctype declaration
+        \assert($markdown !== null);
+        $markdown = \trim($markdown); // Remove blank spaces at the beggining of the html
 
         /*
          * Removing unwanted tags. Tags should be added to the array in the order they are expected.
          * XML, html and body opening tags should be in that order. Same case with closing tags
          */
-        $unwanted = array('<?xml encoding="UTF-8">', '<html>', '</html>', '<body>', '</body>', '<head>', '</head>', '&#xD;');
+        $unwanted = ['<?xml encoding="UTF-8">', '<html>', '</html>', '<body>', '</body>', '<head>', '</head>', '&#xD;'];
 
         foreach ($unwanted as $tag) {
-            if (strpos($tag, '/') === false) {
+            if (\strpos($tag, '/') === false) {
                 // Opening tags
-                if (strpos($markdown, $tag) === 0) {
-                    $markdown = substr($markdown, strlen($tag));
+                if (\strpos($markdown, $tag) === 0) {
+                    $markdown = \substr($markdown, \strlen($tag));
                 }
             } else {
                 // Closing tags
-                if (strpos($markdown, $tag) === strlen($markdown) - strlen($tag)) {
-                    $markdown = substr($markdown, 0, -strlen($tag));
+                if (\strpos($markdown, $tag) === \strlen($markdown) - \strlen($tag)) {
+                    $markdown = \substr($markdown, 0, -\strlen($tag));
                 }
             }
         }
 
-        return trim($markdown, "\n\r\0\x0B");
+        return \trim($markdown, "\n\r\0\x0B");
     }
 
     /**
@@ -239,6 +227,10 @@ class HtmlConverter implements HtmlConverterInterface
      * An example being:
      *
      * HtmlConverter::setOptions(['strip_tags' => true])->convert('<h1>test</h1>');
+     *
+     * @param array<string, mixed> $options
+     *
+     * @return $this
      */
     public function setOptions(array $options)
     {
diff --git a/vendor/league/html-to-markdown/src/HtmlConverterInterface.php b/vendor/league/html-to-markdown/src/HtmlConverterInterface.php
index 7d43cf87e..5c7e9eb65 100644
--- a/vendor/league/html-to-markdown/src/HtmlConverterInterface.php
+++ b/vendor/league/html-to-markdown/src/HtmlConverterInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace League\HTMLToMarkdown;
 
 /**
@@ -16,11 +18,9 @@ interface HtmlConverterInterface
     /**
      * Convert the given $html to Markdown
      *
-     * @param string $html
+     * @return string The Markdown version of the html
      *
      * @throws \InvalidArgumentException
-     *
-     * @return string The Markdown version of the html
      */
-    public function convert($html);
+    public function convert(string $html): string;
 }
diff --git a/vendor/league/html-to-markdown/src/PreConverterInterface.php b/vendor/league/html-to-markdown/src/PreConverterInterface.php
new file mode 100644
index 000000000..f835086ef
--- /dev/null
+++ b/vendor/league/html-to-markdown/src/PreConverterInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace League\HTMLToMarkdown;
+
+interface PreConverterInterface
+{
+    public function preConvert(ElementInterface $element): void;
+}
diff --git a/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php b/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php
index 18e850af1..944885b4f 100644
--- a/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php
+++ b/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php
@@ -39,7 +39,7 @@ class getid3_id3v1 extends getid3_handler
 
 			// If second-last byte of comment field is null and last byte of comment field is non-null
 			// then this is ID3v1.1 and the comment field is 28 bytes long and the 30th byte is the track number
-			if (($id3v1tag{125} === "\x00") && ($id3v1tag{126} !== "\x00")) {
+			if (($id3v1tag[125] === "\x00") && ($id3v1tag[126] !== "\x00")) {
 				$ParsedID3v1['track']   = ord(substr($ParsedID3v1['comment'], 29,  1));
 				$ParsedID3v1['comment'] =     substr($ParsedID3v1['comment'],  0, 28);
 			}
diff --git a/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php b/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php
index 31742b7f2..c1e982137 100644
--- a/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php
+++ b/vendor/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php
@@ -51,8 +51,8 @@ class getid3_id3v2 extends getid3_handler
 		$header = $this->fread(10);
 		if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
 
-			$thisfile_id3v2['majorversion'] = ord($header{3});
-			$thisfile_id3v2['minorversion'] = ord($header{4});
+			$thisfile_id3v2['majorversion'] = ord($header[3]);
+			$thisfile_id3v2['minorversion'] = ord($header[4]);
 
 			// shortcut
 			$id3v2_majorversion = &$thisfile_id3v2['majorversion'];
@@ -71,7 +71,7 @@ class getid3_id3v2 extends getid3_handler
 
 		}
 
-		$id3_flags = ord($header{5});
+		$id3_flags = ord($header[5]);
 		switch ($id3v2_majorversion) {
 			case 2:
 				// %ab000000 in v2.2
@@ -252,7 +252,7 @@ class getid3_id3v2 extends getid3_handler
 					$thisfile_id3v2['padding']['length'] = strlen($framedata);
 					$thisfile_id3v2['padding']['valid']  = true;
 					for ($i = 0; $i < $thisfile_id3v2['padding']['length']; $i++) {
-						if ($framedata{$i} != "\x00") {
+						if ($framedata[$i] != "\x00") {
 							$thisfile_id3v2['padding']['valid'] = false;
 							$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
 							$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
@@ -314,7 +314,7 @@ class getid3_id3v2 extends getid3_handler
 
 					$len = strlen($framedata);
 					for ($i = 0; $i < $len; $i++) {
-						if ($framedata{$i} != "\x00") {
+						if ($framedata[$i]!= "\x00") {
 							$thisfile_id3v2['padding']['valid'] = false;
 							$thisfile_id3v2['padding']['errorpos'] = $thisfile_id3v2['padding']['start'] + $i;
 							$info['warning'][] = 'Invalid ID3v2 padding found at offset '.$thisfile_id3v2['padding']['errorpos'].' (the remaining '.($thisfile_id3v2['padding']['length'] - $i).' bytes are considered invalid)';
@@ -422,11 +422,11 @@ class getid3_id3v2 extends getid3_handler
 			$footer = $this->fread(10);
 			if (substr($footer, 0, 3) == '3DI') {
 				$thisfile_id3v2['footer'] = true;
-				$thisfile_id3v2['majorversion_footer'] = ord($footer{3});
-				$thisfile_id3v2['minorversion_footer'] = ord($footer{4});
+				$thisfile_id3v2['majorversion_footer'] = ord($footer[3]);
+				$thisfile_id3v2['minorversion_footer'] = ord($footer[4]);
 			}
 			if ($thisfile_id3v2['majorversion_footer'] <= 4) {
-				$id3_flags = ord(substr($footer{5}));
+				$id3_flags = ord(substr($footer[5]));
 				$thisfile_id3v2_flags['unsynch_footer']  = (bool) ($id3_flags & 0x80);
 				$thisfile_id3v2_flags['extfoot_footer']  = (bool) ($id3_flags & 0x40);
 				$thisfile_id3v2_flags['experim_footer']  = (bool) ($id3_flags & 0x20);
@@ -648,7 +648,7 @@ class getid3_id3v2 extends getid3_handler
 			//unset($parsedFrame['data']); do not unset, may be needed elsewhere, e.g. for replaygain
 
 
-		} elseif ($parsedFrame['frame_name']{0} == 'T') { // 4.2. T??[?] Text information frame
+		} elseif ($parsedFrame['frame_name'][0] == 'T') { // 4.2. T??[?] Text information frame
 			//   There may only be one text information frame of its kind in an tag.
 			// <Header for 'Text information frame', ID: 'T000' - 'TZZZ',
 			// excluding 'TXXX' described in 4.2.6.>
@@ -750,7 +750,7 @@ class getid3_id3v2 extends getid3_handler
 			unset($parsedFrame['data']);
 
 
-		} elseif ($parsedFrame['frame_name']{0} == 'W') { // 4.3. W??? URL link frames
+		} elseif ($parsedFrame['frame_name'][0] == 'W') { // 4.3. W??? URL link frames
 			//   There may only be one URL link frame of its kind in a tag,
 			//   except when stated otherwise in the frame description
 			// <Header for 'URL link frame', ID: 'W000' - 'WZZZ', excluding 'WXXX'
@@ -1025,7 +1025,7 @@ class getid3_id3v2 extends getid3_handler
 					$parsedFrame['lyrics'][$timestampindex]['data'] = substr($frame_remainingdata, $frame_offset, $frame_terminatorpos - $frame_offset);
 
 					$frame_remainingdata = substr($frame_remainingdata, $frame_terminatorpos + strlen($this->TextEncodingTerminatorLookup($frame_textencoding)));
-					if (($timestampindex == 0) && (ord($frame_remainingdata{0}) != 0)) {
+					if (($timestampindex == 0) && (ord($frame_remainingdata[0]) != 0)) {
 						// timestamp probably omitted for first data item
 					} else {
 						$parsedFrame['lyrics'][$timestampindex]['timestamp'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, 0, 4));
@@ -3334,10 +3334,10 @@ class getid3_id3v2 extends getid3_handler
 
 	public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
 		for ($i = 0; $i < strlen($numberstring); $i++) {
-			if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
-				if (($numberstring{$i} == '.') && $allowdecimal) {
+			if ((chr($numberstring[$i]) < chr('0')) || (chr($numberstring[$i]) > chr('9'))) {
+				if (($numberstring[$i] == '.') && $allowdecimal) {
 					// allowed
-				} elseif (($numberstring{$i} == '-') && $allownegative && ($i == 0)) {
+				} elseif (($numberstring[$i] == '-') && $allownegative && ($i == 0)) {
 					// allowed
 				} else {
 					return false;
diff --git a/vendor/lukasreschke/id3parser/src/getID3/getid3_lib.php b/vendor/lukasreschke/id3parser/src/getID3/getid3_lib.php
index b50ed30cc..ca7dd30ed 100644
--- a/vendor/lukasreschke/id3parser/src/getID3/getid3_lib.php
+++ b/vendor/lukasreschke/id3parser/src/getID3/getid3_lib.php
@@ -85,11 +85,11 @@ class getid3_lib
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
 		if (strpos($binarypointnumber, '.') === false) {
 			$binarypointnumber = '0.'.$binarypointnumber;
-		} elseif ($binarypointnumber{0} == '.') {
+		} elseif ($binarypointnumber[0] == '.') {
 			$binarypointnumber = '0'.$binarypointnumber;
 		}
 		$exponent = 0;
-		while (($binarypointnumber{0} != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
+		while (($binarypointnumber[0] != '1') || (substr($binarypointnumber, 1, 1) != '.')) {
 			if (substr($binarypointnumber, 1, 1) == '.') {
 				$exponent--;
 				$binarypointnumber = substr($binarypointnumber, 2, 1).'.'.substr($binarypointnumber, 3);
@@ -97,7 +97,7 @@ class getid3_lib
 				$pointpos = strpos($binarypointnumber, '.');
 				$exponent += ($pointpos - 1);
 				$binarypointnumber = str_replace('.', '', $binarypointnumber);
-				$binarypointnumber = $binarypointnumber{0}.'.'.substr($binarypointnumber, 1);
+				$binarypointnumber = $binarypointnumber[0].'.'.substr($binarypointnumber, 1);
 			}
 		}
 		$binarypointnumber = str_pad(substr($binarypointnumber, 0, $maxbits + 2), $maxbits + 2, '0', STR_PAD_RIGHT);
@@ -166,7 +166,7 @@ class getid3_lib
 		if (!$bitword) {
 			return 0;
 		}
-		$signbit = $bitword{0};
+		$signbit = $bitword[0];
 
 		switch (strlen($byteword) * 8) {
 			case 32:
@@ -183,7 +183,7 @@ class getid3_lib
 				// 80-bit Apple SANE format
 				// http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
 				$exponentstring = substr($bitword, 1, 15);
-				$isnormalized = intval($bitword{16});
+				$isnormalized = intval($bitword[16]);
 				$fractionstring = substr($bitword, 17, 63);
 				$exponent = pow(2, self::Bin2Dec($exponentstring) - 16383);
 				$fraction = $isnormalized + self::DecimalBinary2Float($fractionstring);
@@ -243,10 +243,10 @@ class getid3_lib
 		}
 		for ($i = 0; $i < $bytewordlen; $i++) {
 			if ($synchsafe) { // disregard MSB, effectively 7-bit bytes
-				//$intvalue = $intvalue | (ord($byteword{$i}) & 0x7F) << (($bytewordlen - 1 - $i) * 7); // faster, but runs into problems past 2^31 on 32-bit systems
-				$intvalue += (ord($byteword{$i}) & 0x7F) * pow(2, ($bytewordlen - 1 - $i) * 7);
+				//$intvalue = $intvalue | (ord($byteword[$i]) & 0x7F) << (($bytewordlen - 1 - $i) * 7); // faster, but runs into problems past 2^31 on 32-bit systems
+				$intvalue += (ord($byteword[$i]) & 0x7F) * pow(2, ($bytewordlen - 1 - $i) * 7);
 			} else {
-				$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
+				$intvalue += ord($byteword[$i]) * pow(256, ($bytewordlen - 1 - $i));
 			}
 		}
 		if ($signed && !$synchsafe) {
@@ -273,7 +273,7 @@ class getid3_lib
 		$binvalue = '';
 		$bytewordlen = strlen($byteword);
 		for ($i = 0; $i < $bytewordlen; $i++) {
-			$binvalue .= str_pad(decbin(ord($byteword{$i})), 8, '0', STR_PAD_LEFT);
+			$binvalue .= str_pad(decbin(ord($byteword[$i])), 8, '0', STR_PAD_LEFT);
 		}
 		return $binvalue;
 	}
@@ -317,7 +317,7 @@ class getid3_lib
 	public static function Bin2Dec($binstring, $signed=false) {
 		$signmult = 1;
 		if ($signed) {
-			if ($binstring{0} == '1') {
+			if ($binstring[0] == '1') {
 				$signmult = -1;
 			}
 			$binstring = substr($binstring, 1);
@@ -538,7 +538,7 @@ class getid3_lib
 			$newcharstring .= "\xEF\xBB\xBF";
 		}
 		for ($i = 0; $i < strlen($string); $i++) {
-			$charval = ord($string{$i});
+			$charval = ord($string[$i]);
 			$newcharstring .= self::iconv_fallback_int_utf8($charval);
 		}
 		return $newcharstring;
@@ -551,7 +551,7 @@ class getid3_lib
 			$newcharstring .= "\xFE\xFF";
 		}
 		for ($i = 0; $i < strlen($string); $i++) {
-			$newcharstring .= "\x00".$string{$i};
+			$newcharstring .= "\x00".$string[$i];
 		}
 		return $newcharstring;
 	}
@@ -563,7 +563,7 @@ class getid3_lib
 			$newcharstring .= "\xFF\xFE";
 		}
 		for ($i = 0; $i < strlen($string); $i++) {
-			$newcharstring .= $string{$i}."\x00";
+			$newcharstring .= $string[$i]."\x00";
 		}
 		return $newcharstring;
 	}
@@ -583,27 +583,27 @@ class getid3_lib
 		$offset = 0;
 		$stringlength = strlen($string);
 		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
+			if ((ord($string[$offset]) | 0x07) == 0xF7) {
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+						   ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+						   ((ord($string[($offset + 2)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 3)]) & 0x3F);
 				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+			} elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+						   ((ord($string[($offset + 1)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 2)]) & 0x3F);
 				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+			} elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x1F) <<  6) &
+							(ord($string[($offset + 1)]) & 0x3F);
 				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+			} elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
 				// 0bbbbbbb
-				$charval = ord($string{$offset});
+				$charval = ord($string[$offset]);
 				$offset += 1;
 			} else {
 				// error? throw some kind of warning here?
@@ -626,27 +626,27 @@ class getid3_lib
 		$offset = 0;
 		$stringlength = strlen($string);
 		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
+			if ((ord($string[$offset]) | 0x07) == 0xF7) {
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+						   ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+						   ((ord($string[($offset + 2)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 3)]) & 0x3F);
 				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+			} elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+						   ((ord($string[($offset + 1)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 2)]) & 0x3F);
 				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+			} elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x1F) <<  6) &
+							(ord($string[($offset + 1)]) & 0x3F);
 				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+			} elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
 				// 0bbbbbbb
-				$charval = ord($string{$offset});
+				$charval = ord($string[$offset]);
 				$offset += 1;
 			} else {
 				// error? throw some kind of warning here?
@@ -669,27 +669,27 @@ class getid3_lib
 		$offset = 0;
 		$stringlength = strlen($string);
 		while ($offset < $stringlength) {
-			if ((ord($string{$offset}) | 0x07) == 0xF7) {
+			if ((ord($string[$offset]) | 0x07) == 0xF7) {
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
-						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 3)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x07) << 18) &
+						   ((ord($string[($offset + 1)]) & 0x3F) << 12) &
+						   ((ord($string[($offset + 2)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 3)]) & 0x3F);
 				$offset += 4;
-			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
+			} elseif ((ord($string[$offset]) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
-							(ord($string{($offset + 2)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x0F) << 12) &
+						   ((ord($string[($offset + 1)]) & 0x3F) <<  6) &
+							(ord($string[($offset + 2)]) & 0x3F);
 				$offset += 3;
-			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
+			} elseif ((ord($string[$offset]) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
-							(ord($string{($offset + 1)}) & 0x3F);
+				$charval = ((ord($string[($offset + 0)]) & 0x1F) <<  6) &
+							(ord($string[($offset + 1)]) & 0x3F);
 				$offset += 2;
-			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
+			} elseif ((ord($string[$offset]) | 0x7F) == 0x7F) {
 				// 0bbbbbbb
-				$charval = ord($string{$offset});
+				$charval = ord($string[$offset]);
 				$offset += 1;
 			} else {
 				// error? maybe throw some warning here?
@@ -886,22 +886,22 @@ class getid3_lib
 			case 'UTF-8':
 				$strlen = strlen($string);
 				for ($i = 0; $i < $strlen; $i++) {
-					$char_ord_val = ord($string{$i});
+					$char_ord_val = ord($string[$i]);
 					$charval = 0;
 					if ($char_ord_val < 0x80) {
 						$charval = $char_ord_val;
 					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F  &&  $i+3 < $strlen) {
 						$charval  = (($char_ord_val & 0x07) << 18);
-						$charval += ((ord($string{++$i}) & 0x3F) << 12);
-						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
+						$charval += ((ord($string[++$i]) & 0x3F) << 12);
+						$charval += ((ord($string[++$i]) & 0x3F) << 6);
+						$charval +=  (ord($string[++$i]) & 0x3F);
 					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07  &&  $i+2 < $strlen) {
 						$charval  = (($char_ord_val & 0x0F) << 12);
-						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
+						$charval += ((ord($string[++$i]) & 0x3F) << 6);
+						$charval +=  (ord($string[++$i]) & 0x3F);
 					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03  &&  $i+1 < $strlen) {
 						$charval  = (($char_ord_val & 0x1F) << 6);
-						$charval += (ord($string{++$i}) & 0x3F);
+						$charval += (ord($string[++$i]) & 0x3F);
 					}
 					if (($charval >= 32) && ($charval <= 127)) {
 						$HTMLstring .= htmlentities(chr($charval));
diff --git a/vendor/psr/log/Psr/Log/AbstractLogger.php b/vendor/psr/log/Psr/Log/AbstractLogger.php
index 90e721af2..e02f9daf3 100644
--- a/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -30,8 +30,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -45,8 +45,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -59,8 +59,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -75,8 +75,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -88,8 +88,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Normal but significant events.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
@@ -116,8 +116,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Detailed debug information.
      *
-     * @param string $message
-     * @param array  $context
+     * @param string  $message
+     * @param mixed[] $context
      *
      * @return void
      */
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index 639f79bda..82bf45c89 100644
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
      * The logger instance.
      *
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     protected $logger;
 
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
index 3f6d4eea4..ca0569537 100644
--- a/vendor/psr/log/composer.json
+++ b/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
diff --git a/vendor/smarty/smarty/CHANGELOG.md b/vendor/smarty/smarty/CHANGELOG.md
index 06b898223..e3bb93a4f 100644
--- a/vendor/smarty/smarty/CHANGELOG.md
+++ b/vendor/smarty/smarty/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.1.39] - 2021-02-17
+
+### Security
+- Prevent access to `$smarty.template_object` in sandbox mode
+- Fixed code injection vulnerability by using illegal function names in `{function name='blah'}{/function}` 
+
 ## [3.1.38] - 2021-01-08
 
 ### Fixed
diff --git a/vendor/smarty/smarty/expectException b/vendor/smarty/smarty/expectException
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/vendor/smarty/smarty/expectException
diff --git a/vendor/smarty/smarty/libs/Smarty.class.php b/vendor/smarty/smarty/libs/Smarty.class.php
index 6564be6d2..375bab133 100644
--- a/vendor/smarty/smarty/libs/Smarty.class.php
+++ b/vendor/smarty/smarty/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.38';
+    const SMARTY_VERSION = '3.1.39';
     /**
      * define variable scopes
      */
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
index 6e408ca72..d0f2b0f4a 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -58,6 +58,11 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase
         }
         unset($_attr[ 'nocache' ]);
         $_name = trim($_attr[ 'name' ], '\'"');
+
+        if (!preg_match('/^[a-zA-Z0-9_\x80-\xff]+$/', $_name)) {
+	        $compiler->trigger_template_error("Function name contains invalid characters: {$_name}", null, true);
+        }
+
         $compiler->parent_compiler->tpl_function[ $_name ] = array();
         $save = array(
             $_attr, $compiler->parser->current_buffer, $compiler->template->compiled->has_nocache_code,
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
index de7d4a224..d53ef51ff 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_private_special_variable.php
@@ -81,6 +81,10 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';
                 case 'template_object':
+                    if (isset($compiler->smarty->security_policy)) {
+                        $compiler->trigger_template_error("(secure mode) template_object not permitted");
+                        break;
+                    }
                     return '$_smarty_tpl';
                 case 'current_dir':
                     return 'dirname($_smarty_tpl->source->filepath)';
diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json
index 995978c0a..f0621a3b6 100644
--- a/vendor/symfony/polyfill-ctype/composer.json
+++ b/vendor/symfony/polyfill-ctype/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.22-dev"
+            "dev-main": "1.23-dev"
         },
         "thanks": {
             "name": "symfony/polyfill",
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 43bc96e57..dbb930fc7 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -34,6 +34,8 @@
 #jot-pagetitle-wrap input,
 #jot-customjotheaders-wrap {
 	padding: 0.5rem;
+	outline: none;
+
 }
 
 #jot-text-wrap {
@@ -55,6 +57,7 @@
 	padding: 0.5rem;
 	width: 100%;
 	display: inherit;
+	outline: none;
 }
 
 #profile-jot-text.jot-expanded {
diff --git a/view/css/mod_dm.css b/view/css/mod_dm.css
new file mode 100644
index 000000000..dde242d4e
--- /dev/null
+++ b/view/css/mod_dm.css
@@ -0,0 +1,3 @@
+#jot-popup {
+	display: none;
+}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 30e7e6972..a67c10ed2 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -38,15 +38,16 @@ li:hover .widget-nav-pills-icons {
 	margin-top: 10px;
 }
 
-/* notes */ 
+/* notes */
 
 #note-text {
 	border: 1px solid rgba(0,0,0,.125);
 	padding: 5px;
 	width: 100%;
-	resize: none;
+	resize: vertical;
 	min-height: 250px;
-	overflow: hidden;
+	overflow: auto;
+	outline: none;
 }
 
 /* saved searches */
@@ -241,3 +242,12 @@ a.wikilist {
 #cid-filter-wrapper {
 	position: relative;
 }
+
+/* hq_controls */
+.hq_controls_fixed_bottom_center {
+	z-index: 1028;
+	position: fixed;
+	bottom: 0px;
+	left: 50%;
+	transform: translateX(-50%);
+}
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 025e5095d..d61cb65c2 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
-	return ($n != 1 ? 1 : 0);
+	return ($n != 1);
 }}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index c45c47518..f20c45982 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -162,8 +162,8 @@ function string2bb(element) {
 		if (typeof extra_channels === 'undefined') extra_channels = false;
 
 		// Autocomplete contacts
-		contacts = {
-			match: /(^|\s)(@\!*)([^ \n]{3,})$/,
+		channels = {
+			match: /(^(?=[^\!]{2})|\s)(@)([^ \n]{3,})$/,
 			index: 3,
 			cache: true,
 			search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels, spinelement=false); },
@@ -171,6 +171,15 @@ function string2bb(element) {
 			template: contact_format
 		};
 
+		contacts = {
+			match: /(^|\s)(@\!)([^ \n]{3,})$/,
+			index: 3,
+			cache: true,
+			search: function(term, callback) { contact_search(term, callback, backend_url, 'm', extra_channels, spinelement=false); },
+			replace: editor_replace,
+			template: contact_format
+		};
+
 		// Autocomplete hashtags
 		tags = {
 			match: /(^|\s)(\#)([^ \n]{2,})$/,
@@ -202,7 +211,7 @@ function string2bb(element) {
 					maxCount: 100
 				}
 			});
-			textcomplete.register([contacts,smilies,tags]);
+			textcomplete.register([channels,contacts,smilies,tags]);
 		});
 	};
 })( jQuery );
diff --git a/view/js/main.js b/view/js/main.js
index 6c418b213..f427df8ad 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -26,13 +26,6 @@ var followUpPageLoad = false;
 var window_needs_alert = true;
 var expanded_items = [];
 
-var sse_bs_active = false;
-var sse_offset = 0;
-var sse_type;
-var sse_partial_result = false;
-var sse_rmids = [];
-var sse_fallback_interval;
-
 var page_cache = {};
 
 // take care of tab/window reloads on channel change
@@ -78,6 +71,65 @@ $(document).ready(function() {
 		}
 	});
 
+	// @hilmar |->
+	if ( typeof(window.tao) == 'undefined' ) {
+		window.tao = {};
+	}
+	if ( typeof(window.tao.zin) == 'undefined' ) {
+		tao.zin = { syslc: '', syslcs: {}, htm: '', me: '', debug: '' };
+		tao.zin.axim = '<div class="zinpax fa fa-sync fa-spin"> </div>';
+		$('.navbar-app[href*="/lang"]').attr({"data-toggle": "dropdown", "aria-expand": "true", "id": "zintog"})
+			.removeAttr('href').addClass('zinlcx zinlcxp dropdown dropdown-toggle');
+		$('.dropdown-item[href*="/lang"]').addClass('zinlcxmi zinlcx').removeAttr('href').css('cursor','pointer');
+	}
+	$('.zinlcx').on('click',  function(e) {
+		if (tao.zin.syslc == '') {
+			$('.zinlcx').append(tao.zin.axim);
+			$.ajax({
+    			type: 'POST', url: 'lang',
+      			data: { zinlc: '??' }
+   			}).done( function(re) {
+   				tao.zin.re = JSON.parse(re);
+   			 	tao.zin.syslc = tao.zin.re.lc;
+   			 	tao.zin.syslcs = tao.zin.re.lcs;
+				tao.zin.htm = '<ul class="zinlcs fa-ul">';
+				$.each( tao.zin.syslcs, function( k, v ) {
+					tao.zin.htm += '<li><a id="zinlc' + k + '" class="zinlc dropdown-item fakelink">' + k + ' ' + v + '</a></li>';
+				});
+				tao.zin.htm += '</ul>';
+				$('.zinpax').remove();
+				$('.zinlcx').append(tao.zin.htm);
+				$('.zinlcxp > ul').addClass('dropdown dropdown-menu dropdown-menu-right').css('left','-16em');
+   			});
+			return false;
+		} else {
+			if (e.target.id == '') {
+				// noop click on lang again
+				return false;
+			}
+			tao.zin.me = e.target.id.substr(5);
+			$('#right_aside_wrapper').append(tao.zin.axim);
+			$.ajax({
+	   			type: 'POST', url: 'lang',
+      			data: { zinlc: tao.zin.me }
+    		}).done( function(re) {
+     			tao.zin.re = JSON.parse(re);
+     			location.reload(true);
+    		});
+		}
+	});
+	$('#zintog').on('click', function() {
+		$('.zinlcs').toggle();
+	});
+	$('#dropdown-menu').on('shown.bs.dropdown', function() {
+		tao.zin.debug += 'e,';
+		//$('.zinlcs').removeAttr('display');
+	})
+		.on('mouseleave', function() {
+		$(this).trigger('click');
+	});
+	// @hilmar <-|
+
 	var tf = new Function('n', 's', 'var k = s.split("/")['+aStr['plural_func']+']; return (k ? k : s);');
 
 	jQuery.timeago.settings.strings = {
@@ -102,110 +154,63 @@ $(document).ready(function() {
 
 	jQuery.timeago.settings.allowFuture = true;
 
-	if(sse_enabled) {
-		if(typeof(window.SharedWorker) === 'undefined') {
-			// notifications with multiple tabs open will not work very well in this scenario
-			var evtSource = new EventSource('/sse');
-
-			evtSource.addEventListener('notifications', function(e) {
-				var obj = JSON.parse(e.data);
-				sse_handleNotifications(obj, false, false);
-			}, false);
+	$(document).on('click', '.notification, .message', function(e) {
+		let b64mid = $(this).data('b64mid');
+		let notify_id = $(this).data('notify_id');
+		let path = $(this)[0].pathname.split('/')[1];
+		let stateObj = { b64mid: b64mid };
+		let singlethread_modules = ['display', 'hq', 'dm'];
+		let redirect_modules = ['display', 'notify'];
 
-			document.addEventListener('visibilitychange', function() {
-				if (!document.hidden) {
-					sse_offset = 0;
-					sse_bs_init();
-				}
-			}, false);
+		if(! b64mid && ! notify_id)
+			return;
 
+		if(redirect_modules.indexOf(path) !== -1) {
+			path = 'hq';
 		}
-		else {
-			var myWorker = new SharedWorker('/view/js/sse_worker.js', localUser);
 
-			myWorker.port.onmessage = function(e) {
-				obj = e.data;
-				console.log(obj);
-				sse_handleNotifications(obj, false, false);
-			}
-
-			myWorker.onerror = function(e) {
-				myWorker.port.close();
-			}
+		if(notify_id != null) {
+			$.ajax({
+				type: 'post',
+				url: 'notify',
+				data: {
+					'notify_id' : notify_id
+				},
+				async: ((module !== path) ? false : true)
+			});
+		}
 
-			myWorker.port.start();
+		if (module !== path) {
+			e.preventDefault();
+			window.location.href = path + '/' + b64mid;
 		}
-	}
-	else {
-		if (!document.hidden)
-			sse_fallback_interval = setInterval(sse_fallback, updateInterval);
+		else {
 
-		document.addEventListener('visibilitychange', function() {
-			if (document.hidden) {
-				clearInterval(sse_fallback_interval);
-			}
-			else {
-				sse_offset = 0;
-				sse_bs_init();
-				sse_fallback_interval = setInterval(sse_fallback, updateInterval);
+			if (singlethread_modules.indexOf(module) !== -1) {
+				history.pushState(stateObj, '', module + '/' + b64mid);
+				$('.message').removeClass('active');
+				$('[data-b64mid="' + b64mid + '"].message').addClass('active');
 			}
 
-		}, false);
-	}
-
-	$('.notification-link').on('click', { replace: true, followup: false }, sse_bs_notifications);
-
-	$('.notification-filter').on('keypress', function(e) {
-		if(e.which == 13) { // enter
-			this.blur();
-			sse_offset = 0;
-			$("#nav-" + sse_type + "-menu").html('');
-			$("#nav-" + sse_type + "-loading").show();
+			if (b64mid) {
 
-			var cn_val = $('#cn-' + sse_type + '-input').length ? $('#cn-' + sse_type + '-input').val().toString().toLowerCase() : '';
+				e.preventDefault();
 
-			$.get('/sse_bs/' + sse_type + '/' + sse_offset + '?nquery=' + encodeURIComponent(cn_val), function(obj) {
-				console.log('sse: bootstraping ' + sse_type);
-				console.log(obj);
-
-				sse_bs_active = false;
-				sse_partial_result = true;
-				sse_offset = obj[sse_type].offset;
-				if(sse_offset < 0)
-					$("#nav-" + sse_type + "-loading").hide();
-
-				sse_handleNotifications(obj, true, false);
-
-			});
+				if(! page_load) {
+					prepareLiveUpdate(b64mid, notify_id);
+				}
+			}
 		}
 	});
 
-	$('.notifications-textinput-clear').on('click', function(e) {
-		if(! sse_partial_result)
-			return;
-
-		$("#nav-" + sse_type + "-menu").html('');
-		$("#nav-" + sse_type + "-loading").show();
-		$.get('/sse_bs/' + sse_type, function(obj) {
-			console.log('sse: bootstraping ' + sse_type);
-			console.log(obj);
-
-			sse_bs_active = false;
-			sse_partial_result = false;
-			sse_offset = obj[sse_type].offset;
-			if(sse_offset < 0)
-				$("#nav-" + sse_type + "-loading").hide();
-
-			sse_handleNotifications(obj, true, false);
-
-		});
-	});
-
-	$('.notification-content').on('scroll', function() {
-		if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) {
-			sse_bs_notifications(sse_type, false, true);
+	window.onpopstate = function(e) {
+		if(e.state !== null && e.state.b64mid !== bParam_mid) {
+			prepareLiveUpdate(e.state.b64mid, '');
+			$('.message').removeClass('active');
+			$('[data-b64mid="' + e.state.b64mid + '"].message').addClass('active');
 		}
-	});
+
+	};
 
 	//mod_mail only
 	$(".mail-conv-detail .autotime").timeago();
@@ -537,7 +542,7 @@ function closeMenu(theID) {
 }
 
 function markRead(notifType) {
-	$.get('ping?f=&markRead='+notifType);
+	$.get('notifications?f=&markRead='+notifType);
 	$('.' + notifType + '-button').fadeOut(function() {
 		$("." + notifType + "-update").html('0');
 		$('#nav-' + notifType + '-menu').html('');
@@ -548,7 +553,7 @@ function markRead(notifType) {
 }
 
 function markItemRead(itemId) {
-	$.get('ping?f=&markItemRead='+itemId);
+	$.get('notifications?f=&markItemRead='+itemId);
 	$('.unseen-wall-indicator-'+itemId).remove();
 }
 
@@ -908,6 +913,20 @@ function updateInit() {
 	}
 }
 
+function prepareLiveUpdate(b64mid, notify_id) {
+	$(document).scrollTop(0);
+	$('.thread-wrapper').remove();
+	bParam_mid = b64mid;
+	mode = 'replace';
+	page_load = true;
+	if (module == 'hq') {
+		liveUpdate(notify_id);
+	}
+	if (module == 'display'|| module == 'dm') {
+		liveUpdate();
+	}
+}
+
 function liveUpdate(notify_id) {
 
 	if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
@@ -993,7 +1012,7 @@ function liveUpdate(notify_id) {
 
 		if(typeof notify_id !== 'undefined' && notify_id !== 'undefined') {
 			$.post(
-				"hq",
+				"notify",
 				{
 					"notify_id" : notify_id
 				}
@@ -1255,7 +1274,7 @@ function dopin(id) {
                 });
 }
 
-function dropItem(url, object) {
+function dropItem(url, object, b64mid) {
 	var confirm = confirmDelete();
 	if(confirm) {
 		var id = url.split('/')[2];
@@ -1265,13 +1284,20 @@ function dropItem(url, object) {
 		$.get(url, function() {
 			$(object + ', #pinned-wrapper-' + id).remove();
 			$('body').css('cursor', 'auto');
+
+			if (typeof b64mid !== typeof undefined) {
+				$('[data-b64mid=\'' + b64mid + '\']').fadeOut(function() {
+					this.remove();
+				});
+			}
 		});
 
-		if($('#wall-item-pinned-' + id).length)
+		if($('#wall-item-pinned-' + id).length) {
 			$.post('pin/pin', { 'id' : id });
+		}
 
 		return true;
-        }
+	}
 	else {
 		return false;
 	}
@@ -1446,24 +1472,6 @@ function preview_post() {
 	return true;
 }
 
-function preview_mail() {
-	$("#mail-preview").val("1");
-	$("#mail-preview-content").show();
-	$.post(
-		"mail",
-		$("#prvmail-form").serialize(),
-		function(data) {
-			if(data.preview) {
-				$("#mail-preview-content").html(data.preview);
-				$("#mail-preview-content" + " a").click(function() { return false; });
-			}
-		},
-		"json"
-	);
-	$("#mail-preview").val("0");
-	return true;
-}
-
 function bin2hex(s) {
 	// Converts the binary representation of data to hex
 	//
@@ -1719,294 +1727,40 @@ function zid(s) {
 	return s;
 }
 
-function sse_bs_init() {
-	if(sessionStorage.getItem('notification_open') !== null || typeof sse_type !== 'undefined' ) {
-		if(typeof sse_type === 'undefined')
-			sse_type = sessionStorage.getItem('notification_open');
-
-		$("#nav-" + sse_type + "-sub").addClass('show');
-		sse_bs_notifications(sse_type, true, false);
-	}
-	else {
-		sse_bs_counts();
-	}
-}
-
-function sse_bs_counts() {
-	if(sse_bs_active)
-		return;
-
-	sse_bs_active = true;
-
-	$.ajax({
-		type: 'post',
-		url: '/sse_bs',
-		data: { sse_rmids }
-	}).done( function(obj) {
-		console.log(obj);
-		sse_bs_active = false;
-		sse_rmids = [];
-		sse_handleNotifications(obj, true, false);
-	});
-}
-
-function sse_bs_notifications(e, replace, followup) {
-
-	if(sse_bs_active)
-		return;
-
-
-	var manual = false;
-
-	if(typeof replace === 'undefined')
-		replace = e.data.replace;
-
-	if(typeof followup === 'undefined')
-		followup = e.data.followup;
-
-	if(typeof e === 'string') {
-		sse_type = e;
-	}
-	else {
-		manual = true;
-		sse_offset = 0;
-		sse_type = e.target.dataset.sse_type;
-	}
-
-	if(typeof sse_type === 'undefined')
-		return;
-
-	if(followup || !manual || !($('#nav-' + sse_type + '-sub').hasClass('collapse') && $('#nav-' + sse_type + '-sub').hasClass('show'))) {
-
-		if(sse_offset >= 0) {
-			$("#nav-" + sse_type + "-loading").show();
-		}
-
-		sessionStorage.setItem('notification_open', sse_type);
-		if(sse_offset !== -1 || replace) {
-
-			var cn_val = (($('#cn-' + sse_type + '-input').length && sse_partial_result) ? $('#cn-' + sse_type + '-input').val().toString().toLowerCase() : '');
-
-			$("#nav-" + sse_type + "-loading").show();
-
-			sse_bs_active = true;
-
-			$.ajax({
-				type: 'post',
-				url: '/sse_bs/' + sse_type + '/' + sse_offset,
-				nquery: encodeURIComponent(cn_val),
-				data: { sse_rmids }
-			}).done(function(obj) {
-				console.log('sse: bootstraping ' + sse_type);
-				console.log(obj);
-				sse_bs_active = false;
-				sse_rmids = [];
-				$("#nav-" + sse_type + "-loading").hide();
-				sse_offset = obj[sse_type].offset;
-				sse_handleNotifications(obj, replace, followup);
-			});
-		}
-		else
-			$("#nav-" + sse_type + "-loading").hide();
-
-	}
-	else {
-		sessionStorage.removeItem('notification_open');
-	}
-}
-
-function sse_handleNotifications(obj, replace, followup) {
-
-	var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files'];
-	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
-	var all_notifications = primary_notifications.concat(secondary_notifications);
-
-	all_notifications.forEach(function(type, index) {
-		if(typeof obj[type] === typeof undefined)
-			return true;
-
-		if(obj[type].count) {
-			$('.' + type + '-button').fadeIn();
-			if(replace || followup)
-				$('.' + type + '-update').html(Number(obj[type].count));
-			else
-				$('.' + type + '-update').html(Number(obj[type].count) + Number($('.' + type + '-update').html()));
-		}
-		else {
-			$('.' + type + '-update').html('0');
-			$('.' + type + '-button').fadeOut(function() {
-				sse_setNotificationsStatus();
-			});
-		}
-		if(obj[type].notifications.length)
-			sse_handleNotificationsItems(type, obj[type].notifications, replace, followup);
-	});
-
-	sse_setNotificationsStatus();
-
-	// notice and info
-	$.jGrowl.defaults.closerTemplate = '<div>[ ' + aStr.closeAll + ']</div>';
-
-	if(obj.notice) {
-		$(obj.notice.notifications).each(function() {
-			$.jGrowl(this, { sticky: true, theme: 'notice' });
-		});
-	}
-
-	if(obj.info) {
-		$(obj.info.notifications).each(function(){
-			$.jGrowl(this, { sticky: false, theme: 'info', life: 10000 });
-		});
-	}
-
-	// load more notifications if visible notifications count becomes low
-	if(sse_type  && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children().length <= 20) {
-		sse_offset = 0;
-		sse_bs_notifications(sse_type, false, true);
-	}
-
-
-}
-
-function sse_handleNotificationsItems(notifyType, data, replace, followup) {
-
-	var notifications_tpl = ((notifyType == 'forums') ? decodeURIComponent($("#nav-notifications-forums-template[rel=template]").html().replace('data-src', 'src')) : decodeURIComponent($("#nav-notifications-template[rel=template]").html().replace('data-src', 'src')));
-	var notify_menu = $("#nav-" + notifyType + "-menu");
-	var notify_loading = $("#nav-" + notifyType + "-loading");
-	var notify_count = $("." + notifyType + "-update");
-
-	if(replace && !followup) {
-		notify_menu.html('');
-		notify_loading.hide();
-	}
-
-	$(data).each(function() {
-
-		// do not add a notification if it is already present
-		if($('#nav-' + notifyType + '-menu .notification[data-b64mid=\'' + this.b64mid + '\']').length)
-			return true;
-
-		html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum, encodeURIComponent(this.mids), this.body);
-		notify_menu.append(html);
-	});
-
-	if(!replace && !followup) {
-		$("#nav-" + notifyType + "-menu .notification").sort(function(a,b) {
-			a = new Date(a.dataset.when);
-			b = new Date(b.dataset.when);
-			return a > b ? -1 : a < b ? 1 : 0;
-		}).appendTo('#nav-' + notifyType + '-menu');
-	}
-
-	$(document.body).trigger("sticky_kit:recalc");
-	$("#nav-" + notifyType + "-menu .notifications-autotime").timeago();
-
-	if($('#tt-' + notifyType + '-only').hasClass('active'))
-		$('#nav-' + notifyType + '-menu [data-thread_top=false]').addClass('tt-filter-active');
-
-	if($('#cn-' + notifyType + '-input').length) {
-		var filter = $('#cn-' + notifyType + '-input').val().toString().toLowerCase();
-		if(filter) {
-			filter = filter.indexOf('%') == 0 ? filter.substring(1) : filter;
-
-			$('#nav-' + notifyType + '-menu .notification').each(function(i, el) {
-				var cn = $(el).data('contact_name').toString().toLowerCase();
-				var ca = $(el).data('contact_addr').toString().toLowerCase();
-				if(cn.indexOf(filter) === -1 && ca.indexOf(filter) === -1)
-					$(el).addClass('cn-filter-active');
-				else
-					$(el).removeClass('cn-filter-active');
-			});
-		}
+function makeid(length) {
+	var result = '';
+	var characters = 'abcdef0123456789';
+	var charactersLength = characters.length;
+	for ( var i = 0; i < length; i++ ) {
+		result += characters.charAt(Math.floor(Math.random() * charactersLength));
 	}
+	return result;
 }
 
-function sse_updateNotifications(type, mid) {
-
-	if(type === 'pubs')
-		return true;
-
-	if(type === 'notify' && (mid !== bParam_mid || sse_type !== 'notify'))
-		return true;
-/*
-	var count = Number($('.' + type + '-update').html());
-
-	count--;
-
-	if(count < 1) {
-		$('.' + type + '-update').html(count);
-		$('.' + type + '-button').fadeOut(function() {
-			sse_setNotificationsStatus();
+function push_notification_request(e) {
+    if (!('Notification' in window)) {
+        alert('This browser does not support push notifications');
+    }
+    else if (Notification.permission !== 'granted') {
+        Notification.requestPermission(function(permission) {
+			if(permission === 'granted') {
+				$(e.target).closest('div').hide();
+			}
 		});
-	}
-	else {
-		$('.' + type + '-update').html(count);
-	}
-*/
-
-	$('#nav-' + type + '-menu .notification[data-b64mid=\'' + mid + '\']').fadeOut(function() {
-		this.remove();
-	});
-
+   }
 }
 
-function sse_setNotificationsStatus() {
-	var primary_notifications = ['dm', 'home', 'intros', 'register', 'mail', 'notify', 'files'];
-	var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
-	var all_notifications = primary_notifications.concat(secondary_notifications);
-
-	var primary_available = false;
-	var any_available = false;
 
-	all_notifications.forEach(function(type, index) {
-		if($('.' + type + '-button').css('display') == 'block') {
-			any_available = true;
-			if(primary_notifications.indexOf(type) > -1)
-				primary_available = true;
-		}
-	});
-
-	if(primary_available) {
-		$('.notifications-btn-icon').removeClass('fa-exclamation-circle');
-		$('.notifications-btn-icon').addClass('fa-exclamation-triangle');
-	}
-	else {
-		$('.notifications-btn-icon').removeClass('fa-exclamation-triangle');
-		$('.notifications-btn-icon').addClass('fa-exclamation-circle');
-	}
-
-	if(any_available) {
-		$('.notifications-btn').css('opacity', 1);
-		$('#no_notifications').hide();
-		$('#notifications').show();
-	}
-	else {
-		$('.notifications-btn').css('opacity', 0.5);
-		$('#navbar-collapse-1').removeClass('show');
-		$('#no_notifications').show();
-		$('#notifications').hide();
+function push_notification(title, body, href) {
+	let options = {
+		body: body,
+		data: href,
+		icon: '/images/hz-64.png',
+		silent: false
 	}
 
-}
-
-function sse_fallback() {
-	$.get('/sse', function(obj) {
-		if(! obj)
-			return;
-
-		console.log('sse fallback');
-		console.log(obj);
-
-		sse_handleNotifications(obj, false, false);
-	});
-}
-
-function makeid(length) {
-	var result = '';
-	var characters = 'abcdef0123456789';
-	var charactersLength = characters.length;
-	for ( var i = 0; i < length; i++ ) {
-		result += characters.charAt(Math.floor(Math.random() * charactersLength));
+	let n = new Notification(title, options);
+	n.onclick = function (e) {
+		window.location.href = e.target.data;
 	}
-	return result;
 }
diff --git a/view/js/mod_hq.js b/view/js/mod_hq.js
index b321382bd..ad77e0af0 100644
--- a/view/js/mod_hq.js
+++ b/view/js/mod_hq.js
@@ -1,10 +1,25 @@
-$(document).on('click', '#jot-toggle', function(e) {
-	e.preventDefault();
-	e.stopPropagation();
-
-	$(this).toggleClass('active');
-	$(window).scrollTop(0);
-	$('#jot-popup').toggle();
-	$('#profile-jot-text').focus();
+$(document).ready(function() {
+
+	$(document).on('click', '.jot-toggle', function(e) {
+		$(window).scrollTop(0);
+		$(document).trigger('hz:hqControlsClickAction');
+		$('#jot-popup').toggle();
+		$('#profile-jot-text').focus();
+	});
+
+	$(document).on('click', '.notes-toggle', function(e) {
+		$(window).scrollTop(0);
+		$(document).trigger('hz:hqControlsClickAction');
+		$('#personal-notes').toggleClass('d-none');
+		$('#note-text').focus();
+	});
+
+	$(document).on('hz:handleNetworkNotificationsItems', function(e, obj) {
+		push_notification(
+			obj.name,
+			$('<p>' + obj.message + '</p>').text(),
+			baseurl + '/hq/' + obj.b64mid
+		);
+	});
 
 });
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
deleted file mode 100644
index 917e5414c..000000000
--- a/view/js/mod_mail.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$(document).ready(function() { 
-	$("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
-		$("#recip-complete").val(data.xid);
-	});
-	$('#prvmail-text').bbco_autocomplete('bbcode');
-	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
-}); 
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index af675e31c..41b8ed560 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -8,11 +8,12 @@ $(document).ready(function() {
 		UploadInit();
 	}
 
-	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
-		$("#photo-edit-newtag").val('@' + data.name);
-	});
-	
+	//$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
+		//$("#photo-edit-newtag").val('@' + data.name);
+	//});
+
 	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
+	$('textarea').editor_autocomplete(baseurl+"/acl");
 	$('textarea').bbco_autocomplete('bbcode');
 	showHideBodyTextarea();
 
@@ -70,12 +71,12 @@ function UploadInit() {
 
            progress: function(e,data) {
 
-                // there will only be one file, the one we are looking for                                                                                                                       
+                // there will only be one file, the one we are looking for
 
                 $(data.files).each( function() {
                     var idx = this.count;
 
-                    // Dynamically update the percentage complete displayed in the file upload list                                                                                              
+                    // Dynamically update the percentage complete displayed in the file upload list
                     $('#upload-progress-' + idx).html(Math.round(data.loaded / data.total * 100) + '%');
                     $('#upload-progress-bar-' + idx).css('background-size', Math.round(data.loaded / data.total * 100) + '%');
 
@@ -283,7 +284,7 @@ function UploadFile(file, idx) {
 		$('#upload-progress-' + idx).html('<span style="color: red;">ERROR</span>');
 	});
 
-	// POST to the entire cloud path 
+	// POST to the entire cloud path
 	xhr.open('post', $('#photos-upload-form').attr( 'action' ), true);
 
 	var formfields = $("#photos-upload-form").serializeArray();
diff --git a/view/js/mod_register.js b/view/js/mod_register.js
index 1fc5ad2fa..f54dd2570 100644
--- a/view/js/mod_register.js
+++ b/view/js/mod_register.js
@@ -3,7 +3,7 @@ $(document).ready(function() {
 	typeof(window.tao) == 'undefined' ? window.tao = {} : '';
 	tao.zar = { vsn: '2.0.0', form: {}, msg: {} };
 	tao.zar.patano = /^d[0-9]{5,10}$/;
-	tao.zar.patema = /^[a-z0-9.-]{1,64}@[a-z0-9.-]{2,32}\.[a-z]{2,12}$/;
+	tao.zar.patema = /^[^@\s]{1,64}@[a-z0-9.-]{2,32}\.[a-z]{2,12}$/;
 
 	$('.register_date').each( function () {
 		var date = new Date($(this).data('utc'));
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index d3392c748..3e91dac9a 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -24,8 +24,14 @@ $(document).ready(function() {
 		loadPermcat(permName);
 	});
 
+	if (Notification.permission !== 'granted') {
+		$('#desktop-notifications-info').show();
+	}
 
-
+	$('#desktop-notifications-request').on('click', function(e) {
+		e.preventDefault();
+		push_notification_request(e);
+	});
 
 });
 
diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl
index 1bcdb2c65..9e139d7b9 100644
--- a/view/pdl/mod_hq.pdl
+++ b/view/pdl/mod_hq.pdl
@@ -1,5 +1,20 @@
 [region=aside]
-[widget=hq_controls][/widget]
+[widget=messages][/widget]
+[widget=hq_controls]
+	[var=wrapper_class]d-none d-lg-block[/var]
+	[var=entry_class]btn-outline-primary[/var]
+[/widget]
+[/region]
+[region=content]
+[widget=notes]
+	[var=hidden]1[/var]
+	[var=app]1[/var]
+[/widget]
+$content
+[widget=hq_controls]
+	[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
+	[var=entry_class]btn-lg btn-primary shadow[/var]
+[/widget]
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index a4bdf0a9f..cac3fc27e 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -3,7 +3,6 @@
 [widget=activity_filter][/widget]
 [widget=savedsearch][/widget]
 [widget=suggestions][/widget]
-[widget=notes][/widget]
 [/region]
 
 [region=content]
diff --git a/view/pl/hmessages.mo b/view/pl/hmessages.mo
index 64db4c71c..4dc55fd42 100644
--- a/view/pl/hmessages.mo
+++ b/view/pl/hmessages.mo
diff --git a/view/pl/hmessages.po b/view/pl/hmessages.po
index 0fb80a1c6..f9100f023 100644
--- a/view/pl/hmessages.po
+++ b/view/pl/hmessages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 5.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 21:08+0200\n"
-"PO-Revision-Date: 2021-05-31 13:29+0200\n"
+"POT-Creation-Date: 2021-06-12 02:13+0200\n"
+"PO-Revision-Date: 2021-06-13 02:21+0200\n"
 "Last-Translator: Andrzej Budziński <astabski@gmail.com>\n"
 "Language-Team: \n"
 "Language: pl\n"
@@ -72,13 +72,13 @@ msgstr "Może wysyłać mi prywatne wiadomości e-mail"
 
 #: ../../Zotlabs/Access/Permissions.php:69
 msgid "Can like/dislike profiles and profile things"
-msgstr "Może lubić/nie lubić profile i rzeczy w profilach"
+msgstr "Może pochwalać/ganić profile i rzeczy w profilach"
 
 #: ../../Zotlabs/Access/Permissions.php:70
 msgid "Can forward to all my channel connections via ! mentions in posts"
 msgstr ""
-"Może przekazywać informacje do wszystkich moich połączeń kanałowych za pośrednictwem !"
-"wzmianki w wpisach"
+"Może przekazywać informacje do wszystkich moich połączeń kanałowych za "
+"pośrednictwem !wzmianki w wpisach"
 
 #: ../../Zotlabs/Access/Permissions.php:71
 msgid "Can chat with me"
@@ -152,12 +152,13 @@ msgstr "Specjalne - celebryckie i mównice"
 msgid "Special - Group Repository"
 msgstr "Specjalne - repozytorium grupowe"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:310 ../../Zotlabs/Module/Cdav.php:1385
-#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:928
-#: ../../include/selectors.php:60 ../../include/selectors.php:77
-#: ../../include/selectors.php:115 ../../include/selectors.php:151
-#: ../../include/connections.php:741 ../../include/connections.php:748
-#: ../../include/event.php:1429 ../../include/event.php:1436
+#: ../../Zotlabs/Access/PermissionRoles.php:310
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:796
+#: ../../Zotlabs/Module/Connedit.php:920 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/selectors.php:115
+#: ../../include/selectors.php:151 ../../include/connections.php:741
+#: ../../include/connections.php:748 ../../include/event.php:1429
+#: ../../include/event.php:1436
 msgid "Other"
 msgstr "Inny"
 
@@ -165,62 +166,72 @@ msgstr "Inny"
 msgid "Custom/Expert Mode"
 msgstr "Tryb niestandardowy/ekspercki"
 
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Pdledit.php:35
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Events.php:277
-#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Webpages.php:133
-#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637
-#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Defperms.php:182
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:15
-#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Appman.php:87
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Moderate.php:15
-#: ../../Zotlabs/Module/New_channel.php:105 ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Filestorage.php:20 ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:96 ../../Zotlabs/Module/Filestorage.php:119
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Card_edit.php:51
+#: ../../Zotlabs/Module/Authtest.php:13 ../../Zotlabs/Module/Pdledit.php:35
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Bookmarks.php:70
+#: ../../Zotlabs/Module/Webpages.php:133 ../../Zotlabs/Module/Profiles.php:200
+#: ../../Zotlabs/Module/Profiles.php:636 ../../Zotlabs/Module/Like.php:242
+#: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Group.php:15 ../../Zotlabs/Module/Group.php:31
+#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Moderate.php:15
+#: ../../Zotlabs/Module/New_channel.php:105
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Filestorage.php:20
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:96
+#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Card_edit.php:51
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33 ../../Zotlabs/Module/Wiki.php:59
 #: ../../Zotlabs/Module/Wiki.php:284 ../../Zotlabs/Module/Wiki.php:427
 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Locs.php:100 ../../Zotlabs/Module/Connedit.php:397
-#: ../../Zotlabs/Module/Profile_photo.php:338 ../../Zotlabs/Module/Profile_photo.php:351
-#: ../../Zotlabs/Module/Sharedwithme.php:19 ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Locs.php:98 ../../Zotlabs/Module/Connedit.php:394
+#: ../../Zotlabs/Module/Profile_photo.php:338
+#: ../../Zotlabs/Module/Profile_photo.php:351
+#: ../../Zotlabs/Module/Sharedwithme.php:19
+#: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Manage.php:10
 #: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525
-#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1444
-#: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Regmod.php:20 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Chat.php:113 ../../Zotlabs/Module/Chat.php:118
-#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Display.php:420
-#: ../../Zotlabs/Module/Photos.php:71 ../../Zotlabs/Module/Channel.php:209
-#: ../../Zotlabs/Module/Channel.php:365 ../../Zotlabs/Module/Channel.php:404
-#: ../../Zotlabs/Module/Cards.php:86 ../../Zotlabs/Module/Connections.php:32
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Block.php:24
-#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Editwebpage.php:68 ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107 ../../Zotlabs/Module/Editwebpage.php:121
-#: ../../Zotlabs/Module/Profile.php:99 ../../Zotlabs/Module/Profile.php:114
+#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1446
+#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Regmod.php:20
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Chat.php:113
+#: ../../Zotlabs/Module/Chat.php:118 ../../Zotlabs/Module/Vote.php:19
+#: ../../Zotlabs/Module/Display.php:420 ../../Zotlabs/Module/Photos.php:71
+#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:378
+#: ../../Zotlabs/Module/Channel.php:417 ../../Zotlabs/Module/Cards.php:86
+#: ../../Zotlabs/Module/Connections.php:32 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
+#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Profile.php:99
+#: ../../Zotlabs/Module/Profile.php:114
 #: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Thing.php:282
 #: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
-#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Setup.php:208
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Mood.php:126
-#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Channel_calendar.php:232
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Articles.php:89
+#: ../../Zotlabs/Module/Setup.php:208 ../../Zotlabs/Module/Mitem.php:129
+#: ../../Zotlabs/Module/Mood.php:126 ../../Zotlabs/Module/Register.php:200
+#: ../../Zotlabs/Module/Channel_calendar.php:232
 #: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
-#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Cover_photo.php:341
+#: ../../Zotlabs/Module/Service_limits.php:11
+#: ../../Zotlabs/Module/Cover_photo.php:341
 #: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Menu.php:130
 #: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Sources.php:80
 #: ../../Zotlabs/Module/Poke.php:157 ../../Zotlabs/Module/Network.php:19
-#: ../../Zotlabs/Module/Attach_edit.php:90 ../../Zotlabs/Module/Attach_edit.php:99
-#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Settings.php:59
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Web/WebServer.php:116
-#: ../../Zotlabs/Lib/Chatroom.php:135 ../../include/photos.php:27
-#: ../../include/attach.php:156 ../../include/attach.php:205 ../../include/attach.php:278
-#: ../../include/attach.php:329 ../../include/attach.php:424 ../../include/attach.php:438
-#: ../../include/attach.php:445 ../../include/attach.php:527
-#: ../../include/attach.php:1091 ../../include/attach.php:1164
-#: ../../include/attach.php:1327 ../../include/items.php:4088
+#: ../../Zotlabs/Module/Attach_edit.php:90
+#: ../../Zotlabs/Module/Attach_edit.php:99
+#: ../../Zotlabs/Module/Attach_edit.php:106
+#: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Viewsrc.php:19
+#: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135
+#: ../../include/photos.php:27 ../../include/attach.php:156
+#: ../../include/attach.php:205 ../../include/attach.php:278
+#: ../../include/attach.php:329 ../../include/attach.php:424
+#: ../../include/attach.php:438 ../../include/attach.php:445
+#: ../../include/attach.php:527 ../../include/attach.php:1091
+#: ../../include/attach.php:1164 ../../include/attach.php:1327
+#: ../../include/items.php:3744
 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:53
 #: ../../extend/addon/hubzilla-addons/keepout/keepout.php:36
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:26
@@ -244,11 +255,11 @@ msgstr "Aplikacja Edytor PDL"
 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Uexport.php:62
 #: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Affinity.php:52
 #: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Suggest.php:40
-#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Tokens.php:99
+#: ../../Zotlabs/Module/Notes.php:56 ../../Zotlabs/Module/Tokens.php:99
 #: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Mood.php:134
-#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Probe.php:19
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
-#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Sources.php:88
+#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Invite.php:56
+#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Lang.php:20
+#: ../../Zotlabs/Module/Lang.php:63 ../../Zotlabs/Module/Sources.php:88
 #: ../../Zotlabs/Module/Poke.php:165
 #: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22
 #: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32
@@ -320,27 +331,32 @@ msgstr "Edytuj inny układ"
 msgid "System layout"
 msgstr "Układ systemowy"
 
-#: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Events.php:501
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Import.php:647
-#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Group.php:151
-#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Appman.php:155
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Filestorage.php:208
-#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Wiki.php:214
-#: ../../Zotlabs/Module/Locs.php:132 ../../Zotlabs/Module/Connedit.php:897
-#: ../../Zotlabs/Module/Regate.php:387 ../../Zotlabs/Module/Rate.php:168
+#: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Import.php:582 ../../Zotlabs/Module/Defperms.php:266
+#: ../../Zotlabs/Module/Group.php:151 ../../Zotlabs/Module/Group.php:167
+#: ../../Zotlabs/Module/Appman.php:155 ../../Zotlabs/Module/Oauth.php:111
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Connect.php:107
+#: ../../Zotlabs/Module/Filestorage.php:208 ../../Zotlabs/Module/Oauth2.php:116
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Locs.php:130
+#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Regate.php:387
 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Chat.php:209
 #: ../../Zotlabs/Module/Chat.php:248 ../../Zotlabs/Module/Photos.php:1058
-#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1214
 #: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Affinity.php:87
-#: ../../Zotlabs/Module/Pconfig.php:116 ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Pconfig.php:116
+#: ../../Zotlabs/Module/Admin/Themes.php:158
 #: ../../Zotlabs/Module/Admin/Security.php:120
-#: ../../Zotlabs/Module/Admin/Accounts.php:309 ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Channels.php:147 ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Accounts.php:309
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Account_edit.php:73
-#: ../../Zotlabs/Module/Admin/Addons.php:442 ../../Zotlabs/Module/Admin/Site.php:412
+#: ../../Zotlabs/Module/Admin/Addons.php:442
+#: ../../Zotlabs/Module/Admin/Site.php:412
 #: ../../Zotlabs/Module/Admin/Profs.php:178 ../../Zotlabs/Module/Thing.php:328
-#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Email_validation.php:40
+#: ../../Zotlabs/Module/Thing.php:381
+#: ../../Zotlabs/Module/Email_validation.php:40
 #: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Setup.php:306
 #: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Mitem.php:259
 #: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Permcats.php:129
@@ -358,12 +374,14 @@ msgstr "Układ systemowy"
 #: ../../Zotlabs/Module/Settings/Directory.php:42
 #: ../../Zotlabs/Module/Settings/Channel_home.php:91
 #: ../../Zotlabs/Module/Settings/Network.php:62
-#: ../../Zotlabs/Module/Settings/Conversation.php:49 ../../Zotlabs/Module/Invite.php:550
-#: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162
-#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Storage/Browser.php:382
-#: ../../Zotlabs/Lib/ThreadItem.php:827 ../../Zotlabs/Widget/Wiki_pages.php:42
-#: ../../Zotlabs/Widget/Wiki_pages.php:99 ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../include/js_strings.php:22 ../../extend/addon/hubzilla-addons/irc/irc.php:45
+#: ../../Zotlabs/Module/Settings/Conversation.php:49
+#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Sources.php:125
+#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Poke.php:217
+#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Lib/ThreadItem.php:827
+#: ../../Zotlabs/Widget/Wiki_pages.php:42
+#: ../../Zotlabs/Widget/Wiki_pages.php:99
+#: ../../Zotlabs/Widget/Eventstools.php:16 ../../include/js_strings.php:22
+#: ../../extend/addon/hubzilla-addons/irc/irc.php:45
 #: ../../extend/addon/hubzilla-addons/hubwall/hubwall.php:95
 #: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:57
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:95
@@ -440,9 +458,10 @@ msgstr "z terminala."
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Cloud.php:123
 #: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Group.php:99
-#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Subthread.php:89
-#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Web/WebServer.php:115
-#: ../../include/items.php:441 ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:75
+#: ../../Zotlabs/Module/Import_items.php:120
+#: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Share.php:72
+#: ../../Zotlabs/Web/WebServer.php:115 ../../include/items.php:440
+#: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:75
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:119
 #: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:109
 msgid "Permission denied"
@@ -452,65 +471,65 @@ msgstr "Dostęp zabroniony"
 msgid "Invalid message"
 msgstr "Nieprawidłowa wiadomość"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Zotlabs/Module/Dreport.php:92
 msgid "no results"
 msgstr "brak wyników"
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Zotlabs/Module/Dreport.php:106
 msgid "channel sync processed"
 msgstr "synchronizacja kanałów została przetworzona"
 
-#: ../../Zotlabs/Module/Dreport.php:111
+#: ../../Zotlabs/Module/Dreport.php:110
 msgid "queued"
 msgstr "w kolejce"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Zotlabs/Module/Dreport.php:114
 msgid "posted"
 msgstr "opublikowane"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Zotlabs/Module/Dreport.php:118
 msgid "accepted for delivery"
 msgstr "przyjęty do dostawy"
 
-#: ../../Zotlabs/Module/Dreport.php:123
+#: ../../Zotlabs/Module/Dreport.php:122
 msgid "updated"
 msgstr "zaktualizowany"
 
-#: ../../Zotlabs/Module/Dreport.php:126
+#: ../../Zotlabs/Module/Dreport.php:125
 msgid "update ignored"
 msgstr "aktualizacja zignorowana"
 
-#: ../../Zotlabs/Module/Dreport.php:129
+#: ../../Zotlabs/Module/Dreport.php:128
 msgid "permission denied"
 msgstr "dostęp zabroniony"
 
-#: ../../Zotlabs/Module/Dreport.php:133
+#: ../../Zotlabs/Module/Dreport.php:132
 msgid "recipient not found"
 msgstr "nie znaleziono odbiorcy"
 
-#: ../../Zotlabs/Module/Dreport.php:136
+#: ../../Zotlabs/Module/Dreport.php:135
 msgid "mail recalled"
 msgstr "mail odwołany"
 
-#: ../../Zotlabs/Module/Dreport.php:139
+#: ../../Zotlabs/Module/Dreport.php:138
 msgid "duplicate mail received"
 msgstr "otrzymano powieloną wiadomość"
 
-#: ../../Zotlabs/Module/Dreport.php:142
+#: ../../Zotlabs/Module/Dreport.php:141
 msgid "mail delivered"
 msgstr "dostarczono pocztÄ™"
 
-#: ../../Zotlabs/Module/Dreport.php:162
+#: ../../Zotlabs/Module/Dreport.php:161
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Raport dostarczenia dla %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:166 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Module/Dreport.php:165 ../../Zotlabs/Widget/Wiki_pages.php:41
 #: ../../Zotlabs/Widget/Wiki_pages.php:98
 msgid "Options"
 msgstr "Opcje"
 
-#: ../../Zotlabs/Module/Dreport.php:167
+#: ../../Zotlabs/Module/Dreport.php:166
 msgid "Redeliver"
 msgstr "Dostarcz ponownie"
 
@@ -523,7 +542,7 @@ msgid "Profile Visibility Editor"
 msgstr "Edytor widoczności profilu"
 
 #: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:362
-#: ../../include/channel.php:1914
+#: ../../include/channel.php:1834
 msgid "Profile"
 msgstr "Profil"
 
@@ -535,7 +554,8 @@ msgstr "Kliknij kontakt, który chcesz dodać lub usunąć."
 msgid "Visible To"
 msgstr "Widoczne dla"
 
-#: ../../Zotlabs/Module/Profperm.php:140 ../../Zotlabs/Module/Connections.php:218
+#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Zotlabs/Module/Connections.php:218
 msgid "All Connections"
 msgstr "Wszystkie połączenia"
 
@@ -564,15 +584,16 @@ msgstr "Czy zezwalasz aplikacji %s na dostęp do danych Twojego kanału?"
 msgid "Allow"
 msgstr "Zezwól"
 
-#: ../../Zotlabs/Module/Authorize.php:33 ../../Zotlabs/Module/Admin/Accounts.php:319
+#: ../../Zotlabs/Module/Authorize.php:33
+#: ../../Zotlabs/Module/Admin/Accounts.php:319
 msgid "Deny"
 msgstr "Zabroń"
 
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28
+#: ../../Zotlabs/Module/Cdav.php:819
 msgid "Calendar entries imported."
 msgstr "Zaimportowano wpisy kalendarza."
 
-#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30
+#: ../../Zotlabs/Module/Cdav.php:821
 msgid "No calendar entries found."
 msgstr "Nie znaleziono wpisów kalendarza."
 
@@ -589,11 +610,11 @@ msgstr "Książka adresowa z obsługą CalDAV"
 msgid "Link to source"
 msgstr "Link do źródła"
 
-#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Cdav.php:1010
 msgid "Event title"
 msgstr "Tytuł wydarzenia"
 
-#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474
+#: ../../Zotlabs/Module/Cdav.php:1011
 msgid "Start date and time"
 msgstr "Data i godzina rozpoczęcia"
 
@@ -601,51 +622,47 @@ msgstr "Data i godzina rozpoczęcia"
 msgid "End date and time"
 msgstr "Data i godzina zakończenia"
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497
+#: ../../Zotlabs/Module/Cdav.php:1013
 msgid "Timezone:"
 msgstr "Strefa czasowa:"
 
-#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:481
-#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Appman.php:145
+#: ../../Zotlabs/Module/Rbmark.php:100
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:173
 #: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:655
 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:260
 msgid "Description"
 msgstr "Opis"
 
-#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:483
-#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736
-#: ../../Zotlabs/Module/Locs.php:128 ../../Zotlabs/Module/Pubsites.php:53
-#: ../../include/js_strings.php:25
+#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Profiles.php:511
+#: ../../Zotlabs/Module/Profiles.php:735 ../../Zotlabs/Module/Locs.php:126
+#: ../../Zotlabs/Module/Pubsites.php:52 ../../include/js_strings.php:25
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:697
-#: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Photos.php:947
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Photos.php:947
 #: ../../Zotlabs/Module/Cal.php:203
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Events.php:707 ../../Zotlabs/Module/Photos.php:956
+#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Photos.php:956
 #: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:262
 msgid "Next"
 msgstr "Następny"
 
-#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708
-#: ../../Zotlabs/Module/Cal.php:205
+#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Cal.php:205
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Cdav.php:1039
 msgid "Month"
 msgstr "MiesiÄ…c"
 
-#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704
+#: ../../Zotlabs/Module/Cdav.php:1040
 msgid "Week"
 msgstr "Tydzień"
 
-#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705
+#: ../../Zotlabs/Module/Cdav.php:1041
 msgid "Day"
 msgstr "Dzień"
 
@@ -670,9 +687,9 @@ msgid "Less"
 msgstr "Mniej"
 
 #: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth.php:53
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Oauth.php:53
 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58
-#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:924
 #: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:536
 msgid "Update"
 msgstr "Zaktualizuj"
@@ -691,18 +708,21 @@ msgid "CalDAV Calendars"
 msgstr "Kalendarze CalDAV"
 
 #: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
-#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Profiles.php:801
 #: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Card_edit.php:130
 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Connections.php:329
-#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Article_edit.php:129
+#: ../../Zotlabs/Module/Connedit.php:653 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Module/Connections.php:329
+#: ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Article_edit.php:128
 #: ../../Zotlabs/Module/Admin/Accounts.php:320
-#: ../../Zotlabs/Module/Admin/Channels.php:149 ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Storage/Browser.php:384
-#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:171
-#: ../../include/conversation.php:730 ../../include/conversation.php:777
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:269
+#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:558
+#: ../../Zotlabs/Lib/ThreadItem.php:171 ../../include/conversation.php:730
+#: ../../include/conversation.php:777
 msgid "Delete"
 msgstr "Usuń"
 
@@ -711,78 +731,85 @@ msgid "Delete all"
 msgstr "Usuń wszystko"
 
 #: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391
-#: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:802
 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth2.php:117
 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367
 #: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Module/Profile_photo.php:507 ../../Zotlabs/Module/Editlayout.php:140
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Profile_photo.php:507
+#: ../../Zotlabs/Module/Editlayout.php:140
 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Editpost.php:111
 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Article_edit.php:131
-#: ../../Zotlabs/Module/Admin/Addons.php:427 ../../Zotlabs/Module/Cover_photo.php:428
-#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1460
-#: ../../include/conversation.php:1515
+#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Article_edit.php:130
+#: ../../Zotlabs/Module/Admin/Addons.php:427
+#: ../../Zotlabs/Module/Cover_photo.php:428
+#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1455
+#: ../../include/conversation.php:1510
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:209
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:258
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388
-#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Profiles.php:800
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/New_channel.php:189
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Connedit.php:931
-#: ../../Zotlabs/Module/Menu.php:182 ../../Zotlabs/Storage/Browser.php:365
-#: ../../Zotlabs/Storage/Browser.php:538 ../../Zotlabs/Widget/Cdav.php:140
-#: ../../Zotlabs/Widget/Cdav.php:178
+#: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Profiles.php:799
+#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Menu.php:182
+#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
+#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
 msgid "Create"
 msgstr "Utwórz"
 
 #: ../../Zotlabs/Module/Cdav.php:1061
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
-"Przepraszamy! Edycja powtarzających się wydarzeń nie została jeszcze zaimplementowana."
+"Przepraszamy! Edycja powtarzających się wydarzeń nie została jeszcze "
+"zaimplementowana."
 
 #: ../../Zotlabs/Module/Cdav.php:1071 ../../Zotlabs/Storage/Browser.php:293
 #: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
-#: ../../Zotlabs/Widget/Appcategories.php:43 ../../include/contact_widgets.php:112
-#: ../../include/contact_widgets.php:156 ../../include/contact_widgets.php:201
-#: ../../include/contact_widgets.php:236 ../../include/taxonomy.php:420
-#: ../../include/taxonomy.php:502 ../../include/taxonomy.php:522
-#: ../../include/taxonomy.php:543
+#: ../../Zotlabs/Widget/Appcategories.php:43
+#: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156
+#: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236
+#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
+#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
 msgid "Categories"
 msgstr "Kategorie"
 
 #: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Group.php:155
 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
-#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:908
 #: ../../Zotlabs/Module/Sharedwithme.php:106 ../../Zotlabs/Module/Chat.php:257
-#: ../../Zotlabs/Module/Admin/Channels.php:159 ../../Zotlabs/Storage/Browser.php:377
-#: ../../Zotlabs/Lib/NativeWikiPage.php:576 ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Storage/Browser.php:377
+#: ../../Zotlabs/Lib/NativeWikiPage.php:576
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:172
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:909
 msgid "Organisation"
 msgstr "Organizacja"
 
-#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:910
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2617
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2678
 msgid "Title"
 msgstr "Tytuł"
 
-#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Connedit.php:911
 msgid "Phone"
 msgstr "Numer telefonu"
 
-#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:789
-#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Admin/Accounts.php:316
-#: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1768
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:788
+#: ../../Zotlabs/Module/Connedit.php:912
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+#: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1743
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:71
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:56
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:57
@@ -790,81 +817,82 @@ msgstr "Numer telefonu"
 msgid "Email"
 msgstr "Adres e-mail"
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:789
+#: ../../Zotlabs/Module/Connedit.php:913
 msgid "Instant messenger"
 msgstr "Komunikator internetowy"
 
-#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Connedit.php:914
 msgid "Website"
 msgstr "Strona internetowa"
 
 #: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:504
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:129
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Admin/Channels.php:160
 msgid "Address"
 msgstr "Adres"
 
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Connedit.php:916
 msgid "Note"
 msgstr "Notatka"
 
-#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:925 ../../include/connections.php:734
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Connedit.php:917 ../../include/connections.php:734
 #: ../../include/event.php:1422
 msgid "Mobile"
 msgstr "Komórka"
 
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:926 ../../include/connections.php:735
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:794
+#: ../../Zotlabs/Module/Connedit.php:918 ../../include/connections.php:735
 #: ../../include/event.php:1423
 msgid "Home"
 msgstr "Domowy"
 
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:927 ../../include/connections.php:738
+#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:795
+#: ../../Zotlabs/Module/Connedit.php:919 ../../include/connections.php:738
 #: ../../include/event.php:1426
 msgid "Work"
 msgstr "Praca"
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:797
+#: ../../Zotlabs/Module/Connedit.php:921
 msgid "Add Contact"
 msgstr "Dodaj kontakt"
 
-#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Connedit.php:922
 msgid "Add Field"
 msgstr "Dodaj pole"
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:927
 msgid "P.O. Box"
 msgstr "Skrytka pocztowa"
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:928
 msgid "Additional"
 msgstr "Dodatkowe informacje"
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:929
 msgid "Street"
 msgstr "Ulica"
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:930
 msgid "Locality"
 msgstr "Miejscowość"
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:931
 msgid "Region"
 msgstr "Region"
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:932
 msgid "ZIP Code"
 msgstr "Kod pocztowy"
 
-#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759
-#: ../../Zotlabs/Module/Connedit.php:941
+#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Connedit.php:933
 msgid "Country"
 msgstr "Państwo"
 
@@ -890,32 +918,33 @@ msgstr "Proszę się zalogować, aby kontynuować."
 
 #: ../../Zotlabs/Module/Api.php:97
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, and/or "
-"create new posts for you?"
-msgstr ""
-"Czy chcesz zezwolić tej aplikacji na dostęp do Twoich wpisów i kontaktów albo "
-"tworzenie dla Ciebie nowych wpisów ?"
-
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
-#: ../../Zotlabs/Module/Filestorage.php:203 ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Wiki.php:226 ../../Zotlabs/Module/Wiki.php:227
-#: ../../Zotlabs/Module/Connedit.php:404 ../../Zotlabs/Module/Photos.php:673
-#: ../../Zotlabs/Module/Admin/Site.php:321 ../../Zotlabs/Module/Mitem.php:176
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
-#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Register.php:512
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+"Czy chcesz zezwolić tej aplikacji na dostęp do Twoich wpisów i kontaktów "
+"albo tworzenie dla Ciebie nowych wpisów ?"
+
+#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
+#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Zotlabs/Module/Register.php:512
 #: ../../Zotlabs/Module/Settings/Display.php:88
-#: ../../Zotlabs/Module/Settings/Channel.php:311 ../../Zotlabs/Module/Menu.php:163
-#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Sources.php:124
-#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Storage/Browser.php:310
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312
-#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
-#: ../../Zotlabs/Storage/Browser.php:552 ../../Zotlabs/Lib/Libzotdir.php:165
-#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
-#: ../../include/conversation.php:1468 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../include/dir_fns.php:146
+#: ../../Zotlabs/Module/Settings/Channel.php:311
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
+#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
+#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../include/dir_fns.php:146
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63
 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370
@@ -965,30 +994,31 @@ msgstr ""
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
 #: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
+#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725
 msgid "Yes"
 msgstr "Tak"
 
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
-#: ../../Zotlabs/Module/Filestorage.php:203 ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Wiki.php:226 ../../Zotlabs/Module/Wiki.php:227
-#: ../../Zotlabs/Module/Connedit.php:404 ../../Zotlabs/Module/Connedit.php:789
-#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:319
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
-#: ../../Zotlabs/Module/Register.php:512 ../../Zotlabs/Module/Settings/Display.php:88
-#: ../../Zotlabs/Module/Settings/Channel.php:311 ../../Zotlabs/Module/Menu.php:163
-#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Sources.php:124
-#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Storage/Browser.php:310
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312
-#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
-#: ../../Zotlabs/Storage/Browser.php:552 ../../Zotlabs/Lib/Libzotdir.php:165
-#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
-#: ../../include/conversation.php:1468 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../include/dir_fns.php:146
+#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Filestorage.php:203
+#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Photos.php:673
+#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
+#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Settings/Display.php:88
+#: ../../Zotlabs/Module/Settings/Channel.php:311
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
+#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
+#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../include/dir_fns.php:146
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63
 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370
@@ -1038,15 +1068,15 @@ msgstr "Tak"
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
 #: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
+#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725
 msgid "No"
 msgstr "Nie"
 
-#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:52
+#: ../../Zotlabs/Module/Dirsearch.php:24 ../../Zotlabs/Module/Regdir.php:52
 msgid "This site is not a directory server"
-msgstr "Ta witryna nie jest serwerem katalogów"
+msgstr "Ten portal nie jest serwerem katalogów"
 
-#: ../../Zotlabs/Module/Dirsearch.php:37
+#: ../../Zotlabs/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "Ten serwer katalogowy wymaga tokenu dostępu"
 
@@ -1059,9 +1089,10 @@ msgid "or select an existing folder (doubleclick)"
 msgstr "lub wybierz istniejÄ…cy folder (kliknij dwukrotnie)"
 
 #: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Cards.php:113
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Admin/Profs.php:114
-#: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:23
+#: ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114
+#: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:31
+#: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Widget/Notes.php:23
 #: ../../include/text.php:1145 ../../include/text.php:1157
 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:116
 msgid "Save"
@@ -1071,168 +1102,13 @@ msgstr "Zapisz"
 msgid "Save to Folder"
 msgstr "Zapisz do folderu"
 
-#: ../../Zotlabs/Module/Events.php:113 ../../Zotlabs/Module/Channel_calendar.php:62
-msgid "Event can not end before it has started."
-msgstr "Wydarzenie nie może zakończyć się przed rozpoczęciem."
-
-#: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124
-#: ../../Zotlabs/Module/Events.php:146 ../../Zotlabs/Module/Channel_calendar.php:64
-#: ../../Zotlabs/Module/Channel_calendar.php:72
-#: ../../Zotlabs/Module/Channel_calendar.php:87
-msgid "Unable to generate preview."
-msgstr "Nie można wygenerować podglądu."
-
-#: ../../Zotlabs/Module/Events.php:122 ../../Zotlabs/Module/Channel_calendar.php:70
-msgid "Event title and start time are required."
-msgstr "Wymaga się wprowadzenia tytułu wydarzenia i godziny rozpoczęcia."
-
-#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Channel_calendar.php:85
-#: ../../Zotlabs/Module/Channel_calendar.php:226
-msgid "Event not found."
-msgstr "Nie znaleziono wydarzenia."
-
-#: ../../Zotlabs/Module/Events.php:266 ../../Zotlabs/Module/Like.php:441
-#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Channel_calendar.php:221
-#: ../../include/conversation.php:132 ../../include/text.php:2257
-#: ../../include/event.php:1259
-msgid "event"
-msgstr "wydarzenie"
-
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit event title"
-msgstr "Edytuj tytuł wydarzenia"
-
-#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Profiles.php:747 ../../Zotlabs/Module/Profiles.php:751
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
-#: ../../Zotlabs/Module/Register.php:498 ../../include/js_strings.php:123
-#: ../../include/datetime.php:211
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:334
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:358
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:434
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:458
-msgid "Required"
-msgstr "Wymagane"
-
-#: ../../Zotlabs/Module/Events.php:470
-msgid "Categories (comma-separated list)"
-msgstr "Kategorie (lista rozdzielana przecinkami)"
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Edit Category"
-msgstr "Edytuj kategoriÄ™"
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Category"
-msgstr "Kategoria"
-
-#: ../../Zotlabs/Module/Events.php:474
-msgid "Edit start date and time"
-msgstr "Edytuj datę i godzinę rozpoczęcia"
-
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
-msgid "Finish date and time are not known or not relevant"
-msgstr "Data i godzina zakończenia nie są znane lub nie mają znaczenia"
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Edit finish date and time"
-msgstr "Edytuj datę i godzinę zakończenia"
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Finish date and time"
-msgstr "Data i godzina zakończenia"
-
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
-msgid "Adjust for viewer timezone"
-msgstr "Dostosuj do strefy czasowej widza"
-
-#: ../../Zotlabs/Module/Events.php:479
-msgid ""
-"Important for events that happen in a particular place. Not practical for global "
-"holidays."
-msgstr ""
-"Ważne dla wydarzeń, które mają miejsce w określonym miejscu. Niepraktyczne na globalne "
-"święta."
-
-#: ../../Zotlabs/Module/Events.php:481
-msgid "Edit Description"
-msgstr "Edytuj opis"
-
-#: ../../Zotlabs/Module/Events.php:483
-msgid "Edit Location"
-msgstr "Edytuj lokalizacjÄ™"
-
-#: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Webpages.php:262
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:837
-#: ../../include/conversation.php:1404
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153
-msgid "Preview"
-msgstr "PodglÄ…d"
-
-#: ../../Zotlabs/Module/Events.php:487 ../../include/conversation.php:1482
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225
-msgid "Permission settings"
-msgstr "Ustawienia dostępu"
-
-#: ../../Zotlabs/Module/Events.php:502
-msgid "Advanced Options"
-msgstr "Zaawansowane opcje"
-
-#: ../../Zotlabs/Module/Events.php:613
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../Zotlabs/Module/Events.php:641 ../../Zotlabs/Module/Channel_calendar.php:370
-msgid "Edit event"
-msgstr "Edytuj wydarzenie"
-
-#: ../../Zotlabs/Module/Events.php:643 ../../Zotlabs/Module/Channel_calendar.php:372
-msgid "Delete event"
-msgstr "Usuń wydarzenie"
-
-#: ../../Zotlabs/Module/Events.php:669 ../../include/text.php:2076
-msgid "Link to Source"
-msgstr "Link do źródła"
-
-#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Channel_calendar.php:406
-msgid "calendar"
-msgstr "kalendarz"
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Edit Event"
-msgstr "Edytuj wydarzenie"
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Create Event"
-msgstr "Utwórz wydarzenie"
-
-#: ../../Zotlabs/Module/Events.php:699 ../../include/channel.php:1917
-msgid "Export"
-msgstr "Eksportuj"
-
-#: ../../Zotlabs/Module/Events.php:702 ../../Zotlabs/Module/Webpages.php:261
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:212
-#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Pubsites.php:61
-msgid "View"
-msgstr "Widok"
-
-#: ../../Zotlabs/Module/Events.php:739
-msgid "Event removed"
-msgstr "Wydarzenie usunięte"
-
-#: ../../Zotlabs/Module/Events.php:742 ../../Zotlabs/Module/Channel_calendar.php:493
-msgid "Failed to remove event"
-msgstr "Nie udało się usunąć wydarzenia"
-
 #: ../../Zotlabs/Module/Help.php:23
 msgid "Documentation Search"
 msgstr "Przeszukaj dokumentacjÄ™"
 
 #: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:434
 msgid "About"
-msgstr "O platformie Hubzilla"
+msgstr "O platformie"
 
 #: ../../Zotlabs/Module/Help.php:84 ../../Zotlabs/Module/Group.php:156
 msgid "Members"
@@ -1281,18 +1157,18 @@ msgstr "Moje zakładki połączeń"
 #: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Layouts.php:31
 #: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Filestorage.php:59
 #: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Articles.php:43
-#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Menu.php:92
-#: ../../include/channel.php:1464
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Cards.php:42
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Profile.php:27
+#: ../../Zotlabs/Module/Articles.php:43 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Menu.php:92 ../../include/channel.php:1384
 #: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:49
 msgid "Requested profile is not available."
 msgstr "Żądany profil nie jest dostępny."
 
 #: ../../Zotlabs/Module/Webpages.php:48
 msgid "Webpages App"
-msgstr "Aplikacja Witryny Internetowe"
+msgstr "Aplikacja Strony internetowe"
 
 #: ../../Zotlabs/Module/Webpages.php:49
 msgid "Provide managed web pages on your channel"
@@ -1314,79 +1190,94 @@ msgstr "Eksportuj elementy strony internetowej"
 msgid "Export selected"
 msgstr "Eksportuj wybrane"
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:341
 #: ../../include/nav.php:524
 msgid "Webpages"
 msgstr "Strony internetowe"
 
-#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Layouts.php:193
 #: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Oauth.php:173
 #: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Module/Oauth2.php:194
 #: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Connections.php:321
-#: ../../Zotlabs/Module/Connections.php:363 ../../Zotlabs/Module/Connections.php:383
-#: ../../Zotlabs/Module/Editwebpage.php:142 ../../Zotlabs/Module/Article_edit.php:98
+#: ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Connections.php:321
+#: ../../Zotlabs/Module/Connections.php:363
+#: ../../Zotlabs/Module/Connections.php:383
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Article_edit.php:97
 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:268
 #: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:557
 #: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Widget/Cdav.php:138
-#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1566
-#: ../../include/channel.php:1570 ../../include/menu.php:120
+#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1486
+#: ../../include/channel.php:1490 ../../include/menu.php:120
 msgid "Edit"
 msgstr "Edytuj"
 
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:194
 #: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Blocks.php:161
 #: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Widget/Cdav.php:136
-#: ../../include/conversation.php:1437
+#: ../../include/conversation.php:1432
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:186
 msgid "Share"
 msgstr "Udostępnij"
 
-#: ../../Zotlabs/Module/Webpages.php:263
+#: ../../Zotlabs/Module/Webpages.php:260 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Wiki.php:408
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Pubsites.php:60
+msgid "View"
+msgstr "Widok"
+
+#: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Photos.php:1099
+#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1399
+#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153
+msgid "Preview"
+msgstr "PodglÄ…d"
+
+#: ../../Zotlabs/Module/Webpages.php:262
 msgid "Actions"
 msgstr "Akcje"
 
-#: ../../Zotlabs/Module/Webpages.php:264
+#: ../../Zotlabs/Module/Webpages.php:263
 msgid "Page Link"
 msgstr "Link do strony"
 
-#: ../../Zotlabs/Module/Webpages.php:265
+#: ../../Zotlabs/Module/Webpages.php:264
 msgid "Page Title"
 msgstr "Tytuł strony"
 
-#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Webpages.php:265 ../../Zotlabs/Module/Layouts.php:191
 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:178
 msgid "Created"
 msgstr "Utworzono"
 
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Layouts.php:192
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:179
 msgid "Edited"
 msgstr "Edytowano"
 
-#: ../../Zotlabs/Module/Webpages.php:295
+#: ../../Zotlabs/Module/Webpages.php:294
 msgid "Invalid file type."
 msgstr "ZÅ‚y typ pliku."
 
-#: ../../Zotlabs/Module/Webpages.php:307
+#: ../../Zotlabs/Module/Webpages.php:306
 msgid "Error opening zip file"
 msgstr "BÅ‚Ä…d podczas otwierania pliku zip"
 
-#: ../../Zotlabs/Module/Webpages.php:318
+#: ../../Zotlabs/Module/Webpages.php:317
 msgid "Invalid folder path."
 msgstr "Nieprawidłowa ścieżka folderu."
 
-#: ../../Zotlabs/Module/Webpages.php:345
+#: ../../Zotlabs/Module/Webpages.php:344
 msgid "No webpage elements detected."
 msgstr "Nie wykryto żadnych elementów strony internetowej."
 
-#: ../../Zotlabs/Module/Webpages.php:420
+#: ../../Zotlabs/Module/Webpages.php:419
 msgid "Import complete."
 msgstr "Importowanie zakończone."
 
 #: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
+#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:660
 msgid "Profile not found."
 msgstr "Nie znaleziono profilu."
 
@@ -1422,15 +1313,15 @@ msgstr "Stan cywilny"
 msgid "Romantic Partner"
 msgstr "Partner romantyczny"
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:773
 msgid "Likes"
-msgstr "Oceny pozytywne"
+msgstr "Pochwały"
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:774
 msgid "Dislikes"
-msgstr "Oceny negatywne"
+msgstr "Zganienia"
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:781
 msgid "Work/Employment"
 msgstr "Praca/Zatrudnienie"
 
@@ -1463,328 +1354,341 @@ msgstr "Zainteresowania"
 msgid "Profile updated."
 msgstr "Profil został zaktualizowany."
 
-#: ../../Zotlabs/Module/Profiles.php:680
+#: ../../Zotlabs/Module/Profiles.php:679
 msgid "Hide your connections list from viewers of this profile"
 msgstr "Ukryj swoją listę kontaktów przed przeglądającymi ten profil"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:723
 msgid "Edit Profile Details"
 msgstr "Edytuj szczegóły profilu"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Profiles.php:725
 msgid "View this profile"
 msgstr "Zobacz ten profil"
 
-#: ../../Zotlabs/Module/Profiles.php:727 ../../Zotlabs/Module/Profiles.php:826
-#: ../../include/channel.php:1589
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Profiles.php:825
+#: ../../include/channel.php:1509
 msgid "Edit visibility"
 msgstr "Edytuj dostępność"
 
-#: ../../Zotlabs/Module/Profiles.php:728
+#: ../../Zotlabs/Module/Profiles.php:727
 msgid "Profile Tools"
 msgstr "Narzędzia profilowe"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:728
 msgid "Change cover photo"
 msgstr "Zmień zdjęcie okładkowe"
 
-#: ../../Zotlabs/Module/Profiles.php:730 ../../include/channel.php:1559
+#: ../../Zotlabs/Module/Profiles.php:729 ../../include/channel.php:1479
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Create a new profile using these settings"
 msgstr "Utwórz nowy profil, korzystając z tych ustawień"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Zotlabs/Module/Profiles.php:731
 msgid "Clone this profile"
 msgstr "Sklonuj ten profil"
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:732
 msgid "Delete this profile"
 msgstr "Usuń ten profil"
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Add profile things"
 msgstr "Dodaj elementy profilu"
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:736
 msgid "Relationship"
 msgstr "Relacje"
 
-#: ../../Zotlabs/Module/Profiles.php:738 ../../Zotlabs/Widget/Newmember.php:51
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Widget/Newmember.php:51
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr "Inne"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Import profile from file"
 msgstr "Importuj profil z pliku"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:740
 msgid "Export profile to file"
 msgstr "Eksportuj profil do pliku"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "Your gender"
 msgstr "Twoja płeć"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Marital status"
 msgstr "Stan cywilny"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Sexual preference"
 msgstr "Preferencje seksualne"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Profile name"
 msgstr "Nazwa profilu"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:746 ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Register.php:498 ../../include/js_strings.php:123
+#: ../../include/datetime.php:211
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:334
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:358
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:434
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:458
+msgid "Required"
+msgstr "Wymagane"
+
+#: ../../Zotlabs/Module/Profiles.php:748
 msgid "This is your default profile."
 msgstr "To jest Twój profil domyślny."
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:750
 msgid "Your full name"
 msgstr "Twoje imię i nazwisko albo pełna nazwa"
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:751
 msgid "Short title/description"
 msgstr "Krótki tytuł/opis"
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:751
 msgid "Maximal 190 characters"
 msgstr "Maksymalnie 190 znaków"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Zotlabs/Module/Profiles.php:754
 msgid "Street address"
 msgstr "Ulica"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Zotlabs/Module/Profiles.php:755
 msgid "Locality/City"
 msgstr "Miejscowość"
 
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Zotlabs/Module/Profiles.php:756
 msgid "Region/State"
 msgstr "Region/Stan"
 
-#: ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Profiles.php:757
 msgid "Postal/Zip code"
 msgstr "Kod pocztowy"
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:763
 msgid "Who (if applicable)"
 msgstr "Kto (jeśli dotyczy)"
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:763
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Przykłady: jan123, Jan Kowalski, jan@example.com"
 
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:764
 msgid "Since (date)"
 msgstr "Od (data)"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Zotlabs/Module/Profiles.php:767
 msgid "Tell us about yourself"
 msgstr "Opowiedz nam o sobie"
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Zotlabs/Module/Profiles.php:768
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr "Adres URL strony domowej"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Zotlabs/Module/Profiles.php:769
 msgid "Hometown"
 msgstr "Miejscowość zamieszkania"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Zotlabs/Module/Profiles.php:770
 msgid "Political views"
 msgstr "PoglÄ…dy polityczne"
 
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Profiles.php:771
 msgid "Religious views"
 msgstr "PoglÄ…dy religijne"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:772
 msgid "Keywords used in directory listings"
 msgstr "Słowa kluczowe używane w wykazach katalogów"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:772
 msgid "Example: fishing photography software"
 msgstr "Przykład: oprogramowanie do fotografii wędkarskiej"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Zotlabs/Module/Profiles.php:775
 msgid "Musical interests"
 msgstr "Zainteresowania muzyczne"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Zotlabs/Module/Profiles.php:776
 msgid "Books, literature"
 msgstr "KsiÄ…zki, literatura"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Profiles.php:777
 msgid "Television"
 msgstr "Telewizja"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Zotlabs/Module/Profiles.php:778
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Film/Taniec/Kultura/Rozrywka"
 
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Zotlabs/Module/Profiles.php:779
 msgid "Hobbies/Interests"
 msgstr "Zainteresowania"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:780
 msgid "Love/Romance"
 msgstr "Miłość/romans"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Zotlabs/Module/Profiles.php:782
 msgid "School/Education"
 msgstr "Szkoła/Edukacja"
 
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Profiles.php:783
 msgid "Contact information and social networks"
 msgstr "Informacje kontaktowe i sieci społecznościowe"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Zotlabs/Module/Profiles.php:784
 msgid "My other channels"
 msgstr "Moje inne kanały"
 
-#: ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Profiles.php:786
 msgid "Communications"
 msgstr "Komunikacja"
 
-#: ../../Zotlabs/Module/Profiles.php:822 ../../include/channel.php:1585
+#: ../../Zotlabs/Module/Profiles.php:821 ../../include/channel.php:1505
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: ../../Zotlabs/Module/Profiles.php:832 ../../include/channel.php:1566
+#: ../../Zotlabs/Module/Profiles.php:831 ../../include/channel.php:1486
 #: ../../include/nav.php:118
 msgid "Edit Profiles"
 msgstr "Edytuj profile"
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213
-#: ../../Zotlabs/Module/Manage.php:145 ../../Zotlabs/Module/Chat.php:262
+#: ../../Zotlabs/Module/Profiles.php:832 ../../Zotlabs/Module/Wiki.php:213
+#: ../../Zotlabs/Module/Manage.php:135 ../../Zotlabs/Module/Chat.php:262
 msgid "Create New"
 msgstr "Utwórz nowy"
 
-#: ../../Zotlabs/Module/Import.php:69 ../../Zotlabs/Module/Import_items.php:48
+#: ../../Zotlabs/Module/Import.php:68 ../../Zotlabs/Module/Import_items.php:48
 msgid "Nothing to import."
 msgstr "Nie ma nic do zaimportowania."
 
-#: ../../Zotlabs/Module/Import.php:84 ../../Zotlabs/Module/Import.php:100
+#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:99
 #: ../../Zotlabs/Module/Import_items.php:72
 msgid "Unable to download data from old server"
 msgstr "Nie można pobrać danych ze starego serwera"
 
-#: ../../Zotlabs/Module/Import.php:107 ../../Zotlabs/Module/Import_items.php:77
+#: ../../Zotlabs/Module/Import.php:106 ../../Zotlabs/Module/Import_items.php:77
 msgid "Imported file is empty."
 msgstr "Zaimportowany plik jest pusty."
 
-#: ../../Zotlabs/Module/Import.php:163
+#: ../../Zotlabs/Module/Import.php:162
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr "Twój plan usług zezwala tylko na %d kanał/kanałów."
 
-#: ../../Zotlabs/Module/Import.php:190
+#: ../../Zotlabs/Module/Import.php:189
 msgid "No channel. Import failed."
 msgstr "Brak kanału. Import nieudany."
 
-#: ../../Zotlabs/Module/Import.php:595
+#: ../../Zotlabs/Module/Import.php:530
 #: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:142
 msgid "Import completed."
 msgstr "Import zakończony."
 
-#: ../../Zotlabs/Module/Import.php:623
+#: ../../Zotlabs/Module/Import.php:558
 msgid "You must be logged in to use this feature."
 msgstr "Trzeba się zalogować, aby korzystać z tej funkcji."
 
-#: ../../Zotlabs/Module/Import.php:628
+#: ../../Zotlabs/Module/Import.php:563
 msgid "Import Channel"
 msgstr "Importuj kanał"
 
-#: ../../Zotlabs/Module/Import.php:629
+#: ../../Zotlabs/Module/Import.php:564
 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."
+"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 ""
-"Użyj tego formularza, aby zaimportować istniejący kanał z innego serwera (portalu)."
-"Możesz pobrać tożsamość kanału ze starego serwera (portalu) przez sieć lub dostarczyć "
-"plik eksportu."
+"Użyj tego formularza, aby zaimportować istniejący kanał z innego serwera "
+"(portalu).Możesz pobrać tożsamość kanału ze starego serwera (portalu) przez "
+"sieć lub dostarczyć plik eksportu."
 
-#: ../../Zotlabs/Module/Import.php:630 ../../Zotlabs/Module/Import_items.php:127
+#: ../../Zotlabs/Module/Import.php:565
+#: ../../Zotlabs/Module/Import_items.php:127
 msgid "File to Upload"
 msgstr "Plik do przesłania"
 
-#: ../../Zotlabs/Module/Import.php:631
+#: ../../Zotlabs/Module/Import.php:566
 msgid "Or provide the old server/hub details"
 msgstr "Lub podaj szczegóły starego serwera/portalu"
 
-#: ../../Zotlabs/Module/Import.php:633
+#: ../../Zotlabs/Module/Import.php:568
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Twój stary adres tożsamości (xyz@example.com)"
 
-#: ../../Zotlabs/Module/Import.php:634
+#: ../../Zotlabs/Module/Import.php:569
 msgid "Your old login email address"
 msgstr "Twój stary adres e-mail logowania"
 
-#: ../../Zotlabs/Module/Import.php:635
+#: ../../Zotlabs/Module/Import.php:570
 msgid "Your old login password"
 msgstr "Twoje stare hasło logowania"
 
-#: ../../Zotlabs/Module/Import.php:636
+#: ../../Zotlabs/Module/Import.php:571
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr ""
-"Zaimportuj wpisy z kilku miesięcy, jeśli to możliwe (ograniczone dostępną pamięcią)"
+"Zaimportuj wpisy z kilku miesięcy, jeśli to możliwe (ograniczone dostępną "
+"pamięcią)"
 
-#: ../../Zotlabs/Module/Import.php:638
+#: ../../Zotlabs/Module/Import.php:573
 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."
+"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 ""
-"W obu przypadkach wybierz, czy chcesz ustawić ten portal jako nowy adres podstawowy, "
-"czy też rolę tą powinna pełnić Twoja stara lokalizacja. Będziesz mógł/mogła publikować "
-"z dowolnej lokalizacji, ale tylko jedna z nich może być oznaczona jako główna "
-"lokalizacja plików, zdjęć i multimediów."
+"W obu przypadkach wybierz, czy chcesz ustawić ten portal jako nowy adres "
+"podstawowy, czy też rolę tą powinna pełnić Twoja stara lokalizacja. Będziesz "
+"mógł/mogła publikować z dowolnej lokalizacji, ale tylko jedna z nich może "
+"być oznaczona jako główna lokalizacja plików, zdjęć i multimediów."
 
-#: ../../Zotlabs/Module/Import.php:640
+#: ../../Zotlabs/Module/Import.php:575
 msgid "Make this hub my primary location"
 msgstr "Ustaw ten portal jako moją główną lokalizację"
 
-#: ../../Zotlabs/Module/Import.php:641
+#: ../../Zotlabs/Module/Import.php:576
 msgid "Move this channel (disable all previous locations)"
 msgstr "Przenieś ten kanał (wyłącz wszystkie poprzednie lokalizacje)"
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:577
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Użyj tego pseudonimu kanału zamiast podanego"
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:577
 msgid ""
-"Leave blank to keep your existing channel nickname. You will be randomly assigned a "
-"similar nickname if either name is already allocated on this site."
+"Leave blank to keep your existing channel nickname. You will be randomly "
+"assigned a similar nickname if either name is already allocated on this site."
 msgstr ""
-"Pozostaw puste, aby zachować istniejący pseudonim kanału. Otrzymasz losowo podobny "
-"pseudonim, jeśli któryś z nich jest już przydzielony na tym portalu."
+"Pozostaw puste, aby zachować istniejący pseudonim kanału. Otrzymasz losowo "
+"podobny pseudonim, jeśli któryś z nich jest już przydzielony na tym portalu."
 
-#: ../../Zotlabs/Module/Import.php:644
+#: ../../Zotlabs/Module/Import.php:579
 msgid ""
-"This process may take several minutes to complete. Please submit the form only once "
-"and leave this page open until finished."
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
 msgstr ""
-"Ten proces może zająć kilka minut. Prześlij formularz tylko raz i pozostaw tę stronę "
-"otwartą do zakończenia procedury."
+"Ten proces może zająć kilka minut. Prześlij formularz tylko raz i pozostaw "
+"tę stronę otwartą do zakończenia procedury."
 
 #: ../../Zotlabs/Module/Like.php:106
 msgid "Like/Dislike"
-msgstr "Oceń pozytywnie/negatywnie"
+msgstr "Pochwal/Zgań"
 
 #: ../../Zotlabs/Module/Like.php:112
 msgid "This action is restricted to members."
@@ -1792,11 +1696,12 @@ msgstr "Ta akcja jest ograniczona do członków."
 
 #: ../../Zotlabs/Module/Like.php:113
 msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=\"register"
-"\">register as a new $Projectname member</a> to continue."
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
 msgstr ""
-"Aby kontynuować, <a href=\"rmagic\">zaloguj się za pomocą ID $Projectname</a> lub <a "
-"href=\"register\">zarejestruj się jako nowy członek $Projectname</a>."
+"Aby kontynuować, <a href=\"rmagic\">zaloguj się za pomocą ID $Projectname</"
+"a> lub <a href=\"register\">zarejestruj się jako nowy członek $Projectname</"
+"a>."
 
 #: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
 #: ../../Zotlabs/Module/Like.php:230
@@ -1820,34 +1725,41 @@ msgid "Previous action reversed."
 msgstr "Poprzednia czynność została cofnięta."
 
 #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Tagger.php:71
-#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:128 ../../include/text.php:2254
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:128 ../../include/text.php:2236
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotohelper.php:71
 msgid "photo"
 msgstr "zdjecie"
 
 #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111
 msgid "status"
 msgstr "stan"
 
-#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3297
+#: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75
+#: ../../Zotlabs/Module/Channel_calendar.php:221
+#: ../../include/conversation.php:132 ../../include/text.php:2239
+#: ../../include/event.php:1259
+msgid "event"
+msgstr "wydarzenie"
+
+#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3281
 #: ../../include/conversation.php:174
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1595
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2138
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2148
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s ocenił pozytywnie %3$s %2$s"
+msgstr "%1$s pochwalił %3$s %2$s"
 
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299
+#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3283
 #: ../../include/conversation.php:177
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2140
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2150
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s ocenił negatywnie %3$s  %2$s"
+msgstr "%1$s zganił %3$s  %2$s"
 
 #: ../../Zotlabs/Module/Like.php:475
 #, php-format
@@ -1894,14 +1806,15 @@ msgstr "Dziękujemy."
 msgid "Could not access contact record."
 msgstr "Brak dostępu do rekordu kontaktu."
 
-#: ../../Zotlabs/Module/Defperms.php:112 ../../Zotlabs/Module/Settings/Channel.php:267
+#: ../../Zotlabs/Module/Defperms.php:112
+#: ../../Zotlabs/Module/Settings/Channel.php:267
 #: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:54
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:116
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:82
 #: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:97
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:171
 #: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:54
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:494
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:487
 #: ../../extend/addon/hubzilla-addons/logrot/logrot.php:54
 msgid "Settings updated."
 msgstr "Zaktualizowano ustawienia."
@@ -1914,63 +1827,72 @@ msgstr "Aplikacja Domyślne uprawnienia"
 msgid "Set custom default permissions for new connections"
 msgstr "Ustaw niestandardowe uprawnienia domyślne dla nowych połączeń"
 
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:860
+#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:852
 msgid "Connection Default Permissions"
 msgstr "Domyślne uprawnienia połączenia"
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:853
 msgid "Apply these permissions automatically"
 msgstr "Zastosuj te uprawnienia automatycznie"
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Settings/Channel.php:472
-msgid "If enabled, connection requests will be approved without your interaction"
-msgstr "Jeśli jest włączone, prośby o połączenie będą zatwierdzane bez Twojej interakcji"
+#: ../../Zotlabs/Module/Defperms.php:256
+#: ../../Zotlabs/Module/Settings/Channel.php:472
+msgid ""
+"If enabled, connection requests will be approved without your interaction"
+msgstr ""
+"Jeśli jest włączone, prośby o połączenie będą zatwierdzane bez Twojej "
+"interakcji"
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:854
 msgid "Permission role"
 msgstr "Rola uprawnień"
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/New_channel.php:157
-#: ../../Zotlabs/Module/New_channel.php:164 ../../Zotlabs/Module/Connedit.php:862
-#: ../../Zotlabs/Widget/Notifications.php:182 ../../include/nav.php:324
+#: ../../Zotlabs/Module/Defperms.php:257
+#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../Zotlabs/Widget/Notifications.php:167 ../../include/nav.php:324
 msgid "Loading"
 msgstr "�adowanie"
 
-#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:855
 msgid "Add permission role"
 msgstr "Dodaj rolę uprawnień"
 
-#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:876
-msgid "The permissions indicated on this page will be applied to all new connections."
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:868
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
-"Uprawnienia wskazane na tej stronie zostaną zastosowane do wszystkich nowych połączeń."
+"Uprawnienia wskazane na tej stronie zostanÄ… zastosowane do wszystkich nowych "
+"połączeń."
 
 #: ../../Zotlabs/Module/Defperms.php:263
 msgid "Automatic approval settings"
 msgstr "Ustawienia automatycznego zatwierdzania"
 
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:888
 #: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
 msgid "inherited"
 msgstr "dziedziczone"
 
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:901
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:893
 #: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
 msgid "My Settings"
 msgstr "Moje ustawienia"
 
-#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:903
+#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:895
 #: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
 msgid "Individual Permissions"
 msgstr "Uprawnienia indywidualne"
 
 #: ../../Zotlabs/Module/Defperms.php:271
 msgid ""
-"Some individual permissions may have been preset or locked based on your channel type "
-"and privacy settings."
+"Some individual permissions may have been preset or locked based on your "
+"channel type and privacy settings."
 msgstr ""
-"Niektóre indywidualne uprawnienia mogły zostać wstępnie ustawione lub zablokowane w "
-"zależności od typu kanału i ustawień prywatności."
+"Niektóre indywidualne uprawnienia mogły zostać wstępnie ustawione lub "
+"zablokowane w zależności od typu kanału i ustawień prywatności."
 
 #: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
 #: ../../Zotlabs/Module/Editlayout.php:128
@@ -1981,13 +1903,13 @@ msgstr "Nazwa układu"
 msgid "Layout Description (Optional)"
 msgstr "Opis układu (opcjonalnie)"
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2714
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2675
 msgid "Layouts"
 msgstr "Układy"
 
 #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348
-#: ../../include/nav.php:180 ../../include/nav.php:320 ../../include/help.php:117
-#: ../../include/help.php:125
+#: ../../include/nav.php:180 ../../include/nav.php:320
+#: ../../include/help.php:118 ../../include/help.php:126
 msgid "Help"
 msgstr "Pomoc"
 
@@ -2012,21 +1934,21 @@ msgid "The unmoderated public stream of this hub"
 msgstr "Niemoderowany strumień publiczny tego portalu"
 
 #: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76
-#: ../../Zotlabs/Module/Channel.php:256 ../../Zotlabs/Module/Hq.php:125
+#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:125
 #: ../../Zotlabs/Module/Network.php:209
 msgid "Reset form"
 msgstr "Resetuj formularz"
 
 #: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375
-#: ../../Zotlabs/Widget/Notifications.php:162
+#: ../../Zotlabs/Widget/Notifications.php:147
 msgid "Public Stream"
 msgstr "Strumień publiczny"
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
+#: ../../Zotlabs/Module/Sse_bs.php:569
 msgid "Private forum"
 msgstr "Prywatne forum"
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
+#: ../../Zotlabs/Module/Sse_bs.php:569
 msgid "Public forum"
 msgstr "Publiczne forum"
 
@@ -2039,7 +1961,7 @@ msgid "Could not create privacy group."
 msgstr "Nie udało się utworzyć grupy prywatności."
 
 #: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:214
-#: ../../include/items.php:4585
+#: ../../include/items.php:4241
 msgid "Privacy group not found."
 msgstr "Nie znaleziono grupy prywatności."
 
@@ -2060,7 +1982,7 @@ msgstr "Zarządzanie grupami prywatności"
 #: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327
 #: ../../include/acl_selectors.php:87 ../../include/nav.php:104
 msgid "Privacy Groups"
-msgstr "Grupy Prywatności"
+msgstr "Grupy prywatności"
 
 #: ../../Zotlabs/Module/Group.php:143
 msgid "Add Group"
@@ -2109,8 +2031,11 @@ msgstr "Kliknij kanał, aby przełączyć członkostwo"
 
 #: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
-"Channel removals are not allowed within 48 hours of changing the account password."
-msgstr "Usunięcie kanału nie jest dozwolone w ciągu 48 godzin od zmiany hasła do konta."
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr ""
+"Usunięcie kanału nie jest dozwolone w ciągu 48 godzin od zmiany hasła do "
+"konta."
 
 #: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
@@ -2125,7 +2050,8 @@ msgstr "UWAGA: "
 msgid "This channel will be completely removed from the network. "
 msgstr "Ten kanał zostanie całkowicie usunięty z sieci. "
 
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid "This action is permanent and can not be undone!"
 msgstr "Ta akcja jest bezpowrotna i nie można jej cofnąć!"
 
@@ -2134,7 +2060,8 @@ msgstr "Ta akcja jest bezpowrotna i nie można jej cofnąć!"
 msgid "Please enter your password for verification:"
 msgstr "Wprowadź hasło do weryfikacji:"
 
-#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Settings/Channel.php:596
 msgid "Remove Channel"
 msgstr "Usuń kanał"
 
@@ -2192,19 +2119,23 @@ msgstr "Lokalizacja (URL) do zakupu aplikacji"
 
 #: ../../Zotlabs/Module/Changeaddr.php:35
 msgid ""
-"Channel name changes are not allowed within 48 hours of changing the account password."
+"Channel name changes are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
-"Zmiana nazwy kanału jest niedozwolona w ciągu 48 godzin od zmiany hasła do konta."
+"Zmiana nazwy kanału jest niedozwolona w ciągu 48 godzin od zmiany hasła do "
+"konta."
 
 #: ../../Zotlabs/Module/Changeaddr.php:46 ../../Zotlabs/Module/Register.php:100
-#: ../../include/channel.php:226 ../../include/channel.php:706
+#: ../../include/channel.php:225 ../../include/channel.php:657
 msgid "Reserved nickname. Please choose another."
 msgstr "Ten pseudonim jest już zarezerwowany. Proszę wybrać inny."
 
 #: ../../Zotlabs/Module/Changeaddr.php:51 ../../Zotlabs/Module/Register.php:105
-#: ../../include/channel.php:231 ../../include/channel.php:711
-msgid "Nickname has unsupported characters or is already being used on this site."
-msgstr "Pseudonim zawiera nieobsługiwane znaki lub jest już używany w tym portalu."
+#: ../../include/channel.php:230 ../../include/channel.php:662
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+"Pseudonim zawiera nieobsługiwane znaki lub jest już używany w tym portalu."
 
 #: ../../Zotlabs/Module/Changeaddr.php:77
 msgid "Change channel nickname/address"
@@ -2251,21 +2182,22 @@ msgstr "Nazwa aplikacji"
 
 #: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
 #: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:596
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:505
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:498
 msgid "Consumer Key"
 msgstr "Klucz konsumenta"
 
 #: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
 #: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
 msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Wygenerowane automatycznie - w razie potrzeby zmień. Maksymalna długość 20"
+msgstr ""
+"Wygenerowane automatycznie - w razie potrzeby zmień. Maksymalna długość 20"
 
 #: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
 #: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
 #: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:595
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:506
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:499
 msgid "Consumer Secret"
-msgstr "Hasło konsumenta"
+msgstr "Sekret konsumenta"
 
 #: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
 #: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
@@ -2274,9 +2206,11 @@ msgstr "Przekierowanie"
 
 #: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
 #: ../../Zotlabs/Module/Oauth2.php:148
-msgid "Redirect URI - leave blank unless your application specifically requires this"
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
-"Identyfikator URI przekierowania - pozostaw puste, chyba że aplikacja tego wymaga"
+"Identyfikator URI przekierowania - pozostaw puste, chyba że aplikacja tego "
+"wymaga"
 
 #: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
 msgid "Icon url"
@@ -2293,7 +2227,7 @@ msgstr "Aplikacji nie znaleziono."
 
 #: ../../Zotlabs/Module/Oauth.php:171
 msgid "Connected OAuth Apps"
-msgstr "Połączone aplikacje OAuth"
+msgstr "Podłączone aplikacje OAuth"
 
 #: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
 msgid "Client key starts with"
@@ -2307,7 +2241,8 @@ msgstr "Brak nazwy"
 msgid "Remove authorization"
 msgstr "Usuń autoryzację"
 
-#: ../../Zotlabs/Module/Email_resend.php:12 ../../Zotlabs/Module/Email_validation.php:24
+#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Zotlabs/Module/Email_validation.php:24
 msgid "Token verification failed."
 msgstr "Weryfikacja tokena nie powiodła się."
 
@@ -2319,10 +2254,10 @@ msgstr "Weryfikacja adresu e-mail została wysłana ponownie"
 msgid "Unable to resend email verification message."
 msgstr "Nie można ponownie wysłać weryfikacyjną wiadomość e-mail."
 
-#: ../../Zotlabs/Module/Search.php:21 ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Search.php:21
+#: ../../Zotlabs/Module/Viewconnections.php:23
 #: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Photos.php:519
-#: ../../Zotlabs/Module/Directory.php:73 ../../Zotlabs/Module/Directory.php:78
-#: ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77
 msgid "Public access denied."
 msgstr "Odmowa dostępu publicznego."
 
@@ -2352,7 +2287,7 @@ msgstr "Komentarz został zatwierdzony"
 msgid "Comment deleted"
 msgstr "Komentarz został usunięty"
 
-#: ../../Zotlabs/Module/Rpost.php:150 ../../Zotlabs/Module/Editpost.php:110
+#: ../../Zotlabs/Module/Rpost.php:151 ../../Zotlabs/Module/Editpost.php:110
 msgid "Edit post"
 msgstr "Edytuj wpis"
 
@@ -2380,14 +2315,14 @@ msgstr "przełącz na tryb pełnego ekranu"
 msgid "Post not found."
 msgstr "Nie znaleziono wpisu."
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:158 ../../include/text.php:2260
-#: ../../include/markdown.php:204 ../../include/bbcode.php:555
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:158 ../../include/text.php:2242
+#: ../../include/markdown.php:205 ../../include/bbcode.php:555
 msgid "post"
 msgstr "wpis"
 
 #: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
-#: ../../include/text.php:2262
+#: ../../include/text.php:2244
 msgid "comment"
 msgstr "komentarz"
 
@@ -2412,7 +2347,8 @@ msgstr "Importuj elementy"
 #: ../../Zotlabs/Module/Import_items.php:126
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
-"Użyj tego formularza, aby zaimportować istniejące wpisy i treść z pliku eksportu."
+"Użyj tego formularza, aby zaimportować istniejące wpisy i treść z pliku "
+"eksportu."
 
 #: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
 msgid "Continue"
@@ -2431,28 +2367,29 @@ msgid ""
 "Please enter your restrictions or conditions, such as paypal receipt, usage "
 "guidelines, etc."
 msgstr ""
-"Podaj swoje ograniczenia lub warunki, takie jak pokwitowanie PayPal, wytyczne "
-"dotyczące użytkowania itp."
+"Podaj swoje ograniczenia lub warunki, takie jak pokwitowanie PayPal, "
+"wytyczne dotyczące użytkowania itp."
 
 #: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124
 msgid ""
-"This channel may require additional steps or acknowledgement of the following "
-"conditions prior to connecting:"
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
-"Ten kanał, przed podłączeniem,  może wymagać dodatkowych kroków lub potwierdzenia "
-"następujących warunków:"
+"Ten kanał, przed podłączeniem,  może wymagać dodatkowych kroków lub "
+"potwierdzenia następujących warunków:"
 
 #: ../../Zotlabs/Module/Connect.php:105
-msgid "Potential connections will then see the following text before proceeding:"
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr "Potencjalne połączenia zobaczą następujący tekst przed kontynuowaniem:"
 
 #: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127
 msgid ""
-"By continuing, I certify that I have complied with any instructions provided on this "
-"page."
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
-"Kontynuując, oświadczam, że postępowałem zgodnie z instrukcjami podanymi na tej "
-"stronie."
+"Kontynuując, oświadczam, że postępowałem zgodnie z instrukcjami podanymi na "
+"tej stronie."
 
 #: ../../Zotlabs/Module/Connect.php:115
 msgid "(No specific instructions have been provided by the channel owner.)"
@@ -2462,7 +2399,7 @@ msgstr "(Właściciel kanału nie przekazał żadnych szczegółowych instrukcji
 msgid "Restricted or Premium Channel"
 msgstr "Kanał z ograniczeniami lub premium"
 
-#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:138
+#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:128
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Utworzono %1$.0f z %2$.0f dozwolonych kanałów."
@@ -2473,15 +2410,18 @@ msgstr "Zalecane jest podania prawdziwego imienia i nazwiska lub nazwy."
 
 #: ../../Zotlabs/Module/New_channel.php:160
 msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
 msgstr ""
-"Przykłady: \"Bob Jameson\", \"Lisa i jej konie\", \"Piłka nożna\", \"Grupa lotnicza\""
+"Przykłady: \"Bob Jameson\", \"Lisa i jej konie\", \"Piłka nożna\", \"Grupa "
+"lotnicza\""
 
 #: ../../Zotlabs/Module/New_channel.php:165
-msgid "This will be used to create a unique network address (like an email address)."
+msgid ""
+"This will be used to create a unique network address (like an email address)."
 msgstr ""
-"Zostanie to zastosowane do utworzenia unikalnego adresu sieciowego (podobnego do "
-"adresu e-mail)."
+"Zostanie to zastosowane do utworzenia unikalnego adresu sieciowego "
+"(podobnego do adresu e-mail)."
 
 #: ../../Zotlabs/Module/New_channel.php:167
 msgid "Allowed characters are a-z 0-9, - and _"
@@ -2491,21 +2431,23 @@ msgstr "Dozwolone znaki, to a-z 0-9, - oraz _"
 msgid "Channel name"
 msgstr "Nazwa kanału"
 
-#: ../../Zotlabs/Module/New_channel.php:177 ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/New_channel.php:177
+#: ../../Zotlabs/Module/Register.php:510
 msgid "Choose a short nickname"
 msgstr "Wybierz krótki pseudonim"
 
-#: ../../Zotlabs/Module/New_channel.php:178 ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/New_channel.php:178
+#: ../../Zotlabs/Module/Settings/Channel.php:537
 msgid "Channel role and privacy"
 msgstr "Rola kanału i prywatność"
 
 #: ../../Zotlabs/Module/New_channel.php:178
 msgid ""
-"Select a channel permission role compatible with your usage needs and privacy "
-"requirements."
+"Select a channel permission role compatible with your usage needs and "
+"privacy requirements."
 msgstr ""
-"Wybierz rolę uprawnień do kanału, zgodną z Twoimi potrzebami użytkowania i wymaganiami "
-"dotyczącymi prywatności."
+"Wybierz rolę uprawnień do kanału, zgodną z Twoimi potrzebami użytkowania i "
+"wymaganiami dotyczącymi prywatności."
 
 #: ../../Zotlabs/Module/New_channel.php:178
 msgid "Read more about channel permission roles"
@@ -2517,17 +2459,19 @@ msgstr "Utwórz kanał"
 
 #: ../../Zotlabs/Module/New_channel.php:182
 msgid ""
-"A channel is a unique network identity. It can represent a person (social network "
-"profile), a forum (group), a business or celebrity page, a newsfeed, and many other "
-"things."
+"A channel is a unique network identity. It can represent a person (social "
+"network profile), a forum (group), a business or celebrity page, a newsfeed, "
+"and many other things."
 msgstr ""
 "Kanał to unikalna tożsamość sieciowa. Może reprezentować osobę (profil sieci "
-"społecznościowej), forum (grupę), stronę biznesową lub celebrycką, kanał informacyjny "
-"i wiele innych rzeczy."
+"społecznościowej), forum (grupę), stronę biznesową lub celebrycką, kanał "
+"informacyjny i wiele innych rzeczy."
 
 #: ../../Zotlabs/Module/New_channel.php:183
-msgid "or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "lub <a href=\"import\">zaimportuj istniejący kanał</a> z innej lokalizacji."
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr ""
+"lub <a href=\"import\">zaimportuj istniejący kanał</a> z innej lokalizacji."
 
 #: ../../Zotlabs/Module/New_channel.php:188
 msgid "Validate"
@@ -2551,15 +2495,20 @@ msgstr "Utwórz własną aplikację"
 
 #: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
-"Account removals are not allowed within 48 hours of changing the account password."
-msgstr "Usunięcie konta nie jest dozwolone w ciągu 48 godzin od zmiany hasła do konta."
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr ""
+"Usunięcie konta nie jest dozwolone w ciągu 48 godzin od zmiany hasła do "
+"konta."
 
 #: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Usuń to konto"
 
 #: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This account and all its channels will be completely removed from the network. "
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
 msgstr "To konto i wszystkie jego kanały zostaną całkowicie usunięte z sieci. "
 
 #: ../../Zotlabs/Module/Removeaccount.php:61
@@ -2567,21 +2516,23 @@ msgstr "To konto i wszystkie jego kanały zostaną całkowicie usunięte z sieci
 msgid "Remove Account"
 msgstr "Usuń konto"
 
-#: ../../Zotlabs/Module/Filestorage.php:14 ../../Zotlabs/Module/Filestorage.php:53
+#: ../../Zotlabs/Module/Filestorage.php:14
+#: ../../Zotlabs/Module/Filestorage.php:53
 msgid "Deprecated!"
 msgstr "Przestarzałe!"
 
 #: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Display.php:42
-#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:62
-#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Admin/Addons.php:260
-#: ../../Zotlabs/Module/Thing.php:96 ../../Zotlabs/Module/Viewsrc.php:25
-#: ../../include/items.php:4011
+#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:61
+#: ../../Zotlabs/Module/Admin/Themes.php:72
+#: ../../Zotlabs/Module/Admin/Addons.php:260 ../../Zotlabs/Module/Thing.php:96
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../include/items.php:3667
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:284
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:285
 msgid "Item not found."
 msgstr "Nie znaleziono elementu."
 
-#: ../../Zotlabs/Module/Filestorage.php:109 ../../Zotlabs/Module/Attach_edit.php:69
+#: ../../Zotlabs/Module/Filestorage.php:109
+#: ../../Zotlabs/Module/Attach_edit.php:69
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
@@ -2593,10 +2544,11 @@ msgstr "Odmowa dostępu."
 msgid "Edit file permissions"
 msgstr "Edytuj uprawnienia do pliku"
 
-#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Connedit.php:683
-#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Photos.php:678
-#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Thing.php:321
-#: ../../Zotlabs/Module/Thing.php:374 ../../include/acl_selectors.php:154
+#: ../../Zotlabs/Module/Filestorage.php:195
+#: ../../Zotlabs/Module/Connedit.php:675 ../../Zotlabs/Module/Chat.php:241
+#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
+#: ../../include/acl_selectors.php:154
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:254
 msgid "Permissions"
 msgstr "Uprawnienia"
@@ -2614,11 +2566,13 @@ msgstr "Uwzględnij wszystkie pliki i podfoldery"
 msgid "Return to file list"
 msgstr "Wróć do listy plików"
 
-#: ../../Zotlabs/Module/Filestorage.php:206 ../../Zotlabs/Storage/Browser.php:386
+#: ../../Zotlabs/Module/Filestorage.php:206
+#: ../../Zotlabs/Storage/Browser.php:386
 msgid "Copy/paste this code to attach file to a post"
 msgstr "Skopiuj/wklej ten kod, aby dołączyć plik do wpisu"
 
-#: ../../Zotlabs/Module/Filestorage.php:207 ../../Zotlabs/Storage/Browser.php:387
+#: ../../Zotlabs/Module/Filestorage.php:207
+#: ../../Zotlabs/Storage/Browser.php:387
 msgid "Copy/paste this URL to link file from a web page"
 msgstr "Skopiuj/wklej ten adres URL, aby połączyć plik ze strony internetowej"
 
@@ -2630,30 +2584,35 @@ msgstr "Udostępnij ten plik"
 msgid "Show URL to this file"
 msgstr "Pokaż adres URL do tego pliku"
 
-#: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Storage/Browser.php:552
+#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Storage/Browser.php:552
 msgid "Show in your contacts shared folder"
 msgstr "Pokaż w folderze udostępnionym kontaktów"
 
 #: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
 #: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editblock.php:79
 #: ../../Zotlabs/Module/Editblock.php:95 ../../Zotlabs/Module/Editpost.php:24
-#: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Article_edit.php:17
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Article_edit.php:17
 #: ../../Zotlabs/Module/Article_edit.php:33
 msgid "Item not found"
 msgstr "Nie znaleziono elementu"
 
-#: ../../Zotlabs/Module/Card_edit.php:101 ../../Zotlabs/Module/Editblock.php:116
-#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Editwebpage.php:143
-#: ../../Zotlabs/Module/Article_edit.php:100 ../../include/conversation.php:1345
+#: ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220
+#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1340
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:95
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:310
 msgid "Insert web link"
 msgstr "Wstaw link internetowy"
 
-#: ../../Zotlabs/Module/Card_edit.php:118 ../../Zotlabs/Module/Editblock.php:129
-#: ../../Zotlabs/Module/Photos.php:674 ../../Zotlabs/Module/Photos.php:1044
-#: ../../Zotlabs/Module/Article_edit.php:117 ../../include/conversation.php:1477
+#: ../../Zotlabs/Module/Card_edit.php:118
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674
+#: ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Article_edit.php:116
+#: ../../include/conversation.php:1472
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:221
 msgid "Title (optional)"
 msgstr "Tytuł (opcjonalnie)"
@@ -2666,28 +2625,28 @@ msgstr "Edytuj kartÄ™"
 msgid "No connections."
 msgstr "Brak połączeń."
 
-#: ../../Zotlabs/Module/Viewconnections.php:80 ../../Zotlabs/Module/Connections.php:289
-#: ../../include/text.php:1038
+#: ../../Zotlabs/Module/Viewconnections.php:80
+#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1038
 msgid "Accepts"
 msgstr "Akceptacje"
 
-#: ../../Zotlabs/Module/Viewconnections.php:83 ../../Zotlabs/Module/Connections.php:292
-#: ../../include/text.php:1041
+#: ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1041
 msgid "Comments"
 msgstr "Komentarze"
 
-#: ../../Zotlabs/Module/Viewconnections.php:88 ../../Zotlabs/Module/Connections.php:297
-#: ../../include/text.php:1046
+#: ../../Zotlabs/Module/Viewconnections.php:88
+#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1046
 msgid "Stream items"
 msgstr "Elementy strumienia"
 
-#: ../../Zotlabs/Module/Viewconnections.php:93 ../../Zotlabs/Module/Connections.php:302
-#: ../../include/text.php:1051
+#: ../../Zotlabs/Module/Viewconnections.php:93
+#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1051
 msgid "Wall posts"
 msgstr "Wpisy ścienne"
 
-#: ../../Zotlabs/Module/Viewconnections.php:97 ../../Zotlabs/Module/Connections.php:306
-#: ../../include/text.php:1055
+#: ../../Zotlabs/Module/Viewconnections.php:97
+#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1055
 msgid "Nothing"
 msgstr "Nic"
 
@@ -2718,11 +2677,11 @@ msgstr "Dodaj aplikacjÄ™ OAuth2"
 
 #: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
 msgid "Grant Types"
-msgstr "Rodzaje dofinansowań"
+msgstr "Rodzaje zezwoleń"
 
 #: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
 msgid "leave blank unless your application sepcifically requires this"
-msgstr "pozostaw puste, chyba że Twoja aplikacja wyraźnie tego wymaga"
+msgstr "pozostaw puste, chyba że Twoja aplikacja jawnie tego wymaga"
 
 #: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
 msgid "Authorization scope"
@@ -2738,9 +2697,10 @@ msgstr "pozostaw puste, chyba że Twoja aplikacja wyraźnie tego wymaga"
 
 #: ../../Zotlabs/Module/Oauth2.php:192
 msgid "Connected OAuth2 Apps"
-msgstr "Aplikacje połączeń OAuth2"
+msgstr "Podłączone aplikacje OAuth2"
 
-#: ../../Zotlabs/Module/Wiki.php:35 ../../extend/addon/hubzilla-addons/cart/cart.php:1410
+#: ../../Zotlabs/Module/Wiki.php:35
+#: ../../extend/addon/hubzilla-addons/cart/cart.php:1410
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:51
 msgid "Profile Unavailable."
 msgstr "Profil niedostępny."
@@ -2753,7 +2713,8 @@ msgstr "Aplikacja Wiki"
 msgid "Provide a wiki for your channel"
 msgstr "Udostępnij wiki dla swojego kanału"
 
-#: ../../Zotlabs/Module/Wiki.php:77 ../../extend/addon/hubzilla-addons/cart/cart.php:1556
+#: ../../Zotlabs/Module/Wiki.php:77
+#: ../../extend/addon/hubzilla-addons/cart/cart.php:1556
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:478
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:456
 #: ../../extend/addon/hubzilla-addons/cart/myshop.php:37
@@ -2791,21 +2752,22 @@ msgid "Content type"
 msgstr "Rodzaj treści"
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
-#: ../../Zotlabs/Widget/Wiki_pages.php:38 ../../Zotlabs/Widget/Wiki_pages.php:95
-#: ../../include/text.php:2118 ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2100
+#: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41
 msgid "Markdown"
 msgstr "Markdown"
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
-#: ../../Zotlabs/Widget/Wiki_pages.php:38 ../../Zotlabs/Widget/Wiki_pages.php:95
-#: ../../include/text.php:2116
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2098
 msgid "BBcode"
 msgstr "BBcode"
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2119
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2101
 msgid "Text"
-msgstr "Text"
+msgstr "Tekst"
 
 #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
 msgid "Type"
@@ -2873,27 +2835,27 @@ msgstr "Nowa nazwa strony"
 msgid "Embed image from photo albums"
 msgstr "Osadź obraz z albumów fotograficznych"
 
-#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1459
+#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1454
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:208
 msgid "Embed an image from your albums"
 msgstr "Osadź obraz ze swoich albumów"
 
 #: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:508
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1461
-#: ../../include/conversation.php:1514
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1456
+#: ../../include/conversation.php:1509
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:210
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:257
 msgid "OK"
 msgstr "Dobrze"
 
 #: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:509
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1387
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1382
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:139
 msgid "Choose images to embed"
 msgstr "Wybierz zdjęcie do osadzenia"
 
 #: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:510
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1388
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1383
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:140
 msgid "Choose an album"
 msgstr "Wybierz album"
@@ -2904,19 +2866,19 @@ msgid "Choose a different album"
 msgstr "Wybierz inny album"
 
 #: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:512
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1390
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1385
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:142
 msgid "Error getting album list"
 msgstr "Błąd podczas pobierania listy albumów"
 
 #: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:513
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1391
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1386
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:143
 msgid "Error getting photo link"
 msgstr "Błąd podczas pobierania linku do zdjęcia"
 
 #: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:514
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1392
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1387
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:144
 msgid "Error getting album"
 msgstr "BÅ‚Ä…d podczas pobierania albumu"
@@ -2982,7 +2944,7 @@ msgstr "Trzeba być uwierzytelnionym."
 msgid "Block Name"
 msgstr "Nazwa bloku"
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2712
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2673
 msgid "Blocks"
 msgstr "Bloki"
 
@@ -2998,58 +2960,63 @@ msgstr "Wpis ocenzurowany"
 msgid "Entry uncensored"
 msgstr "Wpis nieocenzurowany"
 
-#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66
+#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
 msgid "Location not found."
 msgstr "Nie znaleziono lokalizacji."
 
-#: ../../Zotlabs/Module/Locs.php:75
+#: ../../Zotlabs/Module/Locs.php:74
 msgid "Location lookup failed."
 msgstr "Wyszukiwanie lokalizacji nie powiodło się."
 
-#: ../../Zotlabs/Module/Locs.php:79
+#: ../../Zotlabs/Module/Locs.php:78
 msgid ""
-"Please select another location to become primary before removing the primary location."
-msgstr "Przed usunięciem lokalizacji podstawowej wybierz inną lokalizację jako główną."
+"Please select another location to become primary before removing the primary "
+"location."
+msgstr ""
+"Przed usunięciem lokalizacji podstawowej wybierz inną lokalizację jako "
+"główną."
 
-#: ../../Zotlabs/Module/Locs.php:108
+#: ../../Zotlabs/Module/Locs.php:106
 msgid "Syncing locations"
 msgstr "SynchronizujÄ™ lokalizacje"
 
-#: ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Locs.php:115
 msgid "No locations found."
 msgstr "Nie znaleziono żadnych lokalizacji."
 
-#: ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Locs.php:125
 msgid "Manage Channel Locations"
 msgstr "Zarządzaj lokalizacjami kanałów"
 
-#: ../../Zotlabs/Module/Locs.php:130
+#: ../../Zotlabs/Module/Locs.php:128
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:285
 msgid "Primary"
 msgstr "Podstawowy"
 
-#: ../../Zotlabs/Module/Locs.php:131 ../../Zotlabs/Module/Menu.php:177
+#: ../../Zotlabs/Module/Locs.php:129 ../../Zotlabs/Module/Menu.php:177
 msgid "Drop"
 msgstr "Upuść"
 
-#: ../../Zotlabs/Module/Locs.php:133
+#: ../../Zotlabs/Module/Locs.php:131
 msgid "Sync Now"
 msgstr "Synchronizuj teraz"
 
-#: ../../Zotlabs/Module/Locs.php:134
+#: ../../Zotlabs/Module/Locs.php:132
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Poczekaj kilka minut między kolejnymi operacjami."
 
-#: ../../Zotlabs/Module/Locs.php:135
+#: ../../Zotlabs/Module/Locs.php:133
 msgid ""
-"When possible, drop a location by logging into that website/hub and removing your "
-"channel."
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
-"Jeśli to możliwe, upuść lokalizację, logując się do tego portalu i usuwając swój kanał."
+"Jeśli to możliwe, upuść lokalizację, logując się do tego portalu i usuwając "
+"swój kanał."
 
-#: ../../Zotlabs/Module/Locs.php:136
+#: ../../Zotlabs/Module/Locs.php:134
 msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Użyj tego formularza, aby usunąć lokalizację, jeśli portal już nie działa."
+msgstr ""
+"Użyj tego formularza, aby usunąć lokalizację, jeśli portal już nie działa."
 
 #: ../../Zotlabs/Module/Chatsvc.php:131
 msgid "Away"
@@ -3073,343 +3040,353 @@ msgstr "Pliki"
 msgid "Could not locate selected profile."
 msgstr "Nie udało się znaleźć wybranego profilu."
 
-#: ../../Zotlabs/Module/Connedit.php:265
+#: ../../Zotlabs/Module/Connedit.php:262
 msgid "Connection updated."
 msgstr "Zaktualizowano połączenie."
 
-#: ../../Zotlabs/Module/Connedit.php:267
+#: ../../Zotlabs/Module/Connedit.php:264
 msgid "Failed to update connection record."
 msgstr "Nie udało się zaktualizować zapisu połączenia."
 
-#: ../../Zotlabs/Module/Connedit.php:310
+#: ../../Zotlabs/Module/Connedit.php:307
 msgid "is now connected to"
 msgstr "jest teraz połączony z"
 
-#: ../../Zotlabs/Module/Connedit.php:435
+#: ../../Zotlabs/Module/Connedit.php:432
 msgid "Could not access address book record."
 msgstr "Nie można uzyskać dostępu do rekordu książki adresowej."
 
-#: ../../Zotlabs/Module/Connedit.php:483 ../../Zotlabs/Module/Connedit.php:487
+#: ../../Zotlabs/Module/Connedit.php:480
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Odświeżenie nie powiodło się - kanał jest obecnie niedostępny."
 
-#: ../../Zotlabs/Module/Connedit.php:502 ../../Zotlabs/Module/Connedit.php:511
-#: ../../Zotlabs/Module/Connedit.php:520 ../../Zotlabs/Module/Connedit.php:529
-#: ../../Zotlabs/Module/Connedit.php:542
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
 msgid "Unable to set address book parameters."
 msgstr "Nie można ustawić parametrów książki adresowej."
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:553
 msgid "Connection has been removed."
 msgstr "Połączenie zostało usunięte."
 
-#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:344
-#: ../../include/conversation.php:1083 ../../include/nav.php:115
+#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:344
+#: ../../include/conversation.php:1078 ../../include/nav.php:115
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57
 msgid "View Profile"
 msgstr "Wyświetl profil"
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Zotlabs/Module/Connedit.php:596
 #, php-format
 msgid "View %s's profile"
 msgstr "Wyświetl profil %s"
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Zotlabs/Module/Connedit.php:600
 msgid "Refresh Permissions"
 msgstr "Odśwież uprawnienia"
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Zotlabs/Module/Connedit.php:603
 msgid "Fetch updated permissions"
 msgstr "Pobierz zaktualizowane uprawnienia"
 
-#: ../../Zotlabs/Module/Connedit.php:615
+#: ../../Zotlabs/Module/Connedit.php:607
 msgid "Refresh Photo"
 msgstr "Odśwież zdjęcie"
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Zotlabs/Module/Connedit.php:610
 msgid "Fetch updated photo"
 msgstr "Pobierz zaktualizowane zdjęcie"
 
-#: ../../Zotlabs/Module/Connedit.php:622 ../../include/conversation.php:1093
+#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1088
 msgid "Recent Activity"
 msgstr "Ostatnia aktywność"
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Zotlabs/Module/Connedit.php:617
 msgid "View recent posts and comments"
 msgstr "Wyświetl najnowsze wpisy i komentarze"
 
-#: ../../Zotlabs/Module/Connedit.php:629 ../../Zotlabs/Module/Admin/Accounts.php:322
+#: ../../Zotlabs/Module/Connedit.php:621
+#: ../../Zotlabs/Module/Admin/Accounts.php:322
 msgid "Unblock"
 msgstr "Odblokuj"
 
-#: ../../Zotlabs/Module/Connedit.php:629 ../../Zotlabs/Module/Admin/Accounts.php:321
+#: ../../Zotlabs/Module/Connedit.php:621
+#: ../../Zotlabs/Module/Admin/Accounts.php:321
 msgid "Block"
 msgstr "Zablokuj"
 
-#: ../../Zotlabs/Module/Connedit.php:632
+#: ../../Zotlabs/Module/Connedit.php:624
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Zablokuj (lub odblokuj) całą komunikację z tym połączeniem"
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:625
 msgid "This connection is blocked!"
 msgstr "To połączenie jest zablokowane!"
 
-#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Connedit.php:629
 msgid "Unignore"
 msgstr "Przestań ignorować"
 
-#: ../../Zotlabs/Module/Connedit.php:637 ../../Zotlabs/Module/Connections.php:345
+#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Connections.php:345
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../../Zotlabs/Module/Connedit.php:640
+#: ../../Zotlabs/Module/Connedit.php:632
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignoruj (lub przywróć) całą komunikację przychodzącą z tego połączenia"
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:633
 msgid "This connection is ignored!"
 msgstr "To połączenie jest ignorowane!"
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid "Unarchive"
 msgstr "Przywróć z archiwum"
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid "Archive"
 msgstr "Archiwizuj"
 
-#: ../../Zotlabs/Module/Connedit.php:648
-msgid "Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Connedit.php:640
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
-"Archiwizuj (lub przywróć) to połączenie - zaznacz kanał jako martwy, ale zachowaj "
-"zawartość"
+"Archiwizuj (lub przywróć) to połączenie - zaznacz kanał jako martwy, ale "
+"zachowaj zawartość"
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:641
 msgid "This connection is archived!"
 msgstr "To połączenie zostało zarchiwizowane!"
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid "Unhide"
 msgstr "Odkryj"
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid "Hide"
 msgstr "Ukryj"
 
-#: ../../Zotlabs/Module/Connedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:648
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ukryj lub odkryj to połączenie na liście innymi połączeń"
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:649
 msgid "This connection is hidden!"
 msgstr "To połączenie jest ukryte!"
 
-#: ../../Zotlabs/Module/Connedit.php:664
+#: ../../Zotlabs/Module/Connedit.php:656
 msgid "Delete this connection"
 msgstr "Usuń to połączenie"
 
-#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Connedit.php:664
 msgid "Fetch Vcard"
 msgstr "Pobierz Vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:675
+#: ../../Zotlabs/Module/Connedit.php:667
 msgid "Fetch electronic calling card for this connection"
 msgstr "Pobierz kartę rozmów elektronicznych dla tego połączenia"
 
-#: ../../Zotlabs/Module/Connedit.php:686
+#: ../../Zotlabs/Module/Connedit.php:678
 msgid "Open Individual Permissions section by default"
 msgstr "Otwórz domyślnie sekcję Uprawnienia indywidualne"
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:701
 msgid "Affinity"
 msgstr "Stopień zaprzyjaźnienie"
 
-#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Zotlabs/Module/Connedit.php:704
 msgid "Open Set Affinity section by default"
 msgstr "Otwieraj domyślnie sekcję Ustaw stopień zaprzyjażnienia"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:30
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:30
 msgid "Me"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:31
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:31
 msgid "Family"
 msgstr "Rodzina"
 
-#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Settings/Channel.php:71
+#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Settings/Channel.php:71
 #: ../../Zotlabs/Module/Settings/Channel.php:75
 #: ../../Zotlabs/Module/Settings/Channel.php:76
 #: ../../Zotlabs/Module/Settings/Channel.php:79
-#: ../../Zotlabs/Module/Settings/Channel.php:90 ../../Zotlabs/Widget/Affinity.php:32
-#: ../../include/channel.php:506 ../../include/channel.php:509
-#: ../../include/selectors.php:134
+#: ../../Zotlabs/Module/Settings/Channel.php:90
+#: ../../Zotlabs/Widget/Affinity.php:32 ../../include/channel.php:457
+#: ../../include/channel.php:460 ../../include/selectors.php:134
 msgid "Friends"
 msgstr "Przyjaciele"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Widget/Affinity.php:33
+#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:33
 msgid "Acquaintances"
 msgstr "Znajomi"
 
-#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Connections.php:97
-#: ../../Zotlabs/Module/Connections.php:111 ../../Zotlabs/Widget/Affinity.php:34
+#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Zotlabs/Module/Connections.php:97
+#: ../../Zotlabs/Module/Connections.php:111
+#: ../../Zotlabs/Widget/Affinity.php:34
 msgid "All"
 msgstr "Wszyscy"
 
-#: ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Module/Connedit.php:741
 msgid "Filter"
 msgstr "Filtr"
 
-#: ../../Zotlabs/Module/Connedit.php:752
+#: ../../Zotlabs/Module/Connedit.php:744
 msgid "Open Custom Filter section by default"
 msgstr "Otwieraj domyślnie sekcję Własny filtr"
 
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Approve this connection"
 msgstr "Zatwierdź to połączenie"
 
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Accept connection to allow communication"
 msgstr "Zaakceptuj połączenie, aby umożliwić komunikację"
 
-#: ../../Zotlabs/Module/Connedit.php:794
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid "Set Affinity"
 msgstr "Ustaw stopień zaprzyjaźnienia"
 
-#: ../../Zotlabs/Module/Connedit.php:797
+#: ../../Zotlabs/Module/Connedit.php:789
 msgid "Set Profile"
 msgstr "Ustaw profil"
 
-#: ../../Zotlabs/Module/Connedit.php:800
+#: ../../Zotlabs/Module/Connedit.php:792
 msgid "Set Affinity & Profile"
 msgstr "Ustaw stopień zaprzyjaźnienia i profil"
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:840
 msgid "This connection is unreachable from this location."
 msgstr "To połączenie jest nieosiągalne z tej lokalizacji."
 
-#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../Zotlabs/Module/Connedit.php:841
 msgid "This connection may be unreachable from other channel locations."
 msgstr "To połączenie może być nieosiągalne z innych lokalizacji kanału."
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Zotlabs/Module/Connedit.php:843
 msgid "Location independence is not supported by their network."
 msgstr "Niezależność lokalizacji nie jest obsługiwana przez ich sieć."
 
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:849
 msgid ""
-"This connection is unreachable from this location. Location independence is not "
-"supported by their network."
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
 msgstr ""
-"To połączenie jest nieosiągalne z tej lokalizacji. Niezależność lokalizacji nie jest "
-"obsługiwana przez ich sieć."
+"To połączenie jest nieosiągalne z tej lokalizacji. Niezależność lokalizacji "
+"nie jest obsługiwana przez ich sieć."
 
-#: ../../Zotlabs/Module/Connedit.php:860 ../../include/items.php:4618
+#: ../../Zotlabs/Module/Connedit.php:852 ../../include/items.php:4274
 #, php-format
 msgid "Connection: %s"
 msgstr "Połączenie: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:853
 msgid "Connection requests will be approved without your interaction"
 msgstr "Prośby o połączenie zostaną zatwierdzone bez Twojej interakcji"
 
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:862
 msgid "This connection's primary address is"
 msgstr "Podstawowy adres tego połączenia to"
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:863
 msgid "Available locations:"
 msgstr "Dostępne lokalizacje:"
 
-#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:869
 msgid "Connection Tools"
 msgstr "Narzędzia połączeń"
 
-#: ../../Zotlabs/Module/Connedit.php:879
+#: ../../Zotlabs/Module/Connedit.php:871
 msgid "Slide to adjust your degree of friendship"
 msgstr "Przesuń, aby dostosować stopień zaprzyjaźnienia"
 
-#: ../../Zotlabs/Module/Connedit.php:880 ../../Zotlabs/Module/Rate.php:157
-#: ../../include/js_strings.php:20
+#: ../../Zotlabs/Module/Connedit.php:872 ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Ocena"
 
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:873
 msgid "Slide to adjust your rating"
 msgstr "Przesuń, aby dostosować swoją ocenę"
 
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Connedit.php:887
+#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879
 msgid "Optionally explain your rating"
 msgstr "Ewentualnie wyjaśnij swoją ocenę"
 
-#: ../../Zotlabs/Module/Connedit.php:884
+#: ../../Zotlabs/Module/Connedit.php:876
 msgid "Custom Filter"
 msgstr "WÅ‚asny filtr"
 
-#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Connedit.php:877
 msgid "Only import posts with this text"
 msgstr "Importuj tylko wpisy z tym tekstem"
 
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886
-#: ../../Zotlabs/Module/Admin/Site.php:512 ../../Zotlabs/Module/Admin/Site.php:513
+#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878
+#: ../../Zotlabs/Module/Admin/Site.php:512
+#: ../../Zotlabs/Module/Admin/Site.php:513
 msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
 msgstr ""
-"słowa po jednym w wierszu lub #tags lub /patterns/ lub lang=xx, pozostaw puste, aby "
-"zaimportować wszystkie wpisy"
+"słowa po jednym w wierszu lub #tags lub /patterns/ lub lang=xx, pozostaw "
+"puste, aby zaimportować wszystkie wpisy"
 
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:878
 msgid "Do not import posts with this text"
 msgstr "Nie importuj wpisów z tym tekstem"
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:880
 msgid "This information is public!"
 msgstr "Ta informacja jest publiczna!"
 
-#: ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Connedit.php:885
 msgid "Connection Pending Approval"
 msgstr "Połączenie oczekujące na zatwierdzenie"
 
-#: ../../Zotlabs/Module/Connedit.php:898
+#: ../../Zotlabs/Module/Connedit.php:890
 #, php-format
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your profile "
-"securely."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
-"Wybierz profil, który chcesz wyświetlić dla %s, podczas bezpiecznego przeglądania "
-"swojego profilu."
+"Wybierz profil, który chcesz wyświetlić dla %s, podczas bezpiecznego "
+"przeglÄ…dania swojego profilu."
 
-#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Tokens.php:180
+#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Tokens.php:180
 msgid "Their Settings"
 msgstr "Ich ustawienia"
 
-#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Tokens.php:187
+#: ../../Zotlabs/Module/Connedit.php:896 ../../Zotlabs/Module/Tokens.php:187
 #: ../../Zotlabs/Module/Permcats.php:128
 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."
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
-"Niektóre uprawnienia mogą być dziedziczone z <a href=\"settings\"><strong>ustawień "
-"prywatności</strong></a> Twojego kanału, które mają wyższy priorytet niż indywidualne "
-"ustawienia.  <strong>Nie możesz</strong> tutaj zmienić tych ustawień."
+"Niektóre uprawnienia mogą być dziedziczone z <a href=\"settings"
+"\"><strong>ustawień prywatności</strong></a> Twojego kanału, które mają "
+"wyższy priorytet niż indywidualne ustawienia.  <strong>Nie możesz</strong> "
+"tutaj zmienić tych ustawień."
 
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../Zotlabs/Module/Connedit.php:897
 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."
+"\"><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 ""
-"Niektóre uprawnienia mogą być dziedziczone z <a href=\"settings\"><strong>ustawień "
-"prywatności</strong></a> Twojego kanału, te które mają wyższy priorytet niż "
-"indywidualne ustawienia. Możesz zmienić te ustawienia tutaj, ale nie będą one miały "
-"żadnego wpływu, chyba że odziedziczone ustawienie ulegnie zmianie."
+"Niektóre uprawnienia mogą być dziedziczone z <a href=\"settings"
+"\"><strong>ustawień prywatności</strong></a> Twojego kanału, te które mają "
+"wyższy priorytet niż indywidualne ustawienia. Możesz zmienić te ustawienia "
+"tutaj, ale nie będą one miały żadnego wpływu, chyba że odziedziczone "
+"ustawienie ulegnie zmianie."
 
-#: ../../Zotlabs/Module/Connedit.php:906
+#: ../../Zotlabs/Module/Connedit.php:898
 msgid "Last update:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Connedit.php:906
 msgid "Details"
 msgstr "Szczegóły"
 
@@ -3500,11 +3477,11 @@ msgstr "Twój identyfikator logowania to"
 
 #: ../../Zotlabs/Module/Regate.php:340
 msgid ""
-"After your account has been approved by our administrator you will be able to login "
-"with your login ID and your provided password."
+"After your account has been approved by our administrator you will be able "
+"to login with your login ID and your provided password."
 msgstr ""
-"Po zatwierdzeniu konta przez naszego administratora będziesz mógł zalogować się za "
-"pomocą swojego identyfikatora logowania i podanego hasła."
+"Po zatwierdzeniu konta przez naszego administratora będziesz mógł zalogować "
+"się za pomocą swojego identyfikatora logowania i podanego hasła."
 
 #: ../../Zotlabs/Module/Regate.php:352
 msgid "Registration request revoked"
@@ -3542,67 +3519,76 @@ msgstr "Nieznany lub wygasły identyfikator"
 msgid "dId2 malformed"
 msgstr "źle sformułowany dId2"
 
-#: ../../Zotlabs/Module/Profile_photo.php:93 ../../Zotlabs/Module/Cover_photo.php:85
+#: ../../Zotlabs/Module/Profile_photo.php:93
+#: ../../Zotlabs/Module/Cover_photo.php:85
 msgid "Image uploaded but image cropping failed."
 msgstr "Obraz został przesłany, ale przycinanie obrazu nie powiodło się."
 
-#: ../../Zotlabs/Module/Profile_photo.php:147 ../../Zotlabs/Module/Profile_photo.php:284
+#: ../../Zotlabs/Module/Profile_photo.php:147
+#: ../../Zotlabs/Module/Profile_photo.php:284
 #: ../../include/photo/photo_driver.php:435
 msgid "Profile Photos"
 msgstr "Zdjęcia profilowe"
 
-#: ../../Zotlabs/Module/Profile_photo.php:166 ../../Zotlabs/Module/Cover_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:166
+#: ../../Zotlabs/Module/Cover_photo.php:212
 msgid "Image resize failed."
 msgstr "Zmiana rozmiaru obrazu nie powiodła się."
 
 #: ../../Zotlabs/Module/Profile_photo.php:254
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:298
 msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not display "
-"immediately."
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
-"Przeładuj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe zdjęcie nie "
-"zostanie wyświetlone od razu."
+"Przeładuj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe "
+"zdjęcie nie zostanie wyświetlone od razu."
 
-#: ../../Zotlabs/Module/Profile_photo.php:261 ../../Zotlabs/Module/Cover_photo.php:241
-#: ../../include/photos.php:196
+#: ../../Zotlabs/Module/Profile_photo.php:261
+#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:196
 msgid "Unable to process image"
 msgstr "Nie można przetworzyć obrazu"
 
-#: ../../Zotlabs/Module/Profile_photo.php:296 ../../Zotlabs/Module/Cover_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:296
+#: ../../Zotlabs/Module/Cover_photo.php:265
 msgid "Image upload failed."
 msgstr "Przesyłanie obrazu nie powiodło się."
 
-#: ../../Zotlabs/Module/Profile_photo.php:315 ../../Zotlabs/Module/Cover_photo.php:282
+#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Cover_photo.php:282
 msgid "Unable to process image."
 msgstr "Nie można przetworzyć obrazu."
 
-#: ../../Zotlabs/Module/Profile_photo.php:379 ../../Zotlabs/Module/Profile_photo.php:431
-#: ../../Zotlabs/Module/Cover_photo.php:367 ../../Zotlabs/Module/Cover_photo.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:379
+#: ../../Zotlabs/Module/Profile_photo.php:431
+#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Zotlabs/Module/Cover_photo.php:382
 msgid "Photo not available."
 msgstr "Zdjęcie nie jest dostępne."
 
 #: ../../Zotlabs/Module/Profile_photo.php:495
 msgid ""
-"Your default profile photo is visible to anybody on the internet. Profile photos for "
-"alternate profiles will inherit the permissions of the profile"
+"Your default profile photo is visible to anybody on the internet. Profile "
+"photos for alternate profiles will inherit the permissions of the profile"
 msgstr ""
-"Twoje domyślne zdjęcie profilowe jest widoczne dla każdego w internecie. Zdjęcia "
-"profilowe dla profili alternatywnych odziedziczÄ… uprawnienia profilu"
+"Twoje domyślne zdjęcie profilowe jest widoczne dla każdego w internecie. "
+"Zdjęcia profilowe dla profili alternatywnych odziedziczą uprawnienia profilu"
 
 #: ../../Zotlabs/Module/Profile_photo.php:495
 msgid ""
-"Your profile photo is visible to anybody on the internet and may be distributed to "
-"other websites."
+"Your profile photo is visible to anybody on the internet and may be "
+"distributed to other websites."
 msgstr ""
 "Twoje zdjęcie profilowe jest widoczne dla każdego w internecie i może być "
 "rozpowszechniane na innych stronach internetowych."
 
-#: ../../Zotlabs/Module/Profile_photo.php:497 ../../Zotlabs/Module/Cover_photo.php:420
+#: ../../Zotlabs/Module/Profile_photo.php:497
+#: ../../Zotlabs/Module/Cover_photo.php:420
 msgid "Upload File:"
 msgstr "Prześlij plik:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:498 ../../Zotlabs/Module/Cover_photo.php:421
+#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Zotlabs/Module/Cover_photo.php:421
 msgid "Select a profile:"
 msgstr "Wybierz profil:"
 
@@ -3618,39 +3604,47 @@ msgstr "Zmień zdjęcie profilowe"
 msgid "Use"
 msgstr "Użyj"
 
-#: ../../Zotlabs/Module/Profile_photo.php:500 ../../Zotlabs/Module/Photos.php:688
-#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Embedphotos.php:189
+#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Photos.php:688 ../../Zotlabs/Module/Cover_photo.php:423
+#: ../../Zotlabs/Module/Embedphotos.php:189
 #: ../../Zotlabs/Storage/Browser.php:540 ../../Zotlabs/Widget/Cdav.php:146
 #: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
 #: ../../Zotlabs/Widget/Album.php:97
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../../Zotlabs/Module/Profile_photo.php:501 ../../Zotlabs/Module/Photos.php:996
-#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459
+#: ../../Zotlabs/Module/Profile_photo.php:501
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Admin/Addons.php:459
 #: ../../Zotlabs/Module/Cover_photo.php:424
 #: ../../extend/addon/hubzilla-addons/superblock/Mod_Superblock.php:92
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../../Zotlabs/Module/Profile_photo.php:505 ../../Zotlabs/Module/Profile_photo.php:506
-#: ../../Zotlabs/Module/Cover_photo.php:426 ../../Zotlabs/Module/Cover_photo.php:427
+#: ../../Zotlabs/Module/Profile_photo.php:505
+#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Zotlabs/Module/Cover_photo.php:427
 msgid "Use a photo from your albums"
 msgstr "Użyj zdjęcia ze swoich albumów"
 
-#: ../../Zotlabs/Module/Profile_photo.php:516 ../../Zotlabs/Module/Cover_photo.php:438
+#: ../../Zotlabs/Module/Profile_photo.php:516
+#: ../../Zotlabs/Module/Cover_photo.php:438
 msgid "Select existing photo"
 msgstr "Wybierz istniejące zdjęcie"
 
-#: ../../Zotlabs/Module/Profile_photo.php:535 ../../Zotlabs/Module/Cover_photo.php:455
+#: ../../Zotlabs/Module/Profile_photo.php:535
+#: ../../Zotlabs/Module/Cover_photo.php:455
 msgid "Crop Image"
 msgstr "Przytnij zdjęcie"
 
-#: ../../Zotlabs/Module/Profile_photo.php:536 ../../Zotlabs/Module/Cover_photo.php:456
+#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Cover_photo.php:456
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Dostosuj kadrowanie obrazu, aby uzyskać optymalne wyświetlanie."
 
-#: ../../Zotlabs/Module/Profile_photo.php:538 ../../Zotlabs/Module/Cover_photo.php:458
+#: ../../Zotlabs/Module/Profile_photo.php:538
+#: ../../Zotlabs/Module/Cover_photo.php:458
 msgid "Done Editing"
 msgstr "Zakończono edycję"
 
@@ -3662,12 +3656,13 @@ msgstr "Pliki: udostępnione mi"
 msgid "NEW"
 msgstr "NOWY"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:108 ../../Zotlabs/Storage/Browser.php:379
-#: ../../include/text.php:1558
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1540
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109 ../../Zotlabs/Storage/Browser.php:380
+#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Zotlabs/Storage/Browser.php:380
 msgid "Last Modified"
 msgstr "Ostatnio zmodyfikowane"
 
@@ -3683,42 +3678,37 @@ msgstr "Usuń ten plik"
 msgid "Edit Layout"
 msgstr "Edytuj układ"
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Zotlabs/Module/Manage.php:135
 msgid "Create a new channel"
 msgstr "Utwórz nowy kanał"
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:337
+#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:337
 #: ../../include/nav.php:101
 msgid "Channel Manager"
 msgstr "Menadżer kanałów"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:161
 msgid "Current Channel"
 msgstr "Bieżący kanał"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:163
 msgid "Switch to one of your channels by selecting it."
 msgstr "Przełącz się na jeden ze swoich kanałów, wybierając go."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Zotlabs/Module/Manage.php:164
 msgid "Default Channel"
 msgstr "Domyślny kanał"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Make Default"
 msgstr "Ustaw jako domyślny"
 
-#: ../../Zotlabs/Module/Manage.php:178
-#, php-format
-msgid "%d new messages"
-msgstr "%d nowych wiadomości"
-
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:168
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nowych wprowadzeń"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Zotlabs/Module/Manage.php:170
 msgid "Delegated Channel"
 msgstr "Deleguj kanał"
 
@@ -3734,49 +3724,32 @@ msgstr "Nie można znaleźć oryginalnego wpisu."
 msgid "Empty post discarded."
 msgstr "Pusty wpis został odrzucony."
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Zotlabs/Module/Item.php:1191
 msgid "Duplicate post suppressed."
 msgstr "Powielony wpis został wyłączony."
 
-#: ../../Zotlabs/Module/Item.php:1334
+#: ../../Zotlabs/Module/Item.php:1336
 msgid "System error. Post not saved."
 msgstr "Błąd systemu. Wpis nie został zapisany."
 
-#: ../../Zotlabs/Module/Item.php:1368
+#: ../../Zotlabs/Module/Item.php:1370
 msgid "Your comment is awaiting approval."
 msgstr "Twój komentarz oczekuje na zatwierdzenie."
 
-#: ../../Zotlabs/Module/Item.php:1498
+#: ../../Zotlabs/Module/Item.php:1500
 msgid "Unable to obtain post information from database."
 msgstr "Nie można uzyskać z bazy danych informacji o tym wpisie."
 
-#: ../../Zotlabs/Module/Item.php:1505
+#: ../../Zotlabs/Module/Item.php:1507
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Osiągnięty został limit %1$.0f wpisów najwyższego poziomu."
 
-#: ../../Zotlabs/Module/Item.php:1512
+#: ../../Zotlabs/Module/Item.php:1514
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Osiągnięty został limit %1$.0f stron internetowych."
 
-#: ../../Zotlabs/Module/Rate.php:158
-msgid "Website:"
-msgstr "Portal internetowy:"
-
-#: ../../Zotlabs/Module/Rate.php:161
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanał zdalny [% s] (jeszcze nieznany w tym portalu)"
-
-#: ../../Zotlabs/Module/Rate.php:162
-msgid "Rating (this information is public)"
-msgstr "Ocena (ta informacja jest publiczna)"
-
-#: ../../Zotlabs/Module/Rate.php:163
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Ewentualnie wyjaśnij swoją ocenę (ta informacja jest publiczna)"
-
 #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
 msgid "Invalid item."
 msgstr "Nieprawidłowy element."
@@ -3785,25 +3758,25 @@ msgstr "Nieprawidłowy element."
 #: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173
 #: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Block.php:77
 #: ../../Zotlabs/Web/Router.php:186 ../../Zotlabs/Lib/NativeWikiPage.php:533
-#: ../../include/help.php:132
+#: ../../include/help.php:133
 msgid "Page not found."
 msgstr "Nie znaleziono strony."
 
 #: ../../Zotlabs/Module/Page.php:173
 msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor "
-"incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "
-"exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure "
-"dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "
-"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-"mollit anim id est laborum."
-msgstr ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor "
-"incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "
-"exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure "
-"dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. "
-"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt "
-"mollit anim id est laborum."
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
@@ -3866,48 +3839,49 @@ msgstr "Element %s został zainstalowany"
 msgid "%s element installation failed"
 msgstr "Instalacja elementu %s nie powiodła się"
 
-#: ../../Zotlabs/Module/Pubsites.php:25 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr "Portale publiczne"
 
-#: ../../Zotlabs/Module/Pubsites.php:28
+#: ../../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."
+"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 ""
-"Wymienione portale umożliwiają publiczną rejestrację w sieci $Projectname. Wszystkie "
-"portale w sieci są ze sobą połączone, więc członkostwo w którymkolwiek z nich oznacza "
-"członkostwo w całej sieci. Niektóre portale mogą wymagać subskrypcji lub oferować "
-"stopniowe plany usług. Dodatkową informację można znaleźć na poszczególnych portalach."
+"Wymienione portale umożliwiają publiczną rejestrację w sieci $Projectname. "
+"Wszystkie portale w sieci są ze sobą połączone, więc członkostwo w "
+"którymkolwiek z nich oznacza członkostwo w całej sieci. Niektóre portale "
+"mogą wymagać subskrypcji lub oferować stopniowe plany usług. Dodatkową "
+"informację można znaleźć na poszczególnych portalach."
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "Adres URL portalu"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Typ dostępu"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Zasady rejestracji"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Statystyki"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Oprogramowanie"
 
-#: ../../Zotlabs/Module/Pubsites.php:36 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:1133
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1128
 msgid "Ratings"
 msgstr "Oceny"
 
-#: ../../Zotlabs/Module/Pubsites.php:50
+#: ../../Zotlabs/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Ocena"
 
@@ -3948,7 +3922,7 @@ msgstr "Jestem dostępny"
 msgid "Bookmark this room"
 msgstr "Zaznacz ten pokój"
 
-#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1382
+#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1377
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:134
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:120
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:241
@@ -3956,7 +3930,7 @@ msgid "Please enter a link URL:"
 msgstr "Proszę wprowadzić adres URL linku:"
 
 #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841
-#: ../../include/conversation.php:1512
+#: ../../include/conversation.php:1507
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:255
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:173
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:316
@@ -4006,30 +3980,31 @@ msgstr "Eksport Kanału"
 
 #: ../../Zotlabs/Module/Uexport.php:75
 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."
+"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 ""
-"Wyeksportuj do pliku podstawowe informacje o kanale. Działa to jako kopia zapasowa "
-"połączeń, uprawnień, profilu i podstawowych danych, których można użyć do "
-"zaimportowania danych do nowego portalu, ale nie zawiera treści."
+"Wyeksportuj do pliku podstawowe informacje o kanale. Działa to jako kopia "
+"zapasowa połączeń, uprawnień, profilu i podstawowych danych, których można "
+"użyć do zaimportowania danych do nowego portalu, ale nie zawiera treści."
 
 #: ../../Zotlabs/Module/Uexport.php:76
 msgid "Export Content"
-msgstr "Eksport Treści"
+msgstr "Eksport treści"
 
 #: ../../Zotlabs/Module/Uexport.php:77
 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."
+"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 ""
-"Wyeksportuj informacje o kanale i najnowsze treści do kopii zapasowej JSON, którą "
-"można przywrócić lub zaimportować do innego portalu. Tworzy to kopie zapasowe "
-"wszystkich połączeń, uprawnień, danych profilu i wpisów z kilku miesięcy. Ten plik "
-"może być BARDZO duży. Prosimy o cierpliwość - rozpoczęcie pobierania może zająć kilka "
-"minut."
+"Wyeksportuj informacje o kanale i najnowsze treści do kopii zapasowej JSON, "
+"którą można przywrócić lub zaimportować do innego portalu. Tworzy to kopie "
+"zapasowe wszystkich połączeń, uprawnień, danych profilu i wpisów z kilku "
+"miesięcy. Ten plik może być BARDZO duży. Prosimy o cierpliwość - rozpoczęcie "
+"pobierania może zająć kilka minut."
 
 #: ../../Zotlabs/Module/Uexport.php:79
 msgid "Export your posts from a given year."
@@ -4037,44 +4012,46 @@ msgstr "Eksportuj swoje wpisy z danego roku."
 
 #: ../../Zotlabs/Module/Uexport.php:81
 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."
+"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 ""
-"Można także wyeksportować swoje wpisy i rozmowy z określonego roku lub miesiąca. "
-"Dostosuj datę na pasku adresu przeglądarki, aby wybrać inne daty. Jeśli eksport się "
-"nie powiedzie (prawdopodobnie z powodu wyczerpania pamięci w serwera portalu), spróbuj "
-"ponownie, wybierajÄ…c bardziej ograniczony zakres dat."
+"Można także wyeksportować swoje wpisy i rozmowy z określonego roku lub "
+"miesiąca. Dostosuj datę na pasku adresu przeglądarki, aby wybrać inne daty. "
+"Jeśli eksport się nie powiedzie (prawdopodobnie z powodu wyczerpania pamięci "
+"w serwera portalu), spróbuj ponownie, wybierając bardziej ograniczony zakres "
+"dat."
 
 #: ../../Zotlabs/Module/Uexport.php:82
 #, php-format
 msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s\">%2$s</"
-"a>"
-msgstr ""
-"Aby wybrać wszystkie wpisy z danego roku, na przykład tego roku, odwiedź <a href=\"%1$s"
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
 "\">%2$s</a>"
+msgstr ""
+"Aby wybrać wszystkie wpisy z danego roku, na przykład tego roku, odwiedź <a "
+"href=\"%1$s\">%2$s</a>"
 
 #: ../../Zotlabs/Module/Uexport.php:83
 #, 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>"
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
 msgstr ""
-"Aby wybrać wszystkie wpisy z danego miesiąca, np. stycznia tego roku, odwiedź <a href="
-"\"%1$s\">%2$s</a>"
+"Aby wybrać wszystkie wpisy z danego miesiąca, np. stycznia tego roku, "
+"odwiedź <a href=\"%1$s\">%2$s</a>"
 
 #: ../../Zotlabs/Module/Uexport.php:84
 #, 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)."
+"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 ""
-"Te pliki treści można zaimportować lub przywrócić, odwiedzając stronę <a href=\"%1$s\">"
-"%2$s</a> w dowolnym portalu zawierającym Twój kanał. Aby uzyskać najlepsze wyniki, "
-"zaimportuj lub przywróć je w kolejności (od najstarszych)."
+"Te pliki treści można zaimportować lub przywrócić, odwiedzając stronę <a "
+"href=\"%1$s\">%2$s</a> w dowolnym portalu zawierającym Twój kanał. Aby "
+"uzyskać najlepsze wyniki, zaimportuj lub przywróć je w kolejności (od "
+"najstarszych)."
 
 #: ../../Zotlabs/Module/Lostpass.php:19
 msgid "No valid account found."
@@ -4096,13 +4073,13 @@ msgstr "Zresetowano hasło na %s"
 
 #: ../../Zotlabs/Module/Lostpass.php:68
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) Password reset "
-"failed."
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
-"Nie można zweryfikować żądania. (Możliwe, że zostało już przesłane). Resetowanie hasła "
-"nie powiodło się."
+"Nie można zweryfikować żądania. (Możliwe, że zostało już przesłane). "
+"Resetowanie hasła nie powiodło się."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1729
 msgid "Password Reset"
 msgstr "Resetowanie hasła"
 
@@ -4124,10 +4101,11 @@ msgstr "kliknij tutaj aby się zalogować"
 
 #: ../../Zotlabs/Module/Lostpass.php:96
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after successful login."
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
-"Twoje hasło może zostać zmienione na stronie <em>Ustawienia</em> po pomyślnym "
-"zalogowaniu."
+"Twoje hasło może zostać zmienione na stronie <em>Ustawienia</em> po "
+"pomyślnym zalogowaniu."
 
 #: ../../Zotlabs/Module/Lostpass.php:117
 #, php-format
@@ -4140,11 +4118,11 @@ msgstr "Zapomniałeś hasła?"
 
 #: ../../Zotlabs/Module/Lostpass.php:131
 msgid ""
-"Enter your email address and submit to have your password reset. Then check your email "
-"for further instructions."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
-"Wpisz swój adres e-mail i prześlij, aby zresetować hasło. Następnie sprawdź swoja "
-"skrzynkę e-mail, aby uzyskać dalsze instrukcje."
+"Wpisz swój adres e-mail i prześlij, aby zresetować hasło. Następnie sprawdź "
+"swoja skrzynkę e-mail, aby uzyskać dalsze instrukcje."
 
 #: ../../Zotlabs/Module/Lostpass.php:132
 msgid "Email Address"
@@ -4162,39 +4140,12 @@ msgstr "Nieprawidłowa odpowiedź."
 msgid "Response submitted. Updates may not appear instantly."
 msgstr "Odpowiedź przesłana. Aktualizacje mogą nie pojawiać się natychmiast."
 
-#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948
-msgid "sent you a private message"
-msgstr "wysłał Ci prywatną wiadomość"
-
-#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914
-msgid "added your channel"
-msgstr "dodał Twój kanał"
-
-#: ../../Zotlabs/Module/Ping.php:418
-msgid "requires approval"
-msgstr "wymaga zatwierdzenia"
-
-#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960
-msgid "[today]"
-msgstr "[dzisiaj]"
-
-#: ../../Zotlabs/Module/Ping.php:456
-msgid "posted an event"
-msgstr "opublikował wydarzenie"
-
-#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829
-#: ../../Zotlabs/Lib/Enotify.php:931
-msgid "shared a file with you"
-msgstr "udostępnił Ci plik"
-
-#: ../../Zotlabs/Module/Display.php:354 ../../Zotlabs/Module/Channel.php:483
-msgid "You must enable javascript for your browser to be able to view this content."
+#: ../../Zotlabs/Module/Display.php:354 ../../Zotlabs/Module/Channel.php:496
+msgid ""
+"You must enable javascript for your browser to be able to view this content."
 msgstr ""
-"Aby przeglądać te treści, musisz włączyć obsługę JavaScript w swojej przeglądarce."
+"Aby przeglądać te treści, musisz włączyć obsługę JavaScript w swojej "
+"przeglÄ…darce."
 
 #: ../../Zotlabs/Module/Display.php:372
 msgid "Article"
@@ -4204,74 +4155,80 @@ msgstr "Artykuł"
 msgid "Item has been removed."
 msgstr "Element został usunięty."
 
-#: ../../Zotlabs/Module/Admin.php:96 ../../Zotlabs/Module/Admin/Accounts.php:308
-#: ../../Zotlabs/Module/Admin/Accounts.php:327 ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Module/Admin.php:95
+#: ../../Zotlabs/Module/Admin/Accounts.php:308
+#: ../../Zotlabs/Module/Admin/Accounts.php:327
+#: ../../Zotlabs/Widget/Admin.php:23
 msgid "Accounts"
 msgstr "Konta"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Zotlabs/Module/Admin.php:96
 msgid "Blocked accounts"
 msgstr "Zablokowane konta"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Zotlabs/Module/Admin.php:97
 msgid "Expired accounts"
 msgstr "Wygasłe konta"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Zotlabs/Module/Admin.php:98
 msgid "Expiring accounts"
 msgstr "WygasajÄ…ce konta"
 
-#: ../../Zotlabs/Module/Admin.php:117 ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Module/Admin.php:116
+#: ../../Zotlabs/Module/Admin/Channels.php:146
 #: ../../Zotlabs/Widget/Admin.php:24
 msgid "Channels"
 msgstr "Kanały"
 
-#: ../../Zotlabs/Module/Admin.php:123
+#: ../../Zotlabs/Module/Admin.php:122
 msgid "Message queues"
 msgstr "Kolejki wiadomości"
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
 msgid "Your software should be updated"
 msgstr "Twoje oprogramowanie powinno zostać zaktualizowane"
 
-#: ../../Zotlabs/Module/Admin.php:141 ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156 ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Zotlabs/Module/Admin.php:140 ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Security.php:98
 #: ../../Zotlabs/Module/Admin/Accounts.php:307
-#: ../../Zotlabs/Module/Admin/Channels.php:145 ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Addons.php:342 ../../Zotlabs/Module/Admin/Addons.php:440
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Addons.php:342
+#: ../../Zotlabs/Module/Admin/Addons.php:440
 #: ../../Zotlabs/Module/Admin/Site.php:408
 msgid "Administration"
 msgstr "Administracja"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
 msgid "Registered accounts"
 msgstr "Zarejestrowane konta"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
 msgid "Pending registrations"
 msgstr "Rejestracje oczekujÄ…ce"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
 msgid "Registered channels"
 msgstr "Zarejestrowane kanały"
 
-#: ../../Zotlabs/Module/Admin.php:148
+#: ../../Zotlabs/Module/Admin.php:147
 msgid "Active addons"
 msgstr "Aktywne dodatki"
 
-#: ../../Zotlabs/Module/Admin.php:149
+#: ../../Zotlabs/Module/Admin.php:148
 msgid "Version"
 msgstr "Wersja"
 
-#: ../../Zotlabs/Module/Admin.php:150
+#: ../../Zotlabs/Module/Admin.php:149
 msgid "Repository version (master)"
 msgstr "Wersja repozytorium (master)"
 
-#: ../../Zotlabs/Module/Admin.php:151
+#: ../../Zotlabs/Module/Admin.php:150
 msgid "Repository version (dev)"
 msgstr "Wersja repozytorium (dev)"
 
@@ -4337,19 +4294,20 @@ msgstr "Pokaż najpierw najnowsze"
 msgid "Show Oldest First"
 msgstr "Pokaż najpierw najstarsze"
 
-#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1333
-#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Widget/Portfolio.php:87
-#: ../../Zotlabs/Widget/Album.php:78
+#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1331
+#: ../../Zotlabs/Module/Embedphotos.php:171
+#: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr "Zobacz zdjęcie"
 
-#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1255
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1253
 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1112
-#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1552
+#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1553
 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:268
-#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1214
-#: ../../include/cdav.php:158 ../../include/cdav.php:159 ../../include/cdav.php:167
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1189
+#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1209
+#: ../../include/cdav.php:158 ../../include/cdav.php:159
+#: ../../include/cdav.php:167
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1196
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -4358,7 +4316,7 @@ msgstr "Nieznane"
 msgid "Edit Album"
 msgstr "Edytuj album"
 
-#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1362
 msgid "Add Photos"
 msgstr "Dodaj zdjęcia"
 
@@ -4404,7 +4362,7 @@ msgstr "Przenieś zdjęcie do albumu"
 
 #: ../../Zotlabs/Module/Photos.php:1040
 msgid "Enter a new album name"
-msgstr "Wpisz nowÄ… nazwÄ™ albumu"
+msgstr "Wprowadź nową nazwę albumu"
 
 #: ../../Zotlabs/Module/Photos.php:1041
 msgid "or select an existing one (doubleclick)"
@@ -4424,23 +4382,23 @@ msgstr "Oznacz jako \"dla dorosłych\" w widoku albumu"
 
 #: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
 msgid "I like this (toggle)"
-msgstr "Podoba mis sie to (przełącz)"
+msgstr "Pochwalam to (przełącz)"
 
 #: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
 msgid "I don't like this (toggle)"
-msgstr "Nie podoba mi się to (przełącz)"
+msgstr "Nie pochwalam tego (przełącz)"
 
 #: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:503
 #: ../../include/conversation.php:830
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1211
 #: ../../Zotlabs/Lib/ThreadItem.php:824
 msgid "This is you"
 msgstr "To jesteÅ› ty"
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1213
 #: ../../Zotlabs/Lib/ThreadItem.php:826 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr "Komentarz"
@@ -4448,12 +4406,12 @@ msgstr "Komentarz"
 #: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:652
 msgctxt "title"
 msgid "Likes"
-msgstr "Ocen pozytywnych"
+msgstr "Pochwały"
 
 #: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:653
 msgctxt "title"
 msgid "Dislikes"
-msgstr "Ocen negatywnych"
+msgstr "Zganienia"
 
 #: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:77
 #: ../../include/conversation.php:654
@@ -4497,73 +4455,75 @@ msgid "View all"
 msgstr "Pokaż wszystkie"
 
 #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243
-#: ../../include/conversation.php:1752 ../../include/channel.php:1809
+#: ../../include/conversation.php:1744 ../../include/channel.php:1729
 #: ../../include/taxonomy.php:670
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
-msgstr[0] "Ocena pozytywna"
-msgstr[1] "Oceny pozytywne"
-msgstr[2] "Oce pozytywanych"
+msgstr[0] "Pochwała"
+msgstr[1] "Pochwały"
+msgstr[2] "Pochwał"
 
 #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248
-#: ../../include/conversation.php:1755
+#: ../../include/conversation.php:1747
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
-msgstr[0] "Ocena negartwna"
-msgstr[1] "Oceny negatywne"
-msgstr[2] "Ocen negatywnych"
+msgstr[0] "Zganienie"
+msgstr[1] "Zganienia"
+msgstr[2] "Zganień"
 
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1245
 msgid "Photo Tools"
 msgstr "Narzędzia fotograficzne"
 
-#: ../../Zotlabs/Module/Photos.php:1256
+#: ../../Zotlabs/Module/Photos.php:1254
 msgid "In This Photo:"
 msgstr "Na tym zdjęciu:"
 
-#: ../../Zotlabs/Module/Photos.php:1261
+#: ../../Zotlabs/Module/Photos.php:1259
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:491
+#: ../../Zotlabs/Module/Photos.php:1267 ../../Zotlabs/Lib/ThreadItem.php:491
 msgctxt "noun"
 msgid "Likes"
-msgstr "Oceny pozytywne"
+msgstr "Pochwały"
 
-#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:492
+#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:492
 msgctxt "noun"
 msgid "Dislikes"
-msgstr "Oceny negatywne"
+msgstr "Zganienia"
 
-#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Storage/Browser.php:411
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Storage/Browser.php:411
 #: ../../Zotlabs/Lib/ThreadItem.php:497 ../../Zotlabs/Widget/Pinned.php:158
 #: ../../include/acl_selectors.php:156
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:233
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362 ../../include/photos.php:667
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:667
 msgid "Recent Photos"
 msgstr "Najnowsze zdjęcia"
 
-#: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Profile.php:62
+#: ../../Zotlabs/Module/Channel.php:144 ../../Zotlabs/Module/Profile.php:62
 #: ../../Zotlabs/Module/Hcard.php:37
 msgid "Posts and comments"
 msgstr "Wpisy i komentarze"
 
-#: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Profile.php:69
+#: ../../Zotlabs/Module/Channel.php:151 ../../Zotlabs/Module/Profile.php:69
 #: ../../Zotlabs/Module/Hcard.php:44
 msgid "Only posts"
 msgstr "Tylko wpisy"
 
-#: ../../Zotlabs/Module/Channel.php:206
+#: ../../Zotlabs/Module/Channel.php:219
 msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Niewystarczające uprawnienia. Żądanie zostało przekierowane na stronę profilu."
+msgstr ""
+"Niewystarczające uprawnienia. Żądanie zostało przekierowane na stronę "
+"profilu."
 
-#: ../../Zotlabs/Module/Channel.php:221 ../../Zotlabs/Module/Network.php:168
+#: ../../Zotlabs/Module/Channel.php:234 ../../Zotlabs/Module/Network.php:168
 msgid "Search Results For:"
 msgstr "Wyniki wyszukiwania dla:"
 
@@ -4597,7 +4557,8 @@ msgid "What would you like to do?"
 msgstr "Co chciałbyś zrobić?"
 
 #: ../../Zotlabs/Module/Go.php:31
-msgid "Please bookmark this page if you would like to return to it in the future"
+msgid ""
+"Please bookmark this page if you would like to return to it in the future"
 msgstr "Dodaj tę stronę do zakładek, jeśli chcesz wrócić do niej w przyszłości"
 
 #: ../../Zotlabs/Module/Go.php:35
@@ -4633,44 +4594,54 @@ msgid "Visit your channel homepage"
 msgstr "Odwiedź stronę główną swojego kanału"
 
 #: ../../Zotlabs/Module/Go.php:43
-msgid "View your connections and/or add somebody whose address you already know"
+msgid ""
+"View your connections and/or add somebody whose address you already know"
 msgstr "Wyświetl swoje kontakty albo dodaj osobę, której adres już znasz"
 
 #: ../../Zotlabs/Module/Go.php:44
-msgid "View your personal stream (this may be empty until you add some connections)"
+msgid ""
+"View your personal stream (this may be empty until you add some connections)"
 msgstr ""
-"Wyświetl swój osobisty strumień (może być pusty, dopóki nie dodasz niektórych połączeń)"
+"Wyświetl swój osobisty strumień (może być pusty, dopóki nie dodasz "
+"niektórych połączeń)"
 
 #: ../../Zotlabs/Module/Go.php:52
 msgid "View the public stream. Warning: this content is not moderated"
-msgstr "Wyświetl strumień publiczny. Ostrzeżenie: ta zawartość nie jest moderowana"
+msgstr ""
+"Wyświetl strumień publiczny. Ostrzeżenie: ta zawartość nie jest moderowana"
 
-#: ../../Zotlabs/Module/Connections.php:58 ../../Zotlabs/Module/Connections.php:116
+#: ../../Zotlabs/Module/Connections.php:58
+#: ../../Zotlabs/Module/Connections.php:116
 #: ../../Zotlabs/Module/Connections.php:274
 msgid "Active"
 msgstr "Aktywne"
 
-#: ../../Zotlabs/Module/Connections.php:63 ../../Zotlabs/Module/Connections.php:182
+#: ../../Zotlabs/Module/Connections.php:63
+#: ../../Zotlabs/Module/Connections.php:182
 #: ../../Zotlabs/Module/Connections.php:279
 msgid "Blocked"
 msgstr "Zablokowane"
 
-#: ../../Zotlabs/Module/Connections.php:68 ../../Zotlabs/Module/Connections.php:189
+#: ../../Zotlabs/Module/Connections.php:68
+#: ../../Zotlabs/Module/Connections.php:189
 #: ../../Zotlabs/Module/Connections.php:278
 msgid "Ignored"
 msgstr "Ignorowane"
 
-#: ../../Zotlabs/Module/Connections.php:73 ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:73
+#: ../../Zotlabs/Module/Connections.php:203
 #: ../../Zotlabs/Module/Connections.php:277
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: ../../Zotlabs/Module/Connections.php:78 ../../Zotlabs/Module/Connections.php:196
+#: ../../Zotlabs/Module/Connections.php:78
+#: ../../Zotlabs/Module/Connections.php:196
 msgid "Archived/Unreachable"
 msgstr "Zarchiwizowane/NieosiÄ…galne"
 
-#: ../../Zotlabs/Module/Connections.php:83 ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Notifications.php:53 ../../Zotlabs/Module/Menu.php:180
+#: ../../Zotlabs/Module/Connections.php:83
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Notifications.php:101 ../../Zotlabs/Module/Menu.php:180
 msgid "New"
 msgstr "Nowe"
 
@@ -4682,7 +4653,8 @@ msgstr "Aktywne połączenia"
 msgid "Show active connections"
 msgstr "Pokaż aktywne połączenia"
 
-#: ../../Zotlabs/Module/Connections.php:165 ../../Zotlabs/Widget/Notifications.php:104
+#: ../../Zotlabs/Module/Connections.php:165
+#: ../../Zotlabs/Widget/Notifications.php:89
 msgid "New Connections"
 msgstr "Nowe połączenia"
 
@@ -4759,7 +4731,8 @@ msgstr "Połączone"
 msgid "Approve connection"
 msgstr "Zatwierdź połączenie"
 
-#: ../../Zotlabs/Module/Connections.php:343 ../../Zotlabs/Module/Admin/Accounts.php:318
+#: ../../Zotlabs/Module/Connections.php:343
+#: ../../Zotlabs/Module/Admin/Accounts.php:318
 #: ../../include/conversation.php:776
 msgid "Approve"
 msgstr "Zatwierdź"
@@ -4773,9 +4746,9 @@ msgid "Recent activity"
 msgstr "Ostatnia aktywność"
 
 #: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
-#: ../../Zotlabs/Module/Directory.php:370 ../../Zotlabs/Widget/Follow.php:32
-#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1103
-#: ../../include/channel.php:1646 ../../include/connections.php:110
+#: ../../Zotlabs/Module/Directory.php:369 ../../Zotlabs/Widget/Follow.php:32
+#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1098
+#: ../../include/channel.php:1566 ../../include/connections.php:110
 msgid "Connect"
 msgstr "Połączenie"
 
@@ -4796,8 +4769,9 @@ msgstr "Wyszukaj swoje połączenia"
 msgid "Connections search"
 msgstr "Wyszukiwanie połączeń"
 
-#: ../../Zotlabs/Module/Connections.php:382 ../../Zotlabs/Module/Directory.php:433
-#: ../../Zotlabs/Module/Directory.php:438 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Connections.php:382
+#: ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr "Znajdź"
 
@@ -4819,31 +4793,31 @@ msgstr "Wybierz znacznik do usunięcia: "
 
 #: ../../Zotlabs/Module/Affinity.php:35
 msgid "Affinity Tool settings updated."
-msgstr "Zaktualizowano ustawienia narzędzia koligacji."
+msgstr "Zaktualizowano ustawienia narzędzia więzi."
 
 #: ../../Zotlabs/Module/Affinity.php:47
 msgid ""
-"This app presents a slider control in your connection editor and also on your network "
-"page. The slider represents your degree of friendship (affinity) with each connection. "
-"It allows you to zoom in or out and display conversations from only your closest "
-"friends or everybody in your stream."
+"This app presents a slider control in your connection editor and also on "
+"your network page. The slider represents your degree of friendship "
+"(affinity) with each connection. It allows you to zoom in or out and display "
+"conversations from only your closest friends or everybody in your stream."
 msgstr ""
-"Ta aplikacja przedstawia suwak w edytorze połączeń, a także na stronie internetowej. "
-"Suwak przedstawia stopień przyjaźni (koligacji) z każdym połączeniem. Umożliwia "
-"powiększanie i pomniejszanie oraz wyświetlanie rozmów tylko od najbliższych znajomych "
-"lub wszystkich w strumieniu."
+"Ta aplikacja przedstawia suwak w edytorze połączeń, a także na stronie "
+"internetowej. Suwak przedstawia stopień przyjaźni (więzi) z każdym "
+"połączeniem. Umożliwia powiększanie i pomniejszanie oraz wyświetlanie rozmów "
+"tylko od najbliższych znajomych lub wszystkich w strumieniu."
 
 #: ../../Zotlabs/Module/Affinity.php:52
 msgid "Affinity Tool App"
-msgstr "Aplikacja Narzędzie koligacji"
+msgstr "Aplikacja Narzędzie więzi"
 
 #: ../../Zotlabs/Module/Affinity.php:57
 msgid ""
-"The numbers below represent the minimum and maximum slider default positions for your "
-"network/stream page as a percentage."
+"The numbers below represent the minimum and maximum slider default positions "
+"for your network/stream page as a percentage."
 msgstr ""
-"Poniższe liczby przedstawiają minimalne i maksymalne domyślne pozycje suwaków na "
-"stronie sieci/strumienia w procentach."
+"Poniższe liczby przedstawiają minimalne i maksymalne domyślne pozycje "
+"suwaków na stronie sieci/strumienia w procentach."
 
 #: ../../Zotlabs/Module/Affinity.php:64
 msgid "Default maximum affinity level"
@@ -4866,10 +4840,11 @@ msgid "Persistent affinity levels"
 msgstr "Trwałe poziomy więzi"
 
 #: ../../Zotlabs/Module/Affinity.php:76
-msgid "If disabled the max and min levels will be reset to default after page reload"
+msgid ""
+"If disabled the max and min levels will be reset to default after page reload"
 msgstr ""
-"Jeśli wyłączone, maksymalne i minimalne poziomy zostaną zresetowane do wartości "
-"domyślnych po ponownym załadowaniu strony"
+"Jeśli wyłączone, maksymalne i minimalne poziomy zostaną zresetowane do "
+"wartości domyślnych po ponownym załadowaniu strony"
 
 #: ../../Zotlabs/Module/Affinity.php:84
 msgid "Affinity Tool Settings"
@@ -4887,7 +4862,7 @@ msgstr "Brak popularnych połączeń."
 msgid "View Common Connections"
 msgstr "Wyświetl popularne połączenia"
 
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186
+#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2182
 #, php-format
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr "&#x1f501; Powtórzony %2$s %1$s"
@@ -4908,25 +4883,26 @@ msgstr "Edytuj stronÄ™ internetowÄ…"
 msgid "vcard"
 msgstr "vcard"
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Article_edit.php:127
 msgid "Edit Article"
 msgstr "Edytuj artykuł"
 
 #: ../../Zotlabs/Module/Rmagic.php:46
 msgid "Authentication failed."
-msgstr "Uwierzytelnianie nie powiodło się."
+msgstr "Uwierzytelnienie nie powiodło się."
 
-#: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2625 ../../boot.php:1717
+#: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2545
+#: ../../boot.php:1721
 msgid "Remote Authentication"
-msgstr "Zdalne uwierzytelnianie"
+msgstr "Zdalne uwierzytelnienie"
 
-#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2626
+#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2546
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Wpisz adres swojego kanału (np. kanał@example.com)"
 
-#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2627
+#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2547
 msgid "Authenticate"
-msgstr "Uwierzytelnianie"
+msgstr "Uwierzytelnienie"
 
 #: ../../Zotlabs/Module/Attach.php:68
 msgid "Item not available."
@@ -4934,7 +4910,8 @@ msgstr "Element nie jest dostępny."
 
 #: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
 msgid "This setting requires special processing and editing has been blocked."
-msgstr "To ustawienie wymaga specjalnego przetwarzania, a edycja została zablokowana."
+msgstr ""
+"To ustawienie wymaga specjalnego przetwarzania, a edycja została zablokowana."
 
 #: ../../Zotlabs/Module/Pconfig.php:57
 msgid "Configuration Editor"
@@ -4942,13 +4919,13 @@ msgstr "Edytor konfiguracji"
 
 #: ../../Zotlabs/Module/Pconfig.php:58
 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."
+"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 ""
-"Ostrzeżenie: zmiana niektórych ustawień może spowodować, że Twój kanał przestanie "
-"działać. Opuść tę stronę, chyba że czujesz się kompetentnie i wiesz, jak prawidłowo "
-"korzystać z tej funkcji."
+"Ostrzeżenie: zmiana niektórych ustawień może spowodować, że Twój kanał "
+"przestanie działać. Opuść tę stronę, chyba że czujesz się kompetentnie i "
+"wiesz, jak prawidłowo korzystać z tej funkcji."
 
 #: ../../Zotlabs/Module/Randprof.php:29
 msgid "Random Channel App"
@@ -4966,11 +4943,13 @@ msgstr "Zaktualizowano ustawienia motywu."
 msgid "No themes found."
 msgstr "Nie znaleziono motywów."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95 ../../Zotlabs/Module/Admin/Addons.php:311
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Zotlabs/Module/Admin/Addons.php:311
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:97 ../../Zotlabs/Module/Admin/Addons.php:314
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Zotlabs/Module/Admin/Addons.php:314
 msgid "Enable"
 msgstr "WÅ‚Ä…cz"
 
@@ -4978,26 +4957,30 @@ msgstr "WÅ‚Ä…cz"
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123 ../../Zotlabs/Module/Admin/Themes.php:157
-#: ../../Zotlabs/Widget/Admin.php:28
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
 msgid "Themes"
 msgstr "Motywy"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:124 ../../Zotlabs/Module/Admin/Addons.php:344
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Zotlabs/Module/Admin/Addons.php:344
 msgid "Toggle"
 msgstr "Przełącz"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Module/Admin/Addons.php:345
-#: ../../Zotlabs/Lib/Apps.php:339 ../../Zotlabs/Widget/Settings_menu.php:61
+#: ../../Zotlabs/Module/Admin/Themes.php:125
+#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339
+#: ../../Zotlabs/Widget/Settings_menu.php:61
 #: ../../Zotlabs/Widget/Newmember.php:53 ../../include/nav.php:106
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:134 ../../Zotlabs/Module/Admin/Addons.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Zotlabs/Module/Admin/Addons.php:352
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../Zotlabs/Module/Admin/Themes.php:135 ../../Zotlabs/Module/Admin/Addons.php:353
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Zotlabs/Module/Admin/Addons.php:353
 msgid "Maintainer: "
 msgstr "Opiekun: "
 
@@ -5011,33 +4994,35 @@ msgstr "[Nieobsługiwane]"
 
 #: ../../Zotlabs/Module/Admin/Security.php:89
 msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
 msgstr ""
-"Domyślnie,  w osadzonych mediach jest dozwolony niefiltrowany HTML. Jest to z natury "
-"niebezpieczne."
+"Domyślnie,  w osadzonych mediach jest dozwolony niefiltrowany HTML. Jest to "
+"z natury niebezpieczne."
 
 #: ../../Zotlabs/Module/Admin/Security.php:92
 msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following sites:"
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
 msgstr ""
-"Zalecane ustawienie to zezwalanie na niefiltrowany kodu HTML tylko z następujących "
-"portali:"
+"Zalecane ustawienie to zezwalanie na niefiltrowany kodu HTML tylko z "
+"następujących portali:"
 
 #: ../../Zotlabs/Module/Admin/Security.php:93
 msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://"
-"vimeo.com/<br />https://soundcloud.com/<br />"
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 msgstr ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://"
-"vimeo.com/<br />https://soundcloud.com/<br />"
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 
 #: ../../Zotlabs/Module/Admin/Security.php:94
 msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> embedded content "
-"from that site is explicitly blocked."
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
 msgstr ""
-"Wszystkie inne osadzone treści będą filtrowane, <strong>chyba że</strong> osadzone "
-"treści z tego portalu są jawnie zablokowane."
+"Wszystkie inne osadzone treści będą filtrowane, <strong>chyba że</strong> "
+"osadzone treści z tego portalu są jawnie zablokowane."
 
 #: ../../Zotlabs/Module/Admin/Security.php:99 ../../Zotlabs/Widget/Admin.php:25
 msgid "Security"
@@ -5049,25 +5034,28 @@ msgstr "Zablokuj publiczny dostęp"
 
 #: ../../Zotlabs/Module/Admin/Security.php:101
 msgid ""
-"Check to block public access to all otherwise public personal pages on this site "
-"unless you are currently authenticated."
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
 msgstr ""
-"Zaznacz, aby zablokować publiczny dostęp do wszystkich innych publicznych stron "
-"osobistych na tym portalu, chyba że jesteś obecnie uwierzytelniony."
+"Zaznacz, aby zablokować publiczny dostęp do wszystkich innych publicznych "
+"stron osobistych na tym portalu, chyba że jesteś obecnie uwierzytelniony."
 
 #: ../../Zotlabs/Module/Admin/Security.php:102
 msgid "Provide a cloud root directory"
 msgstr "Podaj katalog główny w chmurze"
 
 #: ../../Zotlabs/Module/Admin/Security.php:102
-msgid "The cloud root directory lists all channel names which provide public files"
+msgid ""
+"The cloud root directory lists all channel names which provide public files"
 msgstr ""
-"Katalog główny w chmurze zawiera listę wszystkich nazw kanałów, które udostępniają "
-"pliki publiczne"
+"Katalog główny w chmurze zawiera listę wszystkich nazw kanałów, które "
+"udostępniają pliki publiczne"
 
 #: ../../Zotlabs/Module/Admin/Security.php:103
 msgid "Show total disk space available to cloud uploads"
-msgstr "Pokaż całkowitą powierzchnię dyskową dostępną dla przesyłania plików do chmury"
+msgstr ""
+"Pokaż całkowitą powierzchnię dyskową dostępną dla przesyłania plików do "
+"chmury"
 
 #: ../../Zotlabs/Module/Admin/Security.php:104
 msgid "Set \"Transport Security\" HTTP header"
@@ -5083,12 +5071,13 @@ msgstr "Dozwolone domeny e-mail"
 
 #: ../../Zotlabs/Module/Admin/Security.php:106
 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"
+"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 ""
-"Rozdzielana przecinkami lista domen, które są dozwolone w adresach e-mail podczas "
-"rejestracji w tym portalu. Akceptowane sÄ… symbole wieloznaczne. Puste pole oznacza "
-"zezwolenie na dowolne domeny"
+"Rozdzielana przecinkami lista domen, które są dozwolone w adresach e-mail "
+"podczas rejestracji w tym portalu. Akceptowane sÄ… symbole wieloznaczne. "
+"Puste pole oznacza zezwolenie na dowolne domeny"
 
 #: ../../Zotlabs/Module/Admin/Security.php:107
 msgid "Not allowed email domains"
@@ -5097,23 +5086,25 @@ msgstr "Niedozwolone domeny e-mail"
 #: ../../Zotlabs/Module/Admin/Security.php:107
 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."
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
 msgstr ""
-"Rozdzielana przecinkami lista domen, które nie są dozwolone w adresach e-mail podczas "
-"rejestracji w tym portalu. Akceptowane sÄ… symbole wieloznaczne. Puste pole oznacza "
-"zezwolenie na wszystkie domeny, chyba że zostały uprzednio zdefiniowane jakieś "
-"dozwolone domeny."
+"Rozdzielana przecinkami lista domen, które nie są dozwolone w adresach e-"
+"mail podczas rejestracji w tym portalu. Akceptowane sÄ… symbole wieloznaczne. "
+"Puste pole oznacza zezwolenie na wszystkie domeny, chyba że zostały "
+"uprzednio zdefiniowane jakieÅ› dozwolone domeny."
 
 #: ../../Zotlabs/Module/Admin/Security.php:108
 msgid "Allow communications only from these sites"
 msgstr "Zezwalaj na komunikacjÄ™ tylko z tych portali"
 
 #: ../../Zotlabs/Module/Admin/Security.php:108
-msgid "One site per line. Leave empty to allow communication from anywhere by default"
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
 msgstr ""
-"Jeden portal w każdym wierszu. Pozostaw puste, aby domyślnie zezwolić na komunikację z "
-"każdym portalem"
+"Jeden portal w każdym wierszu. Pozostaw puste, aby domyślnie zezwolić na "
+"komunikację z każdym portalem"
 
 #: ../../Zotlabs/Module/Admin/Security.php:109
 msgid "Block communications from these sites"
@@ -5124,9 +5115,11 @@ msgid "Allow communications only from these channels"
 msgstr "Zezwalaj na komunikację tylko z tych kanałów"
 
 #: ../../Zotlabs/Module/Admin/Security.php:110
-msgid "One channel (hash) per line. Leave empty to allow from any channel by default"
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
-"Jeden kanał (hasz) na linię. Pozostaw puste, aby domyślnie zezwolić na dowolny kanał"
+"Jeden kanał (hasz) na linię. Pozostaw puste, aby domyślnie zezwolić na "
+"dowolny kanał"
 
 #: ../../Zotlabs/Module/Admin/Security.php:111
 msgid "Block communications from these channels"
@@ -5158,7 +5151,7 @@ msgstr "OSTRZEŻENIE: obrazy SVG mogą zawierać złośliwy kod."
 
 #: ../../Zotlabs/Module/Admin/Security.php:116
 msgid "Allow embedded (inline) PDF files"
-msgstr "Zezwalaj na osadzone (w treści) pliki PDF"
+msgstr "Zezwalaj na osadzone pliki PDF (w treści)"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:128
 #, php-format
@@ -5180,7 +5173,7 @@ msgstr[2] "%s kont zostało usuniętych"
 msgid "Account not found"
 msgstr "Konto nie znalezione"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2785
+#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2705
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "Usunięto konto '%s'"
@@ -5282,30 +5275,34 @@ msgstr "Klasa usługi"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:337
 msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
-"Wybrane konta zostaną usunięte!\\n\\nWszystko, co z tych kont zostało opublikowane na "
-"tym portalu, zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
+"Wybrane konta zostaną usunięte!\\n\\nWszystko, co z tych kont zostało "
+"opublikowane na tym portalu, zostanie bezpowrotnie usunięte!\\n\\nCzy na "
+"pewno usunąć?"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:338
 msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on this site "
-"will be permanently deleted!\\n\\nAre you sure?"
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
-"Konto {0} zostanie usuniete!\\n\\nWszystko co opublikowano z tego konta na tym portalu "
-"zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
+"Konto {0} zostanie usuniete!\\n\\nWszystko co opublikowano z tego konta na "
+"tym portalu zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:347 ../../include/conversation.php:1123
+#: ../../Zotlabs/Module/Admin/Accounts.php:347
+#: ../../include/conversation.php:1118
 msgid "Message"
 msgstr "Wiadowmość"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55 ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
 #: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
 msgid "Off"
 msgstr "WY�"
 
-#: ../../Zotlabs/Module/Admin/Features.php:55 ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
 #: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
 msgid "On"
 msgstr "W�"
@@ -5347,7 +5344,8 @@ msgstr "Pusta kolejka dla tego portalu"
 msgid "Last known contact"
 msgstr "Ostatni znany kontakt"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19 ../../Zotlabs/Module/Admin/Dbsync.php:59
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
 msgid "Update has been marked successful"
 msgstr "Aktualizacja została oznaczona jako pomyślna"
 
@@ -5355,9 +5353,11 @@ msgstr "Aktualizacja została oznaczona jako pomyślna"
 #, php-format
 msgid "Verification of update %s failed. Check system logs."
 msgstr ""
-"Weryfikacja aktualizacji %s nie zakończyła się pomyślnie. Sprawdź dzienniki systemowe."
+"Weryfikacja aktualizacji %s nie zakończyła się pomyślnie. Sprawdź dzienniki "
+"systemowe."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:35 ../../Zotlabs/Module/Admin/Dbsync.php:74
+#: ../../Zotlabs/Module/Admin/Dbsync.php:35
+#: ../../Zotlabs/Module/Admin/Dbsync.php:74
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizacja %s została pomyślnie zastosowana."
@@ -5365,14 +5365,16 @@ msgstr "Aktualizacja %s została pomyślnie zastosowana."
 #: ../../Zotlabs/Module/Admin/Dbsync.php:39
 #, php-format
 msgid "Verifying update %s did not return a status. Unknown if it succeeded."
-msgstr "Weryfikacja aktualizacji %s nie zwróciła stanu. Nie wiadomo, czy się udało."
+msgstr ""
+"Weryfikacja aktualizacji %s nie zwróciła stanu. Nie wiadomo, czy się udało."
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:42
 #, php-format
 msgid "Update %s does not contain a verification function."
 msgstr "Aktualizacja %s nie zawiera funkcji weryfikacji."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:46 ../../Zotlabs/Module/Admin/Dbsync.php:81
+#: ../../Zotlabs/Module/Admin/Dbsync.php:46
+#: ../../Zotlabs/Module/Admin/Dbsync.php:81
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Nie można znaleźć funkcji aktualizacji %s."
@@ -5381,11 +5383,14 @@ msgstr "Nie można znaleźć funkcji aktualizacji %s."
 #, php-format
 msgid "Executing update procedure %s failed. Check system logs."
 msgstr ""
-"Wykonanie procedury aktualizacji %s nie powiodło się. Sprawdź dzienniki systemowe."
+"Wykonanie procedury aktualizacji %s nie powiodło się. Sprawdź dzienniki "
+"systemowe."
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:78
 #, php-format
-msgid "Update %s did not return a status. It cannot be determined if it was successful."
+msgid ""
+"Update %s did not return a status. It cannot be determined if it was "
+"successful."
 msgstr "Aktualizacja %s nie zwróciła stanu. Nie można ustalić, czy się udało."
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:99
@@ -5398,7 +5403,8 @@ msgstr "Oznacz sukces (jeśli aktualizacja została wykonana ręcznie)"
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:102
 msgid "Attempt to verify this update if a verification procedure exists"
-msgstr "Spróbuj zweryfikować tą aktualizację, jeśli istnieje procedura weryfikacji"
+msgstr ""
+"Spróbuj zweryfikować tą aktualizację, jeśli istnieje procedura weryfikacji"
 
 #: ../../Zotlabs/Module/Admin/Dbsync.php:103
 msgid "Attempt to execute this update step automatically"
@@ -5465,11 +5471,13 @@ msgstr "Niedozwolony kod kanału '%s'"
 msgid "select all"
 msgstr "wybierz wszystkie"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150 ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Censor"
 msgstr "Cenzoruj"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151 ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Uncensor"
 msgstr "Usuń cenzurę"
 
@@ -5491,19 +5499,19 @@ msgstr "UID"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:162
 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?"
+"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 ""
-"Wybrane kanały zostaną usunięte!\\n\\nWszystko co zostało w nich opublikowane będzie "
-"bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
+"Wybrane kanały zostaną usunięte!\\n\\nWszystko co zostało w nich "
+"opublikowane będzie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:163
 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?"
+"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 ""
-"Kanał {0} zostanie usunięty!\\n\\nWszystko co opublikowano na tym kanale będzie "
-"bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
+"Kanał {0} zostanie usunięty!\\n\\nWszystko co opublikowano na tym kanale "
+"będzie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?"
 
 #: ../../Zotlabs/Module/Admin/Logs.php:28
 msgid "Log settings updated."
@@ -5527,10 +5535,12 @@ msgid "Log file"
 msgstr "Plik dziennika"
 
 #: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Must be writable by web server. Relative to your top-level webserver directory."
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
 msgstr ""
-"Musi mieć możliwość zapisu przez serwer WWW. Ścieżka względna do katalogu głównego "
-"serwera WWW."
+"Musi mieć możliwość zapisu przez serwer WWW. Ścieżka względna do katalogu "
+"głównego serwera WWW."
 
 #: ../../Zotlabs/Module/Admin/Logs.php:93
 msgid "Log level"
@@ -5575,8 +5585,8 @@ msgstr "Wtyczka %s jest wyłączona."
 msgid "Plugin %s enabled."
 msgstr "Wtyczka %s jest włączona."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:343 ../../Zotlabs/Module/Admin/Addons.php:441
-#: ../../Zotlabs/Widget/Admin.php:27
+#: ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Zotlabs/Module/Admin/Addons.php:441 ../../Zotlabs/Widget/Admin.php:27
 msgid "Addons"
 msgstr "Dodatki"
 
@@ -5600,7 +5610,8 @@ msgstr "Kompatybilne role serwera: "
 msgid "Requires: "
 msgstr "Wymagania: "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:359 ../../Zotlabs/Module/Admin/Addons.php:446
+#: ../../Zotlabs/Module/Admin/Addons.php:359
+#: ../../Zotlabs/Module/Admin/Addons.php:446
 msgid "Disabled - version incompatibility"
 msgstr "Wyłączone - niezgodność wersji"
 
@@ -5660,7 +5671,7 @@ msgstr "Błędy"
 msgid "Site settings updated."
 msgstr "Zaktualizowano ustawienia portalu."
 
-#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3395
+#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3356
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:335
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:359
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:435
@@ -5669,7 +5680,8 @@ msgstr "Zaktualizowano ustawienia portalu."
 msgid "Default"
 msgstr "Domyślnie"
 
-#: ../../Zotlabs/Module/Admin/Site.php:262 ../../Zotlabs/Module/Settings/Display.php:118
+#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Settings/Display.php:118
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (niekompatybilne)"
@@ -5700,19 +5712,22 @@ msgstr "Mój portal ma tylko płatny dostęp"
 
 #: ../../Zotlabs/Module/Admin/Site.php:330
 msgid "My site has free access only"
-msgstr "Mój porta ma tylko bezpłatny dostęp"
+msgstr "Mój portal ma tylko bezpłatny dostęp"
 
 #: ../../Zotlabs/Module/Admin/Site.php:331
 msgid "My site offers free accounts with optional paid upgrades"
-msgstr "Mój portal oferuje darmowe konta z opcjonalnymi płatnymi rozszerzeniami"
+msgstr ""
+"Mój portal oferuje darmowe konta z opcjonalnymi płatnymi rozszerzeniami"
 
 #: ../../Zotlabs/Module/Admin/Site.php:345
 msgid "Default permission role for new accounts"
 msgstr "Domyślna rola uprawnień dla nowych kont"
 
 #: ../../Zotlabs/Module/Admin/Site.php:345
-msgid "This role will be used for the first channel created after registration."
-msgstr "Ta rola będzie używana dla pierwszego kanału utworzonego po rejestracji."
+msgid ""
+"This role will be used for the first channel created after registration."
+msgstr ""
+"Ta rola będzie używana dla pierwszego kanału utworzonego po rejestracji."
 
 #: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
 msgid "Minute(s)"
@@ -5746,8 +5761,8 @@ msgstr "Zarejestruj opóźnioną weryfikację"
 msgid "Time to wait before a registration can be verified"
 msgstr "Czas oczekiwania na weryfikacjÄ™ rejestracji"
 
-#: ../../Zotlabs/Module/Admin/Site.php:372 ../../Zotlabs/Module/Admin/Site.php:394
-#: ../../Zotlabs/Module/Invite.php:409
+#: ../../Zotlabs/Module/Admin/Site.php:372
+#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
 msgid "duration up from now"
 msgstr "czas oczekiwania od teraz"
 
@@ -5763,7 +5778,8 @@ msgstr "Czas do wygaśnięcia niezweryfikowanej rejestracji"
 msgid "Site"
 msgstr "Portal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:413 ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:413
+#: ../../Zotlabs/Module/Register.php:520
 msgid "Registration"
 msgstr "Rejestracja"
 
@@ -5799,11 +5815,11 @@ msgstr "Informacje o administratorze"
 
 #: ../../Zotlabs/Module/Admin/Site.php:423
 msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  BBCode can "
-"be used here"
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
-"Informacje kontaktowe o administratorach portalu. Wyświetlane na stronie informacji o "
-"portalu. Tutaj można użyć BBCode"
+"Informacje kontaktowe o administratorach portalu. Wyświetlane na stronie "
+"informacji o portalu. Tutaj można użyć BBCode"
 
 #: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
 msgid "Site Information"
@@ -5811,11 +5827,11 @@ msgstr "Informacje o portalu"
 
 #: ../../Zotlabs/Module/Admin/Site.php:424
 msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be "
-"used here"
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
-"Publicznie widoczny opis tego portalu. Wyświetlane na stronie informacji o portalu. "
-"Tutaj można użyć BBCode"
+"Publicznie widoczny opis tego portalu. Wyświetlane na stronie informacji o "
+"portalu. Tutaj można użyć BBCode"
 
 #: ../../Zotlabs/Module/Admin/Site.php:425
 msgid "System language"
@@ -5830,8 +5846,8 @@ msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
-"Domyślny motyw systemu - może zostać zastąpiony w profilu użytkownika w opcji - <a "
-"href='#' id='cnftheme'>zmień ustawienia motywu</a>"
+"Domyślny motyw systemu - może zostać zastąpiony w profilu użytkownika w "
+"opcji - <a href='#' id='cnftheme'>zmień ustawienia motywu</a>"
 
 #: ../../Zotlabs/Module/Admin/Site.php:429
 msgid "Allow Feeds as Connections"
@@ -5846,10 +5862,12 @@ msgid "Maximum image size"
 msgstr "Maksymalny rozmiar obrazu"
 
 #: ../../Zotlabs/Module/Admin/Site.php:430
-msgid "Maximum size in bytes of uploaded images. Default is 0, which means no limits."
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
-"Maksymalny rozmiar przesyłanych obrazów w bajtach. Wartość domyślna to 0, co oznacza "
-"brak ograniczeń."
+"Maksymalny rozmiar przesyłanych obrazów w bajtach. Wartość domyślna to 0, co "
+"oznacza brak ograniczeń."
 
 #: ../../Zotlabs/Module/Admin/Site.php:431
 msgid "Minimum age"
@@ -5857,17 +5875,19 @@ msgstr "Minimalny wiek"
 
 #: ../../Zotlabs/Module/Admin/Site.php:431
 msgid "Minimum age (in years) for who may register on this site."
-msgstr "Minimalny wiek (w latach) dla osób, które mogą zarejestrować się na tym portalu."
+msgstr ""
+"Minimalny wiek (w latach) dla osób, które mogą zarejestrować się na tym "
+"portalu."
 
 #: ../../Zotlabs/Module/Admin/Site.php:432
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
-"Które z poniższych stwierdzeń najlepiej opisuje rodzaje kont oferowanych przez ten "
-"portal?"
+"Które z poniższych stwierdzeń najlepiej opisuje rodzaje kont oferowanych "
+"przez ten portal?"
 
 #: ../../Zotlabs/Module/Admin/Site.php:432
 msgid "This is displayed on the public server site list."
-msgstr "Jest to wyświetlane na liście witryn publicznych serwerów."
+msgstr "Jest to wyświetlane na liście portali publicznych serwerów."
 
 #: ../../Zotlabs/Module/Admin/Site.php:438
 msgid "Register text"
@@ -5879,7 +5899,7 @@ msgstr "Ten tekst będzie widoczny w widocznym miejscu na stronie rejestracji"
 
 #: ../../Zotlabs/Module/Admin/Site.php:444
 msgid "Does this site allow new member registration?"
-msgstr "Czy ta witryna umożliwia rejestrację nowych członków?"
+msgstr "Czy ten portal umożliwia rejestrację nowych członków?"
 
 #: ../../Zotlabs/Module/Admin/Site.php:451
 msgid "Configure the registration open days/hours"
@@ -5888,36 +5908,39 @@ msgstr "Skonfiguruj dni i godziny otwarte rejestracji"
 #: ../../Zotlabs/Module/Admin/Site.php:453
 msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
 msgstr ""
-"Wartość pusta lub '-:-' sprawi, że rejestracja będzie otwarta 24 godziny na dobę i 7 "
-"dni w tygodniu (domyślne ustawienie)"
+"Wartość pusta lub '-:-' sprawi, że rejestracja będzie otwarta 24 godziny na "
+"dobę i 7 dni w tygodniu (domyślne ustawienie)"
 
 #: ../../Zotlabs/Module/Admin/Site.php:454
 msgid ""
-"Weekdays and hours must be separated by colon ':', From-To ranges with a dash `-` "
-"example: 1:800-1200"
+"Weekdays and hours must be separated by colon ':', From-To ranges with a "
+"dash `-` example: 1:800-1200"
 msgstr ""
-"Dni tygodnia i godziny należy rozdzielić dwukropkiem ':', zakresy od-do myślnikiem "
-"'-'. Przykład: 1:800-1200"
+"Dni tygodnia i godziny należy rozdzielić dwukropkiem ':', zakresy od-do "
+"myślnikiem '-'. Przykład: 1:800-1200"
 
 #: ../../Zotlabs/Module/Admin/Site.php:455
-msgid "Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 2:900-1700"
-msgstr ""
-"Pary 'dzień tygodnia:godzina' muszą być rozdzielone spacją. Przykład: 1:900-1700 "
+msgid ""
+"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
 "2:900-1700"
+msgstr ""
+"Pary 'dzień tygodnia:godzina' muszą być rozdzielone spacją. Przykład: "
+"1:900-1700 2:900-1700"
 
 #: ../../Zotlabs/Module/Admin/Site.php:456
 msgid ""
-"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 or "
-"1-2,4-5:900-1700"
+"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
+"or 1-2,4-5:900-1700"
 msgstr ""
-"Zakresy 'od-do' muszą być rozdzielone przecinkiem. Przykład: 1:800-1200,1300-1700 lub "
-"1-2,4-5:900-1700"
+"Zakresy 'od-do' muszą być rozdzielone przecinkiem. Przykład: "
+"1:800-1200,1300-1700 lub 1-2,4-5:900-1700"
 
 #: ../../Zotlabs/Module/Admin/Site.php:457
 msgid "Advanced examples:"
 msgstr "Zaawansowane przykłady:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457 ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Zotlabs/Module/Admin/Site.php:457
+#: ../../Zotlabs/Module/Settings/Channel.php:420
 msgid "or"
 msgstr "lub"
 
@@ -5947,11 +5970,11 @@ msgstr "Automatyczne tworzenie kanałów"
 
 #: ../../Zotlabs/Module/Admin/Site.php:478
 msgid ""
-"If disabled the channel will be created in a separate step during the registration "
-"process"
+"If disabled the channel will be created in a separate step during the "
+"registration process"
 msgstr ""
-"Jeśli opcja jest wyłączona, kanał zostanie utworzony w osobnym kroku podczas procesu "
-"rejestracji"
+"Jeśli opcja jest wyłączona, kanał zostanie utworzony w osobnym kroku podczas "
+"procesu rejestracji"
 
 #: ../../Zotlabs/Module/Admin/Site.php:482
 msgid "Require invite code"
@@ -5975,25 +5998,26 @@ msgstr "Konto porzucone po x dniach"
 
 #: ../../Zotlabs/Module/Admin/Site.php:500
 msgid ""
-"Will not waste system resources polling external sites for abandonded accounts. Enter "
-"0 for no time limit."
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
-"Nie marnuje zasobów systemowych na odpytywanie zewnętrznych witryn w poszukiwaniu "
-"porzuconych kont. Wpisz 0, aby nie mieć limitu czasu."
+"Nie marnuje zasobów systemowych na odpytywanie zewnętrznych portali w "
+"poszukiwaniu porzuconych kont. Wpisz 0, aby nie mieć limitu czasu."
 
 #: ../../Zotlabs/Module/Admin/Site.php:505
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
-"Strona główna portalu do wyświetlania odwiedzającym (domyślnie: formularz logowania)"
+"Strona główna portalu do wyświetlania odwiedzającym (domyślnie: formularz "
+"logowania)"
 
 #: ../../Zotlabs/Module/Admin/Site.php:505
 msgid ""
-"example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage "
-"called 'home' or 'include:home.html' to include a file."
+"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
-"przykład: 'pubstream', aby pokazać strumień publiczny, 'page/sys/home', aby wyświetlić "
-"systemową stronę internetową o nazwie 'home' lub 'include: home.html', aby dołączyć "
-"plik."
+"przykład: 'pubstream', aby pokazać strumień publiczny, 'page/sys/home', aby "
+"wyświetlić systemową stronę internetową o nazwie 'home' lub 'include: home."
+"html', aby dołączyć plik."
 
 #: ../../Zotlabs/Module/Admin/Site.php:506
 msgid "Preserve site homepage URL"
@@ -6001,7 +6025,8 @@ msgstr "Zachowaj adres URL strony głównej portalu"
 
 #: ../../Zotlabs/Module/Admin/Site.php:506
 msgid ""
-"Present the site homepage in a frame at the original location instead of redirecting"
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
 msgstr ""
 "Przedstaw stronę główną portalu w ramce w oryginalnej lokalizacji zamiast "
 "przekierowywania"
@@ -6012,21 +6037,23 @@ msgstr "Dozwolone domeny znajomych"
 
 #: ../../Zotlabs/Module/Admin/Site.php:507
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships with this "
-"site. Wildcards are accepted. Empty to allow any domains"
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
-"Rozdzielana przecinkami lista domen, które mogą zawierać przyjaźnie z tą witryną. "
-"Akceptowane sÄ… symbole wieloznaczne. Puste oznacza zezwolenie na dowolne domeny"
+"Rozdzielana przecinkami lista domen, które mogą zawierać przyjaźnie z tym "
+"portalem. Akceptowane sÄ… symbole wieloznaczne. Puste oznacza zezwolenie na "
+"dowolne domeny"
 
 #: ../../Zotlabs/Module/Admin/Site.php:508
 msgid "Force publish"
 msgstr "WymuÅ› publikacjÄ™"
 
 #: ../../Zotlabs/Module/Admin/Site.php:508
-msgid "Check to force all profiles on this site to be listed in the site directory."
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
-"Zaznacz, aby wymusić opublikowanie w katalogu wszystkich profili założonych na tym "
-"portalu."
+"Zaznacz, aby wymusić opublikowanie w katalogu wszystkich profili założonych "
+"na tym portalu."
 
 #: ../../Zotlabs/Module/Admin/Site.php:509
 msgid "Import Public Streams"
@@ -6034,11 +6061,11 @@ msgstr "Importuj strumienie publiczne"
 
 #: ../../Zotlabs/Module/Admin/Site.php:509
 msgid ""
-"Import and allow access to public content pulled from other sites. Warning: this "
-"content is unmoderated."
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
 msgstr ""
-"Importuj i zezwalaj na dostęp do treści publicznych pobranych z innych portali. "
-"Ostrzeżenie: ta zawartość jest niemoderowana."
+"Importuj i zezwalaj na dostęp do treści publicznych pobranych z innych "
+"portali. Ostrzeżenie: ta zawartość jest niemoderowana."
 
 #: ../../Zotlabs/Module/Admin/Site.php:510
 msgid "Site only Public Streams"
@@ -6046,11 +6073,11 @@ msgstr "Strumień publiczny tylko z tego portalu"
 
 #: ../../Zotlabs/Module/Admin/Site.php:510
 msgid ""
-"Allow access to public content originating only from this site if Imported Public "
-"Streams are disabled."
+"Allow access to public content originating only from this site if Imported "
+"Public Streams are disabled."
 msgstr ""
-"Zezwalaj na dostęp do treści publicznych pochodzących tylko z tego portalu, jeśli "
-"importowane strumienie publiczne są wyłączone."
+"Zezwalaj na dostęp do treści publicznych pochodzących tylko z tego portalu, "
+"jeśli importowane strumienie publiczne są wyłączone."
 
 #: ../../Zotlabs/Module/Admin/Site.php:511
 msgid "Allow anybody on the internet to access the Public streams"
@@ -6058,10 +6085,11 @@ msgstr "Zezwól każdemu w Internecie na dostęp do strumienia publicznego"
 
 #: ../../Zotlabs/Module/Admin/Site.php:511
 msgid ""
-"Disable to require authentication before viewing. Warning: this content is unmoderated."
+"Disable to require authentication before viewing. Warning: this content is "
+"unmoderated."
 msgstr ""
-"Wyłącz, aby wymagać uwierzytelnienia przed przeglądaniem. Ostrzeżenie: ta zawartość "
-"jest niemoderowana."
+"Wyłącz, aby wymagać uwierzytelnienia przed przeglądaniem. Ostrzeżenie: ta "
+"zawartość jest niemoderowana."
 
 #: ../../Zotlabs/Module/Admin/Site.php:512
 msgid "Only import Public stream posts with this text"
@@ -6077,8 +6105,8 @@ msgstr "Zaloguj się na stronie głównej"
 
 #: ../../Zotlabs/Module/Admin/Site.php:516
 msgid ""
-"Present a login box to visitors on the home page if no other content has been "
-"configured."
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
 msgstr ""
 "Wyświetlaj formularz logowania odwiedzającym na stronie głównej, jeśli nie "
 "skonfigurowano żadnych innych treści."
@@ -6088,9 +6116,11 @@ msgid "Enable context help"
 msgstr "WÅ‚Ä…cz pomoc kontekstowÄ…"
 
 #: ../../Zotlabs/Module/Admin/Site.php:517
-msgid "Display contextual help for the current page when the help button is pressed."
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
 msgstr ""
-"Wyświetlanie pomocy kontekstowej dla bieżącej strony po naciśnięciu przycisku pomocy."
+"Wyświetlanie pomocy kontekstowej dla bieżącej strony po naciśnięciu "
+"przycisku pomocy."
 
 #: ../../Zotlabs/Module/Admin/Site.php:519
 msgid "Reply-to email address for system generated email."
@@ -6098,7 +6128,8 @@ msgstr "Zwrotny adres e-mail dla wiadomości wygenerowanych przez system."
 
 #: ../../Zotlabs/Module/Admin/Site.php:520
 msgid "Sender (From) email address for system generated email."
-msgstr "Adres e-mail nadawcy (Od) wiadomości e-mail wygenerowanej przez system."
+msgstr ""
+"Adres e-mail nadawcy (Od) wiadomości e-mail wygenerowanej przez system."
 
 #: ../../Zotlabs/Module/Admin/Site.php:521
 msgid "Name of email sender for system generated email."
@@ -6118,11 +6149,11 @@ msgstr "WÅ‚Ä…cz powiadomienia SSE"
 
 #: ../../Zotlabs/Module/Admin/Site.php:525
 msgid ""
-"If disabled, traditional polling will be used. Warning: this setting might not be "
-"suited for shared hosting"
+"If disabled, traditional polling will be used. Warning: this setting might "
+"not be suited for shared hosting"
 msgstr ""
-"Jeśli wyłączone, będzie używane tradycyjne odpytywanie. Ostrzeżenie: to ustawienie "
-"może nie być odpowiednie dla hostingu współdzielonego"
+"Jeśli wyłączone, będzie używane tradycyjne odpytywanie. Ostrzeżenie: to "
+"ustawienie może nie być odpowiednie dla hostingu współdzielonego"
 
 #: ../../Zotlabs/Module/Admin/Site.php:527
 msgid "Proxy user"
@@ -6138,7 +6169,8 @@ msgstr "Limit czasu sieci"
 
 #: ../../Zotlabs/Module/Admin/Site.php:529
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Wartość w sekundach. Ustaw na 0 dla nieograniczonej liczby (niezalecane)."
+msgstr ""
+"Wartość w sekundach. Ustaw na 0 dla nieograniczonej liczby (niezalecane)."
 
 #: ../../Zotlabs/Module/Admin/Site.php:530
 msgid "Delivery interval"
@@ -6146,13 +6178,13 @@ msgstr "Interwał dostaw"
 
 #: ../../Zotlabs/Module/Admin/Site.php:530
 msgid ""
-"Delay background delivery processes by this many seconds to reduce system load. "
-"Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large "
-"dedicated servers."
+"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 ""
-"Opóźnij procesy dostarczania w tle o kilka sekund, aby zmniejszyć obciążenie systemu. "
-"Zalecane: 4-5 dla hostów współdzielonych, 2-3 dla wirtualnych serwerów prywatnych. 0-1 "
-"dla dużych serwerów dedykowanych."
+"Opóźnij procesy dostarczania w tle o kilka sekund, aby zmniejszyć obciążenie "
+"systemu. Zalecane: 4-5 dla hostów współdzielonych, 2-3 dla wirtualnych "
+"serwerów prywatnych. 0-1 dla dużych serwerów dedykowanych."
 
 #: ../../Zotlabs/Module/Admin/Site.php:531
 msgid "Deliveries per process"
@@ -6160,11 +6192,11 @@ msgstr "Liczba dostaw na proces"
 
 #: ../../Zotlabs/Module/Admin/Site.php:531
 msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust if "
-"necessary to tune system performance. Recommend: 1-5."
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
-"Liczba dostaw do podjęcia w ramach jednego procesu systemu operacyjnego. W razie "
-"potrzeby dostosuj, aby dostroić wydajność systemu. Zalecane: 1-5."
+"Liczba dostaw do podjęcia w ramach jednego procesu systemu operacyjnego. W "
+"razie potrzeby dostosuj, aby dostroić wydajność systemu. Zalecane: 1-5."
 
 #: ../../Zotlabs/Module/Admin/Site.php:532
 msgid "Queue Threshold"
@@ -6172,10 +6204,11 @@ msgstr "Próg kolejki"
 
 #: ../../Zotlabs/Module/Admin/Site.php:532
 msgid ""
-"Always defer immediate delivery if queue contains more than this number of entries."
+"Always defer immediate delivery if queue contains more than this number of "
+"entries."
 msgstr ""
-"Zawsze odraczaj natychmiastowe dostarczenie, jeśli kolejka zawiera więcej pozycji niż "
-"ta liczba."
+"Zawsze odraczaj natychmiastowe dostarczenie, jeśli kolejka zawiera więcej "
+"pozycji niż ta liczba."
 
 #: ../../Zotlabs/Module/Admin/Site.php:533
 msgid "Poll interval"
@@ -6183,11 +6216,11 @@ msgstr "Okres odpytywania"
 
 #: ../../Zotlabs/Module/Admin/Site.php:533
 msgid ""
-"Delay background polling processes by this many seconds to reduce system load. If 0, "
-"use delivery interval."
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
 msgstr ""
-"Opóźnij procesy sondowania w tle o kilka sekund, aby zmniejszyć obciążenie systemu. "
-"Jeśli 0, użyty będzie interwał dostawy."
+"Opóźnij procesy sondowania w tle o kilka sekund, aby zmniejszyć obciążenie "
+"systemu. Jeśli 0, użyty będzie interwał dostawy."
 
 #: ../../Zotlabs/Module/Admin/Site.php:534
 msgid "Path to ImageMagick convert program"
@@ -6195,22 +6228,25 @@ msgstr "Ścieżka do programu konwertującego ImageMagick"
 
 #: ../../Zotlabs/Module/Admin/Site.php:534
 msgid ""
-"If set, use this program to generate photo thumbnails for huge images ( > 4000 pixels "
-"in either dimension), otherwise memory exhaustion may occur. Example: /usr/bin/convert"
+"If set, use this program to generate photo thumbnails for huge images ( > "
+"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
+"Example: /usr/bin/convert"
 msgstr ""
-"Jeśli jest ustawiona, użyj tego programu do generowania miniatur zdjęć dla dużych "
-"obrazów (> 4000 pikseli w każdym wymiarze), w przeciwnym razie może wystąpić "
-"wyczerpanie pamięci. Przykład: /usr/bin/convert"
+"Jeśli jest ustawiona, użyj tego programu do generowania miniatur zdjęć dla "
+"dużych obrazów (> 4000 pikseli w każdym wymiarze), w przeciwnym razie może "
+"wystąpić wyczerpanie pamięci. Przykład: /usr/bin/convert"
 
 #: ../../Zotlabs/Module/Admin/Site.php:535
 msgid "Maximum Load Average"
 msgstr "Maksymalne średnie obciążenie"
 
 #: ../../Zotlabs/Module/Admin/Site.php:535
-msgid "Maximum system load before delivery and poll processes are deferred - default 50."
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
-"Maksymalne obciążenie systemu przed odroczeniem procesów dostarczania i odpytywania - "
-"domyślnie 50."
+"Maksymalne obciążenie systemu przed odroczeniem procesów dostarczania i "
+"odpytywania - domyślnie 50."
 
 #: ../../Zotlabs/Module/Admin/Site.php:536
 msgid "Expiration period in days for imported (grid/network) content"
@@ -6221,15 +6257,18 @@ msgid "0 for no expiration of imported content"
 msgstr "0 dla braku wygaśnięcia zaimportowanej treści"
 
 #: ../../Zotlabs/Module/Admin/Site.php:537
-msgid "Do not expire any posts which have comments less than this many days ago"
+msgid ""
+"Do not expire any posts which have comments less than this many days ago"
 msgstr ""
-"Nie wygaszaj żadnych wpisów, które mają komentarze z datami mniejszymi niż ta wartość "
-"dni od teraz"
+"Nie wygaszaj żadnych wpisów, które mają komentarze z datami mniejszymi niż "
+"ta wartość dni od teraz"
 
 #: ../../Zotlabs/Module/Admin/Site.php:538
-msgid "Public servers: Optional landing (marketing) webpage for new registrants"
+msgid ""
+"Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr ""
-"Serwery publiczne: opcjonalna strona lÄ…dowania (marketingowa) dla nowych rejestrujÄ…cych"
+"Serwery publiczne: opcjonalna strona lÄ…dowania (marketingowa) dla nowych "
+"rejestrujÄ…cych"
 
 #: ../../Zotlabs/Module/Admin/Site.php:538
 #, php-format
@@ -6252,7 +6291,8 @@ msgstr "Opcjonalnie: lokalizacja portalu"
 msgid "Region or country"
 msgstr "Region lub kraj"
 
-#: ../../Zotlabs/Module/Admin/Site.php:625 ../../Zotlabs/Module/Admin/Site.php:626
+#: ../../Zotlabs/Module/Admin/Site.php:625
+#: ../../Zotlabs/Module/Admin/Site.php:626
 msgid "Invalid 24h time value (hhmm/hmm)"
 msgstr "Nieprawidłowa wartość czasu 24-godzinnego (hhmm/hmm)"
 
@@ -6260,31 +6300,38 @@ msgstr "Nieprawidłowa wartość czasu 24-godzinnego (hhmm/hmm)"
 msgid "New Profile Field"
 msgstr "Nowe pole profilu"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90 ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
 msgid "Field nickname"
 msgstr "Krótka nazwa pola"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90 ../../Zotlabs/Module/Admin/Profs.php:110
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
 msgid "System name of field"
 msgstr "Systemowa nazwa pola"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91 ../../Zotlabs/Module/Admin/Profs.php:111
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+#: ../../Zotlabs/Module/Admin/Profs.php:111
 msgid "Input type"
 msgstr "Typ wejścia"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92 ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
 msgid "Field Name"
 msgstr "Nazwa pola"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92 ../../Zotlabs/Module/Admin/Profs.php:112
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
 msgid "Label on profile pages"
 msgstr "Etykieta na stronach profilu"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93 ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
 msgid "Help text"
 msgstr "Tekst pomocy"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93 ../../Zotlabs/Module/Admin/Profs.php:113
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
 msgid "Additional info (optional)"
 msgstr "Dodatkowe informacje (opcjonalnie)"
 
@@ -6324,11 +6371,13 @@ msgstr "Pola własne"
 msgid "Create Custom Field"
 msgstr "Utwórz własne pole"
 
-#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:58
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:106
 msgid "No more system notifications."
 msgstr "Nigdy więcej powiadomień systemowych."
 
-#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:62
+#: ../../Zotlabs/Module/Notify.php:65
+#: ../../Zotlabs/Module/Notifications.php:110
 msgid "System Notifications"
 msgstr "Powiadomienia systemowe"
 
@@ -6398,22 +6447,29 @@ msgid "Suggest Channels App"
 msgstr "Aplikacja Sugerowane Kanały"
 
 #: ../../Zotlabs/Module/Suggest.php:41
-msgid "Suggestions for channels in the $Projectname network you might be interested in"
-msgstr "Propozycje dotyczące kanałów w sieci $Projectname, które mogą Cię zainteresować"
+msgid ""
+"Suggestions for channels in the $Projectname network you might be interested "
+"in"
+msgstr ""
+"Propozycje dotyczące kanałów w sieci $Projectname, które mogą Cię "
+"zainteresować"
 
 #: ../../Zotlabs/Module/Suggest.php:54
-msgid "No suggestions available. If this is a new site, please try again in 24 hours."
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
-"Brak dostępnych propozycji. Jeśli to jest nowy portal, spróbuj ponownie za 24 godziny."
+"Brak dostępnych propozycji. Jeśli to jest nowy portal, spróbuj ponownie za "
+"24 godziny."
 
 #: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:48
 msgid "Ignore/Hide"
 msgstr "Ignoruj/Ukryj"
 
-#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:437
+#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:436
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
-msgstr "Sugerowane Kanały"
+msgstr "Sugerowane kanały"
 
 #: ../../Zotlabs/Module/Email_validation.php:36
 msgid "Email Verification Required"
@@ -6422,13 +6478,13 @@ msgstr "Wymagana jest weryfikacja adresu e-mail"
 #: ../../Zotlabs/Module/Email_validation.php:37
 #, php-format
 msgid ""
-"A verification token was sent to your email address [%s]. Enter that token here to "
-"complete the account verification step. Please allow a few minutes for delivery, and "
-"check your spam folder if you do not see the message."
+"A verification token was sent to your email address [%s]. Enter that token "
+"here to complete the account verification step. Please allow a few minutes "
+"for delivery, and check your spam folder if you do not see the message."
 msgstr ""
-"Token weryfikacyjny został wysłany na Twój adres e-mail [% s]. Wprowadź tuta ten "
-"token, aby zakończyć etap weryfikacji konta. Poczekaj kilka minut na dostarczenie i "
-"jeśli nie widzisz wiadomości, sprawdź folder ze spamem."
+"Token weryfikacyjny został wysłany na Twój adres e-mail [% s]. Wprowadź tuta "
+"ten token, aby zakończyć etap weryfikacji konta. Poczekaj kilka minut na "
+"dostarczenie i jeśli nie widzisz wiadomości, sprawdź folder ze spamem."
 
 #: ../../Zotlabs/Module/Email_validation.php:38
 msgid "Resend Email"
@@ -6438,13 +6494,14 @@ msgstr "Wyślij ponownie wiadomość e-mail"
 msgid "Validation token"
 msgstr "Token walidacyjny"
 
-#: ../../Zotlabs/Module/Notes.php:57
+#: ../../Zotlabs/Module/Notes.php:56
 msgid "Notes App"
 msgstr "Aplikacja Notatki"
 
-#: ../../Zotlabs/Module/Notes.php:58
+#: ../../Zotlabs/Module/Notes.php:57
 msgid "A simple notes app with a widget (note: notes are not encrypted)"
-msgstr "Prosta aplikacja do notatek z widżetem (uwaga: notatki nie są szyfrowane)"
+msgstr ""
+"Prosta aplikacja do notatek z widżetem (uwaga: notatki nie są szyfrowane)"
 
 #: ../../Zotlabs/Module/Tokens.php:39
 #, php-format
@@ -6453,7 +6510,7 @@ msgstr "Ten kanał jest ograniczony do %d tokenów"
 
 #: ../../Zotlabs/Module/Tokens.php:45
 msgid "Name and Password are required."
-msgstr "Wymagane są Imię i hasło."
+msgstr "Wymagane są nazwa i hasło."
 
 #: ../../Zotlabs/Module/Tokens.php:85
 msgid "Token saved."
@@ -6466,28 +6523,29 @@ msgstr "Aplikacja Dostęp Gościnny"
 #: ../../Zotlabs/Module/Tokens.php:100
 msgid "Create access tokens so that non-members can access private content"
 msgstr ""
-"Utwórz tokeny dostępu, aby osoby niebędące członkami mogły uzyskać dostęp do Twoich "
-"treści prywatnych"
+"Utwórz tokeny dostępu, aby osoby niebędące członkami mogły uzyskać dostęp do "
+"Twoich treści prywatnych"
 
 #: ../../Zotlabs/Module/Tokens.php:133
 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."
+"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 ""
-"Użyj tego formularza, aby utworzyć tymczasowe identyfikatory dostępu, aby udostępniać "
-"rzeczy osobom niebędącym członkami. Tożsamości te mogą być używane na listach kontroli "
-"dostępu, a odwiedzający mogą logować się przy użyciu tych poświadczeń, aby uzyskać "
-"dostęp do treści prywatnych."
+"Użyj tego formularza, aby utworzyć tymczasowe identyfikatory dostępu, aby "
+"udostępniać rzeczy osobom niebędącym członkami. Tożsamości te mogą być "
+"używane na listach kontroli dostępu, a odwiedzający mogą logować się przy "
+"użyciu tych poświadczeń, aby uzyskać dostęp do treści prywatnych."
 
 #: ../../Zotlabs/Module/Tokens.php:135
 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:"
+"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 ""
-"Możesz także udostępnić znajomym i współpracownikom łącza dostępu w stylu <em>dropbox</"
-"em>, dodając hasło logowania do dowolnego adresu URL witryny, jak pokazano na "
-"ilustracji. Przykłady:"
+"Możesz także udostępnić znajomym i współpracownikom łącza dostępu w stylu "
+"<em>dropbox</em>, dodając hasło logowania do dowolnego adresu URL portalu, "
+"jak pokazano na ilustracji. Przykłady:"
 
 #: ../../Zotlabs/Module/Tokens.php:170
 msgid "Guest Access Tokens"
@@ -6515,18 +6573,20 @@ msgstr "Zmień kolejność aplikacji na pasku aplikacji"
 
 #: ../../Zotlabs/Module/Apporder.php:48
 msgid ""
-"Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"
+"Use arrows to move the corresponding app left (top) or right (bottom) in the "
+"navbar"
 msgstr ""
-"Użyj strzałek, aby przesunąć odpowiednią aplikację w lewo (u góry) lub w prawo (u "
-"dołu) na pasku nawigacyjnym"
+"Użyj strzałek, aby przesunąć odpowiednią aplikację w lewo (u góry) lub w "
+"prawo (u dołu) na pasku nawigacyjnym"
 
 #: ../../Zotlabs/Module/Apporder.php:48
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
-"Użyj strzałek, aby przesunąć odpowiednią aplikację w górę lub w dół w zasobniku "
-"aplikacji"
+"Użyj strzałek, aby przesunąć odpowiednią aplikację w górę lub w dół w "
+"zasobniku aplikacji"
 
-#: ../../Zotlabs/Module/Notifications.php:63 ../../Zotlabs/Lib/ThreadItem.php:484
+#: ../../Zotlabs/Module/Notifications.php:111
+#: ../../Zotlabs/Lib/ThreadItem.php:484
 msgid "Mark all seen"
 msgstr "Oznacz wszystko jako oglądnięte"
 
@@ -6568,7 +6628,9 @@ msgid "Could not connect to database."
 msgstr "Nie można połączyć się z bazą danych."
 
 #: ../../Zotlabs/Module/Setup.php:177
-msgid "Could not connect to specified site URL. Possible SSL certificate or DNS issue."
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 "Nie można połączyć się z określonym adresem URL portalu. Możliwy problem z "
 "certyfikatem SSL lub DNS."
@@ -6583,16 +6645,16 @@ msgstr "Baza danych portalu została zainstalowana."
 
 #: ../../Zotlabs/Module/Setup.php:196
 msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a database "
-"client."
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
 msgstr ""
-"Może być konieczne ręczne zaimportowanie pliku „install/schema_xxx.sql� za pomocą "
-"klienta bazy danych."
+"Może być konieczne ręczne zaimportowanie pliku \"install/schema_xxx.sql\" za "
+"pomocÄ… klienta bazy danych."
 
 #: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261
 #: ../../Zotlabs/Module/Setup.php:768
 msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Zobacz plik \"install/INSTALL.txt\"."
+msgstr "Proszę zobaczyć plik \"install/INSTALL.txt\"."
 
 #: ../../Zotlabs/Module/Setup.php:258
 msgid "System check"
@@ -6607,25 +6669,28 @@ msgid "Database connection"
 msgstr "Połączenie z bazą danych"
 
 #: ../../Zotlabs/Module/Setup.php:285
-msgid "In order to install $Projectname we need to know how to connect to your database."
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
 msgstr ""
-"Aby zainstalować $Projectname, musimy wiedzieć, jak połączyć się z twoją bazą danych."
+"Aby zainstalować $Projectname, musimy wiedzieć, jak połączyć się z twoją "
+"bazÄ… danych."
 
 #: ../../Zotlabs/Module/Setup.php:286
 msgid ""
-"Please contact your hosting provider or site administrator if you have questions about "
-"these settings."
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 "Jeśli masz pytania dotyczące tych ustawień, skontaktuj się z dostawcą usług "
 "hostingowych lub administratorem portalu."
 
 #: ../../Zotlabs/Module/Setup.php:287
 msgid ""
-"The database you specify below should already exist. If it does not, please create it "
-"before continuing."
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
-"Baza danych, którą określisz poniżej, powinna już istnieć. Jeśli tak się nie stało, "
-"utwórz ją przed kontynuowaniem."
+"Baza danych, którą określisz poniżej, powinna już istnieć. Jeśli tak się nie "
+"stało, utwórz ją przed kontynuowaniem."
 
 #: ../../Zotlabs/Module/Setup.php:291
 msgid "Database Server Name"
@@ -6664,10 +6729,12 @@ msgid "Site administrator email address"
 msgstr "Adres e-mail administratora portalu"
 
 #: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
-msgid "Your account email address must match this in order to use the web admin panel."
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
-"Adres e-mail Twojego konta będzie musi być zgodny z tym adresem, aby móc korzystać z "
-"panelu administratora sieci."
+"Adres e-mail Twojego konta musi być zgodny z tym adresem, aby móc korzystać "
+"z panelu administratora sieci."
 
 #: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
 msgid "Website URL"
@@ -6699,11 +6766,11 @@ msgstr "Nie można znaleźć wersji CLI PHP w zmiennej PATH serwerze WWW."
 
 #: ../../Zotlabs/Module/Setup.php:399
 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."
+"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 ""
-"Jeśli nie masz wersji CLI PHP zainstalowanej na serwerze, nie będzie można uruchomić "
-"odpytywania w tle przez cron."
+"Jeśli nie masz wersji CLI PHP zainstalowanej na serwerze, nie będzie można "
+"uruchomić odpytywania w tle przez cron."
 
 #: ../../Zotlabs/Module/Setup.php:403
 msgid "PHP executable path"
@@ -6714,28 +6781,31 @@ msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
-"Wpisz pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole puste, aby "
-"kontynuować instalację."
+"Wpisz pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole "
+"puste, aby kontynuować instalację."
 
 #: ../../Zotlabs/Module/Setup.php:408
 msgid "Command line PHP"
-msgstr "PHP CLI"
+msgstr "Wiersz poleceń PHP"
 
 #: ../../Zotlabs/Module/Setup.php:418
-msgid "Unable to check command line PHP, as shell_exec() is disabled. This is required."
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
 msgstr ""
-"Nie można sprawdzić PHP CLI, ponieważ funkcja shell_exec() jest wyłączona. To jest "
-"wymagane."
+"Nie można sprawdzić PHP CLI, ponieważ funkcja shell_exec() jest wyłączona. "
+"To jest wymagane."
 
 #: ../../Zotlabs/Module/Setup.php:422
 msgid ""
-"The command line version of PHP on your system does not have \"register_argc_argv\" "
-"enabled."
-msgstr "PHP CLI w Twoim systemie nie ma włączonego \"register_argc_argv\"."
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+"Ta wersja PHP CLI w Twoim systemie nie ma włączonego \"register_argc_argv\"."
 
 #: ../../Zotlabs/Module/Setup.php:423
 msgid "This is required for message delivery to work."
-msgstr "Jest to konieczne,, aby dostarczanie wiadomości działało."
+msgstr "Jest to konieczne, aby dostarczanie wiadomości działało."
 
 #: ../../Zotlabs/Module/Setup.php:426
 msgid "PHP register_argc_argv"
@@ -6743,20 +6813,21 @@ msgstr "PHP register_argc_argv"
 
 #: ../../Zotlabs/Module/Setup.php:446
 msgid ""
-"This is not sufficient to upload larger images or files. You should be able to upload "
-"at least 4 MB at once."
+"This is not sufficient to upload larger images or files. You should be able "
+"to upload at least 4 MB at once."
 msgstr ""
-"To nie wystarczy, aby przesłać większe obrazy lub pliki. Powinieneś móc przesłać co "
-"najmniej 4 MB na raz."
+"To nie wystarczy, aby przesłać większe obrazy lub pliki. Powinieneś móc "
+"przesłać co najmniej 4 MB na raz."
 
 #: ../../Zotlabs/Module/Setup.php:448
 #, 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."
+"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 ""
-"Twój maksymalny dopuszczalny łączny rozmiar przesyłanych plików to %s. Maksymalny "
-"rozmiar jednego pliku do przesłania to %s. Możesz przesłać jednocześnie do %d plików."
+"Twój maksymalny dopuszczalny łączny rozmiar przesyłanych plików to %s. "
+"Maksymalny rozmiar jednego pliku do przesłania to %s. Możesz przesłać "
+"jednocześnie do %d plików."
 
 #: ../../Zotlabs/Module/Setup.php:454
 msgid "You can adjust these settings in the server php.ini file."
@@ -6768,19 +6839,19 @@ msgstr "Limity wysyłania PHP"
 
 #: ../../Zotlabs/Module/Setup.php:479
 msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to generate "
-"encryption keys"
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
-"Błąd: funkcja \"openssl_pkey_new\" w tym systemie nie jest w stanie wygenerować kluczy "
-"szyfrujÄ…cych"
+"BÅ‚Ä…d: funkcja \"openssl_pkey_new\" w tym systemie nie jest w stanie "
+"wygenerować kluczy szyfrujących"
 
 #: ../../Zotlabs/Module/Setup.php:480
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
-"Jeśli pracujesz w systemie Windows, przeczytaj \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+"Jeśli pracujesz w systemie Windows, przeczytaj \"http://www.php.net/manual/"
+"en/openssl.installation.php\"."
 
 #: ../../Zotlabs/Module/Setup.php:483
 msgid "Generate encryption keys"
@@ -6804,7 +6875,7 @@ msgstr "Moduł PHP PDO"
 
 #: ../../Zotlabs/Module/Setup.php:504
 msgid "mb_string PHP module"
-msgstr "moduł PHP mb_string PHP"
+msgstr "moduł PHP mb_string"
 
 #: ../../Zotlabs/Module/Setup.php:505
 msgid "xml PHP module"
@@ -6819,9 +6890,11 @@ msgid "Apache mod_rewrite module"
 msgstr "Moduł Apache mod_rewrite"
 
 #: ../../Zotlabs/Module/Setup.php:510
-msgid "Error: Apache webserver mod-rewrite module is required but not installed."
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
-"Błąd: wymagany jest moduł mod-rewrite serwera Apache, ale nie jest zainstalowany."
+"Błąd: wymagany jest moduł mod-rewrite serwera Apache, ale nie jest "
+"zainstalowany."
 
 #: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
 msgid "exec"
@@ -6829,10 +6902,11 @@ msgstr "exec"
 
 #: ../../Zotlabs/Module/Setup.php:516
 msgid ""
-"Error: exec is required but is either not installed or has been disabled in php.ini"
-msgstr ""
-"Błąd: wymagany jest program exec ale nie jest on zainstalowany lub został wyłączony w "
+"Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
+msgstr ""
+"Błąd: wymagany jest program exec ale nie jest on zainstalowany lub został "
+"wyłączony w php.ini"
 
 #: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525
 msgid "shell_exec"
@@ -6840,11 +6914,11 @@ msgstr "shell_exec"
 
 #: ../../Zotlabs/Module/Setup.php:522
 msgid ""
-"Error: shell_exec is required but is either not installed or has been disabled in php."
-"ini"
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
-"Błąd: wymagany jest shell_exec, ale nie jest zainstalowany lub został wyłączony w php."
-"ini"
+"Błąd: wymagany jest shell_exec, ale nie jest zainstalowany lub został "
+"wyłączony w php.ini"
 
 #: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: libCURL PHP module required but not installed."
@@ -6852,18 +6926,19 @@ msgstr "Błąd: wymagany jest moduł PHP libCURL, ale nie jest zainstalowany."
 
 #: ../../Zotlabs/Module/Setup.php:534
 msgid ""
-"Error: GD PHP module with JPEG support or ImageMagick graphics library required but "
-"not installed."
+"Error: GD PHP module with JPEG support or ImageMagick graphics library "
+"required but not installed."
 msgstr ""
-"Błąd: wymagany jest moduł PHP GD z obsługą formatu JPEG lub biblioteką graficzną "
-"ImageMagick, ale nie jest on zainstalowany."
+"Błąd: wymagany jest moduł PHP GD z obsługą formatu JPEG lub biblioteką "
+"graficznÄ… ImageMagick, ale nie jest on zainstalowany."
 
 #: ../../Zotlabs/Module/Setup.php:538
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Błąd: wymagany jest moduł PHP openssl, ale niezainstalowany."
 
 #: ../../Zotlabs/Module/Setup.php:544
-msgid "Error: PDO database PHP module missing a driver for either mysql or pgsql."
+msgid ""
+"Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr "BÅ‚Ä…d: w module PHP PDO brakuje sterownika dla mysql lub pgsql."
 
 #: ../../Zotlabs/Module/Setup.php:549
@@ -6876,7 +6951,7 @@ msgstr "Błąd: wymagany, ale niezainstalowany moduł mb_string PHP."
 
 #: ../../Zotlabs/Module/Setup.php:557
 msgid "Error: xml PHP module required for DAV but not installed."
-msgstr "Błąd: moduł XML PHP wymagany dla DAV, ale nie jest zainstalowany."
+msgstr "Błąd: moduł xml PHP jest wymagany dla DAV, ale nie jest zainstalowany."
 
 #: ../../Zotlabs/Module/Setup.php:561
 msgid "Error: zip PHP module required but not installed."
@@ -6888,19 +6963,19 @@ msgstr ".htconfig.php jest możliwy do zapisu"
 
 #: ../../Zotlabs/Module/Setup.php:585
 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."
+"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 ""
-"Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \".htconfig.php\" "
-"w głównym folderze serwera WWW a nie może tego zrobić."
+"Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \"."
+"htconfig.php\" w głównym folderze serwera WWW a nie może tego zrobić."
 
 #: ../../Zotlabs/Module/Setup.php:586
 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."
+"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 ""
-"Najczęściej jest to ustawienie uprawnień, ponieważ serwer WWW może nie być w stanie "
-"zapisywać plików w Twoim folderze - nawet jeśli możesz."
+"Najczęściej jest to ustawienie uprawnień, ponieważ serwer WWW może nie być w "
+"stanie zapisywać plików w Twoim folderze - nawet jeśli Ty możesz."
 
 #: ../../Zotlabs/Module/Setup.php:587
 msgid "Please see install/INSTALL.txt for additional information."
@@ -6908,37 +6983,38 @@ msgstr "Dodatkowe informacje można znaleźć w pliku install/INSTALL.txt."
 
 #: ../../Zotlabs/Module/Setup.php:603
 msgid ""
-"This software uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
-"To oprogramowanie wykorzystuje silnik szablonów Smarty3 do renderowania widoków "
-"internetowych. Smarty3 kompiluje szablony do PHP, aby przyspieszyć renderowanie."
+"To oprogramowanie wykorzystuje silnik szablonów Smarty3 do renderowania "
+"widoków internetowych. Smarty3 kompiluje szablony do PHP, aby przyspieszyć "
+"renderowanie."
 
 #: ../../Zotlabs/Module/Setup.php:604
 #, 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."
+"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 ""
-"Aby przechowywać te skompilowane szablony, serwer sieciowy musi mieć dostęp do zapisu "
-"w katalogu %s zlokalizowanym w folderze głównym serwera WWW."
+"Aby przechowywać te skompilowane szablony, serwer sieciowy musi mieć dostęp "
+"do zapisu w katalogu %s zlokalizowanym w folderze głównym serwera WWW."
 
 #: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626
 msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has write "
-"access to this folder."
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
-"Upewnij się, że właściciel procesu serwer WWW (np. www-data), ma prawo do zapisu w tym "
-"folderze."
+"Upewnij się, że właściciel procesu serwer WWW (np. www-data), ma prawo do "
+"zapisu w tym folderze."
 
 #: ../../Zotlabs/Module/Setup.php:606
 #, 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."
+"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 ""
-"Uwaga: ze względów bezpieczeństwa powinno się dać serwerowi WWW prawo zapisu tylko do "
-"%s - nie do plików szablonów (.tpl), które on zawiera."
+"Uwaga: ze względów bezpieczeństwa powinno się dać serwerowi WWW prawo zapisu "
+"tylko do %s - nie do plików szablonów (.tpl), które on zawiera."
 
 #: ../../Zotlabs/Module/Setup.php:609
 #, php-format
@@ -6947,11 +7023,12 @@ msgstr "%s jest możliwy do zapisu"
 
 #: ../../Zotlabs/Module/Setup.php:625
 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 top level web folder"
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the top level "
+"web folder"
 msgstr ""
-"To oprogramowanie używa katalogu <i>store</i> do zapisywania przesyłanych plików. "
-"Serwer WWW musi mieć dostęp do zapisu w katalogu <i>store</i>, znajdującego się w "
+"To oprogramowanie używa katalogu store do zapisywania przesyłanych plików. "
+"Serwer WWW musi mieć dostęp do zapisu w katalogu store, znajdującego się w "
 "folderze serwera WWW najwyższego poziomu"
 
 #: ../../Zotlabs/Module/Setup.php:629
@@ -6960,72 +7037,79 @@ msgstr "katalog store jest możliwy do zapisu"
 
 #: ../../Zotlabs/Module/Setup.php:661
 msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access to this "
-"site."
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
-"Nie można zweryfikować certyfikatu SSL. Napraw certyfikat lub wyłącz dostęp https do "
-"tej witryny."
+"Nie można zweryfikować certyfikatu SSL. Napraw certyfikat lub wyłącz dostęp "
+"https do tego portalu."
 
 #: ../../Zotlabs/Module/Setup.php:662
 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!"
+"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 ""
-"Jeśli masz dostęp https do swojego portalu internetowego lub zezwalasz na połączenia z "
-"portem TCP 443 (port https:), MUSISZ użyć certyfikatu akceptowanego przez "
-"przeglądarki. NIE WOLNO używać certyfikatów z podpisem własnym!"
+"Jeśli masz dostęp https do swojego portalu internetowego lub zezwalasz na "
+"połączenia z portem TCP 443 (port https:), MUSISZ użyć certyfikatu "
+"akceptowanego przez przeglądarki. NIE WOLNO używać certyfikatów z podpisem "
+"własnym!"
 
 #: ../../Zotlabs/Module/Setup.php:663
 msgid ""
-"This restriction is incorporated because public posts from you may for example contain "
-"references to images on your own hub."
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
 msgstr ""
-"To ograniczenie zostało wprowadzone, ponieważ Twoje publiczne wpisy mogą na przykład "
-"zawierać odniesienia do obrazów na Twoim portalu."
+"To ograniczenie zostało wprowadzone, ponieważ Twoje publiczne wpisy mogą na "
+"przykład zawierać odniesienia do obrazów na Twoim portalu."
 
 #: ../../Zotlabs/Module/Setup.php:664
 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."
+"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 ""
-"Jeśli Twój certyfikat nie zostanie rozpoznany, członkowie innych witryn (którzy sami "
-"mogą mieć ważne certyfikaty) otrzymają komunikat ostrzegawczy we własnej witrynie, "
-"ostrzegający o problemie z bezpieczeństwem."
+"Jeśli Twój certyfikat nie zostanie rozpoznany, członkowie innych portali "
+"(którzy sami mogą mieć ważne certyfikaty) otrzymają komunikat ostrzegawczy "
+"we własnym portalu, ostrzegający o problemie z bezpieczeństwem."
 
 #: ../../Zotlabs/Module/Setup.php:665
 msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we must "
-"insist on this requirement."
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
 msgstr ""
-"Może to powodować problemy z użytecznością w innym portalu (nie tylko na Twoim), więc "
-"musimy nalegać na to wymaganie."
+"Może to powodować problemy z użytecznością w innym portalu (nie tylko na "
+"Twoim), więc musimy nalegać na to wymaganie."
 
 #: ../../Zotlabs/Module/Setup.php:666
-msgid "Providers are available that issue free certificates which are browser-valid."
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 "Są dostępni dostawcy, którzy wydają bezpłatne certyfikaty akceptowane przez "
 "przeglÄ…darki."
 
 #: ../../Zotlabs/Module/Setup.php:667
 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."
+"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 ""
-"Jeśli masz pewność, że certyfikat jest ważny i podpisany przez zaufany urząd, sprawdź, "
-"czy nie udało się zainstalować certyfikatu pośredniego. Zwykle nie są one wymagane "
-"przez przeglądarki, ale są wymagane do komunikacji między serwerami."
+"Jeśli masz pewność, że certyfikat jest ważny i podpisany przez zaufany "
+"urząd, sprawdź, czy nie udało się zainstalować certyfikatu pośredniego. "
+"Zwykle nie sÄ… one wymagane przez przeglÄ…darki, ale sÄ… wymagane do "
+"komunikacji między serwerami."
 
 #: ../../Zotlabs/Module/Setup.php:669
 msgid "SSL certificate validation"
 msgstr "Walidacja certyfikatu SSL"
 
 #: ../../Zotlabs/Module/Setup.php:675
-msgid "Url rewrite in .htaccess is not working. Check your server configuration.Test: "
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
 msgstr ""
-"Przepisywanie adresu URL w .htaccess nie działa. Sprawdź konfigurację serwera. Test: "
+"Przepisywanie adresu URL w .htaccess nie działa. Sprawdź konfigurację "
+"serwera. Test: "
 
 #: ../../Zotlabs/Module/Setup.php:678
 msgid "Url rewrite is working"
@@ -7033,11 +7117,13 @@ msgstr "Przepisywanie adresu URL działa"
 
 #: ../../Zotlabs/Module/Setup.php:691
 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."
+"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 ""
 "Nie można zapisać pliku konfiguracyjnego bazy danych \".htconfig.php\". Użyj "
-"załączonego tekstu, aby utworzyć plik konfiguracyjny w katalogu głównym serwera WWW."
+"załączonego tekstu, aby utworzyć plik konfiguracyjny w katalogu głównym "
+"serwera WWW."
 
 #: ../../Zotlabs/Module/Setup.php:720
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:401
@@ -7049,14 +7135,15 @@ msgid "<h1>What next?</h1>"
 msgstr "<h1>Co następnie?</h1>"
 
 #: ../../Zotlabs/Module/Setup.php:767
-msgid "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowanie zadania Cron."
 
-#: ../../Zotlabs/Module/Directory.php:122
+#: ../../Zotlabs/Module/Directory.php:121
 msgid "No default suggestions were found."
 msgstr "Nie znaleziono domyślnych propozycji."
 
-#: ../../Zotlabs/Module/Directory.php:282
+#: ../../Zotlabs/Module/Directory.php:281
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
@@ -7064,96 +7151,96 @@ msgstr[0] "%d ocen"
 msgstr[1] "%d oceny"
 msgstr[2] "%d ocen"
 
-#: ../../Zotlabs/Module/Directory.php:293
+#: ../../Zotlabs/Module/Directory.php:292
 msgid "Gender: "
 msgstr "Płeć: "
 
-#: ../../Zotlabs/Module/Directory.php:295
+#: ../../Zotlabs/Module/Directory.php:294
 msgid "Status: "
 msgstr "Status: "
 
-#: ../../Zotlabs/Module/Directory.php:297
+#: ../../Zotlabs/Module/Directory.php:296
 msgid "Homepage: "
 msgstr "Strona główna: "
 
-#: ../../Zotlabs/Module/Directory.php:349 ../../include/channel.php:1834
+#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1754
 msgid "Age:"
 msgstr "Wiek:"
 
-#: ../../Zotlabs/Module/Directory.php:354 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Directory.php:353 ../../include/channel.php:1581
 #: ../../include/event.php:63 ../../include/event.php:134
 msgid "Location:"
 msgstr "Lokalizacja:"
 
-#: ../../Zotlabs/Module/Directory.php:360
+#: ../../Zotlabs/Module/Directory.php:359
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../../Zotlabs/Module/Directory.php:367 ../../include/channel.php:1863
+#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1783
 msgid "Hometown:"
 msgstr "Miasto pobytu:"
 
-#: ../../Zotlabs/Module/Directory.php:369 ../../include/channel.php:1869
+#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1789
 msgid "About:"
 msgstr "O mnie:"
 
-#: ../../Zotlabs/Module/Directory.php:371
+#: ../../Zotlabs/Module/Directory.php:370
 msgid "Public Forum:"
 msgstr "Forum publiczne:"
 
-#: ../../Zotlabs/Module/Directory.php:374
+#: ../../Zotlabs/Module/Directory.php:373
 msgid "Keywords: "
 msgstr "SÅ‚owa kluczowe: "
 
-#: ../../Zotlabs/Module/Directory.php:377
+#: ../../Zotlabs/Module/Directory.php:376
 msgid "Don't suggest"
 msgstr "Nie sugeruj"
 
-#: ../../Zotlabs/Module/Directory.php:379
+#: ../../Zotlabs/Module/Directory.php:378
 msgid "Common connections (estimated):"
 msgstr "Popularne połączenia (oszacowanie):"
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Global Directory"
 msgstr "Katalog globalny"
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Local Directory"
 msgstr "Katalog lokalny"
 
-#: ../../Zotlabs/Module/Directory.php:434
+#: ../../Zotlabs/Module/Directory.php:433
 msgid "Finding:"
 msgstr "Odnaleziono:"
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "next page"
 msgstr "następna strona"
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "previous page"
 msgstr "poprzednia strona"
 
-#: ../../Zotlabs/Module/Directory.php:440
+#: ../../Zotlabs/Module/Directory.php:439
 msgid "Sort options"
 msgstr "Opcje sortowania"
 
-#: ../../Zotlabs/Module/Directory.php:441
+#: ../../Zotlabs/Module/Directory.php:440
 msgid "Alphabetic"
 msgstr "Alfabetycznie"
 
-#: ../../Zotlabs/Module/Directory.php:442
+#: ../../Zotlabs/Module/Directory.php:441
 msgid "Reverse Alphabetic"
-msgstr "Odwróć alfabetycznie"
+msgstr "Odwrotnie alfabetycznie"
 
-#: ../../Zotlabs/Module/Directory.php:443
+#: ../../Zotlabs/Module/Directory.php:442
 msgid "Newest to Oldest"
 msgstr "Od najnowszych do najstarszych"
 
-#: ../../Zotlabs/Module/Directory.php:444
+#: ../../Zotlabs/Module/Directory.php:443
 msgid "Oldest to Newest"
 msgstr "Od najstarszych do najnowszych"
 
-#: ../../Zotlabs/Module/Directory.php:461
+#: ../../Zotlabs/Module/Directory.php:460
 msgid "No entries (some entries may be hidden)."
 msgstr "Brak wpisów (niektóre wpisy mogą być ukryte)."
 
@@ -7282,7 +7369,7 @@ msgstr "Tekst linku"
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
-msgstr "%1$s jest %2$s"
+msgstr "%1$s to %2$s"
 
 #: ../../Zotlabs/Module/Mood.php:134
 msgid "Mood App"
@@ -7314,9 +7401,11 @@ msgstr "Utwórz własne limity uprawnień do połączeń"
 
 #: ../../Zotlabs/Module/Permcats.php:80
 msgid ""
-"Use this form to create permission rules for various classes of people or connections."
+"Use this form to create permission rules for various classes of people or "
+"connections."
 msgstr ""
-"Użyj tego formularza, aby utworzyć reguły uprawnień dla różnych klas osób lub połączeń."
+"Użyj tego formularza, aby utworzyć reguły uprawnień dla różnych klas osób "
+"lub połączeń."
 
 #: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374
 msgid "Permission Categories"
@@ -7326,25 +7415,9 @@ msgstr "Kategorie uprawnień"
 msgid "Permission category name"
 msgstr "Nazwa kategorii uprawnień"
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr "Brak ocen"
-
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr "Ocena: "
-
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr "Portal: "
-
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr "Opis: "
-
-#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:212
+#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:211
 msgid "Nickname is required."
-msgstr "Pseudonim jest wymagany."
+msgstr "Wymagany jest pseudonim."
 
 #: ../../Zotlabs/Module/Register.php:112
 msgid "Email address required"
@@ -7410,9 +7483,7 @@ msgstr "Rejestracja na tym portalu wymaga zatwierdzenia przez administratora."
 
 #: ../../Zotlabs/Module/Register.php:445
 msgid "Register at another affiliated hub in case when prefered"
-msgstr ""
-"Zarejestruj siÄ™ w innym stowarzyszonym portalu w przypadku, gdy potrzebujesz takiego "
-"rozwiÄ…zania"
+msgstr "Możesz ewentualnie zarejestrować się na innym stowarzyszonym portalu"
 
 #: ../../Zotlabs/Module/Register.php:458
 msgid "Registration on this hub is by invitation only."
@@ -7461,8 +7532,10 @@ msgid "Real name is preferred"
 msgstr "Preferowane jest prawdziwe imiÄ™ i nazwisko"
 
 #: ../../Zotlabs/Module/Register.php:510
-msgid "Your nickname will be used to create an easy to remember channel address"
-msgstr "Twój pseudonim posłuży do stworzenia łatwego do zapamiętania adresu kanału"
+msgid ""
+"Your nickname will be used to create an easy to remember channel address"
+msgstr ""
+"Twój pseudonim posłuży do stworzenia łatwego do zapamiętania adresu kanału"
 
 #: ../../Zotlabs/Module/Register.php:514
 msgid "Why do you want to join this hub?"
@@ -7476,13 +7549,16 @@ msgstr "Pomoże to przejrzeć Twoją rejestrację"
 msgid "I have an invite code"
 msgstr "Mam kod zaproszenia"
 
-#: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168 ../../boot.php:1696
+#: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168
+#: ../../boot.php:1697
 msgid "Register"
 msgstr "Zarejestruj siÄ™"
 
 #: ../../Zotlabs/Module/Register.php:575
-msgid "This site has exceeded the number of allowed daily account registrations."
-msgstr "Na tym portalu przekroczono  dozwolonÄ… liczbÄ™ dziennych rejestracji kont."
+msgid ""
+"This site has exceeded the number of allowed daily account registrations."
+msgstr ""
+"Na tym portalu przekroczono  dozwolonÄ… liczbÄ™ dziennych rejestracji kont."
 
 #: ../../Zotlabs/Module/Acl.php:123 ../../Zotlabs/Module/Lockview.php:117
 #: ../../Zotlabs/Module/Lockview.php:153
@@ -7494,6 +7570,41 @@ msgstr "Profil"
 msgid "network"
 msgstr "sieć"
 
+#: ../../Zotlabs/Module/Channel_calendar.php:62
+msgid "Event can not end before it has started."
+msgstr "Wydarzenie nie może zakończyć się przed rozpoczęciem."
+
+#: ../../Zotlabs/Module/Channel_calendar.php:64
+#: ../../Zotlabs/Module/Channel_calendar.php:72
+#: ../../Zotlabs/Module/Channel_calendar.php:87
+msgid "Unable to generate preview."
+msgstr "Nie można wygenerować podglądu."
+
+#: ../../Zotlabs/Module/Channel_calendar.php:70
+msgid "Event title and start time are required."
+msgstr "Wymaga się wprowadzenia tytułu wydarzenia i godziny rozpoczęcia."
+
+#: ../../Zotlabs/Module/Channel_calendar.php:85
+#: ../../Zotlabs/Module/Channel_calendar.php:226
+msgid "Event not found."
+msgstr "Nie znaleziono wydarzenia."
+
+#: ../../Zotlabs/Module/Channel_calendar.php:370
+msgid "Edit event"
+msgstr "Edytuj wydarzenie"
+
+#: ../../Zotlabs/Module/Channel_calendar.php:372
+msgid "Delete event"
+msgstr "Usuń wydarzenie"
+
+#: ../../Zotlabs/Module/Channel_calendar.php:406
+msgid "calendar"
+msgstr "kalendarz"
+
+#: ../../Zotlabs/Module/Channel_calendar.php:493
+msgid "Failed to remove event"
+msgstr "Nie udało się usunąć wydarzenia"
+
 #: ../../Zotlabs/Module/Settings/Featured.php:25
 msgid "No feature settings configured"
 msgstr "Brak skonfigurowanych ustawień funkcji"
@@ -7517,7 +7628,8 @@ msgstr "Chroniony adres e-mail. Nie można zmienić tego adresu e-mail."
 #: ../../Zotlabs/Module/Settings/Account.php:33
 msgid "System failure storing new email. Please try again."
 msgstr ""
-"Błąd systemu podczas zapisywania nowej wiadomości e-mail. Proszę spróbuj ponownie."
+"Błąd systemu podczas zapisywania nowej wiadomości e-mail. Proszę spróbuj "
+"ponownie."
 
 #: ../../Zotlabs/Module/Settings/Account.php:51
 msgid "Password verification failed."
@@ -7622,10 +7734,11 @@ msgstr "Przeładuj obrazy przed renderowaniem strony"
 
 #: ../../Zotlabs/Module/Settings/Display.php:195
 msgid ""
-"The subjective page load time will be longer but the page will be ready when displayed"
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
 msgstr ""
-"Subiektywny czas ładowania strony będzie dłuższy, ale strona będzie gotowa po "
-"wyświetleniu"
+"Subiektywny czas ładowania strony będzie dłuższy, ale strona będzie gotowa "
+"po wyświetleniu"
 
 #: ../../Zotlabs/Module/Settings/Display.php:196
 msgid "Enable user zoom on mobile devices"
@@ -7663,7 +7776,8 @@ msgstr "Domyślnie: menu kanału znajduje się w menu aplikacji"
 msgid "Link post titles to source"
 msgstr "Połącz tytuły wpisów ze źródłem"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203 ../../Zotlabs/Widget/Newmember.php:75
+#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Widget/Newmember.php:75
 msgid "New Member Links"
 msgstr "Linki dla nowych członków"
 
@@ -7714,7 +7828,8 @@ msgstr "Opublikuj swój domyślny profil w katalogu sieciowym"
 #: ../../Zotlabs/Module/Settings/Channel.php:416
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
-"Czy pozwalasz nam sugerować nowym członkom Ciebie jako potencjalnego przyjaciela?"
+"Czy pozwalasz nam sugerować nowym członkom Ciebie jako potencjalnego "
+"przyjaciela?"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:429
 msgid "Your channel address is"
@@ -7736,7 +7851,7 @@ msgstr "Ustawienia kanału"
 msgid "Basic Settings"
 msgstr "Podstawowe ustawienia"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1791
+#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1711
 msgid "Full Name:"
 msgstr "Pełna nazwa:"
 
@@ -7766,11 +7881,11 @@ msgstr "Treść dla dorosłych"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:507
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag any adult "
-"material and/or nudity with #NSFW)"
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
-"Ten kanał często lub regularnie publikuje treści dla dorosłych. (Oznacz wszelkie "
-"materiały dla dorosłych albo nagość tagiem #NSFW)"
+"Ten kanał często lub regularnie publikuje treści dla dorosłych. (Oznacz "
+"wszelkie materiały dla dorosłych albo nagość tagiem #NSFW)"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:509
 msgid "Security and Privacy Settings"
@@ -7778,7 +7893,9 @@ msgstr "Ustawienia bezpieczeństwa i prywatności"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:511
 msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Twoje uprawnienia są już skonfigurowane. Kliknij, aby wyświetlić/dostosować"
+msgstr ""
+"Twoje uprawnienia są już skonfigurowane. Kliknij, aby je wyświetlić/"
+"dostosować"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:513
 msgid "Hide my online presence"
@@ -7786,23 +7903,26 @@ msgstr "Ukryj moją obecność w Internecie"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:513
 msgid "Prevents displaying in your profile that you are online"
-msgstr "Zapobiega wyświetlaniu w Twoim profilu, że jesteś online"
+msgstr "Zapobiega wyświetlaniu w Twoim profilu informacji, że jesteś online"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:515
 msgid "Simple Privacy Settings:"
 msgstr "Proste ustawienia prywatności:"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:516
-msgid "Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Bardzo publiczne - <em>wyjątkowo pobłażliwe (należy używać ostrożnie)</em>"
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr ""
+"Bardzo publiczne - <em>wyjątkowo pobłażliwe (należy używać ostrożnie)</em>"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:517
 msgid ""
-"Typical - <em>default public, privacy when desired (similar to social network "
-"permissions but with improved privacy)</em>"
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
 msgstr ""
-"Typowe - <em>domyślne publiczne, prywatność w razie potrzeby (podobne do uprawnień w "
-"popularnych sieciach społecznościowych, ale z podwyższoną prywatnością)</em>"
+"Typowe - <em>domyślne publiczne, prywatność w razie potrzeby (podobne do "
+"uprawnień w popularnych sieciach społecznościowych, ale z podwyższoną "
+"prywatnością)</em>"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:518
 msgid "Private - <em>default private, never open or public</em>"
@@ -7817,9 +7937,11 @@ msgid "Allow others to tag your posts"
 msgstr "Pozwól innym oznaczać Twoje wpisy"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid "Often used by the community to retro-actively flag inappropriate content"
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
-"Często używany przez społeczność do oznaczania nieodpowiednich treści z mocą wsteczną"
+"Często używany przez społeczność do oznaczania nieodpowiednich treści z mocą "
+"wstecznÄ…"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:523
 msgid "Channel Permission Limits"
@@ -7860,7 +7982,8 @@ msgstr "Domyślna grupa prywatności"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:529
 msgid "Use my default audience setting for the type of object published"
-msgstr "Użyj mojego domyślnego ustawienia odbiorców dla typu publikowanego obiektu"
+msgstr ""
+"Użyj mojego domyślnego ustawienia odbiorców dla typu publikowanego obiektu"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:538
 msgid "Default permissions category"
@@ -7874,7 +7997,8 @@ msgstr "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:"
 msgid "Useful to reduce spamming"
 msgstr "Przydatne do ograniczenia spamowania"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547 ../../Zotlabs/Lib/Enotify.php:68
+#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Ustawienia powiadomień"
 
@@ -7924,7 +8048,7 @@ msgstr "Otrzymasz propozycję znajomości"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:559
 msgid "You are tagged in a post"
-msgstr "Oznaczono Ciebie tagiem w poście"
+msgstr "Oznaczono Ciebie tagiem we wpisie"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:560
 msgid "You are poked/prodded/etc. in a post"
@@ -7932,7 +8056,7 @@ msgstr "Zaczepiono Ciebie we wpisie"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:562
 msgid "Someone likes your post/comment"
-msgstr "Ktoś ocenił pozytywnie Twój wpis/komentarz"
+msgstr "Ktoś pochwalił Twój wpis/komentarz"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:565
 msgid "Show visual notifications including:"
@@ -7948,7 +8072,7 @@ msgstr "Niewidoczną aktywność w kanale"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:569
 msgid "Unseen private messages"
-msgstr "Niewidoczną wiadomości prywatne"
+msgstr "Niewidoczne wiadomości prywatne"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:569
 #: ../../Zotlabs/Module/Settings/Channel.php:574
@@ -8003,7 +8127,7 @@ msgstr "Niewidoczna aktywność na publicznym strumieniu"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:580
 msgid "Unseen likes and dislikes"
-msgstr "Niewidoczne oceny pozytywne i negatywne"
+msgstr "Niewidoczne pochwały i zganienia"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:581
 msgid "Unseen forum posts"
@@ -8011,21 +8135,22 @@ msgstr "Niewidoczne wpisy na forum"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:582
 msgid "Email notification hub (hostname)"
-msgstr "Serwer powiadomień e-mail (nazwa hosta)"
+msgstr "Powiadomienia e-mail wysyłane z (nazwa hosta)"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:582
 #, php-format
 msgid ""
-"If your channel is mirrored to multiple hubs, set this to your preferred location. "
-"This will prevent duplicate email notifications. Example: %s"
+"If your channel is mirrored to multiple hubs, set this to your preferred "
+"location. This will prevent duplicate email notifications. Example: %s"
 msgstr ""
-"Jeśli twój kanał jest powielany na wielu ortalach, ustaw to na preferowaną "
+"Jeśli twój kanał jest powielany na wielu portalach, ustaw to na preferowaną "
 "lokalizację. Zapobiegnie to powielaniu powiadomień e-mail. Przykład: % s"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:583
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr ""
-"Pokaż w powiadomieniach nowe wpisy na ścianie oraz prywatne wiadomości i połączenia"
+"Pokaż w powiadomieniach nowe wpisy na ścianie oraz prywatne wiadomości i "
+"połączenia"
 
 #: ../../Zotlabs/Module/Settings/Channel.php:585
 msgid "Notify me of events this many days in advance"
@@ -8110,14 +8235,6 @@ msgstr "Ustawienia zapisane. Proszę ponownie załadować stronę."
 msgid "Conversation Settings"
 msgstr "Ustawienia rozmów"
 
-#: ../../Zotlabs/Module/Probe.php:19
-msgid "Remote Diagnostics App"
-msgstr "Aplikacja Zdalna Diagnostyka"
-
-#: ../../Zotlabs/Module/Probe.php:20
-msgid "Perform diagnostics on remote channels"
-msgstr "Przeprowadź diagnostykę zdalnych kanałów"
-
 #: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
 msgid "Invite App"
 msgstr "Aplikacja Zaproszenie"
@@ -8186,7 +8303,7 @@ msgstr "Zaproszenia nie zostały skonfigurowane"
 
 #: ../../Zotlabs/Module/Invite.php:316
 msgid "Contact the site admin"
-msgstr "Skontaktuj siÄ™ z administratorem witryny"
+msgstr "Skontaktuj siÄ™ z administratorem portalu"
 
 #: ../../Zotlabs/Module/Invite.php:332
 msgid "Invites by users not enabled"
@@ -8226,7 +8343,8 @@ msgstr "Zaproszenia, z których korzystamy"
 
 #: ../../Zotlabs/Module/Invite.php:537
 msgid "§ Note, the email(s) sent will be recorded in the system logs"
-msgstr "§ Uwaga, wysłane wiadomości e-mail zostaną zapisane w dziennikach systemowych"
+msgstr ""
+"§ Uwaga, wysłane wiadomości e-mail zostaną zapisane w dziennikach systemowych"
 
 #: ../../Zotlabs/Module/Invite.php:538
 msgid "Enter email addresses, one per line:"
@@ -8257,7 +8375,7 @@ msgstr "O tym portalu"
 
 #: ../../Zotlabs/Module/Siteinfo.php:22
 msgid "Site Name"
-msgstr "Nazwa witryny"
+msgstr "Nazwa portalu"
 
 #: ../../Zotlabs/Module/Siteinfo.php:26
 msgid "Administrator"
@@ -8269,13 +8387,14 @@ msgstr "Informacje o oprogramowaniu i projekcie"
 
 #: ../../Zotlabs/Module/Siteinfo.php:30
 msgid "This site is powered by $Projectname"
-msgstr "Ta witryna jest oparta na $Projectname"
+msgstr "Ten portal jest oparty na $Projectname"
 
 #: ../../Zotlabs/Module/Siteinfo.php:31
-msgid "Federated and decentralised networking and identity services provided by Zot"
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
 msgstr ""
-"Sfederowane i zdecentralizowane usługi sieciowe i tożsamości wykorzystujące protokół "
-"Zot"
+"Sfederowane i zdecentralizowane usługi sieciowe i tożsamości wykorzystujące "
+"protokół Zot"
 
 #: ../../Zotlabs/Module/Siteinfo.php:34
 msgid "Additional federated transport protocols:"
@@ -8298,27 +8417,27 @@ msgstr "Strona główna developerów"
 msgid "No service class restrictions found."
 msgstr "Nie znaleziono ograniczeń klasy usług."
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Zotlabs/Module/Rbmark.php:93
 msgid "Select a bookmark folder"
 msgstr "Wybierz folder zakładek"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Zotlabs/Module/Rbmark.php:98
 msgid "Save Bookmark"
 msgstr "Zapisz zakładkę"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Zotlabs/Module/Rbmark.php:99
 msgid "URL of bookmark"
 msgstr "URL zakładki"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Zotlabs/Module/Rbmark.php:104
 msgid "Or enter new bookmark folder name"
 msgstr "Lub wprowadź nową nazwę folderu zakładek"
 
-#: ../../Zotlabs/Module/Lang.php:17
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
 msgid "Language App"
 msgstr "Aplikacja Język"
 
-#: ../../Zotlabs/Module/Lang.php:18
+#: ../../Zotlabs/Module/Lang.php:64
 msgid "Change UI language"
 msgstr "Zmień język interfejsu użytkownika"
 
@@ -8330,34 +8449,35 @@ msgstr "Witamy w Hubzilla!"
 msgid "You have got no unseen posts..."
 msgstr "Nie masz żadnych nieoglądniętych wpisów..."
 
-#: ../../Zotlabs/Module/Cover_photo.php:196 ../../Zotlabs/Module/Cover_photo.php:254
+#: ../../Zotlabs/Module/Cover_photo.php:196
+#: ../../Zotlabs/Module/Cover_photo.php:254
 msgid "Cover Photos"
 msgstr "Zdjęcia na okładkę"
 
-#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4966
+#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4622
 msgid "female"
 msgstr "kobieta"
 
-#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4967
+#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4623
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s zaktualizował jej %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4968
+#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4624
 msgid "male"
 msgstr "mężczyzna"
 
-#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4969
+#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4625
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s zaktualizował jego %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4971
+#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4627
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s zaktualizował ich %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2356
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2276
 msgid "cover photo"
 msgstr "zdjęcie okładkowe"
 
@@ -8405,7 +8525,7 @@ msgstr "Menu może służyć do przechowywania zapisanych zakładek"
 msgid "Submit and proceed"
 msgstr "Prześlij i kontynuuj"
 
-#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2713
+#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2674
 msgid "Menus"
 msgstr "Kolekcja menu"
 
@@ -8495,11 +8615,11 @@ msgstr "Nowe źródło"
 
 #: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
 msgid ""
-"Import all or selected content from the following channel into this channel and "
-"distribute it according to your channel settings."
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
-"Zaimportuj wszystkie lub wybrane treści z następującego kanału do tego kanału i "
-"rozpowszechniaj je zgodnie z ustawieniami kanału."
+"Zaimportuj wszystkie lub wybrane treści z następującego kanału do tego "
+"kanału i rozpowszechniaj je zgodnie z ustawieniami kanału."
 
 #: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
 msgid "Only import content with these words (one per line)"
@@ -8514,14 +8634,16 @@ msgid "Channel Name"
 msgstr "Nazwa kanału"
 
 #: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
-msgid "Add the following categories to posts imported from this source (comma separated)"
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
 msgstr ""
-"Dodaj następujące kategorie do wpisów zaimportowanych z tego źródła (oddzielone "
-"przecinkami)"
+"Dodaj następujące kategorie do wpisów zaimportowanych z tego źródła "
+"(rozdzielone przecinkami)"
 
 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
 msgid "Resend posts with this channel as author"
-msgstr "Wyślij ponownie wpisy z tym kanałem jako autorem"
+msgstr "Wyślij ponownie wpisy z tym kanałem jako autor"
 
 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
 msgid "Copyrights may apply"
@@ -8549,14 +8671,14 @@ msgstr "Nie można usunąć źródła."
 
 #: ../../Zotlabs/Module/Poke.php:165
 msgid "Poke App"
-msgstr "Aplikacja kuksaniec"
+msgstr "Aplikacja Zaczepka"
 
 #: ../../Zotlabs/Module/Poke.php:166
 msgid "Poke somebody in your addressbook"
 msgstr "Zaczep kogoś w swojej książce adresowej"
 
 #: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:351
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1138
 msgid "Poke"
 msgstr "Zaczepka"
 
@@ -8652,7 +8774,7 @@ msgstr "Kategoria plików"
 
 #: ../../Zotlabs/Storage/Browser.php:362
 msgid "Total"
-msgstr "Ogólnie"
+msgstr "Ogółem"
 
 #: ../../Zotlabs/Storage/Browser.php:364
 msgid "Shared"
@@ -8726,11 +8848,11 @@ msgstr "OSTRZEŻENIE:"
 
 #: ../../Zotlabs/Storage/Browser.php:537
 msgid "Create new folder"
-msgstr "Stwórz nowy folder"
+msgstr "Utwórz nowy folder"
 
 #: ../../Zotlabs/Storage/Browser.php:539
 msgid "Upload file"
-msgstr "Przesyłanie pliku"
+msgstr "Prześlij plik"
 
 #: ../../Zotlabs/Storage/Browser.php:551
 msgid "Drop files here to immediately upload"
@@ -8738,36 +8860,21 @@ msgstr "Upuść pliki tutaj, aby natychmiast przesłać"
 
 #: ../../Zotlabs/Storage/Browser.php:554
 msgid ""
-"You can select files via the upload button or drop them right here or into an existing "
-"folder."
-msgstr ""
-"Możesz wybrać pliki za pomocą przycisku przesyłania lub upuścić je tutaj lub do "
-"istniejÄ…cego folderu."
-
-#: ../../Zotlabs/Zot/Auth.php:154
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please logout "
-"and retry."
+"You can select files via the upload button or drop them right here or into "
+"an existing folder."
 msgstr ""
-"Zdalne uwierzytelnianie zablokowane. JesteÅ› zalogowany lokalnie na tej stronie. "
-"Wyloguj się i spróbuj ponownie."
-
-#: ../../Zotlabs/Zot/Auth.php:266
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:76
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:178
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Witaj %s. Zdalne uwierzytelnianie powiodło się."
+"Możesz wybrać pliki za pomocą przycisku przesyłania lub upuścić je tutaj lub "
+"do istniejÄ…cego folderu."
 
 #: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:23
 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."
+"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 ""
-"Przywrócono usuniętą grupę o tej nazwie. Istniejące uprawnienia dotyczące elementów "
-"<strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie "
-"tego chciałeś, utwórz kolejną grupę o innej nazwie."
+"Przywrócono usuniętą grupę o tej nazwie. Istniejące uprawnienia dotyczące "
+"elementów <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych "
+"członków. Jeśli nie tego chciałeś, utwórz kolejną grupę o innej nazwie."
 
 #: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:271
 msgid "Add new connections to this privacy group"
@@ -8796,27 +8903,26 @@ msgid "add"
 msgstr "dodaj"
 
 #: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
-#: ../../include/follow.php:39
 msgid "Channel is blocked on this site."
 msgstr "Kanał jest zablokowany na tym portalu."
 
-#: ../../Zotlabs/Lib/Connect.php:51 ../../include/follow.php:44
+#: ../../Zotlabs/Lib/Connect.php:51
 msgid "Channel location missing."
 msgstr "Brak lokalizacji kanału."
 
-#: ../../Zotlabs/Lib/Connect.php:103 ../../include/follow.php:168
+#: ../../Zotlabs/Lib/Connect.php:103
 msgid "Remote channel or protocol unavailable."
 msgstr "Niedostępny jest zdalny kanał lub protokół."
 
-#: ../../Zotlabs/Lib/Connect.php:137 ../../include/follow.php:192
+#: ../../Zotlabs/Lib/Connect.php:137
 msgid "Channel discovery failed."
 msgstr "Wyszukanie kanału nie powiodło się."
 
-#: ../../Zotlabs/Lib/Connect.php:155 ../../include/follow.php:204
+#: ../../Zotlabs/Lib/Connect.php:155
 msgid "Protocol disabled."
 msgstr "Protokół wyłączony."
 
-#: ../../Zotlabs/Lib/Connect.php:167 ../../include/follow.php:215
+#: ../../Zotlabs/Lib/Connect.php:167
 msgid "Cannot connect to yourself."
 msgstr "Nie można połączyć się ze sobą."
 
@@ -8830,7 +8936,7 @@ msgstr "Aplikacje"
 
 #: ../../Zotlabs/Lib/Apps.php:324
 msgid "Affinity Tool"
-msgstr "Narzędzie Zaprzyjaźnienia"
+msgstr "Narzędzie więzi"
 
 #: ../../Zotlabs/Lib/Apps.php:327
 msgid "Site Admin"
@@ -8867,8 +8973,8 @@ msgstr "Zdalna diagnostyka"
 msgid "Suggest Channels"
 msgstr "Proponowane kanały"
 
-#: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127 ../../include/nav.php:131
-#: ../../boot.php:1716
+#: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127
+#: ../../include/nav.php:131 ../../boot.php:1720
 msgid "Login"
 msgstr "Zaloguj siÄ™"
 
@@ -8884,8 +8990,8 @@ msgstr "Wiki"
 msgid "Channel Home"
 msgstr "Strona główna kanału"
 
-#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:82 ../../include/nav.php:463
-#: ../../include/nav.php:466
+#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:82
+#: ../../include/nav.php:463 ../../include/nav.php:466
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -9018,13 +9124,13 @@ msgstr "Aktualizacja %s nie powiodła się. Zobacz dzienniki błędów."
 
 #: ../../Zotlabs/Lib/AccessList.php:28
 msgid ""
-"A deleted list with this name was revived. Existing item permissions <strong>may</"
-"strong> apply to this list and any future members. If this is not what you intended, "
-"please create another list with a different name."
+"A deleted list with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this list and any future members. If this is "
+"not what you intended, please create another list with a different name."
 msgstr ""
-"Przywrócono usuniętą listę o tej nazwie. Istniejące uprawnienia dotyczące elementów "
-"<strong>mogą</strong> dotyczyć tej listy i wszystkich przyszłych członków. Jeśli nie "
-"tego chciałeś, utwórz kolejną listę z inną nazwą."
+"Przywrócono usuniętą listę o tej nazwie. Istniejące uprawnienia dotyczące "
+"elementów <strong>mogą</strong> dotyczyć tej listy i wszystkich przyszłych "
+"członków. Jeśli nie tego chciałeś, utwórz kolejną listę z inną nazwą."
 
 #: ../../Zotlabs/Lib/AccessList.php:286
 msgid "Add new connections to this access list"
@@ -9095,8 +9201,8 @@ msgid "$Projectname Notification"
 msgstr "Powiadomienie $Projectname"
 
 #: ../../Zotlabs/Lib/Enotify.php:61
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:336
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:349
+#: ../../extend/addon/hubzilla-addons/diaspora/util.php:337
+#: ../../extend/addon/hubzilla-addons/diaspora/util.php:350
 #: ../../extend/addon/hubzilla-addons/diaspora/p.php:48
 msgid "$projectname"
 msgstr "$Projectname"
@@ -9118,7 +9224,9 @@ msgstr "Ta wiadomość e-mail została wysłana przez %1$s z %2$s."
 
 #: ../../Zotlabs/Lib/Enotify.php:67
 #, php-format
-msgid "To stop receiving these messages, please adjust your Notification Settings at %s"
+msgid ""
+"To stop receiving these messages, please adjust your Notification Settings "
+"at %s"
 msgstr "Aby nie otrzymywać tych wiadomości, zmień ustawienia powiadomień na %s"
 
 #: ../../Zotlabs/Lib/Enotify.php:68
@@ -9153,7 +9261,8 @@ msgstr "prywatna wiadomość"
 #: ../../Zotlabs/Lib/Enotify.php:131
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Odwiedź %s, aby wyświetlić albo odpowiedzieć na swoje prywatne wiadomości."
+msgstr ""
+"Odwiedź %s, aby wyświetlić albo odpowiedzieć na swoje prywatne wiadomości."
 
 #: ../../Zotlabs/Lib/Enotify.php:144
 msgid "commented on"
@@ -9161,11 +9270,11 @@ msgstr "skomentował"
 
 #: ../../Zotlabs/Lib/Enotify.php:157
 msgid "liked"
-msgstr "ocenił pozytywnie"
+msgstr "pochwalone"
 
 #: ../../Zotlabs/Lib/Enotify.php:160
 msgid "disliked"
-msgstr "ocenił negatywnie"
+msgstr "zganione"
 
 #: ../../Zotlabs/Lib/Enotify.php:165
 msgid "voted on"
@@ -9216,17 +9325,17 @@ msgstr "Odwiedź %s, aby zaakceptować lub odrzucić ten komentarz."
 #: ../../Zotlabs/Lib/Enotify.php:306
 #, php-format
 msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
-msgstr "%1$s ocenił pozytywnie [zrl=%2$s]Twój %3$s[/zrl]"
+msgstr "%1$s pochwalił [zrl=%2$s]Twój %3$s[/zrl]"
 
 #: ../../Zotlabs/Lib/Enotify.php:320
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Ocena poytywna wysłana dla rozmowy #%1$d przez %2$s"
+msgstr "[$Projectname:Notify] Pochwała wysłana dla rozmowy #%1$d przez %2$s"
 
 #: ../../Zotlabs/Lib/Enotify.php:321
 #, php-format
 msgid "%1$s liked an item/conversation you created."
-msgstr "%1$s ocenił pozytywnie utworzony przez Ciebie element/rozmowę."
+msgstr "%1$s pochwalił utworzony przez Ciebie element/rozmowę."
 
 #: ../../Zotlabs/Lib/Enotify.php:332
 #, php-format
@@ -9366,6 +9475,10 @@ msgstr "skomentował wpis %s"
 msgid "repeated %s's post"
 msgstr "powtórzony wpis %s"
 
+#: ../../Zotlabs/Lib/Enotify.php:829 ../../Zotlabs/Lib/Enotify.php:931
+msgid "shared a file with you"
+msgstr "udostępnił Ci plik"
+
 #: ../../Zotlabs/Lib/Enotify.php:837
 #, php-format
 msgid "edited a post dated %s"
@@ -9376,6 +9489,22 @@ msgstr "edytował wpis z dnia %s"
 msgid "edited a comment dated %s"
 msgstr "edytował komentarz z dnia %s"
 
+#: ../../Zotlabs/Lib/Enotify.php:914
+msgid "added your channel"
+msgstr "dodał Twój kanał"
+
+#: ../../Zotlabs/Lib/Enotify.php:948
+msgid "sent you a private message"
+msgstr "wysłał Ci prywatną wiadomość"
+
+#: ../../Zotlabs/Lib/Enotify.php:957
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../Zotlabs/Lib/Enotify.php:960
+msgid "[today]"
+msgstr "[dzisiaj]"
+
 #: ../../Zotlabs/Lib/Enotify.php:970
 msgid "created an event"
 msgstr "utworzono wydarzenie"
@@ -9384,12 +9513,13 @@ msgstr "utworzono wydarzenie"
 msgid "status verified"
 msgstr "status został  zweryfikowany"
 
-#: ../../Zotlabs/Lib/Libsync.php:740 ../../include/zot.php:2663
+#: ../../Zotlabs/Lib/Libsync.php:737
 #, php-format
 msgid "Unable to verify site signature for %s"
-msgstr "Nie można zweryfikować podpisu witryny dla %s"
+msgstr "Nie można zweryfikować podpisu portalu dla %s"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42 ../../Zotlabs/Lib/NativeWikiPage.php:94
+#: ../../Zotlabs/Lib/NativeWikiPage.php:42
+#: ../../Zotlabs/Lib/NativeWikiPage.php:94
 msgid "(No Title)"
 msgstr "(Brak tytułu)"
 
@@ -9405,7 +9535,8 @@ msgstr "Nie znaleziono wiki."
 msgid "Destination name already exists"
 msgstr "Nazwa celu już istnieje"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:167 ../../Zotlabs/Lib/NativeWikiPage.php:368
+#: ../../Zotlabs/Lib/NativeWikiPage.php:167
+#: ../../Zotlabs/Lib/NativeWikiPage.php:368
 msgid "Page not found"
 msgstr "Strona nie znaleziona"
 
@@ -9413,8 +9544,10 @@ msgstr "Strona nie znaleziona"
 msgid "Error reading page content"
 msgstr "Błąd podczas odczytu zawartości strony"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359 ../../Zotlabs/Lib/NativeWikiPage.php:409
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480 ../../Zotlabs/Lib/NativeWikiPage.php:522
+#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Zotlabs/Lib/NativeWikiPage.php:409
+#: ../../Zotlabs/Lib/NativeWikiPage.php:480
+#: ../../Zotlabs/Lib/NativeWikiPage.php:522
 msgid "Error reading wiki"
 msgstr "BÅ‚Ä…d podczas odczytu wiki"
 
@@ -9442,16 +9575,19 @@ msgstr "Bez tytułu"
 msgid "Wiki resource_id required for git commit"
 msgstr "Identyfikator zasobu Wiki wymagany do zatwierdzenia przez Git"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577 ../../Zotlabs/Widget/Wiki_page_history.php:23
+#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:578 ../../Zotlabs/Widget/Wiki_page_history.php:24
+#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+#: ../../Zotlabs/Widget/Wiki_page_history.php:24
 msgid "Date"
 msgstr "Data"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:580 ../../Zotlabs/Widget/Wiki_page_history.php:26
+#: ../../Zotlabs/Lib/NativeWikiPage.php:580
+#: ../../Zotlabs/Widget/Wiki_page_history.php:26
 msgid "Compare"
 msgstr "Porównaj"
 
@@ -9517,11 +9653,11 @@ msgstr "Narzędzia do konwersacji"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584
 msgid "like"
-msgstr "lubi"
+msgstr "pochwaa"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:319 ../../include/taxonomy.php:585
 msgid "dislike"
-msgstr "nie lubi"
+msgstr "gani"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:320
 msgid "Reply on this comment"
@@ -9602,7 +9738,7 @@ msgstr "Uczestnicz"
 msgid "Attendance Options"
 msgstr "Opcje uczestnictwa"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1924
+#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1906
 msgid "Vote"
 msgstr "GÅ‚osuj"
 
@@ -9645,27 +9781,27 @@ msgstr "Ten podgląd nie został zapisany"
 msgid "%s show all"
 msgstr "%s pokaż wszystko"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1451
+#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1446
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:200
 msgid "Bold"
 msgstr "Grube"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1452
+#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1447
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:201
 msgid "Italic"
 msgstr "Pochyłe"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1453
+#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1448
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:202
 msgid "Underline"
 msgstr "Podkreślone"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1454
+#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1449
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:203
 msgid "Quote"
 msgstr "Cytat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1455
+#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1450
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:204
 msgid "Code"
 msgstr "Kod"
@@ -9674,7 +9810,7 @@ msgstr "Kod"
 msgid "Image"
 msgstr "Obraz"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1456
+#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1451
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:205
 msgid "Attach/Upload file"
 msgstr "Załącz/Prześlij plik"
@@ -9697,42 +9833,43 @@ msgstr "Twój adres e-mail (wymagane)"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:848
 msgid "Your website URL (optional)"
-msgstr "Adres URL Twojej witryny (opcjonalnie)"
+msgstr "Adres URL Twojego portalu (opcjonalnie)"
 
-#: ../../Zotlabs/Lib/Activity.php:2163
+#: ../../Zotlabs/Lib/Activity.php:2159
 #, php-format
 msgid "Likes %1$s's %2$s"
-msgstr "Lubi %2$s %1$s"
+msgstr "Pochwalił %2$s %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2166
+#: ../../Zotlabs/Lib/Activity.php:2162
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
-msgstr "Nie lubi %2$s %1$s"
+msgstr "Zganił %2$s %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2172
+#: ../../Zotlabs/Lib/Activity.php:2168
 #, php-format
 msgid "Will attend %s's event"
 msgstr "Weźmie udział w wydarzeniu %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2175
+#: ../../Zotlabs/Lib/Activity.php:2171
 #, php-format
 msgid "Will not attend %s's event"
 msgstr "Nie weźmie udziału w wydarzeniu %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2178
+#: ../../Zotlabs/Lib/Activity.php:2174
 #, php-format
 msgid "May attend %s's event"
 msgstr "Może uczestniczyć w wydarzeniu %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2181
+#: ../../Zotlabs/Lib/Activity.php:2177
 #, php-format
 msgid "May not attend %s's event"
 msgstr "Nie może uczestniczyć w wydarzeniu %s"
 
-#: ../../Zotlabs/Lib/Activity.php:3114 ../../Zotlabs/Lib/Activity.php:3306
-#: ../../include/network.php:1767 ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1490
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1939
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2147
+#: ../../Zotlabs/Lib/Activity.php:3098 ../../Zotlabs/Lib/Activity.php:3290
+#: ../../include/network.php:1742
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1500
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1949
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2157
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
@@ -9780,15 +9917,17 @@ msgctxt "permcat"
 msgid "publisher"
 msgstr "wydawca"
 
-#: ../../Zotlabs/Lib/Libzot.php:655 ../../include/zot.php:805
+#: ../../Zotlabs/Lib/Libzot.php:655
 msgid "Unable to verify channel signature"
 msgstr "Nie można zweryfikować podpisu kanału"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34 ../../include/acl_selectors.php:33
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:33
 msgid "Visible to your default audience"
 msgstr "Widoczne dla domyślnych odbiorców"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:107 ../../include/acl_selectors.php:136
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:136
 msgid "Only me"
 msgstr "Tylko ja"
 
@@ -9822,27 +9961,35 @@ msgid "Any connections including those who haven't yet been approved"
 msgstr "Wszelkie połączenia, w tym te, które nie zostały jeszcze zatwierdzone"
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid "This is your default setting for the audience of your normal stream, and posts."
-msgstr "To jest domyślne ustawienie odbiorców Twojego normalnego strumienia i wpisów."
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+"To jest domyślne ustawienie odbiorców Twojego normalnego strumienia i wpisów."
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid "This is your default setting for who can view your default channel profile"
+msgid ""
+"This is your default setting for who can view your default channel profile"
 msgstr ""
-"To jest domyślne ustawienie określające, kto może wyświetlać Twój domyślny profil "
-"kanału"
+"To jest domyślne ustawienie określające, kto może wyświetlać Twój domyślny "
+"profil kanału"
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:152
 msgid "This is your default setting for who can view your connections"
-msgstr "To jest domyślne ustawienie określające, kto może wyświetlać Twoje połączenia"
+msgstr ""
+"To jest domyślne ustawienie określające, kto może wyświetlać Twoje połączenia"
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid "This is your default setting for who can view your file storage and photos"
+msgid ""
+"This is your default setting for who can view your file storage and photos"
 msgstr ""
-"Jest to domyślne ustawienie określające, kto może przeglądać magazyn plików i zdjęć"
+"Jest to domyślne ustawienie określające, kto może przeglądać magazyn plików "
+"i zdjęć"
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:154
 msgid "This is your default setting for the audience of your webpages"
-msgstr "To jest domyślne ustawienie dotyczące odbiorców Twoich stron internetowych"
+msgstr ""
+"To jest domyślne ustawienie dotyczące odbiorców Twoich stron internetowych"
 
 #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:115
@@ -9927,7 +10074,8 @@ msgstr "Importuj książkę adresową"
 msgid "Select an addressbook to import to"
 msgstr "Wybierz książkę adresową do zaimportowania"
 
-#: ../../Zotlabs/Widget/Filer.php:28 ../../Zotlabs/Widget/Activity_filter.php:189
+#: ../../Zotlabs/Widget/Filer.php:28
+#: ../../Zotlabs/Widget/Activity_filter.php:189
 #: ../../include/contact_widgets.php:53 ../../include/features.php:318
 msgid "Saved Folders"
 msgstr "Zapisywane foldery"
@@ -9957,7 +10105,8 @@ msgstr "Oceń mnie"
 msgid "View Ratings"
 msgstr "Pokaż oceny"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:34 ../../Zotlabs/Widget/Wiki_pages.php:91
+#: ../../Zotlabs/Widget/Wiki_pages.php:34
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
 msgid "Add new page"
 msgstr "Dodaj nowÄ… stronÄ™"
 
@@ -9971,14 +10120,16 @@ msgstr "Nazwa strony"
 
 #: ../../Zotlabs/Widget/Bookmarkedchats.php:24
 msgid "Bookmarked Chatrooms"
-msgstr "Czaty dodane do zakładek"
+msgstr "Czaty z zakładkami"
 
 #: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
 msgid "photo/image"
 msgstr "zdjęcie/obraz"
 
-#: ../../Zotlabs/Widget/Forums.php:100 ../../Zotlabs/Widget/Activity_filter.php:123
-#: ../../Zotlabs/Widget/Notifications.php:139 ../../Zotlabs/Widget/Notifications.php:140
+#: ../../Zotlabs/Widget/Forums.php:100
+#: ../../Zotlabs/Widget/Activity_filter.php:123
+#: ../../Zotlabs/Widget/Notifications.php:124
+#: ../../Zotlabs/Widget/Notifications.php:125
 #: ../../include/acl_selectors.php:125
 msgid "Forums"
 msgstr "Fora"
@@ -10046,7 +10197,7 @@ msgstr "PrzeglÄ…d"
 
 #: ../../Zotlabs/Widget/Appstore.php:11
 msgid "App Collections"
-msgstr "Kolekcja aplikacji"
+msgstr "Kolekcje aplikacji"
 
 #: ../../Zotlabs/Widget/Appstore.php:13
 msgid "Installed apps"
@@ -10096,10 +10247,6 @@ msgstr "Skrzynka odbiorcza"
 msgid "Outbox"
 msgstr "Skrzynka nadawcza"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
-msgid "New Message"
-msgstr "Nowy komunikat"
-
 #: ../../Zotlabs/Widget/Affinity.php:54
 msgid "Refresh"
 msgstr "Odśwież"
@@ -10223,20 +10370,25 @@ msgstr "Powiadomienia o nowej aktywności sieciowej"
 msgid "View your network activity"
 msgstr "Wyświetl swoją aktywność w sieci"
 
-#: ../../Zotlabs/Widget/Notifications.php:23 ../../Zotlabs/Widget/Notifications.php:62
+#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Zotlabs/Widget/Notifications.php:62
 msgid "Mark all notifications read"
 msgstr "Oznacz wszystkie powiadomienia jako przeczytane"
 
-#: ../../Zotlabs/Widget/Notifications.php:26 ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:65 ../../Zotlabs/Widget/Notifications.php:172
+#: ../../Zotlabs/Widget/Notifications.php:26
+#: ../../Zotlabs/Widget/Notifications.php:46
+#: ../../Zotlabs/Widget/Notifications.php:65
+#: ../../Zotlabs/Widget/Notifications.php:157
 msgid "Show new posts only"
 msgstr "Pokaż tylko nowe wpisy"
 
-#: ../../Zotlabs/Widget/Notifications.php:27 ../../Zotlabs/Widget/Notifications.php:47
-#: ../../Zotlabs/Widget/Notifications.php:66 ../../Zotlabs/Widget/Notifications.php:142
-#: ../../Zotlabs/Widget/Notifications.php:173
+#: ../../Zotlabs/Widget/Notifications.php:27
+#: ../../Zotlabs/Widget/Notifications.php:47
+#: ../../Zotlabs/Widget/Notifications.php:66
+#: ../../Zotlabs/Widget/Notifications.php:127
+#: ../../Zotlabs/Widget/Notifications.php:158
 msgid "Filter by name or address"
-msgstr "Filtruj według nazwy lub adresu"
+msgstr "Filtruj wg nazwy lub adresu"
 
 # Sprawdzić w kontekście!
 #: ../../Zotlabs/Widget/Notifications.php:36
@@ -10251,7 +10403,8 @@ msgstr "Powiadomienia o nowej aktywności domowej"
 msgid "View your home activity"
 msgstr "Wyświetl swoją aktywność domową"
 
-#: ../../Zotlabs/Widget/Notifications.php:43 ../../Zotlabs/Widget/Notifications.php:169
+#: ../../Zotlabs/Widget/Notifications.php:43
+#: ../../Zotlabs/Widget/Notifications.php:154
 msgid "Mark all notifications seen"
 msgstr "Oznacz wszystkie powiadomienia jako oglądnięte"
 
@@ -10268,82 +10421,67 @@ msgid "View your direct messages"
 msgstr "Wyświetl swoje bezpośrednie wiadomości"
 
 #: ../../Zotlabs/Widget/Notifications.php:74
-msgid "New Mails"
-msgstr "Nowe wiadomości e-mail"
-
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New Mails Notifications"
-msgstr "Powiadomienia o nowych wiadomościach e-mail"
-
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View your private mails"
-msgstr "Zobacz swoje prywatne wiadomości"
-
-#: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all messages seen"
-msgstr "Oznacz wszystkie wiadomości jako oglądnięte"
-
-#: ../../Zotlabs/Widget/Notifications.php:89
 msgid "New Events"
 msgstr "Nowe wydarzenia"
 
-#: ../../Zotlabs/Widget/Notifications.php:90
+#: ../../Zotlabs/Widget/Notifications.php:75
 msgid "New Events Notifications"
 msgstr "Powiadomienia o nowych wydarzeniach"
 
-#: ../../Zotlabs/Widget/Notifications.php:93
+#: ../../Zotlabs/Widget/Notifications.php:78
 msgid "View events"
 msgstr "Pokaż wydarzenia"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Zotlabs/Widget/Notifications.php:81
 msgid "Mark all events seen"
 msgstr "Oznacza wydarzenia jako oglądnięte"
 
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Zotlabs/Widget/Notifications.php:90
 msgid "New Connections Notifications"
 msgstr "Powiadomienia o nowych połączeniach"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Zotlabs/Widget/Notifications.php:93
 msgid "View all connections"
 msgstr "Pokaż wszystkie połączenia"
 
-#: ../../Zotlabs/Widget/Notifications.php:116
+#: ../../Zotlabs/Widget/Notifications.php:101
 msgid "New Files"
 msgstr "Nowe pliki"
 
-#: ../../Zotlabs/Widget/Notifications.php:117
+#: ../../Zotlabs/Widget/Notifications.php:102
 msgid "New Files Notifications"
 msgstr "Powiadomienia o nowych plikach"
 
-#: ../../Zotlabs/Widget/Notifications.php:124 ../../Zotlabs/Widget/Notifications.php:125
+#: ../../Zotlabs/Widget/Notifications.php:109
+#: ../../Zotlabs/Widget/Notifications.php:110
 msgid "Notices"
 msgstr "Powiadomienia"
 
-#: ../../Zotlabs/Widget/Notifications.php:128
+#: ../../Zotlabs/Widget/Notifications.php:113
 msgid "View all notices"
 msgstr "Pokaż wszystkie powiadomienia"
 
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Zotlabs/Widget/Notifications.php:116
 msgid "Mark all notices seen"
 msgstr "Oznacz wszystkie powiadomienia jako oglądnięte"
 
-#: ../../Zotlabs/Widget/Notifications.php:152
+#: ../../Zotlabs/Widget/Notifications.php:137
 msgid "New Registrations"
 msgstr "Nowe rejestracje"
 
-#: ../../Zotlabs/Widget/Notifications.php:153
+#: ../../Zotlabs/Widget/Notifications.php:138
 msgid "New Registrations Notifications"
 msgstr "Powiadomienia o nowych rejestracjach"
 
-#: ../../Zotlabs/Widget/Notifications.php:163
+#: ../../Zotlabs/Widget/Notifications.php:148
 msgid "Public Stream Notifications"
 msgstr "Powiadomienia o strumieniu publicznym"
 
-#: ../../Zotlabs/Widget/Notifications.php:166
+#: ../../Zotlabs/Widget/Notifications.php:151
 msgid "View the public stream"
 msgstr "Pokaż strumień publiczny"
 
-#: ../../Zotlabs/Widget/Notifications.php:181
+#: ../../Zotlabs/Widget/Notifications.php:166
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "W tej chwili nie masz żadnych powiadomień"
 
@@ -10376,23 +10514,23 @@ msgstr "ZarzÄ…dzaj lokalizacjami"
 msgid "Suggested Chatrooms"
 msgstr "Sugerowane czaty"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:15
 msgid "Received Messages"
 msgstr "Otrzymane wiadomości"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Zotlabs/Widget/Conversations.php:19
 msgid "Sent Messages"
 msgstr "Wysłane wiadomości"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Zotlabs/Widget/Conversations.php:23
 msgid "Conversations"
 msgstr "Rozmowy"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Zotlabs/Widget/Conversations.php:33
 msgid "No messages."
 msgstr "Brak wiadomości."
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Zotlabs/Widget/Conversations.php:53
 msgid "Delete conversation"
 msgstr "Usuń rozmowę"
 
@@ -10426,7 +10564,7 @@ msgstr "Zarządzaj swoimi połączeniami"
 
 #: ../../Zotlabs/Widget/Newmember.php:45
 msgid "Communicate"
-msgstr "Komunikuj siÄ™"
+msgstr "Skomunikuj siÄ™"
 
 #: ../../Zotlabs/Widget/Newmember.php:47
 msgid "View your channel homepage"
@@ -10434,7 +10572,7 @@ msgstr "Wyświetl stronę główną swojego kanału"
 
 #: ../../Zotlabs/Widget/Newmember.php:48
 msgid "View your network stream"
-msgstr "Wyświetl swój strumień sieciowy"
+msgstr "Wyświetl swój strumień"
 
 #: ../../Zotlabs/Widget/Newmember.php:54
 msgid "Documentation"
@@ -10512,12 +10650,12 @@ msgstr "Wyświetl wszystkie %d popularne połączenia"
 #: ../../include/conversation.php:183
 #, php-format
 msgid "likes %1$s's %2$s"
-msgstr "ocenił pozytywnie %2$s %1$s"
+msgstr "pochwalił %2$s %1$s"
 
 #: ../../include/conversation.php:186
 #, php-format
 msgid "doesn't like %1$s's %2$s"
-msgstr "ocenił negatywnie %1$s %2$s"
+msgstr "zganił %1$s %2$s"
 
 #: ../../include/conversation.php:226 ../../include/conversation.php:228
 #, php-format
@@ -10545,7 +10683,7 @@ msgstr "Kategorie:"
 
 #: ../../include/conversation.php:803
 msgid "Filed under:"
-msgstr "Złożone pod:"
+msgstr "Skategoryzowane pod:"
 
 #: ../../include/conversation.php:828
 msgid "View in context"
@@ -10575,41 +10713,41 @@ msgstr "Obserwuj wÄ…tek"
 msgid "Unfollow Thread"
 msgstr "Przestań obserwować wątek"
 
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1108
 msgid "Edit Connection"
 msgstr "Edytuj połączenie"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1260
 #, php-format
 msgid "%s likes this."
-msgstr "%s lubi to."
+msgstr "%s pochwalił to."
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1260
 #, php-format
 msgid "%s doesn't like this."
-msgstr "%s nie lubi tego."
+msgstr "%s zganił to."
 
-#: ../../include/conversation.php:1269
+#: ../../include/conversation.php:1264
 #, 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] "<span  %1$s>%2$d osoba</span> lubi to."
-msgstr[1] "<span  %1$s>%2$d osoby</span> lubiÄ… tego."
-msgstr[2] "<span  %1$s>%2$d osób</span> lubi tego."
+msgstr[0] "<span  %1$s>%2$d osoba</span> pochwaliła to."
+msgstr[1] "<span  %1$s>%2$d osoby</span> pochwaliły to."
+msgstr[2] "<span  %1$s>%2$d osób</span> pochwaliło to."
 
-#: ../../include/conversation.php:1271
+#: ../../include/conversation.php:1266
 #, 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] "<span  %1$s>%2$d osoba</span> nie lubi to."
-msgstr[1] "<span  %1$s>%2$d osoby</span> nie lubiÄ… tego."
-msgstr[2] "<span  %1$s>%2$d osób</span> nie lubią tego."
+msgstr[0] "<span  %1$s>%2$d osoba</span> zganiła to."
+msgstr[1] "<span  %1$s>%2$d osoby</span> zganiły to."
+msgstr[2] "<span  %1$s>%2$d osób</span> zganiło to."
 
-#: ../../include/conversation.php:1277
+#: ../../include/conversation.php:1272
 msgid "and"
 msgstr "i"
 
-#: ../../include/conversation.php:1280
+#: ../../include/conversation.php:1275
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
@@ -10617,136 +10755,141 @@ msgstr[0] ", oraz %d inna osoba"
 msgstr[1] ", oraz %d inne osoby"
 msgstr[2] ", oraz %d innych osób"
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1276
 #, php-format
 msgid "%s like this."
-msgstr "%s lubi to."
+msgstr "%s pochwala to."
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1276
 #, php-format
 msgid "%s don't like this."
-msgstr "%s nie lubi tego."
+msgstr "%s gani to."
 
-#: ../../include/conversation.php:1332
+#: ../../include/conversation.php:1327
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:82
 msgid "Set your location"
 msgstr "Ustaw swojÄ… lokalizacjÄ™"
 
-#: ../../include/conversation.php:1333
+#: ../../include/conversation.php:1328
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:83
 msgid "Clear browser location"
 msgstr "Wyczyść lokalizację przeglądarki"
 
-#: ../../include/conversation.php:1349
+#: ../../include/conversation.php:1344
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:99
 msgid "Embed (existing) photo from your photo albums"
 msgstr "Osadź (istniejące) zdjęcie z albumów ze zdjęciami"
 
-#: ../../include/conversation.php:1383
+#: ../../include/conversation.php:1378
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:135
 msgid "Tag term:"
-msgstr "Termin tagu:"
+msgstr "Nazwa tagu:"
 
-#: ../../include/conversation.php:1384
+#: ../../include/conversation.php:1379
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:136
 msgid "Where are you right now?"
 msgstr "Gdzie teraz jesteÅ›?"
 
-#: ../../include/conversation.php:1389
+#: ../../include/conversation.php:1384
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:141
 msgid "Choose a different album..."
 msgstr "Wybierz inny album..."
 
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1388
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:145
 msgid "Comments enabled"
 msgstr "WÅ‚Ä…czone komentowanie"
 
-#: ../../include/conversation.php:1394
+#: ../../include/conversation.php:1389
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:146
 msgid "Comments disabled"
 msgstr "Wyłączone komentowanie"
 
-#: ../../include/conversation.php:1446
+#: ../../include/conversation.php:1441
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:195
 msgid "Page link name"
 msgstr "Nazwa linku do strony"
 
-#: ../../include/conversation.php:1449
+#: ../../include/conversation.php:1444
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:198
 msgid "Post as"
 msgstr "Opublikuj jako"
 
-#: ../../include/conversation.php:1463
+#: ../../include/conversation.php:1458
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:212
 msgid "Toggle voting"
 msgstr "Przełącz głosowanie"
 
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1459
 msgid "Toggle poll"
 msgstr "Przełącz ankietę"
 
-#: ../../include/conversation.php:1465
+#: ../../include/conversation.php:1460
 msgid "Option"
 msgstr "Opcja"
 
-#: ../../include/conversation.php:1466
+#: ../../include/conversation.php:1461
 msgid "Add option"
 msgstr "Dodaj opcjÄ™"
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Minutes"
 msgstr "Minuty"
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Hours"
 msgstr "Godziny"
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Days"
 msgstr "Dni"
 
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1463
 msgid "Allow multiple answers"
 msgstr "Zezwalaj na wiele odpowiedzi"
 
-#: ../../include/conversation.php:1470
+#: ../../include/conversation.php:1465
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:215
 msgid "Disable comments"
 msgstr "Wyłącz komentarze"
 
-#: ../../include/conversation.php:1471
+#: ../../include/conversation.php:1466
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:216
 msgid "Toggle comments"
 msgstr "Przełącz komentarze"
 
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1473
 msgid "Summary (optional)"
 msgstr "Streszczenie (opcjonalnie)"
 
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1476
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:224
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorie  (opcjonalnie, lista rozdzielana przecinkami)"
 
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1477
+#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225
+msgid "Permission settings"
+msgstr "Ustawienia dostępu"
+
+#: ../../include/conversation.php:1499
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:247
 msgid "Other networks and post services"
 msgstr "Inne sieci i usługi społecznościowe"
 
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1502
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:250
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:314
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: ../../include/conversation.php:1510
+#: ../../include/conversation.php:1505
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:253
 msgid "Set publish date"
 msgstr "Ustaw datÄ™ publikacji"
 
-#: ../../include/conversation.php:1758
+#: ../../include/conversation.php:1750
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
@@ -10754,7 +10897,7 @@ msgstr[0] "Uczestniczy"
 msgstr[1] "Uczestniczy"
 msgstr[2] "Uczestniczy"
 
-#: ../../include/conversation.php:1761
+#: ../../include/conversation.php:1753
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
@@ -10762,7 +10905,7 @@ msgstr[0] "Nie uczestniczy"
 msgstr[1] "Nie uczestniczy"
 msgstr[2] "Nie uczestniczy"
 
-#: ../../include/conversation.php:1764
+#: ../../include/conversation.php:1756
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
@@ -10770,7 +10913,7 @@ msgstr[0] "Niezdecydowany"
 msgstr[1] "Niezdecydowane"
 msgstr[2] "Niezdecydowanych"
 
-#: ../../include/conversation.php:1767
+#: ../../include/conversation.php:1759
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
@@ -10778,7 +10921,7 @@ msgstr[0] "Zgadza siÄ™"
 msgstr[1] "ZgadajÄ… siÄ™"
 msgstr[2] "Zgadza siÄ™"
 
-#: ../../include/conversation.php:1770
+#: ../../include/conversation.php:1762
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
@@ -10786,7 +10929,7 @@ msgstr[0] "Nie zgadza siÄ™"
 msgstr[1] "Nie zgadzajÄ… siÄ™"
 msgstr[2] "Nie zgadza siÄ™"
 
-#: ../../include/conversation.php:1773
+#: ../../include/conversation.php:1765
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -10794,182 +10937,188 @@ msgstr[0] "Wstrzymuje siÄ™"
 msgstr[1] "WstrzymujÄ… siÄ™"
 msgstr[2] "Wstrzymuje siÄ™"
 
-#: ../../include/channel.php:47
+#: ../../include/channel.php:46
 msgid "Unable to obtain identity information from database"
 msgstr "Nie można uzyskać informacji  z bazy danych o tożsamości"
 
-#: ../../include/channel.php:80
+#: ../../include/channel.php:79
 msgid "Empty name"
 msgstr "Pusta nazwa"
 
-#: ../../include/channel.php:83
+#: ../../include/channel.php:82
 msgid "Name too long"
 msgstr "Nazwa jest za długa"
 
-#: ../../include/channel.php:200
+#: ../../include/channel.php:199
 msgid "No account identifier"
 msgstr "Brak identyfikatora konta"
 
-#: ../../include/channel.php:295
+#: ../../include/channel.php:290
 msgid "Unable to retrieve created identity"
 msgstr "Nie można pobrać utworzonej tożsamości"
 
-#: ../../include/channel.php:442
+#: ../../include/channel.php:393
 msgid "Default Profile"
 msgstr "Domyślny profil"
 
-#: ../../include/channel.php:639 ../../include/channel.php:728
+#: ../../include/channel.php:590 ../../include/channel.php:679
 msgid "Unable to retrieve modified identity"
 msgstr "Nie można pobrać zmodyfikowanej tożsamości"
 
-#: ../../include/channel.php:1410
-msgid "Requested channel is not available."
-msgstr "Żądany kanał nie jest dostępny."
+#: ../../include/channel.php:1330
+msgid "Requested channel is not available"
+msgstr "Żądany kanał nie jest dostępny"
 
-#: ../../include/channel.php:1567
+#: ../../include/channel.php:1487
 msgid "Create New Profile"
 msgstr "Utwórz nowy profil"
 
-#: ../../include/channel.php:1570 ../../include/nav.php:120
+#: ../../include/channel.php:1490 ../../include/nav.php:120
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58
 msgid "Edit Profile"
 msgstr "Edytuj profil"
 
-#: ../../include/channel.php:1588
+#: ../../include/channel.php:1508
 msgid "Visible to everybody"
 msgstr "Widoczne dla każdego"
 
-#: ../../include/channel.php:1665 ../../include/channel.php:1793
+#: ../../include/channel.php:1585 ../../include/channel.php:1713
 msgid "Gender:"
 msgstr "Płeć:"
 
-#: ../../include/channel.php:1666 ../../include/channel.php:1837
+#: ../../include/channel.php:1586 ../../include/channel.php:1757
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/channel.php:1667 ../../include/channel.php:1861
+#: ../../include/channel.php:1587 ../../include/channel.php:1781
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: ../../include/channel.php:1668
+#: ../../include/channel.php:1588
 msgid "Online Now"
 msgstr "Teraz online"
 
-#: ../../include/channel.php:1721
+#: ../../include/channel.php:1641
 msgid "Change your profile photo"
 msgstr "Zmień swoje zdjęcie profilowe"
 
-#: ../../include/channel.php:1748 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:87
+#: ../../include/channel.php:1668 ../../include/selectors.php:60
+#: ../../include/selectors.php:77
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:87
 msgid "Female"
 msgstr "Kobieta"
 
-#: ../../include/channel.php:1750 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:85
+#: ../../include/channel.php:1670 ../../include/selectors.php:60
+#: ../../include/selectors.php:77
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:85
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: ../../include/channel.php:1752
+#: ../../include/channel.php:1672
 msgid "Trans"
 msgstr "Trans"
 
-#: ../../include/channel.php:1754 ../../include/selectors.php:60
+#: ../../include/channel.php:1674 ../../include/selectors.php:60
 msgid "Neuter"
 msgstr "Osoba aseksualna"
 
-#: ../../include/channel.php:1756 ../../include/selectors.php:60
+#: ../../include/channel.php:1676 ../../include/selectors.php:60
 msgid "Non-specific"
 msgstr "Nie określono"
 
-#: ../../include/channel.php:1798
+#: ../../include/channel.php:1718
 msgid "Like this channel"
-msgstr "Oceń pozytywnie ten kanał"
+msgstr "Pochwal ten kanał"
 
-#: ../../include/channel.php:1822
+#: ../../include/channel.php:1742
 msgid "j F, Y"
 msgstr "d M, R"
 
-#: ../../include/channel.php:1823
+#: ../../include/channel.php:1743
 msgid "j F"
 msgstr "d M"
 
-#: ../../include/channel.php:1830
+#: ../../include/channel.php:1750
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: ../../include/channel.php:1843
+#: ../../include/channel.php:1763
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "dla %1$d %2$s"
 
-#: ../../include/channel.php:1855
+#: ../../include/channel.php:1775
 msgid "Tags:"
 msgstr "Tagi:"
 
-#: ../../include/channel.php:1859
+#: ../../include/channel.php:1779
 msgid "Sexual Preference:"
 msgstr "Preferencje seksualne:"
 
-#: ../../include/channel.php:1865
+#: ../../include/channel.php:1785
 msgid "Political Views:"
 msgstr "PoglÄ…dy polityczne:"
 
-#: ../../include/channel.php:1867
+#: ../../include/channel.php:1787
 msgid "Religion:"
 msgstr "Religia:"
 
-#: ../../include/channel.php:1871
+#: ../../include/channel.php:1791
 msgid "Hobbies/Interests:"
 msgstr "Hobby/Zainteresowania:"
 
-#: ../../include/channel.php:1873
+#: ../../include/channel.php:1793
 msgid "Likes:"
-msgstr "Ocen pozytywnych:"
+msgstr "Pochwały:"
 
-#: ../../include/channel.php:1875
+#: ../../include/channel.php:1795
 msgid "Dislikes:"
-msgstr "Ocen negatywnych:"
+msgstr "Zganienia:"
 
-#: ../../include/channel.php:1877
+#: ../../include/channel.php:1797
 msgid "Contact information and Social Networks:"
 msgstr "Informacje kontaktowe i sieci społecznościowe:"
 
-#: ../../include/channel.php:1879
+#: ../../include/channel.php:1799
 msgid "My other channels:"
 msgstr "Moje inne kanały:"
 
-#: ../../include/channel.php:1881
+#: ../../include/channel.php:1801
 msgid "Musical interests:"
 msgstr "Zainteresowania muzyczne:"
 
-#: ../../include/channel.php:1883
+#: ../../include/channel.php:1803
 msgid "Books, literature:"
 msgstr "Książki, literatura:"
 
-#: ../../include/channel.php:1885
+#: ../../include/channel.php:1805
 msgid "Television:"
 msgstr "Telewizja:"
 
-#: ../../include/channel.php:1887
+#: ../../include/channel.php:1807
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film/taniec/kultura/rozrywka:"
 
-#: ../../include/channel.php:1889
+#: ../../include/channel.php:1809
 msgid "Love/Romance:"
 msgstr "Miłość/Romans:"
 
-#: ../../include/channel.php:1891
+#: ../../include/channel.php:1811
 msgid "Work/employment:"
 msgstr "Praca/Zatrudnienie:"
 
-#: ../../include/channel.php:1893
+#: ../../include/channel.php:1813
 msgid "School/education:"
 msgstr "Szkoła/Wykształcenie:"
 
-#: ../../include/channel.php:1916
+#: ../../include/channel.php:1836
 msgid "Like this thing"
 msgstr "Podobne do tej rzeczy"
 
+#: ../../include/channel.php:1837
+msgid "Export"
+msgstr "Eksportuj"
+
 #: ../../include/features.php:86
 msgid "Start calendar week on Monday"
 msgstr "Rozpocznij tydzień kalendarzowy w poniedziałek"
@@ -11016,7 +11165,9 @@ msgstr "Filtrowanie połączeń"
 
 #: ../../include/features.php:138
 msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Filtruj przychodzące wpisy z połączeń, na podstawie słów kluczowych lub treści"
+msgstr ""
+"Filtruj przychodzące wpisy z połączeń, na podstawie słów kluczowych lub "
+"treści"
 
 #: ../../include/features.php:146
 msgid "Conversation"
@@ -11032,11 +11183,11 @@ msgstr "Dodaje możliwość wstawiania reakcji emoji we wpisach"
 
 #: ../../include/features.php:166
 msgid "Dislike Posts"
-msgstr "Nielubienie wpisu"
+msgstr "Zganienia wpisów"
 
 #: ../../include/features.php:167
 msgid "Ability to dislike posts/comments"
-msgstr "Możliwość oznaczania wpisów i komentarzy jako nielubiane"
+msgstr "Możliwość oznaczania wpisów i komentarzy jako nieaprobowane"
 
 #: ../../include/features.php:174
 msgid "Star Posts"
@@ -11056,7 +11207,7 @@ msgstr "Możliwość udzielenia odpowiedzi na wybrany komentarz"
 
 #: ../../include/features.php:196
 msgid "Advanced Directory Search"
-msgstr "Zaawansowane przeszukiwanie katalogu"
+msgstr "Zaawansowane wyszukiwanie w katalogu"
 
 #: ../../include/features.php:197
 msgid "Allows creation of complex directory search queries"
@@ -11080,21 +11231,22 @@ msgstr "Duże zdjęcia"
 
 #: ../../include/features.php:219
 msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) "
-"photo thumbnails"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
-"Możliwość zamieszczania dużych miniatur zdjęć (1024px) we wpisach. Jeśli nie jest to "
-"włączone, można używać tylko małych miniatur (640 px)"
+"Możliwość zamieszczania dużych miniatur zdjęć (1024px) we wpisach. Jeśli nie "
+"jest to włączone, można używać tylko małych miniatur (640 px)"
 
 #: ../../include/features.php:226
 msgid "Even More Encryption"
 msgstr "Jeszcze więcej szyfrowania"
 
 #: ../../include/features.php:227
-msgid "Allow optional encryption of content end-to-end with a shared secret key"
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
-"Zezwalaj na opcjonalne pełne (e2e) szyfrowanie treści  za pomocą wspólnego tajnego "
-"klucza"
+"Zezwalaj na opcjonalne pełne (e2e) szyfrowanie treści  za pomocą wspólnego "
+"tajnego klucza"
 
 #: ../../include/features.php:234
 msgid "Disable Comments"
@@ -11126,11 +11278,11 @@ msgstr "Pomijaj zduplikowane wpisy i komentarze"
 
 #: ../../include/features.php:259
 msgid ""
-"Prevent posts with identical content to be published with less than two minutes in "
-"between submissions."
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
-"Zapobiegaj publikowaniu wpisów o identycznej treści, mających mniej niż dwie minuty "
-"między przesłaniami."
+"Zapobiegaj publikowaniu wpisów o identycznej treści, mających mniej niż dwie "
+"minuty między przesłaniami."
 
 #: ../../include/features.php:266
 msgid "Auto-save drafts of posts and comments"
@@ -11138,8 +11290,8 @@ msgstr "Automatyczne zapisywanie wersji roboczych wpisów i komentarzy"
 
 #: ../../include/features.php:267
 msgid ""
-"Automatically saves post and comment drafts in local browser storage to help prevent "
-"accidental loss of compositions"
+"Automatically saves post and comment drafts in local browser storage to help "
+"prevent accidental loss of compositions"
 msgstr ""
 "Automatycznie zapisuje wersje robocze wpisów i komentarzy w lokalnej pamięci "
 "przeglÄ…darki, aby zapobiec przypadkowej utracie kompozycji"
@@ -11186,11 +11338,11 @@ msgstr "Alternatywna kolejność strumienia"
 
 #: ../../include/features.php:327
 msgid ""
-"Ability to order the stream by last post date, last comment date or unthreaded "
-"activities"
+"Ability to order the stream by last post date, last comment date or "
+"unthreaded activities"
 msgstr ""
-"Możliwość uporządkowania strumienia według daty ostatniego wpisu, daty ostatniego "
-"komentarza lub nieprzeczytanych aktywności"
+"Możliwość uporządkowania strumienia według daty ostatniego wpisu, daty "
+"ostatniego komentarza lub nieprzeczytanych aktywności"
 
 #: ../../include/features.php:334
 msgid "Contact Filter"
@@ -11214,7 +11366,8 @@ msgstr "Filtr wpisów osobistych"
 
 #: ../../include/features.php:351
 msgid "Ability to display only posts that you've interacted on"
-msgstr "Możliwość wyświetlania tylko tych wpisów, z którymi miało się interakcję"
+msgstr ""
+"Możliwość wyświetlania tylko tych wpisów, z którymi miało się interakcję"
 
 #: ../../include/features.php:372
 msgid "Photo Location"
@@ -11222,7 +11375,9 @@ msgstr "Lokalizacja zdjęcia"
 
 #: ../../include/features.php:373
 msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Jeśli dane lokalizacji są dostępne na przesłanych zdjęciach, połącz je z mapą."
+msgstr ""
+"Jeśli dane lokalizacji są dostępne na przesłanych zdjęciach, połącz je z "
+"mapÄ…."
 
 #: ../../include/features.php:386
 msgid "Advanced Profiles"
@@ -11238,7 +11393,7 @@ msgstr "Import/Eksport profilu"
 
 #: ../../include/features.php:395
 msgid "Save and load profile details across sites/channels"
-msgstr "Zapisz i wczytaj szczegóły profilu z różnych witryn i  kanałów"
+msgstr "Zapisz i wczytaj szczegóły profilu z różnych portali i  kanałów"
 
 #: ../../include/features.php:402
 msgid "Multiple Profiles"
@@ -11258,7 +11413,9 @@ msgstr "Wylogowano."
 
 #: ../../include/auth.php:294
 msgid "Email validation is incomplete. Please check your email."
-msgstr "Weryfikacja adresu e-mail jest niekompletna. Proszę sprawdzić swój adres email."
+msgstr ""
+"Weryfikacja adresu e-mail jest niekompletna. Proszę sprawdzić swój adres "
+"email."
 
 #: ../../include/auth.php:310
 msgid "Failed authentication"
@@ -11309,11 +11466,11 @@ msgstr "Sieć: %s"
 
 #: ../../include/text.php:1236 ../../include/text.php:1240
 msgid "poke"
-msgstr "zaczepiać"
+msgstr "szturchnij"
 
 #: ../../include/text.php:1241
 msgid "ping"
-msgstr "spingować"
+msgstr "spinguj"
 
 #: ../../include/text.php:1241
 msgid "pinged"
@@ -11321,7 +11478,7 @@ msgstr "spingowany"
 
 #: ../../include/text.php:1242
 msgid "prod"
-msgstr "sprawdzać"
+msgstr "zaczep"
 
 #: ../../include/text.php:1242
 msgid "prodded"
@@ -11329,15 +11486,15 @@ msgstr "zaczepiony"
 
 #: ../../include/text.php:1243
 msgid "slap"
-msgstr "spoliczkować"
+msgstr "uderz"
 
 #: ../../include/text.php:1243
 msgid "slapped"
-msgstr "spoliczkowany"
+msgstr "uderzony"
 
 #: ../../include/text.php:1244
 msgid "finger"
-msgstr "dotknąć"
+msgstr "dotknij"
 
 #: ../../include/text.php:1244
 msgid "fingered"
@@ -11345,7 +11502,7 @@ msgstr "dotknięty"
 
 #: ../../include/text.php:1245
 msgid "rebuff"
-msgstr "odprawiać"
+msgstr "odpraw"
 
 #: ../../include/text.php:1245
 msgid "rebuffed"
@@ -11397,7 +11554,7 @@ msgstr "wesoły"
 
 #: ../../include/text.php:1279
 msgid "alive"
-msgstr "żywy"
+msgstr "ożywiony"
 
 #: ../../include/text.php:1280
 msgid "annoyed"
@@ -11429,7 +11586,7 @@ msgstr "zmotywowany"
 
 #: ../../include/text.php:1287
 msgid "relaxed"
-msgstr "z<relaksowany"
+msgstr "zrelaksowany"
 
 #: ../../include/text.php:1288
 msgid "surprised"
@@ -11457,7 +11614,7 @@ msgstr "PiÄ…tek"
 
 #: ../../include/text.php:1476 ../../include/js_strings.php:104
 msgid "Saturday"
-msgstr "Sonota"
+msgstr "Sobota"
 
 #: ../../include/text.php:1476 ../../include/js_strings.php:98
 msgid "Sunday"
@@ -11511,169 +11668,157 @@ msgstr "Listopad"
 msgid "December"
 msgstr "Grudzień"
 
-#: ../../include/text.php:1556
+#: ../../include/text.php:1538
 msgid "Unknown Attachment"
 msgstr "Nieznany załącznik"
 
-#: ../../include/text.php:1558 ../../include/feedutils.php:872
+#: ../../include/text.php:1540 ../../include/feedutils.php:874
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../../include/text.php:1599
+#: ../../include/text.php:1581
 msgid "remove category"
-msgstr "usuń kataegorię"
+msgstr "usuń kategorię"
 
-#: ../../include/text.php:1676
+#: ../../include/text.php:1658
 msgid "remove from file"
 msgstr "usuń z pliku"
 
-#: ../../include/text.php:1845 ../../include/message.php:13
+#: ../../include/text.php:1827
 msgid "Download binary/encrypted content"
 msgstr "Pobierz zawartość binarną/zaszyfrowaną"
 
-#: ../../include/text.php:1916
+#: ../../include/text.php:1898
 msgid "Poll has ended."
 msgstr "Ankieta zakończyła się."
 
-#: ../../include/text.php:1919
+#: ../../include/text.php:1901
 #, php-format
 msgid "Poll ends: %s"
 msgstr "Ankieta kończy się : %s"
 
-#: ../../include/text.php:2098 ../../include/language.php:428
+#: ../../include/text.php:2058
+msgid "Link to Source"
+msgstr "Link do źródła"
+
+#: ../../include/text.php:2080 ../../include/language.php:428
 msgid "default"
 msgstr "domyślnie"
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2088
 msgid "Page layout"
 msgstr "Układ strony"
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2088
 msgid "You can create your own with the layouts tool"
 msgstr "Możesz tworzyć własne za pomocą narzędzia układów"
 
-#: ../../include/text.php:2117
+#: ../../include/text.php:2099
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../include/text.php:2120
+#: ../../include/text.php:2102
 msgid "Comanche Layout"
 msgstr "Układ Comanche"
 
-#: ../../include/text.php:2125
+#: ../../include/text.php:2107
 msgid "PHP"
 msgstr "PHP"
 
-#: ../../include/text.php:2134
+#: ../../include/text.php:2116
 msgid "Page content type"
 msgstr "Typ treści strony"
 
-#: ../../include/text.php:2267
+#: ../../include/text.php:2249
 msgid "activity"
 msgstr "aktywność"
 
-#: ../../include/text.php:2270
+#: ../../include/text.php:2252
 msgid "poll"
 msgstr "ankieta"
 
-#: ../../include/text.php:2383
+#: ../../include/text.php:2365
 msgid "a-z, 0-9, -, and _ only"
 msgstr "tylko a-z, 0-9, - i _"
 
-#: ../../include/text.php:2709
+#: ../../include/text.php:2670
 msgid "Design Tools"
-msgstr "Narzędzia projektowe"
+msgstr "Narzędzia projektanckie"
 
-#: ../../include/text.php:2715
+#: ../../include/text.php:2676
 msgid "Pages"
 msgstr "Strony"
 
-#: ../../include/text.php:2727
+#: ../../include/text.php:2688
 msgid "Import"
 msgstr "Import"
 
-#: ../../include/text.php:2728
+#: ../../include/text.php:2689
 msgid "Import website..."
 msgstr "Import witryny..."
 
-#: ../../include/text.php:2729
+#: ../../include/text.php:2690
 msgid "Select folder to import"
 msgstr "Wybierz folder do zaimportowania"
 
-#: ../../include/text.php:2730
+#: ../../include/text.php:2691
 msgid "Import from a zipped folder:"
 msgstr "Import z pliku archiwum ZIP:"
 
-#: ../../include/text.php:2731
+#: ../../include/text.php:2692
 msgid "Import from cloud files:"
-msgstr "Import plków z chmury:"
+msgstr "Import plików z chmury:"
 
-#: ../../include/text.php:2732
+#: ../../include/text.php:2693
 msgid "/cloud/channel/path/to/folder"
 msgstr "/chmura/kanał/ścieżka/do/folderu"
 
-#: ../../include/text.php:2733
+#: ../../include/text.php:2694
 msgid "Enter path to website files"
-msgstr "Wprowadź ścieżkę do plików witryny internetowej"
+msgstr "Wprowadź ścieżkę do plików poretalu"
 
-#: ../../include/text.php:2734
+#: ../../include/text.php:2695
 msgid "Select folder"
 msgstr "Wybierz folder"
 
-#: ../../include/text.php:2735
+#: ../../include/text.php:2696
 msgid "Export website..."
 msgstr "Eksport witryny..."
 
-#: ../../include/text.php:2736
+#: ../../include/text.php:2697
 msgid "Export to a zip file"
 msgstr "Eksport do pliku ZIP"
 
-#: ../../include/text.php:2737
+#: ../../include/text.php:2698
 msgid "website.zip"
 msgstr "nazwa_witryny.zip"
 
-#: ../../include/text.php:2738
+#: ../../include/text.php:2699
 msgid "Enter a name for the zip file."
 msgstr "Wprowadź nazwę pliku zip."
 
-#: ../../include/text.php:2739
+#: ../../include/text.php:2700
 msgid "Export to cloud files"
 msgstr "Eksport do plików w chmurze"
 
-#: ../../include/text.php:2740
+#: ../../include/text.php:2701
 msgid "/path/to/export/folder"
 msgstr "/ścieżka/do/eksportu/folder"
 
-#: ../../include/text.php:2741
+#: ../../include/text.php:2702
 msgid "Enter a path to a cloud files destination."
 msgstr "Wprowadź ścieżkę do miejsca docelowego plików w chmurze."
 
-#: ../../include/text.php:2742
+#: ../../include/text.php:2703
 msgid "Specify folder"
 msgstr "Wybierz folder"
 
-#: ../../include/message.php:41
-msgid "Unable to determine sender."
-msgstr "Nie można określić nadawcy."
-
-#: ../../include/message.php:80
-msgid "No recipient provided."
-msgstr "Nie podano odbiorcy."
-
-#: ../../include/message.php:85
-msgid "[no subject]"
-msgstr "[brak tematu]"
-
-#: ../../include/message.php:214
-msgid "Stored post could not be verified."
-msgstr "Nie można zweryfikować zapisanego wpisu."
-
-#: ../../include/markdown.php:202 ../../include/bbcode.php:559
+#: ../../include/markdown.php:203 ../../include/bbcode.php:559
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s napisał ten %2$s %3$s"
 
-#: ../../include/markdown.php:255 ../../include/bbcode.php:644
+#: ../../include/markdown.php:256 ../../include/bbcode.php:644
 msgid "spoiler"
 msgstr "spojler"
 
@@ -11695,8 +11840,8 @@ msgstr "Własny wybór"
 
 #: ../../include/acl_selectors.php:146
 msgid ""
-"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and limit the "
-"scope of \"Allow\"."
+"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and "
+"limit the scope of \"Allow\"."
 msgstr ""
 "Wybierz \"Zezwól\", aby zezwolić na przeglądanie. \"Nie zezwalaj\" umożliwia "
 "zastÄ…pienie i ograniczenie zakresu \"Zezwalaj\"."
@@ -11711,8 +11856,8 @@ msgid ""
 "Post permissions %s cannot be changed %s after a post is shared.</br />These "
 "permissions set who is allowed to view the post."
 msgstr ""
-"Uprawnienia do publikowania %s nie mogą być zmieniane %s po udostępnieniu wpisu. </br /"
-"> Te uprawnienia określają, kto może oglądać wpis."
+"Uprawnienia do publikowania %s nie mogą być zmieniane %s po udostępnieniu "
+"wpisu. </br /> Te uprawnienia określają, kto może oglądać wpis."
 
 #: ../../include/opengraph.php:56
 #, php-format
@@ -11745,21 +11890,22 @@ msgstr "chcÄ…"
 
 #: ../../include/taxonomy.php:584
 msgid "likes"
-msgstr "lubiÄ…"
+msgstr "pochwala"
 
 #: ../../include/taxonomy.php:585
 msgid "dislikes"
-msgstr "nie  lubiÄ…"
+msgstr "gani"
 
 #: ../../include/import.php:29
 msgid "Unable to import a removed channel."
 msgstr "Nie można zaimportować usuniętego kanału."
 
 #: ../../include/import.php:55
-msgid "Cannot create a duplicate channel identifier on this system. Import failed."
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
-"Nie można utworzyć zduplikowanego identyfikatora kanału w tym systemie. Import "
-"nieudany."
+"Nie można utworzyć zduplikowanego identyfikatora kanału w tym systemie. "
+"Import nieudany."
 
 #: ../../include/import.php:76
 #: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:44
@@ -11790,8 +11936,8 @@ msgstr "Zarządzaj swoimi grupami prywatności"
 msgid "Account/Channel Settings"
 msgstr "Ustawienia kanału/konta"
 
-#: ../../include/nav.php:112 ../../include/nav.php:142 ../../include/nav.php:163
-#: ../../boot.php:1715
+#: ../../include/nav.php:112 ../../include/nav.php:142
+#: ../../include/nav.php:163 ../../boot.php:1719
 msgid "Logout"
 msgstr "Wyloguj siÄ™"
 
@@ -11817,7 +11963,7 @@ msgstr "Zabierz mnie do domu"
 
 #: ../../include/nav.php:163
 msgid "Log me out of this site"
-msgstr "Wyloguj mnie z tej witryny"
+msgstr "Wyloguj mnie z tego portalu"
 
 #: ../../include/nav.php:168
 msgid "Create an account"
@@ -11829,11 +11975,11 @@ msgstr "Pomoc i dokumentacja"
 
 #: ../../include/nav.php:194
 msgid "Search site @name, !forum, #tag, ?docs, content"
-msgstr "Szukaj w witrynie @name, !forum, #tag, ?docs, content"
+msgstr "Szukaj @name portalu, !forum, #tag, ?docs, treść"
 
 #: ../../include/nav.php:200
 msgid "Site Setup and Configuration"
-msgstr "Instalacja i konfiguracja witryny"
+msgstr "Instalacja i konfiguracja portalu"
 
 #: ../../include/nav.php:330
 msgid "@name, !forum, #tag, ?doc, content"
@@ -11845,7 +11991,7 @@ msgstr "Proszę czekać ..."
 
 #: ../../include/nav.php:337
 msgid "Add Apps"
-msgstr "Dodaj aplikacje"
+msgstr "Zainstalowane aplikacje"
 
 #: ../../include/nav.php:338
 msgid "Arrange Apps"
@@ -11857,7 +12003,7 @@ msgstr "Przełącz aplikacje systemowe"
 
 #: ../../include/nav.php:424
 msgid "Status Messages and Posts"
-msgstr "Komunikaty o stanie i wpisy"
+msgstr "Komunikaty o stanie i wpisach"
 
 #: ../../include/nav.php:437
 msgid "Profile Details"
@@ -11885,7 +12031,7 @@ msgstr "Wyświetl artykuły"
 
 #: ../../include/nav.php:527
 msgid "View Webpages"
-msgstr "Wyświetl witryny internetowe"
+msgstr "Wyświetl strony internetowe"
 
 #: ../../include/language.php:441
 msgid "Select an alternate language"
@@ -11951,7 +12097,7 @@ msgstr "Nazwa: "
 #: ../../include/photos.php:151
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Obraz przekracza limit rozmiaru witryny wynoszący %lu bajtów"
+msgstr "Obraz przekracza limit rozmiaru dla tego portali, wynoszący %lu bajtów"
 
 #: ../../include/photos.php:162
 msgid "Image file is empty."
@@ -12032,7 +12178,7 @@ msgstr "Opisz (opcjonalnie)"
 
 #: ../../include/js_strings.php:23
 msgid "Please enter a link URL"
-msgstr "Proszę wprowadzić  URL linku"
+msgstr "Proszę wprowadzić URL linku"
 
 #: ../../include/js_strings.php:24
 msgid "Unsaved changes. Are you sure you wish to leave this page?"
@@ -12056,9 +12202,11 @@ msgstr "świetne"
 
 #: ../../include/js_strings.php:30
 msgid ""
-"Your chosen nickname was either already taken or not valid. Please use our suggestion ("
+"Your chosen nickname was either already taken or not valid. Please use our "
+"suggestion ("
 msgstr ""
-"Twój wybrany pseudonim jest już zajęty lub nieważny. Skorzystaj z naszej prpozycji ("
+"Twój wybrany pseudonim jest już zajęty lub nieważny. Skorzystaj z naszej "
+"propozycji ("
 
 #: ../../include/js_strings.php:31
 msgid ") or enter a new one."
@@ -12130,7 +12278,7 @@ msgstr[2] "%d lat"
 
 #: ../../include/js_strings.php:54
 msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+msgstr "temu"
 
 #: ../../include/js_strings.php:55
 msgid "timeago.prefixFromNow"
@@ -12293,11 +12441,11 @@ msgstr "Adres e-mail jest nieprawidłowy"
 
 #: ../../include/security.php:607
 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."
+"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 ""
-"Token bezpieczeństwa formularza był nieprawidłowy. Prawdopodobnie stało się tak, "
-"ponieważ formularz był otwarty zbyt długo (> 3 godziny) przed wysłaniem."
+"Token bezpieczeństwa formularza był nieprawidłowy. Prawdopodobnie stało się "
+"tak, ponieważ formularz był otwarty zbyt długo (> 3 godziny) przed wysłaniem."
 
 #: ../../include/selectors.php:18
 msgid "Profile to assign new connections"
@@ -12535,43 +12683,43 @@ msgstr "Nie obchodzi mnie to"
 msgid "Ask me"
 msgstr "Zapytaj mnie"
 
-#: ../../include/network.php:1762 ../../include/network.php:1763
+#: ../../include/network.php:1737 ../../include/network.php:1738
 msgid "Friendica"
 msgstr "Friendica"
 
-#: ../../include/network.php:1764
+#: ../../include/network.php:1739
 msgid "OStatus"
 msgstr "OStatus"
 
-#: ../../include/network.php:1765
+#: ../../include/network.php:1740
 msgid "GNU-Social"
 msgstr "GNU-Social"
 
-#: ../../include/network.php:1766
+#: ../../include/network.php:1741
 msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
-#: ../../include/network.php:1769
+#: ../../include/network.php:1744
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: ../../include/network.php:1770
+#: ../../include/network.php:1745
 msgid "Facebook"
 msgstr "Facebook"
 
-#: ../../include/network.php:1771
+#: ../../include/network.php:1746
 msgid "Zot"
 msgstr "Zot"
 
-#: ../../include/network.php:1772
+#: ../../include/network.php:1747
 msgid "LinkedIn"
 msgstr "LinkedIn"
 
-#: ../../include/network.php:1773
+#: ../../include/network.php:1748
 msgid "XMPP/IM"
 msgstr "XMPP/IM"
 
-#: ../../include/network.php:1774
+#: ../../include/network.php:1749
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -12585,15 +12733,15 @@ msgstr "Podana domena e-mail nie należy do domen dozwolonych w tym portalu"
 
 #: ../../include/account.php:48
 msgid "The provided email address is already registered at this site"
-msgstr "Podany adres e-mail jest już zarejestrowany w tej witrynie"
+msgstr "Podany adres e-mail jest już zarejestrowany w tym portalu"
 
 #: ../../include/account.php:55
 msgid ""
-"There is a pending registration for this address - click \"Register\" to continue "
-"verification"
+"There is a pending registration for this address - click \"Register\" to "
+"continue verification"
 msgstr ""
-"Oczekuje się na rejestrację tego adresu - kliknij „Zarejestruj się�, aby kontynuować "
-"weryfikacjÄ™"
+"Oczekuje się na rejestrację tego adresu - kliknij „Zarejestruj się�, aby "
+"kontynuować weryfikację"
 
 #: ../../include/account.php:94
 msgid "An invitation is required."
@@ -12667,15 +12815,16 @@ msgstr "Rejestracja trwa"
 msgid "please come back"
 msgstr "proszę wrócić"
 
-#: ../../include/help.php:80
+#: ../../include/help.php:81
 msgid "Help:"
 msgstr "Pomoc:"
 
-#: ../../include/help.php:129
+#: ../../include/help.php:130
 msgid "Not Found"
 msgstr "Nie znaleziono"
 
-#: ../../include/attach.php:273 ../../include/attach.php:324 ../../include/attach.php:419
+#: ../../include/attach.php:273 ../../include/attach.php:324
+#: ../../include/attach.php:419
 msgid "Item was not found."
 msgstr "Nie znaleziono elementu."
 
@@ -12708,8 +12857,8 @@ msgstr "Osiągnięty został limit %1$.0f MB miejsca na załączniki."
 #: ../../include/attach.php:1004
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
-"Przesyłanie pliku nie powiodło się. Możliwe ograniczenie systemowe lub działanie "
-"zakończone."
+"Przesyłanie pliku nie powiodło się. Możliwe ograniczenie systemowe lub "
+"działanie zakończone."
 
 #: ../../include/attach.php:1033
 msgid "Stored file could not be verified. Upload failed."
@@ -12763,11 +12912,11 @@ msgstr "Otwórz wybraną lokalizację w innym oknie lub karcie przeglądarki"
 
 #: ../../include/connections.php:736 ../../include/event.php:1424
 msgid "Home, Voice"
-msgstr "Dom, głosowy"
+msgstr "Domowy, głosowy"
 
 #: ../../include/connections.php:737 ../../include/event.php:1425
 msgid "Home, Fax"
-msgstr "Dom, fax"
+msgstr "Domowy, fax"
 
 #: ../../include/connections.php:739 ../../include/event.php:1427
 msgid "Work, Voice"
@@ -12862,7 +13011,7 @@ msgstr "Wiek: "
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "RRRR-MM-DD lub MM-DD"
 
-#: ../../include/datetime.php:238 ../../boot.php:2730
+#: ../../include/datetime.php:238 ../../boot.php:2734
 msgid "never"
 msgstr "nigdy"
 
@@ -12942,95 +13091,75 @@ msgstr "urodziny %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "%1$s, wszystkiego najlepszego z okazji urodzin"
 
-#: ../../include/items.php:1038 ../../include/items.php:1098
+#: ../../include/items.php:979 ../../include/items.php:1039
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: ../../include/items.php:1302
+#: ../../include/items.php:1243
 msgid "Visible to anybody on the internet."
 msgstr "Widoczne dla każdego w internecie."
 
-#: ../../include/items.php:1304
+#: ../../include/items.php:1245
 msgid "Visible to you only."
 msgstr "Widoczne tylko dla Ciebie."
 
-#: ../../include/items.php:1306
+#: ../../include/items.php:1247
 msgid "Visible to anybody in this network."
 msgstr "Widoczne dla każdego w tej sieci."
 
-#: ../../include/items.php:1308
+#: ../../include/items.php:1249
 msgid "Visible to anybody authenticated."
 msgstr "Widoczne dla każdego uwierzytelnionego."
 
-#: ../../include/items.php:1310
+#: ../../include/items.php:1251
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Widoczne dla wszystkich na %s."
 
-#: ../../include/items.php:1312
+#: ../../include/items.php:1253
 msgid "Visible to all connections."
 msgstr "Widoczny dla wszystkich połączeń."
 
-#: ../../include/items.php:1314
+#: ../../include/items.php:1255
 msgid "Visible to approved connections."
 msgstr "Widoczny dla zatwierdzonych połączeń."
 
-#: ../../include/items.php:1316
+#: ../../include/items.php:1257
 msgid "Visible to specific connections."
 msgstr "Widoczny dla określonych połączeń."
 
-#: ../../include/items.php:4601
+#: ../../include/items.php:4257
 msgid "Privacy group is empty."
 msgstr "Grupa prywatności jest pusta."
 
-#: ../../include/items.php:4608
+#: ../../include/items.php:4264
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupa prywatności: %s"
 
-#: ../../include/items.php:4620
+#: ../../include/items.php:4276
 msgid "Connection not found."
 msgstr "Nie znaleziono połączenia."
 
-#: ../../include/items.php:4973
+#: ../../include/items.php:4629
 msgid "profile photo"
 msgstr "zdjęcie profilowe"
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 #, php-format
 msgid "[Edited %s]"
 msgstr "[Edytowane %s]"
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Wpis"
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../../include/follow.php:86
-msgid "Response from remote channel was incomplete."
-msgstr "Odpowiedź z kanału zdalnego była niekompletna."
-
-#: ../../include/follow.php:98
-msgid "Premium channel - please visit:"
-msgstr "Kanał premium - odwiedź:"
-
-#: ../../include/follow.php:112
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanał został usunięty i już nie istnieje."
-
-#: ../../include/zot.php:778
-msgid "Invalid data packet"
-msgstr "Nieprawidłowy pakiet danych"
-
-#: ../../include/zot.php:4378
-msgid "invalid target signature"
-msgstr "nieprawidłowy podpis docelowy"
-
 #: ../../include/bbcode.php:233 ../../include/bbcode.php:928
 #: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533
 msgid "Image/photo"
@@ -13043,16 +13172,16 @@ msgstr "Zaszyfrowana treść"
 #: ../../include/bbcode.php:334
 #, php-format
 msgid "Install %1$s element %2$s"
-msgstr "Zainstaluj element %1$s %2$s"
+msgstr "Zainstaluj %2$s elementu %1$s"
 
 #: ../../include/bbcode.php:338
 #, php-format
 msgid ""
-"This post contains an installable %s element, however you lack permissions to install "
-"it on this site."
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
-"Ten wpis zawiera możliwy do zainstalowania element %s, jednak nie masz uprawnień do "
-"zainstalowania go w tym portalu."
+"Ten wpis zawiera możliwy do zainstalowania element %s, jednak nie masz "
+"uprawnień do zainstalowania go w tym portalu."
 
 #: ../../include/bbcode.php:551
 msgid "card"
@@ -13089,11 +13218,12 @@ msgstr "%1$s obserwujesz teraz %2$s"
 
 #: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:16
 msgid ""
-"The GNU-Social protocol does not support location independence. Connections you make "
-"within that network may be unreachable from alternate channel locations."
+"The GNU-Social protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
 msgstr ""
-"Protokół GNU-Social nie obsługuje niezależności od lokalizacji. Połączenia nawiązane w "
-"tej sieci mogą być niedostępne z innych lokalizacji kanałów."
+"Protokół GNU-Social nie obsługuje niezależności od lokalizacji. Połączenia "
+"nawiązane w tej sieci mogą być niedostępne z innych lokalizacji kanałów."
 
 #: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22
 msgid "GNU-Social Protocol App"
@@ -13186,7 +13316,7 @@ msgstr "Link:"
 
 #: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:70
 msgid "Like us on Hubzilla"
-msgstr "Oceń nas pozytywnie na Hubzilli"
+msgstr "Pochwal nas na Hubzilli"
 
 #: ../../extend/addon/hubzilla-addons/likebanner/likebanner.php:72
 msgid "Embed:"
@@ -13200,7 +13330,8 @@ msgstr "Zapisz ustawienia"
 
 #: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:47
 msgid "text to include in all outgoing posts from this site"
-msgstr "tekst do umieszczania we wszystkich wpisach wychodzÄ…cych z tej witryny"
+msgstr ""
+"tekst do umieszczania we wszystkich wpisach wychodzÄ…cych z tego portalu"
 
 #: ../../extend/addon/hubzilla-addons/moremoods/moremoods.php:19
 msgid "lonely"
@@ -13292,21 +13423,22 @@ msgstr "zazdrosny"
 
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:85
 msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics "
-"tool."
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
 msgstr ""
-"Ta witryna jest śledzona za pomocą narzędzia analitycznego <a href='http://www.piwik."
-"org'>Piwik</a>."
+"Ten portal jest śledzony za pomocą narzędzia analitycznego <a href='http://"
+"www.piwik.org'>Piwik</a>."
 
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:88
 #, php-format
 msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can set a "
-"cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
 msgstr ""
-"Jeśli nie chcesz, aby Twoje wizyty były rejestrowane w ten sposób, <a href='%s'> "
-"możesz ustawić plik cookie, aby uniemożliwić Piwik śledzenie dalszych wizyt na stronie "
-"</a> (rezygnacja)."
+"Jeśli nie chcesz, aby Twoje wizyty były rejestrowane w ten sposób, <a "
+"href='%s'> możesz ustawić plik cookie, aby uniemożliwić Piwik śledzenie "
+"dalszych wizyt na stronie </a> (rezygnacja)."
 
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:96
 msgid "Piwik Base URL"
@@ -13314,10 +13446,11 @@ msgstr "Bazowy adres URL Piwik"
 
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:96
 msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with trailing "
-"slash)"
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
 msgstr ""
-"Absolutna ścieżka do instalacji Piwik (bez schematu (http/s), z końcowym ukośnikiem)"
+"Absolutna ścieżka do instalacji Piwik (bez schematu (http/s), z końcowym "
+"ukośnikiem)"
 
 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:97
 msgid "Site ID"
@@ -13376,8 +13509,8 @@ msgstr "Minimalna reputacja, zanim członek będzie mógł moderować inne wpisy
 
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:122
 msgid ""
-"Max ratio of moderator's reputation that can be added to/deducted from reputation of "
-"person being moderated"
+"Max ratio of moderator's reputation that can be added to/deducted from "
+"reputation of person being moderated"
 msgstr ""
 "Maksymalny współczynnik reputacji moderatora, który można dodać do reputacji "
 "moderowanej osoby lub od niej odjąć"
@@ -13395,16 +13528,16 @@ msgid ""
 "Reputation automatically recovers at this rate per hour until it reaches "
 "minimum_to_post"
 msgstr ""
-"Reputacja automatycznie odświeżana jest w tym tempie co godzinę, dopóki nie osiągnie "
-"minimum_to_post"
+"Reputacja automatycznie odświeżana jest w tym tempie co godzinę, dopóki nie "
+"osiÄ…gnie minimum_to_post"
 
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:126
 msgid ""
-"When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this "
-"rate per hour"
+"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
+"at this rate per hour"
 msgstr ""
-"Kiedy minimum_to_moderate > reputation> minimum_to_post reputacja odświeża na jest z "
-"taką szybkością na godzinę"
+"Kiedy minimum_to_moderate > reputation> minimum_to_post reputacja odświeża "
+"na jest z taką szybkością na godzinę"
 
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:140
 msgid "Community Moderation Settings"
@@ -13435,7 +13568,7 @@ msgid "Errors encountered deleting database table "
 msgstr "Napotkano błędy podczas usuwania tabeli bazy danych "
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:95
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:503
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:496
 msgid "Submit Settings"
 msgstr "Prześlij ustawienia"
 
@@ -13445,11 +13578,11 @@ msgstr "Usunąć tabele podczas odinstalowywania?"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:96
 msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin is "
-"uninstalled."
+"If checked, the Rendezvous database tables will be deleted when the plugin "
+"is uninstalled."
 msgstr ""
-"Jeśli zaznaczone, po odinstalowaniu wtyczki  zostaną usunięte wszystkie tabele z bazy "
-"danych Rendezvous."
+"Jeśli zaznaczone, po odinstalowaniu wtyczki  zostaną usunięte wszystkie "
+"tabele z bazy danych Rendezvous."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:97
 msgid "Mapbox Access Token"
@@ -13457,11 +13590,12 @@ msgstr "Token dostępu Mapbox"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:97
 msgid ""
-"If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox "
-"instead of the default OpenStreetMap tile server."
+"If you enter a Mapbox access token, it will be used to retrieve map tiles "
+"from Mapbox instead of the default OpenStreetMap tile server."
 msgstr ""
-"Jeśli wprowadzisz token dostępu Mapbox, będzie on używany do pobierania fragmentów "
-"mapy z Mapbox, zamiast z domyślnego serwera kafelków OpenStreetMap."
+"Jeśli wprowadzisz token dostępu Mapbox, będzie on używany do pobierania "
+"fragmentów mapy z Mapbox, zamiast z domyślnego serwera kafelków "
+"OpenStreetMap."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:162
 msgid "Rendezvous"
@@ -13469,13 +13603,13 @@ msgstr "Rendezvous"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:167
 msgid ""
-"This identity has been deleted by another member due to inactivity. Please press the "
-"\"New identity\" button or refresh the page to register a new identity. You may use "
-"the same name."
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
 msgstr ""
-"Ta tożsamość została usunięta przez innego członka z powodu braku aktywności. Proszę "
-"nacisnąć przycisk \"Nowa tożsamość\" lub odświeżyć stronę, aby zarejestrować nową "
-"tożsamość. Możesz użyć tej samej nazwy."
+"Ta tożsamość została usunięta przez innego członka z powodu braku "
+"aktywności. Proszę nacisnąć przycisk \"Nowa tożsamość\" lub odświeżyć "
+"stronę, aby zarejestrować nową tożsamość. Możesz użyć tej samej nazwy."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:168
 msgid "Welcome to Rendezvous!"
@@ -13483,14 +13617,14 @@ msgstr "Witamy w Rendezvous!"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:169
 msgid ""
-"Enter your name to join this rendezvous. To begin sharing your location with the other "
-"members, tap the GPS control. When your location is discovered, a red dot will appear "
-"and others will be able to see you on the map."
+"Enter your name to join this rendezvous. To begin sharing your location with "
+"the other members, tap the GPS control. When your location is discovered, a "
+"red dot will appear and others will be able to see you on the map."
 msgstr ""
-"Wpisz swoje imię i nazwisko, aby dołączyć do tego spotkania. W celu rozpoczęcia "
-"udostępniania swojej lokalizacji innym członkom, dotknij elementu sterującego GPS. Gdy "
-"Twoja lokalizacja zostanie odkryta, pojawi się czerwona kropka i inni będą mogli Cię "
-"zobaczyć na mapie."
+"Wpisz swoje imię i nazwisko, aby dołączyć do tego spotkania. W celu "
+"rozpoczęcia udostępniania swojej lokalizacji innym członkom, dotknij "
+"elementu sterujÄ…cego GPS. Gdy Twoja lokalizacja zostanie odkryta, pojawi siÄ™ "
+"czerwona kropka i inni będą mogli Cię zobaczyć na mapie."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:171
 msgid "Let's meet here"
@@ -13522,11 +13656,12 @@ msgstr "Edytuj alert zbliżeniowy"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:180
 msgid ""
-"A proximity alert will be issued when this member is within a certain radius of you."
-"<br><br>Enter a radius in meters (0 to disable):"
+"A proximity alert will be issued when this member is within a certain radius "
+"of you.<br><br>Enter a radius in meters (0 to disable):"
 msgstr ""
-"Alert zbliżeniowy zostanie wygenerowany, gdy ten członek znajdzie się w określonym "
-"promieniu od Ciebie. <br> <br> Wprowadź promień w metrach (0, aby wyłączyć):"
+"Alert zbliżeniowy zostanie wygenerowany, gdy ten członek znajdzie się w "
+"określonym promieniu od Ciebie. <br> <br> Wprowadź promień w metrach (0, aby "
+"wyłączyć):"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:180
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:185
@@ -13540,11 +13675,12 @@ msgstr "Odległość ostrzeżenia o bliskości (metry)"
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:182
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:184
 msgid ""
-"A proximity alert will be issued when you are within a certain radius of the marker "
-"location.<br><br>Enter a radius in meters (0 to disable):"
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
 msgstr ""
-"Alert zbliżeniowy zostanie wygenerowany, gdy znajdziesz się w określonym promieniu od "
-"lokalizacji znacznika. <br> <br> Wprowadź promień w metrach (0, aby wyłączyć):"
+"Alert zbliżeniowy zostanie wygenerowany, gdy znajdziesz się w określonym "
+"promieniu od lokalizacji znacznika. <br> <br> Wprowadź promień w metrach (0, "
+"aby wyłączyć):"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:183
 msgid "Marker proximity alert"
@@ -13555,9 +13691,11 @@ msgid "Reminder note"
 msgstr "Notatka przypominajÄ…ca"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:187
-msgid "Enter a note to be displayed when you are within the specified proximity..."
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
 msgstr ""
-"Wprowadź notatkę, która będzie wyświetlana, gdy będziesz w określonej odległości ..."
+"Wprowadź notatkę, która będzie wyświetlana, gdy będziesz w określonej "
+"odległości ..."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:199
 msgid "Add new rendezvous"
@@ -13565,14 +13703,15 @@ msgstr "Dodaj nowe spotkanie"
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:200
 msgid ""
-"Create a new rendezvous and share the access link with those you wish to invite to the "
-"group. Those who open the link become members of the rendezvous. They can view other "
-"member locations, add markers to the map, or share their own locations with the group."
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or "
+"share their own locations with the group."
 msgstr ""
-"Utwórz nowe spotkanie i udostępnij łącze dostępu tym, których chcesz zaprosić do "
-"grupy. Osoby, które otworzą łącze, stają się członkami spotkania. Mogą wyświetlać "
-"lokalizacje innych członków, dodawać znaczniki do mapy lub udostępniać własne "
-"lokalizacje grupie."
+"Utwórz nowe spotkanie i udostępnij łącze dostępu tym, których chcesz "
+"zaprosić do grupy. Osoby, które otworzą łącze, stają się członkami "
+"spotkania. Mogą wyświetlać lokalizacje innych członków, dodawać znaczniki do "
+"mapy lub udostępniać własne lokalizacje grupie."
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:232
 msgid "You have no rendezvous. Press the button above to create a rendezvous!"
@@ -13642,6 +13781,7 @@ msgstr "Nazwa kanału Hubzilla"
 
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:54
+#: ../../boot.php:1714
 msgid "Nickname"
 msgstr "Pseudonim"
 
@@ -13659,7 +13799,9 @@ msgstr "Weryfikacja dwuetapowa TOTP"
 
 #: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:24
 msgid "Enter the 2-step verification generated by your authenticator app:"
-msgstr "Wprowadź dwuetapową weryfikację wygenerowaną przez aplikację uwierzytelniającą:"
+msgstr ""
+"Wprowadź dwuetapową weryfikację wygenerowaną przez aplikację "
+"uwierzytelniajÄ…cÄ…:"
 
 #: ../../extend/addon/hubzilla-addons/totp/Mod_Totp.php:25
 msgid "Success!"
@@ -13693,12 +13835,14 @@ msgstr "Twój sekret TOTP to"
 
 #: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:94
 msgid ""
-"Be sure to save it somewhere in case you lose or replace your mobile device.\n"
+"Be sure to save it somewhere in case you lose or replace your mobile "
+"device.\n"
 "Use your mobile device to scan the QR code below to register this site\n"
 "with your preferred authenticator app."
 msgstr ""
 "Zapisz go gdzieÅ› na wypadek zgubienia lub wymiany urzÄ…dzenia mobilnego.\n"
-"Użyj urządzenia mobilnego, aby zeskanować poniższy kod QR i zarejestrować tą witrynę\n"
+"Użyj urządzenia mobilnego, aby zeskanować poniższy kod QR i zarejestrować tą "
+"witrynÄ™\n"
 "w preferowanej aplikacji uwierzytelniajÄ…cej."
 
 #: ../../extend/addon/hubzilla-addons/totp/Settings/Totp.php:99
@@ -13750,15 +13894,15 @@ msgstr "Twoje konto na %s wygaśnie za kilka dni."
 msgid "Your $Productname test account is about to expire."
 msgstr "Twoje konto testowe $Productname wkrótce wygaśnie."
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:70
+#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:101
 msgid "An account has been created for you."
 msgstr "Konto zostało dla Ciebie utworzone."
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:77
+#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:108
 msgid "Authentication successful but rejected: account creation is disabled."
 msgstr ""
-"Uwierzytelnianie przebiegło pomyślne, ale zostało odrzucone: tworzenie konta jest "
-"wyłączone."
+"Uwierzytelnianie przebiegło pomyślne, ale zostało odrzucone: utworzone konto "
+"jest wyłączone."
 
 #: ../../extend/addon/hubzilla-addons/cart/cart.php:252
 msgid "DB Cleanup Failure"
@@ -13933,9 +14077,11 @@ msgid "Enable Subscription Management Module"
 msgstr "Włącz moduł zarządzania subskrypcjami"
 
 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:223
-msgid "Cannot include subscription items with different terms in the same order."
+msgid ""
+"Cannot include subscription items with different terms in the same order."
 msgstr ""
-"Nie może zawierać elementów subskrypcji z różnymi terminami w tej samej kolejności."
+"Nie może zawierać elementów subskrypcji z różnymi terminami w tej samej "
+"kolejności."
 
 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:372
 msgid "Select Subscription to Edit"
@@ -14010,11 +14156,11 @@ msgstr "Płatności za pomocą przycisku PayPal nie są włączone."
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:282
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:270
 msgid ""
-"Paypal button payments are not properly configured.  Please choose another payment "
-"option."
+"Paypal button payments are not properly configured.  Please choose another "
+"payment option."
 msgstr ""
-"Płatności za pomocą przycisku PayPal nie są poprawnie skonfigurowane. Wybierz inną "
-"opcję płatności."
+"Płatności za pomocą przycisku PayPal nie są poprawnie skonfigurowane. "
+"Wybierz inną opcję płatności."
 
 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbutton.php:85
 msgid "Enable Paypal Button Module"
@@ -14061,11 +14207,11 @@ msgstr "Podstawowa waluta sprzedawcy"
 
 #: ../../extend/addon/hubzilla-addons/openid/openid.php:49
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. Please check "
-"the correct spelling of the ID."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
-"Napotkaliśmy problem podczas logowania za pomocą podanego przez Ciebie identyfikatora "
-"OpenID. Sprawdź poprawną pisownię identyfikatora."
+"Napotkaliśmy problem podczas logowania za pomocą podanego przez Ciebie "
+"identyfikatora OpenID. Sprawdź poprawną pisownię identyfikatora."
 
 #: ../../extend/addon/hubzilla-addons/openid/openid.php:49
 msgid "The error message was:"
@@ -14127,6 +14273,12 @@ msgstr "Data urodzenia"
 msgid "OpenID protocol error. No ID returned."
 msgstr "Błąd protokołu OpenID. Brak identyfikatora."
 
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:76
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:178
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Witaj %s. Zdalne uwierzytelnianie powiodło się."
+
 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:81
 msgid "Hubzilla File Storage Import"
 msgstr "Import z magazynu plików Hubzilla"
@@ -14134,7 +14286,8 @@ msgstr "Import z magazynu plików Hubzilla"
 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:82
 msgid "This will import all your cloud files from another server."
 msgstr ""
-"Spowoduje to zaimportowanie wszystkich plików w chmurze z innego portalu Hubzilla."
+"Spowoduje to zaimportowanie wszystkich plików w chmurze z innego portalu "
+"Hubzilla."
 
 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:83
 msgid "Hubzilla Server base URL"
@@ -14156,11 +14309,12 @@ msgstr "Zaktualizowano ustawienia protokołu Diaspora."
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:52
 msgid ""
-"The diaspora protocol does not support location independence. Connections you make "
-"within that network may be unreachable from alternate channel locations."
+"The diaspora protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
 msgstr ""
-"Protokół Diaspora nie obsługuje niezależności lokalizacji. Połączenia nawiązane w tej "
-"sieci mogą być niedostępne z innych lokalizacji kanałów."
+"Protokół Diaspora nie obsługuje niezależności lokalizacji. Połączenia "
+"nawiązane w tej sieci mogą być niedostępne z innych lokalizacji kanałów."
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:58
 msgid "Diaspora Protocol App"
@@ -14168,19 +14322,20 @@ msgstr "Aplikacja Protokół Diaspora"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:77
 msgid "Allow any Diaspora member to comment or like your public posts"
-msgstr "Umożliwia członkom Diaspory komentować lub aprobować Twoje publiczne wpisy"
+msgstr ""
+"Umożliwia członkom Diaspory komentować lub aprobować Twoje publiczne wpisy"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:77
 msgid ""
-"If this setting is disabled only your contacts will be able to comment or like your "
-"public posts"
+"If this setting is disabled only your contacts will be able to comment or "
+"like your public posts"
 msgstr ""
-"Jeśli to ustawienie jest wyłączone, tylko Twoje kontakty będą mogły komentować lub "
-"aprobować Twoje publiczne wpisy"
+"Jeśli to ustawienie jest wyłączone, tylko Twoje kontakty będą mogły "
+"komentować lub aprobować Twoje publiczne wpisy"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:81
 msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Zapobiegaj przekierowywaniu hasztagów do innych witryn"
+msgstr "Zapobiegaj przekierowywaniu hasztagów do innych portali"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:85
 msgid "Sign and forward posts and comments with no existing Diaspora signature"
@@ -14201,11 +14356,13 @@ msgstr "W pliku importu nie znaleziono nazwy użytkownika."
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1599
 #, php-format
 msgid "%1$s dislikes %2$s's %3$s"
-msgstr "%1$s ocen negatywnych %2$s %3$s"
+msgstr "%1$s zganień %2$s %3$s"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:70
-msgid "Please install the statistics addon to be able to configure a diaspora relay"
-msgstr "Zainstaluj dodatek do statystyk, aby móc skonfigurować konektor Diaspory"
+msgid ""
+"Please install the statistics addon to be able to configure a diaspora relay"
+msgstr ""
+"Zainstaluj dodatek do statystyk, aby móc skonfigurować konektor Diaspory"
 
 #: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80
 msgid "Diaspora Relay Handle"
@@ -14273,12 +14430,13 @@ msgstr "Znane tagi"
 
 #: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:119
 msgid ""
-"Please note Diaspora and Friendica statistics are merely those **this directory** is "
-"aware of, and not all those known in the network.  This also applies to chatrooms,"
+"Please note Diaspora and Friendica statistics are merely those **this "
+"directory** is aware of, and not all those known in the network.  This also "
+"applies to chatrooms,"
 msgstr ""
-"Proszę mieć na uwadze, że statystyki Diaspory i Friendica to tylko te,które  są "
-"widoczne dla **tego katalogu**, a nie wszystkie znane w sieci. Dotyczy to również "
-"czatów,"
+"Proszę mieć na uwadze, że statystyki Diaspory i Friendica to tylko te,które  "
+"sÄ… widoczne dla **tego katalogu**, a nie wszystkie znane w sieci. Dotyczy to "
+"również czatów,"
 
 #: ../../extend/addon/hubzilla-addons/upload_limits/upload_limits.php:25
 msgid "Show Upload Limits"
@@ -14304,7 +14462,8 @@ msgstr "Aplikacja Hide Aside"
 #: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:24
 #: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:28
 msgid "Fade out aside areas after a while when using endless scroll"
-msgstr "Powoduje zanikanie obszaru po chwili, gdy używa się długiego przewijania"
+msgstr ""
+"Powoduje zanikanie obszaru po chwili, gdy używa się długiego przewijania"
 
 #: ../../extend/addon/hubzilla-addons/hideaside/Mod_Hideaside.php:27
 #: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:23
@@ -14341,11 +14500,11 @@ msgstr "Adres URL serwera kafelków rastrowych"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:156
 msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public "
-"tile servers</a>"
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
 msgstr ""
-"Lista <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">publicznych "
-"serwerów kafelków</a>"
+"Lista <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">publicznych serwerów kafelków</a>"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:157
 msgid "Nominatim (reverse geocoding) Server URL"
@@ -14353,21 +14512,22 @@ msgstr "Adres URL serwera Nominatim (odwrotne geokodowanie)"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:157
 msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank"
-"\">Nominatim servers</a>"
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\">Nominatim servers</a>"
 msgstr ""
-"Lista <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank"
-"\">serwerów Nominatim</a>"
+"Lista <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\">serwerów Nominatim</a>"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:158
 msgid "Default zoom"
 msgstr "Powiększenie domyślne"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:158
-msgid "The default zoom level. (1:world, 18:highest, also depends on tile server)"
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
 msgstr ""
-"Domyślny poziom powiększenia. (1: świat, 18: najwyższy, zależy również od serwera "
-"kafelków)"
+"Domyślny poziom powiększenia. (1: świat, 18: najwyższy, zależy również od "
+"serwera kafelków)"
 
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:159
 msgid "Include marker on map"
@@ -14427,6 +14587,10 @@ msgstr "Przepływ pracy użytkownika."
 msgid "This channel"
 msgstr "Ten kanał"
 
+#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:327
+msgid "Create New Workflow Item"
+msgstr "Utwórz element przepływu"
+
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:541
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1437
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1456
@@ -14482,13 +14646,14 @@ msgstr "Użyj centralnej bazy użytkowników"
 
 #: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:45
 msgid ""
-"If enabled, members will automatically login to an ejabberd server that has to be "
-"installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" "
-"script."
+"If enabled, members will automatically login to an ejabberd server that has "
+"to be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
 msgstr ""
-"Jeśli jest włączone, członkowie będą automatycznie logować się do serwera ejabberd, "
-"który musi być zainstalowany na tym komputerze z zsynchronizowanymi danymi "
-"uwierzytelniającymi za pośrednictwem skryptu „auth_ejabberd.php�."
+"Jeśli jest włączone, członkowie będą automatycznie logować się do serwera "
+"ejabberd, który musi być zainstalowany na tym komputerze z "
+"zsynchronizowanymi danymi uwierzytelniającymi za pośrednictwem skryptu "
+"„auth_ejabberd.php�."
 
 #: ../../extend/addon/hubzilla-addons/xmpp/Mod_Xmpp.php:23
 msgid "XMPP settings updated."
@@ -14544,9 +14709,11 @@ msgid "Random Planet App"
 msgstr "Aplikacja Losowa Planeta"
 
 #: ../../extend/addon/hubzilla-addons/planets/Mod_Planets.php:25
-msgid "Set a random planet from the Star Wars Empire as your location when posting"
+msgid ""
+"Set a random planet from the Star Wars Empire as your location when posting"
 msgstr ""
-"Podczas wysyłania ustaw, jako lokalizację, losową planetę z Imperium Gwiezdnych Wojen"
+"Podczas wysyłania ustaw, jako lokalizację, losową planetę z Imperium "
+"Gwiezdnych Wojen"
 
 #: ../../extend/addon/hubzilla-addons/nsfw/nsfw.php:152
 msgid "Possible adult content"
@@ -14571,19 +14738,17 @@ msgstr "Zwija treść zawierającą określone słowa"
 
 #: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:44
 msgid ""
-"This app looks in posts for the words/text you specify below, and collapses any "
-"content containing those keywords so it is not displayed at inappropriate times, such "
-"as sexual innuendo that may be improper in a work setting. It is polite and "
-"recommended to tag any content containing nudity with #NSFW.  This filter can also "
-"match any other word/text you specify, and can thereby be used as a general purpose "
-"content filter."
-msgstr ""
-"Ta aplikacja wyszukuje słowa lub tekst, określone poniżej i zwija wszelkie treści "
-"zawierające te słowa kluczowe, aby nie były wyświetlane w nieodpowiednich momentach, "
-"na przykład, insynuacje seksualne, które mogą być niewłaściwe w miejscu pracy. "
-"Grzecznie jest i zaleca się, oznaczanie wszelkich treści zawierających nagość tagiem "
-"#NSFW. Ten filtr może również pasować do dowolnego innego określonego słowa lub "
-"tekstu, dzięki czemu może być używany jako filtr treści ogólnego przeznaczenia."
+"This app looks in posts for the words/text you specify below, and collapses "
+"any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
+msgstr ""
+"Ta aplikacja wyszukuje we  wpisach słowa/tekst określone poniżej i zwija "
+"wszelkie treści zawierające te słowa, tak aby nie były wyświetlane w "
+"nieodpowiednich momentach. Na przykład, podteksty seksualne, mogą być "
+"niewłaściwe w środowisku."
 
 #: ../../extend/addon/hubzilla-addons/nsfw/Mod_Nsfw.php:49
 msgid "Comma separated list of keywords to hide"
@@ -14615,27 +14780,28 @@ msgstr "Nowa gra z handicapem"
 
 #: ../../extend/addon/hubzilla-addons/tictac/tictac.php:61
 msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that it is "
-"played on multiple levels simultaneously. "
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
-"Trójwymiarowa gra w kółko i krzyżyk jest podobna do tradycyjnej gry, z tym wyjątkiem, "
-"że gra się w nią na wielu poziomach jednocześnie. "
+"Trójwymiarowa gra w kółko i krzyżyk jest podobna do tradycyjnej gry, z tym "
+"wyjątkiem, że gra się w nią na wielu poziomach jednocześnie. "
 
 #: ../../extend/addon/hubzilla-addons/tictac/tictac.php:62
 msgid ""
-"In this case there are three levels. You win by getting three in a row on any level, "
-"as well as up, down, and diagonally across the different levels."
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
-"W tym przypadku są trzy poziomy. Wygrywasz, zdobywając trzy z rzędu na dowolnym "
-"poziomie, a także w górę, w dół i po przekątnej na różnych poziomach."
+"W tym przypadku są trzy poziomy. Wygrywasz, zdobywając trzy z rzędu na "
+"dowolnym poziomie, a także w górę, w dół i po przekątnej na różnych "
+"poziomach."
 
 #: ../../extend/addon/hubzilla-addons/tictac/tictac.php:64
 msgid ""
-"The handicap game disables the center position on the middle level because the player "
-"claiming this square often has an unfair advantage."
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
-"Gra z handicapem wyłącza środkową pozycję na środkowym poziomie, ponieważ gracz "
-"zajmujący to pole często ma nieuczciwą przewagę."
+"Gra z handicapem wyłącza środkową pozycję na środkowym poziomie, ponieważ "
+"gracz zajmujący to pole często ma nieuczciwą przewagę."
 
 #: ../../extend/addon/hubzilla-addons/tictac/tictac.php:183
 msgid "You go first..."
@@ -14664,11 +14830,11 @@ msgstr "Zapisano ustawienia pamięci podręcznej zdjęć."
 
 #: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:36
 msgid ""
-"Photo Cache addon saves a copy of images from external sites locally to increase your "
-"anonymity in the web."
+"Photo Cache addon saves a copy of images from external sites locally to "
+"increase your anonymity in the web."
 msgstr ""
-"Dodatek Photo Cache zapisuje lokalnie kopie obrazów z zewnętrznych witryn, aby "
-"zwiększyć Twoją anonimowość w sieci."
+"Dodatek Photo Cache zapisuje lokalnie kopie obrazów z zewnętrznych portali, "
+"aby zwiększyć Twoją anonimowość w sieci."
 
 #: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:42
 msgid "Photo Cache App"
@@ -14681,7 +14847,8 @@ msgstr "Minimalny rozmiar zdjęcia do buforowania"
 #: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:55
 msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
 msgstr ""
-"W pikselach. Od 1 do 1024, 0 zostanie zastąpione domyślnymi ustawieniami systemowymi."
+"W pikselach. Od 1 do 1024, 0 zostanie zastąpione domyślnymi ustawieniami "
+"systemowymi."
 
 #: ../../extend/addon/hubzilla-addons/photocache/Mod_Photocache.php:64
 msgid "Photo Cache"
@@ -14739,10 +14906,12 @@ msgid "Flag Adult Photos"
 msgstr "Oznaczanie zdjęć dla dorosłych"
 
 #: ../../extend/addon/hubzilla-addons/adultphotoflag/adultphotoflag.php:25
-msgid "Provide photo edit option to hide inappropriate photos from default album view"
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
 msgstr ""
-"Dostarcza opcję edycji zdjęć, umożliwiającą ukrywanie nieodpowiednich zdjęć w "
-"domyślnym widoku albumu"
+"Dostarcza opcję edycji zdjęć, umożliwiającą ukrywanie nieodpowiednich zdjęć "
+"w domyślnym widoku albumu"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:145
 msgid "Post to GNU social"
@@ -14757,24 +14926,29 @@ msgid "Application name"
 msgstr "Nazwa aplikacji"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:61
-msgid "Please contact your site administrator.<br />The provided API URL is not valid."
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
 msgstr ""
-"Skontaktuj siÄ™ z administratorem witryny. <br/> Podany adres URL interfejsu API jest "
-"nieprawidłowy."
+"Skontaktuj siÄ™ z administratorem portalu. <br/> Podany adres URL interfejsu "
+"API jest nieprawidłowy."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:98
 msgid "We could not contact the GNU social API with the Path you entered."
-msgstr "Nie mogliśmy nawiązać połączenia ze społecznościowym API GNU o podanej ścieżce."
+msgstr ""
+"Nie mogliśmy nawiązać połączenia ze społecznościowym API GNU o podanej "
+"ścieżce."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:130
 msgid "GNU social settings updated."
 msgstr "Ustawienia społecznościowe GNU zostały zaktualizowane."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:147
-msgid "Relay public postings to a connected GNU social account (formerly StatusNet)"
+msgid ""
+"Relay public postings to a connected GNU social account (formerly StatusNet)"
 msgstr ""
-"Przekazywanie publicznych wpisów na połączone konto społecznościowe GNU (dawniej "
-"StatusNet)"
+"Przekazywanie publicznych wpisów na połączone konto społecznościowe GNU "
+"(dawniej StatusNet)"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:181
 msgid "Globally Available GNU social OAuthKeys"
@@ -14782,13 +14956,14 @@ msgstr "Globalnie dostępne klucze OAuthKey społecznościowe GNU"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:183
 msgid ""
-"There are preconfigured OAuth key pairs for some GNU social servers available. If you "
-"are using one of them, please use these credentials.<br />If not feel free to connect "
-"to any other GNU social instance (see below)."
+"There are preconfigured OAuth key pairs for some GNU social servers "
+"available. If you are using one of them, please use these credentials.<br /"
+">If not feel free to connect to any other GNU social instance (see below)."
 msgstr ""
-"Dostępne są wstępnie skonfigurowane pary kluczy OAuth dla niektórych serwerów "
-"społecznościowych GNU. Jeśli używasz jednego z nich, użyj tych poświadczeń. <br /> "
-"Jeśli nie możesz połączyć się z inną instancją społecznościową GNU (patrz poniżej)."
+"Dostępne są wstępnie skonfigurowane pary kluczy OAuth dla niektórych "
+"serwerów społecznościowych GNU. Jeśli używasz jednego z nich, użyj tych "
+"poświadczeń. <br /> Jeśli nie możesz połączyć się z inną instancją "
+"społecznościową GNU (patrz poniżej)."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:198
 msgid "Provide your own OAuth Credentials"
@@ -14796,18 +14971,18 @@ msgstr "Podaj własne dane logowania OAuth"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:200
 msgid ""
-"No consumer key pair for GNU social found. Register your Hubzilla Account as an "
-"desktop client on your GNU social account, copy the consumer key pair here and enter "
-"the API base root.<br />Before you register your own OAuth key pair ask the "
-"administrator if there is already a key pair for this Hubzilla installation at your "
-"favourite GNU social installation."
-msgstr ""
-"Nie znaleziono pary kluczy konsumenckich dla społeczności GNU. Zarejestruj swoje konto "
-"Hubzilla jako klienta stacjonarnego na swoim koncie społecznościowym GNU, skopiuj "
-"tutaj parę kluczy klienta i wprowadź podstawowy katalog główny API. <br /> Przed "
-"zarejestrowaniem własnej pary kluczy OAuth zapytaj administratora, czy istnieje już "
-"para kluczy dla tej instalacji Hubzilli w Twojej ulubionej instalacji społecznościowej "
-"GNU."
+"No consumer key pair for GNU social found. Register your Hubzilla Account as "
+"an desktop client on your GNU social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Hubzilla installation at your favourite GNU social installation."
+msgstr ""
+"Nie znaleziono pary kluczy konsumenckich dla społeczności GNU. Zarejestruj "
+"swoje konto Hubzilla jako klienta stacjonarnego na swoim koncie "
+"społecznościowym GNU, skopiuj tutaj parę kluczy klienta i wprowadź "
+"podstawowy katalog główny API. <br /> Przed zarejestrowaniem własnej pary "
+"kluczy OAuth zapytaj administratora, czy istnieje już para kluczy dla tej "
+"instalacji Hubzilli w Twojej ulubionej instalacji społecznościowej GNU."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:204
 msgid "OAuth Consumer Key"
@@ -14831,14 +15006,16 @@ msgstr "Nazwa aplikacji społecznościowej GNU"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:239
 msgid ""
-"To connect to your GNU social account click the button below to get a security code "
-"from GNU social which you have to copy into the input box below and submit the form. "
-"Only your <strong>public</strong> posts will be posted to GNU social."
+"To connect to your GNU social account click the button below to get a "
+"security code from GNU social which you have to copy into the input box "
+"below and submit the form. Only your <strong>public</strong> posts will be "
+"posted to GNU social."
 msgstr ""
-"W celu połączenia się ze swoim kontem społecznościowym GNU, kliknij poniższy przycisk, "
-"aby uzyskać kod zabezpieczający z portalu społecznościowego GNU, który musisz "
-"skopiować do pola wprowadzania poniżej i przesłać formularz. Tylko twoje "
-"<strong>publiczne</strong> wpisy będą publikowane w społecznościach GNU."
+"W celu połączenia się ze swoim kontem społecznościowym GNU, kliknij poniższy "
+"przycisk, aby uzyskać kod zabezpieczający z portalu społecznościowego GNU, "
+"który musisz skopiować do pola wprowadzania poniżej i przesłać formularz. "
+"Tylko twoje <strong>publiczne</strong> wpisy będą publikowane w "
+"społecznościach GNU."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:241
 msgid "Log in with GNU social"
@@ -14867,16 +15044,16 @@ msgstr "Obecnie połączony z: "
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:277
 msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from "
-"unknown viewers?</em>) the link potentially included in public postings relayed to GNU "
-"social will lead the visitor to a blank page informing the visitor that the access to "
-"your profile has been restricted."
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
 msgstr ""
 "<strong>Uwaga</strong>: Ze względu na Twoje ustawienia prywatności, odnośnik "
-"(<em>Ukryj szczegóły swojego profilu przed nieznanymi widzami? </em>), ewentualnie "
-"zawarty w publicznych wpisach przekazywanych do społeczności GNU, będzie kierował "
-"odwiedzającego na pustą stronę z informacją dla odwiedzającego, że dostęp do Twojego "
-"profilu został ograniczony."
+"(<em>Ukryj szczegóły swojego profilu przed nieznanymi widzami? </em>), "
+"ewentualnie zawarty w publicznych wpisach przekazywanych do społeczności "
+"GNU, będzie kierował odwiedzającego na pustą stronę z informacją dla "
+"odwiedzającego, że dostęp do Twojego profilu został ograniczony."
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
 msgid "Post to GNU social by default"
@@ -14884,11 +15061,11 @@ msgstr "Wysyłaj domyślnie do społeczności GNU"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:282
 msgid ""
-"If enabled your public postings will be posted to the associated GNU-social account by "
-"default"
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
 msgstr ""
-"Jeśli ta opcja jest włączona, twoje publiczne wpisy będą domyślnie wysyłane na "
-"powiązane konto społecznościowe GNU"
+"Jeśli ta opcja jest włączona, twoje publiczne wpisy będą domyślnie wysyłane "
+"na powiązane konto społecznościowe GNU"
 
 #: ../../extend/addon/hubzilla-addons/statusnet/Mod_Statusnet.php:291
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:171
@@ -14901,7 +15078,7 @@ msgstr "GNU-Social Crosspost Connector"
 
 #: ../../extend/addon/hubzilla-addons/wholikesme/wholikesme.php:29
 msgid "Who likes me?"
-msgstr "Kto mnie lubi?"
+msgstr "Kto mnie pochwala?"
 
 #: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:25
 msgid "ActivityPub Protocol Settings updated."
@@ -14909,11 +15086,12 @@ msgstr "Zaktualizowano ustawienia ActivityPub Protocol."
 
 #: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:34
 msgid ""
-"The activitypub protocol does not support location independence. Connections you make "
-"within that network may be unreachable from alternate channel locations."
+"The activitypub protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
 msgstr ""
-"Protokół AactivityPub nie obsługuje niezależności od lokalizacji. Połączenia nawiązane "
-"w tej sieci mogą być niedostępne z innych lokalizacji kanałów."
+"Protokół AactivityPub nie obsługuje niezależności od lokalizacji. Połączenia "
+"nawiązane w tej sieci mogą być niedostępne z innych lokalizacji kanałów."
 
 #: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:40
 msgid "Activitypub Protocol App"
@@ -14925,11 +15103,11 @@ msgstr "Dostarcz do odbiorców ActivityPub w grupach prywatności"
 
 #: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:50
 msgid ""
-"May result in a large number of mentions and expose all the members of your privacy "
-"group"
+"May result in a large number of mentions and expose all the members of your "
+"privacy group"
 msgstr ""
-"Może skutkować dużą liczbą wzmianek i ujawnieniem wszystkich członków Twojej grupy "
-"prywatności"
+"Może skutkować dużą liczbą wzmianek i ujawnieniem wszystkich członków Twojej "
+"grupy prywatności"
 
 #: ../../extend/addon/hubzilla-addons/pubcrawl/Mod_Pubcrawl.php:54
 msgid "Send multi-media HTML articles"
@@ -14993,7 +15171,7 @@ msgstr "Minimum 120, domyślnie 300 sekund"
 
 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:103
 msgid "Pause before starting next task"
-msgstr "Zatrzymaj się przed rozpoczęciem następnego zadania"
+msgstr "Zatrzymaj przed rozpoczęciem następnego zadania"
 
 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:105
 msgid "Minimum 100, default 100 microseconds"
@@ -15037,13 +15215,13 @@ msgstr "Informacje"
 
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:143
 msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar "
-"addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
 msgstr ""
-"Dodatek Libravatar jest również zainstalowany. Proszę wyłączyć dodatek Libravatar lub "
-"ten dodatek Gravatar. <br> Dodatek Libravatar wykorzysta Gravatara, jeśli nic nie "
-"zostanie znalezione w bibliotece Libravatara."
+"Dodatek Libravatar jest również zainstalowany. Proszę wyłączyć dodatek "
+"Libravatar lub ten dodatek Gravatar. <br> Dodatek Libravatar wykorzysta "
+"Gravatara, jeśli nic nie zostanie znalezione w bibliotece Libravatara."
 
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:151
 msgid "Default avatar image"
@@ -15052,8 +15230,8 @@ msgstr "Domyślny obraz awatara"
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:151
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
-"Wybierz domyślny obraz awatara, jeśli nic nie zostało znaleziony w Gravatarze. Zobacz "
-"README"
+"Wybierz domyślny obraz awatara, jeśli nic nie zostało znaleziony w "
+"Gravatarze. Zobacz README"
 
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:152
 msgid "Rating of images"
@@ -15061,7 +15239,7 @@ msgstr "Ocena zdjęć"
 
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:152
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Wybierz odpowiedniÄ… ocenÄ™ awatara dla swojej witryny. Zobacz README"
+msgstr "Wybierz odpowiedniÄ… ocenÄ™ awatara dla swojego portalu. Zobacz README"
 
 #: ../../extend/addon/hubzilla-addons/gravatar/gravatar.php:165
 msgid "Gravatar settings updated."
@@ -15092,13 +15270,16 @@ msgstr "Zaloguj się do Hubzilli za pomocą konta społecznościowego"
 
 #: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:207
 msgid "Social Authentication using your social media account"
-msgstr "Uwierzytelnianie społecznościowe za pomocą konta w mediach społecznościowych"
+msgstr ""
+"Uwierzytelnianie społecznościowe za pomocą konta w mediach społecznościowych"
 
 #: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:211
-msgid "This app enables one or more social provider sign-in buttons on the login page."
+msgid ""
+"This app enables one or more social provider sign-in buttons on the login "
+"page."
 msgstr ""
-"Ta aplikacja umożliwia korzystanie na stronie logowania z co najmniej jednego "
-"przycisku logowania dostawcy usług społecznościowych."
+"Ta aplikacja umożliwia korzystanie na stronie logowania z co najmniej "
+"jednego przycisku logowania dostawcy usług społecznościowych."
 
 #: ../../extend/addon/hubzilla-addons/socialauth/Mod_SocialAuth.php:229
 msgid "Add an identity provider"
@@ -15149,7 +15330,7 @@ msgstr "Zapisano ustawienia uwierzytelniania społecznościowego."
 
 #: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:14
 msgid "Send your identity to all websites"
-msgstr "Wyślij swoją tożsamość do wszystkich witryn internetowych"
+msgstr "Wyślij swoją tożsamość do wszystkich portali"
 
 #: ../../extend/addon/hubzilla-addons/sendzid/Mod_Sendzid.php:20
 msgid "Sendzid App"
@@ -15170,7 +15351,8 @@ msgstr "Import albumu fotograficznego Redmatrix"
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:130
 msgid "This will import all your Redmatrix photo albums to this channel."
 msgstr ""
-"Spowoduje to zaimportowanie wszystkich albumów ze zdjęciami z Redmatrix do tego kanału."
+"Spowoduje to zaimportowanie wszystkich albumów ze zdjęciami z Redmatrix do "
+"tego kanału."
 
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:131
 #: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:121
@@ -15216,23 +15398,26 @@ msgid "Relay public posts to Twitter"
 msgstr "Przekazuj publiczne wpisy na Twitter"
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:103
-msgid "No consumer key pair for Twitter found. Please contact your site administrator."
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
-"Nie znaleziono pary kluczy klienta dla Twittera. Skontaktuj siÄ™ z administratorem "
-"witryny."
+"Nie znaleziono pary kluczy klienta dla Twittera. Skontaktuj siÄ™ z "
+"administratorem portalu."
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:125
 msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not yet "
-"connected your account to your Twitter account. To do so click the button below to get "
-"a PIN from Twitter which you have to copy into the input box below and submit the "
-"form. Only your <strong>public</strong> posts will be posted to Twitter."
+"At this Hubzilla instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
-"W tej instancji Hubzilla wtyczka Twittera była włączona, ale nie połączyłeś jeszcze "
-"swojego konta z kontem na Twitterze. Aby to zrobić, kliknij poniższy przycisk, aby "
-"uzyskać kod PIN z Twittera, który należy skopiować do pola wprowadzania poniżej i "
-"przesłać formularz. Na Twitterze będą publikowane tylko Twoje <strong>publiczne</"
-"strong> wpisy."
+"W tej instancji Hubzilla wtyczka Twittera była włączona, ale nie połączyłeś "
+"jeszcze swojego konta z kontem na Twitterze. Aby to zrobić, kliknij poniższy "
+"przycisk, aby uzyskać kod PIN z Twittera, który należy skopiować do pola "
+"wprowadzania poniżej i przesłać formularz. Na Twitterze będą publikowane "
+"tylko Twoje <strong>publiczne</strong> wpisy."
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:127
 msgid "Log in with Twitter"
@@ -15244,16 +15429,16 @@ msgstr "Skopiuj tutaj PIN z Twittera"
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:152
 msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from "
-"unknown viewers?</em>) the link potentially included in public postings relayed to "
-"Twitter will lead the visitor to a blank page informing the visitor that the access to "
-"your profile has been restricted."
+"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
 msgstr ""
-"<strong> Uwaga: </strong> Ze względu na Twoje ustawienia prywatności (<em>Ukryj "
-"szczegóły swojego profilu przed nieznanymi widzami?</em>) ten link, potencjalnie "
-"zawarty w publicznych wpisach przekazywanych do Twittera, będzie prowadził "
-"odwiedzającego do pustej strony informującej gościa, że dostęp do Twojego profilu "
-"został ograniczony."
+"<strong> Uwaga: </strong> Ze względu na Twoje ustawienia prywatności "
+"(<em>Ukryj szczegóły swojego profilu przed nieznanymi widzami?</em>) ten "
+"link, potencjalnie zawarty w publicznych wpisach przekazywanych do Twittera, "
+"będzie prowadził odwiedzającego do pustej strony informującej gościa, że "
+"dostęp do Twojego profilu został ograniczony."
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:157
 msgid "Twitter post length"
@@ -15269,11 +15454,11 @@ msgstr "Domyślnie wysyłaj publiczne wpisy na Twitter"
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:162
 msgid ""
-"If enabled your public postings will be posted to the associated Twitter account by "
-"default"
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
 msgstr ""
-"Jeśli ta opcja jest włączona, Twoje publiczne wpisy będą domyślnie publikowane na "
-"powiÄ…zanym koncie Twittera"
+"Jeśli ta opcja jest włączona, Twoje publiczne wpisy będą domyślnie "
+"publikowane na powiÄ…zanym koncie Twittera"
 
 #: ../../extend/addon/hubzilla-addons/twitter/Mod_Twitter.php:181
 msgid "Twitter Crosspost Connector"
@@ -15293,68 +15478,77 @@ msgstr "Twórca projektu i kierownik techniczny"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:49
 msgid ""
-"And the hundreds of other people and organisations who helped make the Hubzilla "
-"possible."
-msgstr "Jak równieź setki innych osób i organizacji, które pomogły stworzyć Hubzillę."
+"And the hundreds of other people and organisations who helped make the "
+"Hubzilla possible."
+msgstr ""
+"Jak równieź setki innych osób i organizacji, które pomogły stworzyć Hubzillę."
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:52
 msgid ""
-"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time "
-"and expertise - and often paying out of pocket for services they share with others."
+"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
+"their time and expertise - and often paying out of pocket for services they "
+"share with others."
 msgstr ""
-"Projekty Redmatrix i Hubzilla są realizowane głównie przez wolontariuszy, którzy "
-"poświęcają swój czas i wiedzę  i często płacą z własnej kieszeni za usługi, którymi "
-"dzielÄ… siÄ™ z innymi."
+"Projekty Redmatrix i Hubzilla są realizowane głównie przez wolontariuszy, "
+"którzy poświęcają swój czas i wiedzę  i często płacą z własnej kieszeni za "
+"usługi, którymi dzielą się z innymi."
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:53
 msgid ""
-"There is no corporate funding and no ads, and we do not collect and sell your personal "
-"information. (We don't control your personal information - <strong>you do</strong>.)"
+"There is no corporate funding and no ads, and we do not collect and sell "
+"your personal information. (We don't control your personal information - "
+"<strong>you do</strong>.)"
 msgstr ""
-"Nie ma żadnych funduszy korporacyjnych ani reklam a my nie zbieramy i nie sprzedajemy "
-"Twoich danych osobowych. (Nie kontrolujemy Twoich danych osobowych - <strong> Ty tak </"
-"strong>)."
+"Nie ma żadnych funduszy korporacyjnych ani reklam a my nie zbieramy i nie "
+"sprzedajemy Twoich danych osobowych. (Nie kontrolujemy Twoich danych "
+"osobowych - <strong> Ty tak </strong>)."
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:54
 msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and privacy."
+"Help support our ground-breaking work in decentralisation, web identity, and "
+"privacy."
 msgstr ""
-"Pomóż nam wspierać nasze przełomowe prace w zakresie decentralizacji, tożsamości "
-"internetowej i prywatności."
+"Pomóż nam wspierać nasze przełomowe prace w zakresie decentralizacji, "
+"tożsamości internetowej i prywatności."
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:56
 msgid ""
-"Your donations keep servers and services running and also helps us to provide "
-"innovative new features and continued development."
+"Your donations keep servers and services running and also helps us to "
+"provide innovative new features and continued development."
 msgstr ""
-"Twoje darowizny zapewniają nieprzerwane działanie serwerów i usług, a także pomagają "
-"nam w zapewnianiu innowacyjnych nowych funkcji i ciągłym rozwoju."
+"Twoje darowizny zapewniają nieprzerwane działanie serwerów i usług, a także "
+"pomagają nam w zapewnianiu innowacyjnych nowych funkcji i ciągłym rozwoju."
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:59
 msgid "Donate"
 msgstr "Wspomóż"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:61
-msgid "Choose a project, developer, or public hub to support with a one-time donation"
+msgid ""
+"Choose a project, developer, or public hub to support with a one-time "
+"donation"
 msgstr ""
-"Wybierz projekt, dewelopera lub publiczny portal, aby wesprzeć jednorazową darowizną"
+"Wybierz projekt, dewelopera lub publiczny portal, aby wesprzeć jednorazową "
+"darowiznÄ…"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:62
 msgid "Donate Now"
 msgstr "Wpłać teraz"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:63
-msgid "<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
+msgid ""
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
 msgstr ""
-"<strong><em>lub</em> </strong> zostań sponsorem projektu (tylko Projekt Hubzilla)"
+"<strong><em>lub</em> </strong> zostań sponsorem projektu (tylko Projekt "
+"Hubzilla)"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:64
 msgid ""
-"Please indicate if you would like your first name or full name (or nothing) to appear "
-"in our sponsor listing"
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
 msgstr ""
-"Wskaż, czy chcesz, aby Twoje imię lub imię i nazwisko pojawiało się na naszej liście "
-"sponsorów"
+"Wskaż, czy chcesz, aby Twoje imię lub imię i nazwisko pojawiało się na "
+"naszej liście sponsorów"
 
 #: ../../extend/addon/hubzilla-addons/donate/donate.php:65
 msgid "Sponsor"
@@ -15411,11 +15605,11 @@ msgstr "Aplikacja Bez Federalizacji"
 
 #: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:34
 msgid ""
-"Prevent posting from being federated to anybody. It will exist only on your channel "
-"page."
+"Prevent posting from being federated to anybody. It will exist only on your "
+"channel page."
 msgstr ""
-"Zapobiega federowaniu wiadomości do kogokolwiek. Będzie istnieć tylko na stronie "
-"Twojego kanału."
+"Zapobiega federowaniu wiadomości do kogokolwiek. Będzie istnieć tylko na "
+"stronie Twojego kanału."
 
 #: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:42
 msgid "Federate posts by default"
@@ -15456,24 +15650,25 @@ msgstr "Zaimportowano pliki"
 
 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:122
 msgid ""
-"This addon app copies existing content and file storage to a cloned/copied channel. "
-"Once the app is installed, visit the newly installed app. This will allow you to set "
-"the location of your original channel and an optional date range of files/"
-"conversations to copy."
+"This addon app copies existing content and file storage to a cloned/copied "
+"channel. Once the app is installed, visit the newly installed app. This will "
+"allow you to set the location of your original channel and an optional date "
+"range of files/conversations to copy."
 msgstr ""
-"Ten dodatek kopiuje istniejące treści i magazyn plików do sklonowanego lub "
-"skopiowanego kanału. Po zainstalowaniu, odwiedź nowo zainstalowaną aplikację. Umożliwi "
-"Ci to ustawienie lokalizacji oryginalnego kanału i opcjonalnego zakresu dat plików lub "
-"konwersacji do skopiowania."
+"Ta dodatkowa aplikacja kopiuje istniejące treści i magazyn plików do "
+"sklonowanego lub skopiowanego kanału. Po zainstalowaniu, odwiedź nowo "
+"zainstalowaną aplikację. Umożliwi Ci to ustawienie lokalizacji oryginalnego "
+"kanału i opcjonalnego zakresu dat plików lub konwersacji do skopiowania."
 
 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:136
 msgid ""
-"This will import all your conversations and cloud files from a cloned channel on "
-"another server. This may take a while if you have lots of posts and or files."
+"This will import all your conversations and cloud files from a cloned "
+"channel on another server. This may take a while if you have lots of posts "
+"and or files."
 msgstr ""
-"Spowoduje to zaimportowanie wszystkich rozmów i plików przechowywanych w chmurze ze "
-"sklonowanego kanału na innym serwerze. Może to chwilę potrwać, jeśli masz dużo wpisów "
-"lun plików."
+"Spowoduje to zaimportowanie wszystkich rozmów i plików przechowywanych w "
+"chmurze ze sklonowanego kanału na innym serwerze. Może to chwilę potrwać, "
+"jeśli masz dużo wpisów lub plików."
 
 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:137
 msgid "Include posts"
@@ -15620,11 +15815,11 @@ msgstr "Usuń rozmowę"
 
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:296
 msgid ""
-"No secure communications available. You <strong>may</strong> be able to respond from "
-"the sender's profile page."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
-"Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć ze strony profilu "
-"nadawcy."
+"Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć ze strony "
+"profilu nadawcy."
 
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:300
 msgid "Send Reply"
@@ -15650,8 +15845,8 @@ msgstr "Nie można zweryfikować żądanego kanału."
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:417
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
-"Wybrany kanał ma ograniczenia dotyczące wiadomości prywatnych. Wysyłanie nie powiodło "
-"siÄ™."
+"Wybrany kanał ma ograniczenia dotyczące wiadomości prywatnych. Wysyłanie nie "
+"powiodło się."
 
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:50
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:128
@@ -15717,7 +15912,7 @@ msgstr "Najczęściej pobierane jako pierwsze"
 
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70
 msgid "Most liked first"
-msgstr "Najbardziej lubiane jako pierwsze"
+msgstr "Najbardziej chwalone jako pierwsze"
 
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72
 msgid "Preferred IDs Message"
@@ -15856,7 +16051,8 @@ msgstr "Aplikacja Publikowanie w Wordpress"
 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:44
 msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
 msgstr ""
-"Opublikowanie na serwisach WordPress lub innych, które używają API XMLRPC WordPress"
+"Opublikowanie na serwisach WordPress lub innych, które używają API XMLRPC "
+"WordPress"
 
 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:69
 msgid "WordPress username"
@@ -15881,8 +16077,8 @@ msgstr "Identyfikator blogu WordPress"
 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:82
 msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
 msgstr ""
-"Dla serwisów wielowitrynowych, takich jak wordpress.com, w przeciwnym razie pozostaw "
-"puste"
+"Dla serwisów wielowitrynowych, takich jak wordpress.com, w przeciwnym razie "
+"pozostaw puste"
 
 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:86
 msgid "Post to WordPress by default"
@@ -15897,9 +16093,11 @@ msgid "Wordpress Post"
 msgstr "Publikowanie w Wordpress"
 
 #: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:22
-msgid "Allow magic authentication only to websites of your immediate connections"
+msgid ""
+"Allow magic authentication only to websites of your immediate connections"
 msgstr ""
-"Zezwalaj na magiczne uwierzytelnianie tylko w portalach Twoich bezpośrednich połączeń"
+"Zezwalaj na magiczne uwierzytelnianie tylko w portalach Twoich bezpośrednich "
+"połączeń"
 
 #: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:28
 #: ../../extend/addon/hubzilla-addons/authchoose/Mod_Authchoose.php:33
@@ -16179,7 +16377,9 @@ msgstr "Import magazyn plików Redmatrix"
 
 #: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:120
 msgid "This will import all your Redmatrix cloud files to this channel."
-msgstr "Spowoduje to zaimportowanie wszystkich plików chmury Redmatrix do tego kanału."
+msgstr ""
+"Spowoduje to zaimportowanie wszystkich plików chmury Redmatrix do tego "
+"kanału."
 
 #: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:42
 msgid "Use markdown for editing posts"
@@ -16194,10 +16394,11 @@ msgid "Fuzzy Location App"
 msgstr "Aplikacja Zamazywanie Lokalizacji"
 
 #: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:35
-msgid "Blur your precise location if your channel uses browser location mapping"
+msgid ""
+"Blur your precise location if your channel uses browser location mapping"
 msgstr ""
-"Zamaż swoją dokładną lokalizację, jeśli Twój kanał używa mapowania lokalizacji w "
-"przeglÄ…darce"
+"Zamaż swoją dokładną lokalizację, jeśli Twój kanał używa mapowania "
+"lokalizacji w przeglÄ…darce"
 
 #: ../../extend/addon/hubzilla-addons/fuzzloc/Mod_Fuzzloc.php:40
 msgid "Minimum offset in meters"
@@ -16217,7 +16418,8 @@ msgstr "Aplikacja Strona poczÄ…tkowa"
 
 #: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:51
 msgid "Set a preferred page to load on login from home page"
-msgstr "Ustaw preferowaną stronę do załadowania przy logowaniu ze strony głównej"
+msgstr ""
+"Ustaw preferowaną stronę do załadowania przy logowaniu ze strony głównej"
 
 #: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:62
 msgid "Page to load after login"
@@ -16225,13 +16427,13 @@ msgstr "Strona do załadowania po zalogowaniu"
 
 #: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:62
 msgid ""
-"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;"
-"channel&quot; or &quot;notifications/system&quot; (leave blank for default network "
-"page (grid)."
+"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
+"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
+"blank for default network page (grid)."
 msgstr ""
-"Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja prywatności), "
-"&quot;kanał&quot; lub &quot;powiadomienie/system&quot; (pozostaw puste dla domyślnej "
-"strony sieci."
+"Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja "
+"prywatności), &quot;kanał&quot; lub &quot;powiadomienie/system&quot; "
+"(pozostaw puste dla domyślnej strony sieci."
 
 #: ../../extend/addon/hubzilla-addons/startpage/Mod_Startpage.php:70
 msgid "Startpage"
@@ -16240,7 +16442,7 @@ msgstr "Strona poczÄ…tkowa"
 #: ../../view/theme/redbasic/php/config.php:16
 #: ../../view/theme/redbasic/php/config.php:19
 msgid "Focus (Hubzilla default)"
-msgstr "Fokus (domyślny w Hubzilla)"
+msgstr "Fokus (domyślnie Hubzilla)"
 
 #: ../../view/theme/redbasic/php/config.php:98
 msgid "Theme settings"
@@ -16264,7 +16466,7 @@ msgstr "Kolor ikony aktywnego paska nawigacji "
 
 #: ../../view/theme/redbasic/php/config.php:103
 msgid "Link color"
-msgstr "Kolor odnośnika"
+msgstr "Kolor linku"
 
 #: ../../view/theme/redbasic/php/config.php:104
 msgid "Set font-color for banner"
@@ -16330,44 +16532,190 @@ msgstr "Ustaw rozmiar kolejnych zdjęć autora"
 msgid "Show advanced settings"
 msgstr "Pokaż ustawienia zaawansowane"
 
-#: ../../boot.php:1695
+#: ../../boot.php:1696
 msgid "Create an account to access services and applications"
 msgstr "Utwórz konto, aby uzyskać dostęp do usług i aplikacji"
 
-#: ../../boot.php:1719
-msgid "Login/Email"
-msgstr "Login/Email"
+#: ../../boot.php:1714
+msgid "Email or nickname"
+msgstr "Adres e-mail lub pseudonim"
 
-#: ../../boot.php:1720
+#: ../../boot.php:1724
 msgid "Password"
 msgstr "Hasło"
 
-#: ../../boot.php:1721
+#: ../../boot.php:1725
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: ../../boot.php:1724
+#: ../../boot.php:1728
 msgid "Forgot your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: ../../boot.php:2603
+#: ../../boot.php:2607
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
-msgstr "[$Projectname] BÅ‚Ä…d SSL witryny internetowej dla %s"
+msgstr "[$Projectname] BÅ‚Ä…d SSL portalu dla %s"
 
-#: ../../boot.php:2608
+#: ../../boot.php:2612
 msgid "Website SSL certificate is not valid. Please correct."
-msgstr "Certyfikat SSL witryny jest nieprawidłowy. Proszę popraw."
+msgstr "Certyfikat SSL portalu jest nieprawidłowy. Proszę poprawić."
 
-#: ../../boot.php:2724
+#: ../../boot.php:2728
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Zadania Crona nie działają na %s"
 
-#: ../../boot.php:2729
+#: ../../boot.php:2733
 msgid "Cron/Scheduled tasks not running."
 msgstr "Zadania Crona (zaplanowane) nie działają."
 
+#~ msgid "Edit event title"
+#~ msgstr "Edytuj tytuł wydarzenia"
+
+#~ msgid "Categories (comma-separated list)"
+#~ msgstr "Kategorie (lista rozdzielana przecinkami)"
+
+#~ msgid "Edit Category"
+#~ msgstr "Edytuj kategoriÄ™"
+
+#~ msgid "Category"
+#~ msgstr "Kategoria"
+
+#~ msgid "Edit start date and time"
+#~ msgstr "Edytuj datę i godzinę rozpoczęcia"
+
+#~ msgid "Finish date and time are not known or not relevant"
+#~ msgstr "Data i godzina zakończenia nie są znane lub nie mają znaczenia"
+
+#~ msgid "Edit finish date and time"
+#~ msgstr "Edytuj datę i godzinę zakończenia"
+
+#~ msgid "Finish date and time"
+#~ msgstr "Data i godzina zakończenia"
+
+#~ msgid "Adjust for viewer timezone"
+#~ msgstr "Dostosuj do strefy czasowej widza"
+
+#~ msgid ""
+#~ "Important for events that happen in a particular place. Not practical for "
+#~ "global holidays."
+#~ msgstr ""
+#~ "Ważne dla wydarzeń, które mają miejsce w określonym miejscu. "
+#~ "Niepraktyczne na globalne święta."
+
+#~ msgid "Edit Description"
+#~ msgstr "Edytuj opis"
+
+#~ msgid "Edit Location"
+#~ msgstr "Edytuj lokalizacjÄ™"
+
+#~ msgid "Advanced Options"
+#~ msgstr "Zaawansowane opcje"
+
+#~ msgid "l, F j"
+#~ msgstr "l, F j"
+
+#~ msgid "Edit Event"
+#~ msgstr "Edytuj wydarzenie"
+
+#~ msgid "Create Event"
+#~ msgstr "Utwórz wydarzenie"
+
+#~ msgid "Event removed"
+#~ msgstr "Wydarzenie usunięte"
+
+#~ msgid "%d new messages"
+#~ msgstr "%d nowych wiadomości"
+
+#~ msgid "Website:"
+#~ msgstr "Portal internetowy:"
+
+#~ msgid "Remote Channel [%s] (not yet known on this site)"
+#~ msgstr "Kanał zdalny [% s] (jeszcze nieznany w tym portalu)"
+
+#~ msgid "Rating (this information is public)"
+#~ msgstr "Ocena (ta informacja jest publiczna)"
+
+#~ msgid "Optionally explain your rating (this information is public)"
+#~ msgstr "Ewentualnie wyjaśnij swoją ocenę (ta informacja jest publiczna)"
+
+#~ msgid "requires approval"
+#~ msgstr "wymaga zatwierdzenia"
+
+#~ msgid "posted an event"
+#~ msgstr "opublikował wydarzenie"
+
+#~ msgid "No ratings"
+#~ msgstr "Brak ocen"
+
+#~ msgid "Rating: "
+#~ msgstr "Ocena: "
+
+#~ msgid "Website: "
+#~ msgstr "Portal: "
+
+#~ msgid "Description: "
+#~ msgstr "Opis: "
+
+#~ msgid "Remote Diagnostics App"
+#~ msgstr "Aplikacja Zdalna Diagnostyka"
+
+#~ msgid "Perform diagnostics on remote channels"
+#~ msgstr "Przeprowadź diagnostykę zdalnych kanałów"
+
+#~ msgid ""
+#~ "Remote authentication blocked. You are logged into this site locally. "
+#~ "Please logout and retry."
+#~ msgstr ""
+#~ "Zdalne uwierzytelnianie zablokowane. JesteÅ› zalogowany lokalnie na tej "
+#~ "stronie. Wyloguj się i spróbuj ponownie."
+
+#~ msgid "New Message"
+#~ msgstr "Nowy komunikat"
+
+#~ msgid "New Mails"
+#~ msgstr "Nowe wiadomości e-mail"
+
+#~ msgid "New Mails Notifications"
+#~ msgstr "Powiadomienia o nowych wiadomościach e-mail"
+
+#~ msgid "View your private mails"
+#~ msgstr "Zobacz swoje prywatne wiadomości"
+
+#~ msgid "Mark all messages seen"
+#~ msgstr "Oznacz wszystkie wiadomości jako oglądnięte"
+
+#~ msgid "Unable to determine sender."
+#~ msgstr "Nie można określić nadawcy."
+
+#~ msgid "No recipient provided."
+#~ msgstr "Nie podano odbiorcy."
+
+#~ msgid "[no subject]"
+#~ msgstr "[brak tematu]"
+
+#~ msgid "Stored post could not be verified."
+#~ msgstr "Nie można zweryfikować zapisanego wpisu."
+
+#~ msgid "Response from remote channel was incomplete."
+#~ msgstr "Odpowiedź z kanału zdalnego była niekompletna."
+
+#~ msgid "Premium channel - please visit:"
+#~ msgstr "Kanał premium - odwiedź:"
+
+#~ msgid "Channel was deleted and no longer exists."
+#~ msgstr "Kanał został usunięty i już nie istnieje."
+
+#~ msgid "Invalid data packet"
+#~ msgstr "Nieprawidłowy pakiet danych"
+
+#~ msgid "invalid target signature"
+#~ msgstr "nieprawidłowy podpis docelowy"
+
+#~ msgid "Login/Email"
+#~ msgstr "Login/Adres e-mail"
+
 #~ msgid "Verify successfull"
 #~ msgstr "Weryfikacja powiodła się"
 
@@ -16390,47 +16738,55 @@ msgstr "Zadania Crona (zaplanowane) nie działają."
 #~ msgstr "Klasa usługi"
 
 #~ msgid ""
-#~ "Only allow new member registrations with an invitation code. Above register policy "
-#~ "must be set to Yes."
+#~ "Only allow new member registrations with an invitation code. Above "
+#~ "register policy must be set to Yes."
 #~ msgstr ""
-#~ "Zezwalaj tylko na rejestracje nowych członków za pomocą kodu zaproszenia. Powyższe "
-#~ "zasady rejestrów muszą być ustawione na Tak."
+#~ "Zezwalaj tylko na rejestracje nowych członków za pomocą kodu zaproszenia. "
+#~ "Powyższe zasady rejestrów muszą być ustawione na Tak."
 
 #~ msgid "Verify Email Addresses"
 #~ msgstr "Zweryfikuj adresy e-mail"
 
-#~ msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+#~ msgid ""
+#~ "Maximum daily site registrations exceeded. Please try again tomorrow."
 #~ msgstr ""
-#~ "Przekroczono maksymalną dzienną liczbę rejestracji na tym portalu. Proszę spróbować "
-#~ "jutro."
+#~ "Przekroczono maksymalnÄ… dziennÄ… liczbÄ™ rejestracji na tym portalu. ProszÄ™ "
+#~ "spróbować jutro."
 
-#~ msgid "Please indicate acceptance of the Terms of Service. Registration failed."
+#~ msgid ""
+#~ "Please indicate acceptance of the Terms of Service. Registration failed."
 #~ msgstr ""
-#~ "Proszę zaznaczyć <strong>akceptację Warunków korzystania z usługi</strong>. "
-#~ "Rejestracja nieudana."
+#~ "Proszę zaznaczyć <strong>akceptację Warunków korzystania z usługi</"
+#~ "strong>. Rejestracja nieudana."
 
 #~ msgid "Passwords do not match."
-#~ msgstr "Hasła niezgodne."
+#~ msgstr "Hasła nie są zgodne."
 
 #~ msgid "Registration successful. Continue to create your first channel..."
-#~ msgstr "Rejestracja pomyślna. Kontynuuj tworzenie swojego pierwszego kanału ..."
+#~ msgstr ""
+#~ "Rejestracja pomyślna. Kontynuuj tworzenie swojego pierwszego kanału ..."
 
-#~ msgid "Registration successful. Please check your email for validation instructions."
+#~ msgid ""
+#~ "Registration successful. Please check your email for validation "
+#~ "instructions."
 #~ msgstr ""
-#~ "Rejestracja pomyślna. Sprawdź pocztę e-mail, aby uzyskać instrukcje dotyczące "
-#~ "weryfikacji."
+#~ "Rejestracja pomyślna. Sprawdź pocztę e-mail, aby uzyskać instrukcje "
+#~ "dotyczÄ…ce weryfikacji."
 
 #~ msgid "Your registration is pending approval by the site owner."
-#~ msgstr "Twoja rejestracja oczekuje na zatwierdzenie przez właściciela portalu."
+#~ msgstr ""
+#~ "Twoja rejestracja oczekuje na zatwierdzenie przez właściciela portalu."
 
 #~ msgid "Your registration can not be processed."
-#~ msgstr "Twoja rejestracja oczekuje na zatwierdzenie przez właściciela witryny."
+#~ msgstr ""
+#~ "Twoja rejestracja oczekuje na zatwierdzenie przez administratora portalu."
 
 #~ msgid ""
-#~ "Select a channel permission role for your usage needs and privacy requirements."
+#~ "Select a channel permission role for your usage needs and privacy "
+#~ "requirements."
 #~ msgstr ""
-#~ "Wybierz rolę uprawnień do kanału zgodnie z potrzebami użytkowania i wymaganiami "
-#~ "dotyczącymi prywatności."
+#~ "Wybierz rolę uprawnień do kanału zgodnie z potrzebami użytkowania i "
+#~ "wymaganiami dotyczącymi prywatności."
 
 #~ msgid "no"
 #~ msgstr "nie"
@@ -16439,17 +16795,18 @@ msgstr "Zadania Crona (zaplanowane) nie działają."
 #~ msgstr "tak"
 
 #~ msgid ""
-#~ "This site requires email verification. After completing this form, please check "
-#~ "your email for further instructions."
+#~ "This site requires email verification. After completing this form, please "
+#~ "check your email for further instructions."
 #~ msgstr ""
-#~ "Ta witryna wymaga weryfikację adresu e-mail. Po wypełnieniu tego formularza sprawdź "
-#~ "swoją pocztę e-mail, aby uzyskać dalsze instrukcje."
+#~ "Ten portal wymaga weryfikację adresu e-mail. Po wypełnieniu tego "
+#~ "formularza sprawdź swoją pocztę e-mail, aby uzyskać dalsze instrukcje."
 
 #~ msgid "Please join us on $Projectname"
 #~ msgstr "Dołącz do nas na $Projectname"
 
 #~ msgid "Invitation limit exceeded. Please contact your site administrator."
-#~ msgstr "Przekroczono limit zaproszeń. Skontaktuj się z administratorem portalu."
+#~ msgstr ""
+#~ "Przekroczono limit zaproszeń. Skontaktuj się z administratorem portalu."
 
 #~ msgid "%d message sent."
 #~ msgid_plural "%d messages sent."
@@ -16458,25 +16815,29 @@ msgstr "Zadania Crona (zaplanowane) nie działają."
 #~ msgstr[2] "Wysłano %d wiadomości."
 
 #~ msgid "Send email invitations to join this network"
-#~ msgstr "Wyślij wiadomości e-mail z zaproszeniami do przyłączenia się do tej sieci"
+#~ msgstr ""
+#~ "Wyślij wiadomości e-mail z zaproszeniami do przyłączenia się do tej sieci"
 
 #~ msgid "Please join my community on $Projectname."
-#~ msgstr "Zapraszam do dołączenia do mojej społeczności $Projectname i Fediverse."
+#~ msgstr ""
+#~ "Zapraszam do dołączenia do mojej społeczności $Projectname i Fediverse."
 
 #~ msgid "You will need to supply this invitation code:"
 #~ msgstr "W formularzy rejstracji trzeba będzie podać ten kod zaproszenia:"
 
-#~ msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#~ msgid ""
+#~ "1. Register at any $Projectname location (they are all inter-connected)"
 #~ msgstr ""
-#~ "1. Zarejestruj się na poniżej wskazanym portalu sieci $Projectname (choć możesz też "
-#~ "na innym, bo wszystkie są ze sobą połączone) i utwórz swój domyślny profil. "
-#~ "Wcześniej zapoznaj się z Regulaminem i poradnikiem \"Kanał osobisty\" dostępnym w "
-#~ "po kliknieciu linku \"Pomoc\" lub skontaktuj siÄ™ ze mnÄ…."
+#~ "1. Zarejestruj się na poniżej wskazanym portalu sieci $Projectname (choć "
+#~ "możesz też na innym, bo wszystkie są ze sobą połączone) i utwórz swój "
+#~ "domyślny profil. Wcześniej zapoznaj się z Regulaminem i poradnikiem "
+#~ "\"Kanał osobisty\" dostępnym w po kliknieciu linku \"Pomoc\" lub "
+#~ "skontaktuj siÄ™ ze mnÄ…."
 
 #~ msgid "2. Enter my $Projectname network address into the site searchbar."
 #~ msgstr ""
-#~ "2. Aby połączyć się z moim kanałem, wpisz w pasku wyszukiwania portalu mój adres "
-#~ "sieciowy $Projectname."
+#~ "2. Aby połączyć się z moim kanałem, wpisz w pasku wyszukiwania portalu "
+#~ "mój adres sieciowy $Projectname."
 
 #~ msgid "or visit"
 #~ msgstr "lub odwiedź adres URL"
diff --git a/view/pl/hmessages.pot b/view/pl/hmessages.pot
index a51bab69a..38c7c2e11 100644
--- a/view/pl/hmessages.pot
+++ b/view/pl/hmessages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: STD_VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 21:08+0200\n"
+"POT-Creation-Date: 2021-06-12 02:13+0200\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"
@@ -150,8 +150,8 @@ msgid "Special - Group Repository"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:310
-#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:797
-#: ../../Zotlabs/Module/Connedit.php:928 ../../include/selectors.php:60
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:796
+#: ../../Zotlabs/Module/Connedit.php:920 ../../include/selectors.php:60
 #: ../../include/selectors.php:77 ../../include/selectors.php:115
 #: ../../include/selectors.php:151 ../../include/connections.php:741
 #: ../../include/connections.php:748 ../../include/event.php:1429
@@ -163,15 +163,14 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Pdledit.php:35
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Events.php:277
-#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Webpages.php:133
-#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637
-#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Defperms.php:182
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:15
-#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Appman.php:87
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Moderate.php:15
+#: ../../Zotlabs/Module/Authtest.php:13 ../../Zotlabs/Module/Pdledit.php:35
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Bookmarks.php:70
+#: ../../Zotlabs/Module/Webpages.php:133 ../../Zotlabs/Module/Profiles.php:200
+#: ../../Zotlabs/Module/Profiles.php:636 ../../Zotlabs/Module/Like.php:242
+#: ../../Zotlabs/Module/Defperms.php:182 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Group.php:15 ../../Zotlabs/Module/Group.php:31
+#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Moderate.php:15
 #: ../../Zotlabs/Module/New_channel.php:105
 #: ../../Zotlabs/Module/New_channel.php:130
 #: ../../Zotlabs/Module/Filestorage.php:20
@@ -184,36 +183,33 @@ msgstr ""
 #: ../../Zotlabs/Module/Viewconnections.php:33 ../../Zotlabs/Module/Wiki.php:59
 #: ../../Zotlabs/Module/Wiki.php:284 ../../Zotlabs/Module/Wiki.php:427
 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Locs.php:100 ../../Zotlabs/Module/Connedit.php:397
+#: ../../Zotlabs/Module/Locs.php:98 ../../Zotlabs/Module/Connedit.php:394
 #: ../../Zotlabs/Module/Profile_photo.php:338
 #: ../../Zotlabs/Module/Profile_photo.php:351
 #: ../../Zotlabs/Module/Sharedwithme.php:19
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Manage.php:10
 #: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525
-#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1444
-#: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Page.php:34
-#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Regmod.php:20 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Chat.php:113 ../../Zotlabs/Module/Chat.php:118
-#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Display.php:420
-#: ../../Zotlabs/Module/Photos.php:71 ../../Zotlabs/Module/Channel.php:209
-#: ../../Zotlabs/Module/Channel.php:365 ../../Zotlabs/Module/Channel.php:404
-#: ../../Zotlabs/Module/Cards.php:86 ../../Zotlabs/Module/Connections.php:32
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Block.php:24
-#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1446
+#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Regmod.php:20
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Chat.php:113
+#: ../../Zotlabs/Module/Chat.php:118 ../../Zotlabs/Module/Vote.php:19
+#: ../../Zotlabs/Module/Display.php:420 ../../Zotlabs/Module/Photos.php:71
+#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:378
+#: ../../Zotlabs/Module/Channel.php:417 ../../Zotlabs/Module/Cards.php:86
+#: ../../Zotlabs/Module/Connections.php:32 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
+#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:107
 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Profile.php:99
 #: ../../Zotlabs/Module/Profile.php:114
 #: ../../Zotlabs/Module/Article_edit.php:51 ../../Zotlabs/Module/Thing.php:282
 #: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
-#: ../../Zotlabs/Module/Suggest.php:32
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Setup.php:208
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Mood.php:126
-#: ../../Zotlabs/Module/Register.php:200
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Articles.php:89
+#: ../../Zotlabs/Module/Setup.php:208 ../../Zotlabs/Module/Mitem.php:129
+#: ../../Zotlabs/Module/Mood.php:126 ../../Zotlabs/Module/Register.php:200
 #: ../../Zotlabs/Module/Channel_calendar.php:232
 #: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
 #: ../../Zotlabs/Module/Service_limits.php:11
@@ -224,7 +220,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Attach_edit.php:90
 #: ../../Zotlabs/Module/Attach_edit.php:99
 #: ../../Zotlabs/Module/Attach_edit.php:106
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Viewsrc.php:19
+#: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Viewsrc.php:19
 #: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135
 #: ../../include/photos.php:27 ../../include/attach.php:156
 #: ../../include/attach.php:205 ../../include/attach.php:278
@@ -232,7 +228,7 @@ msgstr ""
 #: ../../include/attach.php:438 ../../include/attach.php:445
 #: ../../include/attach.php:527 ../../include/attach.php:1091
 #: ../../include/attach.php:1164 ../../include/attach.php:1327
-#: ../../include/items.php:4088
+#: ../../include/items.php:3744
 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:53
 #: ../../extend/addon/hubzilla-addons/keepout/keepout.php:36
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:26
@@ -256,11 +252,11 @@ msgstr ""
 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Uexport.php:62
 #: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Affinity.php:52
 #: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Suggest.php:40
-#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Tokens.php:99
+#: ../../Zotlabs/Module/Notes.php:56 ../../Zotlabs/Module/Tokens.php:99
 #: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Mood.php:134
-#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Probe.php:19
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
-#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Sources.php:88
+#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Invite.php:56
+#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Lang.php:20
+#: ../../Zotlabs/Module/Lang.php:63 ../../Zotlabs/Module/Sources.php:88
 #: ../../Zotlabs/Module/Poke.php:165
 #: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22
 #: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32
@@ -332,20 +328,20 @@ msgstr ""
 msgid "System layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Events.php:501
-#: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Import.php:647
-#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Group.php:151
-#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Appman.php:155
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Pdledit.php:108 ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Import.php:582 ../../Zotlabs/Module/Defperms.php:266
+#: ../../Zotlabs/Module/Group.php:151 ../../Zotlabs/Module/Group.php:167
+#: ../../Zotlabs/Module/Appman.php:155 ../../Zotlabs/Module/Oauth.php:111
+#: ../../Zotlabs/Module/Import_items.php:129
 #: ../../Zotlabs/Module/Connect.php:107
 #: ../../Zotlabs/Module/Filestorage.php:208 ../../Zotlabs/Module/Oauth2.php:116
-#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Locs.php:132
-#: ../../Zotlabs/Module/Connedit.php:897 ../../Zotlabs/Module/Regate.php:387
-#: ../../Zotlabs/Module/Rate.php:168 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248
-#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
-#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Editpost.php:86
-#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Pconfig.php:116
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Locs.php:130
+#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Regate.php:387
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Chat.php:209
+#: ../../Zotlabs/Module/Chat.php:248 ../../Zotlabs/Module/Photos.php:1058
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1214
+#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Affinity.php:87
+#: ../../Zotlabs/Module/Pconfig.php:116
 #: ../../Zotlabs/Module/Admin/Themes.php:158
 #: ../../Zotlabs/Module/Admin/Security.php:120
 #: ../../Zotlabs/Module/Admin/Accounts.php:309
@@ -461,7 +457,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Group.php:99
 #: ../../Zotlabs/Module/Import_items.php:120
 #: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Share.php:72
-#: ../../Zotlabs/Web/WebServer.php:115 ../../include/items.php:441
+#: ../../Zotlabs/Web/WebServer.php:115 ../../include/items.php:440
 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:75
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotos.php:119
 #: ../../extend/addon/hubzilla-addons/redfiles/redfiles.php:109
@@ -472,65 +468,65 @@ msgstr ""
 msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Zotlabs/Module/Dreport.php:92
 msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Zotlabs/Module/Dreport.php:106
 msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:111
+#: ../../Zotlabs/Module/Dreport.php:110
 msgid "queued"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Zotlabs/Module/Dreport.php:114
 msgid "posted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Zotlabs/Module/Dreport.php:118
 msgid "accepted for delivery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:123
+#: ../../Zotlabs/Module/Dreport.php:122
 msgid "updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:126
+#: ../../Zotlabs/Module/Dreport.php:125
 msgid "update ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:129
+#: ../../Zotlabs/Module/Dreport.php:128
 msgid "permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:133
+#: ../../Zotlabs/Module/Dreport.php:132
 msgid "recipient not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:136
+#: ../../Zotlabs/Module/Dreport.php:135
 msgid "mail recalled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:139
+#: ../../Zotlabs/Module/Dreport.php:138
 msgid "duplicate mail received"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:142
+#: ../../Zotlabs/Module/Dreport.php:141
 msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:162
+#: ../../Zotlabs/Module/Dreport.php:161
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:166 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Module/Dreport.php:165 ../../Zotlabs/Widget/Wiki_pages.php:41
 #: ../../Zotlabs/Widget/Wiki_pages.php:98
 msgid "Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:167
+#: ../../Zotlabs/Module/Dreport.php:166
 msgid "Redeliver"
 msgstr ""
 
@@ -543,7 +539,7 @@ msgid "Profile Visibility Editor"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:362
-#: ../../include/channel.php:1914
+#: ../../include/channel.php:1834
 msgid "Profile"
 msgstr ""
 
@@ -590,11 +586,11 @@ msgstr ""
 msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28
+#: ../../Zotlabs/Module/Cdav.php:819
 msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30
+#: ../../Zotlabs/Module/Cdav.php:821
 msgid "No calendar entries found."
 msgstr ""
 
@@ -611,11 +607,11 @@ msgstr ""
 msgid "Link to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Cdav.php:1010
 msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474
+#: ../../Zotlabs/Module/Cdav.php:1011
 msgid "Start date and time"
 msgstr ""
 
@@ -623,51 +619,47 @@ msgstr ""
 msgid "End date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497
+#: ../../Zotlabs/Module/Cdav.php:1013
 msgid "Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:481
-#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Appman.php:145
+#: ../../Zotlabs/Module/Rbmark.php:100
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:173
 #: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:655
 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:260
 msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:483
-#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736
-#: ../../Zotlabs/Module/Locs.php:128 ../../Zotlabs/Module/Pubsites.php:53
-#: ../../include/js_strings.php:25
+#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Profiles.php:511
+#: ../../Zotlabs/Module/Profiles.php:735 ../../Zotlabs/Module/Locs.php:126
+#: ../../Zotlabs/Module/Pubsites.php:52 ../../include/js_strings.php:25
 msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:697
-#: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Photos.php:947
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Photos.php:947
 #: ../../Zotlabs/Module/Cal.php:203
 msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Events.php:707 ../../Zotlabs/Module/Photos.php:956
+#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Photos.php:956
 #: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:262
 msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708
-#: ../../Zotlabs/Module/Cal.php:205
+#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Cal.php:205
 msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Cdav.php:1039
 msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704
+#: ../../Zotlabs/Module/Cdav.php:1040
 msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705
+#: ../../Zotlabs/Module/Cdav.php:1041
 msgid "Day"
 msgstr ""
 
@@ -692,9 +684,9 @@ msgid "Less"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth.php:53
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Oauth.php:53
 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58
-#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:924
 #: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:536
 msgid "Update"
 msgstr ""
@@ -713,15 +705,15 @@ msgid "CalDAV Calendars"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
-#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Profiles.php:801
 #: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Card_edit.php:130
 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Connedit.php:653 ../../Zotlabs/Module/Connedit.php:925
 #: ../../Zotlabs/Module/Editlayout.php:138
 #: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Photos.php:1179
 #: ../../Zotlabs/Module/Connections.php:329
 #: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Article_edit.php:129
+#: ../../Zotlabs/Module/Article_edit.php:128
 #: ../../Zotlabs/Module/Admin/Accounts.php:320
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:269
@@ -736,32 +728,32 @@ msgid "Delete all"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391
-#: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:802
 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth2.php:117
 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367
 #: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:926
 #: ../../Zotlabs/Module/Profile_photo.php:507
 #: ../../Zotlabs/Module/Editlayout.php:140
 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Editpost.php:111
 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
 #: ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Article_edit.php:131
+#: ../../Zotlabs/Module/Article_edit.php:130
 #: ../../Zotlabs/Module/Admin/Addons.php:427
 #: ../../Zotlabs/Module/Cover_photo.php:428
-#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1460
-#: ../../include/conversation.php:1515
+#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1455
+#: ../../include/conversation.php:1510
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:209
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:258
 msgid "Cancel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388
-#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Profiles.php:800
+#: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Profiles.php:799
 #: ../../Zotlabs/Module/Layouts.php:185
 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Menu.php:182
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Menu.php:182
 #: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
 #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
 msgid "Create"
@@ -784,7 +776,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Group.php:155
 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
-#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:908
 #: ../../Zotlabs/Module/Sharedwithme.php:106 ../../Zotlabs/Module/Chat.php:257
 #: ../../Zotlabs/Module/Admin/Channels.php:159
 #: ../../Zotlabs/Storage/Browser.php:377
@@ -794,25 +786,25 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:909
 msgid "Organisation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:910
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2617
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2678
 msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Connedit.php:911
 msgid "Phone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:789
-#: ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:788
+#: ../../Zotlabs/Module/Connedit.php:912
 #: ../../Zotlabs/Module/Admin/Accounts.php:316
-#: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1768
+#: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1743
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:71
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:56
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:57
@@ -820,82 +812,82 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:789
+#: ../../Zotlabs/Module/Connedit.php:913
 msgid "Instant messenger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Connedit.php:914
 msgid "Website"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:504
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Locs.php:129
-#: ../../Zotlabs/Module/Connedit.php:923
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Connedit.php:915
 #: ../../Zotlabs/Module/Admin/Channels.php:160
 msgid "Address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:792
+#: ../../Zotlabs/Module/Connedit.php:916
 msgid "Note"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:925 ../../include/connections.php:734
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Connedit.php:917 ../../include/connections.php:734
 #: ../../include/event.php:1422
 msgid "Mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:926 ../../include/connections.php:735
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:794
+#: ../../Zotlabs/Module/Connedit.php:918 ../../include/connections.php:735
 #: ../../include/event.php:1423
 msgid "Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:927 ../../include/connections.php:738
+#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:795
+#: ../../Zotlabs/Module/Connedit.php:919 ../../include/connections.php:738
 #: ../../include/event.php:1426
 msgid "Work"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:797
+#: ../../Zotlabs/Module/Connedit.php:921
 msgid "Add Contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Connedit.php:922
 msgid "Add Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:927
 msgid "P.O. Box"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:928
 msgid "Additional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:929
 msgid "Street"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:930
 msgid "Locality"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:931
 msgid "Region"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:932
 msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759
-#: ../../Zotlabs/Module/Connedit.php:941
+#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Connedit.php:933
 msgid "Country"
 msgstr ""
 
@@ -925,13 +917,12 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Defperms.php:198
 #: ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
 #: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:321
 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
@@ -944,7 +935,7 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1468
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463
 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../include/dir_fns.php:146
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
@@ -996,18 +987,17 @@ msgstr ""
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
 #: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
+#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725
 msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Import.php:636 ../../Zotlabs/Module/Import.php:640
-#: ../../Zotlabs/Module/Import.php:641 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Profiles.php:682
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Defperms.php:198
 #: ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
-#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Photos.php:673
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Photos.php:673
 #: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Mitem.php:176
 #: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
 #: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Register.php:512
@@ -1019,7 +1009,7 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1468
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463
 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
 #: ../../include/dir_fns.php:146
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111
@@ -1071,15 +1061,15 @@ msgstr ""
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98
 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102
 #: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1721
+#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725
 msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:52
+#: ../../Zotlabs/Module/Dirsearch.php:24 ../../Zotlabs/Module/Regdir.php:52
 msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:37
+#: ../../Zotlabs/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr ""
 
@@ -1094,8 +1084,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Cards.php:113
 #: ../../Zotlabs/Module/Admin/Profs.php:94
 #: ../../Zotlabs/Module/Admin/Profs.php:114
-#: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:23
+#: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:31
+#: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Widget/Notes.php:23
 #: ../../include/text.php:1145 ../../include/text.php:1157
 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:116
 msgid "Save"
@@ -1105,167 +1095,6 @@ msgstr ""
 msgid "Save to Folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:113
-#: ../../Zotlabs/Module/Channel_calendar.php:62
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124
-#: ../../Zotlabs/Module/Events.php:146
-#: ../../Zotlabs/Module/Channel_calendar.php:64
-#: ../../Zotlabs/Module/Channel_calendar.php:72
-#: ../../Zotlabs/Module/Channel_calendar.php:87
-msgid "Unable to generate preview."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:122
-#: ../../Zotlabs/Module/Channel_calendar.php:70
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271
-#: ../../Zotlabs/Module/Channel_calendar.php:85
-#: ../../Zotlabs/Module/Channel_calendar.php:226
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:266 ../../Zotlabs/Module/Like.php:441
-#: ../../Zotlabs/Module/Tagger.php:75
-#: ../../Zotlabs/Module/Channel_calendar.php:221
-#: ../../include/conversation.php:132 ../../include/text.php:2257
-#: ../../include/event.php:1259
-msgid "event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:468 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Profiles.php:747 ../../Zotlabs/Module/Profiles.php:751
-#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
-#: ../../Zotlabs/Module/Register.php:498 ../../include/js_strings.php:123
-#: ../../include/datetime.php:211
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:334
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:358
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:434
-#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:458
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:470
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Edit Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:474
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
-msgid "Finish date and time are not known or not relevant"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:479
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:481
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:483
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:486 ../../Zotlabs/Module/Webpages.php:262
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:837
-#: ../../include/conversation.php:1404
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:487 ../../include/conversation.php:1482
-#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:502
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:613
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:641
-#: ../../Zotlabs/Module/Channel_calendar.php:370
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:643
-#: ../../Zotlabs/Module/Channel_calendar.php:372
-msgid "Delete event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:669 ../../include/text.php:2076
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:677
-#: ../../Zotlabs/Module/Channel_calendar.php:406
-msgid "calendar"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:699 ../../include/channel.php:1917
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:702 ../../Zotlabs/Module/Webpages.php:261
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:212
-#: ../../Zotlabs/Module/Wiki.php:408 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Pubsites.php:61
-msgid "View"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:739
-msgid "Event removed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:742
-#: ../../Zotlabs/Module/Channel_calendar.php:493
-msgid "Failed to remove event"
-msgstr ""
-
 #: ../../Zotlabs/Module/Help.php:23
 msgid "Documentation Search"
 msgstr ""
@@ -1325,7 +1154,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Cards.php:42
 #: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Profile.php:27
 #: ../../Zotlabs/Module/Articles.php:43 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Menu.php:92 ../../include/channel.php:1464
+#: ../../Zotlabs/Module/Menu.php:92 ../../include/channel.php:1384
 #: ../../extend/addon/hubzilla-addons/gallery/Mod_Gallery.php:49
 msgid "Requested profile is not available."
 msgstr ""
@@ -1354,12 +1183,12 @@ msgstr ""
 msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:341
 #: ../../include/nav.php:524
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Layouts.php:193
 #: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Oauth.php:173
 #: ../../Zotlabs/Module/Card_edit.php:99 ../../Zotlabs/Module/Oauth2.php:194
 #: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
@@ -1369,67 +1198,79 @@ msgstr ""
 #: ../../Zotlabs/Module/Connections.php:363
 #: ../../Zotlabs/Module/Connections.php:383
 #: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Article_edit.php:98
+#: ../../Zotlabs/Module/Article_edit.php:97
 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:268
 #: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:557
 #: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Widget/Cdav.php:138
-#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1566
-#: ../../include/channel.php:1570 ../../include/menu.php:120
+#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1486
+#: ../../include/channel.php:1490 ../../include/menu.php:120
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:194
 #: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Blocks.php:161
 #: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Widget/Cdav.php:136
-#: ../../include/conversation.php:1437
+#: ../../include/conversation.php:1432
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:186
 msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:263
+#: ../../Zotlabs/Module/Webpages.php:260 ../../Zotlabs/Module/Layouts.php:198
+#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Wiki.php:408
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Pubsites.php:60
+msgid "View"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Photos.php:1099
+#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1399
+#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:262
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:264
+#: ../../Zotlabs/Module/Webpages.php:263
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:265
+#: ../../Zotlabs/Module/Webpages.php:264
 msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Webpages.php:265 ../../Zotlabs/Module/Layouts.php:191
 #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:178
 msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Layouts.php:192
 #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:179
 msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:295
+#: ../../Zotlabs/Module/Webpages.php:294
 msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:307
+#: ../../Zotlabs/Module/Webpages.php:306
 msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:318
+#: ../../Zotlabs/Module/Webpages.php:317
 msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:345
+#: ../../Zotlabs/Module/Webpages.php:344
 msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:420
+#: ../../Zotlabs/Module/Webpages.php:419
 msgid "Import complete."
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
+#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:660
 msgid "Profile not found."
 msgstr ""
 
@@ -1465,15 +1306,15 @@ msgstr ""
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:773
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:774
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:781
 msgid "Work/Employment"
 msgstr ""
 
@@ -1506,283 +1347,294 @@ msgstr ""
 msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:680
+#: ../../Zotlabs/Module/Profiles.php:679
 msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:723
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Profiles.php:725
 msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:727 ../../Zotlabs/Module/Profiles.php:826
-#: ../../include/channel.php:1589
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Profiles.php:825
+#: ../../include/channel.php:1509
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:728
+#: ../../Zotlabs/Module/Profiles.php:727
 msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:728
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730 ../../include/channel.php:1559
+#: ../../Zotlabs/Module/Profiles.php:729 ../../include/channel.php:1479
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:730
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Zotlabs/Module/Profiles.php:731
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:732
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:733
 msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Profiles.php:734
 msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:736
 msgid "Relationship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738 ../../Zotlabs/Widget/Newmember.php:51
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Widget/Newmember.php:51
 #: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:740
 msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:742
 msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:746 ../../Zotlabs/Module/Profiles.php:750
+#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Register.php:498 ../../include/js_strings.php:123
+#: ../../include/datetime.php:211
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:334
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:358
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:434
+#: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:458
+msgid "Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:748
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:750
 msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:751
 msgid "Short title/description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:751
 msgid "Maximal 190 characters"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Zotlabs/Module/Profiles.php:754
 msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Zotlabs/Module/Profiles.php:755
 msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Zotlabs/Module/Profiles.php:756
 msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Profiles.php:757
 msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:763
 msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:763
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:764
 msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Zotlabs/Module/Profiles.php:767
 msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Zotlabs/Module/Profiles.php:768
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:68
 msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Zotlabs/Module/Profiles.php:769
 msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Zotlabs/Module/Profiles.php:770
 msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Profiles.php:771
 msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:772
 msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:772
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Zotlabs/Module/Profiles.php:775
 msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Zotlabs/Module/Profiles.php:776
 msgid "Books, literature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Profiles.php:777
 msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Zotlabs/Module/Profiles.php:778
 msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Zotlabs/Module/Profiles.php:779
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:780
 msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Zotlabs/Module/Profiles.php:782
 msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Profiles.php:783
 msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Zotlabs/Module/Profiles.php:784
 msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:787
+#: ../../Zotlabs/Module/Profiles.php:786
 msgid "Communications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:822 ../../include/channel.php:1585
+#: ../../Zotlabs/Module/Profiles.php:821 ../../include/channel.php:1505
 msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:832 ../../include/channel.php:1566
+#: ../../Zotlabs/Module/Profiles.php:831 ../../include/channel.php:1486
 #: ../../include/nav.php:118
 msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213
-#: ../../Zotlabs/Module/Manage.php:145 ../../Zotlabs/Module/Chat.php:262
+#: ../../Zotlabs/Module/Profiles.php:832 ../../Zotlabs/Module/Wiki.php:213
+#: ../../Zotlabs/Module/Manage.php:135 ../../Zotlabs/Module/Chat.php:262
 msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:69 ../../Zotlabs/Module/Import_items.php:48
+#: ../../Zotlabs/Module/Import.php:68 ../../Zotlabs/Module/Import_items.php:48
 msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:84 ../../Zotlabs/Module/Import.php:100
+#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:99
 #: ../../Zotlabs/Module/Import_items.php:72
 msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:107 ../../Zotlabs/Module/Import_items.php:77
+#: ../../Zotlabs/Module/Import.php:106 ../../Zotlabs/Module/Import_items.php:77
 msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:163
+#: ../../Zotlabs/Module/Import.php:162
 #, php-format
 msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:190
+#: ../../Zotlabs/Module/Import.php:189
 msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:595
+#: ../../Zotlabs/Module/Import.php:530
 #: ../../extend/addon/hubzilla-addons/diaspora/import_diaspora.php:142
 msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:623
+#: ../../Zotlabs/Module/Import.php:558
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:628
+#: ../../Zotlabs/Module/Import.php:563
 msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:629
+#: ../../Zotlabs/Module/Import.php:564
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You "
 "may retrieve the channel identity from the old server/hub via the network or "
 "provide an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:630
+#: ../../Zotlabs/Module/Import.php:565
 #: ../../Zotlabs/Module/Import_items.php:127
 msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:631
+#: ../../Zotlabs/Module/Import.php:566
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:633
+#: ../../Zotlabs/Module/Import.php:568
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:634
+#: ../../Zotlabs/Module/Import.php:569
 msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:635
+#: ../../Zotlabs/Module/Import.php:570
 msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:636
+#: ../../Zotlabs/Module/Import.php:571
 msgid "Import a few months of posts if possible (limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:638
+#: ../../Zotlabs/Module/Import.php:573
 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 "
@@ -1790,25 +1642,25 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:640
+#: ../../Zotlabs/Module/Import.php:575
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:641
+#: ../../Zotlabs/Module/Import.php:576
 msgid "Move this channel (disable all previous locations)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:577
 msgid "Use this channel nickname instead of the one provided"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:577
 msgid ""
 "Leave blank to keep your existing channel nickname. You will be randomly "
 "assigned a similar nickname if either name is already allocated on this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:644
+#: ../../Zotlabs/Module/Import.php:579
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -1850,31 +1702,38 @@ msgid "Previous action reversed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Tagger.php:71
-#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:128 ../../include/text.php:2254
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:128 ../../include/text.php:2236
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111
 #: ../../extend/addon/hubzilla-addons/redphotos/redphotohelper.php:71
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2101
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111
 msgid "status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3297
+#: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75
+#: ../../Zotlabs/Module/Channel_calendar.php:221
+#: ../../include/conversation.php:132 ../../include/text.php:2239
+#: ../../include/event.php:1259
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3281
 #: ../../include/conversation.php:174
 #: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1595
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2138
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2148
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299
+#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3283
 #: ../../include/conversation.php:177
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2140
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2150
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
@@ -1932,7 +1791,7 @@ msgstr ""
 #: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:97
 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:171
 #: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:54
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:494
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:487
 #: ../../extend/addon/hubzilla-addons/logrot/logrot.php:54
 msgid "Settings updated."
 msgstr ""
@@ -1945,11 +1804,11 @@ msgstr ""
 msgid "Set custom default permissions for new connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:860
+#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:852
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:853
 msgid "Apply these permissions automatically"
 msgstr ""
 
@@ -1959,23 +1818,23 @@ msgid ""
 "If enabled, connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:854
 msgid "Permission role"
 msgstr ""
 
 #: ../../Zotlabs/Module/Defperms.php:257
 #: ../../Zotlabs/Module/New_channel.php:157
 #: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Connedit.php:862
-#: ../../Zotlabs/Widget/Notifications.php:182 ../../include/nav.php:324
+#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../Zotlabs/Widget/Notifications.php:167 ../../include/nav.php:324
 msgid "Loading"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:855
 msgid "Add permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:868
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
@@ -1985,17 +1844,17 @@ msgstr ""
 msgid "Automatic approval settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:888
 #: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
 msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:901
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:893
 #: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
 msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:903
+#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:895
 #: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
 msgid "Individual Permissions"
 msgstr ""
@@ -2015,13 +1874,13 @@ msgstr ""
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2714
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2675
 msgid "Layouts"
 msgstr ""
 
 #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348
 #: ../../include/nav.php:180 ../../include/nav.php:320
-#: ../../include/help.php:117 ../../include/help.php:125
+#: ../../include/help.php:118 ../../include/help.php:126
 msgid "Help"
 msgstr ""
 
@@ -2046,21 +1905,21 @@ msgid "The unmoderated public stream of this hub"
 msgstr ""
 
 #: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76
-#: ../../Zotlabs/Module/Channel.php:256 ../../Zotlabs/Module/Hq.php:125
+#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:125
 #: ../../Zotlabs/Module/Network.php:209
 msgid "Reset form"
 msgstr ""
 
 #: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375
-#: ../../Zotlabs/Widget/Notifications.php:162
+#: ../../Zotlabs/Widget/Notifications.php:147
 msgid "Public Stream"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
+#: ../../Zotlabs/Module/Sse_bs.php:569
 msgid "Private forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:554 ../../Zotlabs/Module/Ping.php:672
+#: ../../Zotlabs/Module/Sse_bs.php:569
 msgid "Public forum"
 msgstr ""
 
@@ -2073,7 +1932,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:214
-#: ../../include/items.php:4585
+#: ../../include/items.php:4241
 msgid "Privacy group not found."
 msgstr ""
 
@@ -2234,12 +2093,12 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Changeaddr.php:46 ../../Zotlabs/Module/Register.php:100
-#: ../../include/channel.php:226 ../../include/channel.php:706
+#: ../../include/channel.php:225 ../../include/channel.php:657
 msgid "Reserved nickname. Please choose another."
 msgstr ""
 
 #: ../../Zotlabs/Module/Changeaddr.php:51 ../../Zotlabs/Module/Register.php:105
-#: ../../include/channel.php:231 ../../include/channel.php:711
+#: ../../include/channel.php:230 ../../include/channel.php:662
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr ""
@@ -2289,7 +2148,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
 #: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:596
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:505
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:498
 msgid "Consumer Key"
 msgstr ""
 
@@ -2301,7 +2160,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
 #: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
 #: ../../extend/addon/hubzilla-addons/statusnet/statusnet.php:595
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:506
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:499
 msgid "Consumer Secret"
 msgstr ""
 
@@ -2361,8 +2220,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Search.php:21
 #: ../../Zotlabs/Module/Viewconnections.php:23
 #: ../../Zotlabs/Module/Display.php:26 ../../Zotlabs/Module/Photos.php:519
-#: ../../Zotlabs/Module/Directory.php:73 ../../Zotlabs/Module/Directory.php:78
-#: ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77
 msgid "Public access denied."
 msgstr ""
 
@@ -2392,7 +2250,7 @@ msgstr ""
 msgid "Comment deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:150 ../../Zotlabs/Module/Editpost.php:110
+#: ../../Zotlabs/Module/Rpost.php:151 ../../Zotlabs/Module/Editpost.php:110
 msgid "Edit post"
 msgstr ""
 
@@ -2420,14 +2278,14 @@ msgstr ""
 msgid "Post not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3264
-#: ../../include/conversation.php:158 ../../include/text.php:2260
-#: ../../include/markdown.php:204 ../../include/bbcode.php:555
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:158 ../../include/text.php:2242
+#: ../../include/markdown.php:205 ../../include/bbcode.php:555
 msgid "post"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
-#: ../../include/text.php:2262
+#: ../../include/text.php:2244
 msgid "comment"
 msgstr ""
 
@@ -2496,7 +2354,7 @@ msgstr ""
 msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:138
+#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:128
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
@@ -2607,10 +2465,10 @@ msgid "Deprecated!"
 msgstr ""
 
 #: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Display.php:42
-#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:62
+#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:61
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Admin/Addons.php:260 ../../Zotlabs/Module/Thing.php:96
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../include/items.php:4011
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../include/items.php:3667
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:284
 #: ../../extend/addon/hubzilla-addons/flashcards/Mod_Flashcards.php:285
 msgid "Item not found."
@@ -2630,7 +2488,7 @@ msgid "Edit file permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Filestorage.php:195
-#: ../../Zotlabs/Module/Connedit.php:683 ../../Zotlabs/Module/Chat.php:241
+#: ../../Zotlabs/Module/Connedit.php:675 ../../Zotlabs/Module/Chat.php:241
 #: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1047
 #: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
 #: ../../include/acl_selectors.php:154
@@ -2686,8 +2544,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Card_edit.php:101
 #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220
 #: ../../Zotlabs/Module/Editwebpage.php:143
-#: ../../Zotlabs/Module/Article_edit.php:100
-#: ../../include/conversation.php:1345
+#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1340
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:95
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:310
@@ -2697,8 +2554,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Card_edit.php:118
 #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674
 #: ../../Zotlabs/Module/Photos.php:1044
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../include/conversation.php:1477
+#: ../../Zotlabs/Module/Article_edit.php:116
+#: ../../include/conversation.php:1472
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:221
 msgid "Title (optional)"
 msgstr ""
@@ -2839,19 +2696,19 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2118
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2100
 #: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41
 msgid "Markdown"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
 #: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2116
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2098
 msgid "BBcode"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2119
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2101
 msgid "Text"
 msgstr ""
 
@@ -2921,27 +2778,27 @@ msgstr ""
 msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1459
+#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1454
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:208
 msgid "Embed an image from your albums"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:508
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1461
-#: ../../include/conversation.php:1514
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1456
+#: ../../include/conversation.php:1509
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:210
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:257
 msgid "OK"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:509
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1387
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1382
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:139
 msgid "Choose images to embed"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:510
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1388
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1383
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:140
 msgid "Choose an album"
 msgstr ""
@@ -2952,19 +2809,19 @@ msgid "Choose a different album"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:512
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1390
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1385
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:142
 msgid "Error getting album list"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:513
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1391
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1386
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:143
 msgid "Error getting photo link"
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:514
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1392
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1387
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:144
 msgid "Error getting album"
 msgstr ""
@@ -3030,7 +2887,7 @@ msgstr ""
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2712
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2673
 msgid "Blocks"
 msgstr ""
 
@@ -3046,56 +2903,56 @@ msgstr ""
 msgid "Entry uncensored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66
+#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
 msgid "Location not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:75
+#: ../../Zotlabs/Module/Locs.php:74
 msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:79
+#: ../../Zotlabs/Module/Locs.php:78
 msgid ""
 "Please select another location to become primary before removing the primary "
 "location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:108
+#: ../../Zotlabs/Module/Locs.php:106
 msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Locs.php:115
 msgid "No locations found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Locs.php:125
 msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:130
+#: ../../Zotlabs/Module/Locs.php:128
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:285
 msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:131 ../../Zotlabs/Module/Menu.php:177
+#: ../../Zotlabs/Module/Locs.php:129 ../../Zotlabs/Module/Menu.php:177
 msgid "Drop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:133
+#: ../../Zotlabs/Module/Locs.php:131
 msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:134
+#: ../../Zotlabs/Module/Locs.php:132
 msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:135
+#: ../../Zotlabs/Module/Locs.php:133
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing "
 "your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:136
+#: ../../Zotlabs/Module/Locs.php:134
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
@@ -3121,286 +2978,285 @@ msgstr ""
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:265
+#: ../../Zotlabs/Module/Connedit.php:262
 msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:267
+#: ../../Zotlabs/Module/Connedit.php:264
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:310
+#: ../../Zotlabs/Module/Connedit.php:307
 msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:435
+#: ../../Zotlabs/Module/Connedit.php:432
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:483 ../../Zotlabs/Module/Connedit.php:487
+#: ../../Zotlabs/Module/Connedit.php:480
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:502 ../../Zotlabs/Module/Connedit.php:511
-#: ../../Zotlabs/Module/Connedit.php:520 ../../Zotlabs/Module/Connedit.php:529
-#: ../../Zotlabs/Module/Connedit.php:542
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:553
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:344
-#: ../../include/conversation.php:1083 ../../include/nav.php:115
+#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:344
+#: ../../include/conversation.php:1078 ../../include/nav.php:115
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57
 msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Zotlabs/Module/Connedit.php:596
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Zotlabs/Module/Connedit.php:600
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Zotlabs/Module/Connedit.php:603
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615
+#: ../../Zotlabs/Module/Connedit.php:607
 msgid "Refresh Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Zotlabs/Module/Connedit.php:610
 msgid "Fetch updated photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:622 ../../include/conversation.php:1093
+#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1088
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Zotlabs/Module/Connedit.php:617
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Connedit.php:621
 #: ../../Zotlabs/Module/Admin/Accounts.php:322
 msgid "Unblock"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Connedit.php:621
 #: ../../Zotlabs/Module/Admin/Accounts.php:321
 msgid "Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:632
+#: ../../Zotlabs/Module/Connedit.php:624
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:625
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Connedit.php:629
 msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Connedit.php:629
 #: ../../Zotlabs/Module/Connections.php:345
 msgid "Ignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:640
+#: ../../Zotlabs/Module/Connedit.php:632
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:633
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:648
+#: ../../Zotlabs/Module/Connedit.php:640
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:641
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:648
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:649
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:664
+#: ../../Zotlabs/Module/Connedit.php:656
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Connedit.php:664
 msgid "Fetch Vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:675
+#: ../../Zotlabs/Module/Connedit.php:667
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:686
+#: ../../Zotlabs/Module/Connedit.php:678
 msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:701
 msgid "Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Zotlabs/Module/Connedit.php:704
 msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:30
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:30
 msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:31
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:31
 msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:710
 #: ../../Zotlabs/Module/Settings/Channel.php:71
 #: ../../Zotlabs/Module/Settings/Channel.php:75
 #: ../../Zotlabs/Module/Settings/Channel.php:76
 #: ../../Zotlabs/Module/Settings/Channel.php:79
 #: ../../Zotlabs/Module/Settings/Channel.php:90
-#: ../../Zotlabs/Widget/Affinity.php:32 ../../include/channel.php:506
-#: ../../include/channel.php:509 ../../include/selectors.php:134
+#: ../../Zotlabs/Widget/Affinity.php:32 ../../include/channel.php:457
+#: ../../include/channel.php:460 ../../include/selectors.php:134
 msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Widget/Affinity.php:33
+#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:33
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:712
 #: ../../Zotlabs/Module/Connections.php:97
 #: ../../Zotlabs/Module/Connections.php:111
 #: ../../Zotlabs/Widget/Affinity.php:34
 msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Module/Connedit.php:741
 msgid "Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:752
+#: ../../Zotlabs/Module/Connedit.php:744
 msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:794
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:797
+#: ../../Zotlabs/Module/Connedit.php:789
 msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:800
+#: ../../Zotlabs/Module/Connedit.php:792
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:848
+#: ../../Zotlabs/Module/Connedit.php:840
 msgid "This connection is unreachable from this location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:849
+#: ../../Zotlabs/Module/Connedit.php:841
 msgid "This connection may be unreachable from other channel locations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:851
+#: ../../Zotlabs/Module/Connedit.php:843
 msgid "Location independence is not supported by their network."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:857
+#: ../../Zotlabs/Module/Connedit.php:849
 msgid ""
 "This connection is unreachable from this location. Location independence is "
 "not supported by their network."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:860 ../../include/items.php:4618
+#: ../../Zotlabs/Module/Connedit.php:852 ../../include/items.php:4274
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:853
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:870
+#: ../../Zotlabs/Module/Connedit.php:862
 msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:863
 msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:869
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:879
+#: ../../Zotlabs/Module/Connedit.php:871
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:880 ../../Zotlabs/Module/Rate.php:157
-#: ../../include/js_strings.php:20
+#: ../../Zotlabs/Module/Connedit.php:872 ../../include/js_strings.php:20
 msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:873
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Connedit.php:887
+#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:884
+#: ../../Zotlabs/Module/Connedit.php:876
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Connedit.php:877
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878
 #: ../../Zotlabs/Module/Admin/Site.php:512
 #: ../../Zotlabs/Module/Admin/Site.php:513
 msgid ""
@@ -3408,30 +3264,30 @@ msgid ""
 "all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Connedit.php:878
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Connedit.php:880
 msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Connedit.php:885
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:898
+#: ../../Zotlabs/Module/Connedit.php:890
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:900 ../../Zotlabs/Module/Tokens.php:180
+#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Tokens.php:180
 msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:904 ../../Zotlabs/Module/Tokens.php:187
+#: ../../Zotlabs/Module/Connedit.php:896 ../../Zotlabs/Module/Tokens.php:187
 #: ../../Zotlabs/Module/Permcats.php:128
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
@@ -3439,7 +3295,7 @@ msgid ""
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../Zotlabs/Module/Connedit.php:897
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -3447,11 +3303,11 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:906
+#: ../../Zotlabs/Module/Connedit.php:898
 msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Connedit.php:906
 msgid "Details"
 msgstr ""
 
@@ -3714,7 +3570,7 @@ msgid "NEW"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1558
+#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1540
 msgid "Size"
 msgstr ""
 
@@ -3735,42 +3591,37 @@ msgstr ""
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Zotlabs/Module/Manage.php:135
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:337
+#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:337
 #: ../../include/nav.php:101
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:161
 msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:163
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Zotlabs/Module/Manage.php:164
 msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Make Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:178
-#, php-format
-msgid "%d new messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:168
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Zotlabs/Module/Manage.php:170
 msgid "Delegated Channel"
 msgstr ""
 
@@ -3786,49 +3637,32 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Zotlabs/Module/Item.php:1191
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1334
+#: ../../Zotlabs/Module/Item.php:1336
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1368
+#: ../../Zotlabs/Module/Item.php:1370
 msgid "Your comment is awaiting approval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1498
+#: ../../Zotlabs/Module/Item.php:1500
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1505
+#: ../../Zotlabs/Module/Item.php:1507
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1512
+#: ../../Zotlabs/Module/Item.php:1514
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:158
-msgid "Website:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:161
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:162
-msgid "Rating (this information is public)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:163
-msgid "Optionally explain your rating (this information is public)"
-msgstr ""
-
 #: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
 msgid "Invalid item."
 msgstr ""
@@ -3837,7 +3671,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173
 #: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Block.php:77
 #: ../../Zotlabs/Web/Router.php:186 ../../Zotlabs/Lib/NativeWikiPage.php:533
-#: ../../include/help.php:132
+#: ../../include/help.php:133
 msgid "Page not found."
 msgstr ""
 
@@ -3912,11 +3746,11 @@ msgstr ""
 msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:25 ../../Zotlabs/Widget/Pubsites.php:12
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:28
+#: ../../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 "
@@ -3925,32 +3759,31 @@ msgid ""
 "additional details."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:36 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:1133
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1128
 msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:50
+#: ../../Zotlabs/Module/Pubsites.php:49
 msgid "Rate"
 msgstr ""
 
@@ -3991,7 +3824,7 @@ msgstr ""
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1382
+#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1377
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:134
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:120
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:241
@@ -3999,7 +3832,7 @@ msgid "Please enter a link URL:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841
-#: ../../include/conversation.php:1512
+#: ../../include/conversation.php:1507
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:255
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:173
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:316
@@ -4125,7 +3958,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1729
 msgid "Password Reset"
 msgstr ""
 
@@ -4182,36 +4015,7 @@ msgstr ""
 msgid "Response submitted. Updates may not appear instantly."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948
-msgid "sent you a private message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914
-msgid "added your channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:418
-msgid "requires approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957
-msgid "g A l F d"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960
-msgid "[today]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:456
-msgid "posted an event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829
-#: ../../Zotlabs/Lib/Enotify.php:931
-msgid "shared a file with you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Display.php:354 ../../Zotlabs/Module/Channel.php:483
+#: ../../Zotlabs/Module/Display.php:354 ../../Zotlabs/Module/Channel.php:496
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
@@ -4224,40 +4028,40 @@ msgstr ""
 msgid "Item has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:96
+#: ../../Zotlabs/Module/Admin.php:95
 #: ../../Zotlabs/Module/Admin/Accounts.php:308
 #: ../../Zotlabs/Module/Admin/Accounts.php:327
 #: ../../Zotlabs/Widget/Admin.php:23
 msgid "Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Zotlabs/Module/Admin.php:96
 msgid "Blocked accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Zotlabs/Module/Admin.php:97
 msgid "Expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Zotlabs/Module/Admin.php:98
 msgid "Expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:117
+#: ../../Zotlabs/Module/Admin.php:116
 #: ../../Zotlabs/Module/Admin/Channels.php:146
 #: ../../Zotlabs/Widget/Admin.php:24
 msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:123
+#: ../../Zotlabs/Module/Admin.php:122
 msgid "Message queues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
 msgid "Your software should be updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:141 ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin.php:140 ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
 #: ../../Zotlabs/Module/Admin/Security.php:98
 #: ../../Zotlabs/Module/Admin/Accounts.php:307
@@ -4269,35 +4073,35 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
 msgid "Summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
 msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
 msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:148
+#: ../../Zotlabs/Module/Admin.php:147
 msgid "Active addons"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:149
+#: ../../Zotlabs/Module/Admin.php:148
 msgid "Version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:150
+#: ../../Zotlabs/Module/Admin.php:149
 msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:151
+#: ../../Zotlabs/Module/Admin.php:150
 msgid "Repository version (dev)"
 msgstr ""
 
@@ -4363,20 +4167,20 @@ msgstr ""
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1333
+#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1331
 #: ../../Zotlabs/Module/Embedphotos.php:171
 #: ../../Zotlabs/Widget/Portfolio.php:87 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1255
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1253
 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1112
-#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1552
+#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1553
 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:268
-#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1214
+#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1209
 #: ../../include/cdav.php:158 ../../include/cdav.php:159
 #: ../../include/cdav.php:167
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1189
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1196
 msgid "Unknown"
 msgstr ""
 
@@ -4385,7 +4189,7 @@ msgstr ""
 msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1362
 msgid "Add Photos"
 msgstr ""
 
@@ -4462,12 +4266,12 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1211
 #: ../../Zotlabs/Lib/ThreadItem.php:824
 msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1213
 #: ../../Zotlabs/Lib/ThreadItem.php:826 ../../include/js_strings.php:6
 msgid "Comment"
 msgstr ""
@@ -4524,7 +4328,7 @@ msgid "View all"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243
-#: ../../include/conversation.php:1752 ../../include/channel.php:1809
+#: ../../include/conversation.php:1744 ../../include/channel.php:1729
 #: ../../include/taxonomy.php:670
 msgctxt "noun"
 msgid "Like"
@@ -4533,62 +4337,62 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248
-#: ../../include/conversation.php:1755
+#: ../../include/conversation.php:1747
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1245
 msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1256
+#: ../../Zotlabs/Module/Photos.php:1254
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1261
+#: ../../Zotlabs/Module/Photos.php:1259
 msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:491
+#: ../../Zotlabs/Module/Photos.php:1267 ../../Zotlabs/Lib/ThreadItem.php:491
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:492
+#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:492
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Storage/Browser.php:411
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Storage/Browser.php:411
 #: ../../Zotlabs/Lib/ThreadItem.php:497 ../../Zotlabs/Widget/Pinned.php:158
 #: ../../include/acl_selectors.php:156
 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:233
 msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362 ../../include/photos.php:667
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:667
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Profile.php:62
+#: ../../Zotlabs/Module/Channel.php:144 ../../Zotlabs/Module/Profile.php:62
 #: ../../Zotlabs/Module/Hcard.php:37
 msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Profile.php:69
+#: ../../Zotlabs/Module/Channel.php:151 ../../Zotlabs/Module/Profile.php:69
 #: ../../Zotlabs/Module/Hcard.php:44
 msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:206
+#: ../../Zotlabs/Module/Channel.php:219
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:221 ../../Zotlabs/Module/Network.php:168
+#: ../../Zotlabs/Module/Channel.php:234 ../../Zotlabs/Module/Network.php:168
 msgid "Search Results For:"
 msgstr ""
 
@@ -4703,7 +4507,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:83
 #: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Notifications.php:53 ../../Zotlabs/Module/Menu.php:180
+#: ../../Zotlabs/Module/Notifications.php:101 ../../Zotlabs/Module/Menu.php:180
 msgid "New"
 msgstr ""
 
@@ -4716,7 +4520,7 @@ msgid "Show active connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:165
-#: ../../Zotlabs/Widget/Notifications.php:104
+#: ../../Zotlabs/Widget/Notifications.php:89
 msgid "New Connections"
 msgstr ""
 
@@ -4808,9 +4612,9 @@ msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
-#: ../../Zotlabs/Module/Directory.php:370 ../../Zotlabs/Widget/Follow.php:32
-#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1103
-#: ../../include/channel.php:1646 ../../include/connections.php:110
+#: ../../Zotlabs/Module/Directory.php:369 ../../Zotlabs/Widget/Follow.php:32
+#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1098
+#: ../../include/channel.php:1566 ../../include/connections.php:110
 msgid "Connect"
 msgstr ""
 
@@ -4832,8 +4636,8 @@ msgid "Connections search"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:382
-#: ../../Zotlabs/Module/Directory.php:433
-#: ../../Zotlabs/Module/Directory.php:438 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr ""
 
@@ -4916,7 +4720,7 @@ msgstr ""
 msgid "View Common Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186
+#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2182
 #, php-format
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr ""
@@ -4937,7 +4741,7 @@ msgstr ""
 msgid "vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Article_edit.php:127
 msgid "Edit Article"
 msgstr ""
 
@@ -4945,16 +4749,16 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2625
-#: ../../boot.php:1717
+#: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2545
+#: ../../boot.php:1721
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2626
+#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2546
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2627
+#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2547
 msgid "Authenticate"
 msgstr ""
 
@@ -5196,7 +5000,7 @@ msgstr[1] ""
 msgid "Account not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2785
+#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2705
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
@@ -5309,7 +5113,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:347
-#: ../../include/conversation.php:1123
+#: ../../include/conversation.php:1118
 msgid "Message"
 msgstr ""
 
@@ -5481,12 +5285,12 @@ msgid "select all"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:150
-#: ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Censor"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:151
-#: ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Uncensor"
 msgstr ""
 
@@ -5674,7 +5478,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3395
+#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3356
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:335
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:359
 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:435
@@ -6304,11 +6108,13 @@ msgstr ""
 msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:58
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:106
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:65 ../../Zotlabs/Module/Notifications.php:62
+#: ../../Zotlabs/Module/Notify.php:65
+#: ../../Zotlabs/Module/Notifications.php:110
 msgid "System Notifications"
 msgstr ""
 
@@ -6393,7 +6199,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:437
+#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:436
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr ""
@@ -6418,11 +6224,11 @@ msgstr ""
 msgid "Validation token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notes.php:57
+#: ../../Zotlabs/Module/Notes.php:56
 msgid "Notes App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notes.php:58
+#: ../../Zotlabs/Module/Notes.php:57
 msgid "A simple notes app with a widget (note: notes are not encrypted)"
 msgstr ""
 
@@ -6495,7 +6301,7 @@ msgstr ""
 msgid "Use arrows to move the corresponding app up or down in the app tray"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:63
+#: ../../Zotlabs/Module/Notifications.php:111
 #: ../../Zotlabs/Lib/ThreadItem.php:484
 msgid "Mark all seen"
 msgstr ""
@@ -6973,107 +6779,107 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:122
+#: ../../Zotlabs/Module/Directory.php:121
 msgid "No default suggestions were found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:282
+#: ../../Zotlabs/Module/Directory.php:281
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Directory.php:293
+#: ../../Zotlabs/Module/Directory.php:292
 msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:295
+#: ../../Zotlabs/Module/Directory.php:294
 msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:297
+#: ../../Zotlabs/Module/Directory.php:296
 msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:349 ../../include/channel.php:1834
+#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1754
 msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:354 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Directory.php:353 ../../include/channel.php:1581
 #: ../../include/event.php:63 ../../include/event.php:134
 msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:360
+#: ../../Zotlabs/Module/Directory.php:359
 msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:367 ../../include/channel.php:1863
+#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1783
 msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:369 ../../include/channel.php:1869
+#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1789
 msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:371
+#: ../../Zotlabs/Module/Directory.php:370
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:374
+#: ../../Zotlabs/Module/Directory.php:373
 msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:377
+#: ../../Zotlabs/Module/Directory.php:376
 msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:379
+#: ../../Zotlabs/Module/Directory.php:378
 msgid "Common connections (estimated):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:434
+#: ../../Zotlabs/Module/Directory.php:433
 msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:440
+#: ../../Zotlabs/Module/Directory.php:439
 msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:441
+#: ../../Zotlabs/Module/Directory.php:440
 msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:442
+#: ../../Zotlabs/Module/Directory.php:441
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:443
+#: ../../Zotlabs/Module/Directory.php:442
 msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:444
+#: ../../Zotlabs/Module/Directory.php:443
 msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:461
+#: ../../Zotlabs/Module/Directory.php:460
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -7246,23 +7052,7 @@ msgstr ""
 msgid "Permission category name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:212
+#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:211
 msgid "Nickname is required."
 msgstr ""
 
@@ -7396,7 +7186,7 @@ msgid "I have an invite code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168
-#: ../../boot.php:1696
+#: ../../boot.php:1697
 msgid "Register"
 msgstr ""
 
@@ -7415,6 +7205,41 @@ msgstr ""
 msgid "network"
 msgstr ""
 
+#: ../../Zotlabs/Module/Channel_calendar.php:62
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:64
+#: ../../Zotlabs/Module/Channel_calendar.php:72
+#: ../../Zotlabs/Module/Channel_calendar.php:87
+msgid "Unable to generate preview."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:70
+msgid "Event title and start time are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:85
+#: ../../Zotlabs/Module/Channel_calendar.php:226
+msgid "Event not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:370
+msgid "Edit event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:372
+msgid "Delete event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:406
+msgid "calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel_calendar.php:493
+msgid "Failed to remove event"
+msgstr ""
+
 #: ../../Zotlabs/Module/Settings/Featured.php:25
 msgid "No feature settings configured"
 msgstr ""
@@ -7655,7 +7480,7 @@ msgstr ""
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1791
+#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1711
 msgid "Full Name:"
 msgstr ""
 
@@ -8024,14 +7849,6 @@ msgstr ""
 msgid "Conversation Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:19
-msgid "Remote Diagnostics App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Probe.php:20
-msgid "Perform diagnostics on remote channels"
-msgstr ""
-
 #: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
 msgid "Invite App"
 msgstr ""
@@ -8211,27 +8028,27 @@ msgstr ""
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Zotlabs/Module/Rbmark.php:93
 msgid "Select a bookmark folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Zotlabs/Module/Rbmark.php:98
 msgid "Save Bookmark"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Zotlabs/Module/Rbmark.php:99
 msgid "URL of bookmark"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Zotlabs/Module/Rbmark.php:104
 msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lang.php:17
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
 msgid "Language App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lang.php:18
+#: ../../Zotlabs/Module/Lang.php:64
 msgid "Change UI language"
 msgstr ""
 
@@ -8248,30 +8065,30 @@ msgstr ""
 msgid "Cover Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4966
+#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4622
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4967
+#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4623
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4968
+#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4624
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4969
+#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4625
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4971
+#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4627
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2356
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2276
 msgid "cover photo"
 msgstr ""
 
@@ -8319,7 +8136,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2713
+#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2674
 msgid "Menus"
 msgstr ""
 
@@ -8468,7 +8285,7 @@ msgid "Poke somebody in your addressbook"
 msgstr ""
 
 #: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:351
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1138
 msgid "Poke"
 msgstr ""
 
@@ -8654,19 +8471,6 @@ msgid ""
 "an existing folder."
 msgstr ""
 
-#: ../../Zotlabs/Zot/Auth.php:154
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
-msgstr ""
-
-#: ../../Zotlabs/Zot/Auth.php:266
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:76
-#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:178
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr ""
-
 #: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:23
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8701,27 +8505,26 @@ msgid "add"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
-#: ../../include/follow.php:39
 msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:51 ../../include/follow.php:44
+#: ../../Zotlabs/Lib/Connect.php:51
 msgid "Channel location missing."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:103 ../../include/follow.php:168
+#: ../../Zotlabs/Lib/Connect.php:103
 msgid "Remote channel or protocol unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:137 ../../include/follow.php:192
+#: ../../Zotlabs/Lib/Connect.php:137
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:155 ../../include/follow.php:204
+#: ../../Zotlabs/Lib/Connect.php:155
 msgid "Protocol disabled."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Connect.php:167 ../../include/follow.php:215
+#: ../../Zotlabs/Lib/Connect.php:167
 msgid "Cannot connect to yourself."
 msgstr ""
 
@@ -8773,7 +8576,7 @@ msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127
-#: ../../include/nav.php:131 ../../boot.php:1716
+#: ../../include/nav.php:131 ../../boot.php:1720
 msgid "Login"
 msgstr ""
 
@@ -8997,8 +8800,8 @@ msgid "$Projectname Notification"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Enotify.php:61
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:336
-#: ../../extend/addon/hubzilla-addons/diaspora/util.php:349
+#: ../../extend/addon/hubzilla-addons/diaspora/util.php:337
+#: ../../extend/addon/hubzilla-addons/diaspora/util.php:350
 #: ../../extend/addon/hubzilla-addons/diaspora/p.php:48
 msgid "$projectname"
 msgstr ""
@@ -9270,6 +9073,10 @@ msgstr ""
 msgid "repeated %s's post"
 msgstr ""
 
+#: ../../Zotlabs/Lib/Enotify.php:829 ../../Zotlabs/Lib/Enotify.php:931
+msgid "shared a file with you"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Enotify.php:837
 #, php-format
 msgid "edited a post dated %s"
@@ -9280,6 +9087,22 @@ msgstr ""
 msgid "edited a comment dated %s"
 msgstr ""
 
+#: ../../Zotlabs/Lib/Enotify.php:914
+msgid "added your channel"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:948
+msgid "sent you a private message"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:957
+msgid "g A l F d"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:960
+msgid "[today]"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Enotify.php:970
 msgid "created an event"
 msgstr ""
@@ -9288,7 +9111,7 @@ msgstr ""
 msgid "status verified"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libsync.php:740 ../../include/zot.php:2663
+#: ../../Zotlabs/Lib/Libsync.php:737
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -9511,7 +9334,7 @@ msgstr ""
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1924
+#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1906
 msgid "Vote"
 msgstr ""
 
@@ -9554,27 +9377,27 @@ msgstr ""
 msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1451
+#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1446
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:200
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1452
+#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1447
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:201
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1453
+#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1448
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:202
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1454
+#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1449
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:203
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1455
+#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1450
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:204
 msgid "Code"
 msgstr ""
@@ -9583,7 +9406,7 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1456
+#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1451
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:205
 msgid "Attach/Upload file"
 msgstr ""
@@ -9608,41 +9431,41 @@ msgstr ""
 msgid "Your website URL (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2163
+#: ../../Zotlabs/Lib/Activity.php:2159
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2166
+#: ../../Zotlabs/Lib/Activity.php:2162
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2172
+#: ../../Zotlabs/Lib/Activity.php:2168
 #, php-format
 msgid "Will attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2175
+#: ../../Zotlabs/Lib/Activity.php:2171
 #, php-format
 msgid "Will not attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2178
+#: ../../Zotlabs/Lib/Activity.php:2174
 #, php-format
 msgid "May attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2181
+#: ../../Zotlabs/Lib/Activity.php:2177
 #, php-format
 msgid "May not attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:3114 ../../Zotlabs/Lib/Activity.php:3306
-#: ../../include/network.php:1767
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1490
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1939
-#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2147
+#: ../../Zotlabs/Lib/Activity.php:3098 ../../Zotlabs/Lib/Activity.php:3290
+#: ../../include/network.php:1742
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1500
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1949
+#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2157
 msgid "ActivityPub"
 msgstr ""
 
@@ -9690,7 +9513,7 @@ msgctxt "permcat"
 msgid "publisher"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Libzot.php:655 ../../include/zot.php:805
+#: ../../Zotlabs/Lib/Libzot.php:655
 msgid "Unable to verify channel signature"
 msgstr ""
 
@@ -9894,8 +9717,8 @@ msgstr ""
 
 #: ../../Zotlabs/Widget/Forums.php:100
 #: ../../Zotlabs/Widget/Activity_filter.php:123
-#: ../../Zotlabs/Widget/Notifications.php:139
-#: ../../Zotlabs/Widget/Notifications.php:140
+#: ../../Zotlabs/Widget/Notifications.php:124
+#: ../../Zotlabs/Widget/Notifications.php:125
 #: ../../include/acl_selectors.php:125
 msgid "Forums"
 msgstr ""
@@ -10013,10 +9836,6 @@ msgstr ""
 msgid "Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
-msgid "New Message"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Affinity.php:54
 msgid "Refresh"
 msgstr ""
@@ -10148,15 +9967,15 @@ msgstr ""
 #: ../../Zotlabs/Widget/Notifications.php:26
 #: ../../Zotlabs/Widget/Notifications.php:46
 #: ../../Zotlabs/Widget/Notifications.php:65
-#: ../../Zotlabs/Widget/Notifications.php:172
+#: ../../Zotlabs/Widget/Notifications.php:157
 msgid "Show new posts only"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Notifications.php:27
 #: ../../Zotlabs/Widget/Notifications.php:47
 #: ../../Zotlabs/Widget/Notifications.php:66
-#: ../../Zotlabs/Widget/Notifications.php:142
-#: ../../Zotlabs/Widget/Notifications.php:173
+#: ../../Zotlabs/Widget/Notifications.php:127
+#: ../../Zotlabs/Widget/Notifications.php:158
 msgid "Filter by name or address"
 msgstr ""
 
@@ -10173,7 +9992,7 @@ msgid "View your home activity"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Notifications.php:43
-#: ../../Zotlabs/Widget/Notifications.php:169
+#: ../../Zotlabs/Widget/Notifications.php:154
 msgid "Mark all notifications seen"
 msgstr ""
 
@@ -10190,83 +10009,67 @@ msgid "View your direct messages"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Notifications.php:74
-msgid "New Mails"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New Mails Notifications"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View your private mails"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all messages seen"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Notifications.php:89
 msgid "New Events"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:90
+#: ../../Zotlabs/Widget/Notifications.php:75
 msgid "New Events Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:93
+#: ../../Zotlabs/Widget/Notifications.php:78
 msgid "View events"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Zotlabs/Widget/Notifications.php:81
 msgid "Mark all events seen"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:105
+#: ../../Zotlabs/Widget/Notifications.php:90
 msgid "New Connections Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Zotlabs/Widget/Notifications.php:93
 msgid "View all connections"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:116
+#: ../../Zotlabs/Widget/Notifications.php:101
 msgid "New Files"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:117
+#: ../../Zotlabs/Widget/Notifications.php:102
 msgid "New Files Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:124
-#: ../../Zotlabs/Widget/Notifications.php:125
+#: ../../Zotlabs/Widget/Notifications.php:109
+#: ../../Zotlabs/Widget/Notifications.php:110
 msgid "Notices"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:128
+#: ../../Zotlabs/Widget/Notifications.php:113
 msgid "View all notices"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Zotlabs/Widget/Notifications.php:116
 msgid "Mark all notices seen"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:152
+#: ../../Zotlabs/Widget/Notifications.php:137
 msgid "New Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:153
+#: ../../Zotlabs/Widget/Notifications.php:138
 msgid "New Registrations Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:163
+#: ../../Zotlabs/Widget/Notifications.php:148
 msgid "Public Stream Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:166
+#: ../../Zotlabs/Widget/Notifications.php:151
 msgid "View the public stream"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notifications.php:181
+#: ../../Zotlabs/Widget/Notifications.php:166
 msgid "Sorry, you have got no notifications at the moment"
 msgstr ""
 
@@ -10299,23 +10102,23 @@ msgstr ""
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:15
 msgid "Received Messages"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:21
+#: ../../Zotlabs/Widget/Conversations.php:19
 msgid "Sent Messages"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:25
+#: ../../Zotlabs/Widget/Conversations.php:23
 msgid "Conversations"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:37
+#: ../../Zotlabs/Widget/Conversations.php:33
 msgid "No messages."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:57
+#: ../../Zotlabs/Widget/Conversations.php:53
 msgid "Delete conversation"
 msgstr ""
 
@@ -10497,394 +10300,403 @@ msgstr ""
 msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1108
 msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1260
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1260
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1269
+#: ../../include/conversation.php:1264
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1271
+#: ../../include/conversation.php:1266
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1277
+#: ../../include/conversation.php:1272
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1280
+#: ../../include/conversation.php:1275
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1276
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1276
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1332
+#: ../../include/conversation.php:1327
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:82
 msgid "Set your location"
 msgstr ""
 
-#: ../../include/conversation.php:1333
+#: ../../include/conversation.php:1328
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:83
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/conversation.php:1349
+#: ../../include/conversation.php:1344
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:99
 msgid "Embed (existing) photo from your photo albums"
 msgstr ""
 
-#: ../../include/conversation.php:1383
+#: ../../include/conversation.php:1378
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:135
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1384
+#: ../../include/conversation.php:1379
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:136
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1389
+#: ../../include/conversation.php:1384
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:141
 msgid "Choose a different album..."
 msgstr ""
 
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1388
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:145
 msgid "Comments enabled"
 msgstr ""
 
-#: ../../include/conversation.php:1394
+#: ../../include/conversation.php:1389
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:146
 msgid "Comments disabled"
 msgstr ""
 
-#: ../../include/conversation.php:1446
+#: ../../include/conversation.php:1441
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:195
 msgid "Page link name"
 msgstr ""
 
-#: ../../include/conversation.php:1449
+#: ../../include/conversation.php:1444
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:198
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1463
+#: ../../include/conversation.php:1458
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:212
 msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1459
 msgid "Toggle poll"
 msgstr ""
 
-#: ../../include/conversation.php:1465
+#: ../../include/conversation.php:1460
 msgid "Option"
 msgstr ""
 
-#: ../../include/conversation.php:1466
+#: ../../include/conversation.php:1461
 msgid "Add option"
 msgstr ""
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Minutes"
 msgstr ""
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Hours"
 msgstr ""
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1462
 msgid "Days"
 msgstr ""
 
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1463
 msgid "Allow multiple answers"
 msgstr ""
 
-#: ../../include/conversation.php:1470
+#: ../../include/conversation.php:1465
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:215
 msgid "Disable comments"
 msgstr ""
 
-#: ../../include/conversation.php:1471
+#: ../../include/conversation.php:1466
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:216
 msgid "Toggle comments"
 msgstr ""
 
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1473
 msgid "Summary (optional)"
 msgstr ""
 
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1476
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:224
 msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1477
+#: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1499
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:247
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1502
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:250
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171
 #: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:314
 msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/conversation.php:1510
+#: ../../include/conversation.php:1505
 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:253
 msgid "Set publish date"
 msgstr ""
 
-#: ../../include/conversation.php:1758
+#: ../../include/conversation.php:1750
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1761
+#: ../../include/conversation.php:1753
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1764
+#: ../../include/conversation.php:1756
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1767
+#: ../../include/conversation.php:1759
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1770
+#: ../../include/conversation.php:1762
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1773
+#: ../../include/conversation.php:1765
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/channel.php:47
+#: ../../include/channel.php:46
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/channel.php:80
+#: ../../include/channel.php:79
 msgid "Empty name"
 msgstr ""
 
-#: ../../include/channel.php:83
+#: ../../include/channel.php:82
 msgid "Name too long"
 msgstr ""
 
-#: ../../include/channel.php:200
+#: ../../include/channel.php:199
 msgid "No account identifier"
 msgstr ""
 
-#: ../../include/channel.php:295
+#: ../../include/channel.php:290
 msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/channel.php:442
+#: ../../include/channel.php:393
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/channel.php:639 ../../include/channel.php:728
+#: ../../include/channel.php:590 ../../include/channel.php:679
 msgid "Unable to retrieve modified identity"
 msgstr ""
 
-#: ../../include/channel.php:1410
-msgid "Requested channel is not available."
+#: ../../include/channel.php:1330
+msgid "Requested channel is not available"
 msgstr ""
 
-#: ../../include/channel.php:1567
+#: ../../include/channel.php:1487
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/channel.php:1570 ../../include/nav.php:120
+#: ../../include/channel.php:1490 ../../include/nav.php:120
 #: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/channel.php:1588
+#: ../../include/channel.php:1508
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/channel.php:1665 ../../include/channel.php:1793
+#: ../../include/channel.php:1585 ../../include/channel.php:1713
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/channel.php:1666 ../../include/channel.php:1837
+#: ../../include/channel.php:1586 ../../include/channel.php:1757
 msgid "Status:"
 msgstr ""
 
-#: ../../include/channel.php:1667 ../../include/channel.php:1861
+#: ../../include/channel.php:1587 ../../include/channel.php:1781
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/channel.php:1668
+#: ../../include/channel.php:1588
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/channel.php:1721
+#: ../../include/channel.php:1641
 msgid "Change your profile photo"
 msgstr ""
 
-#: ../../include/channel.php:1748 ../../include/selectors.php:60
+#: ../../include/channel.php:1668 ../../include/selectors.php:60
 #: ../../include/selectors.php:77
 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:87
 msgid "Female"
 msgstr ""
 
-#: ../../include/channel.php:1750 ../../include/selectors.php:60
+#: ../../include/channel.php:1670 ../../include/selectors.php:60
 #: ../../include/selectors.php:77
 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:85
 msgid "Male"
 msgstr ""
 
-#: ../../include/channel.php:1752
+#: ../../include/channel.php:1672
 msgid "Trans"
 msgstr ""
 
-#: ../../include/channel.php:1754 ../../include/selectors.php:60
+#: ../../include/channel.php:1674 ../../include/selectors.php:60
 msgid "Neuter"
 msgstr ""
 
-#: ../../include/channel.php:1756 ../../include/selectors.php:60
+#: ../../include/channel.php:1676 ../../include/selectors.php:60
 msgid "Non-specific"
 msgstr ""
 
-#: ../../include/channel.php:1798
+#: ../../include/channel.php:1718
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/channel.php:1822
+#: ../../include/channel.php:1742
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/channel.php:1823
+#: ../../include/channel.php:1743
 msgid "j F"
 msgstr ""
 
-#: ../../include/channel.php:1830
+#: ../../include/channel.php:1750
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/channel.php:1843
+#: ../../include/channel.php:1763
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/channel.php:1855
+#: ../../include/channel.php:1775
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/channel.php:1859
+#: ../../include/channel.php:1779
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/channel.php:1865
+#: ../../include/channel.php:1785
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/channel.php:1867
+#: ../../include/channel.php:1787
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/channel.php:1871
+#: ../../include/channel.php:1791
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/channel.php:1873
+#: ../../include/channel.php:1793
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/channel.php:1875
+#: ../../include/channel.php:1795
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/channel.php:1877
+#: ../../include/channel.php:1797
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/channel.php:1879
+#: ../../include/channel.php:1799
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/channel.php:1881
+#: ../../include/channel.php:1801
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/channel.php:1883
+#: ../../include/channel.php:1803
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/channel.php:1885
+#: ../../include/channel.php:1805
 msgid "Television:"
 msgstr ""
 
-#: ../../include/channel.php:1887
+#: ../../include/channel.php:1807
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/channel.php:1889
+#: ../../include/channel.php:1809
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/channel.php:1891
+#: ../../include/channel.php:1811
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/channel.php:1893
+#: ../../include/channel.php:1813
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/channel.php:1916
+#: ../../include/channel.php:1836
 msgid "Like this thing"
 msgstr ""
 
+#: ../../include/channel.php:1837
+msgid "Export"
+msgstr ""
+
 #: ../../include/features.php:86
 msgid "Start calendar week on Monday"
 msgstr ""
@@ -11417,169 +11229,157 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1556
+#: ../../include/text.php:1538
 msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/text.php:1558 ../../include/feedutils.php:872
+#: ../../include/text.php:1540 ../../include/feedutils.php:874
 msgid "unknown"
 msgstr ""
 
-#: ../../include/text.php:1599
+#: ../../include/text.php:1581
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1676
+#: ../../include/text.php:1658
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1845 ../../include/message.php:13
+#: ../../include/text.php:1827
 msgid "Download binary/encrypted content"
 msgstr ""
 
-#: ../../include/text.php:1916
+#: ../../include/text.php:1898
 msgid "Poll has ended."
 msgstr ""
 
-#: ../../include/text.php:1919
+#: ../../include/text.php:1901
 #, php-format
 msgid "Poll ends: %s"
 msgstr ""
 
-#: ../../include/text.php:2098 ../../include/language.php:428
+#: ../../include/text.php:2058
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:2080 ../../include/language.php:428
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2088
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2088
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:2117
+#: ../../include/text.php:2099
 msgid "HTML"
 msgstr ""
 
-#: ../../include/text.php:2120
+#: ../../include/text.php:2102
 msgid "Comanche Layout"
 msgstr ""
 
-#: ../../include/text.php:2125
+#: ../../include/text.php:2107
 msgid "PHP"
 msgstr ""
 
-#: ../../include/text.php:2134
+#: ../../include/text.php:2116
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:2267
+#: ../../include/text.php:2249
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2270
+#: ../../include/text.php:2252
 msgid "poll"
 msgstr ""
 
-#: ../../include/text.php:2383
+#: ../../include/text.php:2365
 msgid "a-z, 0-9, -, and _ only"
 msgstr ""
 
-#: ../../include/text.php:2709
+#: ../../include/text.php:2670
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2715
+#: ../../include/text.php:2676
 msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:2727
+#: ../../include/text.php:2688
 msgid "Import"
 msgstr ""
 
-#: ../../include/text.php:2728
+#: ../../include/text.php:2689
 msgid "Import website..."
 msgstr ""
 
-#: ../../include/text.php:2729
+#: ../../include/text.php:2690
 msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/text.php:2730
+#: ../../include/text.php:2691
 msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/text.php:2731
+#: ../../include/text.php:2692
 msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/text.php:2732
+#: ../../include/text.php:2693
 msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/text.php:2733
+#: ../../include/text.php:2694
 msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/text.php:2734
+#: ../../include/text.php:2695
 msgid "Select folder"
 msgstr ""
 
-#: ../../include/text.php:2735
+#: ../../include/text.php:2696
 msgid "Export website..."
 msgstr ""
 
-#: ../../include/text.php:2736
+#: ../../include/text.php:2697
 msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/text.php:2737
+#: ../../include/text.php:2698
 msgid "website.zip"
 msgstr ""
 
-#: ../../include/text.php:2738
+#: ../../include/text.php:2699
 msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/text.php:2739
+#: ../../include/text.php:2700
 msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/text.php:2740
+#: ../../include/text.php:2701
 msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/text.php:2741
+#: ../../include/text.php:2702
 msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/text.php:2742
+#: ../../include/text.php:2703
 msgid "Specify folder"
 msgstr ""
 
-#: ../../include/message.php:41
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:80
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:85
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:214
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/markdown.php:202 ../../include/bbcode.php:559
+#: ../../include/markdown.php:203 ../../include/bbcode.php:559
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/markdown.php:255 ../../include/bbcode.php:644
+#: ../../include/markdown.php:256 ../../include/bbcode.php:644
 msgid "spoiler"
 msgstr ""
 
@@ -11692,7 +11492,7 @@ msgid "Account/Channel Settings"
 msgstr ""
 
 #: ../../include/nav.php:112 ../../include/nav.php:142
-#: ../../include/nav.php:163 ../../boot.php:1715
+#: ../../include/nav.php:163 ../../boot.php:1719
 msgid "Logout"
 msgstr ""
 
@@ -12429,43 +12229,43 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/network.php:1762 ../../include/network.php:1763
+#: ../../include/network.php:1737 ../../include/network.php:1738
 msgid "Friendica"
 msgstr ""
 
-#: ../../include/network.php:1764
+#: ../../include/network.php:1739
 msgid "OStatus"
 msgstr ""
 
-#: ../../include/network.php:1765
+#: ../../include/network.php:1740
 msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/network.php:1766
+#: ../../include/network.php:1741
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/network.php:1769
+#: ../../include/network.php:1744
 msgid "Diaspora"
 msgstr ""
 
-#: ../../include/network.php:1770
+#: ../../include/network.php:1745
 msgid "Facebook"
 msgstr ""
 
-#: ../../include/network.php:1771
+#: ../../include/network.php:1746
 msgid "Zot"
 msgstr ""
 
-#: ../../include/network.php:1772
+#: ../../include/network.php:1747
 msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/network.php:1773
+#: ../../include/network.php:1748
 msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/network.php:1774
+#: ../../include/network.php:1749
 msgid "MySpace"
 msgstr ""
 
@@ -12559,11 +12359,11 @@ msgstr ""
 msgid "please come back"
 msgstr ""
 
-#: ../../include/help.php:80
+#: ../../include/help.php:81
 msgid "Help:"
 msgstr ""
 
-#: ../../include/help.php:129
+#: ../../include/help.php:130
 msgid "Not Found"
 msgstr ""
 
@@ -12753,7 +12553,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:238 ../../boot.php:2730
+#: ../../include/datetime.php:238 ../../boot.php:2734
 msgid "never"
 msgstr ""
 
@@ -12826,95 +12626,75 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/items.php:1038 ../../include/items.php:1098
+#: ../../include/items.php:979 ../../include/items.php:1039
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:1302
+#: ../../include/items.php:1243
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:1304
+#: ../../include/items.php:1245
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:1306
+#: ../../include/items.php:1247
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:1308
+#: ../../include/items.php:1249
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:1310
+#: ../../include/items.php:1251
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:1312
+#: ../../include/items.php:1253
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:1314
+#: ../../include/items.php:1255
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:1316
+#: ../../include/items.php:1257
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4601
+#: ../../include/items.php:4257
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:4608
+#: ../../include/items.php:4264
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:4620
+#: ../../include/items.php:4276
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:4973
+#: ../../include/items.php:4629
 msgid "profile photo"
 msgstr ""
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 #, php-format
 msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 msgctxt "edit_activity"
 msgid "Post"
 msgstr ""
 
-#: ../../include/items.php:5165
+#: ../../include/items.php:4821
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""
 
-#: ../../include/follow.php:86
-msgid "Response from remote channel was incomplete."
-msgstr ""
-
-#: ../../include/follow.php:98
-msgid "Premium channel - please visit:"
-msgstr ""
-
-#: ../../include/follow.php:112
-msgid "Channel was deleted and no longer exists."
-msgstr ""
-
-#: ../../include/zot.php:778
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:4378
-msgid "invalid target signature"
-msgstr ""
-
 #: ../../include/bbcode.php:233 ../../include/bbcode.php:928
 #: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533
 msgid "Image/photo"
@@ -13305,7 +13085,7 @@ msgid "Errors encountered deleting database table "
 msgstr ""
 
 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:95
-#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:503
+#: ../../extend/addon/hubzilla-addons/twitter/twitter.php:496
 msgid "Submit Settings"
 msgstr ""
 
@@ -13494,6 +13274,7 @@ msgstr ""
 
 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75
 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:54
+#: ../../boot.php:1714
 msgid "Nickname"
 msgstr ""
 
@@ -13597,11 +13378,11 @@ msgstr ""
 msgid "Your $Productname test account is about to expire."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:70
+#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:101
 msgid "An account has been created for you."
 msgstr ""
 
-#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:77
+#: ../../extend/addon/hubzilla-addons/ldapauth/ldapauth.php:108
 msgid "Authentication successful but rejected: account creation is disabled."
 msgstr ""
 
@@ -13968,6 +13749,12 @@ msgstr ""
 msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:76
+#: ../../extend/addon/hubzilla-addons/openid/Mod_Openid.php:178
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr ""
+
 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:81
 msgid "Hubzilla File Storage Import"
 msgstr ""
@@ -14258,6 +14045,10 @@ msgstr ""
 msgid "This channel"
 msgstr ""
 
+#: ../../extend/addon/hubzilla-addons/workflow/workflow.php:327
+msgid "Create New Workflow Item"
+msgstr ""
+
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:541
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1437
 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1456
@@ -16076,40 +15867,40 @@ msgstr ""
 msgid "Show advanced settings"
 msgstr ""
 
-#: ../../boot.php:1695
+#: ../../boot.php:1696
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1719
-msgid "Login/Email"
+#: ../../boot.php:1714
+msgid "Email or nickname"
 msgstr ""
 
-#: ../../boot.php:1720
+#: ../../boot.php:1724
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1721
+#: ../../boot.php:1725
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1724
+#: ../../boot.php:1728
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2603
+#: ../../boot.php:2607
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2608
+#: ../../boot.php:2612
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2724
+#: ../../boot.php:2728
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2729
+#: ../../boot.php:2733
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
diff --git a/view/pl/hstrings.php b/view/pl/hstrings.php
index acb2fca18..8fd352e3f 100644
--- a/view/pl/hstrings.php
+++ b/view/pl/hstrings.php
@@ -19,7 +19,7 @@ App::$strings["Can write to my wiki pages"] = "Może pisać na moich stronach wi
 App::$strings["Can post on my channel (wall) page"] = "Może publikować na stronie mojego kanału (ścianie)";
 App::$strings["Can comment on or like my posts"] = "Może komentować lub oceniać moje wpisy";
 App::$strings["Can send me private mail messages"] = "Może wysyłać mi prywatne wiadomości e-mail";
-App::$strings["Can like/dislike profiles and profile things"] = "Może lubić/nie lubić profile i rzeczy w profilach";
+App::$strings["Can like/dislike profiles and profile things"] = "Może pochwalać/ganić profile i rzeczy w profilach";
 App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Może przekazywać informacje do wszystkich moich połączeń kanałowych za pośrednictwem !wzmianki w wpisach";
 App::$strings["Can chat with me"] = "Może ze mną rozmawiać";
 App::$strings["Can source my public posts in derived channels"] = "Może pozyskiwać moje publiczne wpisy w kanałach pochodnych";
@@ -150,46 +150,14 @@ App::$strings["Please login to continue."] = "Proszę się zalogować, aby konty
 App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Czy chcesz zezwolić tej aplikacji na dostęp do Twoich wpisów i kontaktów albo tworzenie dla Ciebie nowych wpisów ?";
 App::$strings["Yes"] = "Tak";
 App::$strings["No"] = "Nie";
-App::$strings["This site is not a directory server"] = "Ta witryna nie jest serwerem katalogów";
+App::$strings["This site is not a directory server"] = "Ten portal nie jest serwerem katalogów";
 App::$strings["This directory server requires an access token"] = "Ten serwer katalogowy wymaga tokenu dostępu";
 App::$strings["Enter a folder name"] = "Wprowadź nazwę folderu";
 App::$strings["or select an existing folder (doubleclick)"] = "lub wybierz istniejÄ…cy folder (kliknij dwukrotnie)";
 App::$strings["Save"] = "Zapisz";
 App::$strings["Save to Folder"] = "Zapisz do folderu";
-App::$strings["Event can not end before it has started."] = "Wydarzenie nie może zakończyć się przed rozpoczęciem.";
-App::$strings["Unable to generate preview."] = "Nie można wygenerować podglądu.";
-App::$strings["Event title and start time are required."] = "Wymaga się wprowadzenia tytułu wydarzenia i godziny rozpoczęcia.";
-App::$strings["Event not found."] = "Nie znaleziono wydarzenia.";
-App::$strings["event"] = "wydarzenie";
-App::$strings["Edit event title"] = "Edytuj tytuł wydarzenia";
-App::$strings["Required"] = "Wymagane";
-App::$strings["Categories (comma-separated list)"] = "Kategorie (lista rozdzielana przecinkami)";
-App::$strings["Edit Category"] = "Edytuj kategoriÄ™";
-App::$strings["Category"] = "Kategoria";
-App::$strings["Edit start date and time"] = "Edytuj datę i godzinę rozpoczęcia";
-App::$strings["Finish date and time are not known or not relevant"] = "Data i godzina zakończenia nie są znane lub nie mają znaczenia";
-App::$strings["Edit finish date and time"] = "Edytuj datę i godzinę zakończenia";
-App::$strings["Finish date and time"] = "Data i godzina zakończenia";
-App::$strings["Adjust for viewer timezone"] = "Dostosuj do strefy czasowej widza";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Ważne dla wydarzeń, które mają miejsce w określonym miejscu. Niepraktyczne na globalne święta.";
-App::$strings["Edit Description"] = "Edytuj opis";
-App::$strings["Edit Location"] = "Edytuj lokalizacjÄ™";
-App::$strings["Preview"] = "PodglÄ…d";
-App::$strings["Permission settings"] = "Ustawienia dostępu";
-App::$strings["Advanced Options"] = "Zaawansowane opcje";
-App::$strings["l, F j"] = "l, F j";
-App::$strings["Edit event"] = "Edytuj wydarzenie";
-App::$strings["Delete event"] = "Usuń wydarzenie";
-App::$strings["Link to Source"] = "Link do źródła";
-App::$strings["calendar"] = "kalendarz";
-App::$strings["Edit Event"] = "Edytuj wydarzenie";
-App::$strings["Create Event"] = "Utwórz wydarzenie";
-App::$strings["Export"] = "Eksportuj";
-App::$strings["View"] = "Widok";
-App::$strings["Event removed"] = "Wydarzenie usunięte";
-App::$strings["Failed to remove event"] = "Nie udało się usunąć wydarzenia";
 App::$strings["Documentation Search"] = "Przeszukaj dokumentacjÄ™";
-App::$strings["About"] = "O platformie Hubzilla";
+App::$strings["About"] = "O platformie";
 App::$strings["Members"] = "Dla członków";
 App::$strings["Administrators"] = "Dla administratorów";
 App::$strings["Developers"] = "Dla deweloperów";
@@ -202,7 +170,7 @@ App::$strings["Bookmark links from posts and manage them"] = "Dodaj do zakładek
 App::$strings["My Bookmarks"] = "Moje zakładki";
 App::$strings["My Connections Bookmarks"] = "Moje zakładki połączeń";
 App::$strings["Requested profile is not available."] = "Żądany profil nie jest dostępny.";
-App::$strings["Webpages App"] = "Aplikacja Witryny Internetowe";
+App::$strings["Webpages App"] = "Aplikacja Strony internetowe";
 App::$strings["Provide managed web pages on your channel"] = "Udostępnij zarządzane strony internetowe na swoim kanale";
 App::$strings["Import Webpage Elements"] = "Importuj elementy strony internetowej";
 App::$strings["Import selected"] = "Importuj wybrane";
@@ -211,6 +179,8 @@ App::$strings["Export selected"] = "Eksportuj wybrane";
 App::$strings["Webpages"] = "Strony internetowe";
 App::$strings["Edit"] = "Edytuj";
 App::$strings["Share"] = "Udostępnij";
+App::$strings["View"] = "Widok";
+App::$strings["Preview"] = "PodglÄ…d";
 App::$strings["Actions"] = "Akcje";
 App::$strings["Page Link"] = "Link do strony";
 App::$strings["Page Title"] = "Tytuł strony";
@@ -230,8 +200,8 @@ App::$strings["Profile unavailable to export."] = "Profil niedostępny do wyeksp
 App::$strings["Profile Name is required."] = "Wymaga siÄ™ podania nazwy profilu.";
 App::$strings["Marital Status"] = "Stan cywilny";
 App::$strings["Romantic Partner"] = "Partner romantyczny";
-App::$strings["Likes"] = "Oceny pozytywne";
-App::$strings["Dislikes"] = "Oceny negatywne";
+App::$strings["Likes"] = "Pochwały";
+App::$strings["Dislikes"] = "Zganienia";
 App::$strings["Work/Employment"] = "Praca/Zatrudnienie";
 App::$strings["Religion"] = "Religia";
 App::$strings["Political Views"] = "PoglÄ…dy polityczny";
@@ -260,6 +230,7 @@ App::$strings["Your gender"] = "Twoja płeć";
 App::$strings["Marital status"] = "Stan cywilny";
 App::$strings["Sexual preference"] = "Preferencje seksualne";
 App::$strings["Profile name"] = "Nazwa profilu";
+App::$strings["Required"] = "Wymagane";
 App::$strings["This is your default profile."] = "To jest Twój profil domyślny.";
 App::$strings["Your full name"] = "Twoje imię i nazwisko albo pełna nazwa";
 App::$strings["Short title/description"] = "Krótki tytuł/opis";
@@ -312,7 +283,7 @@ App::$strings["Move this channel (disable all previous locations)"] = "PrzenieÅ›
 App::$strings["Use this channel nickname instead of the one provided"] = "Użyj tego pseudonimu kanału zamiast podanego";
 App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Pozostaw puste, aby zachować istniejący pseudonim kanału. Otrzymasz losowo podobny pseudonim, jeśli któryś z nich jest już przydzielony na tym portalu.";
 App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Ten proces może zająć kilka minut. Prześlij formularz tylko raz i pozostaw tę stronę otwartą do zakończenia procedury.";
-App::$strings["Like/Dislike"] = "Oceń pozytywnie/negatywnie";
+App::$strings["Like/Dislike"] = "Pochwal/Zgań";
 App::$strings["This action is restricted to members."] = "Ta akcja jest ograniczona do członków.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Aby kontynuować, <a href=\"rmagic\">zaloguj się za pomocą ID \$Projectname</a> lub <a href=\"register\">zarejestruj się jako nowy członek \$Projectname</a>.";
 App::$strings["Invalid request."] = "Nieprawidłowe żądanie.";
@@ -322,8 +293,9 @@ App::$strings["Channel unavailable."] = "Kanał niedostępny.";
 App::$strings["Previous action reversed."] = "Poprzednia czynność została cofnięta.";
 App::$strings["photo"] = "zdjecie";
 App::$strings["status"] = "stan";
-App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s ocenił pozytywnie %3\$s %2\$s";
-App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s ocenił negatywnie %3\$s  %2\$s";
+App::$strings["event"] = "wydarzenie";
+App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s pochwalił %3\$s %2\$s";
+App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s zganił %3\$s  %2\$s";
 App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s zgadza siÄ™ z %3\$s dla %2\$s";
 App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s nie zgadza siÄ™ z %3\$s dla %2\$s";
 App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s wstrzymuje siÄ™ od decyzji w sprawie %3\$s dla %2\$s";
@@ -367,7 +339,7 @@ App::$strings["Privacy group not found."] = "Nie znaleziono grupy prywatności."
 App::$strings["Privacy group updated."] = "Grupa prywatności została zaktualizowana.";
 App::$strings["Privacy Groups App"] = "Aplikacja Grupy Prywatności";
 App::$strings["Management of privacy groups"] = "Zarządzanie grupami prywatności";
-App::$strings["Privacy Groups"] = "Grupy Prywatności";
+App::$strings["Privacy Groups"] = "Grupy prywatności";
 App::$strings["Add Group"] = "Dodaj grupÄ™";
 App::$strings["Privacy group name"] = "Nazwa grupy prywatności";
 App::$strings["Members are visible to other channels"] = "Członkowie są widoczni dla innych kanałów";
@@ -414,13 +386,13 @@ App::$strings["Add application"] = "Dodaj aplikacjÄ™";
 App::$strings["Name of application"] = "Nazwa aplikacji";
 App::$strings["Consumer Key"] = "Klucz konsumenta";
 App::$strings["Automatically generated - change if desired. Max length 20"] = "Wygenerowane automatycznie - w razie potrzeby zmień. Maksymalna długość 20";
-App::$strings["Consumer Secret"] = "Hasło konsumenta";
+App::$strings["Consumer Secret"] = "Sekret konsumenta";
 App::$strings["Redirect"] = "Przekierowanie";
 App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "Identyfikator URI przekierowania - pozostaw puste, chyba że aplikacja tego wymaga";
 App::$strings["Icon url"] = "URL ikony";
 App::$strings["Optional"] = "Opcjonalne";
 App::$strings["Application not found."] = "Aplikacji nie znaleziono.";
-App::$strings["Connected OAuth Apps"] = "Połączone aplikacje OAuth";
+App::$strings["Connected OAuth Apps"] = "Podłączone aplikacje OAuth";
 App::$strings["Client key starts with"] = "Klucz klienta zaczyna siÄ™ od";
 App::$strings["No name"] = "Brak nazwy";
 App::$strings["Remove authorization"] = "Usuń autoryzację";
@@ -507,12 +479,12 @@ App::$strings["Name and Secret are required"] = "Wymagane jest ustawienie imieni
 App::$strings["OAuth2 Apps Manager App"] = "Aplikacja Menadżer Aplikacji OAuth2";
 App::$strings["OAuth2 authenticatication tokens for mobile and remote apps"] = "Tokeny uwierzytelniajÄ…ce OAuth2 dla aplikacji mobilnych i zdalnych";
 App::$strings["Add OAuth2 application"] = "Dodaj aplikacjÄ™ OAuth2";
-App::$strings["Grant Types"] = "Rodzaje dofinansowań";
-App::$strings["leave blank unless your application sepcifically requires this"] = "pozostaw puste, chyba że Twoja aplikacja wyraźnie tego wymaga";
+App::$strings["Grant Types"] = "Rodzaje zezwoleń";
+App::$strings["leave blank unless your application sepcifically requires this"] = "pozostaw puste, chyba że Twoja aplikacja jawnie tego wymaga";
 App::$strings["Authorization scope"] = "Zakres uprawnień";
 App::$strings["OAuth2 Application not found."] = "Nie znaleziono aplikacji OAuth2.";
 App::$strings["leave blank unless your application specifically requires this"] = "pozostaw puste, chyba że Twoja aplikacja wyraźnie tego wymaga";
-App::$strings["Connected OAuth2 Apps"] = "Aplikacje połączeń OAuth2";
+App::$strings["Connected OAuth2 Apps"] = "Podłączone aplikacje OAuth2";
 App::$strings["Profile Unavailable."] = "Profil niedostępny.";
 App::$strings["Wiki App"] = "Aplikacja Wiki";
 App::$strings["Provide a wiki for your channel"] = "Udostępnij wiki dla swojego kanału";
@@ -526,7 +498,7 @@ App::$strings["Wiki name"] = "Nazwa wiki";
 App::$strings["Content type"] = "Rodzaj treści";
 App::$strings["Markdown"] = "Markdown";
 App::$strings["BBcode"] = "BBcode";
-App::$strings["Text"] = "Text";
+App::$strings["Text"] = "Tekst";
 App::$strings["Type"] = "Rodzaj";
 App::$strings["Any&nbsp;type"] = "Dowolny&nbsp;rodzaj";
 App::$strings["Lock content type"] = "Zablokuj rodzaj treści";
@@ -726,7 +698,6 @@ App::$strings["Current Channel"] = "Bieżący kanał";
 App::$strings["Switch to one of your channels by selecting it."] = "Przełącz się na jeden ze swoich kanałów, wybierając go.";
 App::$strings["Default Channel"] = "Domyślny kanał";
 App::$strings["Make Default"] = "Ustaw jako domyślny";
-App::$strings["%d new messages"] = "%d nowych wiadomości";
 App::$strings["%d new introductions"] = "%d nowych wprowadzeń";
 App::$strings["Delegated Channel"] = "Deleguj kanał";
 App::$strings["Connection added."] = "Dodano połączenie.";
@@ -738,10 +709,6 @@ App::$strings["Your comment is awaiting approval."] = "Twój komentarz oczekuje
 App::$strings["Unable to obtain post information from database."] = "Nie można uzyskać z bazy danych informacji o tym wpisie.";
 App::$strings["You have reached your limit of %1$.0f top level posts."] = "Osiągnięty został limit %1$.0f wpisów najwyższego poziomu.";
 App::$strings["You have reached your limit of %1$.0f webpages."] = "Osiągnięty został limit %1$.0f stron internetowych.";
-App::$strings["Website:"] = "Portal internetowy:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanał zdalny [% s] (jeszcze nieznany w tym portalu)";
-App::$strings["Rating (this information is public)"] = "Ocena (ta informacja jest publiczna)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Ewentualnie wyjaśnij swoją ocenę (ta informacja jest publiczna)";
 App::$strings["Invalid item."] = "Nieprawidłowy element.";
 App::$strings["Page not found."] = "Nie znaleziono strony.";
 App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
@@ -790,7 +757,7 @@ App::$strings["Channel Export App"] = "Aplikacja Eksport Kanału";
 App::$strings["Export your channel"] = "Wyeksportuj swój kanał";
 App::$strings["Export Channel"] = "Eksport Kanału";
 App::$strings["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."] = "Wyeksportuj do pliku podstawowe informacje o kanale. Działa to jako kopia zapasowa połączeń, uprawnień, profilu i podstawowych danych, których można użyć do zaimportowania danych do nowego portalu, ale nie zawiera treści.";
-App::$strings["Export Content"] = "Eksport Treści";
+App::$strings["Export Content"] = "Eksport treści";
 App::$strings["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."] = "Wyeksportuj informacje o kanale i najnowsze treści do kopii zapasowej JSON, którą można przywrócić lub zaimportować do innego portalu. Tworzy to kopie zapasowe wszystkich połączeń, uprawnień, danych profilu i wpisów z kilku miesięcy. Ten plik może być BARDZO duży. Prosimy o cierpliwość - rozpoczęcie pobierania może zająć kilka minut.";
 App::$strings["Export your posts from a given year."] = "Eksportuj swoje wpisy z danego roku.";
 App::$strings["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."] = "Można także wyeksportować swoje wpisy i rozmowy z określonego roku lub miesiąca. Dostosuj datę na pasku adresu przeglądarki, aby wybrać inne daty. Jeśli eksport się nie powiedzie (prawdopodobnie z powodu wyczerpania pamięci w serwera portalu), spróbuj ponownie, wybierając bardziej ograniczony zakres dat.";
@@ -815,13 +782,6 @@ App::$strings["Email Address"] = "Adres e-mail";
 App::$strings["Poll not found."] = "Nie znaleziono ankiety.";
 App::$strings["Invalid response."] = "Nieprawidłowa odpowiedź.";
 App::$strings["Response submitted. Updates may not appear instantly."] = "Odpowiedź przesłana. Aktualizacje mogą nie pojawiać się natychmiast.";
-App::$strings["sent you a private message"] = "wysłał Ci prywatną wiadomość";
-App::$strings["added your channel"] = "dodał Twój kanał";
-App::$strings["requires approval"] = "wymaga zatwierdzenia";
-App::$strings["g A l F d"] = "g A l F d";
-App::$strings["[today]"] = "[dzisiaj]";
-App::$strings["posted an event"] = "opublikował wydarzenie";
-App::$strings["shared a file with you"] = "udostępnił Ci plik";
 App::$strings["You must enable javascript for your browser to be able to view this content."] = "Aby przeglądać te treści, musisz włączyć obsługę JavaScript w swojej przeglądarce.";
 App::$strings["Article"] = "Artykuł";
 App::$strings["Item has been removed."] = "Element został usunięty.";
@@ -870,18 +830,18 @@ App::$strings["Edit photo"] = "Edytuj zdjęcie";
 App::$strings["Rotate CW (right)"] = "Obróć w prawo";
 App::$strings["Rotate CCW (left)"] = "Obróć w lewo";
 App::$strings["Move photo to album"] = "Przenieś zdjęcie do albumu";
-App::$strings["Enter a new album name"] = "Wpisz nowÄ… nazwÄ™ albumu";
+App::$strings["Enter a new album name"] = "Wprowadź nową nazwę albumu";
 App::$strings["or select an existing one (doubleclick)"] = "lub wybierz istniejący (podwójne kliknięcie)";
 App::$strings["Add a Tag"] = "Dodaj tag";
 App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Przykład: @bob, @Barbara_Jensen, @jim@example.com";
 App::$strings["Flag as adult in album view"] = "Oznacz jako \"dla dorosłych\" w widoku albumu";
-App::$strings["I like this (toggle)"] = "Podoba mis sie to (przełącz)";
-App::$strings["I don't like this (toggle)"] = "Nie podoba mi się to (przełącz)";
+App::$strings["I like this (toggle)"] = "Pochwalam to (przełącz)";
+App::$strings["I don't like this (toggle)"] = "Nie pochwalam tego (przełącz)";
 App::$strings["Please wait"] = "Proszę czekać";
 App::$strings["This is you"] = "To jesteÅ› ty";
 App::$strings["Comment"] = "Komentarz";
-App::$strings["__ctx:title__ Likes"] = "Ocen pozytywnych";
-App::$strings["__ctx:title__ Dislikes"] = "Ocen negatywnych";
+App::$strings["__ctx:title__ Likes"] = "Pochwały";
+App::$strings["__ctx:title__ Dislikes"] = "Zganienia";
 App::$strings["__ctx:title__ Agree"] = "Zgoda";
 App::$strings["__ctx:title__ Disagree"] = "Sprzeciw";
 App::$strings["__ctx:title__ Abstain"] = "WstrzymujÄ™ siÄ™";
@@ -890,20 +850,20 @@ App::$strings["__ctx:title__ Not attending"] = "Nie uczestniczÄ™";
 App::$strings["__ctx:title__ Might attend"] = "Mogę uczestniczyć";
 App::$strings["View all"] = "Pokaż wszystkie";
 App::$strings["__ctx:noun__ Like"] = array(
-	0 => "Ocena pozytywna",
-	1 => "Oceny pozytywne",
-	2 => "Oce pozytywanych",
+	0 => "Pochwała",
+	1 => "Pochwały",
+	2 => "Pochwał",
 );
 App::$strings["__ctx:noun__ Dislike"] = array(
-	0 => "Ocena negartwna",
-	1 => "Oceny negatywne",
-	2 => "Ocen negatywnych",
+	0 => "Zganienie",
+	1 => "Zganienia",
+	2 => "Zganień",
 );
 App::$strings["Photo Tools"] = "Narzędzia fotograficzne";
 App::$strings["In This Photo:"] = "Na tym zdjęciu:";
 App::$strings["Map"] = "Mapa";
-App::$strings["__ctx:noun__ Likes"] = "Oceny pozytywne";
-App::$strings["__ctx:noun__ Dislikes"] = "Oceny negatywne";
+App::$strings["__ctx:noun__ Likes"] = "Pochwały";
+App::$strings["__ctx:noun__ Dislikes"] = "Zganienia";
 App::$strings["Close"] = "Zamknij";
 App::$strings["Recent Photos"] = "Najnowsze zdjęcia";
 App::$strings["Posts and comments"] = "Wpisy i komentarze";
@@ -969,9 +929,9 @@ App::$strings["Item is not editable"] = "Elementu nie można edytować";
 App::$strings["Tag removed"] = "Tag został usunięty";
 App::$strings["Remove Item Tag"] = "Usuń znacznik elementu";
 App::$strings["Select a tag to remove: "] = "Wybierz znacznik do usunięcia: ";
-App::$strings["Affinity Tool settings updated."] = "Zaktualizowano ustawienia narzędzia koligacji.";
-App::$strings["This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream."] = "Ta aplikacja przedstawia suwak w edytorze połączeń, a także na stronie internetowej. Suwak przedstawia stopień przyjaźni (koligacji) z każdym połączeniem. Umożliwia powiększanie i pomniejszanie oraz wyświetlanie rozmów tylko od najbliższych znajomych lub wszystkich w strumieniu.";
-App::$strings["Affinity Tool App"] = "Aplikacja Narzędzie koligacji";
+App::$strings["Affinity Tool settings updated."] = "Zaktualizowano ustawienia narzędzia więzi.";
+App::$strings["This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream."] = "Ta aplikacja przedstawia suwak w edytorze połączeń, a także na stronie internetowej. Suwak przedstawia stopień przyjaźni (więzi) z każdym połączeniem. Umożliwia powiększanie i pomniejszanie oraz wyświetlanie rozmów tylko od najbliższych znajomych lub wszystkich w strumieniu.";
+App::$strings["Affinity Tool App"] = "Aplikacja Narzędzie więzi";
 App::$strings["The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage."] = "Poniższe liczby przedstawiają minimalne i maksymalne domyślne pozycje suwaków na stronie sieci/strumienia w procentach.";
 App::$strings["Default maximum affinity level"] = "Domyślny maksymalny poziom więzi";
 App::$strings["0-99 default 99"] = "0-99, domyślnie 99";
@@ -989,10 +949,10 @@ App::$strings["Page link"] = "Link do strony";
 App::$strings["Edit Webpage"] = "Edytuj stronÄ™ internetowÄ…";
 App::$strings["vcard"] = "vcard";
 App::$strings["Edit Article"] = "Edytuj artykuł";
-App::$strings["Authentication failed."] = "Uwierzytelnianie nie powiodło się.";
-App::$strings["Remote Authentication"] = "Zdalne uwierzytelnianie";
+App::$strings["Authentication failed."] = "Uwierzytelnienie nie powiodło się.";
+App::$strings["Remote Authentication"] = "Zdalne uwierzytelnienie";
 App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Wpisz adres swojego kanału (np. kanał@example.com)";
-App::$strings["Authenticate"] = "Uwierzytelnianie";
+App::$strings["Authenticate"] = "Uwierzytelnienie";
 App::$strings["Item not available."] = "Element nie jest dostępny.";
 App::$strings["This setting requires special processing and editing has been blocked."] = "To ustawienie wymaga specjalnego przetwarzania, a edycja została zablokowana.";
 App::$strings["Configuration Editor"] = "Edytor konfiguracji";
@@ -1039,7 +999,7 @@ App::$strings["One site per line. By default embedded content is filtered."] = "
 App::$strings["Block embedded HTML from these domains"] = "Zablokuj osadzony kod HTML z tych domen";
 App::$strings["Allow SVG thumbnails in file browser"] = "Zezwalaj na miniatury SVG w przeglądarce plików";
 App::$strings["WARNING: SVG images may contain malicious code."] = "OSTRZEŻENIE: obrazy SVG mogą zawierać złośliwy kod.";
-App::$strings["Allow embedded (inline) PDF files"] = "Zezwalaj na osadzone (w treści) pliki PDF";
+App::$strings["Allow embedded (inline) PDF files"] = "Zezwalaj na osadzone pliki PDF (w treści)";
 App::$strings["%s account blocked/unblocked"] = array(
 	0 => "%s konto jest zablokowane/odblokowane",
 	1 => "%s konta sÄ… zablokowane/odblokowane",
@@ -1177,7 +1137,7 @@ App::$strings["unsupported"] = "nieobsługiwane";
 App::$strings["Yes - with approval"] = "Tak - za zgodÄ…";
 App::$strings["My site is not a public server"] = "Mój portal nie jest serwerem publicznym";
 App::$strings["My site has paid access only"] = "Mój portal ma tylko płatny dostęp";
-App::$strings["My site has free access only"] = "Mój porta ma tylko bezpłatny dostęp";
+App::$strings["My site has free access only"] = "Mój portal ma tylko bezpłatny dostęp";
 App::$strings["My site offers free accounts with optional paid upgrades"] = "Mój portal oferuje darmowe konta z opcjonalnymi płatnymi rozszerzeniami";
 App::$strings["Default permission role for new accounts"] = "Domyślna rola uprawnień dla nowych kont";
 App::$strings["This role will be used for the first channel created after registration."] = "Ta rola będzie używana dla pierwszego kanału utworzonego po rejestracji.";
@@ -1214,10 +1174,10 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea
 App::$strings["Minimum age"] = "Minimalny wiek";
 App::$strings["Minimum age (in years) for who may register on this site."] = "Minimalny wiek (w latach) dla osób, które mogą zarejestrować się na tym portalu.";
 App::$strings["Which best describes the types of account offered by this hub?"] = "Które z poniższych stwierdzeń najlepiej opisuje rodzaje kont oferowanych przez ten portal?";
-App::$strings["This is displayed on the public server site list."] = "Jest to wyświetlane na liście witryn publicznych serwerów.";
+App::$strings["This is displayed on the public server site list."] = "Jest to wyświetlane na liście portali publicznych serwerów.";
 App::$strings["Register text"] = "Tekst rejestracyjny";
 App::$strings["This text will be displayed prominently at the registration page"] = "Ten tekst będzie widoczny w widocznym miejscu na stronie rejestracji";
-App::$strings["Does this site allow new member registration?"] = "Czy ta witryna umożliwia rejestrację nowych członków?";
+App::$strings["Does this site allow new member registration?"] = "Czy ten portal umożliwia rejestrację nowych członków?";
 App::$strings["Configure the registration open days/hours"] = "Skonfiguruj dni i godziny otwarte rejestracji";
 App::$strings["Empty or '-:-' value will keep registration open 24/7 (default)"] = "Wartość pusta lub '-:-' sprawi, że rejestracja będzie otwarta 24 godziny na dobę i 7 dni w tygodniu (domyślne ustawienie)";
 App::$strings["Weekdays and hours must be separated by colon ':', From-To ranges with a dash `-` example: 1:800-1200"] = "Dni tygodnia i godziny należy rozdzielić dwukropkiem ':', zakresy od-do myślnikiem '-'. Przykład: 1:800-1200";
@@ -1237,13 +1197,13 @@ App::$strings["Allow invite code"] = "Zezwól na kod zaproszenia";
 App::$strings["Require email address"] = "Wymagany jest  adres e-mail";
 App::$strings["The provided email address will be verified (recommended)"] = "Podany adres e-mail zostanie zweryfikowany (zalecane)";
 App::$strings["Abandon account after x days"] = "Konto porzucone po x dniach";
-App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Nie marnuje zasobów systemowych na odpytywanie zewnętrznych witryn w poszukiwaniu porzuconych kont. Wpisz 0, aby nie mieć limitu czasu.";
+App::$strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Nie marnuje zasobów systemowych na odpytywanie zewnętrznych portali w poszukiwaniu porzuconych kont. Wpisz 0, aby nie mieć limitu czasu.";
 App::$strings["Site homepage to show visitors (default: login box)"] = "Strona główna portalu do wyświetlania odwiedzającym (domyślnie: formularz logowania)";
 App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "przykład: 'pubstream', aby pokazać strumień publiczny, 'page/sys/home', aby wyświetlić systemową stronę internetową o nazwie 'home' lub 'include: home.html', aby dołączyć plik.";
 App::$strings["Preserve site homepage URL"] = "Zachowaj adres URL strony głównej portalu";
 App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Przedstaw stronę główną portalu w ramce w oryginalnej lokalizacji zamiast przekierowywania";
 App::$strings["Allowed friend domains"] = "Dozwolone domeny znajomych";
-App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Rozdzielana przecinkami lista domen, które mogą zawierać przyjaźnie z tą witryną. Akceptowane są symbole wieloznaczne. Puste oznacza zezwolenie na dowolne domeny";
+App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Rozdzielana przecinkami lista domen, które mogą zawierać przyjaźnie z tym portalem. Akceptowane są symbole wieloznaczne. Puste oznacza zezwolenie na dowolne domeny";
 App::$strings["Force publish"] = "WymuÅ› publikacjÄ™";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Zaznacz, aby wymusić opublikowanie w katalogu wszystkich profili założonych na tym portalu.";
 App::$strings["Import Public Streams"] = "Importuj strumienie publiczne";
@@ -1329,7 +1289,7 @@ App::$strings["Suggest Channels App"] = "Aplikacja Sugerowane Kanały";
 App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Propozycje dotyczące kanałów w sieci \$Projectname, które mogą Cię zainteresować";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Brak dostępnych propozycji. Jeśli to jest nowy portal, spróbuj ponownie za 24 godziny.";
 App::$strings["Ignore/Hide"] = "Ignoruj/Ukryj";
-App::$strings["Channel Suggestions"] = "Sugerowane Kanały";
+App::$strings["Channel Suggestions"] = "Sugerowane kanały";
 App::$strings["Email Verification Required"] = "Wymagana jest weryfikacja adresu e-mail";
 App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Token weryfikacyjny został wysłany na Twój adres e-mail [% s]. Wprowadź tuta ten token, aby zakończyć etap weryfikacji konta. Poczekaj kilka minut na dostarczenie i jeśli nie widzisz wiadomości, sprawdź folder ze spamem.";
 App::$strings["Resend Email"] = "Wyślij ponownie wiadomość e-mail";
@@ -1337,12 +1297,12 @@ App::$strings["Validation token"] = "Token walidacyjny";
 App::$strings["Notes App"] = "Aplikacja Notatki";
 App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Prosta aplikacja do notatek z widżetem (uwaga: notatki nie są szyfrowane)";
 App::$strings["This channel is limited to %d tokens"] = "Ten kanał jest ograniczony do %d tokenów";
-App::$strings["Name and Password are required."] = "Wymagane są Imię i hasło.";
+App::$strings["Name and Password are required."] = "Wymagane są nazwa i hasło.";
 App::$strings["Token saved."] = "Token został zapisany.";
 App::$strings["Guest Access App"] = "Aplikacja Dostęp Gościnny";
 App::$strings["Create access tokens so that non-members can access private content"] = "Utwórz tokeny dostępu, aby osoby niebędące członkami mogły uzyskać dostęp do Twoich treści prywatnych";
 App::$strings["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."] = "Użyj tego formularza, aby utworzyć tymczasowe identyfikatory dostępu, aby udostępniać rzeczy osobom niebędącym członkami. Tożsamości te mogą być używane na listach kontroli dostępu, a odwiedzający mogą logować się przy użyciu tych poświadczeń, aby uzyskać dostęp do treści prywatnych.";
-App::$strings["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:"] = "Możesz także udostępnić znajomym i współpracownikom łącza dostępu w stylu <em>dropbox</em>, dodając hasło logowania do dowolnego adresu URL witryny, jak pokazano na ilustracji. Przykłady:";
+App::$strings["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:"] = "Możesz także udostępnić znajomym i współpracownikom łącza dostępu w stylu <em>dropbox</em>, dodając hasło logowania do dowolnego adresu URL portalu, jak pokazano na ilustracji. Przykłady:";
 App::$strings["Guest Access Tokens"] = "Token dostępu gościa";
 App::$strings["Login Name"] = "Nazwa logowania";
 App::$strings["Login Password"] = "Hasło logowania";
@@ -1363,8 +1323,8 @@ App::$strings["Could not connect to database."] = "Nie można połączyć się z
 App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Nie można połączyć się z określonym adresem URL portalu. Możliwy problem z certyfikatem SSL lub DNS.";
 App::$strings["Could not create table."] = "Nie udało się utworzyć tabeli.";
 App::$strings["Your site database has been installed."] = "Baza danych portalu została zainstalowana.";
-App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Może być konieczne ręczne zaimportowanie pliku „install/schema_xxx.sql� za pomocą klienta bazy danych.";
-App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Zobacz plik \"install/INSTALL.txt\".";
+App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Może być konieczne ręczne zaimportowanie pliku \"install/schema_xxx.sql\" za pomocą klienta bazy danych.";
+App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Proszę zobaczyć plik \"install/INSTALL.txt\".";
 App::$strings["System check"] = "Sprawdzanie systemu";
 App::$strings["Check again"] = "Sprawdź ponownie";
 App::$strings["Database connection"] = "Połączenie z bazą danych";
@@ -1380,7 +1340,7 @@ App::$strings["Database Login Password"] = "Hasło logowania do bazy danych";
 App::$strings["Database Name"] = "Nazwa bazy danych";
 App::$strings["Database Type"] = "Typ bazy danych";
 App::$strings["Site administrator email address"] = "Adres e-mail administratora portalu";
-App::$strings["Your account email address must match this in order to use the web admin panel."] = "Adres e-mail Twojego konta będzie musi być zgodny z tym adresem, aby móc korzystać z panelu administratora sieci.";
+App::$strings["Your account email address must match this in order to use the web admin panel."] = "Adres e-mail Twojego konta musi być zgodny z tym adresem, aby móc korzystać z panelu administratora sieci.";
 App::$strings["Website URL"] = "Adres URL portalu";
 App::$strings["Please use SSL (https) URL if available."] = "Użyj adresu URL z SSL (https), jeśli jest dostępny.";
 App::$strings["Please select a default timezone for your website"] = "Wybierz domyślną strefę czasową dla swojego portalu";
@@ -1391,10 +1351,10 @@ App::$strings["Could not find a command line version of PHP in the web server PA
 App::$strings["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."] = "Jeśli nie masz wersji CLI PHP zainstalowanej na serwerze, nie będzie można uruchomić odpytywania w tle przez cron.";
 App::$strings["PHP executable path"] = "Ścieżka do pliku wykonywalnego PHP";
 App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Wpisz pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole puste, aby kontynuować instalację.";
-App::$strings["Command line PHP"] = "PHP CLI";
+App::$strings["Command line PHP"] = "Wiersz poleceń PHP";
 App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "Nie można sprawdzić PHP CLI, ponieważ funkcja shell_exec() jest wyłączona. To jest wymagane.";
-App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "PHP CLI w Twoim systemie nie ma włączonego \"register_argc_argv\".";
-App::$strings["This is required for message delivery to work."] = "Jest to konieczne,, aby dostarczanie wiadomości działało.";
+App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Ta wersja PHP CLI w Twoim systemie nie ma włączonego \"register_argc_argv\".";
+App::$strings["This is required for message delivery to work."] = "Jest to konieczne, aby dostarczanie wiadomości działało.";
 App::$strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 App::$strings["This is not sufficient to upload larger images or files. You should be able to upload at least 4 MB at once."] = "To nie wystarczy, aby przesłać większe obrazy lub pliki. Powinieneś móc przesłać co najmniej 4 MB na raz.";
 App::$strings["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."] = "Twój maksymalny dopuszczalny łączny rozmiar przesyłanych plików to %s. Maksymalny rozmiar jednego pliku do przesłania to %s. Możesz przesłać jednocześnie do %d plików.";
@@ -1407,7 +1367,7 @@ App::$strings["libCurl PHP module"] = "moduł PHP libCurl";
 App::$strings["GD graphics PHP module"] = "Moduł PHP GD graphics";
 App::$strings["OpenSSL PHP module"] = "Moduł PHP OpenSSL";
 App::$strings["PDO database PHP module"] = "Moduł PHP PDO";
-App::$strings["mb_string PHP module"] = "moduł PHP mb_string PHP";
+App::$strings["mb_string PHP module"] = "moduł PHP mb_string";
 App::$strings["xml PHP module"] = "moduł PHP xml";
 App::$strings["zip PHP module"] = "moduł PHP zip";
 App::$strings["Apache mod_rewrite module"] = "Moduł Apache mod_rewrite";
@@ -1422,23 +1382,23 @@ App::$strings["Error: openssl PHP module required but not installed."] = "BÅ‚Ä…d
 App::$strings["Error: PDO database PHP module missing a driver for either mysql or pgsql."] = "BÅ‚Ä…d: w module PHP PDO brakuje sterownika dla mysql lub pgsql.";
 App::$strings["Error: PDO database PHP module required but not installed."] = "Błąd: wymagany jest moduł PHP PDO, ale nie jest zainstalowany.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Błąd: wymagany, ale niezainstalowany moduł mb_string PHP.";
-App::$strings["Error: xml PHP module required for DAV but not installed."] = "Błąd: moduł XML PHP wymagany dla DAV, ale nie jest zainstalowany.";
+App::$strings["Error: xml PHP module required for DAV but not installed."] = "Błąd: moduł xml PHP jest wymagany dla DAV, ale nie jest zainstalowany.";
 App::$strings["Error: zip PHP module required but not installed."] = "Błąd: wymagany jest moduł PHP zip, ale nie jest on zainstalowany.";
 App::$strings[".htconfig.php is writable"] = ".htconfig.php jest możliwy do zapisu";
 App::$strings["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."] = "Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \".htconfig.php\" w głównym folderze serwera WWW a nie może tego zrobić.";
-App::$strings["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."] = "Najczęściej jest to ustawienie uprawnień, ponieważ serwer WWW może nie być w stanie zapisywać plików w Twoim folderze - nawet jeśli możesz.";
+App::$strings["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."] = "Najczęściej jest to ustawienie uprawnień, ponieważ serwer WWW może nie być w stanie zapisywać plików w Twoim folderze - nawet jeśli Ty możesz.";
 App::$strings["Please see install/INSTALL.txt for additional information."] = "Dodatkowe informacje można znaleźć w pliku install/INSTALL.txt.";
 App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "To oprogramowanie wykorzystuje silnik szablonów Smarty3 do renderowania widoków internetowych. Smarty3 kompiluje szablony do PHP, aby przyspieszyć renderowanie.";
 App::$strings["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."] = "Aby przechowywać te skompilowane szablony, serwer sieciowy musi mieć dostęp do zapisu w katalogu %s zlokalizowanym w folderze głównym serwera WWW.";
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Upewnij się, że właściciel procesu serwer WWW (np. www-data), ma prawo do zapisu w tym folderze.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Uwaga: ze względów bezpieczeństwa powinno się dać serwerowi WWW prawo zapisu tylko do %s - nie do plików szablonów (.tpl), które on zawiera.";
 App::$strings["%s is writable"] = "%s jest możliwy do zapisu";
-App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "To oprogramowanie używa katalogu <i>store</i> do zapisywania przesyłanych plików. Serwer WWW musi mieć dostęp do zapisu w katalogu <i>store</i>, znajdującego się w folderze serwera WWW najwyższego poziomu";
+App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "To oprogramowanie używa katalogu store do zapisywania przesyłanych plików. Serwer WWW musi mieć dostęp do zapisu w katalogu store, znajdującego się w folderze serwera WWW najwyższego poziomu";
 App::$strings["store is writable"] = "katalog store jest możliwy do zapisu";
-App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Nie można zweryfikować certyfikatu SSL. Napraw certyfikat lub wyłącz dostęp https do tej witryny.";
+App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Nie można zweryfikować certyfikatu SSL. Napraw certyfikat lub wyłącz dostęp https do tego portalu.";
 App::$strings["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!"] = "Jeśli masz dostęp https do swojego portalu internetowego lub zezwalasz na połączenia z portem TCP 443 (port https:), MUSISZ użyć certyfikatu akceptowanego przez przeglądarki. NIE WOLNO używać certyfikatów z podpisem własnym!";
 App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "To ograniczenie zostało wprowadzone, ponieważ Twoje publiczne wpisy mogą na przykład zawierać odniesienia do obrazów na Twoim portalu.";
-App::$strings["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."] = "Jeśli Twój certyfikat nie zostanie rozpoznany, członkowie innych witryn (którzy sami mogą mieć ważne certyfikaty) otrzymają komunikat ostrzegawczy we własnej witrynie, ostrzegający o problemie z bezpieczeństwem.";
+App::$strings["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."] = "Jeśli Twój certyfikat nie zostanie rozpoznany, członkowie innych portali (którzy sami mogą mieć ważne certyfikaty) otrzymają komunikat ostrzegawczy we własnym portalu, ostrzegający o problemie z bezpieczeństwem.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Może to powodować problemy z użytecznością w innym portalu (nie tylko na Twoim), więc musimy nalegać na to wymaganie.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Są dostępni dostawcy, którzy wydają bezpłatne certyfikaty akceptowane przez przeglądarki.";
 App::$strings["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."] = "Jeśli masz pewność, że certyfikat jest ważny i podpisany przez zaufany urząd, sprawdź, czy nie udało się zainstalować certyfikatu pośredniego. Zwykle nie są one wymagane przez przeglądarki, ale są wymagane do komunikacji między serwerami.";
@@ -1474,7 +1434,7 @@ App::$strings["next page"] = "następna strona";
 App::$strings["previous page"] = "poprzednia strona";
 App::$strings["Sort options"] = "Opcje sortowania";
 App::$strings["Alphabetic"] = "Alfabetycznie";
-App::$strings["Reverse Alphabetic"] = "Odwróć alfabetycznie";
+App::$strings["Reverse Alphabetic"] = "Odwrotnie alfabetycznie";
 App::$strings["Newest to Oldest"] = "Od najnowszych do najstarszych";
 App::$strings["Oldest to Newest"] = "Od najstarszych do najnowszych";
 App::$strings["No entries (some entries may be hidden)."] = "Brak wpisów (niektóre wpisy mogą być ukryte).";
@@ -1508,7 +1468,7 @@ App::$strings["Menu item deleted."] = "Usunięto element menu.";
 App::$strings["Menu item could not be deleted."] = "Nie można usunąć elementu menu.";
 App::$strings["Edit Menu Element"] = "Edytuj element menu";
 App::$strings["Link text"] = "Tekst linku";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s jest %2\$s";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s to %2\$s";
 App::$strings["Mood App"] = "Aplikacja Nastrój";
 App::$strings["Set your current mood and tell your friends"] = "Ustaw swój aktualny nastrój i podziel się tym ze znajomymi";
 App::$strings["Mood"] = "Nastrój";
@@ -1519,11 +1479,7 @@ App::$strings["Create custom connection permission limits"] = "Utwórz własne l
 App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Użyj tego formularza, aby utworzyć reguły uprawnień dla różnych klas osób lub połączeń.";
 App::$strings["Permission Categories"] = "Kategorie uprawnień";
 App::$strings["Permission category name"] = "Nazwa kategorii uprawnień";
-App::$strings["No ratings"] = "Brak ocen";
-App::$strings["Rating: "] = "Ocena: ";
-App::$strings["Website: "] = "Portal: ";
-App::$strings["Description: "] = "Opis: ";
-App::$strings["Nickname is required."] = "Pseudonim jest wymagany.";
+App::$strings["Nickname is required."] = "Wymagany jest pseudonim.";
 App::$strings["Email address required"] = "Wymagany jest adres e-mail";
 App::$strings["No password provided"] = "Nie podano hasła";
 App::$strings["Passwords do not match"] = "Hasła nie pasują do siebie";
@@ -1539,7 +1495,7 @@ App::$strings["New register request"] = "Nowa prośba o rejestrację";
 App::$strings["Error creating dId A"] = "BÅ‚Ä…d podczas tworzenia dId A";
 App::$strings["Registration on this hub is disabled."] = "Rejestracja na tym portalu jest wyłączona.";
 App::$strings["Registration on this hub is by approval only."] = "Rejestracja na tym portalu wymaga zatwierdzenia przez administratora.";
-App::$strings["Register at another affiliated hub in case when prefered"] = "Zarejestruj siÄ™ w innym stowarzyszonym portalu w przypadku, gdy potrzebujesz takiego rozwiÄ…zania";
+App::$strings["Register at another affiliated hub in case when prefered"] = "Możesz ewentualnie zarejestrować się na innym stowarzyszonym portalu";
 App::$strings["Registration on this hub is by invitation only."] = "Rejestracja na tym portalu wymaga uprzedniego zaproszenia.";
 App::$strings["Register at another affiliated hub"] = "Zarejestruj siÄ™ w innym stowarzyszonym portalu";
 App::$strings["Terms of Service"] = "Regulamin";
@@ -1559,6 +1515,14 @@ App::$strings["Register"] = "Zarejestruj siÄ™";
 App::$strings["This site has exceeded the number of allowed daily account registrations."] = "Na tym portalu przekroczono  dozwolonÄ… liczbÄ™ dziennych rejestracji kont.";
 App::$strings["__ctx:acl__ Profile"] = "Profil";
 App::$strings["network"] = "sieć";
+App::$strings["Event can not end before it has started."] = "Wydarzenie nie może zakończyć się przed rozpoczęciem.";
+App::$strings["Unable to generate preview."] = "Nie można wygenerować podglądu.";
+App::$strings["Event title and start time are required."] = "Wymaga się wprowadzenia tytułu wydarzenia i godziny rozpoczęcia.";
+App::$strings["Event not found."] = "Nie znaleziono wydarzenia.";
+App::$strings["Edit event"] = "Edytuj wydarzenie";
+App::$strings["Delete event"] = "Usuń wydarzenie";
+App::$strings["calendar"] = "kalendarz";
+App::$strings["Failed to remove event"] = "Nie udało się usunąć wydarzenia";
 App::$strings["No feature settings configured"] = "Brak skonfigurowanych ustawień funkcji";
 App::$strings["Addon Settings"] = "Ustawienia dodatków";
 App::$strings["Please save/submit changes to any panel before opening another."] = "Zapisz/prześlij zmiany do dowolnego panelu przed otwarciem kolejnego.";
@@ -1627,9 +1591,9 @@ App::$strings["Use Browser Location:"] = "Użyj lokalizacji przeglądarki:";
 App::$strings["Adult Content"] = "Treść dla dorosłych";
 App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Ten kanał często lub regularnie publikuje treści dla dorosłych. (Oznacz wszelkie materiały dla dorosłych albo nagość tagiem #NSFW)";
 App::$strings["Security and Privacy Settings"] = "Ustawienia bezpieczeństwa i prywatności";
-App::$strings["Your permissions are already configured. Click to view/adjust"] = "Twoje uprawnienia są już skonfigurowane. Kliknij, aby wyświetlić/dostosować";
+App::$strings["Your permissions are already configured. Click to view/adjust"] = "Twoje uprawnienia są już skonfigurowane. Kliknij, aby je wyświetlić/dostosować";
 App::$strings["Hide my online presence"] = "Ukryj moją obecność w Internecie";
-App::$strings["Prevents displaying in your profile that you are online"] = "Zapobiega wyświetlaniu w Twoim profilu, że jesteś online";
+App::$strings["Prevents displaying in your profile that you are online"] = "Zapobiega wyświetlaniu w Twoim profilu informacji, że jesteś online";
 App::$strings["Simple Privacy Settings:"] = "Proste ustawienia prywatności:";
 App::$strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Bardzo publiczne - <em>wyjątkowo pobłażliwe (należy używać ostrożnie)</em>";
 App::$strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Typowe - <em>domyślne publiczne, prywatność w razie potrzeby (podobne do uprawnień w popularnych sieciach społecznościowych, ale z podwyższoną prywatnością)</em>";
@@ -1662,13 +1626,13 @@ App::$strings["Someone writes on your profile wall"] = "KtoÅ› pisze na Twojej Å›
 App::$strings["Someone writes a followup comment"] = "Ktoś pisze komentarz uzupełniający";
 App::$strings["You receive a private message"] = "Otrzymujesz prywatną wiadomość";
 App::$strings["You receive a friend suggestion"] = "Otrzymasz propozycję znajomości";
-App::$strings["You are tagged in a post"] = "Oznaczono Ciebie tagiem w poście";
+App::$strings["You are tagged in a post"] = "Oznaczono Ciebie tagiem we wpisie";
 App::$strings["You are poked/prodded/etc. in a post"] = "Zaczepiono Ciebie we wpisie";
-App::$strings["Someone likes your post/comment"] = "Ktoś ocenił pozytywnie Twój wpis/komentarz";
+App::$strings["Someone likes your post/comment"] = "Ktoś pochwalił Twój wpis/komentarz";
 App::$strings["Show visual notifications including:"] = "Pokaż powiadomienia wizualne, w tym:";
 App::$strings["Unseen stream activity"] = "Niewidoczną aktywność na strumieniu";
 App::$strings["Unseen channel activity"] = "Niewidoczną aktywność w kanale";
-App::$strings["Unseen private messages"] = "Niewidoczną wiadomości prywatne";
+App::$strings["Unseen private messages"] = "Niewidoczne wiadomości prywatne";
 App::$strings["Recommended"] = "Zalecane";
 App::$strings["Upcoming events"] = "NadchodzÄ…ce wydarzenia";
 App::$strings["Events today"] = "Wydarzenia dzisiejsze";
@@ -1681,10 +1645,10 @@ App::$strings["New connections"] = "Nowe połączenia";
 App::$strings["System Registrations"] = "Rejestracje systemowe";
 App::$strings["Unseen shared files"] = "Niewidoczne udostępnione pliki";
 App::$strings["Unseen public stream activity"] = "Niewidoczna aktywność na publicznym strumieniu";
-App::$strings["Unseen likes and dislikes"] = "Niewidoczne oceny pozytywne i negatywne";
+App::$strings["Unseen likes and dislikes"] = "Niewidoczne pochwały i zganienia";
 App::$strings["Unseen forum posts"] = "Niewidoczne wpisy na forum";
-App::$strings["Email notification hub (hostname)"] = "Serwer powiadomień e-mail (nazwa hosta)";
-App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Jeśli twój kanał jest powielany na wielu ortalach, ustaw to na preferowaną lokalizację. Zapobiegnie to powielaniu powiadomień e-mail. Przykład: % s";
+App::$strings["Email notification hub (hostname)"] = "Powiadomienia e-mail wysyłane z (nazwa hosta)";
+App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Jeśli twój kanał jest powielany na wielu portalach, ustaw to na preferowaną lokalizację. Zapobiegnie to powielaniu powiadomień e-mail. Przykład: % s";
 App::$strings["Show new wall posts, private messages and connections under Notices"] = "Pokaż w powiadomieniach nowe wpisy na ścianie oraz prywatne wiadomości i połączenia";
 App::$strings["Notify me of events this many days in advance"] = "Informuj mnie o wydarzeniach z wyprzedzeniem (w dniach)";
 App::$strings["Must be greater than 0"] = "Musi być większa od 0";
@@ -1706,8 +1670,6 @@ App::$strings["Stream Settings"] = "Ustawienia strumienia";
 App::$strings["Settings saved."] = "Ustawienia zapisane.";
 App::$strings["Settings saved. Reload page please."] = "Ustawienia zapisane. Proszę ponownie załadować stronę.";
 App::$strings["Conversation Settings"] = "Ustawienia rozmów";
-App::$strings["Remote Diagnostics App"] = "Aplikacja Zdalna Diagnostyka";
-App::$strings["Perform diagnostics on remote channels"] = "Przeprowadź diagnostykę zdalnych kanałów";
 App::$strings["Invite App"] = "Aplikacja Zaproszenie";
 App::$strings["Register is closed"] = "Rejestracja zamknięta";
 App::$strings["Note, the invitation code is valid up to"] = "Uwaga: kod zaproszenia jest ważny do";
@@ -1722,7 +1684,7 @@ App::$strings["%s : Message delivery failed."] = "%s: dostarczenie wiadomości n
 App::$strings["To %s : Message delivery success."] = "To %s : Dostarczenie wiadomości powiodło się.";
 App::$strings["%1\$d mail(s) sent, %2\$d mail error(s)"] = "Wysłano %1\$d wiadomości, %2\$d błędy poczty";
 App::$strings["Invites not proposed by configuration"] = "Zaproszenia nie zostały skonfigurowane";
-App::$strings["Contact the site admin"] = "Skontaktuj siÄ™ z administratorem witryny";
+App::$strings["Contact the site admin"] = "Skontaktuj siÄ™ z administratorem portalu";
 App::$strings["Invites by users not enabled"] = "Zaproszenia od użytkowników nie są włączone";
 App::$strings["You have no more invitations available"] = "Nie masz więcej dostępnych zaproszeń";
 App::$strings["Not on xchan"] = "Nie na xchan";
@@ -1739,10 +1701,10 @@ App::$strings["Invite template"] = "Szablon zaproszenia";
 App::$strings["Subject:"] = "Temat:";
 App::$strings["Here you may enter personal notes to the recipient(s)"] = "Tutaj możesz wprowadzić osobiste notatki do odbiorcy/odbiorców";
 App::$strings["About this site"] = "O tym portalu";
-App::$strings["Site Name"] = "Nazwa witryny";
+App::$strings["Site Name"] = "Nazwa portalu";
 App::$strings["Administrator"] = "Administrator";
 App::$strings["Software and Project information"] = "Informacje o oprogramowaniu i projekcie";
-App::$strings["This site is powered by \$Projectname"] = "Ta witryna jest oparta na \$Projectname";
+App::$strings["This site is powered by \$Projectname"] = "Ten portal jest oparty na \$Projectname";
 App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Sfederowane i zdecentralizowane usługi sieciowe i tożsamości wykorzystujące protokół Zot";
 App::$strings["Additional federated transport protocols:"] = "Dodatkowe protokoły transportu federacyjnego:";
 App::$strings["Version %s"] = "Wersja %s";
@@ -1801,15 +1763,15 @@ App::$strings["Import all or selected content from the following channel into th
 App::$strings["Only import content with these words (one per line)"] = "Importuj tylko zawartość z tymi słowami (po jednym w każdym wierszu)";
 App::$strings["Leave blank to import all public content"] = "Pozostaw puste, aby zaimportować całą zawartość publiczną";
 App::$strings["Channel Name"] = "Nazwa kanału";
-App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Dodaj następujące kategorie do wpisów zaimportowanych z tego źródła (oddzielone przecinkami)";
-App::$strings["Resend posts with this channel as author"] = "Wyślij ponownie wpisy z tym kanałem jako autorem";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Dodaj następujące kategorie do wpisów zaimportowanych z tego źródła (rozdzielone przecinkami)";
+App::$strings["Resend posts with this channel as author"] = "Wyślij ponownie wpisy z tym kanałem jako autor";
 App::$strings["Copyrights may apply"] = "Mogą obowiązywać prawa autorskie";
 App::$strings["Source not found."] = "Nie znaleziono źródła.";
 App::$strings["Edit Source"] = "Edytuj źródło";
 App::$strings["Delete Source"] = "Usuń źródło";
 App::$strings["Source removed"] = "Źródło zostało usunięte";
 App::$strings["Unable to remove source."] = "Nie można usunąć źródła.";
-App::$strings["Poke App"] = "Aplikacja kuksaniec";
+App::$strings["Poke App"] = "Aplikacja Zaczepka";
 App::$strings["Poke somebody in your addressbook"] = "Zaczep kogoś w swojej książce adresowej";
 App::$strings["Poke"] = "Zaczepka";
 App::$strings["Poke somebody"] = "Zaczep kogoÅ›";
@@ -1834,7 +1796,7 @@ App::$strings["Copy to target location"] = "Skopiuj do lokalizacji docelowej";
 App::$strings["Set permissions for all files and sub folders"] = "Ustaw uprawnienia dla wszystkich plików i podfolderów";
 App::$strings["Notify your contacts about this file"] = "Powiadom swoje kontakty o tym pliku";
 App::$strings["File category"] = "Kategoria plików";
-App::$strings["Total"] = "Ogólnie";
+App::$strings["Total"] = "Ogółem";
 App::$strings["Shared"] = "Udostępnione";
 App::$strings["Add Files"] = "Dodaj pliki";
 App::$strings["Admin Delete"] = "Usunięte przez administratora";
@@ -1852,12 +1814,10 @@ App::$strings["Link BBcode"] = "Połącz do tekstu BBcode";
 App::$strings["You are using %1\$s of your available file storage."] = "Używasz %1\$s dostępnego miejsca na pliki.";
 App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Używasz %1\$s z %2\$s dostępnego miejsca na pliki. (%3\$s &#37;)";
 App::$strings["WARNING:"] = "OSTRZEŻENIE:";
-App::$strings["Create new folder"] = "Stwórz nowy folder";
-App::$strings["Upload file"] = "Przesyłanie pliku";
+App::$strings["Create new folder"] = "Utwórz nowy folder";
+App::$strings["Upload file"] = "Prześlij plik";
 App::$strings["Drop files here to immediately upload"] = "Upuść pliki tutaj, aby natychmiast przesłać";
 App::$strings["You can select files via the upload button or drop them right here or into an existing folder."] = "Możesz wybrać pliki za pomocą przycisku przesyłania lub upuścić je tutaj lub do istniejącego folderu.";
-App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Zdalne uwierzytelnianie zablokowane. Jesteś zalogowany lokalnie na tej stronie. Wyloguj się i spróbuj ponownie.";
-App::$strings["Welcome %s. Remote authentication successful."] = "Witaj %s. Zdalne uwierzytelnianie powiodło się.";
 App::$strings["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."] = "Przywrócono usuniętą grupę o tej nazwie. Istniejące uprawnienia dotyczące elementów <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie tego chciałeś, utwórz kolejną grupę o innej nazwie.";
 App::$strings["Add new connections to this privacy group"] = "Dodaj nowe połączenia do tej grupy prywatności";
 App::$strings["edit"] = "edutuj";
@@ -1873,7 +1833,7 @@ App::$strings["Protocol disabled."] = "Protokół wyłączony.";
 App::$strings["Cannot connect to yourself."] = "Nie można połączyć się ze sobą.";
 App::$strings["error saving data"] = "błąd podczas zapisywania danych";
 App::$strings["Apps"] = "Aplikacje";
-App::$strings["Affinity Tool"] = "Narzędzie Zaprzyjaźnienia";
+App::$strings["Affinity Tool"] = "Narzędzie więzi";
 App::$strings["Site Admin"] = "Administrator portalu";
 App::$strings["Report Bug"] = "Raport błędów";
 App::$strings["Bookmarks"] = "Zakładki";
@@ -1948,8 +1908,8 @@ App::$strings["%1\$s sent you %2\$s."] = "%1\$s wysłał Ci %2\$s.";
 App::$strings["a private message"] = "prywatna wiadomość";
 App::$strings["Please visit %s to view and/or reply to your private messages."] = "Odwiedź %s, aby wyświetlić albo odpowiedzieć na swoje prywatne wiadomości.";
 App::$strings["commented on"] = "skomentował";
-App::$strings["liked"] = "ocenił pozytywnie";
-App::$strings["disliked"] = "ocenił negatywnie";
+App::$strings["liked"] = "pochwalone";
+App::$strings["disliked"] = "zganione";
 App::$strings["voted on"] = "głosował";
 App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%4\$s[/zrl]";
 App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]%5\$s %4\$s[/zrl]";
@@ -1959,9 +1919,9 @@ App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"]
 App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$s skomentował obserwowany element/rozmowa.";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Odwiedź %s, aby wyświetlić albo włączyć się do rozmowy.";
 App::$strings["Please visit %s to approve or reject this comment."] = "Odwiedź %s, aby zaakceptować lub odrzucić ten komentarz.";
-App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s ocenił pozytywnie [zrl=%2\$s]Twój %3\$s[/zrl]";
-App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Ocena poytywna wysłana dla rozmowy #%1\$d przez %2\$s";
-App::$strings["%1\$s liked an item/conversation you created."] = "%1\$s ocenił pozytywnie utworzony przez Ciebie element/rozmowę.";
+App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s pochwalił [zrl=%2\$s]Twój %3\$s[/zrl]";
+App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Pochwała wysłana dla rozmowy #%1\$d przez %2\$s";
+App::$strings["%1\$s liked an item/conversation you created."] = "%1\$s pochwalił utworzony przez Ciebie element/rozmowę.";
 App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Notify]%s opublikowany na Twojej ścianie profilu";
 App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s opublikowano na ścianie Twojego profilu pod adresem %2\$s";
 App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s opublikował na [zrl=%2\$s]Twojej ścianie[/zrl]";
@@ -1991,11 +1951,16 @@ App::$strings["created a new post"] = "utworzył nowy wpis";
 App::$strings["voted on %s's poll"] = "głosował w ankiecie %s";
 App::$strings["commented on %s's post"] = "skomentował wpis %s";
 App::$strings["repeated %s's post"] = "powtórzony wpis %s";
+App::$strings["shared a file with you"] = "udostępnił Ci plik";
 App::$strings["edited a post dated %s"] = "edytował wpis z dnia %s";
 App::$strings["edited a comment dated %s"] = "edytował komentarz z dnia %s";
+App::$strings["added your channel"] = "dodał Twój kanał";
+App::$strings["sent you a private message"] = "wysłał Ci prywatną wiadomość";
+App::$strings["g A l F d"] = "g A l F d";
+App::$strings["[today]"] = "[dzisiaj]";
 App::$strings["created an event"] = "utworzono wydarzenie";
 App::$strings["status verified"] = "status został  zweryfikowany";
-App::$strings["Unable to verify site signature for %s"] = "Nie można zweryfikować podpisu witryny dla %s";
+App::$strings["Unable to verify site signature for %s"] = "Nie można zweryfikować podpisu portalu dla %s";
 App::$strings["(No Title)"] = "(Brak tytułu)";
 App::$strings["Wiki page create failed."] = "Tworzenie strony Wiki nie powiodło się.";
 App::$strings["Wiki not found."] = "Nie znaleziono wiki.";
@@ -2026,8 +1991,8 @@ App::$strings["Toggle Star Status"] = "Przełącz stan gwiazdki";
 App::$strings["Message signature validated"] = "Podpis wiadomości został zatwierdzony";
 App::$strings["Message signature incorrect"] = "Niepoprawny podpis wiadomości";
 App::$strings["Conversation Tools"] = "Narzędzia do konwersacji";
-App::$strings["like"] = "lubi";
-App::$strings["dislike"] = "nie lubi";
+App::$strings["like"] = "pochwaa";
+App::$strings["dislike"] = "gani";
 App::$strings["Reply on this comment"] = "Odpowiedz na ten komentarz";
 App::$strings["reply"] = "odpowiedz";
 App::$strings["Reply to"] = "Odpowiedź dla";
@@ -2070,9 +2035,9 @@ App::$strings["Insert Link"] = "Wstaw link";
 App::$strings["Video"] = "Wideo";
 App::$strings["Your full name (required)"] = "Twoja imię i nazwisko lub pełna nazwa (wymagane)";
 App::$strings["Your email address (required)"] = "Twój adres e-mail (wymagane)";
-App::$strings["Your website URL (optional)"] = "Adres URL Twojej witryny (opcjonalnie)";
-App::$strings["Likes %1\$s's %2\$s"] = "Lubi %2\$s %1\$s";
-App::$strings["Doesn't like %1\$s's %2\$s"] = "Nie lubi %2\$s %1\$s";
+App::$strings["Your website URL (optional)"] = "Adres URL Twojego portalu (opcjonalnie)";
+App::$strings["Likes %1\$s's %2\$s"] = "Pochwalił %2\$s %1\$s";
+App::$strings["Doesn't like %1\$s's %2\$s"] = "Zganił %2\$s %1\$s";
 App::$strings["Will attend %s's event"] = "Weźmie udział w wydarzeniu %s";
 App::$strings["Will not attend %s's event"] = "Nie weźmie udziału w wydarzeniu %s";
 App::$strings["May attend %s's event"] = "Może uczestniczyć w wydarzeniu %s";
@@ -2133,7 +2098,7 @@ App::$strings["View Ratings"] = "Pokaż oceny";
 App::$strings["Add new page"] = "Dodaj nowÄ… stronÄ™";
 App::$strings["Wiki Pages"] = "Strony wiki";
 App::$strings["Page name"] = "Nazwa strony";
-App::$strings["Bookmarked Chatrooms"] = "Czaty dodane do zakładek";
+App::$strings["Bookmarked Chatrooms"] = "Czaty z zakładkami";
 App::$strings["photo/image"] = "zdjęcie/obraz";
 App::$strings["Forums"] = "Fora";
 App::$strings["Remove term"] = "Usuń termin";
@@ -2151,7 +2116,7 @@ App::$strings["DB updates"] = "Aktualizacje bazy danych";
 App::$strings["Admin"] = "Admin";
 App::$strings["Addon Features"] = "Dodatkowe możliwości";
 App::$strings["Overview"] = "PrzeglÄ…d";
-App::$strings["App Collections"] = "Kolekcja aplikacji";
+App::$strings["App Collections"] = "Kolekcje aplikacji";
 App::$strings["Installed apps"] = "Zainstalowane aplikacje";
 App::$strings["Commented Date"] = "Data skomentowania";
 App::$strings["Order by last commented date"] = "Sortuj według najnowszej daty skomentowania";
@@ -2164,7 +2129,6 @@ App::$strings["Private Mail Menu"] = "Menu prywatnej poczty";
 App::$strings["Combined View"] = "Widok Å‚Ä…czony";
 App::$strings["Inbox"] = "Skrzynka odbiorcza";
 App::$strings["Outbox"] = "Skrzynka nadawcza";
-App::$strings["New Message"] = "Nowy komunikat";
 App::$strings["Refresh"] = "Odśwież";
 App::$strings["HQ Control Panel"] = "Panel kontrolny HQ";
 App::$strings["Create a new post"] = "Utwórz nowy wpis";
@@ -2197,7 +2161,7 @@ App::$strings["New Network Activity Notifications"] = "Powiadomienia o nowej akt
 App::$strings["View your network activity"] = "Wyświetl swoją aktywność w sieci";
 App::$strings["Mark all notifications read"] = "Oznacz wszystkie powiadomienia jako przeczytane";
 App::$strings["Show new posts only"] = "Pokaż tylko nowe wpisy";
-App::$strings["Filter by name or address"] = "Filtruj według nazwy lub adresu";
+App::$strings["Filter by name or address"] = "Filtruj wg nazwy lub adresu";
 App::$strings["New Home Activity"] = "Nowa aktywność domowa";
 App::$strings["New Home Activity Notifications"] = "Powiadomienia o nowej aktywności domowej";
 App::$strings["View your home activity"] = "Wyświetl swoją aktywność domową";
@@ -2205,10 +2169,6 @@ App::$strings["Mark all notifications seen"] = "Oznacz wszystkie powiadomienia j
 App::$strings["New Direct Messages"] = "Nowe bezpośrednie wiadomości";
 App::$strings["New Direct Messages Notifications"] = "Powiadomienia o nowych wiadomościach bezpośrednich";
 App::$strings["View your direct messages"] = "Wyświetl swoje bezpośrednie wiadomości";
-App::$strings["New Mails"] = "Nowe wiadomości e-mail";
-App::$strings["New Mails Notifications"] = "Powiadomienia o nowych wiadomościach e-mail";
-App::$strings["View your private mails"] = "Zobacz swoje prywatne wiadomości";
-App::$strings["Mark all messages seen"] = "Oznacz wszystkie wiadomości jako oglądnięte";
 App::$strings["New Events"] = "Nowe wydarzenia";
 App::$strings["New Events Notifications"] = "Powiadomienia o nowych wydarzeniach";
 App::$strings["View events"] = "Pokaż wydarzenia";
@@ -2244,9 +2204,9 @@ App::$strings["Edit your profile"] = "Edytuj swój profil";
 App::$strings["Find and Connect with others"] = "Znajdź i połącz się z innymi";
 App::$strings["View the directory"] = "Pokaż katalog";
 App::$strings["Manage your connections"] = "Zarządzaj swoimi połączeniami";
-App::$strings["Communicate"] = "Komunikuj siÄ™";
+App::$strings["Communicate"] = "Skomunikuj siÄ™";
 App::$strings["View your channel homepage"] = "Wyświetl stronę główną swojego kanału";
-App::$strings["View your network stream"] = "Wyświetl swój strumień sieciowy";
+App::$strings["View your network stream"] = "Wyświetl swój strumień";
 App::$strings["Documentation"] = "Dokumentacja";
 App::$strings["Missing Features?"] = "Brakuje funkcji?";
 App::$strings["Pin apps to navigation bar"] = "Przypinaj aplikacje do paska nawigacji";
@@ -2268,14 +2228,14 @@ App::$strings["Invite Friends"] = "Zaproś przyjaciół";
 App::$strings["Advanced example: name=fred and country=iceland"] = "Zaawansowany przykład: name=fredeki country=poland";
 App::$strings["Common Connections"] = "Popularne połączenia";
 App::$strings["View all %d common connections"] = "Wyświetl wszystkie %d popularne połączenia";
-App::$strings["likes %1\$s's %2\$s"] = "ocenił pozytywnie %2\$s %1\$s";
-App::$strings["doesn't like %1\$s's %2\$s"] = "ocenił negatywnie %1\$s %2\$s";
+App::$strings["likes %1\$s's %2\$s"] = "pochwalił %2\$s %1\$s";
+App::$strings["doesn't like %1\$s's %2\$s"] = "zganił %1\$s %2\$s";
 App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s jest teraz połączony z %2\$s";
 App::$strings["%1\$s poked %2\$s"] = "%1\$s zaczepił %2\$s";
 App::$strings["poked"] = "zaczepiony";
 App::$strings["View %s's profile @ %s"] = "Pokaż profil @ %s %s";
 App::$strings["Categories:"] = "Kategorie:";
-App::$strings["Filed under:"] = "Złożone pod:";
+App::$strings["Filed under:"] = "Skategoryzowane pod:";
 App::$strings["View in context"] = "Zobacz w kontekście";
 App::$strings["remove"] = "usuń";
 App::$strings["Loading..."] = "�adowanie ...";
@@ -2284,17 +2244,17 @@ App::$strings["View Source"] = "Pokaż źródło";
 App::$strings["Follow Thread"] = "Obserwuj wÄ…tek";
 App::$strings["Unfollow Thread"] = "Przestań obserwować wątek";
 App::$strings["Edit Connection"] = "Edytuj połączenie";
-App::$strings["%s likes this."] = "%s lubi to.";
-App::$strings["%s doesn't like this."] = "%s nie lubi tego.";
+App::$strings["%s likes this."] = "%s pochwalił to.";
+App::$strings["%s doesn't like this."] = "%s zganił to.";
 App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d osoba</span> lubi to.",
-	1 => "<span  %1\$s>%2\$d osoby</span> lubiÄ… tego.",
-	2 => "<span  %1\$s>%2\$d osób</span> lubi tego.",
+	0 => "<span  %1\$s>%2\$d osoba</span> pochwaliła to.",
+	1 => "<span  %1\$s>%2\$d osoby</span> pochwaliły to.",
+	2 => "<span  %1\$s>%2\$d osób</span> pochwaliło to.",
 );
 App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d osoba</span> nie lubi to.",
-	1 => "<span  %1\$s>%2\$d osoby</span> nie lubiÄ… tego.",
-	2 => "<span  %1\$s>%2\$d osób</span> nie lubią tego.",
+	0 => "<span  %1\$s>%2\$d osoba</span> zganiła to.",
+	1 => "<span  %1\$s>%2\$d osoby</span> zganiły to.",
+	2 => "<span  %1\$s>%2\$d osób</span> zganiło to.",
 );
 App::$strings["and"] = "i";
 App::$strings[", and %d other people"] = array(
@@ -2302,12 +2262,12 @@ App::$strings[", and %d other people"] = array(
 	1 => ", oraz %d inne osoby",
 	2 => ", oraz %d innych osób",
 );
-App::$strings["%s like this."] = "%s lubi to.";
-App::$strings["%s don't like this."] = "%s nie lubi tego.";
+App::$strings["%s like this."] = "%s pochwala to.";
+App::$strings["%s don't like this."] = "%s gani to.";
 App::$strings["Set your location"] = "Ustaw swojÄ… lokalizacjÄ™";
 App::$strings["Clear browser location"] = "Wyczyść lokalizację przeglądarki";
 App::$strings["Embed (existing) photo from your photo albums"] = "Osadź (istniejące) zdjęcie z albumów ze zdjęciami";
-App::$strings["Tag term:"] = "Termin tagu:";
+App::$strings["Tag term:"] = "Nazwa tagu:";
 App::$strings["Where are you right now?"] = "Gdzie teraz jesteÅ›?";
 App::$strings["Choose a different album..."] = "Wybierz inny album...";
 App::$strings["Comments enabled"] = "WÅ‚Ä…czone komentowanie";
@@ -2326,6 +2286,7 @@ App::$strings["Disable comments"] = "Wyłącz komentarze";
 App::$strings["Toggle comments"] = "Przełącz komentarze";
 App::$strings["Summary (optional)"] = "Streszczenie (opcjonalnie)";
 App::$strings["Categories (optional, comma-separated list)"] = "Kategorie  (opcjonalnie, lista rozdzielana przecinkami)";
+App::$strings["Permission settings"] = "Ustawienia dostępu";
 App::$strings["Other networks and post services"] = "Inne sieci i usługi społecznościowe";
 App::$strings["Set expiration date"] = "Ustaw datę wygaśnięcia";
 App::$strings["Set publish date"] = "Ustaw datÄ™ publikacji";
@@ -2366,7 +2327,7 @@ App::$strings["No account identifier"] = "Brak identyfikatora konta";
 App::$strings["Unable to retrieve created identity"] = "Nie można pobrać utworzonej tożsamości";
 App::$strings["Default Profile"] = "Domyślny profil";
 App::$strings["Unable to retrieve modified identity"] = "Nie można pobrać zmodyfikowanej tożsamości";
-App::$strings["Requested channel is not available."] = "Żądany kanał nie jest dostępny.";
+App::$strings["Requested channel is not available"] = "Żądany kanał nie jest dostępny";
 App::$strings["Create New Profile"] = "Utwórz nowy profil";
 App::$strings["Edit Profile"] = "Edytuj profil";
 App::$strings["Visible to everybody"] = "Widoczne dla każdego";
@@ -2380,7 +2341,7 @@ App::$strings["Male"] = "Mężczyzna";
 App::$strings["Trans"] = "Trans";
 App::$strings["Neuter"] = "Osoba aseksualna";
 App::$strings["Non-specific"] = "Nie określono";
-App::$strings["Like this channel"] = "Oceń pozytywnie ten kanał";
+App::$strings["Like this channel"] = "Pochwal ten kanał";
 App::$strings["j F, Y"] = "d M, R";
 App::$strings["j F"] = "d M";
 App::$strings["Birthday:"] = "Urodziny:";
@@ -2390,8 +2351,8 @@ App::$strings["Sexual Preference:"] = "Preferencje seksualne:";
 App::$strings["Political Views:"] = "PoglÄ…dy polityczne:";
 App::$strings["Religion:"] = "Religia:";
 App::$strings["Hobbies/Interests:"] = "Hobby/Zainteresowania:";
-App::$strings["Likes:"] = "Ocen pozytywnych:";
-App::$strings["Dislikes:"] = "Ocen negatywnych:";
+App::$strings["Likes:"] = "Pochwały:";
+App::$strings["Dislikes:"] = "Zganienia:";
 App::$strings["Contact information and Social Networks:"] = "Informacje kontaktowe i sieci społecznościowe:";
 App::$strings["My other channels:"] = "Moje inne kanały:";
 App::$strings["Musical interests:"] = "Zainteresowania muzyczne:";
@@ -2402,6 +2363,7 @@ App::$strings["Love/Romance:"] = "Miłość/Romans:";
 App::$strings["Work/employment:"] = "Praca/Zatrudnienie:";
 App::$strings["School/education:"] = "Szkoła/Wykształcenie:";
 App::$strings["Like this thing"] = "Podobne do tej rzeczy";
+App::$strings["Export"] = "Eksportuj";
 App::$strings["Start calendar week on Monday"] = "Rozpocznij tydzień kalendarzowy w poniedziałek";
 App::$strings["Default is Sunday"] = "Domyślnie jest to niedziela";
 App::$strings["Event Timezone Selection"] = "Wybór strefy czasowej wydarzenia";
@@ -2417,13 +2379,13 @@ App::$strings["Filter incoming posts from connections based on keywords/content"
 App::$strings["Conversation"] = "Rozmowa";
 App::$strings["Emoji Reactions"] = "Reakcje emoji";
 App::$strings["Add emoji reaction ability to posts"] = "Dodaje możliwość wstawiania reakcji emoji we wpisach";
-App::$strings["Dislike Posts"] = "Nielubienie wpisu";
-App::$strings["Ability to dislike posts/comments"] = "Możliwość oznaczania wpisów i komentarzy jako nielubiane";
+App::$strings["Dislike Posts"] = "Zganienia wpisów";
+App::$strings["Ability to dislike posts/comments"] = "Możliwość oznaczania wpisów i komentarzy jako nieaprobowane";
 App::$strings["Star Posts"] = "Wyróżnienie wpisu";
 App::$strings["Ability to mark special posts with a star indicator"] = "Możliwość oznaczania wyróżnionych wpisów wskaźnikiem gwiazdki";
 App::$strings["Reply on comment"] = "Odpowiadanie na komentarze";
 App::$strings["Ability to reply on selected comment"] = "Możliwość udzielenia odpowiedzi na wybrany komentarz";
-App::$strings["Advanced Directory Search"] = "Zaawansowane przeszukiwanie katalogu";
+App::$strings["Advanced Directory Search"] = "Zaawansowane wyszukiwanie w katalogu";
 App::$strings["Allows creation of complex directory search queries"] = "Umożliwia tworzenie złożonych zapytań wyszukiwania w katalogu";
 App::$strings["Editor"] = "Edytor";
 App::$strings["Post Categories"] = "Kategorie wpisów";
@@ -2464,7 +2426,7 @@ App::$strings["If location data is available on uploaded photos, link this to a
 App::$strings["Advanced Profiles"] = "Profile zaawansowane";
 App::$strings["Additional profile sections and selections"] = "Dodatkowe sekcje i pola wyboru profilu";
 App::$strings["Profile Import/Export"] = "Import/Eksport profilu";
-App::$strings["Save and load profile details across sites/channels"] = "Zapisz i wczytaj szczegóły profilu z różnych witryn i  kanałów";
+App::$strings["Save and load profile details across sites/channels"] = "Zapisz i wczytaj szczegóły profilu z różnych portali i  kanałów";
 App::$strings["Multiple Profiles"] = "Wiele profili";
 App::$strings["Ability to create multiple profiles"] = "Możliwość tworzenia wielu profili";
 App::$strings["Delegation session ended."] = "Sesja delegacji zakończyła się.";
@@ -2481,16 +2443,16 @@ App::$strings["newer"] = "nowszy";
 App::$strings["No connections"] = "Brak połączeń";
 App::$strings["View all %s connections"] = "Wyświetl wszystkie połączenia %s";
 App::$strings["Network: %s"] = "Sieć: %s";
-App::$strings["poke"] = "zaczepiać";
-App::$strings["ping"] = "spingować";
+App::$strings["poke"] = "szturchnij";
+App::$strings["ping"] = "spinguj";
 App::$strings["pinged"] = "spingowany";
-App::$strings["prod"] = "sprawdzać";
+App::$strings["prod"] = "zaczep";
 App::$strings["prodded"] = "zaczepiony";
-App::$strings["slap"] = "spoliczkować";
-App::$strings["slapped"] = "spoliczkowany";
-App::$strings["finger"] = "dotknąć";
+App::$strings["slap"] = "uderz";
+App::$strings["slapped"] = "uderzony";
+App::$strings["finger"] = "dotknij";
 App::$strings["fingered"] = "dotknięty";
-App::$strings["rebuff"] = "odprawiać";
+App::$strings["rebuff"] = "odpraw";
 App::$strings["rebuffed"] = "odprawiony";
 App::$strings["happy"] = "szczęśliwy";
 App::$strings["sad"] = "smutny";
@@ -2503,7 +2465,7 @@ App::$strings["puzzled"] = "zdziwiony";
 App::$strings["interested"] = "zainteresowany";
 App::$strings["bitter"] = "gorzki";
 App::$strings["cheerful"] = "wesoły";
-App::$strings["alive"] = "żywy";
+App::$strings["alive"] = "ożywiony";
 App::$strings["annoyed"] = "zirytowany";
 App::$strings["anxious"] = "niespokojny";
 App::$strings["cranky"] = "zepsuty";
@@ -2511,14 +2473,14 @@ App::$strings["disturbed"] = "zaniepokojony";
 App::$strings["frustrated"] = "sfrustrowany";
 App::$strings["depressed"] = "przygnębiony";
 App::$strings["motivated"] = "zmotywowany";
-App::$strings["relaxed"] = "z<relaksowany";
+App::$strings["relaxed"] = "zrelaksowany";
 App::$strings["surprised"] = "zaskoczony";
 App::$strings["Monday"] = "Poniedziałek";
 App::$strings["Tuesday"] = "Wtorek";
 App::$strings["Wednesday"] = "Åšroda";
 App::$strings["Thursday"] = "Czwartek";
 App::$strings["Friday"] = "PiÄ…tek";
-App::$strings["Saturday"] = "Sonota";
+App::$strings["Saturday"] = "Sobota";
 App::$strings["Sunday"] = "Niedziela";
 App::$strings["January"] = "Styczeń";
 App::$strings["February"] = "Luty";
@@ -2534,11 +2496,12 @@ App::$strings["November"] = "Listopad";
 App::$strings["December"] = "Grudzień";
 App::$strings["Unknown Attachment"] = "Nieznany załącznik";
 App::$strings["unknown"] = "nieznany";
-App::$strings["remove category"] = "usuń kataegorię";
+App::$strings["remove category"] = "usuń kategorię";
 App::$strings["remove from file"] = "usuń z pliku";
 App::$strings["Download binary/encrypted content"] = "Pobierz zawartość binarną/zaszyfrowaną";
 App::$strings["Poll has ended."] = "Ankieta zakończyła się.";
 App::$strings["Poll ends: %s"] = "Ankieta kończy się : %s";
+App::$strings["Link to Source"] = "Link do źródła";
 App::$strings["default"] = "domyślnie";
 App::$strings["Page layout"] = "Układ strony";
 App::$strings["You can create your own with the layouts tool"] = "Możesz tworzyć własne za pomocą narzędzia układów";
@@ -2549,15 +2512,15 @@ App::$strings["Page content type"] = "Typ treści strony";
 App::$strings["activity"] = "aktywność";
 App::$strings["poll"] = "ankieta";
 App::$strings["a-z, 0-9, -, and _ only"] = "tylko a-z, 0-9, - i _";
-App::$strings["Design Tools"] = "Narzędzia projektowe";
+App::$strings["Design Tools"] = "Narzędzia projektanckie";
 App::$strings["Pages"] = "Strony";
 App::$strings["Import"] = "Import";
 App::$strings["Import website..."] = "Import witryny...";
 App::$strings["Select folder to import"] = "Wybierz folder do zaimportowania";
 App::$strings["Import from a zipped folder:"] = "Import z pliku archiwum ZIP:";
-App::$strings["Import from cloud files:"] = "Import plków z chmury:";
+App::$strings["Import from cloud files:"] = "Import plików z chmury:";
 App::$strings["/cloud/channel/path/to/folder"] = "/chmura/kanał/ścieżka/do/folderu";
-App::$strings["Enter path to website files"] = "Wprowadź ścieżkę do plików witryny internetowej";
+App::$strings["Enter path to website files"] = "Wprowadź ścieżkę do plików poretalu";
 App::$strings["Select folder"] = "Wybierz folder";
 App::$strings["Export website..."] = "Eksport witryny...";
 App::$strings["Export to a zip file"] = "Eksport do pliku ZIP";
@@ -2567,10 +2530,6 @@ App::$strings["Export to cloud files"] = "Eksport do plików w chmurze";
 App::$strings["/path/to/export/folder"] = "/ścieżka/do/eksportu/folder";
 App::$strings["Enter a path to a cloud files destination."] = "Wprowadź ścieżkę do miejsca docelowego plików w chmurze.";
 App::$strings["Specify folder"] = "Wybierz folder";
-App::$strings["Unable to determine sender."] = "Nie można określić nadawcy.";
-App::$strings["No recipient provided."] = "Nie podano odbiorcy.";
-App::$strings["[no subject]"] = "[brak tematu]";
-App::$strings["Stored post could not be verified."] = "Nie można zweryfikować zapisanego wpisu.";
 App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s napisał ten %2\$s %3\$s";
 App::$strings["spoiler"] = "spojler";
 App::$strings["Profile-Based Privacy Groups"] = "Grupy prywatności oparte na profilach";
@@ -2587,8 +2546,8 @@ App::$strings["have"] = "ma";
 App::$strings["has"] = "majÄ…";
 App::$strings["want"] = "chce";
 App::$strings["wants"] = "chcÄ…";
-App::$strings["likes"] = "lubiÄ…";
-App::$strings["dislikes"] = "nie  lubiÄ…";
+App::$strings["likes"] = "pochwala";
+App::$strings["dislikes"] = "gani";
 App::$strings["Unable to import a removed channel."] = "Nie można zaimportować usuniętego kanału.";
 App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Nie można utworzyć zduplikowanego identyfikatora kanału w tym systemie. Import nieudany.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Nie można utworzyć unikalnego adresu kanału. Import nieudany.";
@@ -2604,24 +2563,24 @@ App::$strings["Your profile page"] = "Strona Twojego profilu";
 App::$strings["Manage/Edit profiles"] = "ZarzÄ…dzaj/edytuj profile";
 App::$strings["Sign in"] = "Zaloguj siÄ™";
 App::$strings["Take me home"] = "Zabierz mnie do domu";
-App::$strings["Log me out of this site"] = "Wyloguj mnie z tej witryny";
+App::$strings["Log me out of this site"] = "Wyloguj mnie z tego portalu";
 App::$strings["Create an account"] = "Utwórz konto";
 App::$strings["Help and documentation"] = "Pomoc i dokumentacja";
-App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Szukaj w witrynie @name, !forum, #tag, ?docs, content";
-App::$strings["Site Setup and Configuration"] = "Instalacja i konfiguracja witryny";
+App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Szukaj @name portalu, !forum, #tag, ?docs, treść";
+App::$strings["Site Setup and Configuration"] = "Instalacja i konfiguracja portalu";
 App::$strings["@name, !forum, #tag, ?doc, content"] = "@name, !forum, #tag, ?doc, content";
 App::$strings["Please wait..."] = "Proszę czekać ...";
-App::$strings["Add Apps"] = "Dodaj aplikacje";
+App::$strings["Add Apps"] = "Zainstalowane aplikacje";
 App::$strings["Arrange Apps"] = "Rozmieść aplikacje";
 App::$strings["Toggle System Apps"] = "Przełącz aplikacje systemowe";
-App::$strings["Status Messages and Posts"] = "Komunikaty o stanie i wpisy";
+App::$strings["Status Messages and Posts"] = "Komunikaty o stanie i wpisach";
 App::$strings["Profile Details"] = "Szczegóły profilu";
 App::$strings["Photo Albums"] = "Albumy zdjęć";
 App::$strings["Files and Storage"] = "Pliki i ich magazyn";
 App::$strings["Saved Bookmarks"] = "Zapisane zakładki";
 App::$strings["View Cards"] = "Wyświetl karty";
 App::$strings["View Articles"] = "Wyświetl artykuły";
-App::$strings["View Webpages"] = "Wyświetl witryny internetowe";
+App::$strings["View Webpages"] = "Wyświetl strony internetowe";
 App::$strings["Select an alternate language"] = "Wybierz alternatywny język";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s wita %2\$s";
 App::$strings["%1\$s's bookmarks"] = "zakładki %1\$s";
@@ -2636,7 +2595,7 @@ App::$strings["Date: "] = "Data: ";
 App::$strings["Reason: "] = "Powód: ";
 App::$strings["INVALID CARD DISMISSED!"] = "ODRZUCONO NIEPRAWID�OWĄ KARTĘ!";
 App::$strings["Name: "] = "Nazwa: ";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Obraz przekracza limit rozmiaru witryny wynoszący %lu bajtów";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Obraz przekracza limit rozmiaru dla tego portali, wynoszący %lu bajtów";
 App::$strings["Image file is empty."] = "Plik obrazu jest pusty.";
 App::$strings["Photo storage failed."] = "Zapis zdjęcia nie powiódł się.";
 App::$strings["a new photo"] = "nowe zdjęcie";
@@ -2655,13 +2614,13 @@ App::$strings["close all"] = "zamknij wszystko";
 App::$strings["Nothing new here"] = "Nic nowego tutaj";
 App::$strings["Rate This Channel (this is public)"] = "Oceń ten kanał (to jest publiczne)";
 App::$strings["Describe (optional)"] = "Opisz (opcjonalnie)";
-App::$strings["Please enter a link URL"] = "Proszę wprowadzić  URL linku";
+App::$strings["Please enter a link URL"] = "Proszę wprowadzić URL linku";
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Niezapisane zmiany. Czy na pewno chcesz opuścić tę stronę?";
 App::$strings["lovely"] = "śliczne";
 App::$strings["wonderful"] = "wspaniałe";
 App::$strings["fantastic"] = "fantastyczne";
 App::$strings["great"] = "świetne";
-App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "Twój wybrany pseudonim jest już zajęty lub nieważny. Skorzystaj z naszej prpozycji (";
+App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "Twój wybrany pseudonim jest już zajęty lub nieważny. Skorzystaj z naszej propozycji (";
 App::$strings[") or enter a new one."] = ") lub wprowadź nowy.";
 App::$strings["Thank you, this nickname is valid."] = "Dziękuję, ten pseudonim jest prawidłowy.";
 App::$strings["A channel name is required."] = "Wymagana jest nazwa kanału.";
@@ -2694,7 +2653,7 @@ App::$strings["%d years"] = array(
 	1 => "%d lata",
 	2 => "%d lat",
 );
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+App::$strings["timeago.prefixAgo"] = "temu";
 App::$strings["timeago.prefixFromNow"] = "od";
 App::$strings["timeago.suffixAgo"] = "temu";
 App::$strings["timeago.suffixFromNow"] = "temu";
@@ -2805,7 +2764,7 @@ App::$strings["XMPP/IM"] = "XMPP/IM";
 App::$strings["MySpace"] = "MySpace";
 App::$strings["The provided email address is not valid"] = "Podany adres e-mail jest nieprawidłowy";
 App::$strings["The provided email domain is not among those allowed on this site"] = "Podana domena e-mail nie należy do domen dozwolonych w tym portalu";
-App::$strings["The provided email address is already registered at this site"] = "Podany adres e-mail jest już zarejestrowany w tej witrynie";
+App::$strings["The provided email address is already registered at this site"] = "Podany adres e-mail jest już zarejestrowany w tym portalu";
 App::$strings["There is a pending registration for this address - click \"Register\" to continue verification"] = "Oczekuje się na rejestrację tego adresu - kliknij „Zarejestruj się�, aby kontynuować weryfikację";
 App::$strings["An invitation is required."] = "Wymagane jest zaproszenie.";
 App::$strings["Invitation could not be verified."] = "Nie udało się zweryfikować zaproszenia.";
@@ -2846,8 +2805,8 @@ App::$strings["%s shared a %s with you"] = "%s udostępnił Ci %s";
 App::$strings["file"] = "plik";
 App::$strings["New window"] = "Nowe okno";
 App::$strings["Open the selected location in a different window or browser tab"] = "Otwórz wybraną lokalizację w innym oknie lub karcie przeglądarki";
-App::$strings["Home, Voice"] = "Dom, głosowy";
-App::$strings["Home, Fax"] = "Dom, fax";
+App::$strings["Home, Voice"] = "Domowy, głosowy";
+App::$strings["Home, Fax"] = "Domowy, fax";
 App::$strings["Work, Voice"] = "Praca, głosowy";
 App::$strings["Work, Fax"] = "Praca, fax";
 App::$strings["View PDF"] = "Wyświetl PDF";
@@ -2927,14 +2886,9 @@ App::$strings["profile photo"] = "zdjęcie profilowe";
 App::$strings["[Edited %s]"] = "[Edytowane %s]";
 App::$strings["__ctx:edit_activity__ Post"] = "Wpis";
 App::$strings["__ctx:edit_activity__ Comment"] = "Komentarz";
-App::$strings["Response from remote channel was incomplete."] = "Odpowiedź z kanału zdalnego była niekompletna.";
-App::$strings["Premium channel - please visit:"] = "Kanał premium - odwiedź:";
-App::$strings["Channel was deleted and no longer exists."] = "Kanał został usunięty i już nie istnieje.";
-App::$strings["Invalid data packet"] = "Nieprawidłowy pakiet danych";
-App::$strings["invalid target signature"] = "nieprawidłowy podpis docelowy";
 App::$strings["Image/photo"] = "Obraz/zdjęcie";
 App::$strings["Encrypted content"] = "Zaszyfrowana treść";
-App::$strings["Install %1\$s element %2\$s"] = "Zainstaluj element %1\$s %2\$s";
+App::$strings["Install %1\$s element %2\$s"] = "Zainstaluj %2\$s elementu %1\$s";
 App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Ten wpis zawiera możliwy do zainstalowania element %s, jednak nie masz uprawnień do zainstalowania go w tym portalu.";
 App::$strings["card"] = "karta";
 App::$strings["article"] = "artykuł";
@@ -2966,10 +2920,10 @@ App::$strings["Test mode (only send to hub administrator)"] = "Tryb testowy (wys
 App::$strings["Your Webbie:"] = "Twój Webbie:";
 App::$strings["Fontsize (px):"] = "Wielkość czcionki (px):";
 App::$strings["Link:"] = "Link:";
-App::$strings["Like us on Hubzilla"] = "Oceń nas pozytywnie na Hubzilli";
+App::$strings["Like us on Hubzilla"] = "Pochwal nas na Hubzilli";
 App::$strings["Embed:"] = "Osadzone:";
 App::$strings["Save Settings"] = "Zapisz ustawienia";
-App::$strings["text to include in all outgoing posts from this site"] = "tekst do umieszczania we wszystkich wpisach wychodzÄ…cych z tej witryny";
+App::$strings["text to include in all outgoing posts from this site"] = "tekst do umieszczania we wszystkich wpisach wychodzÄ…cych z tego portalu";
 App::$strings["lonely"] = "samotny";
 App::$strings["drunk"] = "pijany";
 App::$strings["horny"] = "seksualnie podniecony";
@@ -2992,7 +2946,7 @@ App::$strings["victorious"] = "zwycięski";
 App::$strings["defeated"] = "pokonany";
 App::$strings["envious"] = "zazdrosny";
 App::$strings["jealous"] = "zazdrosny";
-App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ta witryna jest śledzona za pomocą narzędzia analitycznego <a href='http://www.piwik.org'>Piwik</a>.";
+App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ten portal jest śledzony za pomocą narzędzia analitycznego <a href='http://www.piwik.org'>Piwik</a>.";
 App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Jeśli nie chcesz, aby Twoje wizyty były rejestrowane w ten sposób, <a href='%s'> możesz ustawić plik cookie, aby uniemożliwić Piwik śledzenie dalszych wizyt na stronie </a> (rezygnacja).";
 App::$strings["Piwik Base URL"] = "Bazowy adres URL Piwik";
 App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolutna ścieżka do instalacji Piwik (bez schematu (http/s), z końcowym ukośnikiem)";
@@ -3086,7 +3040,7 @@ App::$strings["TOTP Settings"] = "Ustawienia TOTP";
 App::$strings["Your account on %s will expire in a few days."] = "Twoje konto na %s wygaśnie za kilka dni.";
 App::$strings["Your $Productname test account is about to expire."] = "Twoje konto testowe $Productname wkrótce wygaśnie.";
 App::$strings["An account has been created for you."] = "Konto zostało dla Ciebie utworzone.";
-App::$strings["Authentication successful but rejected: account creation is disabled."] = "Uwierzytelnianie przebiegło pomyślne, ale zostało odrzucone: tworzenie konta jest wyłączone.";
+App::$strings["Authentication successful but rejected: account creation is disabled."] = "Uwierzytelnianie przebiegło pomyślne, ale zostało odrzucone: utworzone konto jest wyłączone.";
 App::$strings["DB Cleanup Failure"] = "BÅ‚Ä…d czyszczenia bazy danych";
 App::$strings["[cart] Item Added"] = "[koszyk] Dodano element";
 App::$strings["Order already checked out."] = "Zamówienie już jest wyrejestrowane.";
@@ -3168,6 +3122,7 @@ App::$strings["Birth Month"] = "MiesiÄ…c urodzenia";
 App::$strings["Birth Day"] = "Dzień urodzenia";
 App::$strings["Birthdate"] = "Data urodzenia";
 App::$strings["OpenID protocol error. No ID returned."] = "Błąd protokołu OpenID. Brak identyfikatora.";
+App::$strings["Welcome %s. Remote authentication successful."] = "Witaj %s. Zdalne uwierzytelnianie powiodło się.";
 App::$strings["Hubzilla File Storage Import"] = "Import z magazynu plików Hubzilla";
 App::$strings["This will import all your cloud files from another server."] = "Spowoduje to zaimportowanie wszystkich plików w chmurze z innego portalu Hubzilla.";
 App::$strings["Hubzilla Server base URL"] = "Bazowy adres URL serwera Hubzilla";
@@ -3178,12 +3133,12 @@ App::$strings["The diaspora protocol does not support location independence. Con
 App::$strings["Diaspora Protocol App"] = "Aplikacja Protokół Diaspora";
 App::$strings["Allow any Diaspora member to comment or like your public posts"] = "Umożliwia członkom Diaspory komentować lub aprobować Twoje publiczne wpisy";
 App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = "Jeśli to ustawienie jest wyłączone, tylko Twoje kontakty będą mogły komentować lub aprobować Twoje publiczne wpisy";
-App::$strings["Prevent your hashtags from being redirected to other sites"] = "Zapobiegaj przekierowywaniu hasztagów do innych witryn";
+App::$strings["Prevent your hashtags from being redirected to other sites"] = "Zapobiegaj przekierowywaniu hasztagów do innych portali";
 App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Podpisuj i przesyłaj dalej wpisy i komentarze bez podpisu Diaspory";
 App::$strings["Followed hashtags (comma separated, do not include the #)"] = "Obserwowane hasztagi (oddzielone przecinkami, nie dodawaj #)";
 App::$strings["Diaspora Protocol"] = "Protokół Diaspora";
 App::$strings["No username found in import file."] = "W pliku importu nie znaleziono nazwy użytkownika.";
-App::$strings["%1\$s dislikes %2\$s's %3\$s"] = "%1\$s ocen negatywnych %2\$s %3\$s";
+App::$strings["%1\$s dislikes %2\$s's %3\$s"] = "%1\$s zganień %2\$s %3\$s";
 App::$strings["Please install the statistics addon to be able to configure a diaspora relay"] = "Zainstaluj dodatek do statystyk, aby móc skonfigurować konektor Diaspory";
 App::$strings["Diaspora Relay Handle"] = "Uchwyt konektora Diaspory";
 App::$strings["Address of a diaspora relay. Example: relay@diasporarelay.tld"] = "Adres konektora diaspory. Przykład: relay@diasporarelay.tld";
@@ -3234,6 +3189,7 @@ App::$strings["Post to Livejournal"] = "Publikuj w Livejournal";
 App::$strings["Posted by"] = "Wysłane przez";
 App::$strings["Workflow user."] = "Przepływ pracy użytkownika.";
 App::$strings["This channel"] = "Ten kanał";
+App::$strings["Create New Workflow Item"] = "Utwórz element przepływu";
 App::$strings["Workflow"] = "Przepływ pracy";
 App::$strings["No Workflows Available"] = "Żaden przepływ nie jest dostępny";
 App::$strings["Add item to which workflow"] = "Dodaj element do przepływu pracy";
@@ -3266,7 +3222,7 @@ App::$strings["%s - view"] = "%s - widok";
 App::$strings["NSFW Settings saved."] = "Zapisano ustawienia NSFW.";
 App::$strings["NSFW App"] = "Aplikacja NSFW";
 App::$strings["Collapse content that contains predefined words"] = "Zwija treść zawierającą określone słowa";
-App::$strings["This app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Ta aplikacja wyszukuje słowa lub tekst, określone poniżej i zwija wszelkie treści zawierające te słowa kluczowe, aby nie były wyświetlane w nieodpowiednich momentach, na przykład, insynuacje seksualne, które mogą być niewłaściwe w miejscu pracy. Grzecznie jest i zaleca się, oznaczanie wszelkich treści zawierających nagość tagiem #NSFW. Ten filtr może również pasować do dowolnego innego określonego słowa lub tekstu, dzięki czemu może być używany jako filtr treści ogólnego przeznaczenia.";
+App::$strings["This app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Ta aplikacja wyszukuje we  wpisach słowa/tekst określone poniżej i zwija wszelkie treści zawierające te słowa, tak aby nie były wyświetlane w nieodpowiednich momentach. Na przykład, podteksty seksualne, mogą być niewłaściwe w środowisku.";
 App::$strings["Comma separated list of keywords to hide"] = "Lista słów kluczowych rozdzielona przecinkami";
 App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Słowo, /wyrażenie regularne/, lang=xx, lang!=xx";
 App::$strings["NSFW"] = "NSFW";
@@ -3283,7 +3239,7 @@ App::$strings["You won!"] = "Wygrałeś!";
 App::$strings["\"Cat\" game!"] = "Gra \"Kot\"!";
 App::$strings["I won!"] = "Wygrałem!";
 App::$strings["Photo Cache settings saved."] = "Zapisano ustawienia pamięci podręcznej zdjęć.";
-App::$strings["Photo Cache addon saves a copy of images from external sites locally to increase your anonymity in the web."] = "Dodatek Photo Cache zapisuje lokalnie kopie obrazów z zewnętrznych witryn, aby zwiększyć Twoją anonimowość w sieci.";
+App::$strings["Photo Cache addon saves a copy of images from external sites locally to increase your anonymity in the web."] = "Dodatek Photo Cache zapisuje lokalnie kopie obrazów z zewnętrznych portali, aby zwiększyć Twoją anonimowość w sieci.";
 App::$strings["Photo Cache App"] = "Aplikacja Bufor zdjęć";
 App::$strings["Minimal photo size for caching"] = "Minimalny rozmiar zdjęcia do buforowania";
 App::$strings["In pixels. From 1 up to 1024, 0 will be replaced with system default."] = "W pikselach. Od 1 do 1024, 0 zostanie zastąpione domyślnymi ustawieniami systemowymi.";
@@ -3304,7 +3260,7 @@ App::$strings["Provide photo edit option to hide inappropriate photos from defau
 App::$strings["Post to GNU social"] = "Publikuj na portalu społecznościowym GNU";
 App::$strings["API URL"] = "Adres URL API";
 App::$strings["Application name"] = "Nazwa aplikacji";
-App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Skontaktuj się z administratorem witryny. <br/> Podany adres URL interfejsu API jest nieprawidłowy.";
+App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Skontaktuj się z administratorem portalu. <br/> Podany adres URL interfejsu API jest nieprawidłowy.";
 App::$strings["We could not contact the GNU social API with the Path you entered."] = "Nie mogliśmy nawiązać połączenia ze społecznościowym API GNU o podanej ścieżce.";
 App::$strings["GNU social settings updated."] = "Ustawienia społecznościowe GNU zostały zaktualizowane.";
 App::$strings["Relay public postings to a connected GNU social account (formerly StatusNet)"] = "Przekazywanie publicznych wpisów na połączone konto społecznościowe GNU (dawniej StatusNet)";
@@ -3329,7 +3285,7 @@ App::$strings["Post to GNU social by default"] = "Wysyłaj domyślnie do społec
 App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Jeśli ta opcja jest włączona, twoje publiczne wpisy będą domyślnie wysyłane na powiązane konto społecznościowe GNU";
 App::$strings["Clear OAuth configuration"] = "Wyczyść konfigurację OAuth";
 App::$strings["GNU-Social Crosspost Connector"] = "GNU-Social Crosspost Connector";
-App::$strings["Who likes me?"] = "Kto mnie lubi?";
+App::$strings["Who likes me?"] = "Kto mnie pochwala?";
 App::$strings["ActivityPub Protocol Settings updated."] = "Zaktualizowano ustawienia ActivityPub Protocol.";
 App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Protokół AactivityPub nie obsługuje niezależności od lokalizacji. Połączenia nawiązane w tej sieci mogą być niedostępne z innych lokalizacji kanałów.";
 App::$strings["Activitypub Protocol App"] = "Aplikacja Protokół Activitypub";
@@ -3350,7 +3306,7 @@ App::$strings["Max queueworker threads"] = "Maksymalna liczba wątków w kolejce
 App::$strings["Minimum 4, default 4"] = "Minimum 4, domyślnie 4";
 App::$strings["Assume workers dead after"] = "Załóż, że workery wygasają po";
 App::$strings["Minimum 120, default 300 seconds"] = "Minimum 120, domyślnie 300 sekund";
-App::$strings["Pause before starting next task"] = "Zatrzymaj się przed rozpoczęciem następnego zadania";
+App::$strings["Pause before starting next task"] = "Zatrzymaj przed rozpoczęciem następnego zadania";
 App::$strings["Minimum 100, default 100 microseconds"] = "Minimum 100, domyślnie 100 mikrosekund";
 App::$strings["Queueworker Settings"] = "Ustawienia Queueworkera";
 App::$strings["Not allowed."] = "Niedozwolone.";
@@ -3365,7 +3321,7 @@ App::$strings["Libravatar addon is installed, too. Please disable Libravatar add
 App::$strings["Default avatar image"] = "Domyślny obraz awatara";
 App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Wybierz domyślny obraz awatara, jeśli nic nie zostało znaleziony w Gravatarze. Zobacz README";
 App::$strings["Rating of images"] = "Ocena zdjęć";
-App::$strings["Select the appropriate avatar rating for your site. See README"] = "Wybierz odpowiedniÄ… ocenÄ™ awatara dla swojej witryny. Zobacz README";
+App::$strings["Select the appropriate avatar rating for your site. See README"] = "Wybierz odpowiedniÄ… ocenÄ™ awatara dla swojego portalu. Zobacz README";
 App::$strings["Gravatar settings updated."] = "Zaktualizowano ustawienia Gravatara.";
 App::$strings["Network error"] = "BÅ‚Ä…d sieci";
 App::$strings["API error"] = "BÅ‚Ä…d API";
@@ -3385,7 +3341,7 @@ App::$strings["Social authentication"] = "Uwierzytelnianie społecznościowe";
 App::$strings["Error while saving provider settings"] = "Błąd podczas zapisywania ustawień dostawcy";
 App::$strings["Custom provider already exists"] = "Własny dostawca już istnieje";
 App::$strings["Social authentication settings saved."] = "Zapisano ustawienia uwierzytelniania społecznościowego.";
-App::$strings["Send your identity to all websites"] = "Wyślij swoją tożsamość do wszystkich witryn internetowych";
+App::$strings["Send your identity to all websites"] = "Wyślij swoją tożsamość do wszystkich portali";
 App::$strings["Sendzid App"] = "Aplikacja Sendzid";
 App::$strings["Send ZID"] = "Wyślij ZID";
 App::$strings["Photos imported"] = "Zdjęcia zaimportowane";
@@ -3401,7 +3357,7 @@ App::$strings["0 or blank to import all available"] = "0 lub puste, aby zaimport
 App::$strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twittera.";
 App::$strings["Twitter Crosspost Connector App"] = "Aplikacja Twitter Crosspost Connector";
 App::$strings["Relay public posts to Twitter"] = "Przekazuj publiczne wpisy na Twitter";
-App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary kluczy klienta dla Twittera. Skontaktuj siÄ™ z administratorem witryny.";
+App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary kluczy klienta dla Twittera. Skontaktuj siÄ™ z administratorem portalu.";
 App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "W tej instancji Hubzilla wtyczka Twittera była włączona, ale nie połączyłeś jeszcze swojego konta z kontem na Twitterze. Aby to zrobić, kliknij poniższy przycisk, aby uzyskać kod PIN z Twittera, który należy skopiować do pola wprowadzania poniżej i przesłać formularz. Na Twitterze będą publikowane tylko Twoje <strong>publiczne</strong> wpisy.";
 App::$strings["Log in with Twitter"] = "Zaloguj siÄ™ za pomocÄ… Twittera";
 App::$strings["Copy the PIN from Twitter here"] = "Skopiuj tutaj PIN z Twittera";
@@ -3447,8 +3403,8 @@ App::$strings["WYSIWYG Status"] = "WYSIWYG Status";
 App::$strings["No server specified"] = "Nie określono serwera";
 App::$strings["Posts imported"] = "Zaimportowano wpisy";
 App::$strings["Files imported"] = "Zaimportowano pliki";
-App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = "Ten dodatek kopiuje istniejące treści i magazyn plików do sklonowanego lub skopiowanego kanału. Po zainstalowaniu, odwiedź nowo zainstalowaną aplikację. Umożliwi Ci to ustawienie lokalizacji oryginalnego kanału i opcjonalnego zakresu dat plików lub konwersacji do skopiowania.";
-App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = "Spowoduje to zaimportowanie wszystkich rozmów i plików przechowywanych w chmurze ze sklonowanego kanału na innym serwerze. Może to chwilę potrwać, jeśli masz dużo wpisów lun plików.";
+App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = "Ta dodatkowa aplikacja kopiuje istniejące treści i magazyn plików do sklonowanego lub skopiowanego kanału. Po zainstalowaniu, odwiedź nowo zainstalowaną aplikację. Umożliwi Ci to ustawienie lokalizacji oryginalnego kanału i opcjonalnego zakresu dat plików lub konwersacji do skopiowania.";
+App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = "Spowoduje to zaimportowanie wszystkich rozmów i plików przechowywanych w chmurze ze sklonowanego kanału na innym serwerze. Może to chwilę potrwać, jeśli masz dużo wpisów lub plików.";
 App::$strings["Include posts"] = "Dołącz wpisy";
 App::$strings["Conversations, Articles, Cards, and other posted content"] = "Rozmowy, artykuły, karty i inne opublikowane treści";
 App::$strings["Include files"] = "Dołącz pliki";
@@ -3506,7 +3462,7 @@ App::$strings["As entered"] = "Jak wprowadzono";
 App::$strings["Order of other"] = "Kolejność innych";
 App::$strings["Sort order of other clipart ids."] = "Kolejność sortowania innych identyfikatorów clipartów.";
 App::$strings["Most downloaded first"] = "Najczęściej pobierane jako pierwsze";
-App::$strings["Most liked first"] = "Najbardziej lubiane jako pierwsze";
+App::$strings["Most liked first"] = "Najbardziej chwalone jako pierwsze";
 App::$strings["Preferred IDs Message"] = "Komunikat o preferowanych identyfikatorach";
 App::$strings["Message to display above preferred results."] = "Wiadomość do wyświetlenia powyżej preferowanych wyników.";
 App::$strings["Uploaded by: "] = "Przesłane przez: ";
@@ -3632,13 +3588,13 @@ App::$strings["Set a preferred page to load on login from home page"] = "Ustaw p
 App::$strings["Page to load after login"] = "Strona do załadowania po zalogowaniu";
 App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Przykłady: &quot;aplikacje&quot;, &quot;sieć?f=&gid=37&quot; (kolekcja prywatności), &quot;kanał&quot; lub &quot;powiadomienie/system&quot; (pozostaw puste dla domyślnej strony sieci.";
 App::$strings["Startpage"] = "Strona poczÄ…tkowa";
-App::$strings["Focus (Hubzilla default)"] = "Fokus (domyślny w Hubzilla)";
+App::$strings["Focus (Hubzilla default)"] = "Fokus (domyślnie Hubzilla)";
 App::$strings["Theme settings"] = "Ustawienia motywu";
 App::$strings["Narrow navbar"] = "WÄ…ski pasek nawigacyjny";
 App::$strings["Navigation bar background color"] = "Kolor tła paska nawigacji";
 App::$strings["Navigation bar icon color "] = "Kolor ikony paska nawigacji ";
 App::$strings["Navigation bar active icon color "] = "Kolor ikony aktywnego paska nawigacji ";
-App::$strings["Link color"] = "Kolor odnośnika";
+App::$strings["Link color"] = "Kolor linku";
 App::$strings["Set font-color for banner"] = "Ustaw kolor czcionki na banerze";
 App::$strings["Set the background color"] = "Ustaw kolor tła";
 App::$strings["Set the background image"] = "Ustaw obraz tła";
@@ -3656,11 +3612,11 @@ App::$strings["Set size of conversation author photo"] = "Ustaw rozmiar zdjęcia
 App::$strings["Set size of followup author photos"] = "Ustaw rozmiar kolejnych zdjęć autora";
 App::$strings["Show advanced settings"] = "Pokaż ustawienia zaawansowane";
 App::$strings["Create an account to access services and applications"] = "Utwórz konto, aby uzyskać dostęp do usług i aplikacji";
-App::$strings["Login/Email"] = "Login/Email";
+App::$strings["Email or nickname"] = "Adres e-mail lub pseudonim";
 App::$strings["Password"] = "Hasło";
 App::$strings["Remember me"] = "Zapamiętaj mnie";
 App::$strings["Forgot your password?"] = "Nie pamiętasz hasła?";
-App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] BÅ‚Ä…d SSL witryny internetowej dla %s";
-App::$strings["Website SSL certificate is not valid. Please correct."] = "Certyfikat SSL witryny jest nieprawidłowy. Proszę popraw.";
+App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] BÅ‚Ä…d SSL portalu dla %s";
+App::$strings["Website SSL certificate is not valid. Please correct."] = "Certyfikat SSL portalu jest nieprawidłowy. Proszę poprawić.";
 App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Zadania Crona nie działają na %s";
 App::$strings["Cron/Scheduled tasks not running."] = "Zadania Crona (zaplanowane) nie działają.";
diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po
index f3d1095e3..eda371c01 100644
--- a/view/ru/hmessages.po
+++ b/view/ru/hmessages.po
@@ -1,15 +1,15 @@
-# hubzilla
-# Copyright (C) 2012-2016 hubzilla
-# This file is distributed under the same license as the hubzilla package.
-# Mike Macgirvin, 2012
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 08:26+0200\n"
-"PO-Revision-Date: 2021-04-29 08:37+0200\n"
+"POT-Creation-Date: 2021-06-19 19:30+0200\n"
+"PO-Revision-Date: 2021-06-10 10:10+0200\n"
 "Last-Translator: Max Kostikov <max@kostikov.co>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/hubzilla/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,8551 +18,7059 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))"
 
-#: ../../view/theme/redbasic/php/config.php:15
-#: ../../addon/cart/submodules/orderoptions.php:335
-#: ../../addon/cart/submodules/orderoptions.php:359
-#: ../../addon/cart/submodules/orderoptions.php:435
-#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3395
-#: ../../Zotlabs/Module/Admin/Site.php:251
-msgid "Default"
-msgstr "По умолчанию"
+#: ../../boot.php:1697
+msgid "Create an account to access services and applications"
+msgstr "Создайте аккаунт дл� до�тупа к �лужбам и приложени�м"
 
-#: ../../view/theme/redbasic/php/config.php:16
-#: ../../view/theme/redbasic/php/config.php:19
-msgid "Focus (Hubzilla default)"
-msgstr "Фоку� (по умолчанию Hubzilla)"
+#: ../../boot.php:1698 ../../Zotlabs/Module/Register.php:542
+#: ../../include/nav.php:168
+msgid "Register"
+msgstr "Реги�траци�"
 
-#: ../../view/theme/redbasic/php/config.php:94
-#: ../../addon/channelreputation/channelreputation.php:143
-#: ../../addon/openclipatar/openclipatar.php:53
-#: ../../addon/photocache/Mod_Photocache.php:67
-#: ../../addon/redred/Mod_Redred.php:90 ../../addon/redphotos/redphotos.php:136
-#: ../../addon/statusnet/Mod_Statusnet.php:193
-#: ../../addon/statusnet/Mod_Statusnet.php:251
-#: ../../addon/statusnet/Mod_Statusnet.php:306
-#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:72
-#: ../../addon/wppost/Mod_Wppost.php:109
-#: ../../addon/content_import/Mod_content_import.php:142
-#: ../../addon/openstreetmap/openstreetmap.php:155
-#: ../../addon/ijpost/Mod_Ijpost.php:72
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:65
-#: ../../addon/dwpost/Mod_Dwpost.php:80
-#: ../../addon/startpage/Mod_Startpage.php:73 ../../addon/mail/Mod_Mail.php:311
-#: ../../addon/twitter/Mod_Twitter.php:184
-#: ../../addon/pumpio/Mod_Pumpio.php:115
-#: ../../addon/cart/submodules/subscriptions.php:410
-#: ../../addon/cart/submodules/hzservices.php:643
-#: ../../addon/cart/submodules/orderoptions.php:312
-#: ../../addon/cart/submodules/orderoptions.php:412
-#: ../../addon/cart/submodules/manualcat.php:248
-#: ../../addon/cart/Settings/Cart.php:132
-#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1376
-#: ../../addon/nofed/Mod_Nofed.php:53
-#: ../../addon/smileybutton/Mod_Smileybutton.php:55
-#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:79
-#: ../../addon/diaspora/Mod_Diaspora.php:102 ../../addon/piwik/piwik.php:95
-#: ../../addon/workflow/workflow.php:1461
-#: ../../addon/workflow/workflow.php:1520
-#: ../../addon/workflow/workflow.php:1639
-#: ../../addon/workflow/workflow.php:2742
-#: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94
-#: ../../addon/likebanner/likebanner.php:57
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/hubwall/hubwall.php:95
-#: ../../addon/flashcards/Mod_Flashcards.php:262
-#: ../../addon/libertree/Mod_Libertree.php:70 ../../addon/logrot/logrot.php:35
-#: ../../addon/skeleton/Mod_Skeleton.php:51
-#: ../../addon/socialauth/Mod_SocialAuth.php:330
-#: ../../addon/nsfw/Mod_Nsfw.php:61 ../../addon/mailtest/mailtest.php:100
-#: ../../addon/ljpost/Mod_Ljpost.php:82 ../../addon/hzfiles/hzfiles.php:86
-#: ../../addon/pageheader/Mod_Pageheader.php:54 ../../addon/irc/irc.php:45
-#: ../../addon/xmpp/Mod_Xmpp.php:70 ../../include/js_strings.php:22
-#: ../../Zotlabs/Widget/Wiki_pages.php:42
-#: ../../Zotlabs/Widget/Wiki_pages.php:99
-#: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:188
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Import.php:647 ../../Zotlabs/Module/Setup.php:306
-#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:151
-#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111
-#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248
-#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259
-#: ../../Zotlabs/Module/Filestorage.php:208
-#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Security.php:120
-#: ../../Zotlabs/Module/Admin/Accounts.php:309
-#: ../../Zotlabs/Module/Admin/Site.php:412
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:178
-#: ../../Zotlabs/Module/Admin/Addons.php:442
-#: ../../Zotlabs/Module/Regate.php:384 ../../Zotlabs/Module/Events.php:501
-#: ../../Zotlabs/Module/Permcats.php:129 ../../Zotlabs/Module/Mood.php:158
-#: ../../Zotlabs/Module/Appman.php:155
-#: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
-#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Profiles.php:725
-#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:168
-#: ../../Zotlabs/Module/Settings/Network.php:62
-#: ../../Zotlabs/Module/Settings/Features.php:48
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-#: ../../Zotlabs/Module/Settings/Account.php:107
-#: ../../Zotlabs/Module/Settings/Events.php:42
-#: ../../Zotlabs/Module/Settings/Manage.php:43
-#: ../../Zotlabs/Module/Settings/Channel_home.php:91
-#: ../../Zotlabs/Module/Settings/Calendar.php:42
-#: ../../Zotlabs/Module/Settings/Display.php:188
-#: ../../Zotlabs/Module/Settings/Directory.php:42
-#: ../../Zotlabs/Module/Settings/Editor.php:42
-#: ../../Zotlabs/Module/Settings/Connections.php:42
-#: ../../Zotlabs/Module/Settings/Photos.php:42
-#: ../../Zotlabs/Module/Settings/Profiles.php:52
-#: ../../Zotlabs/Module/Settings/Conversation.php:49
-#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116
-#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328
-#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108
-#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Connedit.php:897
-#: ../../Zotlabs/Module/Locs.php:132 ../../Zotlabs/Module/Sources.php:125
-#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:827
-#: ../../Zotlabs/Storage/Browser.php:382
-msgid "Submit"
-msgstr "Отправить"
+#: ../../boot.php:1715
+msgid "Email or nickname"
+msgstr "Электронна� почта или п�евдоним"
 
-#: ../../view/theme/redbasic/php/config.php:98
-msgid "Theme settings"
-msgstr "�а�тройки темы"
+#: ../../boot.php:1715 ../../extend/addon/hzaddons/redred/Mod_Redred.php:75
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:54
+msgid "Nickname"
+msgstr "П�евдоним"
 
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Narrow navbar"
-msgstr "Узка� панель навигации"
+#: ../../boot.php:1720 ../../include/nav.php:112 ../../include/nav.php:142
+#: ../../include/nav.php:163
+msgid "Logout"
+msgstr "Выход"
 
-#: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116
-#: ../../addon/channelreputation/channelreputation.php:111
-#: ../../addon/redred/Mod_Redred.php:63
-#: ../../addon/statusnet/Mod_Statusnet.php:260
-#: ../../addon/statusnet/Mod_Statusnet.php:282
-#: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49
-#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90
-#: ../../addon/wppost/Mod_Wppost.php:94
-#: ../../addon/content_import/Mod_content_import.php:137
-#: ../../addon/content_import/Mod_content_import.php:138
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
-#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65
-#: ../../addon/twitter/Mod_Twitter.php:162
-#: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94
-#: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102
-#: ../../addon/cart/submodules/subscriptions.php:153
-#: ../../addon/cart/submodules/subscriptions.php:425
-#: ../../addon/cart/submodules/hzservices.php:65
-#: ../../addon/cart/submodules/hzservices.php:649
-#: ../../addon/cart/submodules/hzservices.php:653
-#: ../../addon/cart/submodules/orderoptions.php:72
-#: ../../addon/cart/submodules/orderoptions.php:338
-#: ../../addon/cart/submodules/orderoptions.php:362
-#: ../../addon/cart/submodules/orderoptions.php:438
-#: ../../addon/cart/submodules/orderoptions.php:462
-#: ../../addon/cart/submodules/paypalbutton.php:87
-#: ../../addon/cart/submodules/paypalbutton.php:95
-#: ../../addon/cart/submodules/paypalbuttonV2.php:88
-#: ../../addon/cart/submodules/paypalbuttonV2.php:96
-#: ../../addon/cart/submodules/manualcat.php:63
-#: ../../addon/cart/submodules/manualcat.php:254
-#: ../../addon/cart/submodules/manualcat.php:258
-#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73
-#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42
-#: ../../addon/smileybutton/Mod_Smileybutton.php:44
-#: ../../addon/diaspora/Mod_Diaspora.php:72
-#: ../../addon/libertree/Mod_Libertree.php:59
-#: ../../addon/socialauth/Mod_SocialAuth.php:214
-#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67
-#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1468
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:636
-#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Import.php:641
-#: ../../Zotlabs/Module/Register.php:536 ../../Zotlabs/Module/Mitem.php:176
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
-#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:203
+#: ../../boot.php:1721 ../../Zotlabs/Lib/Apps.php:337 ../../include/nav.php:127
+#: ../../include/nav.php:131
+msgid "Login"
+msgstr "Войти"
+
+#: ../../boot.php:1722 ../../Zotlabs/Module/Rmagic.php:96
+#: ../../include/channel.php:2545
+msgid "Remote Authentication"
+msgstr "Удаленна� аутентификаци�"
+
+#: ../../boot.php:1725
+msgid "Password"
+msgstr "Пароль"
+
+#: ../../boot.php:1726
+msgid "Remember me"
+msgstr "Запомнить мен�"
+
+#: ../../boot.php:1726 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Module/Profiles.php:682 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:99
-#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Settings/Channel.php:311
 #: ../../Zotlabs/Module/Settings/Display.php:88
+#: ../../Zotlabs/Module/Settings/Channel.php:311
 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
-#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Sources.php:124
-#: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:781 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
+#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Storage/Browser.php:310
+#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312
+#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
+#: ../../Zotlabs/Storage/Browser.php:552 ../../Zotlabs/Lib/Libzotdir.php:165
 #: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
-#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
-#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
-#: ../../boot.php:1721
+#: ../../include/conversation.php:1463 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../include/dir_fns.php:146
+#: ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:111
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:214
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:162
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:171
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:61
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:73
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:88
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:96
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:63
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:254
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:258
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:72
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:338
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:362
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:438
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:462
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:66
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:650
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:654
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:87
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:95
+#: ../../extend/addon/hzaddons/cart/cart.php:1370
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:86
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:90
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:94
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:42
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:63
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:260
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:282
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:291
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:45
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:72
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:49
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:44
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:63
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:67
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:71
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:102
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:59
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:138
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:61
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:65
 msgid "No"
 msgstr "�ет"
 
-#: ../../view/theme/redbasic/php/config.php:99
-#: ../../view/theme/redbasic/php/config.php:116
-#: ../../addon/channelreputation/channelreputation.php:111
-#: ../../addon/redred/Mod_Redred.php:63
-#: ../../addon/statusnet/Mod_Statusnet.php:260
-#: ../../addon/statusnet/Mod_Statusnet.php:282
-#: ../../addon/statusnet/Mod_Statusnet.php:291 ../../addon/rtof/Mod_Rtof.php:49
-#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/wppost/Mod_Wppost.php:90
-#: ../../addon/wppost/Mod_Wppost.php:94
-#: ../../addon/content_import/Mod_content_import.php:137
-#: ../../addon/content_import/Mod_content_import.php:138
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:45
-#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65
-#: ../../addon/twitter/Mod_Twitter.php:162
-#: ../../addon/twitter/Mod_Twitter.php:171 ../../addon/pumpio/Mod_Pumpio.php:94
-#: ../../addon/pumpio/Mod_Pumpio.php:98 ../../addon/pumpio/Mod_Pumpio.php:102
-#: ../../addon/cart/submodules/subscriptions.php:153
-#: ../../addon/cart/submodules/subscriptions.php:425
-#: ../../addon/cart/submodules/hzservices.php:65
-#: ../../addon/cart/submodules/hzservices.php:649
-#: ../../addon/cart/submodules/hzservices.php:653
-#: ../../addon/cart/submodules/orderoptions.php:72
-#: ../../addon/cart/submodules/orderoptions.php:337
-#: ../../addon/cart/submodules/orderoptions.php:361
-#: ../../addon/cart/submodules/orderoptions.php:437
-#: ../../addon/cart/submodules/orderoptions.php:461
-#: ../../addon/cart/submodules/paypalbutton.php:87
-#: ../../addon/cart/submodules/paypalbutton.php:95
-#: ../../addon/cart/submodules/paypalbuttonV2.php:88
-#: ../../addon/cart/submodules/paypalbuttonV2.php:96
-#: ../../addon/cart/submodules/manualcat.php:63
-#: ../../addon/cart/submodules/manualcat.php:254
-#: ../../addon/cart/submodules/manualcat.php:258
-#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73
-#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42
-#: ../../addon/smileybutton/Mod_Smileybutton.php:44
-#: ../../addon/diaspora/Mod_Diaspora.php:72
-#: ../../addon/libertree/Mod_Libertree.php:59
-#: ../../addon/socialauth/Mod_SocialAuth.php:214
-#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67
-#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1468
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:636
-#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Import.php:641
-#: ../../Zotlabs/Module/Register.php:536 ../../Zotlabs/Module/Mitem.php:176
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
-#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:203
+#: ../../boot.php:1726 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Module/Profiles.php:682 ../../Zotlabs/Module/Defperms.php:198
+#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Admin/Site.php:321 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:98
-#: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683
-#: ../../Zotlabs/Module/Settings/Channel.php:311
 #: ../../Zotlabs/Module/Settings/Display.php:88
+#: ../../Zotlabs/Module/Settings/Channel.php:311
 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226
-#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Module/Import.php:571 ../../Zotlabs/Module/Import.php:575
+#: ../../Zotlabs/Module/Import.php:576 ../../Zotlabs/Module/Connedit.php:401
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
+#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../Zotlabs/Module/Wiki.php:226 ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311
+#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389
+#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552
 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312
-#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391
-#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1721
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../include/dir_fns.php:146 ../../view/theme/redbasic/php/config.php:99
+#: ../../view/theme/redbasic/php/config.php:116
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:111
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:214
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:162
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:171
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:61
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:73
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:88
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:96
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:63
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:254
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:258
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:72
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:337
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:361
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:437
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:461
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:66
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:650
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:654
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:153
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:425
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:87
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:95
+#: ../../extend/addon/hzaddons/cart/cart.php:1370
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:86
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:90
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:94
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:42
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:63
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:260
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:282
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:291
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:45
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:72
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:49
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:44
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:63
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:67
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:71
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:102
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:59
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:138
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:61
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:65
 msgid "Yes"
 msgstr "Да"
 
-#: ../../view/theme/redbasic/php/config.php:100
-msgid "Navigation bar background color"
-msgstr "Панель навигации, цвет фона"
-
-#: ../../view/theme/redbasic/php/config.php:101
-msgid "Navigation bar icon color "
-msgstr "Панель навигации, цвет значков"
+#: ../../boot.php:1729
+msgid "Forgot your password?"
+msgstr "Забыли пароль или логин?"
 
-#: ../../view/theme/redbasic/php/config.php:102
-msgid "Navigation bar active icon color "
-msgstr "Панель навигации, цвет активного значка"
+#: ../../boot.php:1730 ../../Zotlabs/Module/Lostpass.php:91
+msgid "Password Reset"
+msgstr "Сбро�ить пароль"
 
-#: ../../view/theme/redbasic/php/config.php:103
-msgid "Link color"
-msgstr "Цвет ��ылок"
+#: ../../boot.php:2608
+#, php-format
+msgid "[$Projectname] Website SSL error for %s"
+msgstr "[$Projectname] Ошибка SSL/TLS веб-�айта дл� %s"
 
-#: ../../view/theme/redbasic/php/config.php:104
-msgid "Set font-color for banner"
-msgstr "Цвет тек�та в шапке"
+#: ../../boot.php:2613
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr "SSL/TLS �ертификат веб-�айт недей�твителен. И�правьте �то."
 
-#: ../../view/theme/redbasic/php/config.php:105
-msgid "Set the background color"
-msgstr "Цвет фона"
+#: ../../boot.php:2729
+#, php-format
+msgid "[$Projectname] Cron tasks not running on %s"
+msgstr "[$Projectname] Задани� Cron не запущены на %s"
 
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Set the background image"
-msgstr "Фоновое изображение"
+#: ../../boot.php:2734
+msgid "Cron/Scheduled tasks not running."
+msgstr "Задани� Cron / планировщика не запущены."
 
-#: ../../view/theme/redbasic/php/config.php:107
-msgid "Set the background color of items"
-msgstr "Цвет фона �лементов"
+#: ../../boot.php:2735 ../../include/datetime.php:238
+msgid "never"
+msgstr "никогда"
 
-#: ../../view/theme/redbasic/php/config.php:108
-msgid "Set the background color of comments"
-msgstr "Цвет фона комментариев"
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Block.php:24
+#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Channel.php:222
+#: ../../Zotlabs/Module/Channel.php:378 ../../Zotlabs/Module/Channel.php:417
+#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Photos.php:71
+#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Item.php:506
+#: ../../Zotlabs/Module/Item.php:525 ../../Zotlabs/Module/Item.php:535
+#: ../../Zotlabs/Module/Item.php:1446 ../../Zotlabs/Module/Sources.php:80
+#: ../../Zotlabs/Module/Poke.php:157 ../../Zotlabs/Module/Card_edit.php:51
+#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:636
+#: ../../Zotlabs/Module/Connections.php:32
+#: ../../Zotlabs/Module/Profile_photo.php:338
+#: ../../Zotlabs/Module/Profile_photo.php:351
+#: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Page.php:34
+#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Defperms.php:182
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Article_edit.php:51
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Filestorage.php:20
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:96
+#: ../../Zotlabs/Module/Filestorage.php:119
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Pdledit.php:35
+#: ../../Zotlabs/Module/Chat.php:113 ../../Zotlabs/Module/Chat.php:118
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Locs.php:98
+#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
+#: ../../Zotlabs/Module/Cover_photo.php:341
+#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Network.php:19
+#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/New_channel.php:105
+#: ../../Zotlabs/Module/New_channel.php:130 ../../Zotlabs/Module/Cards.php:86
+#: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141
+#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Thing.php:282
+#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
+#: ../../Zotlabs/Module/Webpages.php:133 ../../Zotlabs/Module/Moderate.php:15
+#: ../../Zotlabs/Module/Group.php:15 ../../Zotlabs/Module/Group.php:31
+#: ../../Zotlabs/Module/Profile.php:99 ../../Zotlabs/Module/Profile.php:114
+#: ../../Zotlabs/Module/Connedit.php:394 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Articles.php:89
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Display.php:420 ../../Zotlabs/Module/Setup.php:208
+#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Mood.php:126
+#: ../../Zotlabs/Module/Channel_calendar.php:232
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Sharedwithme.php:19
+#: ../../Zotlabs/Module/Authtest.php:13 ../../Zotlabs/Module/Regmod.php:20
+#: ../../Zotlabs/Module/Service_limits.php:11
+#: ../../Zotlabs/Module/Attach_edit.php:90
+#: ../../Zotlabs/Module/Attach_edit.php:99
+#: ../../Zotlabs/Module/Attach_edit.php:106
+#: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Wiki.php:59
+#: ../../Zotlabs/Module/Wiki.php:284 ../../Zotlabs/Module/Wiki.php:427
+#: ../../Zotlabs/Lib/Chatroom.php:135 ../../Zotlabs/Web/WebServer.php:118
+#: ../../include/photos.php:27 ../../include/items.php:3744
+#: ../../include/attach.php:156 ../../include/attach.php:205
+#: ../../include/attach.php:278 ../../include/attach.php:329
+#: ../../include/attach.php:424 ../../include/attach.php:438
+#: ../../include/attach.php:445 ../../include/attach.php:527
+#: ../../include/attach.php:1091 ../../include/attach.php:1164
+#: ../../include/attach.php:1327
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:53
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:44
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:22
+#: ../../extend/addon/hzaddons/keepout/keepout.php:36
+msgid "Permission denied."
+msgstr "До�туп запрещен."
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Set font-size for the entire application"
-msgstr "У�тановить �и�темный размер шрифта"
+#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Admin/Themes.php:72
+#: ../../Zotlabs/Module/Admin/Addons.php:260 ../../Zotlabs/Module/Admin.php:61
+#: ../../Zotlabs/Module/Filestorage.php:29 ../../Zotlabs/Module/Thing.php:96
+#: ../../Zotlabs/Module/Display.php:42 ../../Zotlabs/Module/Display.php:424
+#: ../../include/items.php:3667
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:284
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:285
+msgid "Item not found."
+msgstr "Элемент не найден."
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Examples: 1rem, 100%, 16px"
-msgstr "�апример: 1rem, 100%, 16px"
+#: ../../Zotlabs/Module/Viewsrc.php:43
+msgid "item"
+msgstr "пункт"
 
-#: ../../view/theme/redbasic/php/config.php:110
-msgid "Set font-color for posts and comments"
-msgstr "Цвет шрифта дл� публикаций и комментариев"
+#: ../../Zotlabs/Module/Z6trans.php:19
+msgid "Update to Hubzilla 5.0 step 2"
+msgstr "Обновление Hubzilla 5.0, �тап 2"
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Set radius of corners"
-msgstr "Радиу� �круглений"
+#: ../../Zotlabs/Module/Z6trans.php:21
+msgid "To complete the update please run"
+msgstr "Дл� завершени� обновлени� пожалуй�та выполните"
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Example: 4px"
-msgstr "�апример: 4px"
+#: ../../Zotlabs/Module/Z6trans.php:23
+msgid "php util/z6convert.php"
+msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Set shadow depth of photos"
-msgstr "Глубина теней фотографий"
+#: ../../Zotlabs/Module/Z6trans.php:25
+msgid "from the terminal."
+msgstr "из терминала."
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Set maximum width of content region in pixel"
-msgstr "Мак�имальна� ширина �одержани� региона (в пик�ел�х)"
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Leave empty for default width"
-msgstr "О�тавьте пу�тым дл� ширины по умолчанию"
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Удалить �тот аккаунт"
 
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Set size of conversation author photo"
-msgstr "Размер фотографии автора бе�еды"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Changeaddr.php:78 ../../Zotlabs/Module/Removeme.php:61
+msgid "WARNING: "
+msgstr "ПРЕДУПРЕЖДЕ�ИЕ: "
 
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Set size of followup author photos"
-msgstr "Размер фотографий подпи�чиков"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr "Этот аккаунт и в�е его каналы будут полно�тью удалены из �ети."
 
-#: ../../view/theme/redbasic/php/config.php:116
-msgid "Show advanced settings"
-msgstr "Показать ра�ширенные на�тройки"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action is permanent and can not be undone!"
+msgstr "Это дей�твие необратимо и не может быть отменено!"
 
-#: ../../util/nconfig.php:34
-msgid "Source channel not found."
-msgstr "Канал-и�точник не найден."
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Changeaddr.php:79 ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
+msgstr "Пожалуй�та, введите ваш пароль дл� проверки:"
 
-#: ../../addon/channelreputation/channelreputation.php:101
-#: ../../addon/channelreputation/channelreputation.php:102
-#: ../../addon/cart/myshop.php:144 ../../addon/cart/myshop.php:180
-#: ../../addon/cart/myshop.php:214 ../../addon/cart/myshop.php:261
-#: ../../addon/cart/myshop.php:296 ../../addon/cart/myshop.php:319
-msgid "Access Denied"
-msgstr "До�туп запрещён"
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:109
+msgid "Remove Account"
+msgstr "Удалить аккаунт"
 
-#: ../../addon/channelreputation/channelreputation.php:109
-msgid "Enable Community Moderation"
-msgstr "Включить модерацию �ообще�тва"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "�евозможно найти ваш �ервер"
 
-#: ../../addon/channelreputation/channelreputation.php:117
-msgid "Reputation automatically given to new members"
-msgstr "Репутаци� автоматиче�ки предо�тавл�ема� новым уча�тникам"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "У�пешно опубликовано."
 
-#: ../../addon/channelreputation/channelreputation.php:118
-msgid "Reputation will never fall below this value"
-msgstr "Репутаци� никогда не упадёт ниже �того значени�"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid "Channel Export App"
+msgstr "Приложение \"Эк�порт канала\""
 
-#: ../../addon/channelreputation/channelreputation.php:119
-msgid "Minimum reputation before posting is allowed"
-msgstr "Минимальна� репутаци� дл� разрешени� возможно�ти размещать публикации"
+#: ../../Zotlabs/Module/Uexport.php:62 ../../Zotlabs/Module/Sources.php:88
+#: ../../Zotlabs/Module/Poke.php:165 ../../Zotlabs/Module/Cdav.php:877
+#: ../../Zotlabs/Module/Oauth.php:100 ../../Zotlabs/Module/Bookmarks.php:78
+#: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Suggest.php:40
+#: ../../Zotlabs/Module/Permcats.php:63 ../../Zotlabs/Module/Pdledit.php:43
+#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Invite.php:56
+#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Affinity.php:52
+#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Pubstream.php:20
+#: ../../Zotlabs/Module/Notes.php:56 ../../Zotlabs/Module/Webpages.php:48
+#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Articles.php:52
+#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Mood.php:134
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
+#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Wiki.php:52
+#: ../../Zotlabs/Module/Tokens.php:99
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:42
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:78
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:43
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:33
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:58
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:34
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:50
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:28
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:146
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:50
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:20
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:32
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:40
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:58
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:21
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:36
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:35
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:33
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:38
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:23
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:53
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:20
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:35
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:21
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:35
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:34
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:35
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:39
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:21
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:20
+msgid "Not Installed"
+msgstr "не у�тановлено"
 
-#: ../../addon/channelreputation/channelreputation.php:120
-msgid "Minimum reputation before commenting is allowed"
-msgstr "Минимальна� репутаци� дл� разрешени� комментировани�"
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your channel"
+msgstr "Эк�портировать ваш канал"
 
-#: ../../addon/channelreputation/channelreputation.php:121
-msgid "Minimum reputation before a member is able to moderate other posts"
-msgstr "Минимальна� репутаци� дл� возможно�ти модерировани� уча�тником чужих публикаций"
+#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74
+msgid "Export Channel"
+msgstr "Эк�порт канала"
 
-#: ../../addon/channelreputation/channelreputation.php:122
+#: ../../Zotlabs/Module/Uexport.php:75
 msgid ""
-"Max ratio of moderator's reputation that can be added to/deducted from "
-"reputation of person being moderated"
-msgstr "Мак�имальное �оотношение репутации модератора, которое может быть добавлено / вычтено из репутации модерируемого уча�тника"
-
-#: ../../addon/channelreputation/channelreputation.php:123
-msgid "Reputation \"cost\" to post"
-msgstr "\"Стоимо�ть\" репутации дл� публикации"
+"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 "Эк�портировать о�новную информацию из канала в файл. Служит в каче�тве резервной копии ваших контактов, о�новных данных и профил�, однако не включает �одержимое. Может быть и�пользовано дл� импорта ваши данных на новый �ервер."
 
-#: ../../addon/channelreputation/channelreputation.php:124
-msgid "Reputation \"cost\" to comment"
-msgstr "\"Стоимо�ть\" репутации дл� комментировани�"
+#: ../../Zotlabs/Module/Uexport.php:76
+msgid "Export Content"
+msgstr "Эк�портировать �одержимое"
 
-#: ../../addon/channelreputation/channelreputation.php:125
+#: ../../Zotlabs/Module/Uexport.php:77
 msgid ""
-"Reputation automatically recovers at this rate per hour until it reaches "
-"minimum_to_post"
-msgstr "Репутаци� автоматиче�ки во��танавливает�� � �той �коро�тью в ча� пока не до�тигает значени� minimum_to_post"
+"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 "Эк�портировать информацию из вашего канала и его �одержимое в резервную копию в формате JSON котора� может быть и�пользована дл� во��тановлени� или импорта на другом �ервере. Сохран�ет в�е ваши контакты, разрешени�, данные профил� и публикации за не�колько ме��цев. Файл может иметь очень большой размер. Пожалуй�та, будьте терпеливы и подождите не�колько минут пока не начнёт�� загрузка."
 
-#: ../../addon/channelreputation/channelreputation.php:126
-msgid ""
-"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
-"at this rate per hour"
-msgstr "При minimum_to_moderate > репутаци� > minimum_to_post репутаци� во��танавливает�� � �той �коро�тью в ча�"
+#: ../../Zotlabs/Module/Uexport.php:79
+msgid "Export your posts from a given year."
+msgstr "Эк�портировать ваши публикации за данный год."
 
-#: ../../addon/channelreputation/channelreputation.php:140
-msgid "Community Moderation Settings"
-msgstr "�а�тройки модерировани� �ообще�тва"
+#: ../../Zotlabs/Module/Uexport.php:81
+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 "Вы также можете �к�портировать ваши публикации и бе�еды за определённый ме��ц или год. Выберите дату в панели ме�тоположени� в браузере. Е�ли �к�порт будет неудачным (�то возможно, например, из-за и�черпани� пам�ти на �ервере), повторите попытку, выбрав меньший диапазон дат."
 
-#: ../../addon/channelreputation/channelreputation.php:232
-msgid "Channel Reputation"
-msgstr "Репутаци� канала"
+#: ../../Zotlabs/Module/Uexport.php:82
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
+msgstr "Дл� выбора в�ех публикаций заданного года, например текущего, по�етите <a href=\"%1$s\">%2$s</a>"
 
-#: ../../addon/channelreputation/channelreputation.php:233
-#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:158
-#: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Lib/ThreadItem.php:497
-#: ../../Zotlabs/Storage/Browser.php:411
-msgid "Close"
-msgstr "Закрыть"
+#: ../../Zotlabs/Module/Uexport.php:83
+#, 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 "Дл� выбора в�ех публикаций заданного ме��ца, например за �нварь �его года, по�етите <a href=\"%1$s\">%2$s</a>"
 
-#: ../../addon/channelreputation/channelreputation.php:236
-msgid "An Error has occurred."
-msgstr "Произошла ошибка."
+#: ../../Zotlabs/Module/Uexport.php:84
+#, 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 "Данные файлы � �одержимым могут быть импортированы и во��тановлены на любом �одержащем ваш канал �айте. По�етите <a href=\"%1$s\">%2$s</a>. Дл� лучших результатов пожалуй�та производите импорт и во��тановление в пор�дке датировки (�тарые �начала)."
 
-#: ../../addon/channelreputation/channelreputation.php:254
-msgid "Upvote"
-msgstr "За"
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
+msgstr "�ет на ме�те"
 
-#: ../../addon/channelreputation/channelreputation.php:255
-msgid "Downvote"
-msgstr "Против"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
+msgstr "В �ети"
 
-#: ../../addon/channelreputation/channelreputation.php:414
-msgid "Can moderate reputation on my channel."
-msgstr "Может модерировать репутацию на моём канале"
+#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39
+msgid "Invalid item."
+msgstr "�едей�твительный �лемент."
 
-#: ../../addon/superblock/superblock.php:337
-msgid "Block Completely"
-msgstr "Заблокировать полно�тью"
+#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Card_edit.php:44
+#: ../../Zotlabs/Module/Chanview.php:95 ../../Zotlabs/Module/Page.php:75
+#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:31
+#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Attach.php:22
+#: ../../Zotlabs/Module/Attach_edit.php:52
+msgid "Channel not found."
+msgstr "Канал не найден."
 
-#: ../../addon/superblock/Mod_Superblock.php:21
-msgid "Superblock App"
-msgstr "Приложение Superblock"
+#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Module/Page.php:136
+#: ../../Zotlabs/Module/Display.php:136 ../../Zotlabs/Module/Display.php:153
+#: ../../Zotlabs/Module/Display.php:173 ../../Zotlabs/Module/Display.php:179
+#: ../../Zotlabs/Lib/NativeWikiPage.php:533 ../../Zotlabs/Web/Router.php:186
+#: ../../include/help.php:133
+msgid "Page not found."
+msgstr "Страница не найдена."
 
-#: ../../addon/superblock/Mod_Superblock.php:21
-#: ../../addon/nsabait/Mod_Nsabait.php:20
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
-#: ../../addon/photocache/Mod_Photocache.php:42
-#: ../../addon/gallery/Mod_Gallery.php:58
-#: ../../addon/planets/Mod_Planets.php:20 ../../addon/redred/Mod_Redred.php:50
-#: ../../addon/statusnet/Mod_Statusnet.php:146 ../../addon/rtof/Mod_Rtof.php:36
-#: ../../addon/wppost/Mod_Wppost.php:43 ../../addon/hsse/Mod_Hsse.php:21
-#: ../../addon/ijpost/Mod_Ijpost.php:35
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:40
-#: ../../addon/dwpost/Mod_Dwpost.php:39
-#: ../../addon/startpage/Mod_Startpage.php:50
-#: ../../addon/twitter/Mod_Twitter.php:78 ../../addon/pumpio/Mod_Pumpio.php:53
-#: ../../addon/sendzid/Mod_Sendzid.php:20 ../../addon/nofed/Mod_Nofed.php:33
-#: ../../addon/smileybutton/Mod_Smileybutton.php:35
-#: ../../addon/diaspora/Mod_Diaspora.php:58
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:34
-#: ../../addon/libertree/Mod_Libertree.php:35
-#: ../../addon/hideaside/Mod_Hideaside.php:23
-#: ../../addon/skeleton/Mod_Skeleton.php:32 ../../addon/nsfw/Mod_Nsfw.php:33
-#: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/ljpost/Mod_Ljpost.php:38
-#: ../../addon/authchoose/Mod_Authchoose.php:28
-#: ../../addon/pageheader/Mod_Pageheader.php:34
-#: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99
-#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165
-#: ../../Zotlabs/Module/Cdav.php:877 ../../Zotlabs/Module/Webpages.php:48
-#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63
-#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:62
-#: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Cards.php:51
-#: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Bookmarks.php:78
-#: ../../Zotlabs/Module/Probe.php:19 ../../Zotlabs/Module/Invite.php:56
-#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Notes.php:57
-#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:190
-#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29
-#: ../../Zotlabs/Module/Pdledit.php:43 ../../Zotlabs/Module/Wiki.php:52
-#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Sources.php:88
-msgid "Not Installed"
-msgstr "не у�тановлено"
+#: ../../Zotlabs/Module/Channel.php:44 ../../Zotlabs/Module/Ochannel.php:32
+#: ../../Zotlabs/Module/Chat.php:29
+msgid "You must be logged in to see this page."
+msgstr "Вы должны авторизовать��, чтобы увидеть �ту �траницу."
 
-#: ../../addon/superblock/Mod_Superblock.php:22
-msgid "Block channels"
-msgstr "Заблокировать каналы"
+#: ../../Zotlabs/Module/Channel.php:144 ../../Zotlabs/Module/Profile.php:62
+#: ../../Zotlabs/Module/Hcard.php:37
+msgid "Posts and comments"
+msgstr "Публикации и комментарии"
 
-#: ../../addon/superblock/Mod_Superblock.php:64
-msgid "superblock settings updated"
-msgstr "�а�тройки Superblock обновлены."
+#: ../../Zotlabs/Module/Channel.php:151 ../../Zotlabs/Module/Profile.php:69
+#: ../../Zotlabs/Module/Hcard.php:44
+msgid "Only posts"
+msgstr "Только публикации"
 
-#: ../../addon/superblock/Mod_Superblock.php:88
-msgid "Currently blocked"
-msgstr "В на�то�щее врем� заблокирован"
+#: ../../Zotlabs/Module/Channel.php:219
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "�едо�таточно прав. Запро� перенаправлен на �траницу профил�."
 
-#: ../../addon/superblock/Mod_Superblock.php:90
-msgid "No channels currently blocked"
-msgstr "В на�то�щее врем� никакие каналы не блокируют��"
+#: ../../Zotlabs/Module/Channel.php:234 ../../Zotlabs/Module/Network.php:168
+msgid "Search Results For:"
+msgstr "Результаты пои�ка дл�:"
 
-#: ../../addon/superblock/Mod_Superblock.php:92
-#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459
-#: ../../Zotlabs/Module/Profile_photo.php:501
-#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:996
-msgid "Remove"
-msgstr "Удалить"
+#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Network.php:209
+#: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76
+#: ../../Zotlabs/Module/Hq.php:113
+msgid "Reset form"
+msgstr "Очи�тить форму"
 
-#: ../../addon/nsabait/Mod_Nsabait.php:20
-#: ../../addon/nsabait/Mod_Nsabait.php:24
-msgid "NSA Bait App"
-msgstr "Приложение NSA Bait"
+#: ../../Zotlabs/Module/Channel.php:496 ../../Zotlabs/Module/Display.php:354
+msgid ""
+"You must enable javascript for your browser to be able to view this content."
+msgstr "Дл� про�мотра �того �одержимого в вашем браузере должен быть включён JavaScript"
 
-#: ../../addon/nsabait/Mod_Nsabait.php:24
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:26
-#: ../../addon/planets/Mod_Planets.php:23 ../../addon/hsse/Mod_Hsse.php:26
-#: ../../addon/hideaside/Mod_Hideaside.php:27
-#: ../../addon/authchoose/Mod_Authchoose.php:33
-msgid "Installed"
-msgstr "У�тановлено"
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of Pinned Navbar Apps"
+msgstr "Изменить пор�док приложений на панели навигации"
 
-#: ../../addon/nsabait/Mod_Nsabait.php:26
-msgid "Make yourself a political target"
-msgstr "Сделать �еб� политиче�кой мишенью"
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of App Tray Apps"
+msgstr "Изменить пор�док приложений в лотке"
 
-#: ../../addon/visage/Mod_Visage.php:21
-msgid "Who viewed my channel/profile"
-msgstr "Кто �мотрел мой канал / профиль"
+#: ../../Zotlabs/Module/Apporder.php:48
+msgid ""
+"Use arrows to move the corresponding app left (top) or right (bottom) in the "
+"navbar"
+msgstr "И�пользуйте �трелки дл� перемещени� приложени� влево (вверх) или вправо (вниз) в панели навигации"
 
-#: ../../addon/visage/Mod_Visage.php:25
-msgid "Recent Channel/Profile Viewers"
-msgstr "По�ледние про�мотры канала / профил�"
+#: ../../Zotlabs/Module/Apporder.php:48
+msgid "Use arrows to move the corresponding app up or down in the app tray"
+msgstr "И�пользуйте �трелки дл� перемещени� приложени� вверх или вниз в лотке"
 
-#: ../../addon/visage/Mod_Visage.php:36
-msgid "No entries."
-msgstr "�ет запи�ей."
+#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:211
+msgid "Nickname is required."
+msgstr "Требует�� п�евдоним."
 
-#: ../../addon/openclipatar/openclipatar.php:50
-#: ../../addon/openclipatar/openclipatar.php:128
-msgid "System defaults:"
-msgstr "Си�темные по умолчанию:"
+#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
+#: ../../include/channel.php:225 ../../include/channel.php:657
+msgid "Reserved nickname. Please choose another."
+msgstr "Зарезервированый п�евдоним. Пожалуй�та, выберите другой."
 
-#: ../../addon/openclipatar/openclipatar.php:54
-msgid "Preferred Clipart IDs"
-msgstr "Предпочитаемый Clipart ID"
+#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51
+#: ../../include/channel.php:230 ../../include/channel.php:662
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "П�евдоним имеет недопу�тимые �имволы или уже и�пользует�� на �том �айте."
 
-#: ../../addon/openclipatar/openclipatar.php:54
-msgid "List of preferred clipart ids. These will be shown first."
-msgstr "Спи�ок предпочитаемых Clipart ID. Эти будут показаны первыми."
+#: ../../Zotlabs/Module/Register.php:112
+msgid "Email address required"
+msgstr "Требует�� адре� �лектронной почты"
 
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "Default Search Term"
-msgstr "У�ловие пои�ка по умолчанию"
+#: ../../Zotlabs/Module/Register.php:156
+msgid "No password provided"
+msgstr "Пароль не указан"
 
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "The default search term. These will be shown second."
-msgstr "У�ловие пои�ка по умолчанию. Показывают�� во вторую очередь."
+#: ../../Zotlabs/Module/Register.php:161 ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr "Пароли не �овпадают"
 
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "Return After"
-msgstr "Вернуть�� по�ле"
+#: ../../Zotlabs/Module/Register.php:179
+msgid "Terms of Service not accepted"
+msgstr "У�лови� и�пользовани� не были прин�ты"
 
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "Page to load after image selection."
-msgstr "Страница дл� загрузки по�ле выбора изображени�."
+#: ../../Zotlabs/Module/Register.php:241
+msgid "Invitation code succesfully applied"
+msgstr "Код приглашени� прин�т у�пешно"
 
-#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:115
-#: ../../include/conversation.php:1083 ../../Zotlabs/Module/Connedit.php:601
-#: ../../Zotlabs/Lib/Apps.php:344
-msgid "View Profile"
-msgstr "Про�мотреть профиль"
+#: ../../Zotlabs/Module/Register.php:261
+msgid "Invitation not in time or too late"
+msgstr "Приглашение и�текло или введено не воврем�"
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:120
-#: ../../include/channel.php:1567
-msgid "Edit Profile"
-msgstr "Редактировать профиль"
+#: ../../Zotlabs/Module/Register.php:267
+msgid "Invitation email failed"
+msgstr "�е удало�ь отправить пи�ьмо � приглашением "
 
-#: ../../addon/openclipatar/openclipatar.php:59
-msgid "Profile List"
-msgstr "Спи�ок профилей"
+#: ../../Zotlabs/Module/Register.php:275
+msgid "Invitation code failed"
+msgstr "�еверный код приглашени�"
 
-#: ../../addon/openclipatar/openclipatar.php:61
-msgid "Order of Preferred"
-msgstr "Пор�док предпочтени�"
+#: ../../Zotlabs/Module/Register.php:282
+msgid "Invitations are not available"
+msgstr "Приглашени� не до�тупны"
 
-#: ../../addon/openclipatar/openclipatar.php:61
-msgid "Sort order of preferred clipart ids."
-msgstr "Пор�док �ортировки предпочитаемых Clipart ID. "
+#: ../../Zotlabs/Module/Register.php:292
+msgid "Registration on this hub is by invitation only"
+msgstr "Реги�траци� на �том хабе возможна только по приглашени�м"
 
-#: ../../addon/openclipatar/openclipatar.php:62
-#: ../../addon/openclipatar/openclipatar.php:68
-msgid "Newest first"
-msgstr "�овое первым"
+#: ../../Zotlabs/Module/Register.php:328 ../../include/account.php:435
+#: ../../include/account.php:503
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Подтверждение реги�трации на %s"
 
-#: ../../addon/openclipatar/openclipatar.php:65
-msgid "As entered"
-msgstr "По мере ввода"
+#: ../../Zotlabs/Module/Register.php:399
+msgid "New register request"
+msgstr "�овый запро� на реги�трацию"
 
-#: ../../addon/openclipatar/openclipatar.php:67
-msgid "Order of other"
-msgstr "Пор�док других"
+#: ../../Zotlabs/Module/Register.php:417
+msgid "Error creating dId A"
+msgstr "Ошибка �оздани� dId A"
 
-#: ../../addon/openclipatar/openclipatar.php:67
-msgid "Sort order of other clipart ids."
-msgstr "Пор�док �ортировки о�тальных Clipart ID."
+#: ../../Zotlabs/Module/Register.php:435
+msgid "Registration on this hub is disabled."
+msgstr "Реги�траци� на �том хабе отключена."
 
-#: ../../addon/openclipatar/openclipatar.php:69
-msgid "Most downloaded first"
-msgstr "Самое загружаемое первым"
+#: ../../Zotlabs/Module/Register.php:444
+msgid "Registration on this hub is by approval only."
+msgstr "Реги�траци� на �том хабе только � одобрени�."
 
-#: ../../addon/openclipatar/openclipatar.php:70
-msgid "Most liked first"
-msgstr "Самое нрав�щее�� первым"
+#: ../../Zotlabs/Module/Register.php:445
+msgid "Register at another affiliated hub in case when prefered"
+msgstr "При необходимо�ти вы можете зареги�трировать�� на другом хабе"
 
-#: ../../addon/openclipatar/openclipatar.php:72
-msgid "Preferred IDs Message"
-msgstr "Сообщение от предпочитаемых ID"
+#: ../../Zotlabs/Module/Register.php:458
+msgid "Registration on this hub is by invitation only."
+msgstr "Реги�траци� на �том хабе до�тупна только по приглашени�м."
 
-#: ../../addon/openclipatar/openclipatar.php:72
-msgid "Message to display above preferred results."
-msgstr "Отображаемое �ообщение над предпочитаемыми результатами."
+#: ../../Zotlabs/Module/Register.php:459
+msgid "Register at another affiliated hub"
+msgstr "Зареги�трировать�� на другом хабе"
 
-#: ../../addon/openclipatar/openclipatar.php:78
-msgid "Uploaded by: "
-msgstr "Загружено:"
+#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Terms of Service"
+msgstr "У�лови� предо�тавлени� у�луг"
 
-#: ../../addon/openclipatar/openclipatar.php:78
-msgid "Drawn by: "
-msgstr "�ари�овано:"
+#: ../../Zotlabs/Module/Register.php:479
+#, php-format
+msgid "I accept the %s for this website"
+msgstr "Я принимаю %s дл� �того веб-�айта."
 
-#: ../../addon/openclipatar/openclipatar.php:182
-#: ../../addon/openclipatar/openclipatar.php:194
-msgid "Use this image"
-msgstr "И�пользовать �то изображение"
+#: ../../Zotlabs/Module/Register.php:486
+#, php-format
+msgid "I am over %s years of age and accept the %s for this website"
+msgstr "Мой возра�т превышает %s лет и � принимаю %s дл� �того веб-�айта."
 
-#: ../../addon/openclipatar/openclipatar.php:192
-msgid "Or select from a free OpenClipart.org image:"
-msgstr "Или выберите из бе�платных изображений на OpenClipart.org"
+#: ../../Zotlabs/Module/Register.php:496
+msgid "Your email address"
+msgstr "Ваш адре� �лектронной почты"
 
-#: ../../addon/openclipatar/openclipatar.php:195
-msgid "Search Term"
-msgstr "У�ловие пои�ка"
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:143
+#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:746
+#: ../../Zotlabs/Module/Profiles.php:750 ../../include/datetime.php:211
+#: ../../include/js_strings.php:123
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:334
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:358
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:434
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:458
+msgid "Required"
+msgstr "Требует��"
 
-#: ../../addon/openclipatar/openclipatar.php:232
-msgid "Unknown error. Please try again later."
-msgstr "�еизве�тна� ошибка. Пожалуй�та, повторите попытку позже."
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Sources.php:123
+#: ../../Zotlabs/Module/Sources.php:158 ../../Zotlabs/Module/Oauth.php:117
+msgid "Optional"
+msgstr "�еоб�зательно"
 
-#: ../../addon/openclipatar/openclipatar.php:298
-#: ../../Zotlabs/Module/Profile_photo.php:254
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Е�ли нова� фотографи� не отображает�� немедленно то нажмите Shift + \"Обновить\" дл� очи�тки к�ша браузера"
+#: ../../Zotlabs/Module/Register.php:503
+msgid "Choose a password"
+msgstr "Выберите пароль"
 
-#: ../../addon/openclipatar/openclipatar.php:308
-msgid "Profile photo updated successfully."
-msgstr "Фотографи� профил� обновлена у�пешно."
+#: ../../Zotlabs/Module/Register.php:504
+msgid "Please re-enter your password"
+msgstr "Пожалуй�та, введите пароль еще раз"
 
-#: ../../addon/bookmarker/bookmarker.php:38
-#: ../../Zotlabs/Lib/ThreadItem.php:474
-msgid "Save Bookmarks"
-msgstr "Сохранить в закладках"
+#: ../../Zotlabs/Module/Register.php:506
+msgid "Please enter your invitation code"
+msgstr "Пожалуй�та, введите Ваш код приглашени�"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:77
-msgid "Max queueworker threads"
-msgstr "Мак�. количе�тво обработчиков очереди"
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Your name"
+msgstr "Ваше им�"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:79
-msgid "Minimum 4, default 4"
-msgstr "Минимум 4, по умолчанию 4"
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Real name is preferred"
+msgstr "Предпочтительнее и�пользовать ваше на�то�щее им�"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:90
-msgid "Assume workers dead after"
-msgstr "Считать обработчики неактивными по�ле"
+#: ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/New_channel.php:177
+msgid "Choose a short nickname"
+msgstr "Выберите короткий п�евдоним"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:92
-msgid "Minimum 120, default 300 seconds"
-msgstr "Минимум 120, по умолчанию 300 �екунд"
+#: ../../Zotlabs/Module/Register.php:510
+msgid ""
+"Your nickname will be used to create an easy to remember channel address"
+msgstr "Ваш п�евдоним будет и�пользован дл� �оздани� легко запоминающего�� адре�а канала"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:103
-msgid "Pause before starting next task"
-msgstr "Задержка перед запу�ком �ледующей задачи"
+#: ../../Zotlabs/Module/Register.php:514
+msgid "Why do you want to join this hub?"
+msgstr "Почему вы хотите зареги�трировать�� на �том хабе?"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:105
-msgid "Minimum 100, default 100 microseconds"
-msgstr "Минимум 100, по умолчанию 100 микро�екунд"
+#: ../../Zotlabs/Module/Register.php:514
+msgid "This will help to review your registration"
+msgstr "Это поможет проверить вашу реги�трацию "
 
-#: ../../addon/queueworker/Mod_Queueworker.php:113
-msgid "Queueworker Settings"
-msgstr "�а�тройки обработчика очереди"
+#: ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:413
+msgid "Registration"
+msgstr "Реги�траци�"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1145
-#: ../../include/text.php:1157 ../../Zotlabs/Widget/Notes.php:23
-#: ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:113
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:117
-#: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104
-msgid "Save"
-msgstr "Запомнить"
+#: ../../Zotlabs/Module/Register.php:528
+msgid "I have an invite code"
+msgstr "У мен� е�ть код приглашени�"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:15
-msgid "Add some colour to tag clouds"
-msgstr "Добавить немного цвета дл� облака тегов"
+#: ../../Zotlabs/Module/Register.php:575
+msgid ""
+"This site has exceeded the number of allowed daily account registrations."
+msgstr "�а �том �айте превышено допу�тимое количе�тво ежедневных реги�траций учетных запи�ей."
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:26
-msgid "Rainbow Tag App"
-msgstr "Приложение \"Радуга тегов\""
+#: ../../Zotlabs/Module/Photos.php:80
+msgid "Page owner information could not be retrieved."
+msgstr "Информаци� о владельце �траницы не может быть получена."
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:34
-msgid "Rainbow Tag"
-msgstr "Радуга тегов"
+#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
+msgid "Album not found."
+msgstr "�льбом не найден."
 
-#: ../../addon/photocache/Mod_Photocache.php:27
-msgid "Photo Cache settings saved."
-msgstr "�а�тройки к�шировани� изображений �охранены."
+#: ../../Zotlabs/Module/Photos.php:105
+msgid "Delete Album"
+msgstr "Удалить альбом"
 
-#: ../../addon/photocache/Mod_Photocache.php:36
-msgid ""
-"Photo Cache addon saves a copy of images from external sites locally to "
-"increase your anonymity in the web."
-msgstr "Приложение \"К�шировние изображений\" �охран�ет копию изображений � внешних �айтов локально дл� повышени� вашей анонимно�ти в Интернет."
+#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059
+msgid "Delete Photo"
+msgstr "Удалить фотографию"
 
-#: ../../addon/photocache/Mod_Photocache.php:42
-msgid "Photo Cache App"
-msgstr "Приложение \"К�ширование изображений\""
+#: ../../Zotlabs/Module/Photos.php:519 ../../Zotlabs/Module/Search.php:21
+#: ../../Zotlabs/Module/Display.php:26
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77
+msgid "Public access denied."
+msgstr "Публичный до�туп запрещен."
 
-#: ../../addon/photocache/Mod_Photocache.php:53
-msgid "Minimal photo size for caching"
-msgstr "Минимальный размер изображений дл� к�шировани�"
+#: ../../Zotlabs/Module/Photos.php:530
+msgid "No photos selected"
+msgstr "�икакие фотографии не выбраны"
 
-#: ../../addon/photocache/Mod_Photocache.php:55
-msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
-msgstr "В пик�ел�х. От 1 до 1024, 0 будет заменён значением по умолчанию."
+#: ../../Zotlabs/Module/Photos.php:579
+msgid "Access to this item is restricted."
+msgstr "До�туп к �тому �лементу ограничен."
 
-#: ../../addon/photocache/Mod_Photocache.php:64
-msgid "Photo Cache"
-msgstr "К�ширование изображений"
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Вы и�пользовали %1$.2f мегабайт из %2$.2f дл� хранени� фото."
 
-#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:136
-msgid "Gallery"
-msgstr "Галере�"
+#: ../../Zotlabs/Module/Photos.php:625
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "Вы и�пользовали %1$.2f мегабайт дл� хранени� фото."
 
-#: ../../addon/gallery/gallery.php:46
-msgid "Photo Gallery"
-msgstr "Фотогалере�"
+#: ../../Zotlabs/Module/Photos.php:667
+msgid "Upload Photos"
+msgstr "Загрузить фотографии"
 
-#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1464
-#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Webpages.php:39
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Cards.php:42
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Articles.php:43
-#: ../../Zotlabs/Module/Menu.php:92 ../../Zotlabs/Module/Layouts.php:31
-msgid "Requested profile is not available."
-msgstr "Запрашиваемый профиль не до�тупен."
+#: ../../Zotlabs/Module/Photos.php:671
+msgid "Enter an album name"
+msgstr "Введите название альбома"
 
-#: ../../addon/gallery/Mod_Gallery.php:58
-msgid "Gallery App"
-msgstr "Приложение \"Галере�\""
+#: ../../Zotlabs/Module/Photos.php:672
+msgid "or select an existing album (doubleclick)"
+msgstr "или выберите �уще�твующий альбом (двойной щелчок)"
 
-#: ../../addon/gallery/Mod_Gallery.php:59
-msgid "A simple gallery for your photo albums"
-msgstr "Про�та� галлере� дл� ваших фотоальбомов"
+#: ../../Zotlabs/Module/Photos.php:673
+msgid "Create a status post for this upload"
+msgstr "Сделать публикацию о �тату�е дл� �той загрузки"
 
-#: ../../addon/planets/Mod_Planets.php:20
-#: ../../addon/planets/Mod_Planets.php:23
-msgid "Random Planet App"
-msgstr "Приложение \"Случайна� планета\""
+#: ../../Zotlabs/Module/Photos.php:674 ../../Zotlabs/Module/Photos.php:1044
+#: ../../Zotlabs/Module/Card_edit.php:118
+#: ../../Zotlabs/Module/Article_edit.php:116
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1472
+#: ../../extend/addon/hzaddons/hsse/hsse.php:221
+msgid "Title (optional)"
+msgstr "Заголовок (необ�зательно)"
 
-#: ../../addon/planets/Mod_Planets.php:25
-msgid ""
-"Set a random planet from the Star Wars Empire as your location when posting"
-msgstr "У�тановить �лучайную планету из Империи Звездных Войн в каче�тве вашего ме�тоположени� при публикации"
+#: ../../Zotlabs/Module/Photos.php:675
+msgid "Description (optional)"
+msgstr "Опи�ание (необ�зательно)"
 
-#: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:26
-#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36
-#: ../../include/photos.php:27 ../../include/items.php:4087
-#: ../../include/attach.php:156 ../../include/attach.php:205
-#: ../../include/attach.php:278 ../../include/attach.php:329
-#: ../../include/attach.php:424 ../../include/attach.php:438
-#: ../../include/attach.php:445 ../../include/attach.php:527
-#: ../../include/attach.php:1091 ../../include/attach.php:1164
-#: ../../include/attach.php:1327 ../../Zotlabs/Module/Article_edit.php:51
-#: ../../Zotlabs/Module/Attach_edit.php:90
-#: ../../Zotlabs/Module/Attach_edit.php:99
-#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:19
-#: ../../Zotlabs/Module/Register.php:197 ../../Zotlabs/Module/Setup.php:208
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Channel.php:209 ../../Zotlabs/Module/Channel.php:365
-#: ../../Zotlabs/Module/Channel.php:404 ../../Zotlabs/Module/Group.php:15
-#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51
-#: ../../Zotlabs/Module/Editwebpage.php:68
-#: ../../Zotlabs/Module/Editwebpage.php:89
-#: ../../Zotlabs/Module/Editwebpage.php:107
-#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:113
-#: ../../Zotlabs/Module/Chat.php:118
-#: ../../Zotlabs/Module/Channel_calendar.php:232
-#: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Poke.php:157
-#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525
-#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1444
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99
-#: ../../Zotlabs/Module/Profile.php:114
-#: ../../Zotlabs/Module/Sharedwithme.php:19
-#: ../../Zotlabs/Module/Webpages.php:133
-#: ../../Zotlabs/Module/Filestorage.php:20
-#: ../../Zotlabs/Module/Filestorage.php:78
-#: ../../Zotlabs/Module/Filestorage.php:96
-#: ../../Zotlabs/Module/Filestorage.php:119
-#: ../../Zotlabs/Module/Filestorage.php:165
-#: ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Events.php:277
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:15
-#: ../../Zotlabs/Module/Display.php:420 ../../Zotlabs/Module/Common.php:38
-#: ../../Zotlabs/Module/New_channel.php:105
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126
-#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Cards.php:86
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Regmod.php:20
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Vote.php:19
-#: ../../Zotlabs/Module/Profile_photo.php:338
-#: ../../Zotlabs/Module/Profile_photo.php:351
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:59
-#: ../../Zotlabs/Module/Editlayout.php:67
-#: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Connections.php:32
-#: ../../Zotlabs/Module/Cover_photo.php:341
-#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Photos.php:71
-#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133
-#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637
-#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70
-#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302
-#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74
-#: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Menu.php:130
-#: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Defperms.php:182
-#: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302
-#: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35
-#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:284
-#: ../../Zotlabs/Module/Wiki.php:427 ../../Zotlabs/Module/Suggest.php:32
-#: ../../Zotlabs/Module/Connedit.php:397
-#: ../../Zotlabs/Module/Notifications.php:11
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:100
-#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135
-#: ../../Zotlabs/Web/WebServer.php:116
-msgid "Permission denied."
-msgstr "До�туп запрещен."
+#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Chat.php:241
+#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
+#: ../../Zotlabs/Module/Connedit.php:675 ../../include/acl_selectors.php:154
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:254
+msgid "Permissions"
+msgstr "Разрешени�"
 
-#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1747
-msgid "Male"
-msgstr "Мужчина"
+#: ../../Zotlabs/Module/Photos.php:688
+#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Embedphotos.php:189
+#: ../../Zotlabs/Module/Cover_photo.php:423
+#: ../../Zotlabs/Storage/Browser.php:540 ../../Zotlabs/Widget/Cdav.php:146
+#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Album.php:97
+#: ../../Zotlabs/Widget/Portfolio.php:110
+msgid "Upload"
+msgstr "Загрузка"
 
-#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1745
-msgid "Female"
-msgstr "Женщина"
+#: ../../Zotlabs/Module/Photos.php:761
+msgid "Show Newest First"
+msgstr "Показать новые первыми"
 
-#: ../../addon/openid/Mod_Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "Ошибка протокола OpenID. Идентификатор не возвращён."
+#: ../../Zotlabs/Module/Photos.php:763
+msgid "Show Oldest First"
+msgstr "Показать �тарые первыми"
 
-#: ../../addon/openid/Mod_Openid.php:76 ../../addon/openid/Mod_Openid.php:178
-#: ../../Zotlabs/Zot/Auth.php:266
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Добро пожаловать %s. Удаленна� аутентификаци� у�пешно завершена."
+#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1331
+#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Widget/Album.php:78
+#: ../../Zotlabs/Widget/Portfolio.php:87
+msgid "View Photo"
+msgstr "По�мотреть фотографию"
 
-#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:320
-msgid "Login failed."
-msgstr "�е удало�ь войти."
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1253
+#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Activity.php:1553
+#: ../../Zotlabs/Lib/Apps.php:1113 ../../Zotlabs/Lib/Apps.php:1197
+#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95
+#: ../../Zotlabs/Widget/Pinned.php:268 ../../include/cdav.php:158
+#: ../../include/cdav.php:159 ../../include/cdav.php:167
+#: ../../include/conversation.php:1209
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1197
+msgid "Unknown"
+msgstr "�еизве�тный"
 
-#: ../../addon/openid/openid.php:49
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Мы �толкнули�ь � проблемой входа � предо�тавленным вами OpenID. Пожалуй�та, проверьте корректно�ть его напи�ани�."
+#: ../../Zotlabs/Module/Photos.php:818 ../../Zotlabs/Module/Embedphotos.php:187
+#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
+msgid "Edit Album"
+msgstr "Редактировать Фотоальбом"
 
-#: ../../addon/openid/openid.php:49
-msgid "The error message was:"
-msgstr "Сообщение об ошибке было:"
+#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1362
+msgid "Add Photos"
+msgstr "Добавить фотографии"
 
-#: ../../addon/openid/MysqlProvider.php:52
-msgid "First Name"
-msgstr "Им�"
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "До�туп запрещен. До�туп к �тому �лементу может быть ограничен."
 
-#: ../../addon/openid/MysqlProvider.php:53
-msgid "Last Name"
-msgstr "Фамили�"
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "Фотографи� не до�тупна"
 
-#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:75
-msgid "Nickname"
-msgstr "П�евдоним"
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "И�пользовать в каче�тве фотографии профил�"
 
-#: ../../addon/openid/MysqlProvider.php:55
-msgid "Full Name"
-msgstr "Полное им�"
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "И�пользовать в каче�тве фотографии обложки"
 
-#: ../../addon/openid/MysqlProvider.php:56
-#: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:71
-#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1768
-#: ../../Zotlabs/Module/Cdav.php:1377
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-#: ../../Zotlabs/Module/Admin/Accounts.php:330
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:920
-msgid "Email"
-msgstr "Электронна� почта"
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Лична� фотографи�"
 
-#: ../../addon/openid/MysqlProvider.php:58
-#: ../../addon/openid/MysqlProvider.php:59
-#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:361
-msgid "Profile Photo"
-msgstr "Фотографи� профил�"
+#: ../../Zotlabs/Module/Photos.php:947 ../../Zotlabs/Module/Cdav.php:1036
+#: ../../Zotlabs/Module/Cal.php:203
+msgid "Previous"
+msgstr "Предыдуща�"
 
-#: ../../addon/openid/MysqlProvider.php:61
-msgid "Profile Photo 16px"
-msgstr "Фотографи� профил� 16px"
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "По�мотреть в полный размер"
 
-#: ../../addon/openid/MysqlProvider.php:62
-msgid "Profile Photo 32px"
-msgstr "Фотографи� профил� 32px"
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Cdav.php:1037
+#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:262
+msgid "Next"
+msgstr "Следующа�"
 
-#: ../../addon/openid/MysqlProvider.php:63
-msgid "Profile Photo 48px"
-msgstr "Фотографи� профил� 48px"
+#: ../../Zotlabs/Module/Photos.php:996
+#: ../../Zotlabs/Module/Admin/Addons.php:459 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Profile_photo.php:501
+#: ../../Zotlabs/Module/Cover_photo.php:424
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:92
+msgid "Remove"
+msgstr "Удалить"
 
-#: ../../addon/openid/MysqlProvider.php:64
-msgid "Profile Photo 64px"
-msgstr "Фотографи� профил� 64px"
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Edit photo"
+msgstr "Редактировать фотографию"
 
-#: ../../addon/openid/MysqlProvider.php:65
-msgid "Profile Photo 80px"
-msgstr "Фотографи� профил� 80px"
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Rotate CW (right)"
+msgstr "Повернуть CW (направо)"
 
-#: ../../addon/openid/MysqlProvider.php:66
-msgid "Profile Photo 128px"
-msgstr "Фотографи� профил� 128px"
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Rotate CCW (left)"
+msgstr "Повернуть CCW (налево)"
 
-#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123
-msgid "Timezone"
-msgstr "Ча�овой по��"
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Move photo to album"
+msgstr "Переме�тить фотографию в альбом"
 
-#: ../../addon/openid/MysqlProvider.php:68
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Homepage URL"
-msgstr "URL домашней �траницы"
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Enter a new album name"
+msgstr "Введите новое название альбома"
 
-#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:359
-msgid "Language"
-msgstr "Язык"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "or select an existing one (doubleclick)"
+msgstr "или выбрать �уще�твующую (двойной щелчок)"
 
-#: ../../addon/openid/MysqlProvider.php:70
-msgid "Birth Year"
-msgstr "Год рождени�"
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Add a Tag"
+msgstr "Добавить тег"
 
-#: ../../addon/openid/MysqlProvider.php:71
-msgid "Birth Month"
-msgstr "Ме��ц рождени�"
+#: ../../Zotlabs/Module/Photos.php:1054
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../addon/openid/MysqlProvider.php:72
-msgid "Birth Day"
-msgstr "День рождени�"
+#: ../../Zotlabs/Module/Photos.php:1057
+msgid "Flag as adult in album view"
+msgstr "Пометить как альбом \"дл� взро�лых\""
 
-#: ../../addon/openid/MysqlProvider.php:73
-msgid "Birthdate"
-msgstr "Дата рождени�"
+#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
+#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Module/Appman.php:155
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+#: ../../Zotlabs/Module/Admin/Accounts.php:309
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Profs.php:178
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Addons.php:442
+#: ../../Zotlabs/Module/Admin/Site.php:412
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Security.php:120
+#: ../../Zotlabs/Module/Admin/Logs.php:84 ../../Zotlabs/Module/Sources.php:125
+#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Module/Poke.php:217
+#: ../../Zotlabs/Module/Profiles.php:724 ../../Zotlabs/Module/Oauth.php:111
+#: ../../Zotlabs/Module/Connect.php:107
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Regate.php:387 ../../Zotlabs/Module/Defperms.php:266
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Filestorage.php:208
+#: ../../Zotlabs/Module/Permcats.php:129 ../../Zotlabs/Module/Pdledit.php:108
+#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Settings/Directory.php:42
+#: ../../Zotlabs/Module/Settings/Account.php:107
+#: ../../Zotlabs/Module/Settings/Calendar.php:42
+#: ../../Zotlabs/Module/Settings/Manage.php:43
+#: ../../Zotlabs/Module/Settings/Network.php:62
+#: ../../Zotlabs/Module/Settings/Conversation.php:49
+#: ../../Zotlabs/Module/Settings/Features.php:48
+#: ../../Zotlabs/Module/Settings/Display.php:188
+#: ../../Zotlabs/Module/Settings/Editor.php:42
+#: ../../Zotlabs/Module/Settings/Photos.php:42
+#: ../../Zotlabs/Module/Settings/Events.php:42
+#: ../../Zotlabs/Module/Settings/Channel_home.php:91
+#: ../../Zotlabs/Module/Settings/Profiles.php:52
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Connections.php:42
+#: ../../Zotlabs/Module/Locs.php:130 ../../Zotlabs/Module/Invite.php:550
+#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Pconfig.php:116
+#: ../../Zotlabs/Module/Thing.php:328 ../../Zotlabs/Module/Thing.php:381
+#: ../../Zotlabs/Module/Email_validation.php:40
+#: ../../Zotlabs/Module/Import.php:582 ../../Zotlabs/Module/Group.php:151
+#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Setup.php:306
+#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Mitem.php:259
+#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Oauth2.php:116
+#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Tokens.php:188
+#: ../../Zotlabs/Storage/Browser.php:382 ../../Zotlabs/Lib/ThreadItem.php:827
+#: ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../Zotlabs/Widget/Wiki_pages.php:42
+#: ../../Zotlabs/Widget/Wiki_pages.php:99 ../../include/js_strings.php:22
+#: ../../view/theme/redbasic/php/config.php:94
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:57
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:67
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:143
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:330
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:184
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:132
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:142
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:248
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:312
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:412
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:644
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:410
+#: ../../extend/addon/hzaddons/cart/cart.php:1376
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:109
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:53
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:136
+#: ../../extend/addon/hzaddons/piwik/piwik.php:95
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:56
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:90
+#: ../../extend/addon/hzaddons/irc/irc.php:45
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:602
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:193
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:251
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:306
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:262
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:86
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:73
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:54
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:51
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:65
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:102
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:84
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:155
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:72
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:95
+#: ../../extend/addon/hzaddons/logrot/logrot.php:35
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:55
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:61
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:124
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:82
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:115
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:72
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:70
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:142
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:54
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:70
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:80
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1461
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1520
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1639
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2742
+#: ../../extend/addon/hzaddons/workflow/Settings/Mod_WorkflowSettings.php:94
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:100
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:206
+msgid "Submit"
+msgstr "Отправить"
 
-#: ../../addon/openid/MysqlProvider.php:74
-#: ../../Zotlabs/Module/Profiles.php:488
-msgid "Gender"
-msgstr "Гендер"
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
+msgid "I like this (toggle)"
+msgstr "мне �то нравит�� (переключение)"
 
-#: ../../addon/moremoods/moremoods.php:19
-msgid "lonely"
-msgstr "одинокий"
+#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
+msgid "I don't like this (toggle)"
+msgstr "мне �то не нравит�� (переключение)"
 
-#: ../../addon/moremoods/moremoods.php:20
-msgid "drunk"
-msgstr "пь�ный"
+#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:255
+#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Widget/Cdav.php:136
+#: ../../include/conversation.php:1432
+#: ../../extend/addon/hzaddons/hsse/hsse.php:186
+msgid "Share"
+msgstr "Поделить��"
 
-#: ../../addon/moremoods/moremoods.php:21
-msgid "horny"
-msgstr "возбуждённый"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:503
+#: ../../include/conversation.php:830
+msgid "Please wait"
+msgstr "Подождите пожалуй�та"
 
-#: ../../addon/moremoods/moremoods.php:22
-msgid "stoned"
-msgstr "под кайфом"
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1211
+#: ../../Zotlabs/Lib/ThreadItem.php:824
+msgid "This is you"
+msgstr "Это вы"
 
-#: ../../addon/moremoods/moremoods.php:23
-msgid "fucked up"
-msgstr "облажал��"
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Lib/ThreadItem.php:826 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Комментарий"
 
-#: ../../addon/moremoods/moremoods.php:24
-msgid "clusterfucked"
-msgstr "в полной заднице"
+#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Webpages.php:261
+#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1399
+#: ../../extend/addon/hzaddons/hsse/hsse.php:153
+msgid "Preview"
+msgstr "Предварительный про�мотр"
 
-#: ../../addon/moremoods/moremoods.php:25
-msgid "crazy"
-msgstr "�ума�шедший"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:652
+msgctxt "title"
+msgid "Likes"
+msgstr "�равит��"
 
-#: ../../addon/moremoods/moremoods.php:26
-msgid "hurt"
-msgstr "обиженный"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:653
+msgctxt "title"
+msgid "Dislikes"
+msgstr "�е нравит��"
 
-#: ../../addon/moremoods/moremoods.php:27
-msgid "sleepy"
-msgstr "�онный"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:77
+#: ../../include/conversation.php:654
+msgctxt "title"
+msgid "Agree"
+msgstr "Согла�ен"
 
-#: ../../addon/moremoods/moremoods.php:28
-msgid "grumpy"
-msgstr "�ердитый"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:78
+#: ../../include/conversation.php:655
+msgctxt "title"
+msgid "Disagree"
+msgstr "�е �огла�ен"
 
-#: ../../addon/moremoods/moremoods.php:29
-msgid "high"
-msgstr "кайфует"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../Zotlabs/Widget/Pinned.php:79
+#: ../../include/conversation.php:656
+msgctxt "title"
+msgid "Abstain"
+msgstr "Воздержал��"
 
-#: ../../addon/moremoods/moremoods.php:30
-msgid "semi-conscious"
-msgstr "в полубез�ознании"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:66
+#: ../../include/conversation.php:657
+msgctxt "title"
+msgid "Attending"
+msgstr "По�ещаю"
 
-#: ../../addon/moremoods/moremoods.php:31
-msgid "in love"
-msgstr "влюблённый"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:67
+#: ../../include/conversation.php:658
+msgctxt "title"
+msgid "Not attending"
+msgstr "�е по�ещаю"
 
-#: ../../addon/moremoods/moremoods.php:32
-msgid "in lust"
-msgstr "похотливый"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../Zotlabs/Widget/Pinned.php:68
+#: ../../include/conversation.php:659
+msgctxt "title"
+msgid "Might attend"
+msgstr "Возможно по�ещу"
 
-#: ../../addon/moremoods/moremoods.php:33
-msgid "naked"
-msgstr "обнажённый"
+#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
+#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
+msgid "View all"
+msgstr "Про�мотреть в�е"
 
-#: ../../addon/moremoods/moremoods.php:34
-msgid "stinky"
-msgstr "вонючий"
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243
+#: ../../include/channel.php:1729 ../../include/taxonomy.php:670
+#: ../../include/conversation.php:1744
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "�равит��"
+msgstr[1] "�равит��"
+msgstr[2] "�равит��"
 
-#: ../../addon/moremoods/moremoods.php:35
-msgid "sweaty"
-msgstr "потный"
+#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248
+#: ../../include/conversation.php:1747
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "�е нравит��"
+msgstr[1] "�е нравит��"
+msgstr[2] "�е нравит��"
 
-#: ../../addon/moremoods/moremoods.php:36
-msgid "bleeding out"
-msgstr "и�текающий кровью"
+#: ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Module/Admin/Accounts.php:320
+#: ../../Zotlabs/Module/Admin/Profs.php:176
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Profiles.php:801
+#: ../../Zotlabs/Module/Connections.php:329 ../../Zotlabs/Module/Cdav.php:1057
+#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Oauth.php:174
+#: ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Editblock.php:139 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Thing.php:269
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Oauth2.php:195
+#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/ThreadItem.php:171
+#: ../../Zotlabs/Lib/Apps.php:559 ../../include/conversation.php:730
+#: ../../include/conversation.php:777
+msgid "Delete"
+msgstr "Удалить"
 
-#: ../../addon/moremoods/moremoods.php:37
-msgid "victorious"
-msgstr "победивший"
+#: ../../Zotlabs/Module/Photos.php:1245
+msgid "Photo Tools"
+msgstr "Фото-Ин�трументы"
 
-#: ../../addon/moremoods/moremoods.php:38
-msgid "defeated"
-msgstr "проигравший"
+#: ../../Zotlabs/Module/Photos.php:1254
+msgid "In This Photo:"
+msgstr "�а �той фотографии:"
 
-#: ../../addon/moremoods/moremoods.php:39
-msgid "envious"
-msgstr "завидует"
+#: ../../Zotlabs/Module/Photos.php:1259
+msgid "Map"
+msgstr "Карта"
 
-#: ../../addon/moremoods/moremoods.php:40
-msgid "jealous"
-msgstr "ревнует"
+#: ../../Zotlabs/Module/Photos.php:1267 ../../Zotlabs/Lib/ThreadItem.php:491
+msgctxt "noun"
+msgid "Likes"
+msgstr "�равит��"
 
-#: ../../addon/dirstats/dirstats.php:94
-msgid "Hubzilla Directory Stats"
-msgstr "Каталог �тати�тики Hubzilla"
+#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:492
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "�е нравит��"
 
-#: ../../addon/dirstats/dirstats.php:95
-msgid "Total Hubs"
-msgstr "В�его хабов"
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Storage/Browser.php:411
+#: ../../Zotlabs/Lib/ThreadItem.php:497 ../../Zotlabs/Widget/Pinned.php:158
+#: ../../include/acl_selectors.php:156
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:233
+msgid "Close"
+msgstr "Закрыть"
 
-#: ../../addon/dirstats/dirstats.php:97
-msgid "Hubzilla Hubs"
-msgstr "Хабы Hubzilla"
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:667
+msgid "Recent Photos"
+msgstr "По�ледние фотографии"
 
-#: ../../addon/dirstats/dirstats.php:99
-msgid "Friendica Hubs"
-msgstr "Хабы Friendica"
+#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+msgid "App installed."
+msgstr "Приложение у�тановлено."
 
-#: ../../addon/dirstats/dirstats.php:101
-msgid "Diaspora Pods"
-msgstr "Стручки Diaspora"
+#: ../../Zotlabs/Module/Appman.php:49
+msgid "Malformed app."
+msgstr "�еработающее приложение."
 
-#: ../../addon/dirstats/dirstats.php:103
-msgid "Hubzilla Channels"
-msgstr "Каналы Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:132
+msgid "Embed code"
+msgstr "В�троить код"
 
-#: ../../addon/dirstats/dirstats.php:105
-msgid "Friendica Channels"
-msgstr "Каналы Friendica"
+#: ../../Zotlabs/Module/Appman.php:138
+msgid "Edit App"
+msgstr "Редактировать приложение"
 
-#: ../../addon/dirstats/dirstats.php:107
-msgid "Diaspora Channels"
-msgstr "Каналы Diaspora"
+#: ../../Zotlabs/Module/Appman.php:138
+msgid "Create App"
+msgstr "Создать приложение"
 
-#: ../../addon/dirstats/dirstats.php:109
-msgid "Aged 35 and above"
-msgstr "Возра�т 35 и выше"
+#: ../../Zotlabs/Module/Appman.php:143
+msgid "Name of app"
+msgstr "�аименование приложени�"
 
-#: ../../addon/dirstats/dirstats.php:111
-msgid "Aged 34 and under"
-msgstr "Возра�т 34 и ниже"
+#: ../../Zotlabs/Module/Appman.php:144
+msgid "Location (URL) of app"
+msgstr "Ме�тоположение (URL) приложени�"
 
-#: ../../addon/dirstats/dirstats.php:113
-msgid "Average Age"
-msgstr "Средний возра�т"
+#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Cdav.php:1015
+#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:656
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr "Опи�ание"
 
-#: ../../addon/dirstats/dirstats.php:115
-msgid "Known Chatrooms"
-msgstr "Изве�тные чаты"
+#: ../../Zotlabs/Module/Appman.php:146
+msgid "Photo icon URL"
+msgstr "URL пиктограммы"
 
-#: ../../addon/dirstats/dirstats.php:117
-msgid "Known Tags"
-msgstr "Изве�тные теги"
+#: ../../Zotlabs/Module/Appman.php:146
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 пик�елей - необ�зательно"
 
-#: ../../addon/dirstats/dirstats.php:119
-msgid ""
-"Please note Diaspora and Friendica statistics are merely those **this "
-"directory** is aware of, and not all those known in the network.  This also "
-"applies to chatrooms,"
-msgstr "Обратите внимание, что �тати�тика Diaspora и Friendica �то только те, о которых ** �тот каталог ** знает, а не в�е изве�тные в �ети. Это также отно�ит�� и к чатам."
+#: ../../Zotlabs/Module/Appman.php:147
+msgid "Categories (optional, comma separated list)"
+msgstr "Категории (необ�зательно, �пи�ок через зап�тую)"
 
-#: ../../addon/redred/Mod_Redred.php:24
-msgid "Channel is required."
-msgstr "�еобходим канал."
+#: ../../Zotlabs/Module/Appman.php:148
+msgid "Version ID"
+msgstr "ID вер�ии"
 
-#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326
-msgid "Invalid channel."
-msgstr "�едей�твительный канал."
+#: ../../Zotlabs/Module/Appman.php:149
+msgid "Price of app"
+msgstr "Цена приложени�"
 
-#: ../../addon/redred/Mod_Redred.php:38
-msgid "Hubzilla Crosspost Connector Settings saved."
-msgstr "�а�тройки пере�ылки публикаций Hubzilla �охранены."
+#: ../../Zotlabs/Module/Appman.php:150
+msgid "Location (URL) to purchase app"
+msgstr "С�ылка (URL) дл� покупки приложени�"
 
-#: ../../addon/redred/Mod_Redred.php:50
-#: ../../addon/statusnet/Mod_Statusnet.php:146
-msgid "Hubzilla Crosspost Connector App"
-msgstr "Приложение \"Пере�ылка публикаций Hubzilla\""
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Update has been marked successful"
+msgstr "Обновление было помечено как у�пешное"
 
-#: ../../addon/redred/Mod_Redred.php:51
-msgid "Relay public postings to another Hubzilla channel"
-msgstr "Пере�ылает общедо�тупные публикации в другой канал Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Verification of update %s failed. Check system logs."
+msgstr "Проверка обновлени� %s не удала�ь. Проверьте �и�темный журнал."
 
-#: ../../addon/redred/Mod_Redred.php:63
-msgid "Send public postings to Hubzilla channel by default"
-msgstr "Отправл�ть общедо�тупные публикации в канал Hubzilla по умолчанию"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:35
+#: ../../Zotlabs/Module/Admin/Dbsync.php:74
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Обновление %s было у�пешно применено."
 
-#: ../../addon/redred/Mod_Redred.php:67
-msgid "Hubzilla API Path"
-msgstr "Путь к Hubzilla API"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Verifying update %s did not return a status. Unknown if it succeeded."
+msgstr "Проверка обновлени� %s не вернула его �о�то�ние. �еизве�тно было ли оно у�пешным."
 
-#: ../../addon/redred/Mod_Redred.php:67 ../../addon/rtof/Mod_Rtof.php:53
-msgid "https://{sitename}/api"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#, php-format
+msgid "Update %s does not contain a verification function."
+msgstr "Обновление %s не �одержит функцию проверки."
 
-#: ../../addon/redred/Mod_Redred.php:71
-msgid "Hubzilla login name"
-msgstr "Им� входа Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:46
+#: ../../Zotlabs/Module/Admin/Dbsync.php:81
+#, php-format
+msgid "Update function %s could not be found."
+msgstr "Функци� обновлени� %s не может быть найдена."
 
-#: ../../addon/redred/Mod_Redred.php:75
-msgid "Hubzilla channel name"
-msgstr "�азвание канала Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#, php-format
+msgid "Executing update procedure %s failed. Check system logs."
+msgstr "�е удало�ь выполнить процедуру обновлени� %s.Проверьте �и�темный журнал."
 
-#: ../../addon/redred/Mod_Redred.php:79
-msgid "Hubzilla password"
-msgstr "Пароль Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#, php-format
+msgid ""
+"Update %s did not return a status. It cannot be determined if it was "
+"successful."
+msgstr "Обновление %s не вернуло �вой �тату�. �евозможно определить было ли оно у�пешным."
 
-#: ../../addon/redred/Mod_Redred.php:87
-msgid "Hubzilla Crosspost Connector"
-msgstr "Пере�ылка публикаций Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:99
+msgid "Failed Updates"
+msgstr "Обновлени� � ошибками"
 
-#: ../../addon/redred/redred.php:50
-msgid "Post to Hubzilla"
-msgstr "Опубликовать в Hubzilla"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:101
+msgid "Mark success (if update was manually applied)"
+msgstr "Пометить у�пешным (е�ли обновление было применено вручную)"
 
-#: ../../addon/redphotos/redphotos.php:106
-msgid "Photos imported"
-msgstr "Фотографии импортированы"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:102
+msgid "Attempt to verify this update if a verification procedure exists"
+msgstr "Попытайте�ь проверить �то обновление, е�ли �уще�твует процедура проверки"
 
-#: ../../addon/redphotos/redphotos.php:119
-#: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75
-#: ../../include/items.php:441 ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99
-#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Cloud.php:123
-#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
-#: ../../Zotlabs/Web/WebServer.php:115
-msgid "Permission denied"
-msgstr "До�туп запрещен"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:103
+msgid "Attempt to execute this update step automatically"
+msgstr "Попытать�� применить �тот �тап обновлени� автоматиче�ки"
 
-#: ../../addon/redphotos/redphotos.php:129
-msgid "Redmatrix Photo Album Import"
-msgstr "Импортировать альбом фотографий Redmatrix"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:108
+msgid "No failed updates."
+msgstr "Ошибок обновлений нет."
 
-#: ../../addon/redphotos/redphotos.php:130
-msgid "This will import all your Redmatrix photo albums to this channel."
-msgstr "Это позволит импортировать в�е ваши альбомы фотографий Redmatrix в �тот канал."
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
+msgstr "Пароль дл� аккаунта %d изменён."
 
-#: ../../addon/redphotos/redphotos.php:131
-#: ../../addon/redfiles/redfiles.php:121
-msgid "Redmatrix Server base URL"
-msgstr "Базовый URL �ервера Redmatrix"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
+msgstr "�а�тройки аккаунта обновлены."
 
-#: ../../addon/redphotos/redphotos.php:132
-#: ../../addon/redfiles/redfiles.php:122
-msgid "Redmatrix Login Username"
-msgstr "Им� пользовател� Redmatrix"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
+msgstr "Учётна� запи�ь не найдена."
 
-#: ../../addon/redphotos/redphotos.php:133
-#: ../../addon/redfiles/redfiles.php:123
-msgid "Redmatrix Login Password"
-msgstr "Пароль Redmatrix"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
+msgstr "Редактировать аккаунт"
 
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Import just this album"
-msgstr "Импортировать только �тот альбом"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
+msgstr "�овый пароль"
 
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Leave blank to import all albums"
-msgstr "О�тавьте пу�тым дл� импорта в�ех альбомов"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
+msgstr "Повторите новый пароль"
 
-#: ../../addon/redphotos/redphotos.php:135
-msgid "Maximum count to import"
-msgstr "Мак�имальное количе�тво дл� импорта"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Account language (for emails)"
+msgstr "Язык �ообщени� дл� email"
 
-#: ../../addon/redphotos/redphotos.php:135
-msgid "0 or blank to import all available"
-msgstr "0 или пу�то дл� импорта в�ех до�тупных"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Zotlabs/Module/Admin/Accounts.php:335
+msgid "Service class"
+msgstr "Кла�� об�луживани�"
 
-#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:2101
-#: ../../addon/diaspora/Receiver.php:1649 ../../include/text.php:2254
-#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:439
-#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115
-#: ../../Zotlabs/Lib/Activity.php:3264
-msgid "photo"
-msgstr "фото"
+#: ../../Zotlabs/Module/Admin/Accounts.php:128
+#, php-format
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] "%s аккаунт блокирован/разблокирован"
+msgstr[1] "%s аккаунта блокированы/разблокированы"
+msgstr[2] "%s аккаунтов блокированы/разблокированы"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:61
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr "Пожалуй�та �в�жите�ь � админи�тратором �айта. <br />Предо�тавленный URL API недей�твителен."
+#: ../../Zotlabs/Module/Admin/Accounts.php:135
+#, php-format
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] "%s аккаунт удалён"
+msgstr[1] "%s аккаунта удалёны"
+msgstr[2] "%s аккаунтов удалёны"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:98
-msgid "We could not contact the GNU social API with the Path you entered."
-msgstr "�ам не удало�ь у�тановить контакт � GNU Social API по введённому вами пути"
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Account not found"
+msgstr "�ккаунт не найден"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:130
-msgid "GNU social settings updated."
-msgstr "�а�тройки GNU Social обновлены."
+#: ../../Zotlabs/Module/Admin/Accounts.php:184 ../../include/channel.php:2705
+#, php-format
+msgid "Account '%s' deleted"
+msgstr "�ккаунт '%s' удален"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:147
-msgid ""
-"Relay public postings to a connected GNU social account (formerly StatusNet)"
-msgstr "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь GNU social (бывша� StatusNet)"
+#: ../../Zotlabs/Module/Admin/Accounts.php:192
+#, php-format
+msgid "Account '%s' blocked"
+msgstr "�ккаунт '%s' заблокирован"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:181
-msgid "Globally Available GNU social OAuthKeys"
-msgstr "Глобально до�тупные ключи OAuthKeys GNU Social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:200
+#, php-format
+msgid "Account '%s' unblocked"
+msgstr "�ккаунт '%s' разблокирован"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:183
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU social servers "
-"available. If you are using one of them, please use these credentials.<br /"
-">If not feel free to connect to any other GNU social instance (see below)."
-msgstr "Суще�твуют предварительно на�троенные пары ключей OAuth дл� некоторых до�тупных �ерверов GNU social. Е�ли вы и�пользуете один из них, и�пользуйте �ти учетные данные. <br />Е�ли вы не хотите подключать�� к какому-либо другому �ерверу GNU social (�м. ниже)."
+#: ../../Zotlabs/Module/Admin/Accounts.php:240
+msgid "Unverified"
+msgstr "�епроверено"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:198
-msgid "Provide your own OAuth Credentials"
-msgstr "Предо�тавьте ваши �об�твенные реги�трационные данные OAuth"
+#: ../../Zotlabs/Module/Admin/Accounts.php:243
+msgid "Expired"
+msgstr "И�тёк"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:200
-msgid ""
-"No consumer key pair for GNU social found. Register your Hubzilla Account as "
-"an desktop client on your GNU social account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Hubzilla installation at your favourite GNU social installation."
-msgstr "�е найдена пользователь�ка� пара ключей дл� GNU social. Зареги�трируйте �вою учетную запи�ь Hubzilla в каче�тве на�тольного клиента в �воей учетной запи�и GNU social, �копируйте cюда пару ключей пользовател� и введите корневой каталог базы API. <br />Прежде чем реги�трировать �вою �об�твенную пару ключей OAuth, �про�ите админи�тратора, е�ли ли уже пара ключей дл� �той у�тановки Hubzilla в вашем GNU social."
+#: ../../Zotlabs/Module/Admin/Accounts.php:307
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Addons.php:342
+#: ../../Zotlabs/Module/Admin/Addons.php:440
+#: ../../Zotlabs/Module/Admin/Site.php:408
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Security.php:98
+#: ../../Zotlabs/Module/Admin/Logs.php:82 ../../Zotlabs/Module/Admin.php:140
+msgid "Administration"
+msgstr "�дмини�трирование"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:204
-msgid "OAuth Consumer Key"
-msgstr "Ключ клиента OAuth"
+#: ../../Zotlabs/Module/Admin/Accounts.php:308
+#: ../../Zotlabs/Module/Admin/Accounts.php:327
+#: ../../Zotlabs/Module/Admin.php:95 ../../Zotlabs/Widget/Admin.php:23
+msgid "Accounts"
+msgstr "Учётные запи�и"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:208
-msgid "OAuth Consumer Secret"
-msgstr "Пароль клиента OAuth"
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show verified registrations"
+msgstr "Показать проверенные реги�трации"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:212
-msgid "Base API Path"
-msgstr "О�новной путь к API"
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show all registrations"
+msgstr "Показать в�е реги�трации"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:212
-msgid "Remember the trailing /"
-msgstr "Запомнить закрывающий /"
+#: ../../Zotlabs/Module/Admin/Accounts.php:312
+msgid "Select toggle"
+msgstr "Выбрать"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:216
-msgid "GNU social application name"
-msgstr "Им� приложени� GNU social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:313
+msgid "Deny selected"
+msgstr "Запретить выбранное"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:239
-msgid ""
-"To connect to your GNU social account click the button below to get a "
-"security code from GNU social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU social."
-msgstr "Чтобы подключить�� к вашей учетной запи�и GNU social нажмите кнопку ниже дл� получени� кода безопа�но�ти из GNU social, который вы должны �копировать в поле ввода ниже и отправить форму. Только ваши общедо�тупные �ообщени� будут опубликованы в GNU social."
+#: ../../Zotlabs/Module/Admin/Accounts.php:314
+msgid "Approve selected"
+msgstr "Утвердить выбранное"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:241
-msgid "Log in with GNU social"
-msgstr "Войти � GNU social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "All registrations"
+msgstr "В�е реги�трации"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:244
-msgid "Copy the security code from GNU social here"
-msgstr "Скопируйте код безопа�но�ти GNU social зде�ь"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "Verified registrations waiting for approval"
+msgstr "Проверенные реги�трации ожидающие утверждени�"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:254
-msgid "Cancel Connection Process"
-msgstr "Отменить проце�� подключени�"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Request date"
+msgstr "Дата запро�а"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:256
-msgid "Current GNU social API is"
-msgstr "Текущий GNU social API"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+#: ../../Zotlabs/Module/Admin/Accounts.php:330
+#: ../../Zotlabs/Module/Profiles.php:788 ../../Zotlabs/Module/Cdav.php:1377
+#: ../../Zotlabs/Module/Connedit.php:912 ../../include/network.php:1743
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:71
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:57
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:56
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:57
+msgid "Email"
+msgstr "Электронна� почта"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:260
-msgid "Cancel GNU social Connection"
-msgstr "Отменить подключение � GNU social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Requests"
+msgstr "Запро�ы"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:272
-#: ../../addon/twitter/Mod_Twitter.php:147
-msgid "Currently connected to: "
-msgstr "В на�то�щее врем� подключён к: "
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No registrations available"
+msgstr "�ет до�тупных реги�траций"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:277
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в GNU social, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен."
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No verified registrations available"
+msgstr "�ет до�тупных подтвержденных реги�траций "
 
-#: ../../addon/statusnet/Mod_Statusnet.php:282
-msgid "Post to GNU social by default"
-msgstr "Публиковать в GNU social по умолчанию"
+#: ../../Zotlabs/Module/Admin/Accounts.php:318
+#: ../../Zotlabs/Module/Connections.php:343 ../../include/conversation.php:776
+msgid "Approve"
+msgstr "Утвердить"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:282
-msgid ""
-"If enabled your public postings will be posted to the associated GNU-social "
-"account by default"
-msgstr "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и GNU social по умолчанию"
+#: ../../Zotlabs/Module/Admin/Accounts.php:319
+#: ../../Zotlabs/Module/Authorize.php:33
+msgid "Deny"
+msgstr "Запретить"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:291
-#: ../../addon/twitter/Mod_Twitter.php:171
-msgid "Clear OAuth configuration"
-msgstr "Очи�тить конфигурацию OAuth"
+#: ../../Zotlabs/Module/Admin/Accounts.php:321
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Block"
+msgstr "Блокировать"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:303
-msgid "GNU-Social Crosspost Connector"
-msgstr "Подключение пере�ылки публикаций GNU Social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:322
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Unblock"
+msgstr "Разблокировать"
 
-#: ../../addon/statusnet/statusnet.php:145
-msgid "Post to GNU social"
-msgstr "Опубликовать в GNU Social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:323
+msgid "Verified"
+msgstr "Подтверждён"
 
-#: ../../addon/statusnet/statusnet.php:593
-#: ../../Zotlabs/Module/Admin/Site.php:420
-msgid "Site name"
-msgstr "�азвание �айта"
+#: ../../Zotlabs/Module/Admin/Accounts.php:324
+msgid "Not yet verified"
+msgstr "Ещё не проверено"
 
-#: ../../addon/statusnet/statusnet.php:594
-msgid "API URL"
+#: ../../Zotlabs/Module/Admin/Accounts.php:329
+msgid "ID"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:506
-#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
-msgid "Consumer Secret"
-msgstr "Код клиента"
-
-#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:505
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
-msgid "Consumer Key"
-msgstr "Ключ клиента"
-
-#: ../../addon/statusnet/statusnet.php:597
-msgid "Application name"
-msgstr "�азвание приложени�"
+#: ../../Zotlabs/Module/Admin/Accounts.php:331
+msgid "All channels"
+msgstr "В�е каналы"
 
-#: ../../addon/rtof/Mod_Rtof.php:24
-msgid "Friendica Crosspost Connector Settings saved."
-msgstr "�а�тройки пере�ылки публикаций Friendica �охранены."
+#: ../../Zotlabs/Module/Admin/Accounts.php:332
+msgid "Register date"
+msgstr "Дата реги�трации"
 
-#: ../../addon/rtof/Mod_Rtof.php:36
-msgid "Friendica Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Friendica\""
+#: ../../Zotlabs/Module/Admin/Accounts.php:333
+msgid "Last login"
+msgstr "По�ледний вход"
 
-#: ../../addon/rtof/Mod_Rtof.php:37
-msgid "Relay public postings to a connected Friendica account"
-msgstr "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:334
+msgid "Expires"
+msgstr "Срок дей�тви�"
 
-#: ../../addon/rtof/Mod_Rtof.php:49
-msgid "Send public postings to Friendica by default"
-msgstr "Отправл�ть общедо�тупные публикации во Friendica по умолчанию"
+#: ../../Zotlabs/Module/Admin/Accounts.php:337
+msgid ""
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Выбранные учётные запи�и будут удалены!\n\nВ�ё что было ими опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
 
-#: ../../addon/rtof/Mod_Rtof.php:53
-msgid "Friendica API Path"
-msgstr "Путь к Friendica API"
+#: ../../Zotlabs/Module/Admin/Accounts.php:338
+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 "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
 
-#: ../../addon/rtof/Mod_Rtof.php:57
-msgid "Friendica login name"
-msgstr "Им� входа Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:347
+#: ../../include/conversation.php:1118
+msgid "Message"
+msgstr "Сообщение"
 
-#: ../../addon/rtof/Mod_Rtof.php:61
-msgid "Friendica password"
-msgstr "Пароль Friendica"
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
+msgstr "Стати�тика очереди"
 
-#: ../../addon/rtof/Mod_Rtof.php:69
-msgid "Friendica Crosspost Connector"
-msgstr "Публикаци� в Friendica"
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
+msgstr "В�его запи�ей"
 
-#: ../../addon/rtof/rtof.php:51
-msgid "Post to Friendica"
-msgstr "Опубликовать в Friendica"
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
+msgstr "Приоритет"
 
-#: ../../addon/wppost/wppost.php:46
-msgid "Post to WordPress"
-msgstr "Опубликовать в WordPress"
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
+msgstr "Конечный URL-адре�"
 
-#: ../../addon/wppost/wppost.php:173 ../../addon/wppost/Mod_Wppost.php:98
-#: ../../addon/dwpost/Mod_Dwpost.php:69 ../../addon/dwpost/dwpost.php:134
-#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:383
-msgid "Source"
-msgstr "И�точник"
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
+msgstr "Пометить хаб как по�то�нно отключенный"
 
-#: ../../addon/wppost/Mod_Wppost.php:30
-msgid "Wordpress Settings saved."
-msgstr "�а�тройки WordPress �охранены."
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
+msgstr "О�вободить очередь дл� �того хаба"
 
-#: ../../addon/wppost/Mod_Wppost.php:43
-msgid "Wordpress Post App"
-msgstr "Приложение \"Публикаци� в Wordpress\""
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
+msgstr "По�ледний изве�тный контакт"
 
-#: ../../addon/wppost/Mod_Wppost.php:44
-msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
-msgstr "Опубликовать в WordPress или в чём-то ещё, поддерживающем wordpress XMLRPC API"
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
+msgstr "�а�тройки темы обновленны."
 
-#: ../../addon/wppost/Mod_Wppost.php:69
-msgid "WordPress username"
-msgstr "Им� пользовател� WordPress"
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
+msgstr "Темы не найдены."
 
-#: ../../addon/wppost/Mod_Wppost.php:73
-msgid "WordPress password"
-msgstr "Пароль WordPress"
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Zotlabs/Module/Admin/Addons.php:311
+msgid "Disable"
+msgstr "Запретить"
 
-#: ../../addon/wppost/Mod_Wppost.php:77
-msgid "WordPress API URL"
-msgstr "URL API WordPress"
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Zotlabs/Module/Admin/Addons.php:314
+msgid "Enable"
+msgstr "Разрешить"
 
-#: ../../addon/wppost/Mod_Wppost.php:78
-msgid "Typically https://your-blog.tld/xmlrpc.php"
-msgstr "Обычно https://your-blog.tld/xmlrpc.php"
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
+msgstr "Снимок �крана"
 
-#: ../../addon/wppost/Mod_Wppost.php:81
-msgid "WordPress blogid"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+msgid "Themes"
+msgstr "Темы"
 
-#: ../../addon/wppost/Mod_Wppost.php:82
-msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
-msgstr "Дл� многопользователь�ких �айтов, таких, как wordpress.com. В противном �лучае о�тавьте пу�тым"
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Zotlabs/Module/Admin/Addons.php:344
+msgid "Toggle"
+msgstr "Переключить"
 
-#: ../../addon/wppost/Mod_Wppost.php:86
-msgid "Post to WordPress by default"
-msgstr "Публиковать в WordPress по умолчанию"
+#: ../../Zotlabs/Module/Admin/Themes.php:125
+#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:340
+#: ../../Zotlabs/Widget/Newmember.php:53
+#: ../../Zotlabs/Widget/Settings_menu.php:61 ../../include/nav.php:106
+msgid "Settings"
+msgstr "�а�тройки"
 
-#: ../../addon/wppost/Mod_Wppost.php:90
-msgid "Forward comments (requires hubzilla_wp plugin)"
-msgstr "Пере�ылать комментарии (требует�� плагин hubzilla_wp)"
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Zotlabs/Module/Admin/Addons.php:352
+msgid "Author: "
+msgstr "�втор: "
 
-#: ../../addon/wppost/Mod_Wppost.php:94 ../../addon/dwpost/Mod_Dwpost.php:65
-#: ../../addon/ljpost/Mod_Ljpost.php:71
-msgid "Add link to original post"
-msgstr "Добавить ��ылку на оригинальную заметку"
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Zotlabs/Module/Admin/Addons.php:353
+msgid "Maintainer: "
+msgstr "Сопровождающий:"
 
-#: ../../addon/wppost/Mod_Wppost.php:98 ../../addon/dwpost/Mod_Dwpost.php:69
-msgid "Link description (default:"
-msgstr "Опи�ание ��ылки (по-умолчанию:"
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
+msgstr "[�к�периментальный]"
 
-#: ../../addon/wppost/Mod_Wppost.php:106
-msgid "Wordpress Post"
-msgstr "Публикаци� в WordPress"
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
+msgstr "[неподдерживаемый]"
 
-#: ../../addon/content_import/Mod_content_import.php:27
-msgid "No server specified"
-msgstr "Сервер не указан"
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "New Profile Field"
+msgstr "Поле нового профил�"
 
-#: ../../addon/content_import/Mod_content_import.php:73
-msgid "Posts imported"
-msgstr "Публикации импортированы"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "Field nickname"
+msgstr "П�евдоним пол�"
 
-#: ../../addon/content_import/Mod_content_import.php:113
-msgid "Files imported"
-msgstr "Файлы импортированы"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "System name of field"
+msgstr "Си�темное им� пол�"
 
-#: ../../addon/content_import/Mod_content_import.php:122
-msgid ""
-"This addon app copies existing content and file storage to a cloned/copied "
-"channel. Once the app is installed, visit the newly installed app. This will "
-"allow you to set the location of your original channel and an optional date "
-"range of files/conversations to copy."
-msgstr "Это дополнительное приложение копирует �уще�твующее �одержимое и хранилище файлов в клонированный / �копированный канал. По�ле того, как приложение у�тановлено, по�етите его �траницу. Это позволит вам задать ме�тоположение вашего и�ходного канала и диапазон дат файлов / бе�ед дл� копировани�."
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+#: ../../Zotlabs/Module/Admin/Profs.php:111
+msgid "Input type"
+msgstr "Тип ввода"
 
-#: ../../addon/content_import/Mod_content_import.php:135
-#: ../../Zotlabs/Lib/Apps.php:332
-msgid "Content Import"
-msgstr "Импорт �одержимого"
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Field Name"
+msgstr "Им� пол�"
 
-#: ../../addon/content_import/Mod_content_import.php:136
-msgid ""
-"This will import all your conversations and cloud files from a cloned "
-"channel on another server. This may take a while if you have lots of posts "
-"and or files."
-msgstr "Импортировать в�е ваши разговоры и хранилище файлов из клонируемого канала на другом �ервере. Это может зан�ть некоторое врем�, е�ли у ва� много публикаций и / или файлов."
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Label on profile pages"
+msgstr "Метка на �транице профил�"
 
-#: ../../addon/content_import/Mod_content_import.php:137
-msgid "Include posts"
-msgstr "Включа� публикации"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Help text"
+msgstr "Тек�т под�казки"
 
-#: ../../addon/content_import/Mod_content_import.php:137
-msgid "Conversations, Articles, Cards, and other posted content"
-msgstr "Бе�еды, Статьи, Карточки и другое опубликованное �одержимое"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Additional info (optional)"
+msgstr "Дополнительна� информаци� (необ�зательно)"
 
-#: ../../addon/content_import/Mod_content_import.php:138
-msgid "Include files"
-msgstr "Включа� файлы"
+#: ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54
+#: ../../Zotlabs/Module/Cards.php:113 ../../Zotlabs/Module/Rbmark.php:31
+#: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Module/Articles.php:117
+#: ../../Zotlabs/Widget/Notes.php:23 ../../include/text.php:1145
+#: ../../include/text.php:1157
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:116
+msgid "Save"
+msgstr "Запомнить"
 
-#: ../../addon/content_import/Mod_content_import.php:138
-msgid "Files, Photos and other cloud storage"
-msgstr "Файлы, Фотографии и прочее из хранилища"
+#: ../../Zotlabs/Module/Admin/Profs.php:103
+msgid "Field definition not found"
+msgstr "Определени� пол� не найдено"
 
-#: ../../addon/content_import/Mod_content_import.php:139
-msgid "Original Server base URL"
-msgstr "Базовый URL �ервера-и�точника"
+#: ../../Zotlabs/Module/Admin/Profs.php:109
+msgid "Edit Profile Field"
+msgstr "Редактировать поле профил�"
 
-#: ../../addon/content_import/Mod_content_import.php:140
-#: ../../addon/hzfiles/hzfiles.php:84
-msgid "Since modified date yyyy-mm-dd"
-msgstr "�ачина� � даты изменений yyyy-mm-dd"
+#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:30
+msgid "Profile Fields"
+msgstr "Пол� профил�"
 
-#: ../../addon/content_import/Mod_content_import.php:141
-#: ../../addon/hzfiles/hzfiles.php:85
-msgid "Until modified date yyyy-mm-dd"
-msgstr "Заканчива� датой изменений yyyy-mm-dd"
+#: ../../Zotlabs/Module/Admin/Profs.php:169
+msgid "Basic Profile Fields"
+msgstr "О�новные пол� профил�"
 
-#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1332
-msgid "Set your location"
-msgstr "Задать �воё ме�тоположение"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "Advanced Profile Fields"
+msgstr "Дополнительные пол� профил�"
 
-#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1333
-msgid "Clear browser location"
-msgstr "Очи�тить ме�тоположение из браузера"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "(In addition to basic fields)"
+msgstr "(к о�новым пол�м)"
 
-#: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:167
-#: ../../addon/mail/Mod_Mail.php:310 ../../include/conversation.php:1345
-#: ../../Zotlabs/Module/Article_edit.php:100
-#: ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220
-#: ../../Zotlabs/Module/Editblock.php:116
-msgid "Insert web link"
-msgstr "В�тавить веб-��ылку"
+#: ../../Zotlabs/Module/Admin/Profs.php:172
+msgid "All available fields"
+msgstr "В�е до�тупные пол�"
 
-#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1349
-msgid "Embed (existing) photo from your photo albums"
-msgstr "В�троить (�уще�твующее) фото из вашего фотоальбома"
+#: ../../Zotlabs/Module/Admin/Profs.php:173
+msgid "Custom Fields"
+msgstr "�а�траиваемые пол�"
 
-#: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:120
-#: ../../addon/mail/Mod_Mail.php:241 ../../include/conversation.php:1382
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Please enter a link URL:"
-msgstr "Пожалуй�та введите URL ��ылки:"
+#: ../../Zotlabs/Module/Admin/Profs.php:175
+#: ../../Zotlabs/Module/Card_edit.php:99
+#: ../../Zotlabs/Module/Connections.php:321
+#: ../../Zotlabs/Module/Connections.php:363
+#: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Oauth.php:173
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Article_edit.php:97
+#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Thing.php:268 ../../Zotlabs/Module/Webpages.php:254
+#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Oauth2.php:194
+#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
+#: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Lib/Apps.php:558
+#: ../../Zotlabs/Widget/Cdav.php:138 ../../Zotlabs/Widget/Cdav.php:175
+#: ../../include/channel.php:1486 ../../include/channel.php:1490
+#: ../../include/menu.php:120
+msgid "Edit"
+msgstr "Изменить"
 
-#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1383
-msgid "Tag term:"
-msgstr "Теги:"
+#: ../../Zotlabs/Module/Admin/Profs.php:177
+msgid "Create Custom Field"
+msgstr "Создать на�траиваемое поле"
 
-#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1384
-msgid "Where are you right now?"
-msgstr "Где вы �ейча�?"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
+msgid "Off"
+msgstr "Выкл."
 
-#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1387
-#: ../../Zotlabs/Module/Profile_photo.php:509
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:402
-msgid "Choose images to embed"
-msgstr "Выбрать изображени� дл� в�траивани�"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38 ../../include/features.php:55
+msgid "On"
+msgstr "Вкл."
 
-#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1388
-#: ../../Zotlabs/Module/Profile_photo.php:510
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:403
-msgid "Choose an album"
-msgstr "Выбрать альбом"
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
+msgstr "Заблокировать функцию \"%s\""
 
-#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1389
-msgid "Choose a different album..."
-msgstr "Выбрать другой альбом..."
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
+msgstr "Управление дополнительными функци�ми"
 
-#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1390
-#: ../../Zotlabs/Module/Profile_photo.php:512
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:405
-msgid "Error getting album list"
-msgstr "Ошибка получени� �пи�ка альбомов"
+#: ../../Zotlabs/Module/Admin/Addons.php:290
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Плагин %s отключен."
 
-#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1391
-#: ../../Zotlabs/Module/Profile_photo.php:513
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:406
-msgid "Error getting photo link"
-msgstr "Ошибка получени� ��ылки на фотографию"
+#: ../../Zotlabs/Module/Admin/Addons.php:295
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Плагин %s включен."
 
-#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1392
-#: ../../Zotlabs/Module/Profile_photo.php:514
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:407
-msgid "Error getting album"
-msgstr "Ошибка получени� альбома"
+#: ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Zotlabs/Module/Admin/Addons.php:441 ../../Zotlabs/Widget/Admin.php:27
+msgid "Addons"
+msgstr "Ра�ширени�"
 
-#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1393
-msgid "Comments enabled"
-msgstr "Комментарии включены"
+#: ../../Zotlabs/Module/Admin/Addons.php:354
+msgid "Minimum project version: "
+msgstr "Минимальна� вер�и� проекта: "
 
-#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1394
-msgid "Comments disabled"
-msgstr "Комментарии отключены"
+#: ../../Zotlabs/Module/Admin/Addons.php:355
+msgid "Maximum project version: "
+msgstr "Мак�имальна� вер�и� проекта: "
 
-#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1404
-#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:837
-msgid "Preview"
-msgstr "Предварительный про�мотр"
+#: ../../Zotlabs/Module/Admin/Addons.php:356
+msgid "Minimum PHP version: "
+msgstr "Минимальна� вер�и� PHP: "
 
-#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1437
-#: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1078
-#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Layouts.php:194
-msgid "Share"
-msgstr "Поделить��"
+#: ../../Zotlabs/Module/Admin/Addons.php:357
+msgid "Compatible Server Roles: "
+msgstr "Совме�тимые роли �ервера: "
 
-#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1446
-msgid "Page link name"
-msgstr "�азвание ��ылки на �траницу "
+#: ../../Zotlabs/Module/Admin/Addons.php:358
+msgid "Requires: "
+msgstr "�еобходимо:"
 
-#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1449
-msgid "Post as"
-msgstr "Опубликовать как"
+#: ../../Zotlabs/Module/Admin/Addons.php:359
+#: ../../Zotlabs/Module/Admin/Addons.php:446
+msgid "Disabled - version incompatibility"
+msgstr "Отключено - не�овме�тимо�ть вер�ий"
 
-#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1451
-#: ../../Zotlabs/Lib/ThreadItem.php:828
-msgid "Bold"
-msgstr "Жирный"
+#: ../../Zotlabs/Module/Admin/Addons.php:415
+msgid "Enter the public git repository URL of the addon repo."
+msgstr "Введите URL публичного репозитори� ра�ширений git"
 
-#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1452
-#: ../../Zotlabs/Lib/ThreadItem.php:829
-msgid "Italic"
-msgstr "Кур�ив"
+#: ../../Zotlabs/Module/Admin/Addons.php:416
+msgid "Addon repo git URL"
+msgstr "URL репозитори� ра�ширений git"
 
-#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1453
-#: ../../Zotlabs/Lib/ThreadItem.php:830
-msgid "Underline"
-msgstr "Подчеркнутый"
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "Custom repo name"
+msgstr "Пользователь�кое им� репозитори�"
 
-#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1454
-#: ../../Zotlabs/Lib/ThreadItem.php:831
-msgid "Quote"
-msgstr "Цитата"
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "(optional)"
+msgstr "(необ�зательно)"
 
-#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1455
-#: ../../Zotlabs/Lib/ThreadItem.php:832
-msgid "Code"
-msgstr "Код"
+#: ../../Zotlabs/Module/Admin/Addons.php:418
+msgid "Download Addon Repo"
+msgstr "Загрузить репозиторий ра�ширений"
 
-#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1456
-#: ../../Zotlabs/Lib/ThreadItem.php:834
-msgid "Attach/Upload file"
-msgstr "Прикрепить/загрузить файл"
+#: ../../Zotlabs/Module/Admin/Addons.php:425
+msgid "Install new repo"
+msgstr "У�тановить новый репозиторий"
 
-#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1459
-#: ../../Zotlabs/Module/Wiki.php:399
-msgid "Embed an image from your albums"
-msgstr "В�троить изображение из ваших альбомов"
+#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:537
+msgid "Install"
+msgstr "У�тановить"
 
-#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
-#: ../../include/conversation.php:1460 ../../include/conversation.php:1515
-#: ../../Zotlabs/Module/Article_edit.php:131
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth.php:112
-#: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Editpost.php:111
 #: ../../Zotlabs/Module/Admin/Addons.php:427
+#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
 #: ../../Zotlabs/Module/Profile_photo.php:507
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56
+#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
+#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Article_edit.php:130
+#: ../../Zotlabs/Module/Editblock.php:141
+#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Filer.php:56
 #: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Cover_photo.php:428
-#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117
-#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367
-#: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Connedit.php:934
-#: ../../Zotlabs/Storage/Browser.php:383
+#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Editpost.php:111
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
+#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Module/Wiki.php:400
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1455
+#: ../../include/conversation.php:1510
+#: ../../extend/addon/hzaddons/hsse/hsse.php:209
+#: ../../extend/addon/hzaddons/hsse/hsse.php:258
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257
-#: ../../include/conversation.php:1461 ../../include/conversation.php:1514
-#: ../../Zotlabs/Module/Profile_photo.php:508
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:401
-msgid "OK"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1463
-msgid "Toggle voting"
-msgstr "Переключить голо�ование"
+#: ../../Zotlabs/Module/Admin/Addons.php:449
+msgid "Manage Repos"
+msgstr "Управление репозитори�ми"
 
-#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1470
-msgid "Disable comments"
-msgstr "Отключить комментарии"
+#: ../../Zotlabs/Module/Admin/Addons.php:450
+msgid "Installed Addon Repositories"
+msgstr "У�тановленные репозитории ра�ширений"
 
-#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1471
-msgid "Toggle comments"
-msgstr "Переключить комментарии"
+#: ../../Zotlabs/Module/Admin/Addons.php:451
+msgid "Install a New Addon Repository"
+msgstr "У�тановить новый репозиторий ра�ширений"
 
-#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1477
-#: ../../Zotlabs/Module/Article_edit.php:117
-#: ../../Zotlabs/Module/Card_edit.php:118
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Title (optional)"
-msgstr "Заголовок (необ�зательно)"
+#: ../../Zotlabs/Module/Admin/Addons.php:457
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Cdav.php:1054
+#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Oauth.php:53
+#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Lib/Apps.php:537
+msgid "Update"
+msgstr "Обновить"
 
-#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1481
-msgid "Categories (optional, comma-separated list)"
-msgstr "Категории (необ�зательно, �пи�ок через зап�тую)"
+#: ../../Zotlabs/Module/Admin/Addons.php:458
+msgid "Switch branch"
+msgstr "Переключить ветку"
 
-#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1482
-#: ../../Zotlabs/Module/Events.php:487
-msgid "Permission settings"
-msgstr "�а�тройки разрешений"
+#: ../../Zotlabs/Module/Admin/Site.php:112
+msgid "Invalid input"
+msgstr "�еверный ввод"
 
-#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1504
-msgid "Other networks and post services"
-msgstr "Другие �ети и �лужбы публикаций"
+#: ../../Zotlabs/Module/Admin/Site.php:132
+msgid "Errors"
+msgstr "Ошибки"
 
-#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:171
-#: ../../addon/mail/Mod_Mail.php:314 ../../include/conversation.php:1507
-msgid "Set expiration date"
-msgstr "У�тановить �рок дей�тви�"
+#: ../../Zotlabs/Module/Admin/Site.php:225
+msgid "Site settings updated."
+msgstr "�а�тройки �айта обновлены."
 
-#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1510
-msgid "Set publish date"
-msgstr "У�тановить дату публикации"
+#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3356
+#: ../../view/theme/redbasic/php/config.php:15
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:335
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:359
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:435
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:459
+msgid "Default"
+msgstr "По умолчанию"
 
-#: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:173
-#: ../../addon/mail/Mod_Mail.php:316 ../../include/conversation.php:1512
-#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841
-msgid "Encrypt text"
-msgstr "Зашифровать тек�т"
+#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Settings/Display.php:118
+#, php-format
+msgid "%s - (Incompatible)"
+msgstr "%s - (не�овме�тимо)"
 
-#: ../../addon/hsse/Mod_Hsse.php:15
-msgid "WYSIWYG status editor"
-msgstr "WYSIWYG редактор �тату�а "
+#: ../../Zotlabs/Module/Admin/Site.php:269
+msgid "mobile"
+msgstr "мобильный"
 
-#: ../../addon/hsse/Mod_Hsse.php:21 ../../addon/hsse/Mod_Hsse.php:26
-msgid "WYSIWYG Status App"
-msgstr "Приложение \"WYSIWYG �тату�\""
+#: ../../Zotlabs/Module/Admin/Site.php:271
+msgid "experimental"
+msgstr "�к�периментальный"
 
-#: ../../addon/hsse/Mod_Hsse.php:34
-msgid "WYSIWYG Status"
-msgstr "WYSIWYG �тату�"
+#: ../../Zotlabs/Module/Admin/Site.php:273
+msgid "unsupported"
+msgstr "неподдерживаемый"
 
-#: ../../addon/openstreetmap/openstreetmap.php:133
-msgid "View Larger"
-msgstr "Увеличить"
+#: ../../Zotlabs/Module/Admin/Site.php:320
+msgid "Yes - with approval"
+msgstr "Да - требует подтверждени�"
 
-#: ../../addon/openstreetmap/openstreetmap.php:156
-msgid "Tile Server URL"
-msgstr "URL �ервера Tile"
+#: ../../Zotlabs/Module/Admin/Site.php:328
+msgid "My site is not a public server"
+msgstr "Мой �айт не �вл�ет�� публичным �ервером"
 
-#: ../../addon/openstreetmap/openstreetmap.php:156
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
-msgstr "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">общедо�тупных �ерверов</a>"
+#: ../../Zotlabs/Module/Admin/Site.php:329
+msgid "My site has paid access only"
+msgstr "Мой �айт до�тупен только � оплатой "
 
-#: ../../addon/openstreetmap/openstreetmap.php:157
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "URL �ервера Nominatim (обратное геокодирование)"
+#: ../../Zotlabs/Module/Admin/Site.php:330
+msgid "My site has free access only"
+msgstr "�а моём �айте разрешён �вободный до�туп"
 
-#: ../../addon/openstreetmap/openstreetmap.php:157
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
-"\"_blank\">Nominatim servers</a>"
-msgstr "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">�ерверов Nominatim</a>"
+#: ../../Zotlabs/Module/Admin/Site.php:331
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr "�а моём �айте разрешены бе�платные аккаунты � дополнительными платными у�лугами"
 
-#: ../../addon/openstreetmap/openstreetmap.php:158
-msgid "Default zoom"
-msgstr "Ма�штаб по умолчанию"
+#: ../../Zotlabs/Module/Admin/Site.php:345
+msgid "Default permission role for new accounts"
+msgstr "Разрешени� по умолчанию дл� новых аккаунтов"
 
-#: ../../addon/openstreetmap/openstreetmap.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:345
 msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Уровень размера по умолчанию (1 - ве�ь мир, 18 - мак�имальный; зави�ит от �ервера)."
-
-#: ../../addon/openstreetmap/openstreetmap.php:159
-msgid "Include marker on map"
-msgstr "Включите маркер на карте"
-
-#: ../../addon/openstreetmap/openstreetmap.php:159
-msgid "Include a marker on the map."
-msgstr "Включить маркер на карте"
+"This role will be used for the first channel created after registration."
+msgstr "Эта роль будет и�пользовать�� дл� первого канала, �озданного по�ле реги�трации."
 
-#: ../../addon/openstreetmap/openstreetmap.php:171
-#: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:494
-#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/diaspora/diaspora.php:97
-#: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54
-#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:267
-#: ../../Zotlabs/Module/Defperms.php:112
-msgid "Settings updated."
-msgstr "�а�тройки обновлены."
+#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
+msgid "Minute(s)"
+msgstr "Минут"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:23
-msgid "Insane Journal Crosspost Connector Settings saved."
-msgstr "�а�тройки пере�ылки публикаций Insane Journal �охранены."
+#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399
+msgid "Hour(s)"
+msgstr "Ча�ов"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:35
-msgid "Insane Journal Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Insane Journal\""
+#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400
+msgid "Day(s)"
+msgstr "Дней"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:36
-msgid "Relay public postings to Insane Journal"
-msgstr "Пере�ылает общедо�тупные публикации в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Site.php:356
+msgid "Week(s)"
+msgstr "�едель"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:53
-msgid "InsaneJournal username"
-msgstr "Им� пользовател� Insane Journal"
+#: ../../Zotlabs/Module/Admin/Site.php:357
+msgid "Month(s)"
+msgstr "Ме��цев"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:57
-msgid "InsaneJournal password"
-msgstr "Пароль Insane Journal"
+#: ../../Zotlabs/Module/Admin/Site.php:358
+msgid "Year(s)"
+msgstr "Лет"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-msgid "Post to InsaneJournal by default"
-msgstr "Публиковать в Insane Journal по умолчанию"
+#: ../../Zotlabs/Module/Admin/Site.php:366
+msgid "Register verification delay"
+msgstr "Задержка проверки реги�трации"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:69
-msgid "Insane Journal Crosspost Connector"
-msgstr "Публикаци� в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Site.php:369
+msgid "Time to wait before a registration can be verified"
+msgstr "Врем� ожидани� до того, как реги�траци� может быть проверена"
 
-#: ../../addon/ijpost/ijpost.php:44
-msgid "Post to Insane Journal"
-msgstr "Опубликовать в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Site.php:372
+#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
+msgid "duration up from now"
+msgstr "продолжительно�ть � на�то�щего момента"
 
-#: ../../addon/wholikesme/wholikesme.php:29
-msgid "Who likes me?"
-msgstr "Кому � нравлю�ь?"
+#: ../../Zotlabs/Module/Admin/Site.php:388
+msgid "Register verification expiration time"
+msgstr "Врем� и�течени� �рока проверки реги�трации"
 
-#: ../../addon/qrator/qrator.php:48
-msgid "QR code"
-msgstr "QR-код"
+#: ../../Zotlabs/Module/Admin/Site.php:391
+msgid "Time before an unverified registration will expire"
+msgstr "Врем� до и�течени� �рока непроверенной реги�трации "
 
-#: ../../addon/qrator/qrator.php:63
-msgid "QR Generator"
-msgstr "Генератор QR-кодов"
+#: ../../Zotlabs/Module/Admin/Site.php:411 ../../Zotlabs/Widget/Admin.php:22
+msgid "Site"
+msgstr "Сайт"
 
-#: ../../addon/qrator/qrator.php:64
-msgid "Enter some text"
-msgstr "Введите любой тек�т"
+#: ../../Zotlabs/Module/Admin/Site.php:414
+msgid "File upload"
+msgstr "Загрузка файла"
 
-#: ../../addon/pubcrawl/as.php:1189 ../../include/cdav.php:158
-#: ../../include/cdav.php:159 ../../include/cdav.php:167
-#: ../../include/conversation.php:1214 ../../Zotlabs/Widget/Album.php:84
-#: ../../Zotlabs/Widget/Pinned.php:268 ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:793
-#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/Activity.php:1552
-#: ../../Zotlabs/Lib/Apps.php:1112 ../../Zotlabs/Lib/Apps.php:1196
-msgid "Unknown"
-msgstr "�еизве�тный"
+#: ../../Zotlabs/Module/Admin/Site.php:415
+msgid "Policies"
+msgstr "Правила"
 
-#: ../../addon/pubcrawl/as.php:1490 ../../addon/pubcrawl/as.php:1939
-#: ../../addon/pubcrawl/as.php:2147 ../../include/network.php:1767
-#: ../../Zotlabs/Lib/Activity.php:3114 ../../Zotlabs/Lib/Activity.php:3306
-msgid "ActivityPub"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:416 ../../include/acl_selectors.php:145
+#: ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr "Дополнительно"
 
-#: ../../addon/pubcrawl/as.php:2101 ../../addon/diaspora/Receiver.php:1649
-#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
-msgid "status"
-msgstr "�тату�"
+#: ../../Zotlabs/Module/Admin/Site.php:420
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:593
+msgid "Site name"
+msgstr "�азвание �айта"
 
-#: ../../addon/pubcrawl/as.php:2138 ../../addon/diaspora/Receiver.php:1595
-#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:471
-#: ../../Zotlabs/Lib/Activity.php:3297
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s нравит�� %3$s %2$s"
+#: ../../Zotlabs/Module/Admin/Site.php:422
+msgid "Banner/Logo"
+msgstr "Баннер / логотип"
 
-#: ../../addon/pubcrawl/as.php:2140 ../../include/conversation.php:177
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s не нравит�� %2$s %3$s"
+#: ../../Zotlabs/Module/Admin/Site.php:422
+msgid "Unfiltered HTML/CSS/JS is allowed"
+msgstr "Разрешён нефильтруемый HTML/CSS/JS"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25
-msgid "ActivityPub Protocol Settings updated."
-msgstr "�а�тройки протокола ActivityPub обновлены."
+#: ../../Zotlabs/Module/Admin/Site.php:423
+msgid "Administrator Information"
+msgstr "Информаци� об админи�траторе"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:34
+#: ../../Zotlabs/Module/Admin/Site.php:423
 msgid ""
-"The activitypub protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
-msgstr "Протокол ActivityPub не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала."
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:40
-msgid "Activitypub Protocol App"
-msgstr "Приложение \"Протокол ActivityPub\""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Контактна� информаци� дл� админи�траторов �айта. Показывает�� на информационной �транице �айта. Можно и�пользовать BBCode."
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
-msgid "Deliver to ActivityPub recipients in privacy groups"
-msgstr "До�тавить получател�м ActivityPub в группах конфиденциально�ти"
+#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
+msgid "Site Information"
+msgstr "Информаци� о �айте"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
+#: ../../Zotlabs/Module/Admin/Site.php:424
 msgid ""
-"May result in a large number of mentions and expose all the members of your "
-"privacy group"
-msgstr "Может приве�ти к большому количе�тву упоминаний и ра�крытию уча�тников группы конфиденциально�ти"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
-msgid "Send multi-media HTML articles"
-msgstr "Отправить HTML �татьи � мультимедиа"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
-msgid "Not supported by some microblog services such as Mastodon"
-msgstr "�е поддерживает�� некоторыми микроблогами, например Mastodon"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62
-msgid "Activitypub Protocol"
-msgstr "Протокол ActivityPub"
-
-#: ../../addon/ldapauth/ldapauth.php:70
-msgid "An account has been created for you."
-msgstr "Учётна� запи�ь, котора� была дл� ва� �оздана."
-
-#: ../../addon/ldapauth/ldapauth.php:77
-msgid "Authentication successful but rejected: account creation is disabled."
-msgstr "�утентификаци� выполнена у�пешно, но отклонена: �оздание учетной запи�и отключено."
-
-#: ../../addon/dwpost/Mod_Dwpost.php:26
-msgid "Dreamwidth Crosspost Connector Settings saved."
-msgstr "�а�тройки пере�ылки публикаций Dreamwidth �охранены."
-
-#: ../../addon/dwpost/Mod_Dwpost.php:39
-msgid "Dreamwidth Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Dreamwidth\""
-
-#: ../../addon/dwpost/Mod_Dwpost.php:40
-msgid "Relay public posts to Dreamwidth"
-msgstr "Пере�ылать общедо�тупные публикации в Dreamwidth"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:53
-msgid "Dreamwidth username"
-msgstr "Им� пользовател� Dreamwidth"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:57
-msgid "Dreamwidth password"
-msgstr "Пароль Dreamwidth"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:61
-msgid "Post to Dreamwidth by default"
-msgstr "Публиковать в Dreamwidth по умолчанию"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:77
-msgid "Dreamwidth Crosspost Connector"
-msgstr "Публикаци� в Dreamwidth"
-
-#: ../../addon/dwpost/dwpost.php:49
-msgid "Post to Dreamwidth"
-msgstr "Публиковать в Dreamwidth"
-
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslap"
-msgstr "дал леща"
-
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslapped"
-msgstr "получил леща"
-
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shag"
-msgstr "вздрючил"
-
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shagged"
-msgstr "вздрюченный"
-
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patent"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patented"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hug"
-msgstr "обн�л"
-
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hugged"
-msgstr "обн�тый"
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Публичное видимое опи�ание �айта. Показывает�� на информационной �транице �айта. Можно и�пользовать BBCode."
 
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murder"
-msgstr "убил"
+#: ../../Zotlabs/Module/Admin/Site.php:425
+msgid "System language"
+msgstr "Язык �и�темы"
 
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murdered"
-msgstr "убитый"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid "System theme"
+msgstr "Си�темна� тема"
 
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worship"
-msgstr "почитает"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Си�темна� тема по умолчанию  - может быть изменена в профиле пользовател� - <a href='#' id='cnftheme'>изменить параметры темы</a>."
 
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worshipped"
-msgstr "почитаемый"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+msgid "Allow Feeds as Connections"
+msgstr "Разрешить ленты ново�тей как контакты"
 
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kiss"
-msgstr "поцеловал"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+msgid "(Heavy system resource usage)"
+msgstr "(Вы�окое и�пользование �и�темных ре�ур�ов)"
 
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kissed"
-msgstr "поцелованный"
+#: ../../Zotlabs/Module/Admin/Site.php:430
+msgid "Maximum image size"
+msgstr "Мак�имальный размер изображени�"
 
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempt"
-msgstr "и�кушает"
+#: ../../Zotlabs/Module/Admin/Site.php:430
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Мак�имальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений."
 
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempted"
-msgstr "и�кушённый"
+#: ../../Zotlabs/Module/Admin/Site.php:431
+msgid "Minimum age"
+msgstr "Минимальный возра�т"
 
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raise eyebrows at"
-msgstr "подн�л брови"
+#: ../../Zotlabs/Module/Admin/Site.php:431
+msgid "Minimum age (in years) for who may register on this site."
+msgstr "Минимальный возра�т (в годах) дл� реги�трации на �том �айте."
 
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raised their eyebrows at"
-msgstr "подн�л брови"
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "Which best describes the types of account offered by this hub?"
+msgstr "Как лучше опи�ать тип учётных запи�ей предлагаемых на �том хабе?"
 
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insult"
-msgstr "о�корбил"
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "This is displayed on the public server site list."
+msgstr "Это отображает�� в �пи�ке общедо�тупных �ерверов."
 
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insulted"
-msgstr "о�корблённый"
+#: ../../Zotlabs/Module/Admin/Site.php:438
+msgid "Register text"
+msgstr "Тек�т реги�трации"
 
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praise"
-msgstr "похвалил"
+#: ../../Zotlabs/Module/Admin/Site.php:440
+msgid "This text will be displayed prominently at the registration page"
+msgstr "Этот тек�т будет отображать�� на видном ме�те на �транице реги�трации"
 
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praised"
-msgstr "похваленный"
+#: ../../Zotlabs/Module/Admin/Site.php:444
+msgid "Does this site allow new member registration?"
+msgstr "Разрешает�� ли реги�траци� новых пользователей на �том �айте?"
 
-#: ../../addon/morepokes/morepokes.php:30
-msgid "be dubious of"
-msgstr "�омневает��"
+#: ../../Zotlabs/Module/Admin/Site.php:451
+msgid "Configure the registration open days/hours"
+msgstr "�а�тройте рабочие дни / ча�ы реги�трации"
 
-#: ../../addon/morepokes/morepokes.php:30
-msgid "was dubious of"
-msgstr "у�омнил��"
+#: ../../Zotlabs/Module/Admin/Site.php:453
+msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
+msgstr "Пу�тое значение или '-:-' да�т возможно�ть реги�трировать�� 24/7 (по умолчанию) "
 
-#: ../../addon/morepokes/morepokes.php:31
-msgid "eat"
-msgstr "е�т"
+#: ../../Zotlabs/Module/Admin/Site.php:454
+msgid ""
+"Weekdays and hours must be separated by colon ':', From-To ranges with a "
+"dash `-` example: 1:800-1200"
+msgstr "Рабочие дни и ча�ы должны быть разделены двоеточием ':', диапазоны от-до - тире '-'. Пример: 1:800-1200"
 
-#: ../../addon/morepokes/morepokes.php:31
-msgid "ate"
-msgstr "�ъел"
+#: ../../Zotlabs/Module/Admin/Site.php:455
+msgid ""
+"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
+"2:900-1700"
+msgstr "День недели: пары ча�ов должны быть разделены пробелом ' ' пример: 1:900-1700 2:900-1700"
 
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggle and fawn at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:456
+msgid ""
+"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
+"or 1-2,4-5:900-1700"
+msgstr "Диапазоны от-до должны быть разделены зап�той, например: 1:800-1200,1300-1700 или 1-2,4-5:900-1700"
 
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggled and fawned at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:457
+msgid "Advanced examples:"
+msgstr "Дополнительные примеры:"
 
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubt"
-msgstr "�омневает��"
+#: ../../Zotlabs/Module/Admin/Site.php:457
+#: ../../Zotlabs/Module/Settings/Channel.php:420
+msgid "or"
+msgstr "или"
 
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubted"
-msgstr "у�омнил��"
+#: ../../Zotlabs/Module/Admin/Site.php:458
+msgid "Check your configuration"
+msgstr "Проверьте ваши на�тройки"
 
-#: ../../addon/morepokes/morepokes.php:34
-msgid "glare"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:462
+msgid "Max account registrations per day"
+msgstr "Мак�имальное количе�тво реги�траций в день"
 
-#: ../../addon/morepokes/morepokes.php:34
-msgid "glared at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:464
+msgid "Unlimited if zero or no value - default 50"
+msgstr "Без ограничений е�ли значение не предо�тавлено или равно 0 (по умолчанию 50)"
 
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fuck"
-msgstr "трахает"
+#: ../../Zotlabs/Module/Admin/Site.php:468
+msgid "Max account registrations from same IP"
+msgstr "Мак�имальное количе�тво реги�траций � одного IP-адре�а"
 
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fucked"
-msgstr "трахнул"
+#: ../../Zotlabs/Module/Admin/Site.php:470
+msgid "Unlimited if zero or no value - default 3"
+msgstr "Без ограничений е�ли значение не предо�тавлено или равно 0 (по умолчанию 3)"
 
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonk"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:476
+msgid "Auto channel create"
+msgstr "�втоматиче�кое �оздание канала"
 
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonked"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:478
+msgid ""
+"If disabled the channel will be created in a separate step during the "
+"registration process"
+msgstr "Е�ли отключено, канал будет �оздан на отдельном �тапе в проце��е реги�трации"
 
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declare undying love for"
-msgstr "признаёт�� в любви к"
+#: ../../Zotlabs/Module/Admin/Site.php:482
+msgid "Require invite code"
+msgstr "Требует�� код приглашени�"
 
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declared undying love for"
-msgstr "признал�� в любви к"
+#: ../../Zotlabs/Module/Admin/Site.php:487
+msgid "Allow invite code"
+msgstr "Разрешить и�пользовать код приглашени�"
 
-#: ../../addon/rendezvous/rendezvous.php:57
-msgid "Errors encountered deleting database table "
-msgstr "Возникшие при удалении таблицы базы данных ошибки"
+#: ../../Zotlabs/Module/Admin/Site.php:492
+msgid "Require email address"
+msgstr "Требует�� адре� �лектронной почты"
 
-#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:503
-msgid "Submit Settings"
-msgstr "Отправить на�тройки"
+#: ../../Zotlabs/Module/Admin/Site.php:494
+msgid "The provided email address will be verified (recommended)"
+msgstr "Предо�тавленный адре� �лектронной почты должен быт подтверждён (рекомендует��)"
 
-#: ../../addon/rendezvous/rendezvous.php:96
-msgid "Drop tables when uninstalling?"
-msgstr "Удалить таблицы при деин�талл�ции?"
+#: ../../Zotlabs/Module/Admin/Site.php:498
+msgid "Abandon account after x days"
+msgstr "Учётна� запи�ь �читает�� заброшенной по�ле X дней"
 
-#: ../../addon/rendezvous/rendezvous.php:96
+#: ../../Zotlabs/Module/Admin/Site.php:500
 msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin "
-"is uninstalled."
-msgstr "Е�ли включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина."
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Си�темные ре�ур�ы не будут ра�ходовать�� дл� опро�а внешних �айтов дл� заброшенных аккаунтов. Введите 0 дл� от�ут�тви� ограничений."
 
-#: ../../addon/rendezvous/rendezvous.php:97
-msgid "Mapbox Access Token"
-msgstr "Токен до�тупа к Mapbox"
+#: ../../Zotlabs/Module/Admin/Site.php:505
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Домашн�� �траница, котора� будет показывать�� по�етител�м �айт (по умочанию - форма входа)."
 
-#: ../../addon/rendezvous/rendezvous.php:97
+#: ../../Zotlabs/Module/Admin/Site.php:505
 msgid ""
-"If you enter a Mapbox access token, it will be used to retrieve map tiles "
-"from Mapbox instead of the default OpenStreetMap tile server."
-msgstr "Е�ли вы введете токен до�тупа к Mapbox, он будет и�пользовать�� дл� извлечени� фрагментов карты из Mapbox вме�то �тандартного �ервера OpenStreetMap."
+"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr "например: 'pubstream' дл� показа публичного потока, 'page/sys/home' дл� показа �и�темной домашней веб-�траницы или 'include:home.html' дл� включени� файла."
 
-#: ../../addon/rendezvous/rendezvous.php:162
-msgid "Rendezvous"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:506
+msgid "Preserve site homepage URL"
+msgstr "Сохранить URL главной �траницы �айта"
 
-#: ../../addon/rendezvous/rendezvous.php:167
+#: ../../Zotlabs/Module/Admin/Site.php:506
 msgid ""
-"This identity has been deleted by another member due to inactivity. Please "
-"press the \"New identity\" button or refresh the page to register a new "
-"identity. You may use the same name."
-msgstr "Этот идентификатор был удалён другим уча�тником из-за неактивно�ти. Пожалуй�та нажмите кнопку \"�овый идентификатор\" дл� обновлени� �траницы и получени� нового идентификатора. Вы можете и�пользовать то же им�."
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Показывать домашнюю �траницу �айта во фрейме вме�то �тандартной переадре�ации"
 
-#: ../../addon/rendezvous/rendezvous.php:168
-msgid "Welcome to Rendezvous!"
-msgstr "Добро пожаловать в Rendezvous!"
+#: ../../Zotlabs/Module/Admin/Site.php:507
+msgid "Allowed friend domains"
+msgstr "Разрешенные домены друзей"
 
-#: ../../addon/rendezvous/rendezvous.php:169
+#: ../../Zotlabs/Module/Admin/Site.php:507
 msgid ""
-"Enter your name to join this rendezvous. To begin sharing your location with "
-"the other members, tap the GPS control. When your location is discovered, a "
-"red dot will appear and others will be able to see you on the map."
-msgstr "Введите ваше им� дл� в�туплени� в �то Rendezvous. Дл� того, чтобы делить�� вашим положением � другими уча�тниками, нажмите \"GPS control\". Когда ваше ме�тоположение определно, кра�на� точка по�вит�� и о�тальные �могут увидеть ва� на карте."
-
-#: ../../addon/rendezvous/rendezvous.php:171
-msgid "Let's meet here"
-msgstr "Давайте в�третим�� зде�ь"
-
-#: ../../addon/rendezvous/rendezvous.php:172
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113
-#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257
-#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Sharedwithme.php:106
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
-#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:916
-#: ../../Zotlabs/Lib/NativeWikiPage.php:576
-#: ../../Zotlabs/Storage/Browser.php:377
-msgid "Name"
-msgstr "Им�"
-
-#: ../../addon/rendezvous/rendezvous.php:173
-#: ../../addon/cart/submodules/hzservices.php:655
-#: ../../addon/cart/submodules/manualcat.php:260
-#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:481
-#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Опи�ание"
-
-#: ../../addon/rendezvous/rendezvous.php:174
-msgid "New marker"
-msgstr "�овый маркер"
-
-#: ../../addon/rendezvous/rendezvous.php:175
-msgid "Edit marker"
-msgstr "Редактировать маркер"
-
-#: ../../addon/rendezvous/rendezvous.php:176
-msgid "New identity"
-msgstr "�овый идентификатор"
-
-#: ../../addon/rendezvous/rendezvous.php:177
-msgid "Delete marker"
-msgstr "Удалить маркер"
-
-#: ../../addon/rendezvous/rendezvous.php:178
-msgid "Delete member"
-msgstr "Удалить уча�тника"
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr "Спи�ок разделённых зап�тыми доменов � которыми разрешено у�танавливать друже�кие отношени� на �том �айте. Wildcards разрешены. Пу�то означает разрешены любые домены."
 
-#: ../../addon/rendezvous/rendezvous.php:179
-msgid "Edit proximity alert"
-msgstr "Изменить оповещение о близо�ти"
+#: ../../Zotlabs/Module/Admin/Site.php:508
+msgid "Force publish"
+msgstr "Принудительно публиковать"
 
-#: ../../addon/rendezvous/rendezvous.php:180
+#: ../../Zotlabs/Module/Admin/Site.php:508
 msgid ""
-"A proximity alert will be issued when this member is within a certain radius "
-"of you.<br><br>Enter a radius in meters (0 to disable):"
-msgstr "Оповещение о близо�ти будет произведено, е�ли �тот уча�тник находит�� на определённом ра��то�нии от ва�. <br><br>Введите радиу� в метрах (0 дл� отключени�):"
-
-#: ../../addon/rendezvous/rendezvous.php:180
-#: ../../addon/rendezvous/rendezvous.php:185
-msgid "distance"
-msgstr "ра��то�ние"
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Включите дл� принудительного включени� в�ех учётных запи�ей на данном �айте в каталог."
 
-#: ../../addon/rendezvous/rendezvous.php:181
-msgid "Proximity alert distance (meters)"
-msgstr "Ра��то�ние дл� уведомлени� о близо�ти (метров)"
+#: ../../Zotlabs/Module/Admin/Site.php:509
+msgid "Import Public Streams"
+msgstr "Импортированные публичные потоки"
 
-#: ../../addon/rendezvous/rendezvous.php:182
-#: ../../addon/rendezvous/rendezvous.php:184
+#: ../../Zotlabs/Module/Admin/Site.php:509
 msgid ""
-"A proximity alert will be issued when you are within a certain radius of the "
-"marker location.<br><br>Enter a radius in meters (0 to disable):"
-msgstr "Оповещение о близо�ти будет произведено, е�ли вы находите�ь на определённом ра��то�нии ме�тоположени� маркера. <br><br>Введите радиу� в метрах (0 дл� отключени�):"
-
-#: ../../addon/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
-msgstr "Маркер уведомлени� о близо�ти"
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Импортировать и разрешить в�ем до�туп к загружаемым � других �айтов потоков. Внимание - �тот контент не может модерировать��."
 
-#: ../../addon/rendezvous/rendezvous.php:186
-msgid "Reminder note"
-msgstr "�апоминание"
+#: ../../Zotlabs/Module/Admin/Site.php:510
+msgid "Site only Public Streams"
+msgstr "Публичные потоки только � �айта"
 
-#: ../../addon/rendezvous/rendezvous.php:187
+#: ../../Zotlabs/Module/Admin/Site.php:510
 msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
-msgstr "Введите �ообщение дл� отображени� когда вы находите�ь р�дом"
+"Allow access to public content originating only from this site if Imported "
+"Public Streams are disabled."
+msgstr "Разрешить до�туп к общедо�тупному контенту, и�ход�щему только � �того �айта, е�ли импортированные публичные потоки отключены."
 
-#: ../../addon/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
-msgstr "Добавить новое Rendezvous."
+#: ../../Zotlabs/Module/Admin/Site.php:511
+msgid "Allow anybody on the internet to access the Public streams"
+msgstr "Разрешить в�ем до�туп к публичным потокам"
 
-#: ../../addon/rendezvous/rendezvous.php:200
+#: ../../Zotlabs/Module/Admin/Site.php:511
 msgid ""
-"Create a new rendezvous and share the access link with those you wish to "
-"invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or "
-"share their own locations with the group."
-msgstr "Создайте новое Rendezvous и поделите�ь ��ылкой до�тупа � теми, кого вы хотите пригла�ить в группу. Тот, кто откроет �ту ��ылку, �танет её уча�тником. Уча�тники могут видеть ме�тоположение, добавл�ть маркеры на карту или делит�� �воим �об�твенным ме�тоположением � группой."
-
-#: ../../addon/rendezvous/rendezvous.php:232
-msgid "You have no rendezvous. Press the button above to create a rendezvous!"
-msgstr "У ва� нет Rendezvous. �ажмите на кнопку ниже чтобы �оздать его!"
-
-#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:720
-msgid "Errors encountered creating database tables."
-msgstr "При �оздании базы данных возникли ошибки."
-
-#: ../../addon/startpage/Mod_Startpage.php:50
-msgid "Startpage App"
-msgstr "Приложение \"Стартова� �траница\""
-
-#: ../../addon/startpage/Mod_Startpage.php:51
-msgid "Set a preferred page to load on login from home page"
-msgstr "У�танавливает предпочтительную �траницу дл� загрузки при входе � домашней �траницы"
+"Disable to require authentication before viewing. Warning: this content is "
+"unmoderated."
+msgstr "Отключите е�ли дл� про�мотра требует�� аутентификаци�. Внимание - �тот контент не может модерировать��."
 
-#: ../../addon/startpage/Mod_Startpage.php:62
-msgid "Page to load after login"
-msgstr "Страница дл� загрузки по�ле входа"
+#: ../../Zotlabs/Module/Admin/Site.php:512
+msgid "Only import Public stream posts with this text"
+msgstr "Импортировать только публичные потоки � �тим тек�том"
 
-#: ../../addon/startpage/Mod_Startpage.php:62
+#: ../../Zotlabs/Module/Admin/Site.php:512
+#: ../../Zotlabs/Module/Admin/Site.php:513
+#: ../../Zotlabs/Module/Connedit.php:877 ../../Zotlabs/Module/Connedit.php:878
 msgid ""
-"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
-"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
-"blank for default network page (grid)."
-msgstr "Примеры: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (о�тавьте пу�тым дл� дл� �траницы �ети по умолчанию)."
-
-#: ../../addon/startpage/Mod_Startpage.php:70
-msgid "Startpage"
-msgstr "Стартова� �траница"
-
-#: ../../addon/mail/Mod_Mail.php:40
-msgid "Messages"
-msgstr "Сообщени�"
-
-#: ../../addon/mail/Mod_Mail.php:53
-msgid "message"
-msgstr "�ообщение"
-
-#: ../../addon/mail/Mod_Mail.php:93
-msgid "Message recalled."
-msgstr "Сообщение отозванно."
-
-#: ../../addon/mail/Mod_Mail.php:106
-msgid "Conversation removed."
-msgstr "Бе�еда удалена."
-
-#: ../../addon/mail/Mod_Mail.php:121 ../../addon/mail/Mod_Mail.php:242
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "И�текает YYYY-MM-DD HH:MM"
-
-#: ../../addon/mail/Mod_Mail.php:149
-msgid "Requested channel is not in this network"
-msgstr "Запрашиваемый канал не до�тупен."
-
-#: ../../addon/mail/Mod_Mail.php:157
-msgid "Send Private Message"
-msgstr "Отправить личное �ообщение"
-
-#: ../../addon/mail/Mod_Mail.php:158 ../../addon/mail/Mod_Mail.php:301
-msgid "To:"
-msgstr "Кому:"
-
-#: ../../addon/mail/Mod_Mail.php:161 ../../addon/mail/Mod_Mail.php:303
-#: ../../Zotlabs/Module/Invite.php:542
-msgid "Subject:"
-msgstr "Тема:"
-
-#: ../../addon/mail/Mod_Mail.php:164 ../../Zotlabs/Module/Invite.php:539
-msgid "Your message:"
-msgstr "Сообщение:"
-
-#: ../../addon/mail/Mod_Mail.php:166 ../../addon/mail/Mod_Mail.php:309
-msgid "Attach file"
-msgstr "Прикрепить файл"
-
-#: ../../addon/mail/Mod_Mail.php:168
-msgid "Send"
-msgstr "Отправить"
-
-#: ../../addon/mail/Mod_Mail.php:272
-msgid "Delete message"
-msgstr "Удалить �ообщение"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "�лова по одному в �троку, #тег,  /шаблон/ или lang=xxl; о�тавьте пу�тым дл� импорта в�ех публикаций"
 
-#: ../../addon/mail/Mod_Mail.php:273
-msgid "Delivery report"
-msgstr "Отчёт о до�тавке"
+#: ../../Zotlabs/Module/Admin/Site.php:513
+msgid "Do not import Public stream posts with this text"
+msgstr "�е импортировать публичные потоки � �тим тек�том"
 
-#: ../../addon/mail/Mod_Mail.php:274
-msgid "Recall message"
-msgstr "Отозвать �ообщение"
+#: ../../Zotlabs/Module/Admin/Site.php:516
+msgid "Login on Homepage"
+msgstr "Вход на домашней �транице"
 
-#: ../../addon/mail/Mod_Mail.php:276
-msgid "Message has been recalled."
-msgstr "Сообщение отозванно"
+#: ../../Zotlabs/Module/Admin/Site.php:516
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Предо�тавл�ть форму входа дл� по�етителей на домашней �транице е�ли другого �одержимого не на�троено."
 
-#: ../../addon/mail/Mod_Mail.php:294
-msgid "Delete Conversation"
-msgstr "Удалить бе�еду"
+#: ../../Zotlabs/Module/Admin/Site.php:517
+msgid "Enable context help"
+msgstr "Включить контек�тную помощь"
 
-#: ../../addon/mail/Mod_Mail.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:517
 msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Безопа�на� �в�зь недо�тупна. Вы <strong>можете</strong> попытать�� ответить �о �траницы профил� отправител�."
-
-#: ../../addon/mail/Mod_Mail.php:300
-msgid "Send Reply"
-msgstr "Отправить ответ"
+"Display contextual help for the current page when the help button is pressed."
+msgstr "Показывать контек�тную помощь дл� текущей �транице при нажатии на кнопку \"Помощь\"."
 
-#: ../../addon/mail/Mod_Mail.php:305
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Ваше �ообщение дл� %s (%s):"
+#: ../../Zotlabs/Module/Admin/Site.php:519
+msgid "Reply-to email address for system generated email."
+msgstr "�дре� email Reply-to дл� генерируемых �и�темой �ообщений."
 
-#: ../../addon/mail/Mod_Mail.php:385
-msgid "Unable to lookup recipient."
-msgstr "�е удало�ь найти получател�."
+#: ../../Zotlabs/Module/Admin/Site.php:520
+msgid "Sender (From) email address for system generated email."
+msgstr "�дре� email отправител� (From) дл� генерируемых �и�темой �ообщений."
 
-#: ../../addon/mail/Mod_Mail.php:392
-msgid "Unable to communicate with requested channel."
-msgstr "�е удало�ь у�тановить �в�зь � запрашиваемым каналом."
+#: ../../Zotlabs/Module/Admin/Site.php:521
+msgid "Name of email sender for system generated email."
+msgstr "Им� отправител� дл� генерируемых �и�темой �ообщений."
 
-#: ../../addon/mail/Mod_Mail.php:399
-msgid "Cannot verify requested channel."
-msgstr "�е удало�ь у�тановить подлинно�ть требуемого канала."
+#: ../../Zotlabs/Module/Admin/Site.php:523
+msgid "Directory Server URL"
+msgstr "URL �ервера каталогов"
 
-#: ../../addon/mail/Mod_Mail.php:417
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Выбранный канал ограничивает ча�тные �ообщени�. Отправка не удала�ь."
+#: ../../Zotlabs/Module/Admin/Site.php:523
+msgid "Default directory server"
+msgstr "Сервер каталогов по умолчанию"
 
-#: ../../addon/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
-msgstr "Пометка фотографий дл� взро�лых"
+#: ../../Zotlabs/Module/Admin/Site.php:525
+msgid "Enable SSE Notifications"
+msgstr "Включить уведомлени� SSE"
 
-#: ../../addon/adultphotoflag/adultphotoflag.php:25
+#: ../../Zotlabs/Module/Admin/Site.php:525
 msgid ""
-"Provide photo edit option to hide inappropriate photos from default album "
-"view"
-msgstr "Предо�тавьте возможно�ть редактировани� фотографий, чтобы �крыть неприемлемые фотографии из альбома по умолчанию"
-
-#: ../../addon/upgrade_info/upgrade_info.php:48
-msgid "Your channel has been upgraded to $Projectname version"
-msgstr "Ваш канал был обновлён до вер�ии $Projectname"
-
-#: ../../addon/upgrade_info/upgrade_info.php:50
-msgid "Please have a look at the"
-msgstr "Пожалуй�та, взгл�ните на"
-
-#: ../../addon/upgrade_info/upgrade_info.php:52
-msgid "git history"
-msgstr "журнал изменений"
-
-#: ../../addon/upgrade_info/upgrade_info.php:54
-msgid "change log"
-msgstr "и�торию git"
-
-#: ../../addon/upgrade_info/upgrade_info.php:55
-msgid "for further info."
-msgstr "дл� дополнительных �ведений."
-
-#: ../../addon/upgrade_info/upgrade_info.php:60
-msgid "Upgrade Info"
-msgstr "Сведени� об обновлении"
+"If disabled, traditional polling will be used. Warning: this setting might "
+"not be suited for shared hosting"
+msgstr "Е�ли выключено будет и�пользовать�� традиционный периодиче�кий опро�. Предупреждение: �тот режим не подходит дл� виртуального (shared) хо�тинга"
 
-#: ../../addon/upgrade_info/upgrade_info.php:64
-msgid "Do not show this again"
-msgstr "Больше не показывать"
+#: ../../Zotlabs/Module/Admin/Site.php:527
+msgid "Proxy user"
+msgstr "Им� пользовател� proxy-�ервера"
 
-#: ../../addon/twitter/Mod_Twitter.php:65
-msgid "Twitter settings updated."
-msgstr "�а�тройки Twitter обновлены"
+#: ../../Zotlabs/Module/Admin/Site.php:528
+msgid "Proxy URL"
+msgstr "URL proxy-�ервера"
 
-#: ../../addon/twitter/Mod_Twitter.php:78
-msgid "Twitter Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Twitter\""
+#: ../../Zotlabs/Module/Admin/Site.php:529
+msgid "Network timeout"
+msgstr "Врем� ожидани� �ети"
 
-#: ../../addon/twitter/Mod_Twitter.php:79
-msgid "Relay public posts to Twitter"
-msgstr "Пере�ылает общедо�тупные публикации в Twitter"
+#: ../../Zotlabs/Module/Admin/Site.php:529
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Значение в �екундах. Е�ли у�тановлен в 0 - без ограничений (не рекомендует��)."
 
-#: ../../addon/twitter/Mod_Twitter.php:103
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "�е найдено пары ключей дл� Twitter. Пожалуй�та, �в�жите�ь � админи�тратором �айта."
+#: ../../Zotlabs/Module/Admin/Site.php:530
+msgid "Delivery interval"
+msgstr "Интервал до�тавки"
 
-#: ../../addon/twitter/Mod_Twitter.php:125
+#: ../../Zotlabs/Module/Admin/Site.php:530
 msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
-msgstr "В �той у�тановке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Дл� �того нажмите на кнопку ниже дл� получени� PIN-кода от Twitter который нужно �копировать в поле ввода и отправить форму. Только ваши <strong>общедо�тупные</strong> публикации будут опубликованы в Twitter."
-
-#: ../../addon/twitter/Mod_Twitter.php:127
-msgid "Log in with Twitter"
-msgstr "Войти в Twitter"
+"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 "Значение задержки фоновых проце��ов до�тавки в �екундах дл� �нижени� нагрузки на �и�тему. Рекомендует�� 4-5 дл� �ерверов �овме�тного и�пользовани�, 2-3 дл� ча�тных виртуальных и 0-1 дл� выделенных �ерверов."
 
-#: ../../addon/twitter/Mod_Twitter.php:130
-msgid "Copy the PIN from Twitter here"
-msgstr "Скопируйте PIN-код из Twitter зде�ь"
+#: ../../Zotlabs/Module/Admin/Site.php:531
+msgid "Deliveries per process"
+msgstr "До�тавок на проце��"
 
-#: ../../addon/twitter/Mod_Twitter.php:152
+#: ../../Zotlabs/Module/Admin/Site.php:531
 msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в Twitter, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен."
-
-#: ../../addon/twitter/Mod_Twitter.php:157
-msgid "Twitter post length"
-msgstr "Длина публикации Twitter"
-
-#: ../../addon/twitter/Mod_Twitter.php:157
-msgid "Maximum tweet length"
-msgstr "Мак�имальна� длина твита"
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
+msgstr "Количе�тво до�тавок дл� одного проце��а. �а�тройте в �оответ�твии � производительно�тью �и�темы. Рекомендует�� 1-5."
 
-#: ../../addon/twitter/Mod_Twitter.php:162
-msgid "Send public postings to Twitter by default"
-msgstr "Отправл�ть общедо�тупные публикации в Twitter по умолчанию"
+#: ../../Zotlabs/Module/Admin/Site.php:532
+msgid "Queue Threshold"
+msgstr "Порог очереди"
 
-#: ../../addon/twitter/Mod_Twitter.php:162
+#: ../../Zotlabs/Module/Admin/Site.php:532
 msgid ""
-"If enabled your public postings will be posted to the associated Twitter "
-"account by default"
-msgstr "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и Twitter по умолчанию"
-
-#: ../../addon/twitter/Mod_Twitter.php:181
-msgid "Twitter Crosspost Connector"
-msgstr "Публикаци� в Twitter"
-
-#: ../../addon/twitter/twitter.php:109
-msgid "Post to Twitter"
-msgstr "Опубликовать в Twitter"
-
-#: ../../addon/pumpio/pumpio.php:152
-msgid "You are now authenticated to pumpio."
-msgstr "Вы аутентифицированы в Pump.io"
-
-#: ../../addon/pumpio/pumpio.php:153
-msgid "return to the featured settings page"
-msgstr "Вернут�� к �транице на�троек"
-
-#: ../../addon/pumpio/pumpio.php:168
-msgid "Post to Pump.io"
-msgstr "Опубликовать в Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:40
-msgid "Pump.io Settings saved."
-msgstr "�а�тройки Pump.io �охранены."
-
-#: ../../addon/pumpio/Mod_Pumpio.php:53
-msgid "Pump.io Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Pump.io\""
-
-#: ../../addon/pumpio/Mod_Pumpio.php:54
-msgid "Relay public posts to pump.io"
-msgstr "Пере�ылает общедо�тупные публикации в Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:73
-msgid "Pump.io servername"
-msgstr "Им� �ервера Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:73
-msgid "Without \"http://\" or \"https://\""
-msgstr "Без \"http://\" или \"https://\""
-
-#: ../../addon/pumpio/Mod_Pumpio.php:77
-msgid "Pump.io username"
-msgstr "Им� пользовател� Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:77
-msgid "Without the servername"
-msgstr "без имени �ервера"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:88
-msgid "You are not authenticated to pumpio"
-msgstr "Вы не аутентифицированы на Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:90
-msgid "(Re-)Authenticate your pump.io connection"
-msgstr "�утентифицировать (повторно) ваше �оединение � Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:94
-msgid "Post to pump.io by default"
-msgstr "Публиковать в Pump.io по умолчанию"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:98
-msgid "Should posts be public"
-msgstr "Публикации должны быть общедо�тупными"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:102
-msgid "Mirror all public posts"
-msgstr "Отображать в�е общедо�тупные публикации"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:112
-msgid "Pump.io Crosspost Connector"
-msgstr "Публикаци� в Pump.io"
-
-#: ../../addon/gravatar/gravatar.php:123
-msgid "generic profile image"
-msgstr "Стандартное изображение профил�"
-
-#: ../../addon/gravatar/gravatar.php:124
-msgid "random geometric pattern"
-msgstr "Случайный геометриче�кий ри�унок"
-
-#: ../../addon/gravatar/gravatar.php:125
-msgid "monster face"
-msgstr "Лицо чудовища"
-
-#: ../../addon/gravatar/gravatar.php:126
-msgid "computer generated face"
-msgstr "Сгенерированное компьютером лицо"
-
-#: ../../addon/gravatar/gravatar.php:127
-msgid "retro arcade style face"
-msgstr "Лицо в �тиле �тарой аркадной игры"
-
-#: ../../addon/gravatar/gravatar.php:128
-msgid "Hub default profile photo"
-msgstr "Фотографи� профил� по умолчанию"
+"Always defer immediate delivery if queue contains more than this number of "
+"entries."
+msgstr "В�егда откладывать немедленную до�тавку, е�ли в очереди �одержит�� большее количе�тво запи�ей, чем �то."
 
-#: ../../addon/gravatar/gravatar.php:143
-msgid "Information"
-msgstr "Информаци�"
+#: ../../Zotlabs/Module/Admin/Site.php:533
+msgid "Poll interval"
+msgstr "Интервал опро�а"
 
-#: ../../addon/gravatar/gravatar.php:143
+#: ../../Zotlabs/Module/Admin/Site.php:533
 msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr "Плагин Libravatar также у�тановлен. Пожалуй�та, отключите плагин Libravatar или �тот плагин Gravatar. Е�ли Плагин Libravatar ничего не найдёт, он вернёт�� в Gravatar."
-
-#: ../../addon/gravatar/gravatar.php:150 ../../addon/msgfooter/msgfooter.php:46
-#: ../../addon/xmpp/xmpp.php:43
-msgid "Save Settings"
-msgstr "Сохранить на�тройки"
-
-#: ../../addon/gravatar/gravatar.php:151
-msgid "Default avatar image"
-msgstr "Изображение аватара по умолчанию"
-
-#: ../../addon/gravatar/gravatar.php:151
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Выберите изображени� аватар по умолчанию е�ли ничего не было найдено в Gravatar (�м. README)."
-
-#: ../../addon/gravatar/gravatar.php:152
-msgid "Rating of images"
-msgstr "Оценки изображений"
-
-#: ../../addon/gravatar/gravatar.php:152
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Выберите подход�щую оценку аватара дл� вашего �айта (�м. README)."
-
-#: ../../addon/gravatar/gravatar.php:165
-msgid "Gravatar settings updated."
-msgstr "�а�тройки Gravatar обновлены."
-
-#: ../../addon/msgfooter/msgfooter.php:47
-msgid "text to include in all outgoing posts from this site"
-msgstr "тек�т, который будет добавлен во в�е и�ход�щие публикации � �того �айта"
-
-#: ../../addon/sendzid/Mod_Sendzid.php:14
-msgid "Send your identity to all websites"
-msgstr "Отправить ваши данные на в�е веб-�айты"
-
-#: ../../addon/sendzid/Mod_Sendzid.php:20
-msgid "Sendzid App"
-msgstr "Приложение \"Отправить ZID\""
-
-#: ../../addon/sendzid/Mod_Sendzid.php:32
-msgid "Send ZID"
-msgstr "Отправить ZID"
-
-#: ../../addon/cart/widgets/catalogitem.php:57
-#: ../../addon/cart/submodules/hzservices.php:658
-#: ../../addon/cart/submodules/manualcat.php:263
-msgid "Price"
-msgstr "Цена"
-
-#: ../../addon/cart/manual_payments.php:7
-msgid "Error: order mismatch. Please try again."
-msgstr "Ошибка: не�оответ�твие заказа. Пожалуй�та, попробуйте ещё раз"
-
-#: ../../addon/cart/manual_payments.php:61
-msgid "Manual payments are not enabled."
-msgstr "Ручные платежи не подключены."
-
-#: ../../addon/cart/manual_payments.php:68
-#: ../../addon/cart/submodules/paypalbutton.php:392
-#: ../../addon/cart/submodules/paypalbuttonV2.php:409
-#: ../../addon/cart/cart.php:1578
-msgid "Order not found."
-msgstr "Заказ не найден."
-
-#: ../../addon/cart/manual_payments.php:77
-msgid "Finished"
-msgstr "Завершено"
-
-#: ../../addon/cart/manual_payments.php:93
-#: ../../addon/cart/submodules/paypalbutton.php:456
-#: ../../addon/cart/submodules/paypalbuttonV2.php:478
-#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1556
-#: ../../Zotlabs/Module/Wiki.php:77
-msgid "Invalid channel"
-msgstr "�едей�твительный канал"
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Задержка фоновых проце��ов опро�а на указанное количе�тво �екунд дл� �нижени� нагрузки на �и�тему. Е�ли 0 - и�пользовать интервал до�тавки."
 
-#: ../../addon/cart/submodules/subscriptions.php:151
-msgid "Enable Subscription Management Module"
-msgstr "Включить модуль управлени� подпи�ками"
+#: ../../Zotlabs/Module/Admin/Site.php:534
+msgid "Path to ImageMagick convert program"
+msgstr "Путь к ImageMagick"
 
-#: ../../addon/cart/submodules/subscriptions.php:223
+#: ../../Zotlabs/Module/Admin/Site.php:534
 msgid ""
-"Cannot include subscription items with different terms in the same order."
-msgstr "�ельз� включать �лементы подпи�ки � разными у�лови�ми в том же заказе."
-
-#: ../../addon/cart/submodules/subscriptions.php:372
-msgid "Select Subscription to Edit"
-msgstr "Выбрать подпи�ку дл� редактировани�"
-
-#: ../../addon/cart/submodules/subscriptions.php:380
-msgid "Edit Subscriptions"
-msgstr "Редактировать подпи�ки"
-
-#: ../../addon/cart/submodules/subscriptions.php:414
-msgid "Subscription SKU"
-msgstr "Код подпи�ки"
-
-#: ../../addon/cart/submodules/subscriptions.php:419
-msgid "Catalog Description"
-msgstr "Опи�ание каталога"
-
-#: ../../addon/cart/submodules/subscriptions.php:423
-msgid "Subscription available for purchase."
-msgstr "Подпи�ка до�тупна дл� покупки."
-
-#: ../../addon/cart/submodules/subscriptions.php:428
-msgid "Maximum active subscriptions to this item per account."
-msgstr "Мак�имальное количе�тво подпи�ок на аккаунт дл� �той позиции"
-
-#: ../../addon/cart/submodules/subscriptions.php:431
-msgid "Subscription price."
-msgstr "Цена подпи�ки."
-
-#: ../../addon/cart/submodules/subscriptions.php:435
-msgid "Quantity"
-msgstr "Количе�тво"
-
-#: ../../addon/cart/submodules/subscriptions.php:439
-msgid "Term"
-msgstr "У�лови�"
-
-#: ../../addon/cart/submodules/hzservices.php:63
-msgid "Enable Hubzilla Services Module"
-msgstr "Включить модуль �ерви�а Hubzilla"
-
-#: ../../addon/cart/submodules/hzservices.php:162
-#: ../../addon/cart/submodules/manualcat.php:172
-msgid "New Sku"
-msgstr "�овый код"
-
-#: ../../addon/cart/submodules/hzservices.php:197
-#: ../../addon/cart/submodules/manualcat.php:208
-msgid "Cannot save edits to locked item."
-msgstr "�евозможно �охранить изменени� заблокированной позиции."
-
-#: ../../addon/cart/submodules/hzservices.php:246
-#: ../../addon/cart/submodules/hzservices.php:333
-msgid "SKU not found."
-msgstr "Код не найден."
-
-#: ../../addon/cart/submodules/hzservices.php:299
-#: ../../addon/cart/submodules/hzservices.php:303
-msgid "Invalid Activation Directive."
-msgstr "�едей�твительна� директива активации."
-
-#: ../../addon/cart/submodules/hzservices.php:374
-#: ../../addon/cart/submodules/hzservices.php:378
-msgid "Invalid Deactivation Directive."
-msgstr "�едей�твительна� директива деактивации"
-
-#: ../../addon/cart/submodules/hzservices.php:564
-msgid "Add to this privacy group"
-msgstr "Добавить в �ту группу конфиденциально�ти"
-
-#: ../../addon/cart/submodules/hzservices.php:580
-msgid "Set user service class"
-msgstr "У�тановить кла�� об�луживани� пользовател�"
-
-#: ../../addon/cart/submodules/hzservices.php:607
-msgid "You must be using a local account to purchase this service."
-msgstr "Вы должны и�пользовать локальную учётноую запи�ь дл� покупки �того �ерви�а."
-
-#: ../../addon/cart/submodules/hzservices.php:647
-#: ../../addon/cart/submodules/manualcat.php:252
-msgid "Changes Locked"
-msgstr "Изменени� заблокированы"
-
-#: ../../addon/cart/submodules/hzservices.php:651
-#: ../../addon/cart/submodules/manualcat.php:256
-msgid "Item available for purchase."
-msgstr "Позици� до�тупна дл� приобретени�."
-
-#: ../../addon/cart/submodules/hzservices.php:661
-#: ../../addon/cart/submodules/manualcat.php:266
-msgid "Photo URL"
-msgstr "URL изображени�"
-
-#: ../../addon/cart/submodules/hzservices.php:665
-msgid "Add buyer to privacy group"
-msgstr "Добавить покупател� в группу конфиденциально�ти"
-
-#: ../../addon/cart/submodules/hzservices.php:670
-msgid "Add buyer as connection"
-msgstr "Добавить покупател� как контакт"
-
-#: ../../addon/cart/submodules/hzservices.php:678
-#: ../../addon/cart/submodules/hzservices.php:720
-msgid "Set Service Class"
-msgstr "У�тановить кла�� об�луживани�"
-
-#: ../../addon/cart/submodules/orderoptions.php:70
-msgid "Enable Order/Item Options"
-msgstr "Включить параметры заказа / позиции"
-
-#: ../../addon/cart/submodules/orderoptions.php:333
-#: ../../addon/cart/submodules/orderoptions.php:357
-#: ../../addon/cart/submodules/orderoptions.php:433
-#: ../../addon/cart/submodules/orderoptions.php:457
-msgid "Label"
-msgstr "Метка"
-
-#: ../../addon/cart/submodules/orderoptions.php:334
-#: ../../addon/cart/submodules/orderoptions.php:358
-#: ../../addon/cart/submodules/orderoptions.php:434
-#: ../../addon/cart/submodules/orderoptions.php:458
-#: ../../include/js_strings.php:123 ../../include/datetime.php:211
-#: ../../Zotlabs/Module/Register.php:522 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143
-#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:747
-#: ../../Zotlabs/Module/Profiles.php:751
-msgid "Required"
-msgstr "Требует��"
-
-#: ../../addon/cart/submodules/orderoptions.php:336
-#: ../../addon/cart/submodules/orderoptions.php:360
-#: ../../addon/cart/submodules/orderoptions.php:436
-#: ../../addon/cart/submodules/orderoptions.php:460
-msgid "Instructions"
-msgstr "Ин�трукции"
-
-#: ../../addon/cart/submodules/paypalbutton.php:85
-msgid "Enable Paypal Button Module"
-msgstr "Включить модуль кнопки Paypal"
-
-#: ../../addon/cart/submodules/paypalbutton.php:93
-#: ../../addon/cart/submodules/paypalbuttonV2.php:94
-msgid "Use Production Key"
-msgstr "И�пользовать ключ Production"
-
-#: ../../addon/cart/submodules/paypalbutton.php:100
-#: ../../addon/cart/submodules/paypalbuttonV2.php:101
-msgid "Paypal Sandbox Client Key"
-msgstr "Ключ клиента Paypal Sandbox"
-
-#: ../../addon/cart/submodules/paypalbutton.php:107
-#: ../../addon/cart/submodules/paypalbuttonV2.php:108
-msgid "Paypal Sandbox Secret Key"
-msgstr "Секретный ключ Paypal Sandbox"
-
-#: ../../addon/cart/submodules/paypalbutton.php:113
-#: ../../addon/cart/submodules/paypalbuttonV2.php:114
-msgid "Paypal Production Client Key"
-msgstr "Ключ клиента Paypal Production"
-
-#: ../../addon/cart/submodules/paypalbutton.php:120
-#: ../../addon/cart/submodules/paypalbuttonV2.php:121
-msgid "Paypal Production Secret Key"
-msgstr "Секретный ключ Paypal Production"
+"If set, use this program to generate photo thumbnails for huge images ( > "
+"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
+"Example: /usr/bin/convert"
+msgstr "При у�тановке �та программа генерирует миниатюры изображений дл� больших файлов (�выше 4000 в любом измерении) дл� предотвращени� утечки пам�ти. Пример: /usr/bin/convert"
 
-#: ../../addon/cart/submodules/paypalbutton.php:252
-#: ../../addon/cart/submodules/paypalbuttonV2.php:264
-msgid "Paypal button payments are not enabled."
-msgstr "Кнопка Paypal дл� платежей не включена."
+#: ../../Zotlabs/Module/Admin/Site.php:535
+msgid "Maximum Load Average"
+msgstr "Мак�имальна� �редн�� нагрузка"
 
-#: ../../addon/cart/submodules/paypalbutton.php:270
-#: ../../addon/cart/submodules/paypalbuttonV2.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:535
 msgid ""
-"Paypal button payments are not properly configured.  Please choose another "
-"payment option."
-msgstr "Кнопка Paypal дл� платежей на�троена неправильно. Пожалуй�та, и�пользуйте другой вариант оплаты."
-
-#: ../../addon/cart/submodules/paypalbuttonV2.php:86
-msgid "Enable Paypal Button Module (API-v2)"
-msgstr "Включить модуль кнопки Paypal (API-v2)"
-
-#: ../../addon/cart/submodules/manualcat.php:61
-msgid "Enable Manual Cart Module"
-msgstr "Включить модуль ручного управлени� карточками"
-
-#: ../../addon/cart/myshop.php:30
-msgid "Access Denied."
-msgstr "До�туп запрещён."
-
-#: ../../addon/cart/myshop.php:112 ../../addon/cart/cart.php:1446
-msgid "Order Not Found"
-msgstr "Заказ не найден"
-
-#: ../../addon/cart/myshop.php:189 ../../addon/cart/myshop.php:223
-#: ../../addon/cart/myshop.php:271 ../../addon/cart/myshop.php:329
-msgid "Invalid Item"
-msgstr "�едей�твительный �лемент"
-
-#: ../../addon/cart/Settings/Cart.php:58
-msgid "Enable Test Catalog"
-msgstr "Включить те�товый каталог"
-
-#: ../../addon/cart/Settings/Cart.php:70
-msgid "Enable Manual Payments"
-msgstr "Включить ручные платежи"
-
-#: ../../addon/cart/Settings/Cart.php:90
-msgid "Base Merchant Currency"
-msgstr "О�новна� торгова� валюта"
-
-#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1375
-msgid "Cart Settings"
-msgstr "�а�тройки карточек"
-
-#: ../../addon/cart/cart.php:252
-msgid "DB Cleanup Failure"
-msgstr "Сбой очи�тки базы данных"
-
-#: ../../addon/cart/cart.php:674
-msgid "[cart] Item Added"
-msgstr "[cart] Элемент добавлен"
-
-#: ../../addon/cart/cart.php:1063
-msgid "Order already checked out."
-msgstr "Заказ уже проверен."
-
-#: ../../addon/cart/cart.php:1368
-msgid "Drop database tables when uninstalling."
-msgstr "Сбро�ить таблицы базы данных при деин�талл�ции"
-
-#: ../../addon/cart/cart.php:1387 ../../addon/cart/cart.php:1390
-msgid "Shop"
-msgstr "Магазин"
-
-#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:51
-#: ../../Zotlabs/Module/Wiki.php:35
-msgid "Profile Unavailable."
-msgstr "Профиль недо�тупен."
-
-#: ../../addon/cart/cart.php:1507
-msgid "Cart utilities for orders and payments"
-msgstr "Утилиты карточек дл� заказов и платежей"
-
-#: ../../addon/cart/cart.php:1545
-msgid "You must be logged into the Grid to shop."
-msgstr "Вы должны быть в �ети дл� до�тупа к магазину"
-
-#: ../../addon/cart/cart.php:1592
-msgid "Access denied."
-msgstr "До�туп запрещён."
-
-#: ../../addon/cart/cart.php:1644 ../../addon/cart/cart.php:1787
-msgid "No Order Found"
-msgstr "�ет найденных заказов"
-
-#: ../../addon/cart/cart.php:1653
-msgid "An unknown error has occurred Please start again."
-msgstr "Произошла неизве�тна� ошибка. Пожалуй�та, начните �нова."
-
-#: ../../addon/cart/cart.php:1796
-msgid "Requirements not met."
-msgstr "Требовани� не �облюдены."
-
-#: ../../addon/cart/cart.php:1796
-msgid "Review your order and complete any needed requirements."
-msgstr "Ÿро�мотрите �вой заказ и выполните в�е необходимые требовани�"
-
-#: ../../addon/cart/cart.php:1822
-msgid "Invalid Payment Type.  Please start again."
-msgstr "�едей�твительный тип платежа. Пожалуй�та, начните �нова."
-
-#: ../../addon/cart/cart.php:1829
-msgid "Order not found"
-msgstr "Заказ не найден"
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Мак�имальна� нагрузка �и�темы дл� откладывани� проце��ов опро�а и до�тавки - по умолчанию 50."
 
-#: ../../addon/nofed/Mod_Nofed.php:21
-msgid "nofed Settings saved."
-msgstr "�а�тройки nofed �охранены."
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid "Expiration period in days for imported (grid/network) content"
+msgstr "Срок хранени� в дн�х дл� импортированного �одержимого (из матрицы / �ети)."
 
-#: ../../addon/nofed/Mod_Nofed.php:33
-msgid "No Federation App"
-msgstr "Приложение No Federation"
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid "0 for no expiration of imported content"
+msgstr "0 дл� по�то�нного хранени� импортированного �одержимого"
 
-#: ../../addon/nofed/Mod_Nofed.php:34
+#: ../../Zotlabs/Module/Admin/Site.php:537
 msgid ""
-"Prevent posting from being federated to anybody. It will exist only on your "
-"channel page."
-msgstr "Запрещает федеративные функций дл� публикаций. Они будут �уще�твовать только на �транице вашего канала."
-
-#: ../../addon/nofed/Mod_Nofed.php:42
-msgid "Federate posts by default"
-msgstr "Разрешить федерацию публикаций по умолчанию"
-
-#: ../../addon/nofed/Mod_Nofed.php:50
-msgid "No Federation"
-msgstr "Отключить Federation"
-
-#: ../../addon/nofed/nofed.php:47
-msgid "Federate"
-msgstr "Федерировать"
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:35
-msgid "Smileybutton App"
-msgstr "Приложение \"Кнопка �о �майликам\""
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:36
-msgid "Adds a smileybutton to the jot editor"
-msgstr "Добавл�ть кнопку �о �майликами в редактор Jot"
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:44
-msgid "Hide the button and show the smilies directly."
-msgstr "Скрыть кнопку и �разу показывать �майлики."
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:52
-msgid "Smileybutton Settings"
-msgstr "�а�тройки кнопки �о �майликами"
-
-#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2099
-msgid "file"
-msgstr "файл"
-
-#: ../../addon/redfiles/redfiles.php:119
-msgid "Redmatrix File Storage Import"
-msgstr "Импорт файлового хранилища Redmatrix"
-
-#: ../../addon/redfiles/redfiles.php:120
-msgid "This will import all your Redmatrix cloud files to this channel."
-msgstr "Это позволит импортировать в�е ваши файлы в Redmatrix в �тот канал."
+"Do not expire any posts which have comments less than this many days ago"
+msgstr "Продлевать �трок хранени� дл� любых публикаций, которые имеют комментарии возра�том менее �того значени�"
 
-#: ../../addon/diaspora/diaspora.php:70
+#: ../../Zotlabs/Module/Admin/Site.php:538
 msgid ""
-"Please install the statistics addon to be able to configure a diaspora relay"
-msgstr "Пожалуй�та, у�тановите ра�ширение �тати�тики, чтобы иметь возможно�ть на�траивать пере�ылку Diaspora"
-
-#: ../../addon/diaspora/diaspora.php:80
-msgid "Diaspora Relay Handle"
-msgstr "Пере�ылка Diaspora"
-
-#: ../../addon/diaspora/diaspora.php:80
-msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
-msgstr "�дре� пере�ылки Diaspora. �апример: relay@diasporarelay.tld"
-
-#: ../../addon/diaspora/diaspora.php:100
-msgid "Diaspora relay could not be imported"
-msgstr "�евозможно импортировать адре� пере�ылки Diaspora"
-
-#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:336
-#: ../../addon/diaspora/util.php:349 ../../Zotlabs/Lib/Enotify.php:61
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../addon/diaspora/import_diaspora.php:19
-msgid "No username found in import file."
-msgstr "Им� пользовател� не найдено в файле дл� импорта."
-
-#: ../../addon/diaspora/import_diaspora.php:44 ../../include/import.php:76
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "�е удало�ь �оздать уникальный адре� канала. Импорт не завершен."
+"Public servers: Optional landing (marketing) webpage for new registrants"
+msgstr "Публичные �ерверы: необ�зательна� маркетингова� л�ндинг-�траница дл� новых пользователей"
 
-#: ../../addon/diaspora/import_diaspora.php:142
-#: ../../Zotlabs/Module/Import.php:595
-msgid "Import completed."
-msgstr "Импорт завершен."
+#: ../../Zotlabs/Module/Admin/Site.php:538
+#, php-format
+msgid "Create this page first. Default is %s/register"
+msgstr "Создать �ту �траницу первой. По умолчанию %s/register"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:43
-msgid "Diaspora Protocol Settings updated."
-msgstr "�а�тройки протокола Diaspora обновлены."
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "Page to display after creating a new channel"
+msgstr "Страница дл� показа по�ле �оздани� нового канала"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:52
-msgid ""
-"The diaspora protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
-msgstr "Протокол Diaspora не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала."
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "Default: profiles"
+msgstr "По умолчанию: profiles"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:58
-msgid "Diaspora Protocol App"
-msgstr "Приложение \"Протокол Diaspora\""
+#: ../../Zotlabs/Module/Admin/Site.php:540
+msgid "Optional: site location"
+msgstr "�еоб�зательно: ме�то размещени� �айта"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:77
-msgid "Allow any Diaspora member to comment or like your public posts"
-msgstr "Разрешить любому уча�тнику Diaspora комментировать или отмечать понравившими�� ваши общедо�тупные �ообщени�"
+#: ../../Zotlabs/Module/Admin/Site.php:540
+msgid "Region or country"
+msgstr "Регион или �трана"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:77
-msgid ""
-"If this setting is disabled only your contacts will be able to comment or "
-"like your public posts"
-msgstr "Е�ли �тот параметр отключен, только ваши контакты �могут комментировать или лайкать ваши общедо�тупные �ообщени�"
+#: ../../Zotlabs/Module/Admin/Site.php:625
+#: ../../Zotlabs/Module/Admin/Site.php:626
+msgid "Invalid 24h time value (hhmm/hmm)"
+msgstr "�еверное 24-ча�овое значение (допу�тимо \"ччмм\" или \"чмм\")"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:81
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Предотвратить перенаправление тегов на другие �айты"
+#: ../../Zotlabs/Module/Admin/Channels.php:31
+#, php-format
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] "%s канал цензурирует��/нецензурирует��"
+msgstr[1] "%s канала цензурируют��/нецензурируют��"
+msgstr[2] "%s каналов цензурируют��/нецензурируют��"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:85
-msgid "Sign and forward posts and comments with no existing Diaspora signature"
-msgstr "Подпи�ывать и отправл�ть публикации и комментарии � не�уще�твующей подпи�ью Diaspora"
+#: ../../Zotlabs/Module/Admin/Channels.php:40
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] "в %s канале код разрешён/запрещён"
+msgstr[1] "в %s каналах код разрешён/запрещён"
+msgstr[2] "в %s каналах код разрешён/запрещён"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:90
-msgid "Followed hashtags (comma separated, do not include the #)"
-msgstr "От�леживаемые теги (через зап�тую, и�ключа� #)"
+#: ../../Zotlabs/Module/Admin/Channels.php:46
+#, php-format
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] "%s канал удалён"
+msgstr[1] "%s канала удалены"
+msgstr[2] "%s каналов удалены"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:99
-msgid "Diaspora Protocol"
-msgstr "Протокол Diaspora"
+#: ../../Zotlabs/Module/Admin/Channels.php:65
+msgid "Channel not found"
+msgstr "Канал не найден"
 
-#: ../../addon/diaspora/Receiver.php:1599
+#: ../../Zotlabs/Module/Admin/Channels.php:75
 #, php-format
-msgid "%1$s dislikes %2$s's %3$s"
-msgstr "%1$s не нравит�� %2$s's %3$s"
+msgid "Channel '%s' deleted"
+msgstr "Канал '%s' удалён"
 
-#: ../../addon/diaspora/Receiver.php:2226 ../../Zotlabs/Module/Like.php:481
+#: ../../Zotlabs/Module/Admin/Channels.php:87
 #, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s по�ещает %2$s%3$s"
+msgid "Channel '%s' censored"
+msgstr "Канал '%s' цензурирует��"
 
-#: ../../addon/diaspora/Receiver.php:2228 ../../Zotlabs/Module/Like.php:483
+#: ../../Zotlabs/Module/Admin/Channels.php:87
 #, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s не по�ещает %2$s%3$s"
+msgid "Channel '%s' uncensored"
+msgstr "Канал '%s' нецензурирует��"
 
-#: ../../addon/diaspora/Receiver.php:2230 ../../Zotlabs/Module/Like.php:485
+#: ../../Zotlabs/Module/Admin/Channels.php:98
 #, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s может по�етить %2$s%3$s"
-
-#: ../../addon/piwik/piwik.php:85
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
-msgstr "Этот �айт от�леживает�� � помощью ин�трументов аналитики <a href='http://www.piwik.org'>Piwik</a>."
+msgid "Channel '%s' code allowed"
+msgstr "Код в канале '%s' разрешён"
 
-#: ../../addon/piwik/piwik.php:88
+#: ../../Zotlabs/Module/Admin/Channels.php:98
 #, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
-msgstr "Е�ли вы не хотите, чтобы ваши визиты реги�трировали�ь таким образом, вы <a href='%s'>можете отключить cookie � тем, чтобы Piwik не от�леживал дальнейшие по�ещени� �айта</a>."
-
-#: ../../addon/piwik/piwik.php:96
-msgid "Piwik Base URL"
-msgstr "Базовый URL Piwik"
+msgid "Channel '%s' code disallowed"
+msgstr "Код в канале '%s' запрещён"
 
-#: ../../addon/piwik/piwik.php:96
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "�б�олютный путь к вашей у�тановке Piwik (без типа протокола, � начальным �л�шем)"
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Module/Admin.php:116 ../../Zotlabs/Widget/Admin.php:24
+msgid "Channels"
+msgstr "Каналы"
 
-#: ../../addon/piwik/piwik.php:97
-msgid "Site ID"
-msgstr "ID �айта"
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
+msgstr "выбрать в�е"
 
-#: ../../addon/piwik/piwik.php:98
-msgid "Show opt-out cookie link?"
-msgstr "Показывать ��ылку на отказ от и�пользовани� cookies?"
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Censor"
+msgstr "Цензурировать"
 
-#: ../../addon/piwik/piwik.php:99
-msgid "Asynchronous tracking"
-msgstr "��инхронное от�леживание"
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Uncensor"
+msgstr "�ецензурировать"
 
-#: ../../addon/piwik/piwik.php:100
-msgid "Enable frontend JavaScript error tracking"
-msgstr "Включить от�леживание ошибок JavaScript на фронтенде."
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
+msgstr "Разрешить код"
 
-#: ../../addon/piwik/piwik.php:100
-msgid "This feature requires Piwik >= 2.2.0"
-msgstr "Эта функци� требует вер�ию Piwik >= 2.2.0"
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
+msgstr "Запретить код"
 
-#: ../../addon/workflow/workflow.php:222
-msgid "Workflow user."
-msgstr "Пользователь \"Рабочего проце��а\"."
+#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421
+msgid "Channel"
+msgstr "Канал"
 
-#: ../../addon/workflow/workflow.php:272
-msgid "This channel"
-msgstr "Этот канал"
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
+msgstr ""
 
-#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:130
-msgid "Primary"
-msgstr "О�новной"
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Oauth.php:113
+#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257
+#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Connedit.php:908
+#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
+#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Storage/Browser.php:377
+#: ../../Zotlabs/Lib/NativeWikiPage.php:576
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172
+msgid "Name"
+msgstr "Им�"
 
-#: ../../addon/workflow/workflow.php:541 ../../addon/workflow/workflow.php:1437
-#: ../../addon/workflow/workflow.php:1456
-msgid "Workflow"
-msgstr "Рабочий проце��"
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:791
+#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Connedit.php:915
+msgid "Address"
+msgstr "�дре�"
 
-#: ../../addon/workflow/workflow.php:1425
-msgid "No Workflows Available"
-msgstr "�ет до�тупных рабочих проце��ов"
+#: ../../Zotlabs/Module/Admin/Channels.php:162
+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 "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
 
-#: ../../addon/workflow/workflow.php:1455
-msgid "Add item to which workflow"
-msgstr "Подключить рабочий проце�� к �лементу"
+#: ../../Zotlabs/Module/Admin/Channels.php:163
+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 "Канал {0} будет удалён!\n\nВ�ё что было опубликовано в �том канале на �том �айте будет удалено нав�егда!\n\nВы уверены?"
 
-#: ../../addon/workflow/workflow.php:1515
-#: ../../addon/workflow/workflow.php:1634
-msgid "Create Workflow Item"
-msgstr "Создать �лемент рабочего проце��а"
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
+msgstr "По умолчанию, HTML без фильтрации до�тупен во в�траиваемых медиа. Это небезопа�но."
 
-#: ../../addon/workflow/workflow.php:2596
-msgid "Link"
-msgstr "С�ылка"
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "Рекомендует�� на�троить разрешени� и�пользовать HTML без фильтрации только дл� �ледующих �айтов:"
 
-#: ../../addon/workflow/workflow.php:2598
-msgid "Web link."
-msgstr "Веб-��ылка."
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr ""
 
-#: ../../addon/workflow/workflow.php:2617
-#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1375
-#: ../../Zotlabs/Module/Connedit.php:918
-msgid "Title"
-msgstr "�аименование"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr "�е о�тальные в�троенные материалы будут отфильтрованы, <strong>е�ли </strong> в�троенное �одержимое � �того �айта �вно заблокировано."
 
-#: ../../addon/workflow/workflow.php:2619
-#: ../../addon/workflow/workflow.php:2680
-msgid "Brief description or title"
-msgstr "Подробное опи�ание или заголовок"
+#: ../../Zotlabs/Module/Admin/Security.php:99 ../../Zotlabs/Widget/Admin.php:25
+msgid "Security"
+msgstr "Безопа�но�ть"
 
-#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:21
-#: ../../Zotlabs/Lib/Apps.php:370
-msgid "Notes"
-msgstr "Запи�ки"
+#: ../../Zotlabs/Module/Admin/Security.php:101
+msgid "Block public"
+msgstr "Блокировать публичный до�туп"
 
-#: ../../addon/workflow/workflow.php:2627
-#: ../../addon/workflow/workflow.php:2688
-msgid "Notes and Info"
-msgstr "Замечани� и информаци�"
+#: ../../Zotlabs/Module/Admin/Security.php:101
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
+msgstr "У�тановите флажок дл� блокировки публичного до�тупа ко в�ем другим общедо�тупным �траницам на �том �айте, е�ли вы в на�то�щее врем� не аутентифицированы."
 
-#: ../../addon/workflow/workflow.php:2686
-msgid "Body"
-msgstr "Тек�т"
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid "Provide a cloud root directory"
+msgstr "Предо�тавить корневой каталог в облаке"
 
-#: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:101
-msgid "Workflow Settings"
-msgstr "�а�тройки \"Рабочего проце��а\""
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid ""
+"The cloud root directory lists all channel names which provide public files"
+msgstr "В корневом каталоге облака показывают�� в�е имена каналов, которые предо�тавл�ют общедо�тупные файлы"
 
-#: ../../addon/donate/donate.php:21
-msgid "Project Servers and Resources"
-msgstr "Серверы и ре�ур�ы проекта"
+#: ../../Zotlabs/Module/Admin/Security.php:103
+msgid "Show total disk space available to cloud uploads"
+msgstr "Показывать общее до�тупное дл� загрузок ме�то в хранилище"
 
-#: ../../addon/donate/donate.php:22
-msgid "Project Creator and Tech Lead"
-msgstr "Создатель проекта и техниче�кий руководитель"
+#: ../../Zotlabs/Module/Admin/Security.php:104
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "У�тановить HTTP-заголовок \"Transport Security\""
 
-#: ../../addon/donate/donate.php:49
-msgid ""
-"And the hundreds of other people and organisations who helped make the "
-"Hubzilla possible."
-msgstr "И �отни других людей и организаций которые помогали в �оздании Hubzilla."
+#: ../../Zotlabs/Module/Admin/Security.php:105
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr "У�тановить HTTP-заголовок \"Content Security Policy\""
 
-#: ../../addon/donate/donate.php:52
-msgid ""
-"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
-"their time and expertise - and often paying out of pocket for services they "
-"share with others."
-msgstr "Проекты Redmatrix / Hubzilla предо�тавл�ют��, в о�новном, добровольцами, которые предо�тавл�ют �вое врем� и опыт и, ча�то, оплачивают из �воего кармана у�луги, которыми они дел�т�� � другими."
+#: ../../Zotlabs/Module/Admin/Security.php:106
+msgid "Allowed email domains"
+msgstr "Разрешённые домены email"
 
-#: ../../addon/donate/donate.php:53
+#: ../../Zotlabs/Module/Admin/Security.php:106
 msgid ""
-"There is no corporate funding and no ads, and we do not collect and sell "
-"your personal information. (We don't control your personal information - "
-"<strong>you do</strong>.)"
-msgstr "Зде�ь нет корпоративного финан�ировани� и рекламы, мы не �обираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - <strong>�то делаете вы</strong>.)"
+"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 "Спи�ок разделённых зап�тыми доменов дл� которых разрешена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены."
 
-#: ../../addon/donate/donate.php:54
-msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and "
-"privacy."
-msgstr "Помогите поддержать нашу новатор�кую работу в обла�т�х децентрализации, веб-идентификации и конфиденциально�ти."
+#: ../../Zotlabs/Module/Admin/Security.php:107
+msgid "Not allowed email domains"
+msgstr "Запрещённые домены email"
 
-#: ../../addon/donate/donate.php:56
+#: ../../Zotlabs/Module/Admin/Security.php:107
 msgid ""
-"Your donations keep servers and services running and also helps us to "
-"provide innovative new features and continued development."
-msgstr "В ваших пожертвовани�х поддерживают �ерверы и �лужбы, а также помогают нам предо�тавл�ть новые возможно�ти и продолжать развитие."
+"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 "Спи�ок разделённых зап�тыми доменов дл� которых запрещена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны."
 
-#: ../../addon/donate/donate.php:59
-msgid "Donate"
-msgstr "Пожертвовать"
+#: ../../Zotlabs/Module/Admin/Security.php:108
+msgid "Allow communications only from these sites"
+msgstr "Разрешить �в�зь только � �тими �айтами"
 
-#: ../../addon/donate/donate.php:61
+#: ../../Zotlabs/Module/Admin/Security.php:108
 msgid ""
-"Choose a project, developer, or public hub to support with a one-time "
-"donation"
-msgstr "Выберите проект, разработчика или общедо�тупный узел дл� поддержки в форме единоразового пожертвовани�"
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr "Один �айт на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� без ограничений (по умочанию)."
 
-#: ../../addon/donate/donate.php:62
-msgid "Donate Now"
-msgstr "Пожертвовать �ейча�"
+#: ../../Zotlabs/Module/Admin/Security.php:109
+msgid "Block communications from these sites"
+msgstr "Блокировать �в�зь � �тими �айтами"
 
-#: ../../addon/donate/donate.php:63
-msgid ""
-"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
-msgstr "<strong><em>или</em></strong> �таньте �пон�ором проекта (только дл� Hubzilla)"
+#: ../../Zotlabs/Module/Admin/Security.php:110
+msgid "Allow communications only from these channels"
+msgstr "Разрешить �в�зь только дл� �тих каналов"
 
-#: ../../addon/donate/donate.php:64
+#: ../../Zotlabs/Module/Admin/Security.php:110
 msgid ""
-"Please indicate if you would like your first name or full name (or nothing) "
-"to appear in our sponsor listing"
-msgstr "Пожалуй�та, е�ли желаете, укажите ваше им� дл� отображени� в �пи�ке �пон�оров."
+"One channel (hash) per line. Leave empty to allow from any channel by default"
+msgstr "Один канал (или его х�ш) на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� � любым каналом (по умолчанию)."
 
-#: ../../addon/donate/donate.php:65
-msgid "Sponsor"
-msgstr "Спон�ор"
+#: ../../Zotlabs/Module/Admin/Security.php:111
+msgid "Block communications from these channels"
+msgstr "Блокировать �в�зь � �тими каналами"
 
-#: ../../addon/donate/donate.php:68
-msgid "Special thanks to: "
-msgstr "О�обые благодарно�ти:"
+#: ../../Zotlabs/Module/Admin/Security.php:112
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr "Разрешать в�траивание только дл� безопа�ных (SSL/TLS) �айтов и ��ылок."
 
-#: ../../addon/likebanner/likebanner.php:51
-msgid "Your Webbie:"
-msgstr "Ваш Webbie:"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Разрешить  в�траивать нефильтруемое HTML-�одержимое только дл� �тих доменов"
 
-#: ../../addon/likebanner/likebanner.php:54
-msgid "Fontsize (px):"
-msgstr "Размер шрифта (px):"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Один �айт на �троку. По умолчанию в�траиваемое �одержимое фильтрует��."
 
-#: ../../addon/likebanner/likebanner.php:68
-msgid "Link:"
-msgstr "С�ылка:"
+#: ../../Zotlabs/Module/Admin/Security.php:114
+msgid "Block embedded HTML from these domains"
+msgstr "Блокировать в�траивание HTML-�одержимого дл� �тих доменов"
 
-#: ../../addon/likebanner/likebanner.php:70
-msgid "Like us on Hubzilla"
-msgstr "�равит�� на Hubzilla"
+#: ../../Zotlabs/Module/Admin/Security.php:115
+msgid "Allow SVG thumbnails in file browser"
+msgstr "Разрешить SVG миниатюры в про�мотрщике файлов"
 
-#: ../../addon/likebanner/likebanner.php:72
-msgid "Embed:"
-msgstr "В�троить:"
+#: ../../Zotlabs/Module/Admin/Security.php:115
+msgid "WARNING: SVG images may contain malicious code."
+msgstr "Внимание: изображени� SVG могут �одержать вредоно�ный код."
 
-#: ../../addon/opensearch/opensearch.php:26
-#, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr "И�кать %1$s (%2$s)"
+#: ../../Zotlabs/Module/Admin/Security.php:116
+msgid "Allow embedded (inline) PDF files"
+msgstr "Разрешить в�траивание дл� файлов PDF"
 
-#: ../../addon/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
+msgstr "�а�тройки журнала обновлены."
 
-#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Invite.php:225
-#: ../../Zotlabs/Module/Invite.php:494 ../../Zotlabs/Module/Invite.php:508
-#: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95
-#: ../../Zotlabs/Lib/Enotify.php:66
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
+#: ../../Zotlabs/Widget/Admin.php:58
+msgid "Logs"
+msgstr "Журналы"
 
-#: ../../addon/opensearch/opensearch.php:43
-msgid "Search $Projectname"
-msgstr "Пои�к $Projectname"
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
+msgstr "Очи�тить"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:22
-msgid "Fuzzloc Settings updated."
-msgstr "�а�тройки примерного положени� обновлены."
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
+msgstr "Отладка"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:34
-msgid "Fuzzy Location App"
-msgstr "Приложение \"Примерное положение\""
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
+msgstr "Файл журнала"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:35
+#: ../../Zotlabs/Module/Admin/Logs.php:92
 msgid ""
-"Blur your precise location if your channel uses browser location mapping"
-msgstr "Размывает вашего точное ме�тоположение в �лучае е�ли ваш канал и�пользует отображение ме�тоположени� из браузера"
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr "Должен быть до�тупен дл� запи�и веб-�ервером. Пу�ть отно�ителен о�новного каталога веб-�айта."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:40
-msgid "Minimum offset in meters"
-msgstr "Минимальное �мещение в метрах"
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
+msgstr "Уровень журнала"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:44
-msgid "Maximum offset in meters"
-msgstr "Мак�имальное �мещение в метрах"
+#: ../../Zotlabs/Module/Item.php:471 ../../Zotlabs/Module/Pin.php:36
+msgid "Unable to locate original post."
+msgstr "�е удало�ь найти оригинальную публикацию."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:53
-msgid "Fuzzy Location"
-msgstr "Примерное положение"
+#: ../../Zotlabs/Module/Item.php:757
+msgid "Empty post discarded."
+msgstr "Пу�та� публикаци� отклонена."
 
-#: ../../addon/hubwall/hubwall.php:19
-msgid "Send email to all members"
-msgstr "Отправить email в�ем уча�тникам"
+#: ../../Zotlabs/Module/Item.php:1191
+msgid "Duplicate post suppressed."
+msgstr "Подавлена дублирующа��� публикаци�."
 
-#: ../../addon/hubwall/hubwall.php:33 ../../Zotlabs/Lib/Enotify.php:65
-#, php-format
-msgid "%s Administrator"
-msgstr "админи�тратор %s"
+#: ../../Zotlabs/Module/Item.php:1336
+msgid "System error. Post not saved."
+msgstr "Си�темна� ошибка. Публикаци� не �охранена."
 
-#: ../../addon/hubwall/hubwall.php:50 ../../addon/mailtest/mailtest.php:50
-msgid "No recipients found."
-msgstr "Получателей не найдено."
+#: ../../Zotlabs/Module/Item.php:1370
+msgid "Your comment is awaiting approval."
+msgstr "Ваш комментарий ожидает одобрени�."
 
-#: ../../addon/hubwall/hubwall.php:73
+#: ../../Zotlabs/Module/Item.php:1500
+msgid "Unable to obtain post information from database."
+msgstr "�евозможно получить информацию о публикации из базы данных"
+
+#: ../../Zotlabs/Module/Item.php:1507
 #, php-format
-msgid "%1$d of %2$d messages sent."
-msgstr "%1$d из %2$d �ообщений отправлено."
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Вы до�тигли вашего ограничени� в %1$.0f публикаций вы�окого уровн�."
 
-#: ../../addon/hubwall/hubwall.php:81
-msgid "Send email to all hub members."
-msgstr "Отправить email в�ем уча�тникам узла."
+#: ../../Zotlabs/Module/Item.php:1514
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Вы до�тигли вашего ограничени� в %1$.0f  �траниц."
 
-#: ../../addon/hubwall/hubwall.php:92 ../../addon/mailtest/mailtest.php:96
-msgid "Message subject"
-msgstr "Тема �ообщени�"
+#: ../../Zotlabs/Module/Sources.php:41
+msgid "Failed to create source. No channel selected."
+msgstr "�е удало�ь �оздать и�точник. Канал не выбран."
 
-#: ../../addon/hubwall/hubwall.php:93
-msgid "Sender Email address"
-msgstr "�дре� �лектронной почты отправител�"
+#: ../../Zotlabs/Module/Sources.php:57
+msgid "Source created."
+msgstr "И�точник �оздан."
 
-#: ../../addon/hubwall/hubwall.php:94
-msgid "Test mode (only send to hub administrator)"
-msgstr "Те�товый режим (отправка только админи�тратору узла)"
+#: ../../Zotlabs/Module/Sources.php:70
+msgid "Source updated."
+msgstr "И�точник обновлен."
 
-#: ../../addon/notifyadmin/notifyadmin.php:34
-msgid "New registration"
-msgstr "�ова� реги�траци�"
+#: ../../Zotlabs/Module/Sources.php:88
+msgid "Sources App"
+msgstr "Приложение \"И�точники канала\""
 
-#: ../../addon/notifyadmin/notifyadmin.php:40
-#: ../../Zotlabs/Module/Invite.php:252
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : До�тавка �ообщени� не удала�ь."
+#: ../../Zotlabs/Module/Sources.php:89
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "�втоматиче�кий импорт контента из других каналов или лент"
 
-#: ../../addon/notifyadmin/notifyadmin.php:42
-#, php-format
-msgid "Message sent to %s. New account registration: %s"
-msgstr "Сообщение отправлено в %s. Реги�траци� нового аккаунта: %s"
+#: ../../Zotlabs/Module/Sources.php:101
+msgid "*"
+msgstr ""
 
-#: ../../addon/flashcards/Mod_Flashcards.php:218
-msgid "Not allowed."
-msgstr "Запрещено."
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:369
+msgid "Channel Sources"
+msgstr "И�точники канала"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:254
-#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:241
-#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:678
-#: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Thing.php:321
-#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:683
-msgid "Permissions"
-msgstr "Разрешени�"
+#: ../../Zotlabs/Module/Sources.php:108
+msgid "Manage remote sources of content for your channel."
+msgstr "Управление удалённым и�точниками �одержимого дл� вашего канала"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:261
-#: ../../Zotlabs/Module/Filestorage.php:202
-msgid "Set/edit permissions"
-msgstr "Редактировать разрешени�"
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
+msgid "New Source"
+msgstr "�овый и�точник"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:284
-#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:4010
-#: ../../Zotlabs/Module/Filestorage.php:29
-#: ../../Zotlabs/Module/Admin/Themes.php:72
-#: ../../Zotlabs/Module/Admin/Addons.php:260
-#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:42
-#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:62
-#: ../../Zotlabs/Module/Thing.php:96
-msgid "Item not found."
-msgstr "Элемент не найден."
+#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Импортировать в�ё или выбранное �одержимое из �ледующего канала в �тот канал и ра�пределить его в �оответ�твии � вашими на�тройками."
 
-#: ../../addon/libertree/libertree.php:43
-msgid "Post to Libertree"
-msgstr "Опубликовать в Libertree"
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+msgid "Only import content with these words (one per line)"
+msgstr "Импортировать �одержимое только � �тим тек�том (по�трочно)"
 
-#: ../../addon/libertree/Mod_Libertree.php:25
-msgid "Libertree Crosspost Connector Settings saved."
-msgstr "�а�тройки пере�ылки публикаций Libertree �охранены."
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+msgid "Leave blank to import all public content"
+msgstr "О�тавьте пу�тым дл� импорта в�его общедо�тупного �одержимого"
 
-#: ../../addon/libertree/Mod_Libertree.php:35
-msgid "Libertree Crosspost Connector App"
-msgstr "Приложение \"Пере�ылка публикаций Libertree\""
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
+msgid "Channel Name"
+msgstr "�азвание канала"
 
-#: ../../addon/libertree/Mod_Libertree.php:36
-msgid "Relay public posts to Libertree"
-msgstr "Пере�ылает общедо�тупные публикации в Libertree"
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Добавить �ледующие категории к импортированным публикаци�м из �того и�точника (через зап�тые)"
 
-#: ../../addon/libertree/Mod_Libertree.php:51
-msgid "Libertree API token"
-msgstr "Токен Libertree API"
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+msgid "Resend posts with this channel as author"
+msgstr "Отправить публикации в �тот канал повторно как автор"
 
-#: ../../addon/libertree/Mod_Libertree.php:55
-msgid "Libertree site URL"
-msgstr "URL �айта Libertree"
+#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+msgid "Copyrights may apply"
+msgstr "Могут примен�ть�� автор�кие права"
 
-#: ../../addon/libertree/Mod_Libertree.php:59
-msgid "Post to Libertree by default"
-msgstr "Публиковать в Libertree по умолчанию"
+#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
+msgid "Source not found."
+msgstr "И�точник не найден."
 
-#: ../../addon/libertree/Mod_Libertree.php:67
-msgid "Libertree Crosspost Connector"
-msgstr "Пере�ылка публикаций Libertree"
+#: ../../Zotlabs/Module/Sources.php:151
+msgid "Edit Source"
+msgstr "Редактировать и�точник"
 
-#: ../../addon/randpost/randpost.php:99
-msgid "You're welcome."
-msgstr "Пожалуй�та."
+#: ../../Zotlabs/Module/Sources.php:152
+msgid "Delete Source"
+msgstr "Удалить и�точник"
 
-#: ../../addon/randpost/randpost.php:100
-msgid "Ah shucks..."
-msgstr "О, чёрт..."
+#: ../../Zotlabs/Module/Sources.php:182
+msgid "Source removed"
+msgstr "И�точник удален"
 
-#: ../../addon/randpost/randpost.php:101
-msgid "Don't mention it."
-msgstr "�е �тоит благодарно�ти."
+#: ../../Zotlabs/Module/Sources.php:184
+msgid "Unable to remove source."
+msgstr "�евозможно удалить и�точник."
 
-#: ../../addon/randpost/randpost.php:102
-msgid "&lt;blush&gt;"
-msgstr "&lt;кра�нею&gt;"
+#: ../../Zotlabs/Module/Acl.php:123 ../../Zotlabs/Module/Lockview.php:117
+#: ../../Zotlabs/Module/Lockview.php:153
+msgctxt "acl"
+msgid "Profile"
+msgstr "Профиль"
 
-#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:328
-msgid "Report Bug"
-msgstr "Сообщить об ошибке"
+#: ../../Zotlabs/Module/Acl.php:370
+msgid "network"
+msgstr "�еть"
 
-#: ../../addon/totp/Mod_Totp.php:23
-msgid "TOTP Two-Step Verification"
-msgstr "Двух�тапна� верификаци� TOTP"
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:89
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Share.php:72
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82
+#: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Group.php:99
+#: ../../Zotlabs/Module/Cloud.php:123 ../../Zotlabs/Web/WebServer.php:117
+#: ../../include/items.php:440
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:119
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:75
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:109
+msgid "Permission denied"
+msgstr "До�туп запрещен"
 
-#: ../../addon/totp/Mod_Totp.php:24
-msgid "Enter the 2-step verification generated by your authenticator app:"
-msgstr "Введите код проверки, �озданный вашим приложением дл� аутентификации"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "�еверный идентификатор профил�"
 
-#: ../../addon/totp/Mod_Totp.php:25
-msgid "Success!"
-msgstr "У�пех!"
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr "Редактор видимо�ти профил�"
 
-#: ../../addon/totp/Mod_Totp.php:26
-msgid "Invalid code, please try again."
-msgstr "�еверный код. Пожалуй�та, попробуйте ещё раз."
+#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:363
+#: ../../include/channel.php:1834
+msgid "Profile"
+msgstr "Профиль"
 
-#: ../../addon/totp/Mod_Totp.php:27
-msgid "Too many invalid codes..."
-msgstr "Слишком много неверных кодов..."
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr "�ажмите на контакт, чтобы добавить или удалить."
 
-#: ../../addon/totp/Mod_Totp.php:28
-msgid "Verify"
-msgstr "Проверить"
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
+msgstr "Видно"
 
-#: ../../addon/totp/Settings/Totp.php:90
-msgid ""
-"You haven't set a TOTP secret yet.\n"
-"Please click the button below to generate one and register this site\n"
-"with your preferred authenticator app."
-msgstr "Вы еще не у�тановили �екретный код TOTP. Пожалуй�та, нажмите на кнопку ниже, чтобы �генерировать его и зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации."
+#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Zotlabs/Module/Connections.php:218
+msgid "All Connections"
+msgstr "В�е контакты"
 
-#: ../../addon/totp/Settings/Totp.php:93
-msgid "Your TOTP secret is"
-msgstr "Ваш �екретный код TOTP"
+#: ../../Zotlabs/Module/Poke.php:165
+msgid "Poke App"
+msgstr "Приложение \"Ткнуть\""
 
-#: ../../addon/totp/Settings/Totp.php:94
-msgid ""
-"Be sure to save it somewhere in case you lose or replace your mobile "
-"device.\n"
-"Use your mobile device to scan the QR code below to register this site\n"
-"with your preferred authenticator app."
-msgstr "Об�зательно �охраните его где-нибудь на �лучай потери или замены мобильного у�трой�тва. С помощью мобильного у�трой�тва от�канируйте приведенный ниже QR-код, чтобы зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации."
+#: ../../Zotlabs/Module/Poke.php:166
+msgid "Poke somebody in your addressbook"
+msgstr "Ткнуть кого-нибудь в вашей адре�ной книге"
 
-#: ../../addon/totp/Settings/Totp.php:99
-msgid "Test"
-msgstr "Те�т"
+#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:352
+#: ../../include/conversation.php:1138
+msgid "Poke"
+msgstr "Ткнуть"
 
-#: ../../addon/totp/Settings/Totp.php:100
-msgid "Generate New Secret"
-msgstr "Сгенерировать новый код"
+#: ../../Zotlabs/Module/Poke.php:200
+msgid "Poke somebody"
+msgstr "Ткнуть кого-нибудь"
 
-#: ../../addon/totp/Settings/Totp.php:101
-msgid "Go"
-msgstr "Вперёд"
+#: ../../Zotlabs/Module/Poke.php:203
+msgid "Poke/Prod"
+msgstr "Толкнуть / подтолкнуть"
 
-#: ../../addon/totp/Settings/Totp.php:102
-msgid "Enter your password"
-msgstr "Введите ваш пароль"
+#: ../../Zotlabs/Module/Poke.php:204
+msgid "Poke, prod or do other things to somebody"
+msgstr "Толкнуть, подтолкнуть или �делать что-то ещё � кем-то"
 
-#: ../../addon/totp/Settings/Totp.php:103
-msgid "enter TOTP code from your device"
-msgstr "введите код TOTP из вашего у�трой�тва"
+#: ../../Zotlabs/Module/Poke.php:211
+msgid "Recipient"
+msgstr "Получатель"
 
-#: ../../addon/totp/Settings/Totp.php:104
-msgid "Pass!"
-msgstr "Прин�то!"
+#: ../../Zotlabs/Module/Poke.php:212
+msgid "Choose what you wish to do to recipient"
+msgstr "Выбрать что вы хотите �делать � получателем"
 
-#: ../../addon/totp/Settings/Totp.php:105
-msgid "Fail"
-msgstr "Отказано"
+#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
+msgid "Make this post private"
+msgstr "Сделать �ту публикацию приватной"
 
-#: ../../addon/totp/Settings/Totp.php:106
-msgid "Incorrect password, try again."
-msgstr "�еверный пароль, попробуйте �нова."
+#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Article_edit.php:17
+#: ../../Zotlabs/Module/Article_edit.php:33
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
+msgid "Item not found"
+msgstr "Элемент не найден"
 
-#: ../../addon/totp/Settings/Totp.php:107
-msgid "Record your new TOTP secret and rescan the QR code above."
-msgstr "Запишите ваш �екретный код TOTP и повторно от�канируйте приведенный ниже QR-код."
+#: ../../Zotlabs/Module/Card_edit.php:101
+#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Article_edit.php:99
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220
+#: ../../include/conversation.php:1340
+#: ../../extend/addon/hzaddons/hsse/hsse.php:95
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:205
+msgid "Insert web link"
+msgstr "В�тавить веб-��ылку"
 
-#: ../../addon/totp/Settings/Totp.php:115
-msgid "TOTP Settings"
-msgstr "�а�тройки TOTP"
+#: ../../Zotlabs/Module/Card_edit.php:129
+msgid "Edit Card"
+msgstr "Редактировать карточку"
 
-#: ../../addon/logrot/logrot.php:36
-msgid "Logfile archive directory"
-msgstr "Каталог архивировани� журнала"
+#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
+#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:660
+msgid "Profile not found."
+msgstr "Профиль не найден."
 
-#: ../../addon/logrot/logrot.php:36
-msgid "Directory to store rotated logs"
-msgstr "Каталог дл� хранени� заархивированных журналов"
+#: ../../Zotlabs/Module/Profiles.php:46
+msgid "Profile deleted."
+msgstr "Профиль удален."
 
-#: ../../addon/logrot/logrot.php:37
-msgid "Logfile size in bytes before rotating"
-msgstr "Размер файла журнала в байтах дл� архивировани�"
+#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
+msgid "Profile-"
+msgstr "Профиль -"
 
-#: ../../addon/logrot/logrot.php:38
-msgid "Number of logfiles to retain"
-msgstr "Количе�тво �охран�емых файлов журналов"
+#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
+msgid "New profile created."
+msgstr "�овый профиль �оздан."
 
-#: ../../addon/testdrive/testdrive.php:104
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Ваш аккаунт на %s пере�танет работать через не�колько дней."
+#: ../../Zotlabs/Module/Profiles.php:113
+msgid "Profile unavailable to clone."
+msgstr "Профиль недо�тупен дл� клонировани�."
 
-#: ../../addon/testdrive/testdrive.php:105
-msgid "Your $Productname test account is about to expire."
-msgstr "Ваша те�това� учётна� запи�ь в $Productname близка к окончанию �рока дей�тви�."
+#: ../../Zotlabs/Module/Profiles.php:148
+msgid "Profile unavailable to export."
+msgstr "Профиль недо�тупен дл� �к�порта."
 
-#: ../../addon/hideaside/Mod_Hideaside.php:23
-#: ../../addon/hideaside/Mod_Hideaside.php:27
-msgid "Hide Aside App"
-msgstr "Скрывать приложени�"
+#: ../../Zotlabs/Module/Profiles.php:254
+msgid "Profile Name is required."
+msgstr "Требует�� им� профил�."
 
-#: ../../addon/hideaside/Mod_Hideaside.php:24
-#: ../../addon/hideaside/Mod_Hideaside.php:28
-msgid "Fade out aside areas after a while when using endless scroll"
-msgstr "Через некоторое врем� при и�пользовании прокрутки обла�ть приложений и�чезает"
+#: ../../Zotlabs/Module/Profiles.php:461
+msgid "Marital Status"
+msgstr "Семейное положение"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:32
-msgid "Skeleton App"
-msgstr "Приложение \"Скелет\""
+#: ../../Zotlabs/Module/Profiles.php:465
+msgid "Romantic Partner"
+msgstr "Романтиче�кий партнер"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:33
-msgid "A skeleton for addons, you can copy/paste"
-msgstr "Скелет дл� приложений. Вы можете и�пользовать copy/paste"
+#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:773
+msgid "Likes"
+msgstr "�равит��"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:40
-msgid "Some setting"
-msgstr "�екоторые на�тройки"
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:774
+msgid "Dislikes"
+msgstr "�е нравит��"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:40
-msgid "A setting"
-msgstr "�а�тройка"
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:781
+msgid "Work/Employment"
+msgstr "Работа / Зан�то�ть"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:48
-msgid "Skeleton Settings"
-msgstr "�а�тройки �келета"
+#: ../../Zotlabs/Module/Profiles.php:480
+msgid "Religion"
+msgstr "Религи�"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:104
-#: ../../addon/socialauth/Mod_SocialAuth.php:176
-msgid "Network error"
-msgstr "Сетева� ошибка"
+#: ../../Zotlabs/Module/Profiles.php:484
+msgid "Political Views"
+msgstr "Политиче�кие взгл�ды"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:108
-#: ../../addon/socialauth/Mod_SocialAuth.php:180
-msgid "API error"
-msgstr "Ошибка API"
+#: ../../Zotlabs/Module/Profiles.php:488
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:74
+msgid "Gender"
+msgstr "Гендер"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:112
-#: ../../addon/socialauth/Mod_SocialAuth.php:184
-msgid "Unknown issue"
-msgstr "�еизве�тна� проблема"
+#: ../../Zotlabs/Module/Profiles.php:492
+msgid "Sexual Preference"
+msgstr "Сек�уальна� ориентаци�"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:168
-msgid "Unable to login using email address "
-msgstr "�евозможно войти, и�пользу� адре� �лектронной почты "
+#: ../../Zotlabs/Module/Profiles.php:496
+msgid "Homepage"
+msgstr "Домашн�� �траница"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:202
-msgid "Sign in to Hubzilla using a social account"
-msgstr "Войдите в Hubzilla, и�пользу� учетную запи�ь в �оциальных �ет�х"
+#: ../../Zotlabs/Module/Profiles.php:500
+msgid "Interests"
+msgstr "Интере�ы"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:207
-msgid "Social Authentication using your social media account"
-msgstr "Social Authentication � и�пользованием вашей учетной запи�и в �оциальных �ет�х"
+#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:735
+#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Locs.php:126
+#: ../../Zotlabs/Module/Pubsites.php:52 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ме�то"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:211
-msgid ""
-"This app enables one or more social provider sign-in buttons on the login "
-"page."
-msgstr "Это приложение добавл�ет на �транице входа в �и�тему одну или не�колько кнопок дл� аутентификации при помощи учётных запи�ей в �оциальных �ет�х"
+#: ../../Zotlabs/Module/Profiles.php:596
+msgid "Profile updated."
+msgstr "Профиль обновлен."
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:229
-msgid "Add an identity provider"
-msgstr "Добавить провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:679
+msgid "Hide your connections list from viewers of this profile"
+msgstr "Скрывать от про�мотра ваш �пи�ок контактов в �том профиле"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:256
-msgid "Enable "
-msgstr "Включить "
+#: ../../Zotlabs/Module/Profiles.php:723
+msgid "Edit Profile Details"
+msgstr "Редактирование профил�"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:263
-msgid "Key"
-msgstr "Ключ"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "View this profile"
+msgstr "По�мотреть �тот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:263
-#: ../../addon/socialauth/Mod_SocialAuth.php:268
-#: ../../addon/socialauth/Mod_SocialAuth.php:284
-#: ../../addon/socialauth/Mod_SocialAuth.php:297
-msgid "Word"
-msgstr "Слово"
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Profiles.php:825
+#: ../../include/channel.php:1509
+msgid "Edit visibility"
+msgstr "Редактировать видимо�ть"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:268
-msgid "Secret"
-msgstr "Секрет"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Profile Tools"
+msgstr "Ин�трументы профил�"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:297
-msgid "Add a custom provider"
-msgstr "Добавить �об�твенного провайдера"
+#: ../../Zotlabs/Module/Profiles.php:728
+msgid "Change cover photo"
+msgstr "Изменить фотографию обложки"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:317
-msgid "Remove an identity provider"
-msgstr "Удалить провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:729 ../../include/channel.php:1479
+msgid "Change profile photo"
+msgstr "Изменить фотографию профил�"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:327
-msgid "Social authentication"
-msgstr "�утентификаци� в �оциальных �ет�х"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Create a new profile using these settings"
+msgstr "Создать новый профиль � теми же на�тройками"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:366
-msgid "Error while saving provider settings"
-msgstr "Ошибка при �охранении на�троек провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:731
+msgid "Clone this profile"
+msgstr "Клонировать �тот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:382
-msgid "Custom provider already exists"
-msgstr "Соб�твенный провайдер уже �уще�твует"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Delete this profile"
+msgstr "Удалить �тот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:399
-msgid "Social authentication settings saved."
-msgstr "�а�тройки Social authentication �охранены."
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Add profile things"
+msgstr "Добавить в профиль"
 
-#: ../../addon/nsfw/nsfw.php:152
-msgid "Possible adult content"
-msgstr "Возможно �одержимое дл� взро�лых"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Personal"
+msgstr "Личное"
 
-#: ../../addon/nsfw/nsfw.php:167
-#, php-format
-msgid "%s - view"
-msgstr "%s -  про�мотр"
+#: ../../Zotlabs/Module/Profiles.php:736
+msgid "Relationship"
+msgstr "Отношени�"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:22
-msgid "NSFW Settings saved."
-msgstr "�а�тройки NSFW �охранены."
+#: ../../Zotlabs/Module/Profiles.php:737 ../../Zotlabs/Widget/Newmember.php:51
+#: ../../include/datetime.php:58
+msgid "Miscellaneous"
+msgstr "Прочее"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:33
-msgid "NSFW App"
-msgstr "Приложение NSFW"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Import profile from file"
+msgstr "Импортировать профиль из файла"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:34
-msgid "Collapse content that contains predefined words"
-msgstr "Свернуть �одержимое, �одержащее предопределенные �лова"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Export profile to file"
+msgstr "Эк�портировать профиль в файл"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:44
-msgid ""
-"This app looks in posts for the words/text you specify below, and collapses "
-"any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW.  This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
-msgstr "Это приложение про�матривает публикации дл� �лов / тек�та, которые вы указываете ниже, и �ворачивает любой контент, �одержащий �ти ключевые �лова, по�тому он не отображает�� в неподход�щее врем�, например, �ек�уальные ин�инуации, которые могут быть неправильными в на�тройке работы. �апример, мы рекомендуем отмечать любой контент, �одержащий наготу, тегом #NSFW. Этот фильтр также �по�обен реагировать на любое другое указанное вами �лово / тек�т и может и�пользовать�� в каче�тве фильтра �одержимого общего назначени�."
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Your gender"
+msgstr "Ваш пол"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:49
-msgid "Comma separated list of keywords to hide"
-msgstr "Спи�ок ключевых �лов дл� �крыти�, через зап�тую"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Marital status"
+msgstr "Семейное положение"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:49
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
-msgstr "�лово, /регул�рное_выражение/, lang=xx, lang!=xx"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Sexual preference"
+msgstr "Сек�уальна� ориентаци�"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:58
-msgid "NSFW"
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Profile name"
+msgstr "Им� профил�"
 
-#: ../../addon/upload_limits/upload_limits.php:25
-msgid "Show Upload Limits"
-msgstr "Показать ограничени� на загрузку"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "This is your default profile."
+msgstr "Это ваш профиль по умолчанию."
 
-#: ../../addon/upload_limits/upload_limits.php:27
-msgid "Hubzilla configured maximum size: "
-msgstr "Мак�имальный размер на�троенный в Hubzilla:"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "Your full name"
+msgstr "Ваше полное им�"
 
-#: ../../addon/upload_limits/upload_limits.php:28
-msgid "PHP upload_max_filesize: "
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:751
+msgid "Short title/description"
+msgstr "Краткий заголовок или наименование"
 
-#: ../../addon/upload_limits/upload_limits.php:29
-msgid "PHP post_max_size (must be larger than upload_max_filesize): "
-msgstr "PHP post_max_size (должен быть больше чем upload_max_filesize): "
+#: ../../Zotlabs/Module/Profiles.php:751
+msgid "Maximal 190 characters"
+msgstr "�е более 190 �имволов"
 
-#: ../../addon/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Tic-Tac-Toe в трёх измерени�х"
+#: ../../Zotlabs/Module/Profiles.php:754
+msgid "Street address"
+msgstr "Улица, дом, квартира"
 
-#: ../../addon/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:755
+msgid "Locality/City"
+msgstr "�а�еленный пункт / город"
 
-#: ../../addon/tictac/tictac.php:59
-msgid "New game"
-msgstr "�ова� игра"
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Region/State"
+msgstr "Регион / Обла�ть"
 
-#: ../../addon/tictac/tictac.php:60
-msgid "New game with handicap"
-msgstr "�ова� игра � форой"
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Postal/Zip code"
+msgstr "Почтовый индек�"
 
-#: ../../addon/tictac/tictac.php:61
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "Трехмерный Tic-Tac-Toe похож на традиционную игру, за и�ключением того, что игра идёт на не�кольких уровн�х одновременно."
+#: ../../Zotlabs/Module/Profiles.php:758 ../../Zotlabs/Module/Cdav.php:1398
+#: ../../Zotlabs/Module/Connedit.php:933
+msgid "Country"
+msgstr "Страна"
 
-#: ../../addon/tictac/tictac.php:62
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "Имеет�� три уровн�. Вы выигрываете, получа� три подр�д на любом уровне, а также вверх, вниз и по диагонали на разных уровн�х."
+#: ../../Zotlabs/Module/Profiles.php:763
+msgid "Who (if applicable)"
+msgstr "Кто (е�ли применимо)"
 
-#: ../../addon/tictac/tictac.php:64
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "Игра � форой отключает центральную позицию на �реднем уровне, потому что игрок, претендующий на �тот квадрат, ча�то имеет не�праведливое преимуще�тво."
+#: ../../Zotlabs/Module/Profiles.php:763
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
 
-#: ../../addon/tictac/tictac.php:183
-msgid "You go first..."
-msgstr "Вы начинаете..."
+#: ../../Zotlabs/Module/Profiles.php:764
+msgid "Since (date)"
+msgstr "С (дата)"
 
-#: ../../addon/tictac/tictac.php:188
-msgid "I'm going first this time..."
-msgstr "�а �тот раз начинаю �..."
+#: ../../Zotlabs/Module/Profiles.php:767
+msgid "Tell us about yourself"
+msgstr "Ра��кажите нам о �ебе"
 
-#: ../../addon/tictac/tictac.php:194
-msgid "You won!"
-msgstr "Вы выиграли!"
+#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr "URL домашней �траницы"
 
-#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225
-msgid "\"Cat\" game!"
-msgstr "�ичь�!"
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Hometown"
+msgstr "Родной город"
 
-#: ../../addon/tictac/tictac.php:223
-msgid "I won!"
-msgstr "Я выиграл!"
+#: ../../Zotlabs/Module/Profiles.php:770
+msgid "Political views"
+msgstr "Политиче�кие взгл�ды"
 
-#: ../../addon/gnusoc/gnusoc.php:453
-msgid "Follow"
-msgstr "От�леживать"
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Religious views"
+msgstr "Религиозные взгл�ды"
 
-#: ../../addon/gnusoc/gnusoc.php:456
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr "%1$s �ейча� от�леживает %2$s"
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Keywords used in directory listings"
+msgstr "Ключевые �лова дл� уча�ти� в каталоге"
 
-#: ../../addon/gnusoc/Mod_Gnusoc.php:16
-msgid ""
-"The GNU-Social protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
-msgstr "Протокол GNU-Social не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала."
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Example: fishing photography software"
+msgstr "�апример: fishing photography software"
 
-#: ../../addon/gnusoc/Mod_Gnusoc.php:22
-msgid "GNU-Social Protocol App"
-msgstr "Приложение \"Протокол GNU-Social\""
+#: ../../Zotlabs/Module/Profiles.php:775
+msgid "Musical interests"
+msgstr "Музыкальные интере�ы"
 
-#: ../../addon/gnusoc/Mod_Gnusoc.php:34
-msgid "GNU-Social Protocol"
-msgstr "Протокол GNU-Social"
+#: ../../Zotlabs/Module/Profiles.php:776
+msgid "Books, literature"
+msgstr "Книги, литература"
 
-#: ../../addon/mailtest/mailtest.php:19
-msgid "Send test email"
-msgstr "Отправить те�товый email"
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Television"
+msgstr "Телевидение"
 
-#: ../../addon/mailtest/mailtest.php:66
-msgid "Mail sent."
-msgstr "Сообщение отправлено"
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Film/Dance/Culture/Entertainment"
+msgstr "Кино / танцы / культура / развлечени�"
 
-#: ../../addon/mailtest/mailtest.php:68
-msgid "Sending of mail failed."
-msgstr "�е удало�ь отправить �ообщение."
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Hobbies/Interests"
+msgstr "Хобби / интере�ы"
 
-#: ../../addon/mailtest/mailtest.php:77
-msgid "Mail Test"
-msgstr "Те�товое �ообщение"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Love/Romance"
+msgstr "Любовь / романтиче�кие отношени�"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:38
-msgid "Livejournal Crosspost Connector App"
-msgstr "Приложение \"Публикаци� в Livejournal\""
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "School/Education"
+msgstr "Школа / образование"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:39
-msgid "Relay public posts to Livejournal"
-msgstr "Пере�ылает общедо�тупные публикации в Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:783
+msgid "Contact information and social networks"
+msgstr "Информаци� и �оциальные �ети дл� �в�зи"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:55
-msgid "Livejournal username"
-msgstr "Им� пользовател� Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "My other channels"
+msgstr "Мои другие контакты"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:59
-msgid "Livejournal password"
-msgstr "Пароль Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "Communications"
+msgstr "Св�зи"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:63
-msgid "Post to Livejournal by default"
-msgstr "Публиковать в Livejournal по умолчанию"
+#: ../../Zotlabs/Module/Profiles.php:787 ../../Zotlabs/Module/Cdav.php:1376
+#: ../../Zotlabs/Module/Connedit.php:911
+msgid "Phone"
+msgstr "Телефон"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:67
-msgid "Send wall-to-wall posts to Livejournal"
-msgstr "Отправл�ть публикации на �тене в Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Cdav.php:1378
+#: ../../Zotlabs/Module/Connedit.php:913
+msgid "Instant messenger"
+msgstr "Ме��енджер"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:79
-msgid "Livejournal Crosspost Connector"
-msgstr "Публикаци� в Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:790 ../../Zotlabs/Module/Cdav.php:1379
+#: ../../Zotlabs/Module/Connedit.php:914
+msgid "Website"
+msgstr "Веб-�айт"
 
-#: ../../addon/ljpost/ljpost.php:49
-msgid "Post to Livejournal"
-msgstr "Опубликовать в Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Cdav.php:1381
+#: ../../Zotlabs/Module/Connedit.php:916
+msgid "Note"
+msgstr "Заметка"
 
-#: ../../addon/ljpost/ljpost.php:127
-msgid "Posted by"
-msgstr "Опубликовано"
+#: ../../Zotlabs/Module/Profiles.php:793 ../../Zotlabs/Module/Cdav.php:1382
+#: ../../Zotlabs/Module/Connedit.php:917 ../../include/event.php:1422
+#: ../../include/connections.php:734
+msgid "Mobile"
+msgstr "Мобильный"
 
-#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2118
-#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
-#: ../../Zotlabs/Module/Wiki.php:370
-msgid "Markdown"
-msgstr "Разметка Markdown"
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Cdav.php:1383
+#: ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Widget/Notifications.php:36 ../../include/event.php:1423
+#: ../../include/connections.php:735
+msgid "Home"
+msgstr "Домашний"
 
-#: ../../addon/mdpost/mdpost.php:42
-msgid "Use markdown for editing posts"
-msgstr "И�пользовать �зык разметки Markdown дл� редактировани� публикаций"
+#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Cdav.php:1384
+#: ../../Zotlabs/Module/Connedit.php:919 ../../include/event.php:1426
+#: ../../include/connections.php:738
+msgid "Work"
+msgstr "Рабочий"
 
-#: ../../addon/hzfiles/hzfiles.php:81
-msgid "Hubzilla File Storage Import"
-msgstr "Импорт файлового хранилища Hubzilla"
+#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Cdav.php:1385
+#: ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Access/PermissionRoles.php:310 ../../include/event.php:1429
+#: ../../include/event.php:1436 ../../include/connections.php:741
+#: ../../include/connections.php:748 ../../include/selectors.php:60
+#: ../../include/selectors.php:77 ../../include/selectors.php:115
+#: ../../include/selectors.php:151
+msgid "Other"
+msgstr "Другой"
 
-#: ../../addon/hzfiles/hzfiles.php:82
-msgid "This will import all your cloud files from another server."
-msgstr "Это позволит импортировать в�е ваши файлы � другого �ервера."
+#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Cdav.php:1386
+#: ../../Zotlabs/Module/Connedit.php:921
+msgid "Add Contact"
+msgstr "Добавить контакт"
 
-#: ../../addon/hzfiles/hzfiles.php:83
-msgid "Hubzilla Server base URL"
-msgstr "Базовый URL �ервера Hubzilla"
+#: ../../Zotlabs/Module/Profiles.php:798 ../../Zotlabs/Module/Cdav.php:1387
+#: ../../Zotlabs/Module/Connedit.php:922
+msgid "Add Field"
+msgstr "Добавить поле"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:22
-msgid ""
-"Allow magic authentication only to websites of your immediate connections"
-msgstr "Разрешить волшебную аутентификацию только на �айтах ваших непо�ред�твенных �оединений"
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Cdav.php:1060
+#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/New_channel.php:189
+#: ../../Zotlabs/Module/Menu.php:182 ../../Zotlabs/Module/Webpages.php:253
+#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Storage/Browser.php:365
+#: ../../Zotlabs/Storage/Browser.php:538 ../../Zotlabs/Widget/Cdav.php:140
+#: ../../Zotlabs/Widget/Cdav.php:178
+msgid "Create"
+msgstr "Создать"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:28
-#: ../../addon/authchoose/Mod_Authchoose.php:33
-msgid "Authchoose App"
-msgstr "Приложение Authchoose"
+#: ../../Zotlabs/Module/Profiles.php:821 ../../include/channel.php:1505
+msgid "Profile Image"
+msgstr "Изображение профил�"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:39
-msgid "Authchoose"
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:831 ../../include/channel.php:1486
+#: ../../include/nav.php:118
+msgid "Edit Profiles"
+msgstr "Редактирование профилей"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:22
-msgid "pageheader Settings saved."
-msgstr "�а�тройки шапки �траницы �охранены."
+#: ../../Zotlabs/Module/Profiles.php:832 ../../Zotlabs/Module/Chat.php:262
+#: ../../Zotlabs/Module/Manage.php:135 ../../Zotlabs/Module/Wiki.php:213
+msgid "Create New"
+msgstr "Создать новый"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:34
-msgid "Page Header App"
-msgstr "Приложение \"Заголовок �траницы\""
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "Blocked accounts"
+msgstr "Заблокированные аккаунты"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:35
-msgid "Inserts a page header"
-msgstr "В�тавл�ет заголовок �траницы"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "Expired accounts"
+msgstr "Про�роченные аккаунты"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:43
-msgid "Message to display on every page on this server"
-msgstr "Отображаемое �ообщение на каждой �транице на �том �ервере."
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expiring accounts"
+msgstr "Близкие к про�рочке аккаунты"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:51
-msgid "Page Header"
-msgstr "Заголовок �траницы"
+#: ../../Zotlabs/Module/Admin.php:122
+msgid "Message queues"
+msgstr "Очередь �ообщений"
 
-#: ../../addon/irc/Mod_Irc.php:23 ../../addon/irc/irc.php:41
-msgid "Popular Channels"
-msgstr "Попул�рные каналы"
+#: ../../Zotlabs/Module/Admin.php:136
+msgid "Your software should be updated"
+msgstr "Ваше программное обе�печение должно быть обновлено"
 
-#: ../../addon/irc/irc.php:37
-msgid "Channels to auto connect"
-msgstr "Каналы дл� автоматиче�кого подключени�"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Summary"
+msgstr "Резюме"
 
-#: ../../addon/irc/irc.php:37 ../../addon/irc/irc.php:41
-msgid "Comma separated list"
-msgstr "Спи�ок, разделённый зап�тыми"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Registered accounts"
+msgstr "Зареги�трированные аккаунты"
 
-#: ../../addon/irc/irc.php:45
-msgid "IRC Settings"
-msgstr "�а�тройки IRC"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Pending registrations"
+msgstr "Ждут утверждени�"
 
-#: ../../addon/irc/irc.php:54
-msgid "IRC settings saved."
-msgstr "�а�тройки IRC �охранены"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Registered channels"
+msgstr "Зареги�трированные каналы"
 
-#: ../../addon/irc/irc.php:58
-msgid "IRC Chatroom"
-msgstr "Чат IRC"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Active addons"
+msgstr "�ктивные ра�ширени�"
 
-#: ../../addon/xmpp/xmpp.php:44
-msgid "Jabber BOSH host"
-msgstr "Узел Jabber BOSH"
+#: ../../Zotlabs/Module/Admin.php:148
+msgid "Version"
+msgstr "Вер�и� �и�темы"
 
-#: ../../addon/xmpp/xmpp.php:45
-msgid "Use central userbase"
-msgstr "И�пользовать центральную базу данных"
+#: ../../Zotlabs/Module/Admin.php:149
+msgid "Repository version (master)"
+msgstr "Вер�и� репозитори� (master)"
 
-#: ../../addon/xmpp/xmpp.php:45
-msgid ""
-"If enabled, members will automatically login to an ejabberd server that has "
-"to be installed on this machine with synchronized credentials via the "
-"\"auth_ejabberd.php\" script."
-msgstr "Е�ли включено, уча�тники автоматиче�ки войдут на �ервер ejabberd, который должен быть у�тановлен на �том компьютере � �инхронизированными учетными данными через �крипт \"auth_ejabberd.php\"."
+#: ../../Zotlabs/Module/Admin.php:150
+msgid "Repository version (dev)"
+msgstr "Вер�и� репозитори� (dev)"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:23
-msgid "XMPP settings updated."
-msgstr "�а�тройки XMPP обновлены."
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
+msgstr "Тег удалён"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:35
-msgid "XMPP App"
-msgstr "Приложение XMPP"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
+msgstr "Удалить тег �лемента"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:36
-msgid "Embedded XMPP (Jabber) client"
-msgstr "В�тренный клиент XMPP (Jabber)"
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
+msgstr "Выбрать тег дл� удалени�:"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:52
-msgid "Individual credentials"
-msgstr "Индивидуальные разрешени�"
+#: ../../Zotlabs/Module/Connections.php:58
+#: ../../Zotlabs/Module/Connections.php:116
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Active"
+msgstr "�ктивен"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:58
-msgid "Jabber BOSH server"
-msgstr "Сервер Jabber BOSH"
+#: ../../Zotlabs/Module/Connections.php:63
+#: ../../Zotlabs/Module/Connections.php:182
+#: ../../Zotlabs/Module/Connections.php:279
+msgid "Blocked"
+msgstr "Заблокирован"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:67
-msgid "XMPP Settings"
-msgstr "�а�тройки XMPP"
+#: ../../Zotlabs/Module/Connections.php:68
+#: ../../Zotlabs/Module/Connections.php:189
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Ignored"
+msgstr "Игнорирует��"
 
-#: ../../include/zot.php:778
-msgid "Invalid data packet"
-msgstr "�еверный пакет данных"
+#: ../../Zotlabs/Module/Connections.php:73
+#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:277
+msgid "Hidden"
+msgstr "Скрыт"
 
-#: ../../include/zot.php:805 ../../Zotlabs/Lib/Libzot.php:655
-msgid "Unable to verify channel signature"
-msgstr "�евозможно проверить подпи�ь канала"
+#: ../../Zotlabs/Module/Connections.php:78
+#: ../../Zotlabs/Module/Connections.php:196
+msgid "Archived/Unreachable"
+msgstr "Заархивировано / недо�тупно"
 
-#: ../../include/zot.php:2663 ../../Zotlabs/Lib/Libsync.php:740
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "�евозможно проверить подпи�ь �айта %s"
+#: ../../Zotlabs/Module/Connections.php:83
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Notifications.php:101 ../../Zotlabs/Module/Menu.php:180
+msgid "New"
+msgstr "�овые"
 
-#: ../../include/zot.php:4378
-msgid "invalid target signature"
-msgstr "недопу�тима� целева� подпи�ь"
+#: ../../Zotlabs/Module/Connections.php:97
+#: ../../Zotlabs/Module/Connections.php:111
+#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:34
+msgid "All"
+msgstr "В�е"
 
-#: ../../include/text.php:523
-msgid "prev"
-msgstr "предыдущий"
+#: ../../Zotlabs/Module/Connections.php:158
+msgid "Active Connections"
+msgstr "�ктивные контакты"
 
-#: ../../include/text.php:525
-msgid "first"
-msgstr "первый"
+#: ../../Zotlabs/Module/Connections.php:161
+msgid "Show active connections"
+msgstr "Показать активные контакты"
 
-#: ../../include/text.php:554
-msgid "last"
-msgstr "по�ледний"
+#: ../../Zotlabs/Module/Connections.php:165
+#: ../../Zotlabs/Widget/Notifications.php:89
+msgid "New Connections"
+msgstr "�овые контакты"
 
-#: ../../include/text.php:557
-msgid "next"
-msgstr "�ледующий"
+#: ../../Zotlabs/Module/Connections.php:168
+msgid "Show pending (new) connections"
+msgstr "Про�мотр (новых) ожидающих контактов"
 
-#: ../../include/text.php:575
-msgid "older"
-msgstr "�тарше"
+#: ../../Zotlabs/Module/Connections.php:185
+msgid "Only show blocked connections"
+msgstr "Показать только заблокированные контакты"
 
-#: ../../include/text.php:577
-msgid "newer"
-msgstr "новее"
+#: ../../Zotlabs/Module/Connections.php:192
+msgid "Only show ignored connections"
+msgstr "Показать только проигнорированные контакты"
 
-#: ../../include/text.php:1018
-msgid "No connections"
-msgstr "�ет контактов"
+#: ../../Zotlabs/Module/Connections.php:199
+msgid "Only show archived/unreachable connections"
+msgstr "Показать только заархивированные / недо�тупные контакты"
 
-#: ../../include/text.php:1030 ../../include/features.php:133
-#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333
-msgid "Connections"
-msgstr "Контакты"
+#: ../../Zotlabs/Module/Connections.php:206
+msgid "Only show hidden connections"
+msgstr "Показать только �крытые контакты"
+
+#: ../../Zotlabs/Module/Connections.php:221
+msgid "Show all connections"
+msgstr "Про�мотр в�ех контактов"
+
+#: ../../Zotlabs/Module/Connections.php:275
+msgid "Pending approval"
+msgstr "Ожидающие подтверждени�"
+
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Archived"
+msgstr "Зархивирован"
+
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Not connected at this location"
+msgstr "�е подключено в �том ме�те"
 
-#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:80
 #: ../../Zotlabs/Module/Connections.php:289
+#: ../../Zotlabs/Module/Viewconnections.php:80 ../../include/text.php:1038
 msgid "Accepts"
 msgstr "Принимает"
 
-#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:83
 #: ../../Zotlabs/Module/Connections.php:292
+#: ../../Zotlabs/Module/Viewconnections.php:83 ../../include/text.php:1041
 msgid "Comments"
 msgstr "комментарии"
 
-#: ../../include/text.php:1046 ../../Zotlabs/Module/Viewconnections.php:88
 #: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Viewconnections.php:88 ../../include/text.php:1046
 msgid "Stream items"
 msgstr "публикации в потоке"
 
-#: ../../include/text.php:1051 ../../Zotlabs/Module/Viewconnections.php:93
 #: ../../Zotlabs/Module/Connections.php:302
+#: ../../Zotlabs/Module/Viewconnections.php:93 ../../include/text.php:1051
 msgid "Wall posts"
 msgstr "публикации на �тене"
 
-#: ../../include/text.php:1055 ../../Zotlabs/Module/Viewconnections.php:97
 #: ../../Zotlabs/Module/Connections.php:306
+#: ../../Zotlabs/Module/Viewconnections.php:97 ../../include/text.php:1055
 msgid "Nothing"
 msgstr "ничего"
 
-#: ../../include/text.php:1070
-#, php-format
-msgid "View all %s connections"
-msgstr "Про�мотреть в�е %s контактов"
-
-#: ../../include/text.php:1133
+#: ../../Zotlabs/Module/Connections.php:319
 #, php-format
-msgid "Network: %s"
-msgstr "Сеть: %s"
-
-#: ../../include/text.php:1144 ../../include/text.php:1156
-#: ../../include/nav.php:194 ../../include/acl_selectors.php:149
-#: ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../Zotlabs/Widget/Activity_filter.php:203
-#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379
-#: ../../Zotlabs/Lib/Apps.php:353
-msgid "Search"
-msgstr "Пои�к"
-
-#: ../../include/text.php:1236 ../../include/text.php:1240
-msgid "poke"
-msgstr "Ткнуть"
-
-#: ../../include/text.php:1236 ../../include/text.php:1240
-#: ../../include/conversation.php:267
-msgid "poked"
-msgstr "ткнут"
-
-#: ../../include/text.php:1241
-msgid "ping"
-msgstr "Пингануть"
-
-#: ../../include/text.php:1241
-msgid "pinged"
-msgstr "Отпингован"
-
-#: ../../include/text.php:1242
-msgid "prod"
-msgstr "Подтолкнуть"
-
-#: ../../include/text.php:1242
-msgid "prodded"
-msgstr "Подтолкнут"
-
-#: ../../include/text.php:1243
-msgid "slap"
-msgstr "Шлёпнуть"
-
-#: ../../include/text.php:1243
-msgid "slapped"
-msgstr "Шлёпнут"
-
-#: ../../include/text.php:1244
-msgid "finger"
-msgstr "Указать"
-
-#: ../../include/text.php:1244
-msgid "fingered"
-msgstr "Указан"
-
-#: ../../include/text.php:1245
-msgid "rebuff"
-msgstr "Дать отпор"
-
-#: ../../include/text.php:1245
-msgid "rebuffed"
-msgstr "Дан отпор"
-
-#: ../../include/text.php:1268
-msgid "happy"
-msgstr "�ча�тливый"
-
-#: ../../include/text.php:1269
-msgid "sad"
-msgstr "гру�тный"
-
-#: ../../include/text.php:1270
-msgid "mellow"
-msgstr "�покойный"
-
-#: ../../include/text.php:1271
-msgid "tired"
-msgstr "у�талый"
-
-#: ../../include/text.php:1272
-msgid "perky"
-msgstr "ве�ёлый"
-
-#: ../../include/text.php:1273
-msgid "angry"
-msgstr "�ердитый"
-
-#: ../../include/text.php:1274
-msgid "stupefied"
-msgstr "отупевший"
-
-#: ../../include/text.php:1275
-msgid "puzzled"
-msgstr "недоумевающий"
-
-#: ../../include/text.php:1276
-msgid "interested"
-msgstr "заинтере�ованный"
-
-#: ../../include/text.php:1277
-msgid "bitter"
-msgstr "едкий"
-
-#: ../../include/text.php:1278
-msgid "cheerful"
-msgstr "бодрый"
-
-#: ../../include/text.php:1279
-msgid "alive"
-msgstr "�нергичный"
-
-#: ../../include/text.php:1280
-msgid "annoyed"
-msgstr "раздражённый"
-
-#: ../../include/text.php:1281
-msgid "anxious"
-msgstr "обе�покоенный"
-
-#: ../../include/text.php:1282
-msgid "cranky"
-msgstr "капризный"
-
-#: ../../include/text.php:1283
-msgid "disturbed"
-msgstr "в�тревоженный"
-
-#: ../../include/text.php:1284
-msgid "frustrated"
-msgstr "разочарованный"
-
-#: ../../include/text.php:1285
-msgid "depressed"
-msgstr "подавленный"
-
-#: ../../include/text.php:1286
-msgid "motivated"
-msgstr "мотивированный"
+msgid "%1$s [%2$s]"
+msgstr ""
 
-#: ../../include/text.php:1287
-msgid "relaxed"
-msgstr "ра��лабленный"
+#: ../../Zotlabs/Module/Connections.php:320
+msgid "Edit connection"
+msgstr "Редактировать контакт"
 
-#: ../../include/text.php:1288
-msgid "surprised"
-msgstr "удивленный"
+#: ../../Zotlabs/Module/Connections.php:322
+msgid "Delete connection"
+msgstr "Удалить контакт"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:99
-msgid "Monday"
-msgstr "Понедельник"
+#: ../../Zotlabs/Module/Connections.php:331
+msgid "Channel address"
+msgstr "�дре� канала"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:100
-msgid "Tuesday"
-msgstr "Вторник"
+#: ../../Zotlabs/Module/Connections.php:333
+#: ../../Zotlabs/Widget/Notifications.php:16 ../../include/features.php:290
+msgid "Network"
+msgstr "Сеть"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:101
-msgid "Wednesday"
-msgstr "Среда"
+#: ../../Zotlabs/Module/Connections.php:336
+msgid "Call"
+msgstr "Вызов"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:102
-msgid "Thursday"
-msgstr "Четверг"
+#: ../../Zotlabs/Module/Connections.php:338
+msgid "Status"
+msgstr "Стату�"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:103
-msgid "Friday"
-msgstr "П�тница"
+#: ../../Zotlabs/Module/Connections.php:340
+msgid "Connected"
+msgstr "Подключено"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:104
-msgid "Saturday"
-msgstr "Суббота"
+#: ../../Zotlabs/Module/Connections.php:342
+msgid "Approve connection"
+msgstr "Утвердить контакт"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:98
-msgid "Sunday"
-msgstr "Во�кре�енье"
+#: ../../Zotlabs/Module/Connections.php:344
+msgid "Ignore connection"
+msgstr "Игнорировать контакт"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:74
-msgid "January"
-msgstr "Январь"
+#: ../../Zotlabs/Module/Connections.php:345
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Ignore"
+msgstr "Игнорировать"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:75
-msgid "February"
-msgstr "Февраль"
+#: ../../Zotlabs/Module/Connections.php:346
+msgid "Recent activity"
+msgstr "По�ледние дей�тви�"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:76
-msgid "March"
-msgstr "Март"
+#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
+#: ../../Zotlabs/Module/Directory.php:369
+#: ../../Zotlabs/Widget/Suggestions.php:46 ../../Zotlabs/Widget/Follow.php:32
+#: ../../include/channel.php:1566 ../../include/connections.php:110
+#: ../../include/conversation.php:1098
+msgid "Connect"
+msgstr "Подключить"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:77
-msgid "April"
-msgstr "�прель"
+#: ../../Zotlabs/Module/Connections.php:352
+msgid "Connect at this location"
+msgstr "Подключить в �том ме�те"
 
-#: ../../include/text.php:1480
-msgid "May"
-msgstr "Май"
+#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:334
+#: ../../include/features.php:133 ../../include/text.php:1030
+msgid "Connections"
+msgstr "Контакты"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:79
-msgid "June"
-msgstr "Июнь"
+#: ../../Zotlabs/Module/Connections.php:379 ../../Zotlabs/Module/Search.php:45
+#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/nav.php:194
+#: ../../include/acl_selectors.php:149 ../../include/text.php:1144
+#: ../../include/text.php:1156
+msgid "Search"
+msgstr "Пои�к"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:80
-msgid "July"
-msgstr "Июль"
+#: ../../Zotlabs/Module/Connections.php:380
+msgid "Search your connections"
+msgstr "Пои�к ваших контактов"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:81
-msgid "August"
-msgstr "�вгу�т"
+#: ../../Zotlabs/Module/Connections.php:381
+msgid "Connections search"
+msgstr "Пои�к контаков"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:82
-msgid "September"
-msgstr "Сент�брь"
+#: ../../Zotlabs/Module/Connections.php:382
+#: ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437 ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr "Пои�к"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:83
-msgid "October"
-msgstr "Окт�брь"
+#: ../../Zotlabs/Module/Profile_photo.php:93
+#: ../../Zotlabs/Module/Cover_photo.php:85
+msgid "Image uploaded but image cropping failed."
+msgstr "Изображение загружено но обрезка не удала�ь."
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:84
-msgid "November"
-msgstr "�о�брь"
+#: ../../Zotlabs/Module/Profile_photo.php:147
+#: ../../Zotlabs/Module/Profile_photo.php:284
+#: ../../include/photo/photo_driver.php:435
+msgid "Profile Photos"
+msgstr "Фотографии профил�"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:85
-msgid "December"
-msgstr "Декабрь"
+#: ../../Zotlabs/Module/Profile_photo.php:166
+#: ../../Zotlabs/Module/Cover_photo.php:212
+msgid "Image resize failed."
+msgstr "�е удало�ь изменить размер изображени�."
 
-#: ../../include/text.php:1556
-msgid "Unknown Attachment"
-msgstr "�еизве�тное вложение"
+#: ../../Zotlabs/Module/Profile_photo.php:254
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:299
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Е�ли нова� фотографи� не отображает�� немедленно то нажмите Shift + \"Обновить\" дл� очи�тки к�ша браузера"
 
-#: ../../include/text.php:1558 ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:379
-msgid "Size"
-msgstr "Размер"
+#: ../../Zotlabs/Module/Profile_photo.php:261
+#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:196
+msgid "Unable to process image"
+msgstr "�е удает�� обработать изображение"
 
-#: ../../include/text.php:1558 ../../include/feedutils.php:872
-msgid "unknown"
-msgstr "неизве�тный"
+#: ../../Zotlabs/Module/Profile_photo.php:296
+#: ../../Zotlabs/Module/Cover_photo.php:265
+msgid "Image upload failed."
+msgstr "Загрузка изображени� не удала�ь."
 
-#: ../../include/text.php:1599
-msgid "remove category"
-msgstr "удалить категорию"
+#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Cover_photo.php:282
+msgid "Unable to process image."
+msgstr "�евозможно обработать изображение."
 
-#: ../../include/text.php:1676
-msgid "remove from file"
-msgstr "удалить из файла"
+#: ../../Zotlabs/Module/Profile_photo.php:379
+#: ../../Zotlabs/Module/Profile_photo.php:431
+#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Zotlabs/Module/Cover_photo.php:382
+msgid "Photo not available."
+msgstr "Фотографи� недо�тупна."
 
-#: ../../include/text.php:1845 ../../include/message.php:13
-msgid "Download binary/encrypted content"
-msgstr "Загрузить двоичное / зашифрованное �одержимое"
+#: ../../Zotlabs/Module/Profile_photo.php:495
+msgid ""
+"Your default profile photo is visible to anybody on the internet. Profile "
+"photos for alternate profiles will inherit the permissions of the profile"
+msgstr "Фотографи� вашего профил� по умолчанию видна в�ем в Интернете. Фотографи�профил� дл� альтернативных профилей на�ледуют разрешени� текущего профил�"
 
-#: ../../include/text.php:1916
-msgid "Poll has ended."
-msgstr "Опро� окончен."
+#: ../../Zotlabs/Module/Profile_photo.php:495
+msgid ""
+"Your profile photo is visible to anybody on the internet and may be "
+"distributed to other websites."
+msgstr "Фотографи� вашего профил� видна в�ем в Интернете и может быть отправлена на другие �айты."
 
-#: ../../include/text.php:1919
-#, php-format
-msgid "Poll ends: %s"
-msgstr "Опро� заканчивает�� %s"
+#: ../../Zotlabs/Module/Profile_photo.php:497
+#: ../../Zotlabs/Module/Cover_photo.php:420
+msgid "Upload File:"
+msgstr "Загрузить файл:"
 
-#: ../../include/text.php:1924 ../../Zotlabs/Lib/ThreadItem.php:446
-msgid "Vote"
-msgstr "Голо�овать"
+#: ../../Zotlabs/Module/Profile_photo.php:498
+#: ../../Zotlabs/Module/Cover_photo.php:421
+msgid "Select a profile:"
+msgstr "Выбрать профиль:"
 
-#: ../../include/text.php:2076 ../../Zotlabs/Module/Events.php:669
-msgid "Link to Source"
-msgstr "С�ылка на и�точник"
+#: ../../Zotlabs/Module/Profile_photo.php:499
+msgid "Use Photo for Profile"
+msgstr "И�пользовать фотографию дл� профил�"
 
-#: ../../include/text.php:2098 ../../include/language.php:428
-msgid "default"
-msgstr "по умолчанию"
+#: ../../Zotlabs/Module/Profile_photo.php:499
+msgid "Change Profile Photo"
+msgstr "Изменить фотографию профил�"
 
-#: ../../include/text.php:2106
-msgid "Page layout"
-msgstr "Шаблон �траницы"
+#: ../../Zotlabs/Module/Profile_photo.php:500
+msgid "Use"
+msgstr "И�пользовать"
 
-#: ../../include/text.php:2106
-msgid "You can create your own with the layouts tool"
-msgstr "Вы можете �оздать �вой �об�твенный � помощью ин�трумента шаблонов"
+#: ../../Zotlabs/Module/Profile_photo.php:505
+#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Zotlabs/Module/Cover_photo.php:427
+msgid "Use a photo from your albums"
+msgstr "И�пользовать фотографию из ваших альбомов"
 
-#: ../../include/text.php:2116 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
-#: ../../Zotlabs/Module/Wiki.php:370
-msgid "BBcode"
+#: ../../Zotlabs/Module/Profile_photo.php:508
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:401
+#: ../../include/conversation.php:1456 ../../include/conversation.php:1509
+#: ../../extend/addon/hzaddons/hsse/hsse.php:210
+#: ../../extend/addon/hzaddons/hsse/hsse.php:257
+msgid "OK"
 msgstr ""
 
-#: ../../include/text.php:2117
-msgid "HTML"
-msgstr ""
+#: ../../Zotlabs/Module/Profile_photo.php:509
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:402
+#: ../../include/conversation.php:1382
+#: ../../extend/addon/hzaddons/hsse/hsse.php:139
+msgid "Choose images to embed"
+msgstr "Выбрать изображени� дл� в�траивани�"
 
-#: ../../include/text.php:2119 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
-msgid "Text"
-msgstr "Тек�т"
+#: ../../Zotlabs/Module/Profile_photo.php:510
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:403
+#: ../../include/conversation.php:1383
+#: ../../extend/addon/hzaddons/hsse/hsse.php:140
+msgid "Choose an album"
+msgstr "Выбрать альбом"
 
-#: ../../include/text.php:2120
-msgid "Comanche Layout"
-msgstr "Шаблон Comanche"
+#: ../../Zotlabs/Module/Profile_photo.php:511
+#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:404
+msgid "Choose a different album"
+msgstr "Выбрать другой альбом"
 
-#: ../../include/text.php:2125
-msgid "PHP"
-msgstr ""
+#: ../../Zotlabs/Module/Profile_photo.php:512
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:405
+#: ../../include/conversation.php:1385
+#: ../../extend/addon/hzaddons/hsse/hsse.php:142
+msgid "Error getting album list"
+msgstr "Ошибка получени� �пи�ка альбомов"
 
-#: ../../include/text.php:2134
-msgid "Page content type"
-msgstr "Тип �одержимого �траницы"
+#: ../../Zotlabs/Module/Profile_photo.php:513
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:406
+#: ../../include/conversation.php:1386
+#: ../../extend/addon/hzaddons/hsse/hsse.php:143
+msgid "Error getting photo link"
+msgstr "Ошибка получени� ��ылки на фотографию"
 
-#: ../../include/text.php:2257 ../../include/event.php:1259
-#: ../../include/conversation.php:132
-#: ../../Zotlabs/Module/Channel_calendar.php:221
-#: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75
-#: ../../Zotlabs/Module/Events.php:266
-msgid "event"
-msgstr "�обытие"
+#: ../../Zotlabs/Module/Profile_photo.php:514
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:407
+#: ../../include/conversation.php:1387
+#: ../../extend/addon/hzaddons/hsse/hsse.php:144
+msgid "Error getting album"
+msgstr "Ошибка получени� альбома"
 
-#: ../../include/text.php:2260 ../../include/conversation.php:158
-#: ../../include/bbcode.php:555 ../../include/markdown.php:204
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3264
-msgid "post"
-msgstr "публикаци�"
+#: ../../Zotlabs/Module/Profile_photo.php:516
+#: ../../Zotlabs/Module/Cover_photo.php:438
+msgid "Select existing photo"
+msgstr "Выбрать �уще�твующую фотографию"
 
-#: ../../include/text.php:2262 ../../include/conversation.php:160
-#: ../../Zotlabs/Module/Tagger.php:81
-msgid "comment"
-msgstr "комментарий"
+#: ../../Zotlabs/Module/Profile_photo.php:535
+#: ../../Zotlabs/Module/Cover_photo.php:455
+msgid "Crop Image"
+msgstr "Обрезать изображение"
 
-#: ../../include/text.php:2267
-msgid "activity"
-msgstr "активно�ть"
+#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Cover_photo.php:456
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Пожалуй�та на�тройте обрезку изображени� дл� оптимального про�мотра."
 
-#: ../../include/text.php:2270
-msgid "poll"
-msgstr "голо�ование"
+#: ../../Zotlabs/Module/Profile_photo.php:538
+#: ../../Zotlabs/Module/Cover_photo.php:458
+msgid "Done Editing"
+msgstr "Закончить редактирование"
 
-#: ../../include/text.php:2383
-msgid "a-z, 0-9, -, and _ only"
-msgstr "Только a-z, 0-9, -, и _"
+#: ../../Zotlabs/Module/Cdav.php:819
+msgid "Calendar entries imported."
+msgstr "Событи� календар� импортированы."
 
-#: ../../include/text.php:2709
-msgid "Design Tools"
-msgstr "Ин�трументы дизайна"
+#: ../../Zotlabs/Module/Cdav.php:821
+msgid "No calendar entries found."
+msgstr "�е найдено �обытий в календаре."
 
-#: ../../include/text.php:2712 ../../Zotlabs/Module/Blocks.php:154
-msgid "Blocks"
-msgstr "Блокировки"
+#: ../../Zotlabs/Module/Cdav.php:877
+msgid "CardDAV App"
+msgstr "Приложение CardDAV"
 
-#: ../../include/text.php:2713 ../../Zotlabs/Module/Menu.php:171
-msgid "Menus"
-msgstr "Меню"
+#: ../../Zotlabs/Module/Cdav.php:878
+msgid "CalDAV capable addressbook"
+msgstr "�дре�на� книга � поддержкой CalDAV"
 
-#: ../../include/text.php:2714 ../../Zotlabs/Module/Layouts.php:184
-msgid "Layouts"
-msgstr "Шаблоны"
+#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165
+#: ../../Zotlabs/Module/Channel_calendar.php:392
+msgid "Link to source"
+msgstr "С�ылка на и�точник"
 
-#: ../../include/text.php:2715
-msgid "Pages"
-msgstr "Страницы"
+#: ../../Zotlabs/Module/Cdav.php:1010
+msgid "Event title"
+msgstr "�аименование �обыти�"
 
-#: ../../include/text.php:2727
-msgid "Import"
-msgstr "Импортировать"
+#: ../../Zotlabs/Module/Cdav.php:1011
+msgid "Start date and time"
+msgstr "Дата и врем� начала"
 
-#: ../../include/text.php:2728
-msgid "Import website..."
-msgstr "Импорт веб-�айта..."
+#: ../../Zotlabs/Module/Cdav.php:1012
+msgid "End date and time"
+msgstr "Дата и врем� окончани�"
 
-#: ../../include/text.php:2729
-msgid "Select folder to import"
-msgstr "Выбрать каталог дл� импорта"
+#: ../../Zotlabs/Module/Cdav.php:1013
+msgid "Timezone:"
+msgstr "Ча�овой по��:"
 
-#: ../../include/text.php:2730
-msgid "Import from a zipped folder:"
-msgstr "Импортировать из каталога в zip-архиве:"
+#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Cal.php:205
+msgid "Today"
+msgstr "Сегодн�"
 
-#: ../../include/text.php:2731
-msgid "Import from cloud files:"
-msgstr "Импортировать из �етевых файлов:"
+#: ../../Zotlabs/Module/Cdav.php:1039
+msgid "Month"
+msgstr "Ме��ц"
 
-#: ../../include/text.php:2732
-msgid "/cloud/channel/path/to/folder"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1040
+msgid "Week"
+msgstr "�едел�"
 
-#: ../../include/text.php:2733
-msgid "Enter path to website files"
-msgstr "Введите путь к файлам веб-�айта"
+#: ../../Zotlabs/Module/Cdav.php:1041
+msgid "Day"
+msgstr "День"
 
-#: ../../include/text.php:2734
-msgid "Select folder"
-msgstr "Выбрать каталог"
+#: ../../Zotlabs/Module/Cdav.php:1042
+msgid "List month"
+msgstr "Про�мотреть ме��ц"
 
-#: ../../include/text.php:2735
-msgid "Export website..."
-msgstr "Эк�порт веб-�айта..."
+#: ../../Zotlabs/Module/Cdav.php:1043
+msgid "List week"
+msgstr "Про�мотреть неделю"
 
-#: ../../include/text.php:2736
-msgid "Export to a zip file"
-msgstr "Эк�портировать в ZIP файл."
+#: ../../Zotlabs/Module/Cdav.php:1044
+msgid "List day"
+msgstr "Про�мотреть день"
 
-#: ../../include/text.php:2737
-msgid "website.zip"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1052
+msgid "More"
+msgstr "Больше"
 
-#: ../../include/text.php:2738
-msgid "Enter a name for the zip file."
-msgstr "Введите им� дл� ZIP файла."
+#: ../../Zotlabs/Module/Cdav.php:1053
+msgid "Less"
+msgstr "Меньше"
 
-#: ../../include/text.php:2739
-msgid "Export to cloud files"
-msgstr "Э�кпортировать в �етевые файлы:"
+#: ../../Zotlabs/Module/Cdav.php:1055
+msgid "Select calendar"
+msgstr "Выбрать календарь"
 
-#: ../../include/text.php:2740
-msgid "/path/to/export/folder"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1056 ../../Zotlabs/Widget/Cdav.php:143
+msgid "Channel Calendars"
+msgstr "Календари канала"
 
-#: ../../include/text.php:2741
-msgid "Enter a path to a cloud files destination."
-msgstr "Введите путь к ра�положению �етевых файлов."
+#: ../../Zotlabs/Module/Cdav.php:1056 ../../Zotlabs/Widget/Cdav.php:129
+#: ../../Zotlabs/Widget/Cdav.php:143
+msgid "CalDAV Calendars"
+msgstr "Календари CalDAV"
 
-#: ../../include/text.php:2742
-msgid "Specify folder"
-msgstr "Указать каталог"
+#: ../../Zotlabs/Module/Cdav.php:1058
+msgid "Delete all"
+msgstr "Удалить в�ё"
 
-#: ../../include/opengraph.php:56
-#, php-format
-msgid "This is the home page of %s."
-msgstr "Это домашн�� �траница %s."
+#: ../../Zotlabs/Module/Cdav.php:1061
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr "Про�тите, но редактирование повтор�ющих�� �обытий пока не реализовано."
 
-#: ../../include/event.php:33 ../../include/event.php:110
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1071 ../../Zotlabs/Storage/Browser.php:293
+#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
+#: ../../Zotlabs/Widget/Appcategories.php:43 ../../include/taxonomy.php:420
+#: ../../include/taxonomy.php:502 ../../include/taxonomy.php:522
+#: ../../include/taxonomy.php:543 ../../include/contact_widgets.php:112
+#: ../../include/contact_widgets.php:156 ../../include/contact_widgets.php:201
+#: ../../include/contact_widgets.php:236
+msgid "Categories"
+msgstr "Категории"
 
-#: ../../include/event.php:41
-msgid "Starts:"
-msgstr "�ачало:"
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:909
+msgid "Organisation"
+msgstr "Организаци�"
 
-#: ../../include/event.php:51
-msgid "Finishes:"
-msgstr "Окончание:"
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:910
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2617
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2678
+msgid "Title"
+msgstr "�аименование"
 
-#: ../../include/event.php:63 ../../include/event.php:134
-#: ../../include/channel.php:1658 ../../Zotlabs/Module/Directory.php:354
-msgid "Location:"
-msgstr "Ме�тоположение:"
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:927
+msgid "P.O. Box"
+msgstr "абонент�кий �щик"
 
-#: ../../include/event.php:110
-msgid "l F d, Y"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:928
+msgid "Additional"
+msgstr "Дополнительно"
 
-#: ../../include/event.php:114
-msgid "Start:"
-msgstr "�ачало:"
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:929
+msgid "Street"
+msgstr "Улица"
 
-#: ../../include/event.php:118
-msgid "End:"
-msgstr "Окончание:"
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:930
+msgid "Locality"
+msgstr "�а�елённый пункт"
 
-#: ../../include/event.php:1106
-msgid "This event has been added to your calendar."
-msgstr "Это �обытие было добавлено в ваш календарь."
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:931
+msgid "Region"
+msgstr "Регион"
 
-#: ../../include/event.php:1337
-msgid "Not specified"
-msgstr "�е указано"
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:932
+msgid "ZIP Code"
+msgstr "Индек�"
 
-#: ../../include/event.php:1338
-msgid "Needs Action"
-msgstr "Требует дей�тви�"
+#: ../../Zotlabs/Module/Cdav.php:1457
+msgid "Default Calendar"
+msgstr "Календарь по умолчанию"
 
-#: ../../include/event.php:1339
-msgid "Completed"
-msgstr "Завершено"
+#: ../../Zotlabs/Module/Cdav.php:1468
+msgid "Default Addressbook"
+msgstr "�дре�на� книга по умолчанию"
 
-#: ../../include/event.php:1340
-msgid "In Process"
-msgstr "В проце��е"
+#: ../../Zotlabs/Module/Chanview.php:132
+msgid "toggle full screen mode"
+msgstr "переключение полно�кранного режима"
 
-#: ../../include/event.php:1341
-msgid "Cancelled"
-msgstr "Отменено"
+#: ../../Zotlabs/Module/Oauth.php:45
+msgid "Name is required"
+msgstr "�еобходимо им�"
 
-#: ../../include/event.php:1422 ../../include/connections.php:734
-#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:925
-msgid "Mobile"
-msgstr "Мобильный"
+#: ../../Zotlabs/Module/Oauth.php:49
+msgid "Key and Secret are required"
+msgstr "Требуют�� ключ и код"
 
-#: ../../include/event.php:1423 ../../include/connections.php:735
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:926
-msgid "Home"
-msgstr "Домашний"
+#: ../../Zotlabs/Module/Oauth.php:100
+msgid "OAuth Apps Manager App"
+msgstr "Приложение \"Менеджер Oauth\""
 
-#: ../../include/event.php:1424 ../../include/connections.php:736
-msgid "Home, Voice"
-msgstr "Дом, голо�"
+#: ../../Zotlabs/Module/Oauth.php:101
+msgid "OAuth authentication tokens for mobile and remote apps"
+msgstr "Токены аутентификации OAuth дл� мобильный и удалённых приложений"
 
-#: ../../include/event.php:1425 ../../include/connections.php:737
-msgid "Home, Fax"
-msgstr "Дом, фак�"
+#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
+#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Oauth2.php:143
+#: ../../Zotlabs/Module/Oauth2.php:193
+msgid "Add application"
+msgstr "Добавить приложение"
 
-#: ../../include/event.php:1426 ../../include/connections.php:738
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:927
-msgid "Work"
-msgstr "Рабочий"
+#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth2.php:118
+#: ../../Zotlabs/Module/Oauth2.php:146
+msgid "Name of application"
+msgstr "�азвание приложени�"
 
-#: ../../include/event.php:1427 ../../include/connections.php:739
-msgid "Work, Voice"
-msgstr "Работа, голо�"
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+#: ../../extend/addon/hzaddons/twitter/twitter.php:498
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:596
+msgid "Consumer Key"
+msgstr "Ключ клиента"
 
-#: ../../include/event.php:1428 ../../include/connections.php:740
-msgid "Work, Fax"
-msgstr "Работа, фак�"
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Сгенерирован автоматиче�кие - измените е�ли требует��. Мак�. длина 20"
 
-#: ../../include/event.php:1429 ../../include/event.php:1436
-#: ../../include/selectors.php:60 ../../include/selectors.php:77
-#: ../../include/selectors.php:115 ../../include/selectors.php:151
-#: ../../include/connections.php:741 ../../include/connections.php:748
-#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:797
-#: ../../Zotlabs/Module/Connedit.php:928
-#: ../../Zotlabs/Access/PermissionRoles.php:310
-msgid "Other"
-msgstr "Другой"
+#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+#: ../../extend/addon/hzaddons/twitter/twitter.php:499
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:595
+msgid "Consumer Secret"
+msgstr "Код клиента"
 
-#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "Off"
-msgstr "Выкл."
+#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+msgid "Redirect"
+msgstr "Перенаправление"
 
-#: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "On"
-msgstr "Вкл."
+#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
+#: ../../Zotlabs/Module/Oauth2.php:148
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
+msgstr "URI перенаправлени� - о�тавьте пу�тыми до тех пока ваше приложение не требует �того"
 
-#: ../../include/features.php:82 ../../include/nav.php:463
-#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346
-msgid "Calendar"
-msgstr "Календарь"
+#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
+msgid "Icon url"
+msgstr "URL значка"
 
-#: ../../include/features.php:86
-msgid "Start calendar week on Monday"
-msgstr "�ачинать календарную неделю � понедельника"
+#: ../../Zotlabs/Module/Oauth.php:128
+msgid "Application not found."
+msgstr "Приложение не найдено."
 
-#: ../../include/features.php:87
-msgid "Default is Sunday"
-msgstr "По умолчанию - во�кре�енье"
+#: ../../Zotlabs/Module/Oauth.php:171
+msgid "Connected OAuth Apps"
+msgstr "Подключенные приложени� OAuth"
 
-#: ../../include/features.php:94
-msgid "Event Timezone Selection"
-msgstr "Выбор ча�ового по��а �обыти�"
+#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
+msgid "Client key starts with"
+msgstr "Ключ клиента начинает�� �"
 
-#: ../../include/features.php:95
-msgid "Allow event creation in timezones other than your own."
-msgstr "Разрешить �оздание �обыти� в ча�овой зоне отличной от вашей"
+#: ../../Zotlabs/Module/Oauth.php:176 ../../Zotlabs/Module/Oauth2.php:197
+msgid "No name"
+msgstr "Без названи�"
 
-#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:343
-msgid "Channel Home"
-msgstr "Главна� канала"
+#: ../../Zotlabs/Module/Oauth.php:177 ../../Zotlabs/Module/Oauth2.php:198
+msgid "Remove authorization"
+msgstr "Удалить разрешение"
 
-#: ../../include/features.php:108
-msgid "Search by Date"
-msgstr "Пои�к по дате"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Дей�твительный аккаунт не найден."
 
-#: ../../include/features.php:109
-msgid "Ability to select posts by date ranges"
-msgstr "Возможно�ть выбора �ообщений по диапазонам дат"
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Запро� на �бро� парол� отправлен. Проверьте вашу �лектронную почту."
 
-#: ../../include/features.php:116
-msgid "Tag Cloud"
-msgstr "Облако тегов"
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Уча�тник �айта (%s)"
 
-#: ../../include/features.php:117
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Показывает личное облако тегов на �транице канала"
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Запрошен �бро� парол� на %s"
 
-#: ../../include/features.php:124 ../../include/features.php:358
-msgid "Use blog/list mode"
-msgstr "И�пользовать режим блога / �пи�ка"
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Запро� не может быть проверен. (Вы могли отправить его раньше). Сбро� парол� не возможен."
 
-#: ../../include/features.php:125 ../../include/features.php:359
-msgid "Comments will be displayed separately"
-msgstr "Комментарии будут отображать�� отдельно"
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr "Ваш пароль в �оответ�твии � про�ьбой �брошен."
 
-#: ../../include/features.php:137
-msgid "Connection Filtering"
-msgstr "Фильтраци� контактов"
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr "Ваш новый пароль"
 
-#: ../../include/features.php:138
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Фильтр вход�щих �ообщений от контактов на о�нове ключевых �лов / контента"
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr "Сохраните ваш новый пароль и затем"
 
-#: ../../include/features.php:146
-msgid "Conversation"
-msgstr "Диалоги"
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr "нажмите зде�ь чтобы войти"
 
-#: ../../include/features.php:158
-msgid "Emoji Reactions"
-msgstr "Реакции Emoji"
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Ваш пароль может быть изменён на �транице <em>�а�тройки</em> по�ле у�пешного входа."
 
-#: ../../include/features.php:159
-msgid "Add emoji reaction ability to posts"
-msgstr "Возможно�ть добавл�ть реакции Emoji к публикаци�м"
+#: ../../Zotlabs/Module/Lostpass.php:117
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Пароль был изменен на %s"
 
-#: ../../include/features.php:166
-msgid "Dislike Posts"
-msgstr "�е нрав�щие�� публикации"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
+msgstr "Забыли ваш пароль?"
 
-#: ../../include/features.php:167
-msgid "Ability to dislike posts/comments"
-msgstr "Возможно�ть отмечать не нрав�щие�� публикации / комментарии"
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Введите ваш адре� �лектронной почты и нажмите отправить чтобы �бро�ить пароль. Затем проверьте ваш почтовый �щик дл� дальнейших ин�трукций. "
 
-#: ../../include/features.php:174
-msgid "Star Posts"
-msgstr "Помечать �ообщени�"
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
+msgstr "�дре� �лектронной почты"
 
-#: ../../include/features.php:175
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Возможно�ть отметить �пециальные �ообщени� индикатором-звёздочкой"
+#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78
+msgid "Reset"
+msgstr "Сбро�ить"
 
-#: ../../include/features.php:182
-msgid "Reply on comment"
-msgstr "Ответить на комментарий"
+#: ../../Zotlabs/Module/Notifications.php:106
+#: ../../Zotlabs/Module/Notify.php:69
+msgid "No more system notifications."
+msgstr "�ет новых оповещений �и�темы."
 
-#: ../../include/features.php:183
-msgid "Ability to reply on selected comment"
-msgstr "Возможно�ть ответить на выбранный комментарий"
+#: ../../Zotlabs/Module/Notifications.php:110
+#: ../../Zotlabs/Module/Notify.php:73
+msgid "System Notifications"
+msgstr "Си�темные оповещени� "
 
-#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:347
-msgid "Directory"
-msgstr "Каталог"
+#: ../../Zotlabs/Module/Notifications.php:111
+#: ../../Zotlabs/Lib/ThreadItem.php:484
+msgid "Mark all seen"
+msgstr "Отметить как про�мотренное"
 
-#: ../../include/features.php:196
-msgid "Advanced Directory Search"
-msgstr "Ра�ширенный пои�к в каталоге"
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Удаленна� информаци� о конфиденциально�ти недо�тупна."
 
-#: ../../include/features.php:197
-msgid "Allows creation of complex directory search queries"
-msgstr "Позвол�ет �оздание �ложных пои�ковых запро�ов в каталоге"
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Видимо дл�:"
 
-#: ../../include/features.php:206
-msgid "Editor"
-msgstr "Редактор"
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editwebpage.php:32
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Filestorage.php:59
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Menu.php:92
+#: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Webpages.php:39
+#: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Articles.php:43
+#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
+#: ../../include/channel.php:1384
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:49
+msgid "Requested profile is not available."
+msgstr "Запрашиваемый профиль не до�тупен."
 
-#: ../../include/features.php:210
-msgid "Post Categories"
-msgstr "Категории публикаций"
+#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
+msgid "Continue"
+msgstr "Продолжить"
 
-#: ../../include/features.php:211
-msgid "Add categories to your posts"
-msgstr "Добавить категории дл� ваших публикаций"
+#: ../../Zotlabs/Module/Connect.php:99
+msgid "Premium Channel Setup"
+msgstr "У�тановка премиального канала"
 
-#: ../../include/features.php:218
-msgid "Large Photos"
-msgstr "Большие фотографии"
+#: ../../Zotlabs/Module/Connect.php:101
+msgid "Enable premium channel connection restrictions"
+msgstr "Включить ограничени� дл� премиального канала"
 
-#: ../../include/features.php:219
+#: ../../Zotlabs/Module/Connect.php:102
 msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
-msgstr "Включить большие (1024px) миниатюры изображений в публикаци�х. Е�ли не включено, и�пользовать маленькие (640px) миниатюры."
-
-#: ../../include/features.php:226
-msgid "Even More Encryption"
-msgstr "Еще больше шифровани�"
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Пожалуй�та введите ваши ограничени� или у�лови�, такие, как оплата PayPal, правила и�пользовани� и т.п."
 
-#: ../../include/features.php:227
+#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124
 msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Разрешить дополнительное end-to-end шифрование �одержимого � общим �екретным ключом"
-
-#: ../../include/features.php:234
-msgid "Disable Comments"
-msgstr "Отключить комментарии"
-
-#: ../../include/features.php:235
-msgid "Provide the option to disable comments for a post"
-msgstr "Предо�тавить возможно�ть отключать комментарии дл� публикаций"
-
-#: ../../include/features.php:242
-msgid "Delayed Posting"
-msgstr "Задержанна� публикаци�"
-
-#: ../../include/features.php:243
-msgid "Allow posts to be published at a later date"
-msgstr "Разрешить размешать публикации �ледующими датами"
-
-#: ../../include/features.php:250
-msgid "Content Expiration"
-msgstr "И�течение �рока дей�тви� �одержимого"
-
-#: ../../include/features.php:251
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Удал�ть публикации / комментарии и / или личные �ообщени�"
-
-#: ../../include/features.php:258
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Подавл�ть дублирующие публикации / комментарии"
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Этот канал до подключени� может требовать дополнительных шагов или подтверждений �ледующих у�ловий:"
 
-#: ../../include/features.php:259
+#: ../../Zotlabs/Module/Connect.php:105
 msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
-msgstr "Предотвращает по�вление публикаций � одинаковым �одержимым е�ли интервал между ними менее 2 минут"
-
-#: ../../include/features.php:266
-msgid "Auto-save drafts of posts and comments"
-msgstr "�втоматиче�ки �охран�ть черновики публикаций и комментариев"
+"Potential connections will then see the following text before proceeding:"
+msgstr "Потенциальные �оединени� будут видеть �ледующий предварительный тек�т:"
 
-#: ../../include/features.php:267
+#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127
 msgid ""
-"Automatically saves post and comment drafts in local browser storage to help "
-"prevent accidental loss of compositions"
-msgstr "�втоматиче�ки �охран�ет черновики публикаций и комментариев в локальном хранилище браузера дл� предотвращени� их �лучайной утраты"
-
-#: ../../include/features.php:276
-msgid "Manage"
-msgstr "Управление"
-
-#: ../../include/features.php:280
-msgid "Navigation Channel Select"
-msgstr "Выбор канала навигации"
-
-#: ../../include/features.php:281
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr "Изменить канал напр�мую из выпадающего меню"
-
-#: ../../include/features.php:290 ../../Zotlabs/Module/Connections.php:333
-msgid "Network"
-msgstr "Сеть"
-
-#: ../../include/features.php:294
-msgid "Events Filter"
-msgstr "Фильтр �обытий"
-
-#: ../../include/features.php:295
-msgid "Ability to display only events"
-msgstr "Возможно�ть отображать только �обыти�"
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
+msgstr "Продолжа�, � подтверждаю что � выполнил в�е у�лови� пред�тавленные на данной �транице."
 
-#: ../../include/features.php:302
-msgid "Polls Filter"
-msgstr "Фильтр голо�ований"
+#: ../../Zotlabs/Module/Connect.php:115
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Владельцем канала не было пред�тавлено никаких �пециальных ин�трукций.)"
 
-#: ../../include/features.php:303
-msgid "Ability to display only polls"
-msgstr "Возможно�ть отображать только опро�ы"
+#: ../../Zotlabs/Module/Connect.php:123
+msgid "Restricted or Premium Channel"
+msgstr "Ограниченный или премиальный канал"
 
-#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:83
-msgid "Saved Searches"
-msgstr "Сохранённые пои�ки"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Канала нет."
 
-#: ../../include/features.php:311
-msgid "Save search terms for re-use"
-msgstr "Сохран�ть результаты пои�ка дл� повторного и�пользовани�"
+#: ../../Zotlabs/Module/Common.php:45
+msgid "No connections in common."
+msgstr "Общих контактов нет."
 
-#: ../../include/features.php:318 ../../include/contact_widgets.php:53
-#: ../../Zotlabs/Widget/Activity_filter.php:189
-#: ../../Zotlabs/Widget/Filer.php:28
-msgid "Saved Folders"
-msgstr "Сохранённые каталоги"
+#: ../../Zotlabs/Module/Common.php:65
+msgid "View Common Connections"
+msgstr "Про�мотр общий контактов"
 
-#: ../../include/features.php:319
-msgid "Ability to file posts under folders"
-msgstr "Возможно�ть размещать публикации в каталогах"
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Tagger.php:71
+#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:128 ../../include/text.php:2236
+#: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2128
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1621
+msgid "photo"
+msgstr "фото"
 
-#: ../../include/features.php:326
-msgid "Alternate Stream Order"
-msgstr "Отображение потока"
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Module/Like.php:439
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2128
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1621
+msgid "status"
+msgstr "�тату�"
 
-#: ../../include/features.php:327
-msgid ""
-"Ability to order the stream by last post date, last comment date or "
-"unthreaded activities"
-msgstr "Возможно�ть показывать поток по дате по�леднего �ообщени�, по�леднего комментари� или в пор�дке по�туплени�"
+#: ../../Zotlabs/Module/Subthread.php:128
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s от�леживает %2$s's %3$s"
 
-#: ../../include/features.php:334
-msgid "Contact Filter"
-msgstr "Фильтр контактов"
+#: ../../Zotlabs/Module/Subthread.php:130
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s прекратил от�леживать %2$s's %3$s"
 
-#: ../../include/features.php:335
-msgid "Ability to display only posts of a selected contact"
-msgstr "Возможно�ть показа публикаций только от выбранных контактов"
+#: ../../Zotlabs/Module/Editwebpage.php:139
+msgid "Page link"
+msgstr "С�ылка �траницы"
 
-#: ../../include/features.php:342
-msgid "Forum Filter"
-msgstr "Фильтр по форумам"
+#: ../../Zotlabs/Module/Editwebpage.php:166
+msgid "Edit Webpage"
+msgstr "Редактировать веб-�траницу"
 
-#: ../../include/features.php:343
-msgid "Ability to display only posts of a specific forum"
-msgstr "Возможно�ть показа публикаций только определённого форума"
+#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Zotlabs/Module/Email_validation.php:24
+msgid "Token verification failed."
+msgstr "�е удало�ь выполнить проверку токена."
 
-#: ../../include/features.php:350
-msgid "Personal Posts Filter"
-msgstr "Пер�ональный фильтр публикаций"
+#: ../../Zotlabs/Module/Email_resend.php:30
+msgid "Email verification resent"
+msgstr "Сообщение дл� проверки email отправлено повторно"
 
-#: ../../include/features.php:351
-msgid "Ability to display only posts that you've interacted on"
-msgstr "Возможно�ть показа только тех публикаций � которыми вы взаимодей�твовали"
+#: ../../Zotlabs/Module/Email_resend.php:33
+msgid "Unable to resend email verification message."
+msgstr "�евозможно повторно отправить �ообщение дл� проверки email"
 
-#: ../../include/features.php:368 ../../include/nav.php:444
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345
-msgid "Photos"
-msgstr "Фотографии"
+#: ../../Zotlabs/Module/Dircensor.php:42
+msgid "Entry censored"
+msgstr "Запи�ь цензурирована"
 
-#: ../../include/features.php:372
-msgid "Photo Location"
-msgstr "Ме�тоположение фотографии"
+#: ../../Zotlabs/Module/Dircensor.php:45
+msgid "Entry uncensored"
+msgstr "Запи�ь нецензурирована"
 
-#: ../../include/features.php:373
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Е�ли данные о ме�тоположении до�тупны на загруженных фотографий, �в�зать их � картой."
+#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:68
+msgid "Nothing to import."
+msgstr "�ичего импортировать."
 
-#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:363
-msgid "Profiles"
-msgstr "Редактировать профиль"
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:83
+#: ../../Zotlabs/Module/Import.php:99
+msgid "Unable to download data from old server"
+msgstr "�евозможно загрузить данные �о �тарого �ервера"
 
-#: ../../include/features.php:386
-msgid "Advanced Profiles"
-msgstr "Ра�ширенные профили"
+#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:106
+msgid "Imported file is empty."
+msgstr "Импортированный файл пу�т."
 
-#: ../../include/features.php:387
-msgid "Additional profile sections and selections"
-msgstr "Дополнительные �екции и выборы профил�"
+#: ../../Zotlabs/Module/Import_items.php:93
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Предупреждение: Вер�и� базы данных отличает�� от %1$d обновлени�."
 
-#: ../../include/features.php:394
-msgid "Profile Import/Export"
-msgstr "Импорт / �к�порт профил�"
+#: ../../Zotlabs/Module/Import_items.php:108
+msgid "Import completed"
+msgstr "Импорт завершён."
 
-#: ../../include/features.php:395
-msgid "Save and load profile details across sites/channels"
-msgstr "Сохранение и загрузка на�троек профил� на в�ех �айтах / каналах"
+#: ../../Zotlabs/Module/Import_items.php:125
+msgid "Import Items"
+msgstr "Импортировать объекты"
 
-#: ../../include/features.php:402
-msgid "Multiple Profiles"
-msgstr "�е�колько профилей"
+#: ../../Zotlabs/Module/Import_items.php:126
+msgid "Use this form to import existing posts and content from an export file."
+msgstr "И�пользуйте �ту форму дл� импорта �уще�твующих публикаций и �одержимого из файла."
 
-#: ../../include/features.php:403
-msgid "Ability to create multiple profiles"
-msgstr "Возможно�ть �оздани� не�кольких профилей"
+#: ../../Zotlabs/Module/Import_items.php:127
+#: ../../Zotlabs/Module/Import.php:565
+msgid "File to Upload"
+msgstr "Файл дл� загрузки"
 
-#: ../../include/security.php:607
+#: ../../Zotlabs/Module/Page.php:173
 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 "�еверный токен безопа�но�ти дл� формы. Веро�тно, �то произошло потому, что форма была открыта �лишком долго (> 3-х ча�ов) перед её отправкой."
-
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr "Удалить �тот �лемент?"
-
-#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1097
-#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Lib/ThreadItem.php:826
-msgid "Comment"
-msgstr "Комментарий"
-
-#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:535
-#, php-format
-msgid "%s show all"
-msgstr "%s показать в�ё"
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr ""
 
-#: ../../include/js_strings.php:8
-#, php-format
-msgid "%s show less"
-msgstr "%s показать меньше"
+#: ../../Zotlabs/Module/Regate.php:81
+msgid "Email resent"
+msgstr "Электронна� почта повторно отправлена"
 
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
-msgstr "%s развернуть"
+#: ../../Zotlabs/Module/Regate.php:81
+msgid "Email resend failed"
+msgstr "Ошибка повторной отправки �лектронной почты"
 
-#: ../../include/js_strings.php:10
-#, php-format
-msgid "%s collapse"
-msgstr "%s �вернуть"
+#: ../../Zotlabs/Module/Regate.php:106
+msgid "Verification successful"
+msgstr "Проверка прошла у�пешно"
 
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr "Пароль �лишком короткий"
+#: ../../Zotlabs/Module/Regate.php:150
+msgid "Account successfull created"
+msgstr "Учётна� запи�ь у�пешно �оздана"
 
-#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:158
-msgid "Passwords do not match"
-msgstr "Пароли не �овпадают"
+#: ../../Zotlabs/Module/Regate.php:191
+msgid "Channel successfull created"
+msgstr "Канал у�пешно �оздан"
 
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr "в�е"
+#: ../../Zotlabs/Module/Regate.php:197
+msgid "Automatic channel creation failed. Please create a channel."
+msgstr "�втоматиче�кой �оздание канала не удало�ь. Пожалуй�та �оздайте канал."
 
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr "Тайный пароль"
+#: ../../Zotlabs/Module/Regate.php:209
+msgid "Account creation error"
+msgstr "Ошибка �оздани� учётной запи�и"
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr "Под�казка дл� парол�"
+#: ../../Zotlabs/Module/Regate.php:221
+msgid "Verify failed"
+msgstr "Проверка не удала�ь"
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr "Уведомление: Права до�тупа изменили�ь, но до �их пор не �охранены."
+#: ../../Zotlabs/Module/Regate.php:226
+msgid "Token verification failed"
+msgstr "�еверный проверочный код"
 
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "закрыть в�е"
+#: ../../Zotlabs/Module/Regate.php:231
+msgid "Request not inside time frame"
+msgstr "Запро� в не у�тановленные �роки "
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr "Зде�ь нет ничего нового"
+#: ../../Zotlabs/Module/Regate.php:237 ../../Zotlabs/Module/Regate.php:267
+msgid "Identity unknown"
+msgstr "Лично�ть не у�тановлена"
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr "Оценкa �тoго канала (общедо�тупно)"
+#: ../../Zotlabs/Module/Regate.php:243
+msgid "dId2 mistaken"
+msgstr "ошибочный dId2"
 
-#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:157
-#: ../../Zotlabs/Module/Connedit.php:880
-msgid "Rating"
-msgstr "Оценка"
+#: ../../Zotlabs/Module/Regate.php:271
+msgid "Your Registration ID"
+msgstr "Идентификатор вашей реги�трации"
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr "Охарактеризовать (необ�зательно)"
+#: ../../Zotlabs/Module/Regate.php:284 ../../Zotlabs/Module/Regate.php:376
+#: ../../Zotlabs/Module/Regate.php:408
+msgid "Registration verification"
+msgstr "Проверка реги�трации"
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Пожалуй�та, введите URL ��ылки"
+#: ../../Zotlabs/Module/Regate.php:291 ../../Zotlabs/Module/Regate.php:413
+msgid "Hold on, you can start verification in"
+msgstr "Подождите, вы можете начать проверку через "
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Е�ть не�охраненные изменени�. Вы уверены, что хотите покинуть �ту �траницу?"
+#: ../../Zotlabs/Module/Regate.php:292
+msgid "Please remember your verification token for ID"
+msgstr "Пожалуй�та, запомните �вой код подтверждени� дл� идентификации"
 
-#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:53
-#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:483
-#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736
-#: ../../Zotlabs/Module/Locs.php:128
-msgid "Location"
-msgstr "Ме�то"
+#: ../../Zotlabs/Module/Regate.php:294
+msgid "Token validity"
+msgstr "Срок дей�тви� кода"
 
-#: ../../include/js_strings.php:26
-msgid "lovely"
-msgstr "прекра�но"
+#: ../../Zotlabs/Module/Regate.php:330
+msgid "Resend email"
+msgstr "Отправить �лектронное пи�ьмо повторно"
 
-#: ../../include/js_strings.php:27
-msgid "wonderful"
-msgstr "замечательно"
+#: ../../Zotlabs/Module/Regate.php:335
+msgid "Registration status"
+msgstr "Стату� реги�трации"
 
-#: ../../include/js_strings.php:28
-msgid "fantastic"
-msgstr "фанта�тично"
+#: ../../Zotlabs/Module/Regate.php:338
+msgid "Verification successful!"
+msgstr "Проверка прошла у�пешно! "
 
-#: ../../include/js_strings.php:29
-msgid "great"
-msgstr "отлично"
+#: ../../Zotlabs/Module/Regate.php:339
+msgid "Your login ID is"
+msgstr "Ваш логин дл� входа"
 
-#: ../../include/js_strings.php:30
+#: ../../Zotlabs/Module/Regate.php:340
 msgid ""
-"Your chosen nickname was either already taken or not valid. Please use our "
-"suggestion ("
-msgstr "Выбранный вами п�евдоним уже и�пользует�� или недей�твителен. Попробуйте и�пользовать наше предложение ("
-
-#: ../../include/js_strings.php:31
-msgid ") or enter a new one."
-msgstr ") или введите новый."
-
-#: ../../include/js_strings.php:32
-msgid "Thank you, this nickname is valid."
-msgstr "Спа�ибо, �тот п�евдоним может быть и�пользован."
-
-#: ../../include/js_strings.php:33
-msgid "A channel name is required."
-msgstr "Требует�� название канала."
-
-#: ../../include/js_strings.php:34
-msgid "This is a "
-msgstr "Это "
+"After your account has been approved by our administrator you will be able "
+"to login with your login ID and your provided password."
+msgstr "По�ле того, как ваша учетна� запи�ь будет одобрена нашим админи�тратором, вы �можете войти в �и�тему, указав �вой логин и пароль."
 
-#: ../../include/js_strings.php:35
-msgid " channel name"
-msgstr " название канала"
+#: ../../Zotlabs/Module/Regate.php:352
+msgid "Registration request revoked"
+msgstr "Запро� на реги�трацию был отозван"
 
-#: ../../include/js_strings.php:36
-msgid "Back to reply"
-msgstr "Вернуть�� к ответу"
+#: ../../Zotlabs/Module/Regate.php:353
+msgid "Sorry for any inconvience. Thank you for your response."
+msgstr "Прино�им извинени� за неудоб�тва. Благодарим за ваш ответ."
 
-#: ../../include/js_strings.php:37
-msgid "Pinned"
-msgstr "Прикреплено"
+#: ../../Zotlabs/Module/Regate.php:377
+msgid "Please enter your verification token for ID"
+msgstr "Пожалуй�та введите ваш проверочный код дл� идентификации"
 
-#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:473
-msgid "Pin to the top"
-msgstr "Прикрепить �верху"
+#: ../../Zotlabs/Module/Regate.php:378 ../../Zotlabs/Module/Regate.php:405
+msgid "Please check your email!"
+msgstr "Пожалуй�та, проверьте вашу �лектронную почту!"
 
-#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155
-#: ../../Zotlabs/Lib/ThreadItem.php:473
-msgid "Unpin from the top"
-msgstr "Открепить"
+#: ../../Zotlabs/Module/Regate.php:388
+msgid "Verification token"
+msgstr "Код проверки"
 
-#: ../../include/js_strings.php:45
-#, php-format
-msgid "%d minutes"
-msgid_plural "%d minutes"
-msgstr[0] "%d минуту"
-msgstr[1] "%d минуты"
-msgstr[2] "%d минут"
+#: ../../Zotlabs/Module/Regate.php:399
+msgid "ID expired"
+msgstr "Срок дей�тви� идентификатора и�тёк"
 
-#: ../../include/js_strings.php:46
-#, php-format
-msgid "about %d hours"
-msgid_plural "about %d hours"
-msgstr[0] "около %d ча�a"
-msgstr[1] "около %d ча�ов"
-msgstr[2] "около %d ча�ов"
+#: ../../Zotlabs/Module/Regate.php:414
+msgid "You will require the verification token for ID"
+msgstr "Вам потребует�� проверочный кода дл� идентификации"
 
-#: ../../include/js_strings.php:47
-#, php-format
-msgid "%d days"
-msgid_plural "%d days"
-msgstr[0] "%d день"
-msgstr[1] "%d дн�"
-msgstr[2] "%d дней"
+#: ../../Zotlabs/Module/Regate.php:423
+msgid "Unknown or expired ID"
+msgstr "Идентификатор неизве�тен или � и�текшим �роком дей�тви�"
 
-#: ../../include/js_strings.php:48
-#, php-format
-msgid "%d months"
-msgid_plural "%d months"
-msgstr[0] "%d ме��ц"
-msgstr[1] "%d ме��ца"
-msgstr[2] "%d ме��цев"
+#: ../../Zotlabs/Module/Regate.php:434
+msgid "dId2 malformed"
+msgstr "�еверный dId2"
 
-#: ../../include/js_strings.php:49
+#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2182
 #, php-format
-msgid "%d years"
-msgid_plural "%d years"
-msgstr[0] "%d год"
-msgstr[1] "%d года"
-msgstr[2] "%d лет"
-
-#: ../../include/js_strings.php:54
-msgid "timeago.prefixAgo"
-msgstr ""
-
-#: ../../include/js_strings.php:55
-msgid "timeago.prefixFromNow"
-msgstr "через"
+msgid "&#x1f501; Repeated %1$s's %2$s"
+msgstr "&#x1f501; Повторил %1$s %2$s"
 
-#: ../../include/js_strings.php:56
-msgid "timeago.suffixAgo"
-msgstr "назад"
+#: ../../Zotlabs/Module/Share.php:120
+msgid "Post repeated"
+msgstr "Публикаци� повтор�ет��"
 
-#: ../../include/js_strings.php:57
-msgid "timeago.suffixFromNow"
-msgstr "NONE"
+#: ../../Zotlabs/Module/Impel.php:43 ../../include/bbcode.php:348
+msgid "webpage"
+msgstr "веб-�траница"
 
-#: ../../include/js_strings.php:60
-msgid "less than a minute"
-msgstr "менее чем одну минуту"
+#: ../../Zotlabs/Module/Impel.php:48 ../../include/bbcode.php:354
+msgid "block"
+msgstr "заблокировать"
 
-#: ../../include/js_strings.php:61
-msgid "about a minute"
-msgstr "около минуты"
+#: ../../Zotlabs/Module/Impel.php:53 ../../include/bbcode.php:351
+msgid "layout"
+msgstr "шаблон"
 
-#: ../../include/js_strings.php:63
-msgid "about an hour"
-msgstr "около ча�а"
+#: ../../Zotlabs/Module/Impel.php:60 ../../include/bbcode.php:357
+msgid "menu"
+msgstr "меню"
 
-#: ../../include/js_strings.php:65
-msgid "a day"
-msgstr "день"
+#: ../../Zotlabs/Module/Impel.php:185
+#, php-format
+msgid "%s element installed"
+msgstr "%s �лемент у�тановлен"
 
-#: ../../include/js_strings.php:67
-msgid "about a month"
-msgstr "около ме��ца"
+#: ../../Zotlabs/Module/Impel.php:188
+#, php-format
+msgid "%s element installation failed"
+msgstr "%sу�тановка �лемента неудачна."
 
-#: ../../include/js_strings.php:69
-msgid "about a year"
-msgstr "около года"
+#: ../../Zotlabs/Module/Regdir.php:52 ../../Zotlabs/Module/Dirsearch.php:24
+msgid "This site is not a directory server"
+msgstr "Этот �айт не �вл�ет�� �ервером каталога"
 
-#: ../../include/js_strings.php:71
-msgid " "
-msgstr " "
+#: ../../Zotlabs/Module/Changeaddr.php:35
+msgid ""
+"Channel name changes are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Изменение названи� канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
 
-#: ../../include/js_strings.php:72
-msgid "timeago.numbers"
-msgstr ""
+#: ../../Zotlabs/Module/Changeaddr.php:77
+msgid "Change channel nickname/address"
+msgstr "Изменить п�евдоним / адре� канала"
 
-#: ../../include/js_strings.php:78
-msgctxt "long"
-msgid "May"
-msgstr "Май"
+#: ../../Zotlabs/Module/Changeaddr.php:78
+msgid "Any/all connections on other networks will be lost!"
+msgstr "Любые / в�е контакты в других �ет�х будут утер�ны!"
 
-#: ../../include/js_strings.php:86
-msgid "Jan"
-msgstr "Янв"
+#: ../../Zotlabs/Module/Changeaddr.php:80
+msgid "New channel address"
+msgstr "�овый адре� канала"
 
-#: ../../include/js_strings.php:87
-msgid "Feb"
-msgstr "Фев"
+#: ../../Zotlabs/Module/Changeaddr.php:81
+msgid "Rename Channel"
+msgstr "Переименовать канал"
 
-#: ../../include/js_strings.php:88
-msgid "Mar"
-msgstr "Мар"
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Editlayout.php:128
+msgid "Layout Name"
+msgstr "�азвание шаблона"
 
-#: ../../include/js_strings.php:89
-msgid "Apr"
-msgstr "�пр"
+#: ../../Zotlabs/Module/Layouts.php:132 ../../Zotlabs/Module/Editlayout.php:129
+msgid "Layout Description (Optional)"
+msgstr "Опи�ание шаблона (необ�зательно)"
 
-#: ../../include/js_strings.php:90
-msgctxt "short"
-msgid "May"
-msgstr "Май"
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2675
+msgid "Layouts"
+msgstr "Шаблоны"
 
-#: ../../include/js_strings.php:91
-msgid "Jun"
-msgstr "Июн"
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:349
+#: ../../include/help.php:118 ../../include/help.php:126
+#: ../../include/nav.php:180 ../../include/nav.php:320
+msgid "Help"
+msgstr "Помощь"
 
-#: ../../include/js_strings.php:92
-msgid "Jul"
-msgstr "Июл"
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
+msgstr "Помощь по �зыку опи�ани� �траниц Comanche "
 
-#: ../../include/js_strings.php:93
-msgid "Aug"
-msgstr "�вг"
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
+msgstr "Опи�ание шаблона"
 
-#: ../../include/js_strings.php:94
-msgid "Sep"
-msgstr "Сен"
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Webpages.php:265
+msgid "Created"
+msgstr "Создано"
 
-#: ../../include/js_strings.php:95
-msgid "Oct"
-msgstr "Окт"
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:158
+#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Webpages.php:266
+msgid "Edited"
+msgstr "Отредактировано"
 
-#: ../../include/js_strings.php:96
-msgid "Nov"
-msgstr "�о�"
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
+msgstr "Загрузить PDL файл"
 
-#: ../../include/js_strings.php:97
-msgid "Dec"
-msgstr "Дек"
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:260 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Wiki.php:408
+msgid "View"
+msgstr "Про�мотр"
 
-#: ../../include/js_strings.php:105
-msgid "Sun"
-msgstr "В�к"
+#: ../../Zotlabs/Module/Bookmarks.php:62
+msgid "Bookmark added"
+msgstr "Закладка добавлена"
 
-#: ../../include/js_strings.php:106
-msgid "Mon"
-msgstr "Пон"
+#: ../../Zotlabs/Module/Bookmarks.php:78
+msgid "Bookmarks App"
+msgstr "Приложение \"Закладки\""
 
-#: ../../include/js_strings.php:107
-msgid "Tue"
-msgstr "Ð’Ñ‚"
+#: ../../Zotlabs/Module/Bookmarks.php:79
+msgid "Bookmark links from posts and manage them"
+msgstr "Поме�тить ��ылки из публикации в закладки и управл�ть ими"
 
-#: ../../include/js_strings.php:108
-msgid "Wed"
-msgstr "Ср"
+#: ../../Zotlabs/Module/Bookmarks.php:92
+msgid "My Bookmarks"
+msgstr "Мои закладки"
 
-#: ../../include/js_strings.php:109
-msgid "Thu"
-msgstr "Чет"
+#: ../../Zotlabs/Module/Bookmarks.php:103
+msgid "My Connections Bookmarks"
+msgstr "Закладки моих контактов"
 
-#: ../../include/js_strings.php:110
-msgid "Fri"
-msgstr "П�т"
+#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
+msgid "Could not access contact record."
+msgstr "�е удало�ь получить до�туп к запи�и контакта."
 
-#: ../../include/js_strings.php:111
-msgid "Sat"
-msgstr "Суб"
+#: ../../Zotlabs/Module/Defperms.php:112
+#: ../../Zotlabs/Module/Settings/Channel.php:267
+#: ../../extend/addon/hzaddons/twitter/twitter.php:487
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:82
+#: ../../extend/addon/hzaddons/piwik/piwik.php:116
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:102
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:171
+#: ../../extend/addon/hzaddons/logrot/logrot.php:54
+#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:54
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:54
+msgid "Settings updated."
+msgstr "�а�тройки обновлены."
 
-#: ../../include/js_strings.php:112
-msgctxt "calendar"
-msgid "today"
-msgstr "�егодн�"
+#: ../../Zotlabs/Module/Defperms.php:190
+msgid "Default Permissions App"
+msgstr "Приложение \"Разрешени� по умолчанию\""
 
-#: ../../include/js_strings.php:113
-msgctxt "calendar"
-msgid "month"
-msgstr "ме��ц"
+#: ../../Zotlabs/Module/Defperms.php:191
+msgid "Set custom default permissions for new connections"
+msgstr "�а�тройка пользователь�ких разрешений по умолчанию дл� новых подключений "
 
-#: ../../include/js_strings.php:114
-msgctxt "calendar"
-msgid "week"
-msgstr "недел�"
+#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:852
+msgid "Connection Default Permissions"
+msgstr "Разрешени� по умолчанию дл� контакта"
 
-#: ../../include/js_strings.php:115
-msgctxt "calendar"
-msgid "day"
-msgstr "день"
+#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:853
+msgid "Apply these permissions automatically"
+msgstr "Применить �ти разрешени� автоматиче�ки"
 
-#: ../../include/js_strings.php:116
-msgctxt "calendar"
-msgid "All day"
-msgstr "Ве�ь день"
+#: ../../Zotlabs/Module/Defperms.php:256
+#: ../../Zotlabs/Module/Settings/Channel.php:472
+msgid ""
+"If enabled, connection requests will be approved without your interaction"
+msgstr "Е�ли включено, запро�ы контактов будут одобрены без вашего уча�ти�"
 
-#: ../../include/js_strings.php:119
-msgid "Please stand by while your download is being prepared."
-msgstr "Пожалуй�та, подождите, пока готовит�� загрузка."
+#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:854
+msgid "Permission role"
+msgstr "Роль разрешени�"
 
-#: ../../include/js_strings.php:122
-msgid "Email address not valid"
-msgstr "�дре� �лектронной почты недей�твителен"
+#: ../../Zotlabs/Module/Defperms.php:257
+#: ../../Zotlabs/Module/New_channel.php:157
+#: ../../Zotlabs/Module/New_channel.php:164
+#: ../../Zotlabs/Module/Connedit.php:854
+#: ../../Zotlabs/Widget/Notifications.php:166
+#: ../../Zotlabs/Widget/Messages.php:29 ../../include/nav.php:324
+msgid "Loading"
+msgstr "Загрузка"
 
-#: ../../include/help.php:80
-msgid "Help:"
-msgstr "Помощь:"
+#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:855
+msgid "Add permission role"
+msgstr "Добавить роль разрешени�"
 
-#: ../../include/help.php:117 ../../include/help.php:125
-#: ../../include/nav.php:180 ../../include/nav.php:320
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348
-msgid "Help"
-msgstr "Помощь"
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:868
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Разрешени�, указанные на �той �транице, будут примен�ть�� ко в�ем новым �оединени�м."
 
-#: ../../include/help.php:129
-msgid "Not Found"
-msgstr "�е найдено"
+#: ../../Zotlabs/Module/Defperms.php:263
+msgid "Automatic approval settings"
+msgstr "�а�тройки автоматиче�кого одобрени�"
 
-#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:136
-#: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173
-#: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Page.php:136
-#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:533
-#: ../../Zotlabs/Web/Router.php:186
-msgid "Page not found."
-msgstr "Страница не найдена."
+#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Permcats.php:124
+#: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Tokens.php:183
+msgid "inherited"
+msgstr "на�ледует��"
 
-#: ../../include/photos.php:151
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Файл превышает предельный размер дл� �айта в %lu байт"
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Permcats.php:122
+#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Tokens.php:181
+msgid "My Settings"
+msgstr "Мои на�тройки"
 
-#: ../../include/photos.php:162
-msgid "Image file is empty."
-msgstr "Файл изображени� пу�т."
+#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Permcats.php:127
+#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Tokens.php:186
+msgid "Individual Permissions"
+msgstr "Индивидуальные разрешени�"
 
-#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:261
-#: ../../Zotlabs/Module/Cover_photo.php:241
-msgid "Unable to process image"
-msgstr "�е удает�� обработать изображение"
+#: ../../Zotlabs/Module/Defperms.php:271
+msgid ""
+"Some individual permissions may have been preset or locked based on your "
+"channel type and privacy settings."
+msgstr "�екоторые индивидуальные разрешени� могут быть преду�тановлены или заблокированы на о�новании типа вашего канала и на�троек приватно�ти."
 
-#: ../../include/photos.php:324
-msgid "Photo storage failed."
-msgstr "Ошибка хранилища фотографий."
+#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+msgid "Authorize application connection"
+msgstr "�вторизовать подключение приложени�"
 
-#: ../../include/photos.php:373
-msgid "a new photo"
-msgstr "нова� фотографи�"
+#: ../../Zotlabs/Module/Api.php:75
+msgid "Return to your app and insert this Security Code:"
+msgstr "Верните�ь к �воему приложению и в�тавьте �тот код безопа�но�ти:"
 
-#: ../../include/photos.php:377
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s опубликовал %2$s в %3$s"
+#: ../../Zotlabs/Module/Api.php:85
+msgid "Please login to continue."
+msgstr "Пожалуй�та, войдите, чтобы продолжить."
 
-#: ../../include/photos.php:666 ../../include/nav.php:447
-msgid "Photo Albums"
-msgstr "Фотоальбомы"
+#: ../../Zotlabs/Module/Api.php:97
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr "Вы хотите авторизовать �то приложение дл� до�тупа к вашим публикаци�м и контактам и / или �озданию новых публикаций?"
 
-#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1348
-#: ../../Zotlabs/Module/Photos.php:1361 ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "По�ледние фотографии"
+#: ../../Zotlabs/Module/Xchan.php:10
+msgid "Xchan Lookup"
+msgstr "Пои�к Xchan"
 
-#: ../../include/photos.php:671
-msgid "Upload New Photos"
-msgstr "Загрузить новые фотографии"
+#: ../../Zotlabs/Module/Xchan.php:13
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Запро� Xchan начинает�� � (или webbie):"
 
-#: ../../include/network.php:1762 ../../include/network.php:1763
-msgid "Friendica"
-msgstr ""
+#: ../../Zotlabs/Module/Xchan.php:41 ../../Zotlabs/Module/Menu.php:232
+#: ../../Zotlabs/Module/Mitem.php:134
+msgid "Not found."
+msgstr "�е найдено."
 
-#: ../../include/network.php:1764
-msgid "OStatus"
-msgstr ""
+#: ../../Zotlabs/Module/Article_edit.php:127
+msgid "Edit Article"
+msgstr "Редактировать �татью"
 
-#: ../../include/network.php:1765
-msgid "GNU-Social"
-msgstr ""
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
+msgstr "Дл� до�тупа к �тому �ерверу каталогов требует�� токен"
 
-#: ../../include/network.php:1766
-msgid "RSS/Atom"
-msgstr ""
+#: ../../Zotlabs/Module/Suggest.php:40
+msgid "Suggest Channels App"
+msgstr "Приложение \"Рекомендуемые каналы\""
 
-#: ../../include/network.php:1769
-msgid "Diaspora"
-msgstr ""
+#: ../../Zotlabs/Module/Suggest.php:41
+msgid ""
+"Suggestions for channels in the $Projectname network you might be interested "
+"in"
+msgstr "Предложени� по рекомендуемым каналам в �ети $Projectname которые могут ва� заинтере�овать"
 
-#: ../../include/network.php:1770
-msgid "Facebook"
-msgstr ""
+#: ../../Zotlabs/Module/Suggest.php:54
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "�ет предложений. Е�ли �то новый �айт, повторите попытку через 24 ча�а."
 
-#: ../../include/network.php:1771
-msgid "Zot"
-msgstr ""
+#: ../../Zotlabs/Module/Suggest.php:73 ../../Zotlabs/Widget/Suggestions.php:48
+msgid "Ignore/Hide"
+msgstr "Игнорировать / cкрыть"
 
-#: ../../include/network.php:1772
-msgid "LinkedIn"
-msgstr ""
+#: ../../Zotlabs/Module/Suggest.php:79 ../../Zotlabs/Module/Directory.php:436
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr "Рекомендации каналов"
 
-#: ../../include/network.php:1773
-msgid "XMPP/IM"
-msgstr ""
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr "Пои�к документации"
 
-#: ../../include/network.php:1774
-msgid "MySpace"
-msgstr ""
+#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:434
+msgid "About"
+msgstr "О �ебе"
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr " и "
+#: ../../Zotlabs/Module/Help.php:84 ../../Zotlabs/Module/Group.php:156
+msgid "Members"
+msgstr "Уча�тники"
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "общедо�тупный профиль"
+#: ../../Zotlabs/Module/Help.php:85
+msgid "Administrators"
+msgstr "�дмини�траторы"
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s изменил %2$s на &ldquo;%3$s&rdquo;"
+#: ../../Zotlabs/Module/Help.php:86
+msgid "Developers"
+msgstr "Разработчики"
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "По�етить %1$s %2$s"
+#: ../../Zotlabs/Module/Help.php:87
+msgid "Tutorials"
+msgstr "Руковод�тва"
 
-#: ../../include/activities.php:63
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s обновлено %2$s, изменено %3$s."
+#: ../../Zotlabs/Module/Help.php:98
+msgid "$Projectname Documentation"
+msgstr "$Projectname Документаци�"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "до�тупно %d приглашение"
-msgstr[1] "до�тупны %d приглашени�"
-msgstr[2] "до�тупны %d приглашений"
+#: ../../Zotlabs/Module/Help.php:99
+msgid "Contents"
+msgstr "Содержимое"
 
-#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:416
-msgid "Advanced"
-msgstr "Дополнительно"
+#: ../../Zotlabs/Module/Filestorage.php:14
+#: ../../Zotlabs/Module/Filestorage.php:53
+msgid "Deprecated!"
+msgstr "�е рекомендовано!"
 
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Пои�к каналов"
+#: ../../Zotlabs/Module/Filestorage.php:109
+#: ../../Zotlabs/Module/Attach_edit.php:69
+msgid "File not found."
+msgstr "Файл не найден."
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Впишите им� или интере�"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Permission Denied."
+msgstr "До�туп запрещен."
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Подключить / от�леживать"
+#: ../../Zotlabs/Module/Filestorage.php:190
+msgid "Edit file permissions"
+msgstr "Редактировать разрешени� файла"
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Примеры: Владимир Ильич, Революционер"
+#: ../../Zotlabs/Module/Filestorage.php:202
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:261
+msgid "Set/edit permissions"
+msgstr "Редактировать разрешени�"
 
-#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:433
-#: ../../Zotlabs/Module/Directory.php:438
-#: ../../Zotlabs/Module/Connections.php:382
-msgid "Find"
-msgstr "Пои�к"
+#: ../../Zotlabs/Module/Filestorage.php:203
+msgid "Include all files and sub folders"
+msgstr "Включить в�е файлы и подкаталоги"
 
-#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:437
-#: ../../Zotlabs/Module/Suggest.php:79
-msgid "Channel Suggestions"
-msgstr "Рекомендации каналов"
+#: ../../Zotlabs/Module/Filestorage.php:204
+msgid "Return to file list"
+msgstr "Вернут�� к �пи�ку файлов"
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Случайный профиль"
+#: ../../Zotlabs/Module/Filestorage.php:206
+#: ../../Zotlabs/Storage/Browser.php:386
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Копировать / в�тавить �тот код дл� прикреплени� файла к публикации"
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Пригла�ить друзей"
+#: ../../Zotlabs/Module/Filestorage.php:207
+#: ../../Zotlabs/Storage/Browser.php:387
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Копировать / в�тавить �ту URL дл� ��ылки на файл �о �траницы"
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Ра�ширенный пример: name=ivan and country=russia"
+#: ../../Zotlabs/Module/Filestorage.php:209
+msgid "Share this file"
+msgstr "Поделить�� �тим файлом"
 
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:115
-#: ../../include/contact_widgets.php:159 ../../include/contact_widgets.php:204
-#: ../../include/contact_widgets.php:239
-#: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31
-msgid "Everything"
-msgstr "В�ё"
+#: ../../Zotlabs/Module/Filestorage.php:210
+msgid "Show URL to this file"
+msgstr "Показать URL �того файла"
 
-#: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156
-#: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236
-#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
-#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
-#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Module/Cdav.php:1071
-#: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:388
-#: ../../Zotlabs/Storage/Browser.php:403
-msgid "Categories"
-msgstr "Категории"
+#: ../../Zotlabs/Module/Filestorage.php:211
+#: ../../Zotlabs/Storage/Browser.php:552
+msgid "Show in your contacts shared folder"
+msgstr "Показать общий каталог в ваших контактах"
 
-#: ../../include/contact_widgets.php:269
-msgid "Common Connections"
-msgstr "Общие контакты"
+#: ../../Zotlabs/Module/Permcats.php:29
+msgid "Permission category name is required."
+msgstr "Требует�� категори� разрешений."
 
-#: ../../include/contact_widgets.php:273
-#, php-format
-msgid "View all %d common connections"
-msgstr "Про�мотреть в�е %d общих контактов"
+#: ../../Zotlabs/Module/Permcats.php:48
+msgid "Permission category saved."
+msgstr "Категори� разрешени� �охранена."
 
-#: ../../include/language.php:441
-msgid "Select an alternate language"
-msgstr "Выбор дополнительного �зыка"
+#: ../../Zotlabs/Module/Permcats.php:63
+msgid "Permission Categories App"
+msgstr "Приложение \"Категории разрешений\""
 
-#: ../../include/import.php:29
-msgid "Unable to import a removed channel."
-msgstr "�евозможно импортировать удалённый канал."
+#: ../../Zotlabs/Module/Permcats.php:64
+msgid "Create custom connection permission limits"
+msgstr "Создать пользователь�кие ограничени� на до�туп к подключению"
 
-#: ../../include/import.php:55
+#: ../../Zotlabs/Module/Permcats.php:80
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "�е удало�ь �оздать дублирующий�� идентификатор канала. Импорт невозможен."
-
-#: ../../include/import.php:121
-msgid "Cloned channel not found. Import failed."
-msgstr "Клон канала не найден. Импорт невозможен."
-
-#: ../../include/nav.php:95
-msgid "Remote authentication"
-msgstr "Удаленна� аутентификаци�"
-
-#: ../../include/nav.php:95
-msgid "Click to authenticate to your home hub"
-msgstr "�ажмите, чтобы аутентифицировать �еб� на домашнем узле"
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr "И�пользуйте �ту форму дл� �оздани� правил разрешений дл� различных групп людей и контактов."
 
-#: ../../include/nav.php:101 ../../Zotlabs/Module/Manage.php:170
-#: ../../Zotlabs/Lib/Apps.php:337
-msgid "Channel Manager"
-msgstr "Менеджер каналов"
+#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:375
+msgid "Permission Categories"
+msgstr "Категории разрешений"
 
-#: ../../include/nav.php:101
-msgid "Manage your channels"
-msgstr "Управление вашими каналами"
+#: ../../Zotlabs/Module/Permcats.php:121
+msgid "Permission category name"
+msgstr "�аименование категории разрешений"
 
-#: ../../include/nav.php:104 ../../include/group.php:327
-#: ../../include/acl_selectors.php:87
-#: ../../Zotlabs/Widget/Activity_filter.php:88
-#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154
-#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364
-msgid "Privacy Groups"
-msgstr "Группы конфиденциально�ти"
+#: ../../Zotlabs/Module/Permcats.php:128 ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Tokens.php:187
+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 "�екоторые разрешени� могут на�ледовать из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> ваших каналов которые могут иметь более вы�окий приоритет чем индивидуальные. Вы <strong>не можете</strong> мен�ть �ти на�тройки зде�ь."
 
-#: ../../include/nav.php:104
-msgid "Manage your privacy groups"
-msgstr "Управление вашим группами конфиденциально�ти"
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
+msgstr "�азвание блока"
 
-#: ../../include/nav.php:106 ../../Zotlabs/Widget/Settings_menu.php:61
-#: ../../Zotlabs/Widget/Newmember.php:53
-#: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339
-msgid "Settings"
-msgstr "�а�тройки"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr "Редактировать блок"
 
-#: ../../include/nav.php:106
-msgid "Account/Channel Settings"
-msgstr "�а�тройки аккаунта / канала"
+#: ../../Zotlabs/Module/Tagger.php:50
+msgid "Post not found."
+msgstr "Публикаци� не найдена"
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
-#: ../../include/nav.php:163 ../../boot.php:1715
-msgid "Logout"
-msgstr "Выход"
+#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Like.php:441
+#: ../../Zotlabs/Module/Channel_calendar.php:221 ../../include/event.php:1259
+#: ../../include/conversation.php:132 ../../include/text.php:2239
+msgid "event"
+msgstr "�обытие"
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
-msgid "End this session"
-msgstr "Закончить �ту �е��ию"
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3248
+#: ../../include/conversation.php:158 ../../include/bbcode.php:555
+#: ../../include/markdown.php:205 ../../include/text.php:2242
+msgid "post"
+msgstr "публикаци�"
 
-#: ../../include/nav.php:115
-msgid "Your profile page"
-msgstr "Страницa вашего профил�"
+#: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
+#: ../../include/text.php:2244
+msgid "comment"
+msgstr "комментарий"
 
-#: ../../include/nav.php:118 ../../include/channel.php:1563
-#: ../../Zotlabs/Module/Profiles.php:832
-msgid "Edit Profiles"
-msgstr "Редактирование профилей"
+#: ../../Zotlabs/Module/Tagger.php:121
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s отметил тегом %4$s %3$s %2$s"
 
-#: ../../include/nav.php:118
-msgid "Manage/Edit profiles"
-msgstr "Управление / редактирование профилей"
+#: ../../Zotlabs/Module/Pdledit.php:27
+msgid "Layout updated."
+msgstr "Шаблон обновлен."
 
-#: ../../include/nav.php:120 ../../Zotlabs/Widget/Newmember.php:35
-msgid "Edit your profile"
-msgstr "Редактировать профиль"
+#: ../../Zotlabs/Module/Pdledit.php:43
+msgid "PDL Editor App"
+msgstr "Приложение \"Редактор PDL\""
 
-#: ../../include/nav.php:127 ../../include/nav.php:131
-#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1716
-msgid "Login"
-msgstr "Войти"
+#: ../../Zotlabs/Module/Pdledit.php:44
+msgid "Provides the ability to edit system page layouts"
+msgstr "Предо�тавл�ет возможно�ть редактировать макеты �и�темных �траниц"
 
-#: ../../include/nav.php:127 ../../include/nav.php:131
-msgid "Sign in"
-msgstr "Войти"
+#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100
+msgid "Edit System Page Description"
+msgstr "Редактировать опи�ание �и�темной �траницы"
 
-#: ../../include/nav.php:161
-msgid "Take me home"
-msgstr "Домой"
+#: ../../Zotlabs/Module/Pdledit.php:78
+msgid "(modified)"
+msgstr "(изменено)"
 
-#: ../../include/nav.php:163
-msgid "Log me out of this site"
-msgstr "Выйти � �того �айта"
+#: ../../Zotlabs/Module/Pdledit.php:95
+msgid "Layout not found."
+msgstr "Шаблон не найден."
 
-#: ../../include/nav.php:168 ../../Zotlabs/Module/Register.php:566
-#: ../../boot.php:1696
-msgid "Register"
-msgstr "Реги�траци�"
+#: ../../Zotlabs/Module/Pdledit.php:101
+msgid "Module Name:"
+msgstr "Им� модул�:"
 
-#: ../../include/nav.php:168
-msgid "Create an account"
-msgstr "Создать аккаунт"
+#: ../../Zotlabs/Module/Pdledit.php:102
+msgid "Layout Help"
+msgstr "Помощь к шаблону"
 
-#: ../../include/nav.php:180
-msgid "Help and documentation"
-msgstr "Справочна� информаци� и документаци�"
+#: ../../Zotlabs/Module/Pdledit.php:103
+msgid "Edit another layout"
+msgstr "Редактировать другой шаблон"
 
-#: ../../include/nav.php:194
-msgid "Search site @name, !forum, #tag, ?docs, content"
-msgstr "И�кать на �айте @им�, !форум, #тег, ?документ, �одержимое"
+#: ../../Zotlabs/Module/Pdledit.php:104
+msgid "System layout"
+msgstr "Си�темный шаблон"
 
-#: ../../include/nav.php:200 ../../Zotlabs/Widget/Admin.php:55
-msgid "Admin"
-msgstr "�дмини�трирование"
+#: ../../Zotlabs/Module/Chat.php:100
+msgid "Chatrooms App"
+msgstr "Приложение \"Мои чаты\""
 
-#: ../../include/nav.php:200
-msgid "Site Setup and Configuration"
-msgstr "У�тановка и конфигураци� �айта"
+#: ../../Zotlabs/Module/Chat.php:101
+msgid "Access Controlled Chatrooms"
+msgstr "Получить до�туп к контролируемым чатам"
 
-#: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182
-#: ../../Zotlabs/Module/New_channel.php:157
-#: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
-msgid "Loading"
-msgstr "Загрузка"
+#: ../../Zotlabs/Module/Chat.php:194
+msgid "Room not found"
+msgstr "Комната не найдена"
 
-#: ../../include/nav.php:330
-msgid "@name, !forum, #tag, ?doc, content"
-msgstr "@им�, !форум, #тег, ?документ, �одержимое"
+#: ../../Zotlabs/Module/Chat.php:210
+msgid "Leave Room"
+msgstr "Покинуть комнату"
 
-#: ../../include/nav.php:331
-msgid "Please wait..."
-msgstr "Подождите пожалуй�та ..."
+#: ../../Zotlabs/Module/Chat.php:211
+msgid "Delete Room"
+msgstr "Удалить комнату"
 
-#: ../../include/nav.php:337
-msgid "Add Apps"
-msgstr "Добавить приложени�"
+#: ../../Zotlabs/Module/Chat.php:212
+msgid "I am away right now"
+msgstr "Я �ейча� отошёл"
 
-#: ../../include/nav.php:338
-msgid "Arrange Apps"
-msgstr "Упор�дочить приложени�"
+#: ../../Zotlabs/Module/Chat.php:213
+msgid "I am online"
+msgstr "Я на �в�зи"
 
-#: ../../include/nav.php:339
-msgid "Toggle System Apps"
-msgstr "Показать �и�темные приложени�"
+#: ../../Zotlabs/Module/Chat.php:215
+msgid "Bookmark this room"
+msgstr "Запомнить �ту комнату"
 
-#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154
-msgid "Channel"
-msgstr "Канал"
+#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1377
+#: ../../extend/addon/hzaddons/hsse/hsse.php:134
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:135
+msgid "Please enter a link URL:"
+msgstr "Пожалуй�та введите URL ��ылки:"
 
-#: ../../include/nav.php:424
-msgid "Status Messages and Posts"
-msgstr "Стату�ы и публикации"
+#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841
+#: ../../include/conversation.php:1507
+#: ../../extend/addon/hzaddons/hsse/hsse.php:255
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:211
+msgid "Encrypt text"
+msgstr "Зашифровать тек�т"
 
-#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83
-msgid "About"
-msgstr "О �ебе"
+#: ../../Zotlabs/Module/Chat.php:238
+msgid "New Chatroom"
+msgstr "�овый чат"
 
-#: ../../include/nav.php:437
-msgid "Profile Details"
-msgstr "Информаци� о профиле"
+#: ../../Zotlabs/Module/Chat.php:239
+msgid "Chatroom name"
+msgstr "�азвание чата"
 
-#: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:351
-msgid "Files"
-msgstr "Файлы"
+#: ../../Zotlabs/Module/Chat.php:240
+msgid "Expiration of chats (minutes)"
+msgstr "Завершение чатов (минут)"
 
-#: ../../include/nav.php:455
-msgid "Files and Storage"
-msgstr "Файлы и хранилище"
+#: ../../Zotlabs/Module/Chat.php:256
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Чаты пользовател� %1$s"
 
-#: ../../include/nav.php:477 ../../include/nav.php:480
-#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:330
-msgid "Chatrooms"
-msgstr "Чаты"
+#: ../../Zotlabs/Module/Chat.php:261
+msgid "No chatrooms available"
+msgstr "�ет до�тупных чатов"
 
-#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:329
-msgid "Bookmarks"
-msgstr "Закладки"
+#: ../../Zotlabs/Module/Chat.php:265
+msgid "Expiration"
+msgstr "Срок дей�тви�"
 
-#: ../../include/nav.php:493
-msgid "Saved Bookmarks"
-msgstr "Сохранённые закладки"
+#: ../../Zotlabs/Module/Chat.php:266
+msgid "min"
+msgstr "мин."
 
-#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207
-#: ../../Zotlabs/Lib/Apps.php:326
-msgid "Cards"
-msgstr "Карточки"
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2673
+msgid "Blocks"
+msgstr "Блокировки"
 
-#: ../../include/nav.php:504
-msgid "View Cards"
-msgstr "Про�мотреть карточки"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Заблокировать заголовок"
 
-#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:225
-#: ../../Zotlabs/Lib/Apps.php:325
-msgid "Articles"
-msgstr "Статьи"
+#: ../../Zotlabs/Module/Settings/Directory.php:40
+msgid "Directory Settings"
+msgstr "�а�тройки каталога"
 
-#: ../../include/nav.php:515
-msgid "View Articles"
-msgstr "Про�мотр �татей"
+#: ../../Zotlabs/Module/Settings/Account.php:21
+msgid "Not valid email."
+msgstr "�е дей�твительный адре� email."
 
-#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:252
-#: ../../Zotlabs/Lib/Apps.php:341
-msgid "Webpages"
-msgstr "Веб-�траницы"
+#: ../../Zotlabs/Module/Settings/Account.php:24
+msgid "Protected email address. Cannot change to that email."
+msgstr "Защищенный адре� �лектронной почты. �ельз� изменить."
 
-#: ../../include/nav.php:527
-msgid "View Webpages"
-msgstr "Про�мотр веб-�траниц"
+#: ../../Zotlabs/Module/Settings/Account.php:33
+msgid "System failure storing new email. Please try again."
+msgstr "Си�темна� ошибка �охранени� email. Пожалуй�та попробуйте ещё раз."
 
-#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../Zotlabs/Module/Wiki.php:205
-msgid "Wikis"
-msgstr ""
+#: ../../Zotlabs/Module/Settings/Account.php:51
+msgid "Password verification failed."
+msgstr "�е удало�ь выполнить проверку парол�."
 
-#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:342
-msgid "Wiki"
-msgstr ""
+#: ../../Zotlabs/Module/Settings/Account.php:58
+msgid "Passwords do not match. Password unchanged."
+msgstr "Пароли не �овпадают. Пароль не изменён."
 
-#: ../../include/auth.php:194
-msgid "Delegation session ended."
-msgstr "Делегированна� �е��и� завершена."
+#: ../../Zotlabs/Module/Settings/Account.php:62
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Пу�тые пароли не допу�кают��. Пароль не изменён."
 
-#: ../../include/auth.php:198
-msgid "Logged out."
-msgstr "Вышел из �и�темы."
+#: ../../Zotlabs/Module/Settings/Account.php:76
+msgid "Password changed."
+msgstr "Пароль изменен."
 
-#: ../../include/auth.php:294
-msgid "Email validation is incomplete. Please check your email."
-msgstr "Проверка email не завершена. Пожалуй�та, проверьте вашу почту."
+#: ../../Zotlabs/Module/Settings/Account.php:78
+msgid "Password update failed. Please try again."
+msgstr "Изменение парол� не удало�ь. Пожалуй�та, попробуйте ещё раз."
 
-#: ../../include/auth.php:310
-msgid "Failed authentication"
-msgstr "Ошибка аутентификации"
+#: ../../Zotlabs/Module/Settings/Account.php:103
+msgid "Account Settings"
+msgstr "�а�тройки аккаунта"
 
-#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Miscellaneous"
-msgstr "Прочее"
+#: ../../Zotlabs/Module/Settings/Account.php:104
+msgid "Current Password"
+msgstr "Текущий пароль"
 
-#: ../../include/datetime.php:140
-msgid "Birthday"
-msgstr "День рождени�"
+#: ../../Zotlabs/Module/Settings/Account.php:105
+msgid "Enter New Password"
+msgstr "Введите новый пароль:"
 
-#: ../../include/datetime.php:140
-msgid "Age: "
-msgstr "Возра�т:"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Confirm New Password"
+msgstr "Подтвердите новый пароль:"
 
-#: ../../include/datetime.php:140
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD или MM-DD"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Leave password fields blank unless changing"
+msgstr "О�тавьте пол� пу�тыми до измнени�"
 
-#: ../../include/datetime.php:238 ../../boot.php:2730
-msgid "never"
-msgstr "никогда"
+#: ../../Zotlabs/Module/Settings/Account.php:108
+msgid "DId2 or Email Address:"
+msgstr "dId2 или адре� �лектронной почты:"
 
-#: ../../include/datetime.php:244
-msgid "less than a second ago"
-msgstr "менее чем одну �екунду"
+#: ../../Zotlabs/Module/Settings/Account.php:110
+msgid "Remove this account including all its channels"
+msgstr "Удалить �тот аккаунт включа� в�е каналы"
 
-#: ../../include/datetime.php:262
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "%1$d %2$s назад"
+#: ../../Zotlabs/Module/Settings/Calendar.php:40
+msgid "Calendar Settings"
+msgstr "�а�тройки календар�"
 
-#: ../../include/datetime.php:273
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "год"
-msgstr[1] "года"
-msgstr[2] "лет"
+#: ../../Zotlabs/Module/Settings/Manage.php:41
+msgid "Channel Manager Settings"
+msgstr "�а�тройки менеджера канала"
 
-#: ../../include/datetime.php:276
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "ме��ц"
-msgstr[1] "ме��ца"
-msgstr[2] "ме��цев"
+#: ../../Zotlabs/Module/Settings/Network.php:42
+#: ../../Zotlabs/Module/Settings/Channel_home.php:46
+msgid "Max height of content (in pixels)"
+msgstr "Мак�имальна� вы�ота �одержимого (в пик�ел�х)"
 
-#: ../../include/datetime.php:279
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "неделю"
-msgstr[1] "недели"
-msgstr[2] "недель"
+#: ../../Zotlabs/Module/Settings/Network.php:44
+#: ../../Zotlabs/Module/Settings/Channel_home.php:48
+msgid "Click to expand content exceeding this height"
+msgstr "�ажмите чтобы развернуть �одержимое превышающее �ту вы�оту"
 
-#: ../../include/datetime.php:282
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "день"
-msgstr[1] "дн�"
-msgstr[2] "дней"
+#: ../../Zotlabs/Module/Settings/Network.php:59
+msgid "Stream Settings"
+msgstr "�а�тройки потока"
 
-#: ../../include/datetime.php:285
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "ча�"
-msgstr[1] "ча�а"
-msgstr[2] "ча�ов"
+#: ../../Zotlabs/Module/Settings/Conversation.php:23
+msgid "Settings saved."
+msgstr "�а�тройки �охранены."
 
-#: ../../include/datetime.php:288
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "минуту"
-msgstr[1] "минуты"
-msgstr[2] "минут"
+#: ../../Zotlabs/Module/Settings/Conversation.php:25
+msgid "Settings saved. Reload page please."
+msgstr "�а�тройки �охранены. Пожалуй�та, перезагрузите �траницу."
 
-#: ../../include/datetime.php:291
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "�екунду"
-msgstr[1] "�екунды"
-msgstr[2] "�екунд"
+#: ../../Zotlabs/Module/Settings/Conversation.php:47
+msgid "Conversation Settings"
+msgstr "�а�тройки бе�ед"
 
-#: ../../include/datetime.php:520
-#, php-format
-msgid "%1$s's birthday"
-msgstr "День рождени� %1$s"
+#: ../../Zotlabs/Module/Settings/Features.php:45
+msgid "Additional Features"
+msgstr "Дополнительные функции"
 
-#: ../../include/datetime.php:521
+#: ../../Zotlabs/Module/Settings/Display.php:127
 #, php-format
-msgid "Happy Birthday %1$s"
-msgstr "С Днем рождени� %1$s !"
-
-#: ../../include/cdav.php:157
-msgid "INVALID EVENT DISMISSED!"
-msgstr "�ЕДЕЙСТВИТЕЛЬ�ОЕ СОБЫТИЕ ОТКЛО�Е�О!"
-
-#: ../../include/cdav.php:158
-msgid "Summary: "
-msgstr "Резюме: "
+msgid "%s - (Experimental)"
+msgstr "%s - (�к�периментальный)"
 
-#: ../../include/cdav.php:159
-msgid "Date: "
-msgstr "Дата: "
+#: ../../Zotlabs/Module/Settings/Display.php:183
+msgid "Display Settings"
+msgstr "�а�тройки отображени�"
 
-#: ../../include/cdav.php:160 ../../include/cdav.php:168
-msgid "Reason: "
-msgstr "Причина: "
+#: ../../Zotlabs/Module/Settings/Display.php:184
+msgid "Theme Settings"
+msgstr "�а�тройки темы"
 
-#: ../../include/cdav.php:166
-msgid "INVALID CARD DISMISSED!"
-msgstr "�ЕДЕЙСТВИТЕЛЬ��Я К�РТОЧК� ОТКЛО�Е��!"
+#: ../../Zotlabs/Module/Settings/Display.php:185
+msgid "Custom Theme Settings"
+msgstr "Дополнительные на�тройки темы"
 
-#: ../../include/cdav.php:167
-msgid "Name: "
-msgstr "Им�: "
+#: ../../Zotlabs/Module/Settings/Display.php:186
+msgid "Content Settings"
+msgstr "�а�тройки �одержимого"
 
-#: ../../include/follow.php:39 ../../Zotlabs/Lib/Connect.php:46
-#: ../../Zotlabs/Lib/Connect.php:143
-msgid "Channel is blocked on this site."
-msgstr "Канал блокирует�� на �том �айте."
+#: ../../Zotlabs/Module/Settings/Display.php:192
+msgid "Display Theme:"
+msgstr "Тема отображени�:"
 
-#: ../../include/follow.php:44 ../../Zotlabs/Lib/Connect.php:51
-msgid "Channel location missing."
-msgstr "Ме�тоположение канала от�ут�твует."
+#: ../../Zotlabs/Module/Settings/Display.php:193
+msgid "Select scheme"
+msgstr "Выбрать �хему"
 
-#: ../../include/follow.php:86
-msgid "Response from remote channel was incomplete."
-msgstr "Ответ удаленного канала неполный."
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid "Preload images before rendering the page"
+msgstr "Предзагрузка изображений перед обработкой �траницы"
 
-#: ../../include/follow.php:98
-msgid "Premium channel - please visit:"
-msgstr "Премимум-канал - пожалуй�та по�етите:"
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
+msgstr "Субъективное врем� загрузки �траницы будет длиннее, но �траница будет готова при отображении"
 
-#: ../../include/follow.php:112
-msgid "Channel was deleted and no longer exists."
-msgstr "Канал удален и больше не �уще�твует."
+#: ../../Zotlabs/Module/Settings/Display.php:196
+msgid "Enable user zoom on mobile devices"
+msgstr "Включить ма�штабирование на мобильных у�трой�твах"
 
-#: ../../include/follow.php:168 ../../Zotlabs/Lib/Connect.php:103
-msgid "Remote channel or protocol unavailable."
-msgstr "Удалённый канал или протокол недо�тупен."
+#: ../../Zotlabs/Module/Settings/Display.php:197
+msgid "Update browser every xx seconds"
+msgstr "Обновление браузера каждые N �екунд"
 
-#: ../../include/follow.php:192 ../../Zotlabs/Lib/Connect.php:137
-msgid "Channel discovery failed."
-msgstr "�е удало�ь обнаружить канал."
+#: ../../Zotlabs/Module/Settings/Display.php:197
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Минимум 10 �екунд, без мак�имума"
 
-#: ../../include/follow.php:204 ../../Zotlabs/Lib/Connect.php:155
-msgid "Protocol disabled."
-msgstr "Протокол отключен."
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Мак�имальное количе�тво бе�ед дл� загрузки одновременно:"
 
-#: ../../include/follow.php:215 ../../Zotlabs/Lib/Connect.php:167
-msgid "Cannot connect to yourself."
-msgstr "�ельз� подключить�� к �амому �ебе."
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Maximum of 30 items"
+msgstr "�е более 30 �лементов"
 
-#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:178
-msgid "channel"
-msgstr "канал"
+#: ../../Zotlabs/Module/Settings/Display.php:199
+msgid "Show emoticons (smilies) as images"
+msgstr "Показывать �мотиконы (�майлики) как изображени�"
 
-#: ../../include/conversation.php:183
-#, php-format
-msgid "likes %1$s's %2$s"
-msgstr "�равит�� %1$s %2$s"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Provide channel menu in navigation bar"
+msgstr "Показывать меню канала в панели навигации"
 
-#: ../../include/conversation.php:186
-#, php-format
-msgid "doesn't like %1$s's %2$s"
-msgstr "�е нравит�� %1$s %2$s"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Default: channel menu located in app menu"
+msgstr "По умолчанию каналы ра�положены в меню приложени�"
 
-#: ../../include/conversation.php:226 ../../include/conversation.php:228
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s теперь в контакте � %2$s"
+#: ../../Zotlabs/Module/Settings/Display.php:201
+msgid "Link post titles to source"
+msgstr "С�ылки на и�точник заголовков публикаций"
 
-#: ../../include/conversation.php:263
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ткнул %2$s"
+#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Widget/Newmember.php:75
+msgid "New Member Links"
+msgstr "С�ылки дл� новичков"
 
-#: ../../include/conversation.php:286 ../../Zotlabs/Module/Mood.php:76
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s %2$s"
+#: ../../Zotlabs/Module/Settings/Display.php:203
+msgid "Display new member quick links menu"
+msgstr "Показать меню бы�трых ��ылок дл� новых уча�тников"
 
-#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:502
-msgid "This is an unsaved preview"
-msgstr "Это не�охранённый про�мотр"
+#: ../../Zotlabs/Module/Settings/Editor.php:40
+msgid "Editor Settings"
+msgstr "�а�тройки редактора"
 
-#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1113
-msgctxt "title"
-msgid "Likes"
-msgstr "�равит��"
+#: ../../Zotlabs/Module/Settings/Photos.php:40
+msgid "Photos Settings"
+msgstr "�а�тройки фотографий"
 
-#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113
-msgctxt "title"
-msgid "Dislikes"
-msgstr "�е нравит��"
+#: ../../Zotlabs/Module/Settings/Events.php:40
+msgid "Events Settings"
+msgstr "�а�тройки �обытий"
 
-#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:77
-#: ../../Zotlabs/Module/Photos.php:1114
-msgctxt "title"
-msgid "Agree"
-msgstr "Согла�ен"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:61
+msgid "Personal menu to display in your channel pages"
+msgstr "Пер�ональное меню дл� отображени� на �транице вашего канала"
 
-#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:78
-#: ../../Zotlabs/Module/Photos.php:1114
-msgctxt "title"
-msgid "Disagree"
-msgstr "�е �огла�ен"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:88
+msgid "Channel Home Settings"
+msgstr "�а�тройки главной �траницы канала"
 
-#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:79
-#: ../../Zotlabs/Module/Photos.php:1114
-msgctxt "title"
-msgid "Abstain"
-msgstr "Воздержал��"
+#: ../../Zotlabs/Module/Settings/Profiles.php:49
+msgid "Profiles Settings"
+msgstr "�а�тройки профилей"
 
-#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:66
-#: ../../Zotlabs/Module/Photos.php:1115
-msgctxt "title"
-msgid "Attending"
-msgstr "По�ещаю"
+#: ../../Zotlabs/Module/Settings/Channel.php:71
+#: ../../Zotlabs/Module/Settings/Channel.php:75
+#: ../../Zotlabs/Module/Settings/Channel.php:76
+#: ../../Zotlabs/Module/Settings/Channel.php:79
+#: ../../Zotlabs/Module/Settings/Channel.php:90
+#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:32
+#: ../../include/channel.php:457 ../../include/channel.php:460
+#: ../../include/selectors.php:134
+msgid "Friends"
+msgstr "Друзь�"
 
-#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:67
-#: ../../Zotlabs/Module/Photos.php:1115
-msgctxt "title"
-msgid "Not attending"
-msgstr "�е по�ещаю"
+#: ../../Zotlabs/Module/Settings/Channel.php:329
+msgid "Nobody except yourself"
+msgstr "�икто кроме ва�"
 
-#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:68
-#: ../../Zotlabs/Module/Photos.php:1115
-msgctxt "title"
-msgid "Might attend"
-msgstr "Возможно по�ещу"
+#: ../../Zotlabs/Module/Settings/Channel.php:330
+msgid "Only those you specifically allow"
+msgstr "Только пер�онально разрешённые"
 
-#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:181
-msgid "Select"
-msgstr "Выбрать"
+#: ../../Zotlabs/Module/Settings/Channel.php:331
+msgid "Approved connections"
+msgstr "Одобренные контакты"
 
-#: ../../include/conversation.php:730 ../../include/conversation.php:777
-#: ../../Zotlabs/Module/Article_edit.php:129
-#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:174
-#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1057
-#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Webpages.php:257
-#: ../../Zotlabs/Module/Admin/Accounts.php:320
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Editlayout.php:138
-#: ../../Zotlabs/Module/Connections.php:329
-#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269
-#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:933
-#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:171
-#: ../../Zotlabs/Storage/Browser.php:384
-msgid "Delete"
-msgstr "Удалить"
+#: ../../Zotlabs/Module/Settings/Channel.php:332
+msgid "Any connections"
+msgstr "Любые контакты"
 
-#: ../../include/conversation.php:734 ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "Toggle Star Status"
-msgstr "Переключить �тату� пометки"
+#: ../../Zotlabs/Module/Settings/Channel.php:333
+msgid "Anybody on this website"
+msgstr "Любой на �том �айте"
 
-#: ../../include/conversation.php:739 ../../Zotlabs/Lib/ThreadItem.php:103
-msgid "Private Message"
-msgstr "Личное �ообщение"
+#: ../../Zotlabs/Module/Settings/Channel.php:334
+msgid "Anybody in this network"
+msgstr "Любой в �той �ети"
 
-#: ../../include/conversation.php:748 ../../Zotlabs/Widget/Pinned.php:88
-#: ../../Zotlabs/Lib/ThreadItem.php:285
-msgid "Message signature validated"
-msgstr "Подпи�ь �ообщени� проверена"
+#: ../../Zotlabs/Module/Settings/Channel.php:335
+msgid "Anybody authenticated"
+msgstr "Любой аутентифицированный"
 
-#: ../../include/conversation.php:749 ../../Zotlabs/Widget/Pinned.php:89
-#: ../../Zotlabs/Lib/ThreadItem.php:286
-msgid "Message signature incorrect"
-msgstr "Подпи�ь �ообщени� неверна�"
+#: ../../Zotlabs/Module/Settings/Channel.php:336
+msgid "Anybody on the internet"
+msgstr "Любой в интернете"
 
-#: ../../include/conversation.php:776
-#: ../../Zotlabs/Module/Admin/Accounts.php:318
-#: ../../Zotlabs/Module/Connections.php:343
-msgid "Approve"
-msgstr "Утвердить"
+#: ../../Zotlabs/Module/Settings/Channel.php:411
+msgid "Publish your default profile in the network directory"
+msgstr "Публиковать ваш профиль по умолчанию в �етевом каталоге"
 
-#: ../../include/conversation.php:781
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Про�мотреть профиль %s @ %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:416
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Разрешить предлагать ва� как потенциального друга дл� новых пользователей?"
 
-#: ../../include/conversation.php:802
-msgid "Categories:"
-msgstr "Категории:"
+#: ../../Zotlabs/Module/Settings/Channel.php:429
+msgid "Your channel address is"
+msgstr "�дре� вашего канала"
 
-#: ../../include/conversation.php:803
-msgid "Filed under:"
-msgstr "Хранить под:"
+#: ../../Zotlabs/Module/Settings/Channel.php:432
+msgid "Your files/photos are accessible via WebDAV at"
+msgstr "Ваши файлы / фотографии до�тупны через WebDAV по"
 
-#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:132
-#: ../../Zotlabs/Lib/ThreadItem.php:430
-#, php-format
-msgid "from %s"
-msgstr "от %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:472
+msgid "Automatic membership approval"
+msgstr "Член�тво одобрено автоматиче�ки"
 
-#: ../../include/conversation.php:812 ../../Zotlabs/Widget/Pinned.php:135
-#: ../../Zotlabs/Lib/ThreadItem.php:433
-#, php-format
-msgid "last edited: %s"
-msgstr "по�леднее редактирование: %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:493
+msgid "Channel Settings"
+msgstr "�а�тройки канала"
 
-#: ../../include/conversation.php:813 ../../Zotlabs/Widget/Pinned.php:136
-#: ../../Zotlabs/Lib/ThreadItem.php:434
-#, php-format
-msgid "Expires: %s"
-msgstr "Срок дей�тви�: %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:500
+msgid "Basic Settings"
+msgstr "О�новные на�тройки"
 
-#: ../../include/conversation.php:828
-msgid "View in context"
-msgstr "Показать в контек�те"
+#: ../../Zotlabs/Module/Settings/Channel.php:501 ../../include/channel.php:1711
+msgid "Full Name:"
+msgstr "Полное им�:"
 
-#: ../../include/conversation.php:830 ../../Zotlabs/Module/Photos.php:1079
-#: ../../Zotlabs/Lib/ThreadItem.php:503
-msgid "Please wait"
-msgstr "Подождите пожалуй�та"
+#: ../../Zotlabs/Module/Settings/Channel.php:502
+msgid "Email Address:"
+msgstr "�дре� email:"
 
-#: ../../include/conversation.php:930
-msgid "remove"
-msgstr "удалить"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid "Your Timezone:"
+msgstr "Ча�овой по��:"
 
-#: ../../include/conversation.php:934
-msgid "Loading..."
-msgstr "Загрузка..."
+#: ../../Zotlabs/Module/Settings/Channel.php:504
+msgid "Default Post Location:"
+msgstr "Ра�положение по умолчанию:"
 
-#: ../../include/conversation.php:935 ../../Zotlabs/Lib/ThreadItem.php:302
-msgid "Conversation Tools"
-msgstr "Ин�трументы общени�"
+#: ../../Zotlabs/Module/Settings/Channel.php:504
+msgid "Geographical location to display on your posts"
+msgstr "Показывать географиче�кое положение в ваших публикаци�х"
 
-#: ../../include/conversation.php:936
-msgid "Delete Selected Items"
-msgstr "Удалить выбранные �лементы"
+#: ../../Zotlabs/Module/Settings/Channel.php:505
+msgid "Use Browser Location:"
+msgstr "Определ�ть ра�положение из браузера"
 
-#: ../../include/conversation.php:980
-msgid "View Source"
-msgstr "Про�мотреть и�точник"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "Adult Content"
+msgstr "Содержимое дл� взро�лых"
 
-#: ../../include/conversation.php:990
-msgid "Follow Thread"
-msgstr "Следить за темой"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Этот канал ча�то или регул�рно публикует �одержимое дл� взро�лых. Пожалуй�та, помечайте любой такой материал тегом #NSFW"
 
-#: ../../include/conversation.php:999
-msgid "Unfollow Thread"
-msgstr "Прекратить от�леживать тему"
+#: ../../Zotlabs/Module/Settings/Channel.php:509
+msgid "Security and Privacy Settings"
+msgstr "Безопа�но�ть и на�тройки приватно�ти"
 
-#: ../../include/conversation.php:1093 ../../Zotlabs/Module/Connedit.php:622
-msgid "Recent Activity"
-msgstr "По�ледние дей�тви�"
+#: ../../Zotlabs/Module/Settings/Channel.php:511
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr "Ваши разрешени� уже на�троены. �ажмите чтобы про�мотреть или изменить"
 
-#: ../../include/conversation.php:1103 ../../include/connections.php:110
-#: ../../include/channel.php:1643 ../../Zotlabs/Widget/Suggestions.php:46
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:370
-#: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71
-msgid "Connect"
-msgstr "Подключить"
+#: ../../Zotlabs/Module/Settings/Channel.php:513
+msgid "Hide my online presence"
+msgstr "Скрывать моё при�ут�твие онлайн"
 
-#: ../../include/conversation.php:1113
-msgid "Edit Connection"
-msgstr "Редактировать контакт"
+#: ../../Zotlabs/Module/Settings/Channel.php:513
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Предотвращает отображени� �тату�а \"в �ети\" в вашем профиле"
 
-#: ../../include/conversation.php:1123
-#: ../../Zotlabs/Module/Admin/Accounts.php:347
-msgid "Message"
-msgstr "Сообщение"
+#: ../../Zotlabs/Module/Settings/Channel.php:515
+msgid "Simple Privacy Settings:"
+msgstr "Про�тые на�тройки безопа�но�ти:"
 
-#: ../../include/conversation.php:1133 ../../Zotlabs/Module/Pubsites.php:36
-#: ../../Zotlabs/Module/Ratings.php:97
-msgid "Ratings"
-msgstr "Оценки"
+#: ../../Zotlabs/Module/Settings/Channel.php:516
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Полно�тью открытый - <em>�верхлиберальный (должен и�пользовать�� � о�торожно�тью)</em>"
 
-#: ../../include/conversation.php:1143 ../../Zotlabs/Module/Poke.php:199
-#: ../../Zotlabs/Lib/Apps.php:351
-msgid "Poke"
-msgstr "Ткнуть"
+#: ../../Zotlabs/Module/Settings/Channel.php:517
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Обычный - <em>открытый по умолчанию, приватно�ть по желанию (как в �оциальных �ет�х, но � улучшенными на�тройками)</em>"
 
-#: ../../include/conversation.php:1265
-#, php-format
-msgid "%s likes this."
-msgstr "%s нравит�� �то."
+#: ../../Zotlabs/Module/Settings/Channel.php:518
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Ча�тный - <em>ча�тный по умочанию, не открытый и не публичный</em>"
 
-#: ../../include/conversation.php:1265
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s не нравит�� �то."
+#: ../../Zotlabs/Module/Settings/Channel.php:519
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Закрытый - <em>заблокированный по умолчанию от / дл� в�ех</em>"
 
-#: ../../include/conversation.php:1269
-#, 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] "<span  %1$s>%2$d человеку</span> �то нравит��."
-msgstr[1] "<span  %1$s>%2$d человекам</span> �то нравит��."
-msgstr[2] "<span  %1$s>%2$d человекам</span> �то нравит��."
+#: ../../Zotlabs/Module/Settings/Channel.php:521
+msgid "Allow others to tag your posts"
+msgstr "Разрешить другим отмечать ваши публикации"
 
-#: ../../include/conversation.php:1271
-#, 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] "<span  %1$s>%2$d человеку</span> �то не нравит��."
-msgstr[1] "<span  %1$s>%2$d человекам</span> �то не нравит��."
-msgstr[2] "<span  %1$s>%2$d человекам</span> �то не нравит��."
+#: ../../Zotlabs/Module/Settings/Channel.php:521
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Ча�то и�пользует�� �ообще�твом дл� маркировки неподобающего �одержани�"
 
-#: ../../include/conversation.php:1277
-msgid "and"
-msgstr "и"
+#: ../../Zotlabs/Module/Settings/Channel.php:523
+msgid "Channel Permission Limits"
+msgstr "Ограничени� разрешений канала"
 
-#: ../../include/conversation.php:1280
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ", и ещё %d человеку"
-msgstr[1] ", и ещё %d человекам"
-msgstr[2] ", и ещё %d человекам"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Expire other channel content after this many days"
+msgstr "Храненить �одержимое других каналов, дней"
 
-#: ../../include/conversation.php:1281
-#, php-format
-msgid "%s like this."
-msgstr "%s нравит�� �то."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "0 or blank to use the website limit."
+msgstr "0 или пу�то - и�пользовать на�тройки �айта."
 
-#: ../../include/conversation.php:1281
+#: ../../Zotlabs/Module/Settings/Channel.php:525
 #, php-format
-msgid "%s don't like this."
-msgstr "%s не нравит�� �то."
-
-#: ../../include/conversation.php:1464
-msgid "Toggle poll"
-msgstr "Переключить опро�"
-
-#: ../../include/conversation.php:1465
-msgid "Option"
-msgstr "Вариант"
-
-#: ../../include/conversation.php:1466
-msgid "Add option"
-msgstr "Добавить вариант"
-
-#: ../../include/conversation.php:1467
-msgid "Minutes"
-msgstr "Минут"
+msgid "This website expires after %d days."
+msgstr "Срок хранени� �одержимого �того �айта и�текает через %d дней"
 
-#: ../../include/conversation.php:1467
-msgid "Hours"
-msgstr "Ча�ов"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "This website does not expire imported content."
+msgstr "Срок хранени� импортированного �одержимого �того �айта не ограничен."
 
-#: ../../include/conversation.php:1467
-msgid "Days"
-msgstr "Дней"
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "The website limit takes precedence if lower than your limit."
+msgstr "Ограничение �айта имеет приоритет е�ли ниже вашего значени�."
 
-#: ../../include/conversation.php:1468
-msgid "Allow multiple answers"
-msgstr "Разрешить не�колько ответов"
+#: ../../Zotlabs/Module/Settings/Channel.php:526
+msgid "Maximum Friend Requests/Day:"
+msgstr "Запро�ов в друзь� в день:"
 
-#: ../../include/conversation.php:1478
-msgid "Summary (optional)"
-msgstr "Резюме (необ�зательно)"
+#: ../../Zotlabs/Module/Settings/Channel.php:526
+msgid "May reduce spam activity"
+msgstr "Может ограничить �пам активно�ть"
 
-#: ../../include/conversation.php:1752 ../../include/taxonomy.php:670
-#: ../../include/channel.php:1806 ../../Zotlabs/Module/Photos.php:1136
-#: ../../Zotlabs/Lib/ThreadItem.php:243
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "�равит��"
-msgstr[1] "�равит��"
-msgstr[2] "�равит��"
+#: ../../Zotlabs/Module/Settings/Channel.php:527
+msgid "Default Privacy Group"
+msgstr "Группа конфиденциально�ти по умолчанию"
 
-#: ../../include/conversation.php:1755 ../../Zotlabs/Module/Photos.php:1141
-#: ../../Zotlabs/Lib/ThreadItem.php:248
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "�е нравит��"
-msgstr[1] "�е нравит��"
-msgstr[2] "�е нравит��"
+#: ../../Zotlabs/Module/Settings/Channel.php:528
+#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
+msgid "(click to open/close)"
+msgstr "(нажмите чтобы открыть/закрыть)"
 
-#: ../../include/conversation.php:1758
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "По�етит"
-msgstr[1] "По�ет�т"
-msgstr[2] "По�ет�т"
+#: ../../Zotlabs/Module/Settings/Channel.php:529
+msgid "Use my default audience setting for the type of object published"
+msgstr "И�пользовать на�тройки аудитории по умолчанию дл� типа опубликованного объекта"
 
-#: ../../include/conversation.php:1761
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "�е по�етит"
-msgstr[1] "�е по�ет�т"
-msgstr[2] "�е по�ет�т"
+#: ../../Zotlabs/Module/Settings/Channel.php:537
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid "Channel role and privacy"
+msgstr "Роль и конфиденциально�ть канала"
 
-#: ../../include/conversation.php:1764
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr "�е решил"
+#: ../../Zotlabs/Module/Settings/Channel.php:538
+msgid "Default permissions category"
+msgstr "Категори� разрешений по умолчанию"
 
-#: ../../include/conversation.php:1767
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "Согла�ен"
-msgstr[1] "Согла�ны"
-msgstr[2] "Согла�ны"
+#: ../../Zotlabs/Module/Settings/Channel.php:544
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Мак�имально количе�тво �ообщений от незнакомых людей, в день:"
 
-#: ../../include/conversation.php:1770
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "�е �огла�ен"
-msgstr[1] "�е �огла�ны"
-msgstr[2] "�е �огла�ны"
+#: ../../Zotlabs/Module/Settings/Channel.php:544
+msgid "Useful to reduce spamming"
+msgstr "Полезно дл� �окращени� количе�тва �пама"
 
-#: ../../include/conversation.php:1773
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "Воздержал��"
-msgstr[1] "Воздержали�ь"
-msgstr[2] "Воздержали�ь"
+#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Lib/Enotify.php:68
+msgid "Notification Settings"
+msgstr "�а�тройки уведомлений"
 
-#: ../../include/selectors.php:18
-msgid "Profile to assign new connections"
-msgstr "�азначить профиль дл� новых контактов"
+#: ../../Zotlabs/Module/Settings/Channel.php:548
+msgid "By default post a status message when:"
+msgstr "По умолчанию публиковать новый �тату� при:"
 
-#: ../../include/selectors.php:41
-msgid "Frequently"
-msgstr "Ча�то"
+#: ../../Zotlabs/Module/Settings/Channel.php:549
+msgid "accepting a friend request"
+msgstr "одобрении запро�а в друзь�"
 
-#: ../../include/selectors.php:42
-msgid "Hourly"
-msgstr "Ежеча�но"
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+msgid "joining a forum/community"
+msgstr "в�туплении в �ообще�тво / форум"
 
-#: ../../include/selectors.php:43
-msgid "Twice daily"
-msgstr "Дважды в день"
+#: ../../Zotlabs/Module/Settings/Channel.php:551
+msgid "making an <em>interesting</em> profile change"
+msgstr "<em>интере�ном</em> изменении профил�"
 
-#: ../../include/selectors.php:44
-msgid "Daily"
-msgstr "Ежедневно"
+#: ../../Zotlabs/Module/Settings/Channel.php:552
+msgid "Send a notification email when:"
+msgstr "Отправить уведомление по email когда:"
 
-#: ../../include/selectors.php:45
-msgid "Weekly"
-msgstr "Еженедельно"
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "You receive a connection request"
+msgstr "вы получили новый запро� контакта"
 
-#: ../../include/selectors.php:46
-msgid "Monthly"
-msgstr "Ежеме��чно"
+#: ../../Zotlabs/Module/Settings/Channel.php:554
+msgid "Your connections are confirmed"
+msgstr "Ваш запро� контакта был одобрен"
 
-#: ../../include/selectors.php:60
-msgid "Currently Male"
-msgstr "В на�то�щее врем� муж�кой"
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+msgid "Someone writes on your profile wall"
+msgstr "Кто-то напи�ал на �тене вашего профил�"
 
-#: ../../include/selectors.php:60
-msgid "Currently Female"
-msgstr "В на�то�щее врем� жен�кий"
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+msgid "Someone writes a followup comment"
+msgstr "Кто-то пишет комментарий"
 
-#: ../../include/selectors.php:60
-msgid "Mostly Male"
-msgstr "В о�новном муж�кой"
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+msgid "You receive a private message"
+msgstr "Вы получили личное �ообщение"
 
-#: ../../include/selectors.php:60
-msgid "Mostly Female"
-msgstr "В о�новном жен�кий"
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+msgid "You receive a friend suggestion"
+msgstr "Вы получили предложение друзей"
 
-#: ../../include/selectors.php:60
-msgid "Transgender"
-msgstr "Тран�гендер"
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+msgid "You are tagged in a post"
+msgstr "Вы были отмечены в публикации"
 
-#: ../../include/selectors.php:60
-msgid "Intersex"
-msgstr "Интер�ек�уал"
+#: ../../Zotlabs/Module/Settings/Channel.php:560
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Ва� толкнули, подтолкнули и т.п. в публикации"
 
-#: ../../include/selectors.php:60
-msgid "Transsexual"
-msgstr "Тран��ек�уал"
+#: ../../Zotlabs/Module/Settings/Channel.php:562
+msgid "Someone likes your post/comment"
+msgstr "Кому-то нравит�� ваша публикаци� / комментарий"
 
-#: ../../include/selectors.php:60
-msgid "Hermaphrodite"
-msgstr "Гермафродит"
+#: ../../Zotlabs/Module/Settings/Channel.php:565
+msgid "Show visual notifications including:"
+msgstr "Показывать визуальные оповещени� включа�:"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1751
-msgid "Neuter"
-msgstr "Среднего рода"
+#: ../../Zotlabs/Module/Settings/Channel.php:567
+msgid "Unseen stream activity"
+msgstr "�ова� активно�ть в потоке"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1753
-msgid "Non-specific"
-msgstr "�е�пецифиче�кий"
+#: ../../Zotlabs/Module/Settings/Channel.php:568
+msgid "Unseen channel activity"
+msgstr "�ова� активно�ть в канале"
 
-#: ../../include/selectors.php:60
-msgid "Undecided"
-msgstr "�е решил"
+#: ../../Zotlabs/Module/Settings/Channel.php:569
+msgid "Unseen private messages"
+msgstr "�овые личные �ообщени�"
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
-msgid "Males"
-msgstr "Мужчины"
+#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "Recommended"
+msgstr "Рекомендовано"
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
-msgid "Females"
-msgstr "Женщины"
+#: ../../Zotlabs/Module/Settings/Channel.php:570
+msgid "Upcoming events"
+msgstr "Гр�дущие �обыти�"
 
-#: ../../include/selectors.php:96
-msgid "Gay"
-msgstr "Гей"
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+msgid "Events today"
+msgstr "Событи� �егодн�"
 
-#: ../../include/selectors.php:96
-msgid "Lesbian"
-msgstr "Ле�би�нка"
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Upcoming birthdays"
+msgstr "Гр�дущие дни рождени�"
 
-#: ../../include/selectors.php:96
-msgid "No Preference"
-msgstr "Без предпочтений"
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Not available in all themes"
+msgstr "�е до�тупно во в�ех темах"
 
-#: ../../include/selectors.php:96
-msgid "Bisexual"
-msgstr "Би�ек�уал"
+#: ../../Zotlabs/Module/Settings/Channel.php:573
+msgid "System (personal) notifications"
+msgstr "Си�темные (личные) уведомлени�"
 
-#: ../../include/selectors.php:96
-msgid "Autosexual"
-msgstr "�вто�ек�уал"
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+msgid "System info messages"
+msgstr "Сообщени� � �и�темной информацией"
 
-#: ../../include/selectors.php:96
-msgid "Abstinent"
-msgstr "Воздержание"
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+msgid "System critical alerts"
+msgstr "Критиче�кие уведомлени� �и�темы"
 
-#: ../../include/selectors.php:96
-msgid "Virgin"
-msgstr "Дев�твенник"
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "New connections"
+msgstr "�овые контакты"
 
-#: ../../include/selectors.php:96
-msgid "Deviant"
-msgstr "Отклон�ющий�� от нормы"
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+msgid "System Registrations"
+msgstr "Си�темные реги�трации"
 
-#: ../../include/selectors.php:96
-msgid "Fetish"
-msgstr "Фетиши�т"
+#: ../../Zotlabs/Module/Settings/Channel.php:578
+msgid "Unseen shared files"
+msgstr "�овые общие файлы"
 
-#: ../../include/selectors.php:96
-msgid "Oodles"
-msgstr "Множе�твенный"
+#: ../../Zotlabs/Module/Settings/Channel.php:579
+msgid "Unseen public stream activity"
+msgstr "�ова� активно�ть в публичном потоке"
 
-#: ../../include/selectors.php:96
-msgid "Nonsexual"
-msgstr "��ек�уал"
+#: ../../Zotlabs/Module/Settings/Channel.php:580
+msgid "Unseen likes and dislikes"
+msgstr "�овые лайки и ди�лайки"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Single"
-msgstr "Одиночка"
+#: ../../Zotlabs/Module/Settings/Channel.php:581
+msgid "Unseen forum posts"
+msgstr "�овые публикации на форуме"
 
-#: ../../include/selectors.php:134
-msgid "Lonely"
-msgstr "Одинокий"
+#: ../../Zotlabs/Module/Settings/Channel.php:582
+msgid "Email notification hub (hostname)"
+msgstr "Центр уведомлений по email (им� хо�та)"
 
-#: ../../include/selectors.php:134
-msgid "Available"
-msgstr "Свободен"
+#: ../../Zotlabs/Module/Settings/Channel.php:582
+#, php-format
+msgid ""
+"If your channel is mirrored to multiple hubs, set this to your preferred "
+"location. This will prevent duplicate email notifications. Example: %s"
+msgstr "Е�ли ваш канал зеркалирует�� в не�кольких ме�тах, �то ваше предпочтительное ме�тоположение. Это должно предотвратить дублировать уведомлений по email. �апример: %s"
 
-#: ../../include/selectors.php:134
-msgid "Unavailable"
-msgstr "Зан�т"
+#: ../../Zotlabs/Module/Settings/Channel.php:583
+msgid "Show new wall posts, private messages and connections under Notices"
+msgstr "Показать новые �ообщени� на �тене, личные �ообщени� и контакты в \"Уведомлени�х\""
 
-#: ../../include/selectors.php:134
-msgid "Has crush"
-msgstr "Влюблён"
+#: ../../Zotlabs/Module/Settings/Channel.php:585
+msgid "Notify me of events this many days in advance"
+msgstr "Уведомл�ть мен� о �обыти�х заранее, дней"
 
-#: ../../include/selectors.php:134
-msgid "Infatuated"
-msgstr "без ума"
+#: ../../Zotlabs/Module/Settings/Channel.php:585
+msgid "Must be greater than 0"
+msgstr "Должно быть больше 0"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Dating"
-msgstr "В�тречаю�ь"
+#: ../../Zotlabs/Module/Settings/Channel.php:590
+msgid "Advanced Account/Page Type Settings"
+msgstr "Дополнительные на�тройки учётной запи�и / �траницы"
 
-#: ../../include/selectors.php:134
-msgid "Unfaithful"
-msgstr "�еверный"
+#: ../../Zotlabs/Module/Settings/Channel.php:591
+msgid "Change the behaviour of this account for special situations"
+msgstr "Изменить поведение �того аккаунта в о�обых �итуаци�х"
 
-#: ../../include/selectors.php:134
-msgid "Sex Addict"
-msgstr "Эротоман"
+#: ../../Zotlabs/Module/Settings/Channel.php:593
+msgid "Miscellaneous Settings"
+msgstr "Дополнительные на�тройки"
 
-#: ../../include/selectors.php:134 ../../include/channel.php:506
-#: ../../include/channel.php:509 ../../Zotlabs/Widget/Affinity.php:32
-#: ../../Zotlabs/Module/Settings/Channel.php:71
-#: ../../Zotlabs/Module/Settings/Channel.php:75
-#: ../../Zotlabs/Module/Settings/Channel.php:76
-#: ../../Zotlabs/Module/Settings/Channel.php:79
-#: ../../Zotlabs/Module/Settings/Channel.php:90
-#: ../../Zotlabs/Module/Connedit.php:718
-msgid "Friends"
-msgstr "Друзь�"
+#: ../../Zotlabs/Module/Settings/Channel.php:594
+msgid "Default photo upload folder"
+msgstr "Каталог загрузки фотографий по умолчанию"
 
-#: ../../include/selectors.php:134
-msgid "Friends/Benefits"
-msgstr "Друзь� / Выгоды"
+#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Zotlabs/Module/Settings/Channel.php:595
+msgid "%Y - current year, %m -  current month"
+msgstr "%Y - текущий год, %y - текущий ме��ц"
 
-#: ../../include/selectors.php:134
-msgid "Casual"
-msgstr "Легкомы�ленный"
+#: ../../Zotlabs/Module/Settings/Channel.php:595
+msgid "Default file upload folder"
+msgstr "Каталог загрузки файлов по умолчанию"
 
-#: ../../include/selectors.php:134
-msgid "Engaged"
-msgstr "Помолвлен"
+#: ../../Zotlabs/Module/Settings/Channel.php:596
+#: ../../Zotlabs/Module/Removeme.php:64
+msgid "Remove Channel"
+msgstr "Удаление канала"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Married"
-msgstr "В браке"
+#: ../../Zotlabs/Module/Settings/Channel.php:597
+msgid "Remove this channel."
+msgstr "Удалить �тот канал."
 
-#: ../../include/selectors.php:134
-msgid "Imaginarily married"
-msgstr "В воображаемом браке"
+#: ../../Zotlabs/Module/Settings/Connections.php:40
+msgid "Connections Settings"
+msgstr "�а�тройки контактов"
 
-#: ../../include/selectors.php:134
-msgid "Partners"
-msgstr "Партнёр�тво"
+#: ../../Zotlabs/Module/Settings/Featured.php:25
+msgid "No feature settings configured"
+msgstr "Параметры функций не на�троены"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Cohabiting"
-msgstr "Сожитель�твующие"
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "Addon Settings"
+msgstr "�а�тройки ра�ширений"
 
-#: ../../include/selectors.php:134
-msgid "Common law"
-msgstr "Граждан�кий брак"
+#: ../../Zotlabs/Module/Settings/Featured.php:35
+msgid "Please save/submit changes to any panel before opening another."
+msgstr "Пожалуй�та �охраните / отправьте изменени� на панели прежде чем открывать другую."
 
-#: ../../include/selectors.php:134
-msgid "Happy"
-msgstr "Сча�тлив"
+#: ../../Zotlabs/Module/Vote.php:40
+msgid "Poll not found."
+msgstr "Опро� не найден"
 
-#: ../../include/selectors.php:134
-msgid "Not looking"
-msgstr "�е нуждаю�ь"
+#: ../../Zotlabs/Module/Vote.php:71
+msgid "Invalid response."
+msgstr "�еверный ответ."
 
-#: ../../include/selectors.php:134
-msgid "Swinger"
-msgstr "Свингер"
+#: ../../Zotlabs/Module/Vote.php:132
+msgid "Response submitted. Updates may not appear instantly."
+msgstr "Ответ отправлен. Обновлени� могут отображать�� не �разу."
 
-#: ../../include/selectors.php:134
-msgid "Betrayed"
-msgstr "Предан"
+#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
+msgid "Location not found."
+msgstr "Ме�тоположение не найдено"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Separated"
-msgstr "Разделён"
+#: ../../Zotlabs/Module/Locs.php:74
+msgid "Location lookup failed."
+msgstr "Пои�к ме�тоположени� не удал��"
 
-#: ../../include/selectors.php:134
-msgid "Unstable"
-msgstr "�е�табильно"
+#: ../../Zotlabs/Module/Locs.php:78
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
+msgstr "Пожалуй�та, выберите другое ме�тоположение в каче�тве о�новного прежде чем удалить предыдущее"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Divorced"
-msgstr "В разводе"
+#: ../../Zotlabs/Module/Locs.php:106
+msgid "Syncing locations"
+msgstr "Синхронизировать ме�тоположение"
 
-#: ../../include/selectors.php:134
-msgid "Imaginarily divorced"
-msgstr "В воображаемом разводе"
+#: ../../Zotlabs/Module/Locs.php:115
+msgid "No locations found."
+msgstr "Ме�тоположений не найдено"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "Widowed"
-msgstr "Вдовец / вдова"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Manage Channel Locations"
+msgstr "Управление ме�тоположением канала"
 
-#: ../../include/selectors.php:134
-msgid "Uncertain"
-msgstr "�еопределенный"
+#: ../../Zotlabs/Module/Locs.php:128
+#: ../../extend/addon/hzaddons/workflow/workflow.php:285
+msgid "Primary"
+msgstr "О�новной"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
-msgid "It's complicated"
-msgstr "Это �ложно"
+#: ../../Zotlabs/Module/Locs.php:129 ../../Zotlabs/Module/Menu.php:177
+msgid "Drop"
+msgstr "Удалить"
 
-#: ../../include/selectors.php:134
-msgid "Don't care"
-msgstr "В�ё равно"
+#: ../../Zotlabs/Module/Locs.php:131
+msgid "Sync Now"
+msgstr "Синхронизировать"
 
-#: ../../include/selectors.php:134
-msgid "Ask me"
-msgstr "Спро�и мен�"
+#: ../../Zotlabs/Module/Locs.php:132
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Пожалуй�та, подождите не�колько минут между по�ледовательными операци�ми."
 
-#: ../../include/connections.php:134
-msgid "New window"
-msgstr "�овое окно"
+#: ../../Zotlabs/Module/Locs.php:133
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
+msgstr "По возможно�ти, очи�тите ме�тоположение, войд� на �тот веб-�айт / хаб и удалив �вой канал."
 
-#: ../../include/connections.php:135
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Открыть выбранное ме�тоположение в другом окне или вкладке браузера"
+#: ../../Zotlabs/Module/Locs.php:134
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "И�пользуйте �ту форму, чтобы удалить ме�тоположение, е�ли хаб больше не функционирует."
 
-#: ../../include/group.php:23 ../../Zotlabs/Lib/Group.php:28
-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 "Удаленна� группа � �тим названием была во��тановлена. Суще�твующие разрешени� пункт <strong>могут</strong> примен�ть�� к �той группе и к её будущих уча�тников. Е�ли �то не то, чего вы хотели, пожалуй�та, �оздайте другую группу � другим именем."
+#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
+msgid "Invite App"
+msgstr "Приложение \"Пригла�ить\""
 
-#: ../../include/group.php:271 ../../Zotlabs/Lib/Group.php:270
-msgid "Add new connections to this privacy group"
-msgstr "Добавить новые контакты в группу конфиденциально�ти"
+#: ../../Zotlabs/Module/Invite.php:68
+msgid "Register is closed"
+msgstr "Реги�траци� закрыта"
 
-#: ../../include/group.php:305 ../../Zotlabs/Lib/AccessList.php:311
-#: ../../Zotlabs/Lib/Group.php:302
-msgid "edit"
-msgstr "редактировать"
+#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
+msgid "Note, the invitation code is valid up to"
+msgstr "Обратите внимание: код приглашени� дей�твителен до "
 
-#: ../../include/group.php:328 ../../Zotlabs/Lib/Group.php:325
-msgid "Edit group"
-msgstr "Редактировать группу"
+#: ../../Zotlabs/Module/Invite.php:115
+#, php-format
+msgid "Too many recipients for one invitation (max %d)"
+msgstr "Слишком много получателей дл� одного кода приглашени� (не более %d)"
 
-#: ../../include/group.php:329 ../../Zotlabs/Lib/Group.php:326
-msgid "Add privacy group"
-msgstr "Добавить группу конфиденциально�ти"
+#: ../../Zotlabs/Module/Invite.php:119
+msgid "No recipients for this invitation"
+msgstr "�ет получателей дл� �того приглашени�"
 
-#: ../../include/group.php:330 ../../Zotlabs/Lib/Group.php:327
-msgid "Channels not in any privacy group"
-msgstr "Каналы не включены ни в одну группу конфиденциально�ти"
+#: ../../Zotlabs/Module/Invite.php:133
+#, php-format
+msgid "(%s) : Not a valid email address"
+msgstr "(%s) : �едей�твительный адре� �лектронной почты"
 
-#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84
-#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329
-msgid "add"
-msgstr "добавить"
+#: ../../Zotlabs/Module/Invite.php:138
+#, php-format
+msgid "(%s) : Not a real email address"
+msgstr "(%s) : �е на�то�щий адре� �лектронной почты"
 
-#: ../../include/taxonomy.php:323
-msgid "Trending"
-msgstr "В тренде"
+#: ../../Zotlabs/Module/Invite.php:145
+#, php-format
+msgid "(%s) : Not allowed email address"
+msgstr "(%s) : �е разрешённый адре� �лектронной почты"
 
-#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:460
-#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:22
-msgid "Tags"
-msgstr "Теги"
+#: ../../Zotlabs/Module/Invite.php:158
+#, php-format
+msgid "(%s) : email address already in use"
+msgstr "(%s) : �дре� �лектронной почты уже и�пользует��"
 
-#: ../../include/taxonomy.php:561
-msgid "Keywords"
-msgstr "Ключевые �лова"
+#: ../../Zotlabs/Module/Invite.php:165
+#, php-format
+msgid "(%s) : Accepted email address"
+msgstr "%s) : Подтверждённый адре� �лектронной почты"
 
-#: ../../include/taxonomy.php:582
-msgid "have"
-msgstr "иметь"
+#: ../../Zotlabs/Module/Invite.php:225 ../../Zotlabs/Module/Invite.php:494
+#: ../../Zotlabs/Module/Invite.php:508 ../../Zotlabs/Module/Home.php:87
+#: ../../Zotlabs/Module/Home.php:95 ../../Zotlabs/Lib/Enotify.php:66
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:42
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../include/taxonomy.php:582
-msgid "has"
-msgstr "е�ть"
+#: ../../Zotlabs/Module/Invite.php:252
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:40
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : До�тавка �ообщени� не удала�ь."
 
-#: ../../include/taxonomy.php:583
-msgid "want"
-msgstr "хотеть"
+#: ../../Zotlabs/Module/Invite.php:257
+#, php-format
+msgid "To %s : Message delivery success."
+msgstr "Дл� %s : Сообщение у�пешно до�тавлено."
 
-#: ../../include/taxonomy.php:583
-msgid "wants"
-msgstr "хотеть"
+#: ../../Zotlabs/Module/Invite.php:289
+#, php-format
+msgid "%1$d mail(s) sent, %2$d mail error(s)"
+msgstr "%1$d пи�ем отправлено, %2$d ошибок до�тавки"
 
-#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:318
-msgid "like"
-msgstr "нравит��"
+#: ../../Zotlabs/Module/Invite.php:315
+msgid "Invites not proposed by configuration"
+msgstr "И�пользование приглашений не предлагает��"
 
-#: ../../include/taxonomy.php:584
-msgid "likes"
-msgstr "нравит��"
+#: ../../Zotlabs/Module/Invite.php:316
+msgid "Contact the site admin"
+msgstr "Св�зат�� � админи�тратором �айта"
 
-#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:319
-msgid "dislike"
-msgstr "не нравит��"
+#: ../../Zotlabs/Module/Invite.php:332
+msgid "Invites by users not enabled"
+msgstr "Приглашени� от пользователей отключены"
 
-#: ../../include/taxonomy.php:585
-msgid "dislikes"
-msgstr "не нравит��"
+#: ../../Zotlabs/Module/Invite.php:337
+msgid "You have no more invitations available"
+msgstr "У ва� больше нет приглашений"
 
-#: ../../include/items.php:1037 ../../include/items.php:1097
-msgid "(Unknown)"
-msgstr "(�еизве�тный)"
+#: ../../Zotlabs/Module/Invite.php:353
+msgid "Not on xchan"
+msgstr "�еизве�тный пользователь"
 
-#: ../../include/items.php:1301
-msgid "Visible to anybody on the internet."
-msgstr "Виден в�ем в интернете."
+#: ../../Zotlabs/Module/Invite.php:386
+msgid "All users invitation limit exceeded."
+msgstr "Превышен лимит приглашений дл� в�ех пользователей."
 
-#: ../../include/items.php:1303
-msgid "Visible to you only."
-msgstr "Видно только вам."
+#: ../../Zotlabs/Module/Invite.php:404
+msgid "Invitation expires after"
+msgstr "Приглашение и�текает по�ле"
 
-#: ../../include/items.php:1305
-msgid "Visible to anybody in this network."
-msgstr "Видно в�ем в �той �ети."
+#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
+msgid "Invitation"
+msgstr "Приглашение"
 
-#: ../../include/items.php:1307
-msgid "Visible to anybody authenticated."
-msgstr "Видно в�ем аутентифицированным."
+#: ../../Zotlabs/Module/Invite.php:534
+msgid "Send invitations"
+msgstr "Отправить приглашение"
 
-#: ../../include/items.php:1309
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Видно в�ем в %s."
+#: ../../Zotlabs/Module/Invite.php:535
+msgid "Invitations I am using"
+msgstr "Приглашени�, которые � и�пользую"
 
-#: ../../include/items.php:1311
-msgid "Visible to all connections."
-msgstr "Видно в�ем контактам."
+#: ../../Zotlabs/Module/Invite.php:536
+msgid "Invitations we are using"
+msgstr "Приглашени�, которые мы и�пользуем"
 
-#: ../../include/items.php:1313
-msgid "Visible to approved connections."
-msgstr "Видно только одобренным контактам."
+#: ../../Zotlabs/Module/Invite.php:537
+msgid "§ Note, the email(s) sent will be recorded in the system logs"
+msgstr "Внимание: адре�а �лектронной почты будут запи�аны в �и�темные журналы."
 
-#: ../../include/items.php:1315
-msgid "Visible to specific connections."
-msgstr "Видно указанным контактам."
+#: ../../Zotlabs/Module/Invite.php:538
+msgid "Enter email addresses, one per line:"
+msgstr "Введите адре�а �лектронной почты, по одному в �троке:"
 
-#: ../../include/items.php:4584 ../../Zotlabs/Module/Group.php:62
-#: ../../Zotlabs/Module/Group.php:214
-msgid "Privacy group not found."
-msgstr "Группа конфиденциально�ти не найдена."
+#: ../../Zotlabs/Module/Invite.php:539
+msgid "Your message:"
+msgstr "Сообщение:"
 
-#: ../../include/items.php:4600
-msgid "Privacy group is empty."
-msgstr "Группа конфиденциально�ти пу�та"
+#: ../../Zotlabs/Module/Invite.php:540
+msgid "Invite template"
+msgstr "Шаблон приглашени�"
 
-#: ../../include/items.php:4607
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Группа конфиденциально�ти: %s"
+#: ../../Zotlabs/Module/Invite.php:542
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:198
+msgid "Subject:"
+msgstr "Тема:"
 
-#: ../../include/items.php:4617 ../../Zotlabs/Module/Connedit.php:860
-#, php-format
-msgid "Connection: %s"
-msgstr "Контакт: %s"
+#: ../../Zotlabs/Module/Invite.php:548
+msgid "Here you may enter personal notes to the recipient(s)"
+msgstr "Зде�ь вы можете вве�ти личные заметки дл� получателей"
 
-#: ../../include/items.php:4619
-msgid "Connection not found."
-msgstr "Контакт не найден."
+#: ../../Zotlabs/Module/Cover_photo.php:196
+#: ../../Zotlabs/Module/Cover_photo.php:254
+msgid "Cover Photos"
+msgstr "Фотографии обложки"
 
-#: ../../include/items.php:4965 ../../Zotlabs/Module/Cover_photo.php:297
+#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4622
 msgid "female"
 msgstr "женщина"
 
-#: ../../include/items.php:4966 ../../Zotlabs/Module/Cover_photo.php:298
+#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4623
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s обновила её %2$s"
 
-#: ../../include/items.php:4967 ../../Zotlabs/Module/Cover_photo.php:299
+#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4624
 msgid "male"
 msgstr "мужчина"
 
-#: ../../include/items.php:4968 ../../Zotlabs/Module/Cover_photo.php:300
+#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4625
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s обновил его %2$s"
 
-#: ../../include/items.php:4970 ../../Zotlabs/Module/Cover_photo.php:302
+#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4627
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%2$s %1$s обновлена"
 
-#: ../../include/items.php:4972
-msgid "profile photo"
-msgstr "Фотографи� профил�"
-
-#: ../../include/items.php:5164
-#, php-format
-msgid "[Edited %s]"
-msgstr "[Отредактировано %s]"
-
-#: ../../include/items.php:5164
-msgctxt "edit_activity"
-msgid "Post"
-msgstr "Публикаци�"
-
-#: ../../include/items.php:5164
-msgctxt "edit_activity"
-msgid "Comment"
-msgstr "Комментарий"
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2276
+msgid "cover photo"
+msgstr "фотографи� обложки"
 
-#: ../../include/account.php:38
-msgid "The provided email address is not valid"
-msgstr "Предо�тавленный адре� �лектронной почты недей�твителен"
+#: ../../Zotlabs/Module/Cover_photo.php:418
+msgid "Your cover photo may be visible to anybody on the internet"
+msgstr "Фотографи� вашей обложки может быть видна в�ем в Интернете"
 
-#: ../../include/account.php:40
-msgid "The provided email domain is not among those allowed on this site"
-msgstr "Домен �лектронной почты не входит в чи�ло разрешенных на �том �айте"
+#: ../../Zotlabs/Module/Cover_photo.php:422
+msgid "Change Cover Photo"
+msgstr "Изменить фотографию обложки"
 
-#: ../../include/account.php:51
-msgid "The provided email address is already registered at this site"
-msgstr "Предо�тавленный адре� �лектронной почты уже зареги�трирован на �том �айте"
+#: ../../Zotlabs/Module/Network.php:107
+msgid "No such group"
+msgstr "�ет такой группы"
 
-#: ../../include/account.php:88
-msgid "An invitation is required."
-msgstr "Требует�� приглашение."
+#: ../../Zotlabs/Module/Network.php:156
+msgid "No such channel"
+msgstr "�ет такого канала"
 
-#: ../../include/account.php:97
-msgid "Invitation could not be verified."
-msgstr "�е удало�ь проверить приглашение."
+#: ../../Zotlabs/Module/Network.php:243
+msgid "Privacy group is empty"
+msgstr "Группа конфиденциально�ти пу�та"
 
-#: ../../include/account.php:185
-msgid "Please enter the required information."
-msgstr "Пожалуй�та, введите необходимую информацию."
+#: ../../Zotlabs/Module/Network.php:253
+msgid "Privacy group: "
+msgstr "Группа конфиденциально�ти: "
 
-#: ../../include/account.php:252 ../../include/account.php:360
-msgid "Failed to store account information."
-msgstr "�е удало�ь �охранить информацию аккаунта."
+#: ../../Zotlabs/Module/Network.php:326
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:29
+msgid "Invalid channel."
+msgstr "�едей�твительный канал."
 
-#: ../../include/account.php:429 ../../include/account.php:497
-#: ../../Zotlabs/Module/Register.php:352
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Подтверждение реги�трации на %s"
+#: ../../Zotlabs/Module/Dreport.php:59
+msgid "Invalid message"
+msgstr "�еверное �ообщение"
 
-#: ../../include/account.php:572
-#, php-format
-msgid "Registration request at %s"
-msgstr "Запро� реги�трации на %s"
+#: ../../Zotlabs/Module/Dreport.php:92
+msgid "no results"
+msgstr "�ичего не найдено."
 
-#: ../../include/account.php:594
-msgid "your registration password"
-msgstr "ваш пароль реги�трации"
+#: ../../Zotlabs/Module/Dreport.php:106
+msgid "channel sync processed"
+msgstr "�инхронизаци� канала завершена"
 
-#: ../../include/account.php:600 ../../include/account.php:689
-#, php-format
-msgid "Registration details for %s"
-msgstr "Реги�трационные данные дл� %s"
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "queued"
+msgstr "в очереди"
 
-#: ../../include/account.php:700
-msgid "Account approved."
-msgstr "�ккаунт утвержден."
+#: ../../Zotlabs/Module/Dreport.php:114
+msgid "posted"
+msgstr "опубликовано"
 
-#: ../../include/account.php:756
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Реги�траци� отозвана дл� %s"
+#: ../../Zotlabs/Module/Dreport.php:118
+msgid "accepted for delivery"
+msgstr "прин�то к до�тавке"
 
-#: ../../include/account.php:763
-#, php-format
-msgid "Could not revoke registration for %s"
-msgstr "�е удало�ь отозвать реги�трацию дл� %s"
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "updated"
+msgstr "обновлено"
 
-#: ../../include/account.php:1179 ../../include/account.php:1181
-msgid "Click here to upgrade."
-msgstr "�ажмите зде�ь дл� обновлени�."
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "update ignored"
+msgstr "обновление игнорирует��"
 
-#: ../../include/account.php:1187
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Это дей�твие превышает ограничени�, у�тановленные в вашем плане."
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "permission denied"
+msgstr "до�туп запрещен"
 
-#: ../../include/account.php:1192
-msgid "This action is not available under your subscription plan."
-msgstr "Это дей�твие невозможно из-за ограничений в вашем плане."
+#: ../../Zotlabs/Module/Dreport.php:132
+msgid "recipient not found"
+msgstr "получатель не найден"
 
-#: ../../include/account.php:1252
-msgid "open"
-msgstr "открыта"
+#: ../../Zotlabs/Module/Dreport.php:135
+msgid "mail recalled"
+msgstr "почта отозвана"
 
-#: ../../include/account.php:1252
-msgid "closed"
-msgstr "закрыта"
+#: ../../Zotlabs/Module/Dreport.php:138
+msgid "duplicate mail received"
+msgstr "получено дублирующее �ообщение"
 
-#: ../../include/account.php:1259
-msgid "Registration is currently"
-msgstr "В на�то�щее врем� реги�траци�"
+#: ../../Zotlabs/Module/Dreport.php:141
+msgid "mail delivered"
+msgstr "почта до�тавлен"
 
-#: ../../include/account.php:1268
-msgid "please come back"
-msgstr "пожалуй�та, возвращайте�ь позднее"
+#: ../../Zotlabs/Module/Dreport.php:161
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr "Отчёт о до�тавке дл� %1$s"
 
-#: ../../include/photo/photo_driver.php:435
-#: ../../Zotlabs/Module/Profile_photo.php:147
-#: ../../Zotlabs/Module/Profile_photo.php:284
-msgid "Profile Photos"
-msgstr "Фотографии профил�"
+#: ../../Zotlabs/Module/Dreport.php:165 ../../Zotlabs/Widget/Wiki_pages.php:41
+#: ../../Zotlabs/Widget/Wiki_pages.php:98
+msgid "Options"
+msgstr "Параметры"
 
-#: ../../include/attach.php:273 ../../include/attach.php:324
-#: ../../include/attach.php:419
-msgid "Item was not found."
-msgstr "Элемент не найден."
+#: ../../Zotlabs/Module/Dreport.php:166
+msgid "Redeliver"
+msgstr "До�тавить повторно"
 
-#: ../../include/attach.php:290
-msgid "Unknown error."
-msgstr "�еизве�тна� ошибка."
+#: ../../Zotlabs/Module/Affinity.php:35
+msgid "Affinity Tool settings updated."
+msgstr "�а�тройки �тепени �ход�тва обновлены."
 
-#: ../../include/attach.php:612
-msgid "No source file."
-msgstr "�ет и�ходного файла."
+#: ../../Zotlabs/Module/Affinity.php:47
+msgid ""
+"This app presents a slider control in your connection editor and also on "
+"your network page. The slider represents your degree of friendship "
+"(affinity) with each connection. It allows you to zoom in or out and display "
+"conversations from only your closest friends or everybody in your stream."
+msgstr "Это приложение пред�тавл�ет управление ползунком на �транице контактов и �етевом потоке, который позвол�ет выбирать вашу �тепень дружбы (�ход�тва). Это позвол�ет вам увеличивать или уменьшать ма�штаб и отображать разговоры только от ваших �амых близких друзей или в�ех в вашем потоке."
 
-#: ../../include/attach.php:634
-msgid "Cannot locate file to replace"
-msgstr "�е удает�� найти файл дл� замены"
+#: ../../Zotlabs/Module/Affinity.php:52
+msgid "Affinity Tool App"
+msgstr "Приложение \"Степень �ход�тва\""
 
-#: ../../include/attach.php:653
-msgid "Cannot locate file to revise/update"
-msgstr "�е удает�� найти файл дл� пере�мотра / обновлени�"
+#: ../../Zotlabs/Module/Affinity.php:57
+msgid ""
+"The numbers below represent the minimum and maximum slider default positions "
+"for your network/stream page as a percentage."
+msgstr "Чи�ла ниже пред�тавл�ют минимальное и мак�имальное значение по умолчанию дл� вашей �ети / потока в процентах."
 
-#: ../../include/attach.php:795
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Файл превышает предельный размер %d"
+#: ../../Zotlabs/Module/Affinity.php:64
+msgid "Default maximum affinity level"
+msgstr "Мак�имальна� �тепень �ход�тва по умолчанию."
 
-#: ../../include/attach.php:816
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Вы до�тигли предела %1$.0f Мбайт дл� хранени� вложений."
+#: ../../Zotlabs/Module/Affinity.php:64
+msgid "0-99 default 99"
+msgstr "0-99 (по умолчанию 99)"
 
-#: ../../include/attach.php:1004
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Загрузка файла не удала�ь. Возможно �и�тема перегружена или попытка прекращена."
+#: ../../Zotlabs/Module/Affinity.php:70
+msgid "Default minimum affinity level"
+msgstr "Мак�имальна� �тепень �ход�тва по умолчанию."
 
-#: ../../include/attach.php:1033
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Файл дл� �охранени� не может быть проверен. Загрузка не удала�ь."
+#: ../../Zotlabs/Module/Affinity.php:70
+msgid "0-99 - default 0"
+msgstr "0-99 (по умолчанию 0)"
 
-#: ../../include/attach.php:1105 ../../include/attach.php:1121
-msgid "Path not available."
-msgstr "Путь недо�тупен."
+#: ../../Zotlabs/Module/Affinity.php:76
+msgid "Persistent affinity levels"
+msgstr "У�то�вшие�� �тепени �ход�тва"
 
-#: ../../include/attach.php:1169 ../../include/attach.php:1332
-msgid "Empty pathname"
-msgstr "Пу�тое им� пути"
+#: ../../Zotlabs/Module/Affinity.php:76
+msgid ""
+"If disabled the max and min levels will be reset to default after page reload"
+msgstr "Е�ли �тот параметр отключен, мак�имальный и минимальный уровни будут �брошены к значени�м по умолчанию по�ле перезагрузки �траницы"
 
-#: ../../include/attach.php:1195
-msgid "duplicate filename or path"
-msgstr "дублирующее�� им� файла или пути"
+#: ../../Zotlabs/Module/Affinity.php:84
+msgid "Affinity Tool Settings"
+msgstr "�а�тройки �тепени �ход�тва"
 
-#: ../../include/attach.php:1220
-msgid "Path not found."
-msgstr "Путь не найден."
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "Enter a folder name"
+msgstr "Введите название каталога"
 
-#: ../../include/attach.php:1288
-msgid "mkdir failed."
-msgstr "mkdir не удал��"
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "or select an existing folder (doubleclick)"
+msgstr "или выберите �уще�твующий каталог (двойной щелчок)"
 
-#: ../../include/attach.php:1292
-msgid "database storage failed."
-msgstr "ошибка при запи�и базы данных."
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
+msgid "Save to Folder"
+msgstr "Сохранить в каталог"
 
-#: ../../include/attach.php:1338
-msgid "Empty path"
-msgstr "Пу�тое им� пути"
+#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Widget/Appstore.php:14
+msgid "Available Apps"
+msgstr "До�тупные приложени�"
 
-#: ../../include/attach.php:2099
-#, php-format
-msgid "%s shared a %s with you"
-msgstr "%s поделил�� � вами %s"
+#: ../../Zotlabs/Module/Apps.php:50
+msgid "Installed Apps"
+msgstr "У�тановленные приложени�"
 
-#: ../../include/bookmarks.php:34
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Закладки пользовател� %1$s"
+#: ../../Zotlabs/Module/Apps.php:53
+msgid "Manage Apps"
+msgstr "Управление приложени�ми"
 
-#: ../../include/menu.php:120 ../../include/channel.php:1563
-#: ../../include/channel.php:1567 ../../Zotlabs/Widget/Cdav.php:138
-#: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98
-#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:255
-#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Editblock.php:114
-#: ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Connections.php:321
-#: ../../Zotlabs/Module/Connections.php:363
-#: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Menu.php:176
-#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268
-#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:557
-#: ../../Zotlabs/Lib/ThreadItem.php:149
-msgid "Edit"
-msgstr "Изменить"
+#: ../../Zotlabs/Module/Apps.php:54
+msgid "Create Custom App"
+msgstr "Создать пользователь�кое приложение"
 
-#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
-#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533
-msgid "Image/photo"
-msgstr "Изображение / фотографи�"
+#: ../../Zotlabs/Module/Follow.php:93
+msgid "Connection added."
+msgstr "Контакт добавлен."
 
-#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550
-msgid "Encrypted content"
-msgstr "Зашифрованное �одержание"
+#: ../../Zotlabs/Module/Like.php:106
+msgid "Like/Dislike"
+msgstr "�равит�� / не нравит��"
 
-#: ../../include/bbcode.php:334
-#, php-format
-msgid "Install %1$s element %2$s"
-msgstr "У�тановить %1$s �лемент %2$s"
+#: ../../Zotlabs/Module/Like.php:112
+msgid "This action is restricted to members."
+msgstr "Это дей�твие до�тупно только уча�тникам."
 
-#: ../../include/bbcode.php:338
-#, php-format
+#: ../../Zotlabs/Module/Like.php:113
 msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Эта публикаци� �одержит у�танавливаемый %s �лемент, однако у ва� нет разрешений дл� его у�тановки на �том �айте."
-
-#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:43
-msgid "webpage"
-msgstr "веб-�траница"
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
+msgstr "Пожалуй�та, дл� продолжени� <a href=\"rmagic\"> войдите � вашим $Projectname ID</a> или <a href=\"register\">зареги�трируйте�ь как новый уча�тник $Projectname</a>."
 
-#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:53
-msgid "layout"
-msgstr "шаблон"
+#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
+#: ../../Zotlabs/Module/Like.php:230
+msgid "Invalid request."
+msgstr "�еверный запро�."
 
-#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:48
-msgid "block"
-msgstr "заблокировать"
+#: ../../Zotlabs/Module/Like.php:178 ../../include/conversation.php:135
+msgid "channel"
+msgstr "канал"
 
-#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:60
-msgid "menu"
-msgstr "меню"
+#: ../../Zotlabs/Module/Like.php:207
+msgid "thing"
+msgstr "предмет"
 
-#: ../../include/bbcode.php:551
-msgid "card"
-msgstr "карточка"
+#: ../../Zotlabs/Module/Like.php:253
+msgid "Channel unavailable."
+msgstr "Канал недо�тупен."
 
-#: ../../include/bbcode.php:553
-msgid "article"
-msgstr "�тать�"
+#: ../../Zotlabs/Module/Like.php:289
+msgid "Previous action reversed."
+msgstr "Предыдущее дей�твие отменено."
 
-#: ../../include/bbcode.php:559 ../../include/markdown.php:202
+#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3281
+#: ../../include/conversation.php:174
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2165
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1567
 #, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s была �оздана %2$s %3$s"
-
-#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
-msgid "Click to open/close"
-msgstr "�ажмите, чтобы открыть/закрыть"
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s нравит�� %3$s %2$s"
 
-#: ../../include/bbcode.php:644 ../../include/markdown.php:255
-msgid "spoiler"
-msgstr "�пойлер"
+#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3283
+#: ../../include/conversation.php:177
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2167
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s не нравит�� %2$s %3$s"
 
-#: ../../include/bbcode.php:657
-msgid "View article"
-msgstr "Про�мотр �татьи"
+#: ../../Zotlabs/Module/Like.php:475
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr "%1$s �огла�ен � %2$s %3$s"
 
-#: ../../include/bbcode.php:657
-msgid "View summary"
-msgstr "Про�мотр резюме"
+#: ../../Zotlabs/Module/Like.php:477
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr "%1$s не �огла�ен � %2$s %3$s"
 
-#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1217
-#: ../../Zotlabs/Lib/NativeWikiPage.php:618
-msgid "Different viewers will see this text differently"
-msgstr "Различные зрители увид�т �тот тек�т по-разному"
+#: ../../Zotlabs/Module/Like.php:479
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr "%1$s воздерживает�� от решени� по %2$s%3$s"
 
-#: ../../include/bbcode.php:1501
-msgid "$1 wrote:"
-msgstr "$1 пи�ал:"
+#: ../../Zotlabs/Module/Like.php:481
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2200
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s по�ещает %2$s%3$s"
 
-#: ../../include/channel.php:47
-msgid "Unable to obtain identity information from database"
-msgstr "�евозможно получить идентификационную информацию из базы данных"
+#: ../../Zotlabs/Module/Like.php:483
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2202
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s не по�ещает %2$s%3$s"
 
-#: ../../include/channel.php:80
-msgid "Empty name"
-msgstr "Пу�тое им�"
+#: ../../Zotlabs/Module/Like.php:485
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2204
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s может по�етить %2$s%3$s"
 
-#: ../../include/channel.php:83
-msgid "Name too long"
-msgstr "Слишком длинное им�"
+#: ../../Zotlabs/Module/Like.php:586
+msgid "Action completed."
+msgstr "Дей�твие завершено."
 
-#: ../../include/channel.php:200
-msgid "No account identifier"
-msgstr "Идентификатор аккаунта от�ут�твует"
+#: ../../Zotlabs/Module/Like.php:587
+msgid "Thank you."
+msgstr "Спа�ибо."
 
-#: ../../include/channel.php:212 ../../Zotlabs/Module/Register.php:95
-msgid "Nickname is required."
-msgstr "Требует�� п�евдоним."
+#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Этот параметр требует �пециальной обработки и редактировани� и был заблокирован."
 
-#: ../../include/channel.php:226 ../../include/channel.php:706
-#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
-msgid "Reserved nickname. Please choose another."
-msgstr "Зарезервированый п�евдоним. Пожалуй�та, выберите другой."
+#: ../../Zotlabs/Module/Pconfig.php:57
+msgid "Configuration Editor"
+msgstr "Редактор конфигурации"
 
-#: ../../include/channel.php:231 ../../include/channel.php:711
-#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51
+#: ../../Zotlabs/Module/Pconfig.php:58
 msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "П�евдоним имеет недопу�тимые �имволы или уже и�пользует�� на �том �айте."
-
-#: ../../include/channel.php:295
-msgid "Unable to retrieve created identity"
-msgstr "�е удает�� получить �озданный идентификатор"
-
-#: ../../include/channel.php:442
-msgid "Default Profile"
-msgstr "Профиль по умолчанию"
-
-#: ../../include/channel.php:639 ../../include/channel.php:728
-msgid "Unable to retrieve modified identity"
-msgstr "�е удает�� найти изменённый идентификатор"
-
-#: ../../include/channel.php:1410
-msgid "Requested channel is not available."
-msgstr "Запрошенный канал не до�тупен."
-
-#: ../../include/channel.php:1556 ../../Zotlabs/Module/Profiles.php:730
-msgid "Change profile photo"
-msgstr "Изменить фотографию профил�"
+"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 "Предупреждение. Изменение некоторых на�троек может приве�ти к неработо�по�обно�ти вашего канала. Пожалуй�та, покиньте �ту �траницу, е�ли вы точно не знаете, как правильно и�пользовать �ту функцию."
 
-#: ../../include/channel.php:1564
-msgid "Create New Profile"
-msgstr "Создать новый профиль"
+#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:128
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Вы �оздали %1$.0f из %2$.0f возможных каналов."
 
-#: ../../include/channel.php:1582 ../../Zotlabs/Module/Profiles.php:822
-msgid "Profile Image"
-msgstr "Изображение профил�"
+#: ../../Zotlabs/Module/New_channel.php:159
+msgid "Your real name is recommended."
+msgstr "Рекомендует�� и�пользовать ваше на�то�щее им�."
 
-#: ../../include/channel.php:1585
-msgid "Visible to everybody"
-msgstr "Видно в�ем"
+#: ../../Zotlabs/Module/New_channel.php:160
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
+msgstr "Примеры: \"Иван Иванов\", \"Ок�ана и кони\", \"Футбол\", \"Тимур и его команда\""
 
-#: ../../include/channel.php:1586 ../../Zotlabs/Module/Profiles.php:727
-#: ../../Zotlabs/Module/Profiles.php:826
-msgid "Edit visibility"
-msgstr "Редактировать видимо�ть"
+#: ../../Zotlabs/Module/New_channel.php:165
+msgid ""
+"This will be used to create a unique network address (like an email address)."
+msgstr "Это будет и�пользовано дл� �оздани� уникального �етевого адре�а (наподобие email)."
 
-#: ../../include/channel.php:1662 ../../include/channel.php:1790
-msgid "Gender:"
-msgstr "Пол:"
+#: ../../Zotlabs/Module/New_channel.php:167
+msgid "Allowed characters are a-z 0-9, - and _"
+msgstr "Разрешённые �имволы a-z 0-9, - и _"
 
-#: ../../include/channel.php:1663 ../../include/channel.php:1834
-msgid "Status:"
-msgstr "Стату�:"
+#: ../../Zotlabs/Module/New_channel.php:175
+msgid "Channel name"
+msgstr "�азвание канала"
 
-#: ../../include/channel.php:1664 ../../include/channel.php:1858
-msgid "Homepage:"
-msgstr "Домашн�� �траница:"
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid ""
+"Select a channel permission role compatible with your usage needs and "
+"privacy requirements."
+msgstr "Выберите разрешени� дл� канала в �оответ�твии � вашими потребно�т�ми и требовани�ми безопа�но�ти."
 
-#: ../../include/channel.php:1665
-msgid "Online Now"
-msgstr "Сейча� в �ети"
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid "Read more about channel permission roles"
+msgstr "Прочитать больше о разрешени�х дл� каналов"
 
-#: ../../include/channel.php:1718
-msgid "Change your profile photo"
-msgstr "Изменить фотографию вашего профил�"
+#: ../../Zotlabs/Module/New_channel.php:181
+msgid "Create a Channel"
+msgstr "Создать канал"
 
-#: ../../include/channel.php:1749
-msgid "Trans"
-msgstr "Тран�ек�уал"
+#: ../../Zotlabs/Module/New_channel.php:182
+msgid ""
+"A channel is a unique network identity. It can represent a person (social "
+"network profile), a forum (group), a business or celebrity page, a newsfeed, "
+"and many other things."
+msgstr "Канал �то уникальна� �етева� идентично�ть. Он может пред�тавл�ть человека (профиль в �оциальной �ети), форум или группу, бизне� или �траницу знаменито�ти, ново�тную ленту и многие другие вещи."
 
-#: ../../include/channel.php:1788 ../../Zotlabs/Module/Settings/Channel.php:501
-msgid "Full Name:"
-msgstr "Полное им�:"
+#: ../../Zotlabs/Module/New_channel.php:183
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "или <a href=\"import\">импортировать �уще�твующий канал</a> из другого ме�та."
 
-#: ../../include/channel.php:1795
-msgid "Like this channel"
-msgstr "нравит�� �тот канал"
+#: ../../Zotlabs/Module/New_channel.php:188
+msgid "Validate"
+msgstr "Проверить"
 
-#: ../../include/channel.php:1819
-msgid "j F, Y"
-msgstr ""
+#: ../../Zotlabs/Module/Cards.php:51
+msgid "Cards App"
+msgstr "Приложение \"Карточки\""
 
-#: ../../include/channel.php:1820
-msgid "j F"
-msgstr ""
+#: ../../Zotlabs/Module/Cards.php:52
+msgid "Create personal planning cards"
+msgstr "Создать личные карточки планировани�"
 
-#: ../../include/channel.php:1827
-msgid "Birthday:"
-msgstr "День рождени�:"
+#: ../../Zotlabs/Module/Cards.php:112
+msgid "Add Card"
+msgstr "Добавить карточку"
 
-#: ../../include/channel.php:1831 ../../Zotlabs/Module/Directory.php:349
-msgid "Age:"
-msgstr "Возра�т:"
+#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:327
+#: ../../include/nav.php:501
+msgid "Cards"
+msgstr "Карточки"
 
-#: ../../include/channel.php:1840
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "дл� %1$d %2$s"
+#: ../../Zotlabs/Module/Menu.php:68
+msgid "Unable to update menu."
+msgstr "�евозможно обновить меню."
 
-#: ../../include/channel.php:1852
-msgid "Tags:"
-msgstr "Теги:"
+#: ../../Zotlabs/Module/Menu.php:79
+msgid "Unable to create menu."
+msgstr "�евозможно �оздать меню."
 
-#: ../../include/channel.php:1856
-msgid "Sexual Preference:"
-msgstr "Сек�уальные предпочтени�:"
+#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
+msgid "Menu Name"
+msgstr "�азвание меню"
 
-#: ../../include/channel.php:1860 ../../Zotlabs/Module/Directory.php:367
-msgid "Hometown:"
-msgstr "Родной город:"
+#: ../../Zotlabs/Module/Menu.php:161
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Уникальное название (не видимо на �транице) - требует��"
 
-#: ../../include/channel.php:1862
-msgid "Political Views:"
-msgstr "Политиче�кие взгл�ды:"
+#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
+msgid "Menu Title"
+msgstr "Заголовок меню"
 
-#: ../../include/channel.php:1864
-msgid "Religion:"
-msgstr "Религи�:"
+#: ../../Zotlabs/Module/Menu.php:162
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Видимо�ть на �транице - о�тавьте пу�тым е�ли не хотите иметь заголовок"
 
-#: ../../include/channel.php:1866 ../../Zotlabs/Module/Directory.php:369
-msgid "About:"
-msgstr "О �ебе:"
+#: ../../Zotlabs/Module/Menu.php:163
+msgid "Allow Bookmarks"
+msgstr "Разрешить закладки"
 
-#: ../../include/channel.php:1868
-msgid "Hobbies/Interests:"
-msgstr "Хобби / интере�ы:"
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Меню может и�пользовать��, чтобы �охранить закладки"
 
-#: ../../include/channel.php:1870
-msgid "Likes:"
-msgstr "Что вам нравит��:"
+#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
+msgid "Submit and proceed"
+msgstr "Отправить и обработать"
 
-#: ../../include/channel.php:1872
-msgid "Dislikes:"
-msgstr "Что вам не нравит��:"
+#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2674
+msgid "Menus"
+msgstr "Меню"
 
-#: ../../include/channel.php:1874
-msgid "Contact information and Social Networks:"
-msgstr "Контактна� информаци� и �оциальные �ети:"
+#: ../../Zotlabs/Module/Menu.php:181
+msgid "Bookmarks allowed"
+msgstr "Закладки разрешены"
 
-#: ../../include/channel.php:1876
-msgid "My other channels:"
-msgstr "Мои другие каналы:"
+#: ../../Zotlabs/Module/Menu.php:183
+msgid "Delete this menu"
+msgstr "Удалить �то меню"
 
-#: ../../include/channel.php:1878
-msgid "Musical interests:"
-msgstr "Музыкальные интере�ы:"
+#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
+msgid "Edit menu contents"
+msgstr "Редактировать �одержание меню"
 
-#: ../../include/channel.php:1880
-msgid "Books, literature:"
-msgstr "Книги, литература:"
+#: ../../Zotlabs/Module/Menu.php:185
+msgid "Edit this menu"
+msgstr "Редактировать �то меню"
 
-#: ../../include/channel.php:1882
-msgid "Television:"
-msgstr "Телевидение:"
+#: ../../Zotlabs/Module/Menu.php:201
+msgid "Menu could not be deleted."
+msgstr "Меню не может быть удалено."
 
-#: ../../include/channel.php:1884
-msgid "Film/dance/culture/entertainment:"
-msgstr "Кино / танцы / культура / развлечени�:"
+#: ../../Zotlabs/Module/Menu.php:209 ../../Zotlabs/Module/Mitem.php:31
+msgid "Menu not found."
+msgstr "Меню не найдено"
 
-#: ../../include/channel.php:1886
-msgid "Love/Romance:"
-msgstr "Любовь / романтика:"
+#: ../../Zotlabs/Module/Menu.php:214
+msgid "Edit Menu"
+msgstr "Редактировать меню"
 
-#: ../../include/channel.php:1888
-msgid "Work/employment:"
-msgstr "Работа / зан�то�ть:"
+#: ../../Zotlabs/Module/Menu.php:218
+msgid "Add or remove entries to this menu"
+msgstr "Добавить или удалить пункты �того меню"
 
-#: ../../include/channel.php:1890
-msgid "School/education:"
-msgstr "Школа / образование:"
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Menu name"
+msgstr "�азвание меню"
 
-#: ../../include/channel.php:1911 ../../Zotlabs/Module/Profperm.php:113
-#: ../../Zotlabs/Lib/Apps.php:362
-msgid "Profile"
-msgstr "Профиль"
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Must be unique, only seen by you"
+msgstr "Должно быть уникальным (видно только вам)"
 
-#: ../../include/channel.php:1913
-msgid "Like this thing"
-msgstr "нравит�� �тo"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title"
+msgstr "Заголовок меню"
 
-#: ../../include/channel.php:1914 ../../Zotlabs/Module/Events.php:699
-msgid "Export"
-msgstr "Эк�порт"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title as seen by others"
+msgstr "Видимый другими заголовок меню"
 
-#: ../../include/channel.php:2353 ../../Zotlabs/Module/Cover_photo.php:304
-msgid "cover photo"
-msgstr "фотографи� обложки"
+#: ../../Zotlabs/Module/Menu.php:222
+msgid "Allow bookmarks"
+msgstr "Разрешить закладки"
 
-#: ../../include/channel.php:2622 ../../Zotlabs/Module/Rmagic.php:96
-#: ../../boot.php:1717
-msgid "Remote Authentication"
-msgstr "Удаленна� аутентификаци�"
+#: ../../Zotlabs/Module/Pubstream.php:20
+msgid "Public Stream App"
+msgstr "Приложение \"Публичный поток\""
 
-#: ../../include/channel.php:2623 ../../Zotlabs/Module/Rmagic.php:97
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Введите адре� вашего канала (например: channel@example.com)"
+#: ../../Zotlabs/Module/Pubstream.php:21
+msgid "The unmoderated public stream of this hub"
+msgstr "�емодерируемый публичный поток � �того хаба"
 
-#: ../../include/channel.php:2624 ../../Zotlabs/Module/Rmagic.php:98
-msgid "Authenticate"
-msgstr "Проверка подлинно�ти"
+#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:376
+#: ../../Zotlabs/Widget/Notifications.php:147
+msgid "Public Stream"
+msgstr "Публичный поток"
 
-#: ../../include/channel.php:2782 ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Zotlabs/Module/Search.php:250
 #, php-format
-msgid "Account '%s' deleted"
-msgstr "�ккаунт '%s' удален"
-
-#: ../../include/acl_selectors.php:33
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
-msgid "Visible to your default audience"
-msgstr "Видно вашей аудитории по умолчанию."
-
-#: ../../include/acl_selectors.php:100
-msgid "Profile-Based Privacy Groups"
-msgstr "Группы конфиденциально�ти о�нованные на профиле"
-
-#: ../../include/acl_selectors.php:119
-msgid "Private Forum"
-msgstr "Ча�тный форум"
-
-#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Forums.php:100
-#: ../../Zotlabs/Widget/Activity_filter.php:123
-#: ../../Zotlabs/Widget/Notifications.php:139
-#: ../../Zotlabs/Widget/Notifications.php:140
-msgid "Forums"
-msgstr "Форумы"
-
-#: ../../include/acl_selectors.php:136
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-msgid "Only me"
-msgstr "Только мне"
-
-#: ../../include/acl_selectors.php:143
-msgid "Share with"
-msgstr "Поделить�� �"
-
-#: ../../include/acl_selectors.php:144
-msgid "Custom selection"
-msgstr "�а�траиваемый выбор"
-
-#: ../../include/acl_selectors.php:146
-msgid ""
-"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and "
-"limit the scope of \"Allow\"."
-msgstr "Выберите \"Разрешить\" дл� разрешени� про�мотра. \"�е разрешать\" позвол�ет вам переопределить и ограничить разрешени�."
-
-#: ../../include/acl_selectors.php:147 ../../Zotlabs/Module/Authorize.php:32
-msgid "Allow"
-msgstr "Разрешить"
-
-#: ../../include/acl_selectors.php:148
-msgid "Don't allow"
-msgstr "�е разрешать"
+msgid "Items tagged with: %s"
+msgstr "Объекты помечены как: %s"
 
-#: ../../include/acl_selectors.php:181
+#: ../../Zotlabs/Module/Search.php:252
 #, 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."
-msgstr "Разрешени� публикации %s не могут быть изменены %s по�ле того, как ею поделили�ь. Эти разрешени� у�танавливают кому разрешено про�матривать �ту публикацию."
-
-#: ../../include/oembed.php:153
-msgid "View PDF"
-msgstr "Про�мотреть PDF"
-
-#: ../../include/oembed.php:365
-msgid " by "
-msgstr " из "
-
-#: ../../include/oembed.php:366
-msgid " on "
-msgstr " на "
-
-#: ../../include/oembed.php:395
-msgid "Embedded content"
-msgstr "В�троенное �одержимое"
-
-#: ../../include/oembed.php:404
-msgid "Embedding disabled"
-msgstr "В�траивание отключено"
-
-#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:163
-msgid "Directory Options"
-msgstr "Параметры каталога"
-
-#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:165
-msgid "Safe Mode"
-msgstr "Безопа�ный режим"
+msgid "Search results for: %s"
+msgstr "Результаты пои�ка дл�: %s"
 
-#: ../../include/dir_fns.php:145 ../../Zotlabs/Lib/Libzotdir.php:166
-msgid "Public Forums Only"
-msgstr "Только публичные форумы"
+#: ../../Zotlabs/Module/Authorize.php:17
+msgid "Unknown App"
+msgstr "�еизве�тное приложение"
 
-#: ../../include/dir_fns.php:146 ../../Zotlabs/Lib/Libzotdir.php:168
-msgid "This Website Only"
-msgstr "Только �тот веб-�айт"
+#: ../../Zotlabs/Module/Authorize.php:29
+msgid "Authorize"
+msgstr "�вторизовать"
 
-#: ../../include/zid.php:360
+#: ../../Zotlabs/Module/Authorize.php:30
 #, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr "OpenWebAuth: %1$s привет�твует %2$s"
-
-#: ../../include/message.php:41
-msgid "Unable to determine sender."
-msgstr "�евозможно определить отправител�."
-
-#: ../../include/message.php:80
-msgid "No recipient provided."
-msgstr "Получатель не предо�тавлен."
-
-#: ../../include/message.php:85
-msgid "[no subject]"
-msgstr "[без темы]"
-
-#: ../../include/message.php:214
-msgid "Stored post could not be verified."
-msgstr "Сохранённа� публикаци� не может быть проверена."
-
-#: ../../Zotlabs/Widget/Activity_order.php:90
-msgid "Commented Date"
-msgstr "По комментари�м"
-
-#: ../../Zotlabs/Widget/Activity_order.php:94
-msgid "Order by last commented date"
-msgstr "Сортировка по дате по�леднего комментари�"
-
-#: ../../Zotlabs/Widget/Activity_order.php:97
-msgid "Posted Date"
-msgstr "По публикаци�м"
-
-#: ../../Zotlabs/Widget/Activity_order.php:101
-msgid "Order by last posted date"
-msgstr "Сортировка по дате по�ледней публикации"
-
-#: ../../Zotlabs/Widget/Activity_order.php:104
-msgid "Date Unthreaded"
-msgstr "По пор�дку"
-
-#: ../../Zotlabs/Widget/Activity_order.php:108
-msgid "Order unthreaded by date"
-msgstr "Сортировка в пор�дке по�туплени�"
-
-#: ../../Zotlabs/Widget/Activity_order.php:123
-msgid "Stream Order"
-msgstr "Упор�дочить поток"
-
-#: ../../Zotlabs/Widget/Archive.php:43
-msgid "Archives"
-msgstr "�рхивы"
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:34
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
-msgid "Add new page"
-msgstr "Добавить новую �траницу"
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:41
-#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:166
-msgid "Options"
-msgstr "Параметры"
+msgid "Do you authorize the app %s to access your channel data?"
+msgstr "�вторизуете ли вы приложение %s дл� до�тупа к данным вашего канала?"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:85
-msgid "Wiki Pages"
-msgstr "Wiki �траницы"
+#: ../../Zotlabs/Module/Authorize.php:32 ../../include/acl_selectors.php:147
+msgid "Allow"
+msgstr "Разрешить"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
-msgid "Page name"
-msgstr "�азвание �траницы"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
+msgstr "Редактировать шаблон"
 
-#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87
-#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:787
-#: ../../Zotlabs/Module/Photos.php:1333
-msgid "View Photo"
-msgstr "По�мотреть фотографию"
+#: ../../Zotlabs/Module/Rbmark.php:93
+msgid "Select a bookmark folder"
+msgstr "Выбрать каталог дл� закладок"
 
-#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Module/Embedphotos.php:187 ../../Zotlabs/Module/Photos.php:818
-msgid "Edit Album"
-msgstr "Редактировать Фотоальбом"
+#: ../../Zotlabs/Module/Rbmark.php:98
+msgid "Save Bookmark"
+msgstr "Сохранить закладку"
 
-#: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Cdav.php:146
-#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
-#: ../../Zotlabs/Module/Embedphotos.php:189
-#: ../../Zotlabs/Module/Profile_photo.php:500
-#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:688
-#: ../../Zotlabs/Storage/Browser.php:540
-msgid "Upload"
-msgstr "Загрузка"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "URL of bookmark"
+msgstr "URL закладки"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
-msgstr "Задачи"
+#: ../../Zotlabs/Module/Rbmark.php:104
+msgid "Or enter new bookmark folder name"
+msgstr "или введите новое им� каталога закладок"
 
-#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:25
-msgid "Public Hubs"
-msgstr "Публичные хабы"
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "About this site"
+msgstr "Об �том �айте"
 
-#: ../../Zotlabs/Widget/Conversations.php:17
-msgid "Received Messages"
-msgstr "Полученные �ообщени�"
+#: ../../Zotlabs/Module/Siteinfo.php:22
+msgid "Site Name"
+msgstr "�азвание �айта"
 
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Sent Messages"
-msgstr "Отправленные �ообщени�"
+#: ../../Zotlabs/Module/Siteinfo.php:26
+msgid "Administrator"
+msgstr "�дмини�тратор"
 
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Conversations"
-msgstr "Бе�еды"
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "Software and Project information"
+msgstr "Информаци� о программном обе�печении и проекте"
 
-#: ../../Zotlabs/Widget/Conversations.php:37
-msgid "No messages."
-msgstr "Сообщений нет."
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid "This site is powered by $Projectname"
+msgstr "Этот �айт работает на $Projectname"
 
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
-msgstr "Удалить бе�еду"
+#: ../../Zotlabs/Module/Siteinfo.php:31
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr "Объединенные и децентрализованные �ети и �лужбы идентификациии обе�печивают�� Zot"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
-msgid "Chat Members"
-msgstr "Уча�тники чата"
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Additional federated transport protocols:"
+msgstr "Дополнительные федеративные тран�портные протоколы:"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
-msgid "I will attend"
-msgstr "Я буду уча�твовать"
+#: ../../Zotlabs/Module/Siteinfo.php:36
+#, php-format
+msgid "Version %s"
+msgstr "Вер�и� %s"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
-msgid "I will not attend"
-msgstr "Я не буду уча�твовать"
+#: ../../Zotlabs/Module/Siteinfo.php:37
+msgid "Project homepage"
+msgstr "Домашн�� �траница проекта"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
-msgid "I might attend"
-msgstr "Я возможно буду при�ут�твовать"
+#: ../../Zotlabs/Module/Siteinfo.php:38
+msgid "Developer homepage"
+msgstr "Домашн�� �траница разработчика"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
-msgid "I agree"
-msgstr "Я �огла�ен"
+#: ../../Zotlabs/Module/Notes.php:56
+msgid "Notes App"
+msgstr "Приложение \"Запи�ки\""
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
-msgid "I disagree"
-msgstr "Я не �огла�ен"
+#: ../../Zotlabs/Module/Notes.php:57
+msgid "A simple notes app with a widget (note: notes are not encrypted)"
+msgstr "Про�тое приложение дл� запи�ок � виджетом (примечание: запи�ки не зашифрованы)"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
-msgid "I abstain"
-msgstr "Я воздержал��"
+#: ../../Zotlabs/Module/Thing.php:122
+msgid "Thing updated"
+msgstr "Обновлено"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
-msgid "Share This"
-msgstr "Поделить�� �тим"
+#: ../../Zotlabs/Module/Thing.php:174
+msgid "Object store: failed"
+msgstr "Хранлищие объектов: неудача"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
-msgid "share"
-msgstr "поделить��"
+#: ../../Zotlabs/Module/Thing.php:178
+msgid "Thing added"
+msgstr "Добавлено"
 
-#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
+#: ../../Zotlabs/Module/Thing.php:204
 #, php-format
-msgid "View %s's profile - %s"
-msgstr "Про�мотр профил� %s - %s"
-
-#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Lib/ThreadItem.php:414
-msgid "via"
-msgstr "через"
-
-#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:445
-msgid "Attendance Options"
-msgstr "Параметры по�ещаемо�ти"
-
-#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:447
-msgid "Voting Options"
-msgstr "Параметры голо�овани�"
-
-#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:471
-msgid "Pinned post"
-msgstr "Прикреплённа� заметка"
-
-#: ../../Zotlabs/Widget/Pinned.php:156
-msgid "Don't show"
-msgstr "�е показывать"
-
-#: ../../Zotlabs/Widget/Activity.php:50
-msgctxt "widget"
-msgid "Activity"
-msgstr "�ктивно�ть"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr ""
 
-#: ../../Zotlabs/Widget/Cdav.php:37
-msgid "Select Channel"
-msgstr "Выбрать канал"
+#: ../../Zotlabs/Module/Thing.php:267
+msgid "Show Thing"
+msgstr "Показать"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
-msgid "Read-write"
-msgstr "Чтение-запи�ь"
+#: ../../Zotlabs/Module/Thing.php:274
+msgid "item not found."
+msgstr "Элемент не найден."
 
-#: ../../Zotlabs/Widget/Cdav.php:43
-msgid "Read-only"
-msgstr "Только чтение"
+#: ../../Zotlabs/Module/Thing.php:307
+msgid "Edit Thing"
+msgstr "Редактировать"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
-msgid "Channel Calendar"
-msgstr "Календарь канала"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
+msgid "Select a profile"
+msgstr "Выбрать профиль"
 
-#: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143
-#: ../../Zotlabs/Module/Cdav.php:1056
-msgid "CalDAV Calendars"
-msgstr "Календари CalDAV"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Post an activity"
+msgstr "Опубликовать меропри�тие"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
-msgid "Shared CalDAV Calendars"
-msgstr "Общие календари CalDAV"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Отправл�ть только подход�щий профиль"
 
-#: ../../Zotlabs/Widget/Cdav.php:135
-msgid "Share this calendar"
-msgstr "Поделить�� �тим календарём"
+#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
+msgid "Name of thing e.g. something"
+msgstr "�аименование, например \"нечто\""
 
-#: ../../Zotlabs/Widget/Cdav.php:137
-msgid "Calendar name and color"
-msgstr "Им� и цвет календар�"
+#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
+msgid "URL of thing (optional)"
+msgstr "URL (необ�зательно)"
 
-#: ../../Zotlabs/Widget/Cdav.php:139
-msgid "Create new CalDAV calendar"
-msgstr "Создать новый календарь CalDAV"
+#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
+msgid "URL for photo of thing (optional)"
+msgstr "URL дл� фотографии (необ�зательно)"
 
-#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
-#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388
-#: ../../Zotlabs/Module/Webpages.php:254
-#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Menu.php:182
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Layouts.php:185
-#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
-msgid "Create"
-msgstr "Создать"
+#: ../../Zotlabs/Module/Thing.php:364
+msgid "Add Thing to your Profile"
+msgstr "Добавить к вашему профилю"
 
-#: ../../Zotlabs/Widget/Cdav.php:141
-msgid "Calendar Name"
-msgstr "Им� календар�"
+#: ../../Zotlabs/Module/Email_validation.php:36
+msgid "Email Verification Required"
+msgstr "Требует�� проверка адре�а email"
 
-#: ../../Zotlabs/Widget/Cdav.php:142
-msgid "Calendar Tools"
-msgstr "Ин�трументы календар�"
+#: ../../Zotlabs/Module/Email_validation.php:37
+#, php-format
+msgid ""
+"A verification token was sent to your email address [%s]. Enter that token "
+"here to complete the account verification step. Please allow a few minutes "
+"for delivery, and check your spam folder if you do not see the message."
+msgstr "Проверочный токен был отправлен на ваш адре� �лектронной почты [%s]. Введите �тот токен зде�ь дл� завершени� �тапа проверки учётной запи�и. Пожалуй�та, подождите не�колько минут дл� завершени� до�тавки и проверьте вашу папку \"Спам\" е�ли вы не видите пи�ьма."
 
-#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1056
-msgid "Channel Calendars"
-msgstr "Календари канала"
+#: ../../Zotlabs/Module/Email_validation.php:38
+msgid "Resend Email"
+msgstr "Вы�лать повторно"
 
-#: ../../Zotlabs/Widget/Cdav.php:144
-msgid "Import calendar"
-msgstr "Импортировать календарь"
+#: ../../Zotlabs/Module/Email_validation.php:41
+msgid "Validation token"
+msgstr "Проверочный код"
 
-#: ../../Zotlabs/Widget/Cdav.php:145
-msgid "Select a calendar to import to"
-msgstr "Выбрать календарь дл� импорта в"
+#: ../../Zotlabs/Module/Webpages.php:48
+msgid "Webpages App"
+msgstr "Приложение \"Веб-�траницы\""
 
-#: ../../Zotlabs/Widget/Cdav.php:172
-msgid "Addressbooks"
-msgstr "�дре�ные книги"
+#: ../../Zotlabs/Module/Webpages.php:49
+msgid "Provide managed web pages on your channel"
+msgstr "Предо�тавл�ть управл�емые веб-�траницы на Вашем канале"
 
-#: ../../Zotlabs/Widget/Cdav.php:174
-msgid "Addressbook name"
-msgstr "Им� адре�ной книги"
+#: ../../Zotlabs/Module/Webpages.php:69
+msgid "Import Webpage Elements"
+msgstr "Импортировать ча�ти веб-�траницы"
 
-#: ../../Zotlabs/Widget/Cdav.php:176
-msgid "Create new addressbook"
-msgstr "Создать новую адре�ную книгу"
+#: ../../Zotlabs/Module/Webpages.php:70
+msgid "Import selected"
+msgstr "Импортировать выбранное"
 
-#: ../../Zotlabs/Widget/Cdav.php:177
-msgid "Addressbook Name"
-msgstr "Им� адре�ной книги"
+#: ../../Zotlabs/Module/Webpages.php:93
+msgid "Export Webpage Elements"
+msgstr "Эк�портировать ча�ть веб-�траницы"
 
-#: ../../Zotlabs/Widget/Cdav.php:179
-msgid "Addressbook Tools"
-msgstr "Ин�трументы адре�ной книги"
+#: ../../Zotlabs/Module/Webpages.php:94
+msgid "Export selected"
+msgstr "Эк�портировать выбранное"
 
-#: ../../Zotlabs/Widget/Cdav.php:180
-msgid "Import addressbook"
-msgstr "Импортировать адре�ную книгу"
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:342
+#: ../../include/nav.php:524
+msgid "Webpages"
+msgstr "Веб-�траницы"
 
-#: ../../Zotlabs/Widget/Cdav.php:181
-msgid "Select an addressbook to import to"
-msgstr "Выбрать адре�ную книгу дл� импорта в"
+#: ../../Zotlabs/Module/Webpages.php:262
+msgid "Actions"
+msgstr "Дей�тви�"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
-msgid "Remove term"
-msgstr "Удалить термин"
+#: ../../Zotlabs/Module/Webpages.php:263
+msgid "Page Link"
+msgstr "С�ылка �траницы"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
-msgid "Suggested Chatrooms"
-msgstr "Рекомендуемые чаты"
+#: ../../Zotlabs/Module/Webpages.php:264
+msgid "Page Title"
+msgstr "Заголовок �траницы"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:32
-msgid "Account settings"
-msgstr "�а�тройки аккаунта"
+#: ../../Zotlabs/Module/Webpages.php:294
+msgid "Invalid file type."
+msgstr "�еверный тип файла."
 
-#: ../../Zotlabs/Widget/Settings_menu.php:38
-msgid "Channel settings"
-msgstr "�а�тройки канала"
+#: ../../Zotlabs/Module/Webpages.php:306
+msgid "Error opening zip file"
+msgstr "Ошибка открыти� ZIP файла"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:46
-msgid "Display settings"
-msgstr "�а�тройки отображени�"
+#: ../../Zotlabs/Module/Webpages.php:317
+msgid "Invalid folder path."
+msgstr "�еверный путь к каталогу."
 
-#: ../../Zotlabs/Widget/Settings_menu.php:53
-msgid "Manage locations"
-msgstr "Управление ме�тоположением"
+#: ../../Zotlabs/Module/Webpages.php:344
+msgid "No webpage elements detected."
+msgstr "�е обнаружено ча�тей веб-�траницы."
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
-msgid "Overview"
-msgstr "Обзор"
+#: ../../Zotlabs/Module/Webpages.php:419
+msgid "Import complete."
+msgstr "Импорт завершен."
 
-#: ../../Zotlabs/Widget/Suggestions.php:48 ../../Zotlabs/Module/Suggest.php:73
-msgid "Ignore/Hide"
-msgstr "Игнорировать / cкрыть"
+#: ../../Zotlabs/Module/Moderate.php:67
+msgid "Comment approved"
+msgstr "Комментарий одобрен"
 
-#: ../../Zotlabs/Widget/Suggestions.php:53
-msgid "Suggestions"
-msgstr "Рекомендации"
+#: ../../Zotlabs/Module/Moderate.php:71
+msgid "Comment deleted"
+msgstr "Комментарий удалён"
 
-#: ../../Zotlabs/Widget/Suggestions.php:54
-msgid "See more..."
-msgstr "Про�мотреть больше..."
+#: ../../Zotlabs/Module/Rmagic.php:46
+msgid "Authentication failed."
+msgstr "Ошибка аутентификации."
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
-msgid "Bookmarked Chatrooms"
-msgstr "Закладки чатов"
+#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2546
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Введите адре� вашего канала (например: channel@example.com)"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577
-msgctxt "wiki_history"
-msgid "Message"
-msgstr "Сообщение"
+#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2547
+msgid "Authenticate"
+msgstr "Проверка подлинно�ти"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:24
-#: ../../Zotlabs/Lib/NativeWikiPage.php:578
-msgid "Date"
-msgstr "Дата"
+#: ../../Zotlabs/Module/Cal.php:62
+msgid "Permissions denied."
+msgstr "До�туп запрещен."
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:25
-#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579
-msgid "Revert"
-msgstr "Отменить"
+#: ../../Zotlabs/Module/Import.php:162
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Ваш кла�� об�луживани� разрешает только %d каналов."
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:26
-#: ../../Zotlabs/Lib/NativeWikiPage.php:580
-msgid "Compare"
-msgstr "Сравнить"
+#: ../../Zotlabs/Module/Import.php:189
+msgid "No channel. Import failed."
+msgstr "Канала нет. Импорт невозможен."
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
-msgid "HQ Control Panel"
-msgstr "Панель управлени� HQ"
+#: ../../Zotlabs/Module/Import.php:530
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Импорт завершен."
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
-msgid "Create a new post"
-msgstr "Создать новую публикацию"
+#: ../../Zotlabs/Module/Import.php:558
+msgid "You must be logged in to use this feature."
+msgstr "Вы должны войти в �и�тему, чтобы и�пользовать �ту функцию."
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
-msgid "Private Mail Menu"
-msgstr "Меню личной перепи�ки"
+#: ../../Zotlabs/Module/Import.php:563
+msgid "Import Channel"
+msgstr "Импортировать канал"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
-msgid "Combined View"
-msgstr "Комбинированный вид"
+#: ../../Zotlabs/Module/Import.php:564
+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/Widget/Mailmenu.php:20
-msgid "Inbox"
-msgstr "Вход�щие"
+#: ../../Zotlabs/Module/Import.php:566
+msgid "Or provide the old server/hub details"
+msgstr "или предо�тавьте данные �тарого �ервера"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
-msgid "Outbox"
-msgstr "И�ход�щие"
+#: ../../Zotlabs/Module/Import.php:568
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Ваш �тарый адре� канала (xyz@example.com)"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
-msgid "New Message"
-msgstr "�овое �ообщение"
+#: ../../Zotlabs/Module/Import.php:569
+msgid "Your old login email address"
+msgstr "Ваш �тарый адре� �лектронной почты"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
-msgid "photo/image"
-msgstr "фотографи� / изображение"
+#: ../../Zotlabs/Module/Import.php:570
+msgid "Your old login password"
+msgstr "Ваш �тарый пароль"
 
-#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:411
-msgid "Site"
-msgstr "Сайт"
+#: ../../Zotlabs/Module/Import.php:571
+msgid "Import a few months of posts if possible (limited by available memory"
+msgstr "Импортировать не�колько ме��цев публикаций е�ли возможно (ограничено до�тупной пам�тью)"
 
-#: ../../Zotlabs/Widget/Admin.php:23
-#: ../../Zotlabs/Module/Admin/Accounts.php:308
-#: ../../Zotlabs/Module/Admin/Accounts.php:327
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "Accounts"
-msgstr "Учётные запи�и"
+#: ../../Zotlabs/Module/Import.php:573
+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/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
-msgid "Member registrations waiting for confirmation"
-msgstr "Реги�трации уча�тников, ожидающие подверждени�"
+#: ../../Zotlabs/Module/Import.php:575
+msgid "Make this hub my primary location"
+msgstr "Сделать �тот хаб главным"
 
-#: ../../Zotlabs/Widget/Admin.php:24
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:117
-msgid "Channels"
-msgstr "Каналы"
+#: ../../Zotlabs/Module/Import.php:576
+msgid "Move this channel (disable all previous locations)"
+msgstr "Переме�тить �то канал (отключить в�е предыдущие ме�тора�положени�)"
 
-#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Security"
-msgstr "Безопа�но�ть"
+#: ../../Zotlabs/Module/Import.php:577
+msgid "Use this channel nickname instead of the one provided"
+msgstr "И�пользовать п�евдоним �того канала вме�то предо�тавленного"
 
-#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:358
-msgid "Features"
-msgstr "Функции"
+#: ../../Zotlabs/Module/Import.php:577
+msgid ""
+"Leave blank to keep your existing channel nickname. You will be randomly "
+"assigned a similar nickname if either name is already allocated on this site."
+msgstr "О�тавьте пу�тым дл� �охранени� �уще�твующего п�евдонима канала. Вам будет �лучайным образом назначен похожий п�евдоним е�ли такое им� уже выделено на �том �айте."
 
-#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:343
-#: ../../Zotlabs/Module/Admin/Addons.php:441
-msgid "Addons"
-msgstr "Ра�ширени�"
+#: ../../Zotlabs/Module/Import.php:579
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Проце�� может зан�ть не�колько минут. Пожалуй�та, отправьте форму только один раз и о�тавьте �ту �траницу открытой до завершени�."
 
-#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157
-msgid "Themes"
-msgstr "Темы"
+#: ../../Zotlabs/Module/Group.php:46
+msgid "Privacy group created."
+msgstr "Группа конфиденциально�ти �оздана."
 
-#: ../../Zotlabs/Widget/Admin.php:29
-msgid "Inspect queue"
-msgstr "Про�мотр очереди"
+#: ../../Zotlabs/Module/Group.php:49
+msgid "Could not create privacy group."
+msgstr "�е удало�ь �оздать группу конфиденциально�ти."
 
-#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168
-msgid "Profile Fields"
-msgstr "Пол� профил�"
+#: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:214
+#: ../../include/items.php:4241
+msgid "Privacy group not found."
+msgstr "Группа конфиденциально�ти не найдена."
 
-#: ../../Zotlabs/Widget/Admin.php:31
-msgid "DB updates"
-msgstr "Обновление базы данных"
+#: ../../Zotlabs/Module/Group.php:81
+msgid "Privacy group updated."
+msgstr "Группа конфиденциально�ти обновлена."
 
-#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58
-#: ../../Zotlabs/Module/Admin/Logs.php:83
-msgid "Logs"
-msgstr "Журналы"
+#: ../../Zotlabs/Module/Group.php:107
+msgid "Privacy Groups App"
+msgstr "Приложение \"Группы конфиденциально�ти\""
 
-#: ../../Zotlabs/Widget/Admin.php:56
-msgid "Addon Features"
-msgstr "�а�тройки ра�ширений"
+#: ../../Zotlabs/Module/Group.php:108
+msgid "Management of privacy groups"
+msgstr "Управление группами конфиденциально�ти."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:37
-msgid "Direct Messages"
-msgstr "Личные �ообщени�"
+#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154
+#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327
+#: ../../include/nav.php:104 ../../include/acl_selectors.php:87
+msgid "Privacy Groups"
+msgstr "Группы конфиденциально�ти"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:41
-msgid "Show direct (private) messages"
-msgstr "Показать личные (пр�мые) �ообщени�"
+#: ../../Zotlabs/Module/Group.php:143
+msgid "Add Group"
+msgstr "Добавить группу"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:46
-msgid "Events"
-msgstr "Событи�"
+#: ../../Zotlabs/Module/Group.php:147
+msgid "Privacy group name"
+msgstr "Им� группы конфиденциально�ти"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:50
-msgid "Show posts that include events"
-msgstr "Показывать публикации � �обыти�ми"
+#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257
+msgid "Members are visible to other channels"
+msgstr "Уча�тники канала видимые дл� о�тальных"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:56
-msgid "Polls"
-msgstr "Опро�ы"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group removed."
+msgstr "Группа конфиденциально�ти удалена."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:60
-msgid "Show posts that include polls"
-msgstr "Показывать публикации � опро�ами"
+#: ../../Zotlabs/Module/Group.php:186
+msgid "Unable to remove privacy group."
+msgstr "�у удало�ь удалить группу конфиденциально�ти."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:83
+#: ../../Zotlabs/Module/Group.php:252
 #, php-format
-msgid "Show posts related to the %s privacy group"
-msgstr "Показывать публикации отно��щие�� к группе конфиденциально�ти %s"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:92
-msgid "Show my privacy groups"
-msgstr "Показывать мои группы конфиденциально�ти"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:116
-msgid "Show posts to this forum"
-msgstr "Показывать публикации �того форума"
+msgid "Privacy Group: %s"
+msgstr "Группа конфиденциально�ти: %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:127
-msgid "Show forums"
-msgstr "Показывать форумы"
+#: ../../Zotlabs/Module/Group.php:254
+msgid "Privacy group name: "
+msgstr "�азвание группы конфиденциально�ти: "
 
-#: ../../Zotlabs/Widget/Activity_filter.php:141
-msgid "Starred Posts"
-msgstr "Отмеченные публикации"
+#: ../../Zotlabs/Module/Group.php:259
+msgid "Delete Group"
+msgstr "Удалить группу"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:145
-msgid "Show posts that I have starred"
-msgstr "Показывать публикации которые � отметил"
+#: ../../Zotlabs/Module/Group.php:270
+msgid "Group members"
+msgstr "Члены группы"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:156
-msgid "Personal Posts"
-msgstr "Свои публикации"
+#: ../../Zotlabs/Module/Group.php:272
+msgid "Not in this group"
+msgstr "�е в �той группе"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:160
-msgid "Show posts that mention or involve me"
-msgstr "Показывать публикации где вы были упом�нуты или привлечены"
+#: ../../Zotlabs/Module/Group.php:304
+msgid "Click a channel to toggle membership"
+msgstr "�ажмите на канал дл� про�мотра член�тва"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:183
-#, php-format
-msgid "Show posts that I have filed to %s"
-msgstr "Показывать публикации которые � добавил в %s"
+#: ../../Zotlabs/Module/Profile.php:106
+msgid "vcard"
+msgstr "vCard"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
-msgid "Show filed post categories"
-msgstr "Показывать категории добавленных публикаций"
+#: ../../Zotlabs/Module/Connedit.php:121
+msgid "Could not locate selected profile."
+msgstr "�е удало�ь обнаружить выбранный профиль."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:207
-msgid "Panel search"
-msgstr "Панель пои�ка"
+#: ../../Zotlabs/Module/Connedit.php:262
+msgid "Connection updated."
+msgstr "Контакты обновлены."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:217
-msgid "Filter by name"
-msgstr "Отфильтровать по имени"
+#: ../../Zotlabs/Module/Connedit.php:264
+msgid "Failed to update connection record."
+msgstr "�е удало�ь обновить запи�ь контакта."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:232
-msgid "Remove active filter"
-msgstr "Удалить активный фильтр"
+#: ../../Zotlabs/Module/Connedit.php:307
+msgid "is now connected to"
+msgstr "теперь подключён к"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:248
-msgid "Stream Filters"
-msgstr "Фильтры потока"
+#: ../../Zotlabs/Module/Connedit.php:432
+msgid "Could not access address book record."
+msgstr "�е удало�ь получить до�туп к запи�и адре�ной книги."
 
-#: ../../Zotlabs/Widget/Appstore.php:11
-msgid "App Collections"
-msgstr "Коллекции приложений"
+#: ../../Zotlabs/Module/Connedit.php:480
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Обновление невозможно - в на�то�щее врем� канал недо�тупен."
 
-#: ../../Zotlabs/Widget/Appstore.php:13
-msgid "Installed apps"
-msgstr "У�тановленные приложени�"
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
+msgid "Unable to set address book parameters."
+msgstr "�е удало�ь получить до�туп к параметрам адре�ной книги."
 
-#: ../../Zotlabs/Widget/Appstore.php:14 ../../Zotlabs/Module/Apps.php:50
-msgid "Available Apps"
-msgstr "До�тупные приложени�"
+#: ../../Zotlabs/Module/Connedit.php:553
+msgid "Connection has been removed."
+msgstr "Контакт был удалён."
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
-msgstr "Ин�трументы дл� �обытий"
+#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:345
+#: ../../include/nav.php:115 ../../include/conversation.php:1078
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58
+msgid "View Profile"
+msgstr "Про�мотреть профиль"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
-msgstr "Эк�портировать календарь"
+#: ../../Zotlabs/Module/Connedit.php:596
+#, php-format
+msgid "View %s's profile"
+msgstr "Про�мотр %s профил�"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
-msgstr "Импортировать календарь"
+#: ../../Zotlabs/Module/Connedit.php:600
+msgid "Refresh Permissions"
+msgstr "Обновить разрешени�"
 
-#: ../../Zotlabs/Widget/Rating.php:51
-msgid "Rating Tools"
-msgstr "Ин�трументы оценки"
+#: ../../Zotlabs/Module/Connedit.php:603
+msgid "Fetch updated permissions"
+msgstr "Получить обновлённые разрешени�"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
-msgid "Rate Me"
-msgstr "Оценить мен�"
+#: ../../Zotlabs/Module/Connedit.php:607
+msgid "Refresh Photo"
+msgstr "Обновить фотографию"
 
-#: ../../Zotlabs/Widget/Rating.php:60
-msgid "View Ratings"
-msgstr "Про�мотр оценок"
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Fetch updated photo"
+msgstr "Получить обновлённую фотографию"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:65
-msgid "Click to show more"
-msgstr "�ажмите чтобы показать больше"
+#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1088
+msgid "Recent Activity"
+msgstr "По�ледние дей�тви�"
 
-#: ../../Zotlabs/Widget/Follow.php:22
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "У ва� е�ть %1$.0f из %2$.0f разрешенных контактов."
+#: ../../Zotlabs/Module/Connedit.php:617
+msgid "View recent posts and comments"
+msgstr "Про�мотреть по�ледние публикации и комментарии"
 
-#: ../../Zotlabs/Widget/Follow.php:29
-msgid "Add New Connection"
-msgstr "Добавить новый контакт"
+#: ../../Zotlabs/Module/Connedit.php:624
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Блокировать (или разблокировать) �в�зи � �тим контактом"
 
-#: ../../Zotlabs/Widget/Follow.php:30
-msgid "Enter channel address"
-msgstr "Введите адре� канала"
+#: ../../Zotlabs/Module/Connedit.php:625
+msgid "This connection is blocked!"
+msgstr "Этот контакт заблокирован!"
 
-#: ../../Zotlabs/Widget/Follow.php:31
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Пример: ivan@example.com, http://example.com/ivan"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Unignore"
+msgstr "�е игнорировать"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
-msgid "Profile Creation"
-msgstr "Создание профил�"
+#: ../../Zotlabs/Module/Connedit.php:632
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Игнорировать (или не игнорировать) в�е �в�зи дл� �того контакта"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
-msgid "Upload profile photo"
-msgstr "Загрузить фотографию профил�"
+#: ../../Zotlabs/Module/Connedit.php:633
+msgid "This connection is ignored!"
+msgstr "Этот контакт игнорирует��!"
 
-#: ../../Zotlabs/Widget/Newmember.php:34
-msgid "Upload cover photo"
-msgstr "Загрузить фотографию обложки"
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "Unarchive"
+msgstr "Разархивировать"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
-msgid "Find and Connect with others"
-msgstr "�айти и в�тупить в контакт"
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "Archive"
+msgstr "Заархивировать"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
-msgid "View the directory"
-msgstr "Про�мотреть каталог"
+#: ../../Zotlabs/Module/Connedit.php:640
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Заархивировать (или разархивировать) �тот контакт - пометить канал отключённым но �охранить �одержимое"
 
-#: ../../Zotlabs/Widget/Newmember.php:41 ../../Zotlabs/Module/Go.php:38
-msgid "View friend suggestions"
-msgstr "Про�мотр рекомендуемых друзей"
+#: ../../Zotlabs/Module/Connedit.php:641
+msgid "This connection is archived!"
+msgstr "Этот контакт заархивирован!"
 
-#: ../../Zotlabs/Widget/Newmember.php:42
-msgid "Manage your connections"
-msgstr "Управление вашими контактами"
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Unhide"
+msgstr "Показать"
 
-#: ../../Zotlabs/Widget/Newmember.php:45
-msgid "Communicate"
-msgstr "Св�зать��"
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Hide"
+msgstr "Скрыть"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
-msgid "View your channel homepage"
-msgstr "Домашн�� �траница канала"
+#: ../../Zotlabs/Module/Connedit.php:648
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Скрыть или показать �тот контакт от / дл� о�тальных"
 
-#: ../../Zotlabs/Widget/Newmember.php:48
-msgid "View your network stream"
-msgstr "Про�мотреть ваш �етевой поток"
+#: ../../Zotlabs/Module/Connedit.php:649
+msgid "This connection is hidden!"
+msgstr "Этот контакт �крыт!"
 
-#: ../../Zotlabs/Widget/Newmember.php:54
-msgid "Documentation"
-msgstr "Документаци�"
+#: ../../Zotlabs/Module/Connedit.php:656
+msgid "Delete this connection"
+msgstr "Удалить �тот контакт"
 
-#: ../../Zotlabs/Widget/Newmember.php:57
-msgid "Missing Features?"
-msgstr "От�ут�твует функци�?"
+#: ../../Zotlabs/Module/Connedit.php:664
+msgid "Fetch Vcard"
+msgstr "Получить vCard"
 
-#: ../../Zotlabs/Widget/Newmember.php:59
-msgid "Pin apps to navigation bar"
-msgstr "Прикрепить приложение к панели"
+#: ../../Zotlabs/Module/Connedit.php:667
+msgid "Fetch electronic calling card for this connection"
+msgstr "Получить �лектронную телефонную карточку дл� �того контакта"
 
-#: ../../Zotlabs/Widget/Newmember.php:60
-msgid "Install more apps"
-msgstr "У�тановить больше приложений"
+#: ../../Zotlabs/Module/Connedit.php:678
+msgid "Open Individual Permissions section by default"
+msgstr "Открывать раздел \"Индивидуальные разрешени�\" по умолчанию"
 
-#: ../../Zotlabs/Widget/Newmember.php:71
-msgid "View public stream"
-msgstr "Про�мотреть публичный поток"
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Affinity"
+msgstr "Сход�тво"
 
-#: ../../Zotlabs/Widget/Newmember.php:75
-#: ../../Zotlabs/Module/Settings/Display.php:203
-msgid "New Member Links"
-msgstr "С�ылки дл� новичков"
+#: ../../Zotlabs/Module/Connedit.php:704
+msgid "Open Set Affinity section by default"
+msgstr "Открыть �екцию у�тановлени� �ход�тва по умолчанию"
 
-#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:716
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:30
 msgid "Me"
 msgstr "Я"
 
-#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:717
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:31
 msgid "Family"
 msgstr "Семь�"
 
-#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:33
 msgid "Acquaintances"
 msgstr "Знакомые"
 
-#: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97
-#: ../../Zotlabs/Module/Connections.php:111
-#: ../../Zotlabs/Module/Connedit.php:720
-msgid "All"
-msgstr "В�е"
-
-#: ../../Zotlabs/Widget/Affinity.php:54
-msgid "Refresh"
-msgstr "Обновить"
-
-#: ../../Zotlabs/Widget/Notifications.php:16
-msgid "New Network Activity"
-msgstr "�ова� �етева� активно�ть"
-
-#: ../../Zotlabs/Widget/Notifications.php:17
-msgid "New Network Activity Notifications"
-msgstr "�овые уведомлени� о �етевой активно�ти"
-
-#: ../../Zotlabs/Widget/Notifications.php:20
-msgid "View your network activity"
-msgstr "Про�мотреть вашу �етевую активно�ть"
-
-#: ../../Zotlabs/Widget/Notifications.php:23
-#: ../../Zotlabs/Widget/Notifications.php:62
-msgid "Mark all notifications read"
-msgstr "Пометить уведомлени� как прочитанные"
-
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:65
-#: ../../Zotlabs/Widget/Notifications.php:172
-msgid "Show new posts only"
-msgstr "Показывать только новые публикации"
-
-#: ../../Zotlabs/Widget/Notifications.php:27
-#: ../../Zotlabs/Widget/Notifications.php:47
-#: ../../Zotlabs/Widget/Notifications.php:66
-#: ../../Zotlabs/Widget/Notifications.php:142
-#: ../../Zotlabs/Widget/Notifications.php:173
-msgid "Filter by name or address"
-msgstr "Фильтровать по имени или адре�у"
-
-#: ../../Zotlabs/Widget/Notifications.php:36
-msgid "New Home Activity"
-msgstr "�ова� локальна� активно�ть"
-
-#: ../../Zotlabs/Widget/Notifications.php:37
-msgid "New Home Activity Notifications"
-msgstr "�овые уведомлени� локальной активно�ти"
-
-#: ../../Zotlabs/Widget/Notifications.php:40
-msgid "View your home activity"
-msgstr "Про�мотреть локальную активно�ть"
-
-#: ../../Zotlabs/Widget/Notifications.php:43
-#: ../../Zotlabs/Widget/Notifications.php:169
-msgid "Mark all notifications seen"
-msgstr "Пометить уведомлени� как про�мотренные"
-
-#: ../../Zotlabs/Widget/Notifications.php:55
-msgid "New Direct Messages"
-msgstr "�овое �ообщение"
+#: ../../Zotlabs/Module/Connedit.php:741
+msgid "Filter"
+msgstr "Фильтр"
 
-#: ../../Zotlabs/Widget/Notifications.php:56
-msgid "New Direct Messages Notifications"
-msgstr "Уведомлени� о новых �ообщени�х"
+#: ../../Zotlabs/Module/Connedit.php:744
+msgid "Open Custom Filter section by default"
+msgstr "Открывать �екцию \"�а�траиваемый фильтр\" по умолчанию"
 
-#: ../../Zotlabs/Widget/Notifications.php:59
-msgid "View your direct messages"
-msgstr "Про�мотреть ваше �ообщение"
+#: ../../Zotlabs/Module/Connedit.php:781
+msgid "Approve this connection"
+msgstr "Утвердить �тот контакт"
 
-#: ../../Zotlabs/Widget/Notifications.php:74
-msgid "New Mails"
-msgstr "�ова� перепи�ка"
+#: ../../Zotlabs/Module/Connedit.php:781
+msgid "Accept connection to allow communication"
+msgstr "Прин�ть контакт чтобы разрешить �в�зь"
 
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New Mails Notifications"
-msgstr "Уведомлени� о новой перепи�ке"
+#: ../../Zotlabs/Module/Connedit.php:786
+msgid "Set Affinity"
+msgstr "У�тановить �ход�тво"
 
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View your private mails"
-msgstr "Про�мотреть вашу личную перепи�ку"
+#: ../../Zotlabs/Module/Connedit.php:789
+msgid "Set Profile"
+msgstr "У�тановить профиль"
 
-#: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all messages seen"
-msgstr "Пометить �ообщени� как про�мотренные"
+#: ../../Zotlabs/Module/Connedit.php:792
+msgid "Set Affinity & Profile"
+msgstr "У�тановить �ход�тво и профиль"
 
-#: ../../Zotlabs/Widget/Notifications.php:89
-msgid "New Events"
-msgstr "�овые �обыти�"
+#: ../../Zotlabs/Module/Connedit.php:840
+msgid "This connection is unreachable from this location."
+msgstr "Этот контакт недо�тупен дл� данного ме�тоположени�"
 
-#: ../../Zotlabs/Widget/Notifications.php:90
-msgid "New Events Notifications"
-msgstr "Уведомлени� о новых �обыти�х"
+#: ../../Zotlabs/Module/Connedit.php:841
+msgid "This connection may be unreachable from other channel locations."
+msgstr "Этот контакт может быть недо�тупен из других ме�т размещени� канала"
 
-#: ../../Zotlabs/Widget/Notifications.php:93
-msgid "View events"
-msgstr "Про�мотреть �обыти�"
+#: ../../Zotlabs/Module/Connedit.php:843
+msgid "Location independence is not supported by their network."
+msgstr "�езави�имое ме�тоположение не поддерживает�� их �етью."
 
-#: ../../Zotlabs/Widget/Notifications.php:96
-msgid "Mark all events seen"
-msgstr "Пометить в�е �обыти� как про�мотренные"
+#: ../../Zotlabs/Module/Connedit.php:849
+msgid ""
+"This connection is unreachable from this location. Location independence is "
+"not supported by their network."
+msgstr "Этот контакт недо�тупен из данного ме�тоположени�. �езави�имое ме�тоположение не поддерживает�� их �етью."
 
-#: ../../Zotlabs/Widget/Notifications.php:104
-#: ../../Zotlabs/Module/Connections.php:165
-msgid "New Connections"
-msgstr "�овые контакты"
+#: ../../Zotlabs/Module/Connedit.php:852 ../../include/items.php:4274
+#, php-format
+msgid "Connection: %s"
+msgstr "Контакт: %s"
 
-#: ../../Zotlabs/Widget/Notifications.php:105
-msgid "New Connections Notifications"
-msgstr "Уведомлени� о новых контактах"
+#: ../../Zotlabs/Module/Connedit.php:853
+msgid "Connection requests will be approved without your interaction"
+msgstr "Запро�ы контактов будут одобрены без вашего уча�ти�"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
-msgid "View all connections"
-msgstr "Про�мотр в�ех контактов"
+#: ../../Zotlabs/Module/Connedit.php:862
+msgid "This connection's primary address is"
+msgstr "Главный адре� �то контакта"
 
-#: ../../Zotlabs/Widget/Notifications.php:116
-msgid "New Files"
-msgstr "�овые файлы"
+#: ../../Zotlabs/Module/Connedit.php:863
+msgid "Available locations:"
+msgstr "До�тупные ра�положени�:"
 
-#: ../../Zotlabs/Widget/Notifications.php:117
-msgid "New Files Notifications"
-msgstr "Уведомлени� о новых файлах"
+#: ../../Zotlabs/Module/Connedit.php:869
+msgid "Connection Tools"
+msgstr "Ин�трументы контактов"
 
-#: ../../Zotlabs/Widget/Notifications.php:124
-#: ../../Zotlabs/Widget/Notifications.php:125
-msgid "Notices"
-msgstr "Оповещени�"
+#: ../../Zotlabs/Module/Connedit.php:871
+msgid "Slide to adjust your degree of friendship"
+msgstr "Прокрутить дл� на�тройки �тепени дружбы"
 
-#: ../../Zotlabs/Widget/Notifications.php:128
-msgid "View all notices"
-msgstr "Про�мотреть в�е оповещени�"
+#: ../../Zotlabs/Module/Connedit.php:872 ../../include/js_strings.php:20
+msgid "Rating"
+msgstr "Оценка"
 
-#: ../../Zotlabs/Widget/Notifications.php:131
-msgid "Mark all notices seen"
-msgstr "Пометить в�е оповещени� как про�мотренные"
+#: ../../Zotlabs/Module/Connedit.php:873
+msgid "Slide to adjust your rating"
+msgstr "Прокрутить дл� на�тройки оценки"
 
-#: ../../Zotlabs/Widget/Notifications.php:152
-msgid "New Registrations"
-msgstr "�овые реги�трации"
+#: ../../Zotlabs/Module/Connedit.php:874 ../../Zotlabs/Module/Connedit.php:879
+msgid "Optionally explain your rating"
+msgstr "Объ��ните �вою оценку (не об�зательно)"
 
-#: ../../Zotlabs/Widget/Notifications.php:153
-msgid "New Registrations Notifications"
-msgstr "Уведомлени� о новых реги�траци�х"
+#: ../../Zotlabs/Module/Connedit.php:876
+msgid "Custom Filter"
+msgstr "�а�траиваемый фильтр"
 
-#: ../../Zotlabs/Widget/Notifications.php:162
-#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375
-msgid "Public Stream"
-msgstr "Публичный поток"
+#: ../../Zotlabs/Module/Connedit.php:877
+msgid "Only import posts with this text"
+msgstr "Импортировать публикации только � �тим тек�том"
 
-#: ../../Zotlabs/Widget/Notifications.php:163
-msgid "Public Stream Notifications"
-msgstr "Уведомлени� публичного потока"
+#: ../../Zotlabs/Module/Connedit.php:878
+msgid "Do not import posts with this text"
+msgstr "�е импортировать публикации � �тим тек�том"
 
-#: ../../Zotlabs/Widget/Notifications.php:166
-msgid "View the public stream"
-msgstr "Про�мотреть публичный поток"
+#: ../../Zotlabs/Module/Connedit.php:880
+msgid "This information is public!"
+msgstr "Эта информаци� общедо�тупна!"
 
-#: ../../Zotlabs/Widget/Notifications.php:181
-msgid "Sorry, you have got no notifications at the moment"
-msgstr "Извините, но �ейча� у ва� нет уведомлений"
+#: ../../Zotlabs/Module/Connedit.php:885
+msgid "Connection Pending Approval"
+msgstr "Ожидающие подтверждени� контактов"
 
-#: ../../Zotlabs/Module/Tokens.php:39
+#: ../../Zotlabs/Module/Connedit.php:890
 #, php-format
-msgid "This channel is limited to %d tokens"
-msgstr "Этот канал ограничен %d токенами"
-
-#: ../../Zotlabs/Module/Tokens.php:45
-msgid "Name and Password are required."
-msgstr "Требуют�� им� и пароль."
-
-#: ../../Zotlabs/Module/Tokens.php:85
-msgid "Token saved."
-msgstr "Токен �охранён."
-
-#: ../../Zotlabs/Module/Tokens.php:99
-msgid "Guest Access App"
-msgstr "Приложение \"Го�тевой до�туп\""
-
-#: ../../Zotlabs/Module/Tokens.php:100
-msgid "Create access tokens so that non-members can access private content"
-msgstr "Создайте токены до�тупа, чтобы �торонние пользователи могли получить до�туп к ча�тному �одержимому"
-
-#: ../../Zotlabs/Module/Tokens.php:133
-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/Tokens.php:135
 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 "Вы также можете предо�тавить до�туп в �тиле <em>dropbox</em> дл� друзей и коллег, добавив им� и пароль дл� входа на любой URL-адре� �айта. �апример:"
-
-#: ../../Zotlabs/Module/Tokens.php:170
-msgid "Guest Access Tokens"
-msgstr "Токен го�тевого до�тупа"
-
-#: ../../Zotlabs/Module/Tokens.php:177
-msgid "Login Name"
-msgstr "Им�"
-
-#: ../../Zotlabs/Module/Tokens.php:178
-msgid "Login Password"
-msgstr "Пароль"
-
-#: ../../Zotlabs/Module/Tokens.php:179
-msgid "Expires (yyyy-mm-dd)"
-msgstr "Срок дей�тви� (yyyy-mm-dd)"
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Пожалуй�та, выберите профиль который вы хотит показывать в %s при безопа�ном про�мотре."
 
-#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Tokens.php:180
 msgid "Their Settings"
 msgstr "Их на�тройки"
 
-#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:901
-msgid "My Settings"
-msgstr "Мои на�тройки"
-
-#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:896
-msgid "inherited"
-msgstr "на�ледует��"
-
-#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
-#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:903
-msgid "Individual Permissions"
-msgstr "Индивидуальные разрешени�"
-
-#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128
-#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../Zotlabs/Module/Connedit.php:897
 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 "�екоторые разрешени� могут на�ледовать из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> ваших каналов которые могут иметь более вы�окий приоритет чем индивидуальные. Вы <strong>не можете</strong> мен�ть �ти на�тройки зде�ь."
-
-#: ../../Zotlabs/Module/Article_edit.php:17
-#: ../../Zotlabs/Module/Article_edit.php:33
-#: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
-#: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Editpost.php:24
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editlayout.php:79
-msgid "Item not found"
-msgstr "Элемент не найден"
-
-#: ../../Zotlabs/Module/Article_edit.php:44
-#: ../../Zotlabs/Module/Attach_edit.php:52
-#: ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:95
-#: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Attach.php:22
-#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Block.php:41
-msgid "Channel not found."
-msgstr "Канал не найден."
-
-#: ../../Zotlabs/Module/Article_edit.php:128
-msgid "Edit Article"
-msgstr "Редактировать �татью"
-
-#: ../../Zotlabs/Module/Attach_edit.php:69
-#: ../../Zotlabs/Module/Filestorage.php:109
-msgid "File not found."
-msgstr "Файл не найден."
-
-#: ../../Zotlabs/Module/Attach_edit.php:118
-msgid "Can not copy folder into itself."
-msgstr "�евозможно �копировать каталог в �амого �еб�."
-
-#: ../../Zotlabs/Module/Attach_edit.php:131
-#, php-format
-msgid "Can not move folder \"%s\" into itself."
-msgstr "�евозможно �копировать каталог \"%s\" в �амого �еб�."
-
-#: ../../Zotlabs/Module/Network.php:107
-msgid "No such group"
-msgstr "�ет такой группы"
-
-#: ../../Zotlabs/Module/Network.php:156
-msgid "No such channel"
-msgstr "�ет такого канала"
-
-#: ../../Zotlabs/Module/Network.php:168 ../../Zotlabs/Module/Channel.php:221
-msgid "Search Results For:"
-msgstr "Результаты пои�ка дл�:"
-
-#: ../../Zotlabs/Module/Network.php:209 ../../Zotlabs/Module/Channel.php:256
-#: ../../Zotlabs/Module/Hq.php:125 ../../Zotlabs/Module/Pubstream.php:95
-#: ../../Zotlabs/Module/Display.php:76
-msgid "Reset form"
-msgstr "Очи�тить форму"
-
-#: ../../Zotlabs/Module/Network.php:243
-msgid "Privacy group is empty"
-msgstr "Группа конфиденциально�ти пу�та"
-
-#: ../../Zotlabs/Module/Network.php:253
-msgid "Privacy group: "
-msgstr "Группа конфиденциально�ти: "
-
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:69
-msgid "Nothing to import."
-msgstr "�ичего импортировать."
-
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:84
-#: ../../Zotlabs/Module/Import.php:100
-msgid "Unable to download data from old server"
-msgstr "�евозможно загрузить данные �о �тарого �ервера"
-
-#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:107
-msgid "Imported file is empty."
-msgstr "Импортированный файл пу�т."
-
-#: ../../Zotlabs/Module/Import_items.php:93
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Предупреждение: Вер�и� базы данных отличает�� от %1$d обновлени�."
-
-#: ../../Zotlabs/Module/Import_items.php:108
-msgid "Import completed"
-msgstr "Импорт завершён."
-
-#: ../../Zotlabs/Module/Import_items.php:125
-msgid "Import Items"
-msgstr "Импортировать объекты"
-
-#: ../../Zotlabs/Module/Import_items.php:126
-msgid "Use this form to import existing posts and content from an export file."
-msgstr "И�пользуйте �ту форму дл� импорта �уще�твующих публикаций и �одержимого из файла."
-
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:630
-msgid "File to Upload"
-msgstr "Файл дл� загрузки"
-
-#: ../../Zotlabs/Module/Import.php:163
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Ваш кла�� об�луживани� разрешает только %d каналов."
-
-#: ../../Zotlabs/Module/Import.php:190
-msgid "No channel. Import failed."
-msgstr "Канала нет. Импорт невозможен."
-
-#: ../../Zotlabs/Module/Import.php:623
-msgid "You must be logged in to use this feature."
-msgstr "Вы должны войти в �и�тему, чтобы и�пользовать �ту функцию."
-
-#: ../../Zotlabs/Module/Import.php:628
-msgid "Import Channel"
-msgstr "Импортировать канал"
-
-#: ../../Zotlabs/Module/Import.php:629
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
-msgstr "И�пользуйте �ту форм дл� импорта �уще�твующего канала � другого �ервера / хаба. Вы можете получить идентификационные данные канала �о �тарого �ервера / хаба через �еть или предо�тавить файл �к�порта."
-
-#: ../../Zotlabs/Module/Import.php:631
-msgid "Or provide the old server/hub details"
-msgstr "или предо�тавьте данные �тарого �ервера"
-
-#: ../../Zotlabs/Module/Import.php:633
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Ваш �тарый адре� канала (xyz@example.com)"
-
-#: ../../Zotlabs/Module/Import.php:634
-msgid "Your old login email address"
-msgstr "Ваш �тарый адре� �лектронной почты"
-
-#: ../../Zotlabs/Module/Import.php:635
-msgid "Your old login password"
-msgstr "Ваш �тарый пароль"
-
-#: ../../Zotlabs/Module/Import.php:636
-msgid "Import a few months of posts if possible (limited by available memory"
-msgstr "Импортировать не�колько ме��цев публикаций е�ли возможно (ограничено до�тупной пам�тью)"
-
-#: ../../Zotlabs/Module/Import.php:638
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
-msgstr "Дл� любого варианта, пожалуй�та, выберите, �ледует ли �делать �тот хаб вашим новым о�новным адре�ом, или ваше прежнее ме�тоположение должно продолжить выполн�ть �ту роль. Вы �можете отправл�ть �ообщени� из любого ме�тоположени�, но только одно может быть помечено как о�новное ме�то дл� файлов, фотографий и мультимедиа."
-
-#: ../../Zotlabs/Module/Import.php:640
-msgid "Make this hub my primary location"
-msgstr "Сделать �тот хаб главным"
-
-#: ../../Zotlabs/Module/Import.php:641
-msgid "Move this channel (disable all previous locations)"
-msgstr "Переме�тить �то канал (отключить в�е предыдущие ме�тора�положени�)"
-
-#: ../../Zotlabs/Module/Import.php:642
-msgid "Use this channel nickname instead of the one provided"
-msgstr "И�пользовать п�евдоним �того канала вме�то предо�тавленного"
-
-#: ../../Zotlabs/Module/Import.php:642
-msgid ""
-"Leave blank to keep your existing channel nickname. You will be randomly "
-"assigned a similar nickname if either name is already allocated on this site."
-msgstr "О�тавьте пу�тым дл� �охранени� �уще�твующего п�евдонима канала. Вам будет �лучайным образом назначен похожий п�евдоним е�ли такое им� уже выделено на �том �айте."
-
-#: ../../Zotlabs/Module/Import.php:644
-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/Ochannel.php:32 ../../Zotlabs/Module/Channel.php:44
-#: ../../Zotlabs/Module/Chat.php:29
-msgid "You must be logged in to see this page."
-msgstr "Вы должны авторизовать��, чтобы увидеть �ту �траницу."
-
-#: ../../Zotlabs/Module/Z6trans.php:19
-msgid "Update to Hubzilla 5.0 step 2"
-msgstr "Обновление Hubzilla 5.0, �тап 2"
-
-#: ../../Zotlabs/Module/Z6trans.php:21
-msgid "To complete the update please run"
-msgstr "Дл� завершени� обновлени� пожалуй�та выполните"
-
-#: ../../Zotlabs/Module/Z6trans.php:23
-msgid "php util/z6convert.php"
-msgstr ""
-
-#: ../../Zotlabs/Module/Z6trans.php:25
-msgid "from the terminal."
-msgstr "из терминала."
-
-#: ../../Zotlabs/Module/Register.php:112
-msgid "Email address required"
-msgstr "Требует�� адре� �лектронной почты"
-
-#: ../../Zotlabs/Module/Register.php:153
-msgid "No password provided"
-msgstr "Пароль не указан"
-
-#: ../../Zotlabs/Module/Register.php:176
-msgid "Terms of Service not accepted"
-msgstr "У�лови� и�пользовани� не были прин�ты"
-
-#: ../../Zotlabs/Module/Register.php:238
-msgid "Invitation code succesfully applied"
-msgstr "Код приглашени� прин�т у�пешно"
-
-#: ../../Zotlabs/Module/Register.php:258
-msgid "Invitation not in time or too late"
-msgstr "Приглашение и�текло или введено не воврем�"
-
-#: ../../Zotlabs/Module/Register.php:264
-msgid "Invitation email failed"
-msgstr "�е удало�ь отправить пи�ьмо � приглашением "
-
-#: ../../Zotlabs/Module/Register.php:272
-msgid "Invitation code failed"
-msgstr "�еверный код приглашени�"
-
-#: ../../Zotlabs/Module/Register.php:279
-msgid "Invitations are not available"
-msgstr "Приглашени� не до�тупны"
-
-#: ../../Zotlabs/Module/Register.php:305
-msgid "Email address already in use"
-msgstr "�дре� �лектронной почты уже и�пользует��"
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
+msgstr "�екоторые разрешени� могут быть уна�ледованы из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> вашего канала, которые могут иметь более вы�окий приоритет чем индивидуальные. Вы можете изменить �ти на�тройки, однако они не будут применены до изменени� переданных по на�лед�тву на�троек."
 
-#: ../../Zotlabs/Module/Register.php:315
-msgid "Registration on this hub is by invitation only"
-msgstr "Реги�траци� на �том хабе возможна только по приглашени�м"
+#: ../../Zotlabs/Module/Connedit.php:898
+msgid "Last update:"
+msgstr "По�леднее обновление:"
 
-#: ../../Zotlabs/Module/Register.php:423
-msgid "New register request"
-msgstr "�овый запро� на реги�трацию"
+#: ../../Zotlabs/Module/Connedit.php:906
+msgid "Details"
+msgstr "Сведени�"
 
-#: ../../Zotlabs/Module/Register.php:441
-msgid "Error creating dId A"
-msgstr "Ошибка �оздани� dId A"
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+msgid "Item is not editable"
+msgstr "Элемент нельз� редактировать"
 
-#: ../../Zotlabs/Module/Register.php:459
-msgid "Registration on this hub is disabled."
-msgstr "Реги�траци� на �том хабе отключена."
+#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:151
+msgid "Edit post"
+msgstr "Редактировать �ообщение"
 
-#: ../../Zotlabs/Module/Register.php:468
-msgid "Registration on this hub is by approval only."
-msgstr "Реги�траци� на �том хабе только � одобрени�."
+#: ../../Zotlabs/Module/Manage.php:135
+msgid "Create a new channel"
+msgstr "Создать новый канал"
 
-#: ../../Zotlabs/Module/Register.php:469
-msgid "Register at another affiliated hub in case when prefered"
-msgstr "При необходимо�ти вы можете зареги�трировать�� на другом хабе"
+#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:338
+#: ../../include/nav.php:101
+msgid "Channel Manager"
+msgstr "Менеджер каналов"
 
-#: ../../Zotlabs/Module/Register.php:482
-msgid "Registration on this hub is by invitation only."
-msgstr "Реги�траци� на �том хабе до�тупна только по приглашени�м."
+#: ../../Zotlabs/Module/Manage.php:161
+msgid "Current Channel"
+msgstr "Текущий канал"
 
-#: ../../Zotlabs/Module/Register.php:483
-msgid "Register at another affiliated hub"
-msgstr "Зареги�трировать�� на другом хабе"
+#: ../../Zotlabs/Module/Manage.php:163
+msgid "Switch to one of your channels by selecting it."
+msgstr "Выбрать и переключить�� на один из ваших каналов"
 
-#: ../../Zotlabs/Module/Register.php:497 ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Terms of Service"
-msgstr "У�лови� предо�тавлени� у�луг"
+#: ../../Zotlabs/Module/Manage.php:164
+msgid "Default Channel"
+msgstr "О�новной канал"
 
-#: ../../Zotlabs/Module/Register.php:503
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Я принимаю %s дл� �того веб-�айта."
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Make Default"
+msgstr "Сделать о�новным"
 
-#: ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/Manage.php:168
 #, php-format
-msgid "I am over %s years of age and accept the %s for this website"
-msgstr "Мой возра�т превышает %s лет и � принимаю %s дл� �того веб-�айта."
-
-#: ../../Zotlabs/Module/Register.php:520
-msgid "Your email address"
-msgstr "Ваш адре� �лектронной почты"
-
-#: ../../Zotlabs/Module/Register.php:522 ../../Zotlabs/Module/Oauth.php:117
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
-msgid "Optional"
-msgstr "�еоб�зательно"
-
-#: ../../Zotlabs/Module/Register.php:527
-msgid "Choose a password"
-msgstr "Выберите пароль"
+msgid "%d new introductions"
+msgstr "%d новых пред�тавлений"
 
-#: ../../Zotlabs/Module/Register.php:528
-msgid "Please re-enter your password"
-msgstr "Пожалуй�та, введите пароль еще раз"
+#: ../../Zotlabs/Module/Manage.php:170
+msgid "Delegated Channel"
+msgstr "Делегированный канал"
 
-#: ../../Zotlabs/Module/Register.php:530
-msgid "Please enter your invitation code"
-msgstr "Пожалуй�та, введите Ваш код приглашени�"
+#: ../../Zotlabs/Module/Articles.php:52
+msgid "Articles App"
+msgstr "Приложение \"Статьи\""
 
-#: ../../Zotlabs/Module/Register.php:532
-msgid "Your name"
-msgstr "Ваше им�"
+#: ../../Zotlabs/Module/Articles.php:53
+msgid "Create interactive articles"
+msgstr "Создать интерактивные �татьи"
 
-#: ../../Zotlabs/Module/Register.php:532
-msgid "Real name is preferred"
-msgstr "Предпочтительнее и�пользовать ваше на�то�щее им�"
+#: ../../Zotlabs/Module/Articles.php:116
+msgid "Add Article"
+msgstr "Добавить �татью"
 
-#: ../../Zotlabs/Module/Register.php:534
-#: ../../Zotlabs/Module/New_channel.php:177
-msgid "Choose a short nickname"
-msgstr "Выберите короткий п�евдоним"
+#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:326
+#: ../../include/nav.php:512
+msgid "Articles"
+msgstr "Статьи"
 
-#: ../../Zotlabs/Module/Register.php:534
-msgid "Your nickname will be used to create an easy to remember channel address"
-msgstr "Ваш п�евдоним будет и�пользован дл� �оздани� легко запоминающего�� адре�а канала"
+#: ../../Zotlabs/Module/Randprof.php:29
+msgid "Random Channel App"
+msgstr "Приложение \"Случайный канал\""
 
-#: ../../Zotlabs/Module/Register.php:538
-msgid "Why do you want to join this hub?"
-msgstr "Почему вы хотите зареги�трировать�� на �том хабе?"
+#: ../../Zotlabs/Module/Randprof.php:30
+msgid "Visit a random channel in the $Projectname network"
+msgstr "По�ещение �лучайного канала в �ети $Projectname"
 
-#: ../../Zotlabs/Module/Register.php:538
-msgid "This will help to review your registration"
-msgstr "Это поможет проверить вашу реги�трацию "
+#: ../../Zotlabs/Module/Achievements.php:38
+msgid "Some blurb about what to do when you're new here"
+msgstr "�екоторые предложени� о том, что делать, е�ли вы зде�ь новичок "
 
-#: ../../Zotlabs/Module/Register.php:544
-#: ../../Zotlabs/Module/Admin/Site.php:413
-msgid "Registration"
-msgstr "Реги�траци�"
+#: ../../Zotlabs/Module/Cloud.php:120
+msgid "Not found"
+msgstr "�е найдено."
 
-#: ../../Zotlabs/Module/Register.php:552
-msgid "I have an invite code"
-msgstr "У мен� е�ть код приглашени�"
+#: ../../Zotlabs/Module/Cloud.php:130
+msgid "Unknown error"
+msgstr "�еизве�тна� ошибка"
 
-#: ../../Zotlabs/Module/Register.php:599
-msgid ""
-"This site has exceeded the number of allowed daily account registrations."
-msgstr "�а �том �айте превышено допу�тимое количе�тво ежедневных реги�траций учетных запи�ей."
+#: ../../Zotlabs/Module/Display.php:372
+msgid "Article"
+msgstr "Стать�"
 
-#: ../../Zotlabs/Module/Search.php:21
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:26
-#: ../../Zotlabs/Module/Directory.php:73 ../../Zotlabs/Module/Directory.php:78
-#: ../../Zotlabs/Module/Photos.php:519
-msgid "Public access denied."
-msgstr "Публичный до�туп запрещен."
+#: ../../Zotlabs/Module/Display.php:417
+msgid "Item has been removed."
+msgstr "Элемент был удалён."
 
-#: ../../Zotlabs/Module/Search.php:250
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Объекты помечены как: %s"
+#: ../../Zotlabs/Module/Attach.php:68
+msgid "Item not available."
+msgstr "Элемент недо�тупен."
 
-#: ../../Zotlabs/Module/Search.php:252
+#: ../../Zotlabs/Module/Home.php:104
 #, php-format
-msgid "Search results for: %s"
-msgstr "Результаты пои�ка дл�: %s"
+msgid "Welcome to %s"
+msgstr "Добро пожаловать в %s"
 
 #: ../../Zotlabs/Module/Setup.php:169
 msgid "$Projectname Server - Setup"
@@ -8601,12 +7109,6 @@ msgstr "Пожалуй�та, обратите�ь к файлу \"install/INSTA
 msgid "System check"
 msgstr "Проверка �и�темы"
 
-#: ../../Zotlabs/Module/Setup.php:262 ../../Zotlabs/Module/Cdav.php:1037
-#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707
-#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:956
-msgid "Next"
-msgstr "Следующа�"
-
 #: ../../Zotlabs/Module/Setup.php:263
 msgid "Check again"
 msgstr "Перепроверить"
@@ -9000,6 +7502,11 @@ msgid ""
 "server root."
 msgstr "Файл конфигурации базы данных \".htconfig.php\" не может быть запи�ан. И�пользуйте прилагаемый тек�т дл� �оздани� файла конфигурации в корневом каталоге веб-�ервера."
 
+#: ../../Zotlabs/Module/Setup.php:720
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
+msgstr "При �оздании базы данных возникли ошибки."
+
 #: ../../Zotlabs/Module/Setup.php:766
 msgid "<h1>What next?</h1>"
 msgstr "<h1>Что дальше? </h1>"
@@ -9009,171 +7516,176 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr "Вам понадобит�� [вручную] на�троить запланированную задачу дл� опрашивател�."
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
-msgid "No connections."
-msgstr "Контактов нет."
+#: ../../Zotlabs/Module/Mitem.php:63
+msgid "Unable to create element."
+msgstr "�евозможно �оздать �лемент."
 
-#: ../../Zotlabs/Module/Viewconnections.php:105
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "По�етить %s ​​профиль [%s]"
+#: ../../Zotlabs/Module/Mitem.php:87
+msgid "Unable to update menu element."
+msgstr "�евозможно обновить �лемент меню."
 
-#: ../../Zotlabs/Module/Viewconnections.php:135
-msgid "View Connections"
-msgstr "Про�мотр контактов"
+#: ../../Zotlabs/Module/Mitem.php:103
+msgid "Unable to add menu element."
+msgstr "�евозможно добавить �лемент меню."
 
-#: ../../Zotlabs/Module/Pubsites.php:28
-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 "Указанные хабы разрешают публичную реги�трацию дл� �ети $Projectname. В�е хабы в �ети взаимо�в�заны, по�тому член�тво в любом из них передает член�тво во в�ю �еть. �екоторым хабам может потребовать�� подпи�ка или предо�тавление многоуровневых планов об�луживани�. Сам хаб <strong>может</strong> предо�тавить дополнительные �ведени�."
+#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
+msgid "Menu Item Permissions"
+msgstr "Разрешени� на пункт меню"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Hub URL"
-msgstr "URL �ервера"
+#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
+msgid "Link Name"
+msgstr "Им� ��ылки"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Access Type"
-msgstr "Тип до�тупа"
+#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
+msgid "Link or Submenu Target"
+msgstr "С�ылка или цель подменю"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Registration Policy"
-msgstr "Политика реги�трации"
+#: ../../Zotlabs/Module/Mitem.php:175
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Введите URL ��ылки или выберите им� меню дл� �оздани� подменю"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Stats"
-msgstr "Стати�тика"
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
+msgid "Use magic-auth if available"
+msgstr "И�пользовать magic-auth е�ли возможно"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
-msgid "Software"
-msgstr "Программное обе�печение"
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
+msgid "Open link in new window"
+msgstr "Открыть ��ылку в новом окне"
 
-#: ../../Zotlabs/Module/Pubsites.php:50
-msgid "Rate"
-msgstr "Оценка"
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Order in list"
+msgstr "Пор�док в �пи�ке"
 
-#: ../../Zotlabs/Module/Pubsites.php:61 ../../Zotlabs/Module/Webpages.php:261
-#: ../../Zotlabs/Module/Events.php:702 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Wiki.php:408
-#: ../../Zotlabs/Module/Layouts.php:198
-msgid "View"
-msgstr "Про�мотр"
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Большие значени� в конце �пи�ка"
 
-#: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:62
-msgid "Posts and comments"
-msgstr "Публикации и комментарии"
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Submit and finish"
+msgstr "Отправить и завершить"
 
-#: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:69
-msgid "Only posts"
-msgstr "Только публикации"
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Submit and continue"
+msgstr "Отправить и продолжить"
 
-#: ../../Zotlabs/Module/Channel.php:206
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "�едо�таточно прав. Запро� перенаправлен на �траницу профил�."
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Menu:"
+msgstr "Меню:"
 
-#: ../../Zotlabs/Module/Channel.php:483 ../../Zotlabs/Module/Display.php:354
-msgid ""
-"You must enable javascript for your browser to be able to view this content."
-msgstr "Дл� про�мотра �того �одержимого в вашем браузере должен быть включён JavaScript"
+#: ../../Zotlabs/Module/Mitem.php:192
+msgid "Link Target"
+msgstr "Цель ��ылки"
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "�еверный идентификатор профил�"
+#: ../../Zotlabs/Module/Mitem.php:195
+msgid "Edit menu"
+msgstr "Редактировать меню"
 
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Редактор видимо�ти профил�"
+#: ../../Zotlabs/Module/Mitem.php:198
+msgid "Edit element"
+msgstr "Редактировать �лемент"
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr "�ажмите на контакт, чтобы добавить или удалить."
+#: ../../Zotlabs/Module/Mitem.php:199
+msgid "Drop element"
+msgstr "Удалить �лемент"
 
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
-msgstr "Видно"
+#: ../../Zotlabs/Module/Mitem.php:200
+msgid "New element"
+msgstr "�овый �лемент"
 
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:218
-msgid "All Connections"
-msgstr "В�е контакты"
+#: ../../Zotlabs/Module/Mitem.php:201
+msgid "Edit this menu container"
+msgstr "Редактировать контейнер меню"
 
-#: ../../Zotlabs/Module/Group.php:46
-msgid "Privacy group created."
-msgstr "Группа конфиденциально�ти �оздана."
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Add menu element"
+msgstr "Добавить �лемент меню"
 
-#: ../../Zotlabs/Module/Group.php:49
-msgid "Could not create privacy group."
-msgstr "�е удало�ь �оздать группу конфиденциально�ти."
+#: ../../Zotlabs/Module/Mitem.php:203
+msgid "Delete this menu item"
+msgstr "Удалить �тот �лемент меню"
 
-#: ../../Zotlabs/Module/Group.php:81
-msgid "Privacy group updated."
-msgstr "Группа конфиденциально�ти обновлена."
+#: ../../Zotlabs/Module/Mitem.php:204
+msgid "Edit this menu item"
+msgstr "Редактировать �тот �лемент меню"
 
-#: ../../Zotlabs/Module/Group.php:107
-msgid "Privacy Groups App"
-msgstr "Приложение \"Группы конфиденциально�ти\""
+#: ../../Zotlabs/Module/Mitem.php:222
+msgid "Menu item not found."
+msgstr "Элемент меню не найден."
 
-#: ../../Zotlabs/Module/Group.php:108
-msgid "Management of privacy groups"
-msgstr "Управление группами конфиденциально�ти."
+#: ../../Zotlabs/Module/Mitem.php:235
+msgid "Menu item deleted."
+msgstr "Элемент меню удалён."
 
-#: ../../Zotlabs/Module/Group.php:143
-msgid "Add Group"
-msgstr "Добавить группу"
+#: ../../Zotlabs/Module/Mitem.php:237
+msgid "Menu item could not be deleted."
+msgstr "�евозможно удалить �лемент меню."
 
-#: ../../Zotlabs/Module/Group.php:147
-msgid "Privacy group name"
-msgstr "Им� группы конфиденциально�ти"
+#: ../../Zotlabs/Module/Mitem.php:244
+msgid "Edit Menu Element"
+msgstr "Редактировать �лемент меню"
 
-#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257
-msgid "Members are visible to other channels"
-msgstr "Уча�тники канала видимые дл� о�тальных"
+#: ../../Zotlabs/Module/Mitem.php:254
+msgid "Link text"
+msgstr "Тек�т ��ылки"
 
-#: ../../Zotlabs/Module/Group.php:156 ../../Zotlabs/Module/Help.php:84
-msgid "Members"
-msgstr "Уча�тники"
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+msgid "Public Hubs"
+msgstr "Публичные хабы"
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group removed."
-msgstr "Группа конфиденциально�ти удалена."
+#: ../../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 "Указанные хабы разрешают публичную реги�трацию дл� �ети $Projectname. В�е хабы в �ети взаимо�в�заны, по�тому член�тво в любом из них передает член�тво во в�ю �еть. �екоторым хабам может потребовать�� подпи�ка или предо�тавление многоуровневых планов об�луживани�. Сам хаб <strong>может</strong> предо�тавить дополнительные �ведени�."
 
-#: ../../Zotlabs/Module/Group.php:186
-msgid "Unable to remove privacy group."
-msgstr "�у удало�ь удалить группу конфиденциально�ти."
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
+msgstr "URL �ервера"
 
-#: ../../Zotlabs/Module/Group.php:252
-#, php-format
-msgid "Privacy Group: %s"
-msgstr "Группа конфиденциально�ти: %s"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
+msgstr "Тип до�тупа"
 
-#: ../../Zotlabs/Module/Group.php:254
-msgid "Privacy group name: "
-msgstr "�азвание группы конфиденциально�ти: "
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
+msgstr "Политика реги�трации"
 
-#: ../../Zotlabs/Module/Group.php:259
-msgid "Delete Group"
-msgstr "Удалить группу"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
+msgstr "Стати�тика"
 
-#: ../../Zotlabs/Module/Group.php:270
-msgid "Group members"
-msgstr "Члены группы"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
+msgstr "Программное обе�печение"
 
-#: ../../Zotlabs/Module/Group.php:272
-msgid "Not in this group"
-msgstr "�е в �той группе"
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1128
+msgid "Ratings"
+msgstr "Оценки"
 
-#: ../../Zotlabs/Module/Group.php:304
-msgid "Click a channel to toggle membership"
-msgstr "�ажмите на канал дл� про�мотра член�тва"
+#: ../../Zotlabs/Module/Pubsites.php:49
+msgid "Rate"
+msgstr "Оценка"
 
-#: ../../Zotlabs/Module/Card_edit.php:129
-msgid "Edit Card"
-msgstr "Редактировать карточку"
+#: ../../Zotlabs/Module/Mood.php:76 ../../include/conversation.php:286
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:134
+msgid "Mood App"
+msgstr "Приложение \"�а�троение\""
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Module/Mood.php:155
+msgid "Set your current mood and tell your friends"
+msgstr "У�тановить текущее на�троение и ра��казать друзь�м"
+
+#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:351
+msgid "Mood"
+msgstr "�а�троение"
 
 #: ../../Zotlabs/Module/Go.php:21
 msgid "This page is available only to site members"
@@ -9204,6 +7716,10 @@ msgstr "Загрузить фотографию обложки"
 msgid "Edit your default profile"
 msgstr "Редактировать ваш профиль по умолчанию"
 
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:41
+msgid "View friend suggestions"
+msgstr "Про�мотр рекомендуемых друзей"
+
 #: ../../Zotlabs/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Про�мотр каталога каналов"
@@ -9234,6773 +7750,8112 @@ msgstr "Ваш пер�ональный поток (может быть пу�т
 msgid "View the public stream. Warning: this content is not moderated"
 msgstr "Про�мотр публичного потока. Предупреждение: �тот контент не модерирует��"
 
-#: ../../Zotlabs/Module/Oauth.php:45
-msgid "Name is required"
-msgstr "�еобходимо им�"
+#: ../../Zotlabs/Module/Channel_calendar.php:62
+msgid "Event can not end before it has started."
+msgstr "Событие не может завершить�� до его начала."
 
-#: ../../Zotlabs/Module/Oauth.php:49
-msgid "Key and Secret are required"
-msgstr "Требуют�� ключ и код"
+#: ../../Zotlabs/Module/Channel_calendar.php:64
+#: ../../Zotlabs/Module/Channel_calendar.php:72
+#: ../../Zotlabs/Module/Channel_calendar.php:87
+msgid "Unable to generate preview."
+msgstr "�евозможно �оздать предварительный про�мотр."
 
-#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
-#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389
-#: ../../Zotlabs/Module/Admin/Addons.php:457
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58
-#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:932
-#: ../../Zotlabs/Lib/Apps.php:536
-msgid "Update"
-msgstr "Обновить"
+#: ../../Zotlabs/Module/Channel_calendar.php:70
+msgid "Event title and start time are required."
+msgstr "Требуют�� наименование �обыти� и врем� начала."
 
-#: ../../Zotlabs/Module/Oauth.php:100
-msgid "OAuth Apps Manager App"
-msgstr "Приложение \"Менеджер Oauth\""
+#: ../../Zotlabs/Module/Channel_calendar.php:85
+#: ../../Zotlabs/Module/Channel_calendar.php:226
+msgid "Event not found."
+msgstr "Событие не найдено."
 
-#: ../../Zotlabs/Module/Oauth.php:101
-msgid "OAuth authentication tokens for mobile and remote apps"
-msgstr "Токены аутентификации OAuth дл� мобильный и удалённых приложений"
+#: ../../Zotlabs/Module/Channel_calendar.php:370
+msgid "Edit event"
+msgstr "Редактировать �обытие"
 
-#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
-#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Oauth2.php:143
-#: ../../Zotlabs/Module/Oauth2.php:193
-msgid "Add application"
-msgstr "Добавить приложение"
+#: ../../Zotlabs/Module/Channel_calendar.php:372
+msgid "Delete event"
+msgstr "Удалить �обытие"
 
-#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth2.php:118
-#: ../../Zotlabs/Module/Oauth2.php:146
-msgid "Name of application"
-msgstr "�азвание приложени�"
+#: ../../Zotlabs/Module/Channel_calendar.php:406
+msgid "calendar"
+msgstr "календарь"
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Сгенерирован автоматиче�кие - измените е�ли требует��. Мак�. длина 20"
+#: ../../Zotlabs/Module/Channel_calendar.php:493
+msgid "Failed to remove event"
+msgstr "�е удало�ь удалить �обытие"
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
-#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
-msgid "Redirect"
-msgstr "Перенаправление"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
+msgstr "Контактов нет."
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
-#: ../../Zotlabs/Module/Oauth2.php:148
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr "URI перенаправлени� - о�тавьте пу�тыми до тех пока ваше приложение не требует �того"
+#: ../../Zotlabs/Module/Viewconnections.php:105
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "По�етить %s ​​профиль [%s]"
 
-#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
-msgid "Icon url"
-msgstr "URL значка"
+#: ../../Zotlabs/Module/Viewconnections.php:135
+msgid "View Connections"
+msgstr "Про�мотр контактов"
 
-#: ../../Zotlabs/Module/Oauth.php:128
-msgid "Application not found."
-msgstr "Приложение не найдено."
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+msgid "Files: shared with me"
+msgstr "Файлы: поделили�ь �о мной"
 
-#: ../../Zotlabs/Module/Oauth.php:171
-msgid "Connected OAuth Apps"
-msgstr "Подключенные приложени� OAuth"
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+msgid "NEW"
+msgstr "�ОВОЕ"
 
-#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
-msgid "Client key starts with"
-msgstr "Ключ клиента начинает�� �"
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1540
+msgid "Size"
+msgstr "Размер"
 
-#: ../../Zotlabs/Module/Oauth.php:176 ../../Zotlabs/Module/Oauth2.php:197
-msgid "No name"
-msgstr "Без названи�"
+#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Zotlabs/Storage/Browser.php:380
+msgid "Last Modified"
+msgstr "По�леднее изменение"
 
-#: ../../Zotlabs/Module/Oauth.php:177 ../../Zotlabs/Module/Oauth2.php:198
-msgid "Remove authorization"
-msgstr "Удалить разрешение"
+#: ../../Zotlabs/Module/Sharedwithme.php:110
+msgid "Remove all files"
+msgstr "Удалить в�е файлы"
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
-msgid "Page link"
-msgstr "С�ылка �траницы"
+#: ../../Zotlabs/Module/Sharedwithme.php:111
+msgid "Remove this file"
+msgstr "Удалить �тот файл"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
-msgid "Edit Webpage"
-msgstr "Редактировать веб-�траницу"
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
+msgstr "Пожалуй�та, войдите."
 
-#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:52
-msgid "This site is not a directory server"
-msgstr "Этот �айт не �вл�ет�� �ервером каталога"
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Lang.php:63
+msgid "Language App"
+msgstr "Приложение \"Язык\""
 
-#: ../../Zotlabs/Module/Dirsearch.php:37
-msgid "This directory server requires an access token"
-msgstr "Дл� до�тупа к �тому �ерверу каталогов требует�� токен"
+#: ../../Zotlabs/Module/Lang.php:64
+msgid "Change UI language"
+msgstr "Изменить �зык интерфей�а"
 
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "Welcome to Hubzilla!"
-msgstr "Добро пожаловать в Hubzilla!"
+#: ../../Zotlabs/Module/Oauth2.php:54
+msgid "Name and Secret are required"
+msgstr "Требуют�� им� и код"
 
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "You have got no unseen posts..."
-msgstr "У ва� нет непро�мотренных публикаций..."
+#: ../../Zotlabs/Module/Oauth2.php:106
+msgid "OAuth2 Apps Manager App"
+msgstr "Приложение \"Менеджер Oauth2\""
 
-#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:471
-msgid "Unable to locate original post."
-msgstr "�е удало�ь найти оригинальную публикацию."
+#: ../../Zotlabs/Module/Oauth2.php:107
+msgid "OAuth2 authenticatication tokens for mobile and remote apps"
+msgstr "�утентификаци� OAuth2 дл� мобильных и удаленных приложений"
 
-#: ../../Zotlabs/Module/Chat.php:100
-msgid "Chatrooms App"
-msgstr "Приложение \"Мои чаты\""
+#: ../../Zotlabs/Module/Oauth2.php:115
+msgid "Add OAuth2 application"
+msgstr "Добавить приложение OAuth2"
 
-#: ../../Zotlabs/Module/Chat.php:101
-msgid "Access Controlled Chatrooms"
-msgstr "Получить до�туп к контролируемым чатам"
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
+msgid "Grant Types"
+msgstr "Разрешить типы"
 
-#: ../../Zotlabs/Module/Chat.php:194
-msgid "Room not found"
-msgstr "Комната не найдена"
+#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
+msgid "leave blank unless your application sepcifically requires this"
+msgstr "о�тавьте пу�тыми до тех пока ваше приложение не требует �того"
 
-#: ../../Zotlabs/Module/Chat.php:210
-msgid "Leave Room"
-msgstr "Покинуть комнату"
+#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
+msgid "Authorization scope"
+msgstr "Обла�ть полномочий"
 
-#: ../../Zotlabs/Module/Chat.php:211
-msgid "Delete Room"
-msgstr "Удалить комнату"
+#: ../../Zotlabs/Module/Oauth2.php:134
+msgid "OAuth2 Application not found."
+msgstr "Приложение OAuth2 не найдено."
 
-#: ../../Zotlabs/Module/Chat.php:212
-msgid "I am away right now"
-msgstr "Я �ейча� отошёл"
+#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
+msgid "leave blank unless your application specifically requires this"
+msgstr "о�тавьте поле пу�тым, е�ли ваше приложение не требует �того"
 
-#: ../../Zotlabs/Module/Chat.php:213
-msgid "I am online"
-msgstr "Я на �в�зи"
+#: ../../Zotlabs/Module/Oauth2.php:192
+msgid "Connected OAuth2 Apps"
+msgstr "Подключённые приложени� OAuth2"
 
-#: ../../Zotlabs/Module/Chat.php:215
-msgid "Bookmark this room"
-msgstr "Запомнить �ту комнату"
+#: ../../Zotlabs/Module/Directory.php:121
+msgid "No default suggestions were found."
+msgstr "Предложений по умолчанию не найдено."
 
-#: ../../Zotlabs/Module/Chat.php:238
-msgid "New Chatroom"
-msgstr "�овый чат"
+#: ../../Zotlabs/Module/Directory.php:281
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d оценка"
+msgstr[1] "%d оценки"
+msgstr[2] "%d оценок"
 
-#: ../../Zotlabs/Module/Chat.php:239
-msgid "Chatroom name"
-msgstr "�азвание чата"
+#: ../../Zotlabs/Module/Directory.php:292
+msgid "Gender: "
+msgstr "Пол:"
 
-#: ../../Zotlabs/Module/Chat.php:240
-msgid "Expiration of chats (minutes)"
-msgstr "Завершение чатов (минут)"
+#: ../../Zotlabs/Module/Directory.php:294
+msgid "Status: "
+msgstr "Стату�:"
 
-#: ../../Zotlabs/Module/Chat.php:256
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Чаты пользовател� %1$s"
+#: ../../Zotlabs/Module/Directory.php:296
+msgid "Homepage: "
+msgstr "Домашн�� �траница:"
 
-#: ../../Zotlabs/Module/Chat.php:261
-msgid "No chatrooms available"
-msgstr "�ет до�тупных чатов"
+#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1754
+msgid "Age:"
+msgstr "Возра�т:"
 
-#: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:145
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213
-msgid "Create New"
-msgstr "Создать новый"
+#: ../../Zotlabs/Module/Directory.php:353 ../../include/event.php:63
+#: ../../include/event.php:134 ../../include/channel.php:1581
+msgid "Location:"
+msgstr "Ме�тоположение:"
 
-#: ../../Zotlabs/Module/Chat.php:265
-msgid "Expiration"
-msgstr "Срок дей�тви�"
+#: ../../Zotlabs/Module/Directory.php:359
+msgid "Description:"
+msgstr "Опи�ание:"
 
-#: ../../Zotlabs/Module/Chat.php:266
-msgid "min"
-msgstr "мин."
+#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1783
+msgid "Hometown:"
+msgstr "Родной город:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:62
-#: ../../Zotlabs/Module/Events.php:113
-msgid "Event can not end before it has started."
-msgstr "Событие не может завершить�� до его начала."
+#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1789
+msgid "About:"
+msgstr "О �ебе:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:64
-#: ../../Zotlabs/Module/Channel_calendar.php:72
-#: ../../Zotlabs/Module/Channel_calendar.php:87
-#: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124
-#: ../../Zotlabs/Module/Events.php:146
-msgid "Unable to generate preview."
-msgstr "�евозможно �оздать предварительный про�мотр."
+#: ../../Zotlabs/Module/Directory.php:370
+msgid "Public Forum:"
+msgstr "Публичный форум:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:70
-#: ../../Zotlabs/Module/Events.php:122
-msgid "Event title and start time are required."
-msgstr "Требуют�� наименование �обыти� и врем� начала."
+#: ../../Zotlabs/Module/Directory.php:373
+msgid "Keywords: "
+msgstr "Ключевые �лова:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:85
-#: ../../Zotlabs/Module/Channel_calendar.php:226
-#: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271
-msgid "Event not found."
-msgstr "Событие не найдено."
+#: ../../Zotlabs/Module/Directory.php:376
+msgid "Don't suggest"
+msgstr "�е предлагать"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:370
-#: ../../Zotlabs/Module/Events.php:641
-msgid "Edit event"
-msgstr "Редактировать �обытие"
+#: ../../Zotlabs/Module/Directory.php:378
+msgid "Common connections (estimated):"
+msgstr "Общие контакты (оценочно):"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:372
-#: ../../Zotlabs/Module/Events.php:643
-msgid "Delete event"
-msgstr "Удалить �обытие"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Global Directory"
+msgstr "Глобальный каталог"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:392
-#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165
-msgid "Link to source"
-msgstr "С�ылка на и�точник"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Local Directory"
+msgstr "Локальный каталог"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:406
-#: ../../Zotlabs/Module/Events.php:677
-msgid "calendar"
-msgstr "календарь"
+#: ../../Zotlabs/Module/Directory.php:433
+msgid "Finding:"
+msgstr "Пои�к:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:493
-#: ../../Zotlabs/Module/Events.php:742
-msgid "Failed to remove event"
-msgstr "�е удало�ь удалить �обытие"
+#: ../../Zotlabs/Module/Directory.php:438
+msgid "next page"
+msgstr "�ледующа� �траница"
 
-#: ../../Zotlabs/Module/Like.php:106
-msgid "Like/Dislike"
-msgstr "�равит�� / не нравит��"
+#: ../../Zotlabs/Module/Directory.php:438
+msgid "previous page"
+msgstr "предыдуща� �траница"
 
-#: ../../Zotlabs/Module/Like.php:112
-msgid "This action is restricted to members."
-msgstr "Это дей�твие до�тупно только уча�тникам."
+#: ../../Zotlabs/Module/Directory.php:439
+msgid "Sort options"
+msgstr "Параметры �ортировки"
 
-#: ../../Zotlabs/Module/Like.php:113
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
-msgstr "Пожалуй�та, дл� продолжени� <a href=\"rmagic\"> войдите � вашим $Projectname ID</a> или <a href=\"register\">зареги�трируйте�ь как новый уча�тник $Projectname</a>."
+#: ../../Zotlabs/Module/Directory.php:440
+msgid "Alphabetic"
+msgstr "По алфавиту"
 
-#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
-#: ../../Zotlabs/Module/Like.php:230
-msgid "Invalid request."
-msgstr "�еверный запро�."
+#: ../../Zotlabs/Module/Directory.php:441
+msgid "Reverse Alphabetic"
+msgstr "Против алфавита"
 
-#: ../../Zotlabs/Module/Like.php:207
-msgid "thing"
-msgstr "предмет"
+#: ../../Zotlabs/Module/Directory.php:442
+msgid "Newest to Oldest"
+msgstr "От новых к �тарым"
 
-#: ../../Zotlabs/Module/Like.php:253
-msgid "Channel unavailable."
-msgstr "Канал недо�тупен."
+#: ../../Zotlabs/Module/Directory.php:443
+msgid "Oldest to Newest"
+msgstr "От �тарых к новым"
 
-#: ../../Zotlabs/Module/Like.php:289
-msgid "Previous action reversed."
-msgstr "Предыдущее дей�твие отменено."
+#: ../../Zotlabs/Module/Directory.php:460
+msgid "No entries (some entries may be hidden)."
+msgstr "�ет запи�ей (некоторые запи�и могут быть �крыты)."
 
-#: ../../Zotlabs/Module/Like.php:475
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s �огла�ен � %2$s %3$s"
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
+msgstr "Ограничений кла��а об�луживание не найдено."
 
-#: ../../Zotlabs/Module/Like.php:477
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s не �огла�ен � %2$s %3$s"
+#: ../../Zotlabs/Module/Sse_bs.php:567
+msgid "Private forum"
+msgstr "Ча�тный форум"
 
-#: ../../Zotlabs/Module/Like.php:479
+#: ../../Zotlabs/Module/Sse_bs.php:567
+msgid "Public forum"
+msgstr "Публичный форум"
+
+#: ../../Zotlabs/Module/Attach_edit.php:118
+msgid "Can not copy folder into itself."
+msgstr "�евозможно �копировать каталог в �амого �еб�."
+
+#: ../../Zotlabs/Module/Attach_edit.php:131
 #, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s воздерживает�� от решени� по %2$s%3$s"
+msgid "Can not move folder \"%s\" into itself."
+msgstr "�евозможно �копировать каталог \"%s\" в �амого �еб�."
 
-#: ../../Zotlabs/Module/Like.php:586
-msgid "Action completed."
-msgstr "Дей�твие завершено."
+#: ../../Zotlabs/Module/Wiki.php:35
+#: ../../extend/addon/hzaddons/cart/cart.php:1410
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:51
+msgid "Profile Unavailable."
+msgstr "Профиль недо�тупен."
 
-#: ../../Zotlabs/Module/Like.php:587
-msgid "Thank you."
-msgstr "Спа�ибо."
+#: ../../Zotlabs/Module/Wiki.php:52
+msgid "Wiki App"
+msgstr "Приложение \"Wiki\""
 
-#: ../../Zotlabs/Module/Poke.php:165
-msgid "Poke App"
-msgstr "Приложение \"Ткнуть\""
+#: ../../Zotlabs/Module/Wiki.php:53
+msgid "Provide a wiki for your channel"
+msgstr "Предо�тавьте Wiki дл� вашего канала"
 
-#: ../../Zotlabs/Module/Poke.php:166
-msgid "Poke somebody in your addressbook"
-msgstr "Ткнуть кого-нибудь в вашей адре�ной книге"
+#: ../../Zotlabs/Module/Wiki.php:77
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:478
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:456
+#: ../../extend/addon/hzaddons/cart/myshop.php:37
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:93
+#: ../../extend/addon/hzaddons/cart/cart.php:1556
+msgid "Invalid channel"
+msgstr "�едей�твительный канал"
 
-#: ../../Zotlabs/Module/Poke.php:200
-msgid "Poke somebody"
-msgstr "Ткнуть кого-нибудь"
+#: ../../Zotlabs/Module/Wiki.php:132
+msgid "Error retrieving wiki"
+msgstr "Ошибка при получении Wiki"
 
-#: ../../Zotlabs/Module/Poke.php:203
-msgid "Poke/Prod"
-msgstr "Толкнуть / подтолкнуть"
+#: ../../Zotlabs/Module/Wiki.php:139
+msgid "Error creating zip file export folder"
+msgstr "Ошибка при �оздании zip-файла при �к�порте каталога"
 
-#: ../../Zotlabs/Module/Poke.php:204
-msgid "Poke, prod or do other things to somebody"
-msgstr "Толкнуть, подтолкнуть или �делать что-то ещё � кем-то"
+#: ../../Zotlabs/Module/Wiki.php:190
+msgid "Error downloading wiki: "
+msgstr "Ошибка загрузки Wiki:"
 
-#: ../../Zotlabs/Module/Poke.php:211
-msgid "Recipient"
-msgstr "Получатель"
+#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../include/nav.php:536
+msgid "Wikis"
+msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:212
-msgid "Choose what you wish to do to recipient"
-msgstr "Выбрать что вы хотите �делать � получателем"
+#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:166
+msgid "Download"
+msgstr "Загрузить"
 
-#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
-msgid "Make this post private"
-msgstr "Сделать �ту публикацию приватной"
+#: ../../Zotlabs/Module/Wiki.php:215
+msgid "Wiki name"
+msgstr "�азвание Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28
-msgid "Calendar entries imported."
-msgstr "Событи� календар� импортированы."
+#: ../../Zotlabs/Module/Wiki.php:216
+msgid "Content type"
+msgstr "Тип �одержимого"
 
-#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30
-msgid "No calendar entries found."
-msgstr "�е найдено �обытий в календаре."
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2100
+#: ../../extend/addon/hzaddons/mdpost/mdpost.php:41
+msgid "Markdown"
+msgstr "Разметка Markdown"
 
-#: ../../Zotlabs/Module/Cdav.php:877
-msgid "CardDAV App"
-msgstr "Приложение CardDAV"
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370
+#: ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2098
+msgid "BBcode"
+msgstr ""
 
-#: ../../Zotlabs/Module/Cdav.php:878
-msgid "CalDAV capable addressbook"
-msgstr "�дре�на� книга � поддержкой CalDAV"
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38
+#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2101
+msgid "Text"
+msgstr "Тек�т"
 
-#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468
-msgid "Event title"
-msgstr "�аименование �обыти�"
+#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
+msgid "Type"
+msgstr "Тип"
 
-#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474
-msgid "Start date and time"
-msgstr "Дата и врем� начала"
+#: ../../Zotlabs/Module/Wiki.php:219
+msgid "Any&nbsp;type"
+msgstr "Любой&nbsp;тип"
 
-#: ../../Zotlabs/Module/Cdav.php:1012
-msgid "End date and time"
-msgstr "Дата и врем� окончани�"
+#: ../../Zotlabs/Module/Wiki.php:226
+msgid "Lock content type"
+msgstr "Зафик�ировать тип �одержимого"
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497
-msgid "Timezone:"
-msgstr "Ча�овой по��:"
+#: ../../Zotlabs/Module/Wiki.php:227
+msgid "Create a status post for this wiki"
+msgstr "Создать публикацию о �тату�е �той Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:697
-#: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:203
-#: ../../Zotlabs/Module/Photos.php:947
-msgid "Previous"
-msgstr "Предыдуща�"
+#: ../../Zotlabs/Module/Wiki.php:228
+msgid "Edit Wiki Name"
+msgstr "Редактировать наименование Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708
-#: ../../Zotlabs/Module/Cal.php:205
-msgid "Today"
-msgstr "Сегодн�"
+#: ../../Zotlabs/Module/Wiki.php:273
+msgid "Wiki not found"
+msgstr "Wiki не найдена"
 
-#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703
-msgid "Month"
-msgstr "Ме��ц"
+#: ../../Zotlabs/Module/Wiki.php:299
+msgid "Rename page"
+msgstr "Переименовать �траницу"
 
-#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704
-msgid "Week"
-msgstr "�едел�"
+#: ../../Zotlabs/Module/Wiki.php:320
+msgid "Error retrieving page content"
+msgstr "Ошибка при получении �одержимого �траницы"
 
-#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705
-msgid "Day"
-msgstr "День"
+#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330
+msgid "New page"
+msgstr "�ова� �траница"
 
-#: ../../Zotlabs/Module/Cdav.php:1042
-msgid "List month"
-msgstr "Про�мотреть ме��ц"
+#: ../../Zotlabs/Module/Wiki.php:365
+msgid "Revision Comparison"
+msgstr "Сравнение ревизий"
 
-#: ../../Zotlabs/Module/Cdav.php:1043
-msgid "List week"
-msgstr "Про�мотреть неделю"
+#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579
+#: ../../Zotlabs/Widget/Wiki_page_history.php:25
+msgid "Revert"
+msgstr "Отменить"
 
-#: ../../Zotlabs/Module/Cdav.php:1044
-msgid "List day"
-msgstr "Про�мотреть день"
+#: ../../Zotlabs/Module/Wiki.php:373
+msgid "Short description of your changes (optional)"
+msgstr "Краткое опи�ание ваших изменений (необ�зательно)"
 
-#: ../../Zotlabs/Module/Cdav.php:1052
-msgid "More"
-msgstr "Больше"
+#: ../../Zotlabs/Module/Wiki.php:383
+#: ../../extend/addon/hzaddons/wppost/wppost.php:174
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:98
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:134
+#: ../../extend/addon/hzaddons/dwpost/dwpost.php:134
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:69
+msgid "Source"
+msgstr "И�точник"
 
-#: ../../Zotlabs/Module/Cdav.php:1053
-msgid "Less"
-msgstr "Меньше"
+#: ../../Zotlabs/Module/Wiki.php:393
+msgid "New page name"
+msgstr "�овое им� �траницы"
 
-#: ../../Zotlabs/Module/Cdav.php:1055
-msgid "Select calendar"
-msgstr "Выбрать календарь"
+#: ../../Zotlabs/Module/Wiki.php:398
+msgid "Embed image from photo albums"
+msgstr "В�троить изображение из фотоальбома"
 
-#: ../../Zotlabs/Module/Cdav.php:1058
-msgid "Delete all"
-msgstr "Удалить в�ё"
+#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1454
+#: ../../extend/addon/hzaddons/hsse/hsse.php:208
+msgid "Embed an image from your albums"
+msgstr "В�троить изображение из ваших альбомов"
 
-#: ../../Zotlabs/Module/Cdav.php:1061
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr "Про�тите, но редактирование повтор�ющих�� �обытий пока не реализовано."
+#: ../../Zotlabs/Module/Wiki.php:409
+msgid "History"
+msgstr "И�тори�"
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917
-msgid "Organisation"
-msgstr "Организаци�"
+#: ../../Zotlabs/Module/Wiki.php:487
+msgid "Error creating wiki. Invalid name."
+msgstr "Ошибка �оздани� Wiki. �еверное им�."
 
-#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:919
-msgid "Phone"
-msgstr "Телефон"
+#: ../../Zotlabs/Module/Wiki.php:494
+msgid "A wiki with this name already exists."
+msgstr "Wiki � таким именем уже �уще�твует."
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:921
-msgid "Instant messenger"
-msgstr "Ме��енджер"
+#: ../../Zotlabs/Module/Wiki.php:507
+msgid "Wiki created, but error creating Home page."
+msgstr "Wiki �оздана, но возникла ошибка при �оздании домашней �траницы"
 
-#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:922
-msgid "Website"
-msgstr "Веб-�айт"
+#: ../../Zotlabs/Module/Wiki.php:514
+msgid "Error creating wiki"
+msgstr "Ошибка при �оздании Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:1380
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Locs.php:129
-msgid "Address"
-msgstr "�дре�"
+#: ../../Zotlabs/Module/Wiki.php:538
+msgid "Error updating wiki. Invalid name."
+msgstr "Ошибка при обновлении Wiki. �еверное им�."
 
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:924
-msgid "Note"
-msgstr "Заметка"
+#: ../../Zotlabs/Module/Wiki.php:557
+msgid "Error updating wiki"
+msgstr "Ошибка при обновлении Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:929
-msgid "Add Contact"
-msgstr "Добавить контакт"
+#: ../../Zotlabs/Module/Wiki.php:572
+msgid "Wiki delete permission denied."
+msgstr "�ет прав на удаление Wiki."
 
-#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:930
-msgid "Add Field"
-msgstr "Добавить поле"
+#: ../../Zotlabs/Module/Wiki.php:582
+msgid "Error deleting wiki"
+msgstr "Ошибка удалени� Wiki"
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935
-msgid "P.O. Box"
-msgstr "абонент�кий �щик"
+#: ../../Zotlabs/Module/Wiki.php:615
+msgid "New page created"
+msgstr "Создана нова� �траница"
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936
-msgid "Additional"
-msgstr "Дополнительно"
+#: ../../Zotlabs/Module/Wiki.php:741
+msgid "Cannot delete Home"
+msgstr "�евозможно удалить домашнюю �траницу"
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937
-msgid "Street"
-msgstr "Улица"
+#: ../../Zotlabs/Module/Wiki.php:817
+msgid "Current Revision"
+msgstr "Текуща� ревизи�"
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938
-msgid "Locality"
-msgstr "�а�елённый пункт"
+#: ../../Zotlabs/Module/Wiki.php:817
+msgid "Selected Revision"
+msgstr "Выбранна� ревизи�"
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939
-msgid "Region"
-msgstr "Регион"
+#: ../../Zotlabs/Module/Wiki.php:872
+msgid "You must be authenticated."
+msgstr "Вы должны быть аутентифицированы."
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940
-msgid "ZIP Code"
-msgstr "Индек�"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:346
+#: ../../include/nav.php:444 ../../include/features.php:368
+msgid "Photos"
+msgstr "Фотографии"
 
-#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759
-#: ../../Zotlabs/Module/Connedit.php:941
-msgid "Country"
-msgstr "Страна"
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351
+#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Widget/Notifications.php:101
+#: ../../include/nav.php:452
+msgid "Files"
+msgstr "Файлы"
 
-#: ../../Zotlabs/Module/Cdav.php:1457
-msgid "Default Calendar"
-msgstr "Календарь по умолчанию"
+#: ../../Zotlabs/Module/Tokens.php:39
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr "Этот канал ограничен %d токенами"
 
-#: ../../Zotlabs/Module/Cdav.php:1468
-msgid "Default Addressbook"
-msgstr "�дре�на� книга по умолчанию"
+#: ../../Zotlabs/Module/Tokens.php:45
+msgid "Name and Password are required."
+msgstr "Требуют�� им� и пароль."
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
-msgstr "Удаленна� информаци� о конфиденциально�ти недо�тупна."
+#: ../../Zotlabs/Module/Tokens.php:85
+msgid "Token saved."
+msgstr "Токен �охранён."
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
-msgstr "Видимо дл�:"
+#: ../../Zotlabs/Module/Tokens.php:99
+msgid "Guest Access App"
+msgstr "Приложение \"Го�тевой до�туп\""
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:123
-msgctxt "acl"
-msgid "Profile"
-msgstr "Профиль"
+#: ../../Zotlabs/Module/Tokens.php:100
+msgid "Create access tokens so that non-members can access private content"
+msgstr "Создайте токены до�тупа, чтобы �торонние пользователи могли получить до�туп к ча�тному �одержимому"
 
-#: ../../Zotlabs/Module/Item.php:757
-msgid "Empty post discarded."
-msgstr "Пу�та� публикаци� отклонена."
+#: ../../Zotlabs/Module/Tokens.php:133
+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/Item.php:1189
-msgid "Duplicate post suppressed."
-msgstr "Подавлена дублирующа��� публикаци�."
+#: ../../Zotlabs/Module/Tokens.php:135
+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 "Вы также можете предо�тавить до�туп в �тиле <em>dropbox</em> дл� друзей и коллег, добавив им� и пароль дл� входа на любой URL-адре� �айта. �апример:"
 
-#: ../../Zotlabs/Module/Item.php:1334
-msgid "System error. Post not saved."
-msgstr "Си�темна� ошибка. Публикаци� не �охранена."
+#: ../../Zotlabs/Module/Tokens.php:170
+msgid "Guest Access Tokens"
+msgstr "Токен го�тевого до�тупа"
 
-#: ../../Zotlabs/Module/Item.php:1368
-msgid "Your comment is awaiting approval."
-msgstr "Ваш комментарий ожидает одобрени�."
+#: ../../Zotlabs/Module/Tokens.php:177
+msgid "Login Name"
+msgstr "Им�"
 
-#: ../../Zotlabs/Module/Item.php:1498
-msgid "Unable to obtain post information from database."
-msgstr "�евозможно получить информацию о публикации из базы данных"
+#: ../../Zotlabs/Module/Tokens.php:178
+msgid "Login Password"
+msgstr "Пароль"
 
-#: ../../Zotlabs/Module/Item.php:1505
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Вы до�тигли вашего ограничени� в %1$.0f публикаций вы�окого уровн�."
+#: ../../Zotlabs/Module/Tokens.php:179
+msgid "Expires (yyyy-mm-dd)"
+msgstr "Срок дей�тви� (yyyy-mm-dd)"
 
-#: ../../Zotlabs/Module/Item.php:1512
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Вы до�тигли вашего ограничени� в %1$.0f  �траниц."
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
 
-#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:209
-msgid "Menu not found."
-msgstr "Меню не найдено"
+#: ../../Zotlabs/Module/Removeme.php:60
+msgid "Remove This Channel"
+msgstr "Удалить �тот канал"
 
-#: ../../Zotlabs/Module/Mitem.php:63
-msgid "Unable to create element."
-msgstr "�евозможно �оздать �лемент."
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be completely removed from the network. "
+msgstr "Этот канал будет полно�тью удалён из �ети. "
 
-#: ../../Zotlabs/Module/Mitem.php:87
-msgid "Unable to update menu element."
-msgstr "�евозможно обновить �лемент меню."
+#: ../../Zotlabs/Storage/Browser.php:292
+msgid "Change filename to"
+msgstr "Переименовать файл в"
 
-#: ../../Zotlabs/Module/Mitem.php:103
-msgid "Unable to add menu element."
-msgstr "�евозможно добавить �лемент меню."
+#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
+msgid "Select a target location"
+msgstr "Выбрать ме�то назначени�"
 
-#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Xchan.php:41
-#: ../../Zotlabs/Module/Menu.php:232
-msgid "Not found."
-msgstr "�е найдено."
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
+msgid "Copy to target location"
+msgstr "Скопировать в ме�то назнаени�"
 
-#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
-msgid "Menu Item Permissions"
-msgstr "Разрешени� на пункт меню"
+#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
+msgid "Set permissions for all files and sub folders"
+msgstr "У�тановить разрешени� дл� в�ех файлов и подкаталогов"
 
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:528
-msgid "(click to open/close)"
-msgstr "(нажмите чтобы открыть/закрыть)"
+#: ../../Zotlabs/Storage/Browser.php:312
+msgid "Notify your contacts about this file"
+msgstr "Сообщить �воим контактам об �том файле"
 
-#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
-msgid "Link Name"
-msgstr "Им� ��ылки"
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "File category"
+msgstr "Категори� файла"
 
-#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
-msgid "Link or Submenu Target"
-msgstr "С�ылка или цель подменю"
+#: ../../Zotlabs/Storage/Browser.php:362
+msgid "Total"
+msgstr "В�его"
 
-#: ../../Zotlabs/Module/Mitem.php:175
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Введите URL ��ылки или выберите им� меню дл� �оздани� подменю"
+#: ../../Zotlabs/Storage/Browser.php:364
+msgid "Shared"
+msgstr "Общие"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
-msgid "Use magic-auth if available"
-msgstr "И�пользовать magic-auth е�ли возможно"
+#: ../../Zotlabs/Storage/Browser.php:366
+msgid "Add Files"
+msgstr "Добавить файлы"
 
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
-msgid "Open link in new window"
-msgstr "Открыть ��ылку в новом окне"
+#: ../../Zotlabs/Storage/Browser.php:369 ../../Zotlabs/Lib/ThreadItem.php:175
+msgid "Admin Delete"
+msgstr "Удалено админи�тратором"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Order in list"
-msgstr "Пор�док в �пи�ке"
+#: ../../Zotlabs/Storage/Browser.php:381
+msgid "parent"
+msgstr "и�точник"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Большие значени� в конце �пи�ка"
+#: ../../Zotlabs/Storage/Browser.php:399
+msgid "Select All"
+msgstr "Выбрать в�ё"
 
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Submit and finish"
-msgstr "Отправить и завершить"
+#: ../../Zotlabs/Storage/Browser.php:400
+msgid "Bulk Actions"
+msgstr "Группова� обработка"
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Submit and continue"
-msgstr "Отправить и продолжить"
+#: ../../Zotlabs/Storage/Browser.php:401
+msgid "Adjust Permissions"
+msgstr "�а�троить разрешени�"
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Menu:"
-msgstr "Меню:"
+#: ../../Zotlabs/Storage/Browser.php:402
+msgid "Move or Copy"
+msgstr "Переме�тить или копировать"
 
-#: ../../Zotlabs/Module/Mitem.php:192
-msgid "Link Target"
-msgstr "Цель ��ылки"
+#: ../../Zotlabs/Storage/Browser.php:405
+msgid "Info"
+msgstr "Информаци�"
 
-#: ../../Zotlabs/Module/Mitem.php:195
-msgid "Edit menu"
-msgstr "Редактировать меню"
+#: ../../Zotlabs/Storage/Browser.php:406
+msgid "Rename"
+msgstr "Переименовать"
 
-#: ../../Zotlabs/Module/Mitem.php:198
-msgid "Edit element"
-msgstr "Редактировать �лемент"
+#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:361
+msgid "Post"
+msgstr "Публикаци�"
 
-#: ../../Zotlabs/Module/Mitem.php:199
-msgid "Drop element"
-msgstr "Удалить �лемент"
+#: ../../Zotlabs/Storage/Browser.php:408
+msgid "Attachment BBcode"
+msgstr "Вложение BBcode"
 
-#: ../../Zotlabs/Module/Mitem.php:200
-msgid "New element"
-msgstr "�овый �лемент"
+#: ../../Zotlabs/Storage/Browser.php:409
+msgid "Embed BBcode"
+msgstr "В�траивание BBcode"
 
-#: ../../Zotlabs/Module/Mitem.php:201
-msgid "Edit this menu container"
-msgstr "Редактировать контейнер меню"
+#: ../../Zotlabs/Storage/Browser.php:410
+msgid "Link BBcode"
+msgstr "С�ылка BBcode"
 
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Add menu element"
-msgstr "Добавить �лемент меню"
+#: ../../Zotlabs/Storage/Browser.php:480
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Вы и�пользуете %1$s из до�тупного вам хранилища файлов."
 
-#: ../../Zotlabs/Module/Mitem.php:203
-msgid "Delete this menu item"
-msgstr "Удалить �тот �лемент меню"
+#: ../../Zotlabs/Storage/Browser.php:485
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Вы и�пользуете %1$s из %2$s до�тупного хранилища файлов (%3$s&#37;)."
 
-#: ../../Zotlabs/Module/Mitem.php:204
-msgid "Edit this menu item"
-msgstr "Редактировать �тот �лемент меню"
+#: ../../Zotlabs/Storage/Browser.php:496
+msgid "WARNING:"
+msgstr "Предупреждение:"
 
-#: ../../Zotlabs/Module/Mitem.php:222
-msgid "Menu item not found."
-msgstr "Элемент меню не найден."
+#: ../../Zotlabs/Storage/Browser.php:537
+msgid "Create new folder"
+msgstr "Создать новую папку"
 
-#: ../../Zotlabs/Module/Mitem.php:235
-msgid "Menu item deleted."
-msgstr "Элемент меню удалён."
+#: ../../Zotlabs/Storage/Browser.php:539
+msgid "Upload file"
+msgstr "Загрузить файл"
 
-#: ../../Zotlabs/Module/Mitem.php:237
-msgid "Menu item could not be deleted."
-msgstr "�евозможно удалить �лемент меню."
+#: ../../Zotlabs/Storage/Browser.php:551
+msgid "Drop files here to immediately upload"
+msgstr "Поме�тите файлы �юда дл� немедленной загрузки"
 
-#: ../../Zotlabs/Module/Mitem.php:244
-msgid "Edit Menu Element"
-msgstr "Редактировать �лемент меню"
+#: ../../Zotlabs/Storage/Browser.php:554
+msgid ""
+"You can select files via the upload button or drop them right here or into "
+"an existing folder."
+msgstr "Вы можете выбрать файлы � помощью кнопки загрузки или перетащить их �юда или в �уще�твующую папку."
 
-#: ../../Zotlabs/Module/Mitem.php:254
-msgid "Link text"
-msgstr "Тек�т ��ылки"
+#: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:23
+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 "Удаленна� группа � �тим названием была во��тановлена. Суще�твующие разрешени� пункт <strong>могут</strong> примен�ть�� к �той группе и к её будущих уча�тников. Е�ли �то не то, чего вы хотели, пожалуй�та, �оздайте другую группу � другим именем."
 
-#: ../../Zotlabs/Module/Profile.php:106
-msgid "vcard"
-msgstr "vCard"
+#: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:271
+msgid "Add new connections to this privacy group"
+msgstr "Добавить новые контакты в группу конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-msgid "Files: shared with me"
-msgstr "Файлы: поделили�ь �о мной"
+#: ../../Zotlabs/Lib/Group.php:302 ../../Zotlabs/Lib/AccessList.php:311
+#: ../../include/group.php:305
+msgid "edit"
+msgstr "редактировать"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-msgid "NEW"
-msgstr "�ОВОЕ"
+#: ../../Zotlabs/Lib/Group.php:325 ../../include/group.php:328
+msgid "Edit group"
+msgstr "Редактировать группу"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
-#: ../../Zotlabs/Storage/Browser.php:380
-msgid "Last Modified"
-msgstr "По�леднее изменение"
+#: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:329
+msgid "Add privacy group"
+msgstr "Добавить группу конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
-msgid "Remove all files"
-msgstr "Удалить в�е файлы"
+#: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:330
+msgid "Channels not in any privacy group"
+msgstr "Каналы не включены ни в одну группу конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:111
-msgid "Remove this file"
-msgstr "Удалить �тот файл"
+#: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Lib/AccessList.php:336
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:332
+msgid "add"
+msgstr "добавить"
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
-msgstr "Пои�к документации"
+#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
+msgid "Channel is blocked on this site."
+msgstr "Канал блокирует�� на �том �айте."
 
-#: ../../Zotlabs/Module/Help.php:85
-msgid "Administrators"
-msgstr "�дмини�траторы"
+#: ../../Zotlabs/Lib/Connect.php:51
+msgid "Channel location missing."
+msgstr "Ме�тоположение канала от�ут�твует."
 
-#: ../../Zotlabs/Module/Help.php:86
-msgid "Developers"
-msgstr "Разработчики"
+#: ../../Zotlabs/Lib/Connect.php:103
+msgid "Remote channel or protocol unavailable."
+msgstr "Удалённый канал или протокол недо�тупен."
 
-#: ../../Zotlabs/Module/Help.php:87
-msgid "Tutorials"
-msgstr "Руковод�тва"
+#: ../../Zotlabs/Lib/Connect.php:137
+msgid "Channel discovery failed."
+msgstr "�е удало�ь обнаружить канал."
 
-#: ../../Zotlabs/Module/Help.php:98
-msgid "$Projectname Documentation"
-msgstr "$Projectname Документаци�"
+#: ../../Zotlabs/Lib/Connect.php:155
+msgid "Protocol disabled."
+msgstr "Протокол отключен."
 
-#: ../../Zotlabs/Module/Help.php:99
-msgid "Contents"
-msgstr "Содержимое"
+#: ../../Zotlabs/Lib/Connect.php:167
+msgid "Cannot connect to yourself."
+msgstr "�ельз� подключить�� к �амому �ебе."
 
-#: ../../Zotlabs/Module/Webpages.php:48
-msgid "Webpages App"
-msgstr "Приложение \"Веб-�траницы\""
+#: ../../Zotlabs/Lib/Connect.php:271
+msgid "error saving data"
+msgstr "ошибка �охранени� данных"
 
-#: ../../Zotlabs/Module/Webpages.php:49
-msgid "Provide managed web pages on your channel"
-msgstr "Предо�тавл�ть управл�емые веб-�траницы на Вашем канале"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:67
+msgid "Source code of failed update: "
+msgstr "И�ходный код неудачного обновлени�: "
 
-#: ../../Zotlabs/Module/Webpages.php:69
-msgid "Import Webpage Elements"
-msgstr "Импортировать ча�ти веб-�траницы"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:88
+#, php-format
+msgid "Update Error at %s"
+msgstr "Ошибка обновлени� на %s"
 
-#: ../../Zotlabs/Module/Webpages.php:70
-msgid "Import selected"
-msgstr "Импортировать выбранное"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:94
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Выполнение %s неудачно. Проверьте �и�темный журнал."
 
-#: ../../Zotlabs/Module/Webpages.php:93
-msgid "Export Webpage Elements"
-msgstr "Эк�портировать ча�ть веб-�траницы"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:42
+#: ../../Zotlabs/Lib/NativeWikiPage.php:94
+msgid "(No Title)"
+msgstr "(нет заголовка)"
 
-#: ../../Zotlabs/Module/Webpages.php:94
-msgid "Export selected"
-msgstr "Эк�портировать выбранное"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:109
+msgid "Wiki page create failed."
+msgstr "�е удало�ь �оздать �траницу Wiki."
 
-#: ../../Zotlabs/Module/Webpages.php:263
-msgid "Actions"
-msgstr "Дей�тви�"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:123
+msgid "Wiki not found."
+msgstr "Wiki не найдена."
 
-#: ../../Zotlabs/Module/Webpages.php:264
-msgid "Page Link"
-msgstr "С�ылка �траницы"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:134
+msgid "Destination name already exists"
+msgstr "Им� назначени� уже �уще�твует"
 
-#: ../../Zotlabs/Module/Webpages.php:265
-msgid "Page Title"
-msgstr "Заголовок �траницы"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:167
+#: ../../Zotlabs/Lib/NativeWikiPage.php:368
+msgid "Page not found"
+msgstr "Страница не найдена."
 
-#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:191
-msgid "Created"
-msgstr "Создано"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:200
+msgid "Error reading page content"
+msgstr "Ошибка чтени� �одержимого �траницы"
 
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:192
-msgid "Edited"
-msgstr "Отредактировано"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:359
+#: ../../Zotlabs/Lib/NativeWikiPage.php:409
+#: ../../Zotlabs/Lib/NativeWikiPage.php:480
+#: ../../Zotlabs/Lib/NativeWikiPage.php:522
+msgid "Error reading wiki"
+msgstr "Ошибка чтени� Wiki"
 
-#: ../../Zotlabs/Module/Webpages.php:295
-msgid "Invalid file type."
-msgstr "�еверный тип файла."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:396
+msgid "Page update failed."
+msgstr "�е удало�ь обновить �траницу."
 
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Error opening zip file"
-msgstr "Ошибка открыти� ZIP файла"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:431
+msgid "Nothing deleted"
+msgstr "�ичего не удалено"
 
-#: ../../Zotlabs/Module/Webpages.php:318
-msgid "Invalid folder path."
-msgstr "�еверный путь к каталогу."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:501
+msgid "Compare: object not found."
+msgstr "Сравнение: объект не найден."
 
-#: ../../Zotlabs/Module/Webpages.php:345
-msgid "No webpage elements detected."
-msgstr "�е обнаружено ча�тей веб-�траницы."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+msgid "Page updated"
+msgstr "Страница обновлена"
 
-#: ../../Zotlabs/Module/Webpages.php:420
-msgid "Import complete."
-msgstr "Импорт завершен."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:511
+msgid "Untitled"
+msgstr "�е озаглавлено"
 
-#: ../../Zotlabs/Module/Filestorage.php:14
-#: ../../Zotlabs/Module/Filestorage.php:53
-msgid "Deprecated!"
-msgstr "�е рекомендовано!"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:517
+msgid "Wiki resource_id required for git commit"
+msgstr "Требует�� resource_id Wiki дл� отправки в Git"
 
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Permission Denied."
-msgstr "До�туп запрещен."
+#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
+msgstr "Сообщение"
 
-#: ../../Zotlabs/Module/Filestorage.php:190
-msgid "Edit file permissions"
-msgstr "Редактировать разрешени� файла"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+#: ../../Zotlabs/Widget/Wiki_page_history.php:24
+msgid "Date"
+msgstr "Дата"
 
-#: ../../Zotlabs/Module/Filestorage.php:203
-msgid "Include all files and sub folders"
-msgstr "Включить в�е файлы и подкаталоги"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:580
+#: ../../Zotlabs/Widget/Wiki_page_history.php:26
+msgid "Compare"
+msgstr "Сравнить"
 
-#: ../../Zotlabs/Module/Filestorage.php:204
-msgid "Return to file list"
-msgstr "Вернут�� к �пи�ку файлов"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:618 ../../include/bbcode.php:1050
+#: ../../include/bbcode.php:1238
+msgid "Different viewers will see this text differently"
+msgstr "Различные зрители увид�т �тот тек�т по-разному"
 
-#: ../../Zotlabs/Module/Filestorage.php:206
-#: ../../Zotlabs/Storage/Browser.php:386
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Копировать / в�тавить �тот код дл� прикреплени� файла к публикации"
+#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:739
+msgid "Private Message"
+msgstr "Личное �ообщение"
 
-#: ../../Zotlabs/Module/Filestorage.php:207
-#: ../../Zotlabs/Storage/Browser.php:387
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Копировать / в�тавить �ту URL дл� ��ылки на файл �о �траницы"
+#: ../../Zotlabs/Lib/ThreadItem.php:131
+msgid "Privacy conflict. Discretion advised."
+msgstr "Конфиликт на�троек конфиденциально�ти."
 
-#: ../../Zotlabs/Module/Filestorage.php:209
-msgid "Share this file"
-msgstr "Поделить�� �тим файлом"
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../include/conversation.php:729
+msgid "Select"
+msgstr "Выбрать"
 
-#: ../../Zotlabs/Module/Filestorage.php:210
-msgid "Show URL to this file"
-msgstr "Показать URL �того файла"
+#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+msgid "I will attend"
+msgstr "Я буду уча�твовать"
 
-#: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Storage/Browser.php:552
-msgid "Show in your contacts shared folder"
-msgstr "Показать общий каталог в ваших контактах"
+#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+msgid "I will not attend"
+msgstr "Я не буду уча�твовать"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
-msgstr "Тег удалён"
+#: ../../Zotlabs/Lib/ThreadItem.php:206 ../../Zotlabs/Widget/Pinned.php:70
+msgid "I might attend"
+msgstr "Я возможно буду при�ут�твовать"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
-msgstr "Удалить тег �лемента"
+#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+msgid "I agree"
+msgstr "Я �огла�ен"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
-msgstr "Выбрать тег дл� удалени�:"
+#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+msgid "I disagree"
+msgstr "Я не �огла�ен"
 
-#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
-msgid "Continue"
-msgstr "Продолжить"
+#: ../../Zotlabs/Lib/ThreadItem.php:220 ../../Zotlabs/Widget/Pinned.php:81
+msgid "I abstain"
+msgstr "Я воздержал��"
 
-#: ../../Zotlabs/Module/Connect.php:99
-msgid "Premium Channel Setup"
-msgstr "У�тановка премиального канала"
+#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:734
+msgid "Toggle Star Status"
+msgstr "Переключить �тату� пометки"
 
-#: ../../Zotlabs/Module/Connect.php:101
-msgid "Enable premium channel connection restrictions"
-msgstr "Включить ограничени� дл� премиального канала"
+#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Widget/Pinned.php:88
+#: ../../include/conversation.php:748
+msgid "Message signature validated"
+msgstr "Подпи�ь �ообщени� проверена"
 
-#: ../../Zotlabs/Module/Connect.php:102
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Пожалуй�та введите ваши ограничени� или у�лови�, такие, как оплата PayPal, правила и�пользовани� и т.п."
+#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Widget/Pinned.php:89
+#: ../../include/conversation.php:749
+msgid "Message signature incorrect"
+msgstr "Подпи�ь �ообщени� неверна�"
 
-#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Этот канал до подключени� может требовать дополнительных шагов или подтверждений �ледующих у�ловий:"
+#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:935
+msgid "Conversation Tools"
+msgstr "Ин�трументы общени�"
 
-#: ../../Zotlabs/Module/Connect.php:105
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Потенциальные �оединени� будут видеть �ледующий предварительный тек�т:"
+#: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584
+msgid "like"
+msgstr "нравит��"
 
-#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
-msgstr "Продолжа�, � подтверждаю что � выполнил в�е у�лови� пред�тавленные на данной �транице."
+#: ../../Zotlabs/Lib/ThreadItem.php:319 ../../include/taxonomy.php:585
+msgid "dislike"
+msgstr "не нравит��"
 
-#: ../../Zotlabs/Module/Connect.php:115
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Владельцем канала не было пред�тавлено никаких �пециальных ин�трукций.)"
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "Reply on this comment"
+msgstr "Ответить на �тот комментарий"
 
-#: ../../Zotlabs/Module/Connect.php:123
-msgid "Restricted or Premium Channel"
-msgstr "Ограниченный или премиальный канал"
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "reply"
+msgstr "ответить"
 
-#: ../../Zotlabs/Module/Cloud.php:120
-msgid "Not found"
-msgstr "�е найдено."
+#: ../../Zotlabs/Lib/ThreadItem.php:320
+msgid "Reply to"
+msgstr "Ответить"
 
-#: ../../Zotlabs/Module/Cloud.php:130
-msgid "Unknown error"
-msgstr "�еизве�тна� ошибка"
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
+msgid "Share This"
+msgstr "Поделить�� �тим"
 
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Widget/Pinned.php:99
+msgid "share"
+msgstr "поделить��"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:340
+msgid "Delivery Report"
+msgstr "Отчёт о до�тавке"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:359
 #, php-format
-msgid "&#x1f501; Repeated %1$s's %2$s"
-msgstr "&#x1f501; Повторил %1$s %2$s"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d комментарий"
+msgstr[1] "%d комментари�"
+msgstr[2] "%d комментариев"
 
-#: ../../Zotlabs/Module/Share.php:120
-msgid "Post repeated"
-msgstr "Публикаци� повтор�ет��"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+#, php-format
+msgid "%d unseen"
+msgstr "новых %d"
 
-#: ../../Zotlabs/Module/Acl.php:370
-msgid "network"
-msgstr "�еть"
+#: ../../Zotlabs/Lib/ThreadItem.php:413
+msgid "to"
+msgstr "к"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
-msgid "Item is not editable"
-msgstr "Элемент нельз� редактировать"
+#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Messages.php:90
+#: ../../Zotlabs/Widget/Pinned.php:127
+msgid "via"
+msgstr "через"
 
-#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:150
-msgid "Edit post"
-msgstr "Редактировать �ообщение"
+#: ../../Zotlabs/Lib/ThreadItem.php:415
+msgid "Wall-to-Wall"
+msgstr "Стена-на-Стену"
 
-#: ../../Zotlabs/Module/Tagger.php:50
-msgid "Post not found."
-msgstr "Публикаци� не найдена"
+#: ../../Zotlabs/Lib/ThreadItem.php:416
+msgid "via Wall-To-Wall:"
+msgstr "через Стена-на-Стену:"
 
-#: ../../Zotlabs/Module/Tagger.php:121
+#: ../../Zotlabs/Lib/ThreadItem.php:430 ../../Zotlabs/Widget/Pinned.php:132
+#: ../../include/conversation.php:809
 #, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s отметил тегом %4$s %3$s %2$s"
+msgid "from %s"
+msgstr "от %s"
 
-#: ../../Zotlabs/Module/Authorize.php:17
-msgid "Unknown App"
-msgstr "�еизве�тное приложение"
+#: ../../Zotlabs/Lib/ThreadItem.php:433 ../../Zotlabs/Widget/Pinned.php:135
+#: ../../include/conversation.php:812
+#, php-format
+msgid "last edited: %s"
+msgstr "по�леднее редактирование: %s"
 
-#: ../../Zotlabs/Module/Authorize.php:29
-msgid "Authorize"
-msgstr "�вторизовать"
+#: ../../Zotlabs/Lib/ThreadItem.php:434 ../../Zotlabs/Widget/Pinned.php:136
+#: ../../include/conversation.php:813
+#, php-format
+msgid "Expires: %s"
+msgstr "Срок дей�тви�: %s"
 
-#: ../../Zotlabs/Module/Authorize.php:30
+#: ../../Zotlabs/Lib/ThreadItem.php:444
+msgid "Attend"
+msgstr "По�етить"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:445 ../../Zotlabs/Widget/Pinned.php:141
+msgid "Attendance Options"
+msgstr "Параметры по�ещаемо�ти"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1906
+msgid "Vote"
+msgstr "Голо�овать"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:447 ../../Zotlabs/Widget/Pinned.php:142
+msgid "Voting Options"
+msgstr "Параметры голо�овани�"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:462
+msgid "Go to previous comment"
+msgstr "Перейти к предыдущему комментарию"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:471 ../../Zotlabs/Widget/Pinned.php:154
+msgid "Pinned post"
+msgstr "Прикреплённа� заметка"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../Zotlabs/Widget/Pinned.php:155
+#: ../../include/js_strings.php:39
+msgid "Unpin from the top"
+msgstr "Открепить"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:473 ../../include/js_strings.php:38
+msgid "Pin to the top"
+msgstr "Прикрепить �верху"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:474
+#: ../../extend/addon/hzaddons/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
+msgstr "Сохранить в закладках"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:475
+msgid "Add to Calendar"
+msgstr "Добавить в календарь"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:502 ../../include/conversation.php:516
+msgid "This is an unsaved preview"
+msgstr "Это не�охранённый про�мотр"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:535 ../../include/js_strings.php:7
 #, php-format
-msgid "Do you authorize the app %s to access your channel data?"
-msgstr "�вторизуете ли вы приложение %s дл� до�тупа к данным вашего канала?"
+msgid "%s show all"
+msgstr "%s показать в�ё"
 
-#: ../../Zotlabs/Module/Authorize.php:33
-#: ../../Zotlabs/Module/Admin/Accounts.php:319
-msgid "Deny"
-msgstr "Запретить"
+#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1446
+#: ../../extend/addon/hzaddons/hsse/hsse.php:200
+msgid "Bold"
+msgstr "Жирный"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
-msgstr "Стати�тика очереди"
+#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1447
+#: ../../extend/addon/hzaddons/hsse/hsse.php:201
+msgid "Italic"
+msgstr "Кур�ив"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
-msgstr "В�его запи�ей"
+#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1448
+#: ../../extend/addon/hzaddons/hsse/hsse.php:202
+msgid "Underline"
+msgstr "Подчеркнутый"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
-msgstr "Приоритет"
+#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1449
+#: ../../extend/addon/hzaddons/hsse/hsse.php:203
+msgid "Quote"
+msgstr "Цитата"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
-msgstr "Конечный URL-адре�"
+#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1450
+#: ../../extend/addon/hzaddons/hsse/hsse.php:204
+msgid "Code"
+msgstr "Код"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
-msgstr "Пометить хаб как по�то�нно отключенный"
+#: ../../Zotlabs/Lib/ThreadItem.php:833
+msgid "Image"
+msgstr "Изображение"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
-msgstr "О�вободить очередь дл� �того хаба"
+#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1451
+#: ../../extend/addon/hzaddons/hsse/hsse.php:205
+msgid "Attach/Upload file"
+msgstr "Прикрепить/загрузить файл"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
-msgstr "По�ледний изве�тный контакт"
+#: ../../Zotlabs/Lib/ThreadItem.php:835
+msgid "Insert Link"
+msgstr "В�тавить ��ылку"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
-msgstr "�а�тройки темы обновленны."
+#: ../../Zotlabs/Lib/ThreadItem.php:836
+msgid "Video"
+msgstr "Видео"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
-msgstr "Темы не найдены."
+#: ../../Zotlabs/Lib/ThreadItem.php:846
+msgid "Your full name (required)"
+msgstr "Ваше полное им� (требует��)"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-#: ../../Zotlabs/Module/Admin/Addons.php:311
-msgid "Disable"
-msgstr "Запретить"
+#: ../../Zotlabs/Lib/ThreadItem.php:847
+msgid "Your email address (required)"
+msgstr "Ваш адре� �лектронной почты (требует��)"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-#: ../../Zotlabs/Module/Admin/Addons.php:314
-msgid "Enable"
-msgstr "Разрешить"
+#: ../../Zotlabs/Lib/ThreadItem.php:848
+msgid "Your website URL (optional)"
+msgstr "URL вашего веб�айта (необ�зательно)"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
-msgstr "Снимок �крана"
+#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:142
+msgid "Directory Options"
+msgstr "Параметры каталога"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Security.php:98
-#: ../../Zotlabs/Module/Admin/Accounts.php:307
-#: ../../Zotlabs/Module/Admin/Site.php:408
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Addons.php:342
-#: ../../Zotlabs/Module/Admin/Addons.php:440 ../../Zotlabs/Module/Admin.php:141
-msgid "Administration"
-msgstr "�дмини�трирование"
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:144
+msgid "Safe Mode"
+msgstr "Безопа�ный режим"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-#: ../../Zotlabs/Module/Admin/Addons.php:344
-msgid "Toggle"
-msgstr "Переключить"
+#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../include/dir_fns.php:145
+msgid "Public Forums Only"
+msgstr "Только публичные форумы"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-#: ../../Zotlabs/Module/Admin/Addons.php:352
-msgid "Author: "
-msgstr "�втор: "
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/dir_fns.php:146
+msgid "This Website Only"
+msgstr "Только �тот веб-�айт"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-#: ../../Zotlabs/Module/Admin/Addons.php:353
-msgid "Maintainer: "
-msgstr "Сопровождающий:"
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:33
+msgid "Visible to your default audience"
+msgstr "Видно вашей аудитории по умолчанию."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
-msgstr "[�к�периментальный]"
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:136
+msgid "Only me"
+msgstr "Только мне"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
-msgid "[Unsupported]"
-msgstr "[неподдерживаемый]"
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
+msgstr "Общедо�тупно"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
+msgstr "Любому в �ети $Projectname"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
 #, php-format
-msgid "Lock feature %s"
-msgstr "Заблокировать функцию \"%s\""
+msgid "Any account on %s"
+msgstr "Любой аккаунт в %s"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
-msgstr "Управление дополнительными функци�ми"
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
+msgstr "Любой из моих контактов"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
+msgstr "Только те контакты, кому � дам разрешение"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Любой аутентифицированный (может включать по�етителей их других �етей)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Любые контакты включа� те, которые вы ещё не одобрили"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
 msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
-msgstr "По умолчанию, HTML без фильтрации до�тупен во в�траиваемых медиа. Это небезопа�но."
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Это на�тройка по умолчанию дл� аудитории ваших обычных потоков и публикаций"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
 msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
-msgstr "Рекомендует�� на�троить разрешени� и�пользовать HTML без фильтрации только дл� �ледующих �айтов:"
+"This is your default setting for who can view your default channel profile"
+msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать профиль вашего о�новного канала"
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
+msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваши контакты"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
 msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+"This is your default setting for who can view your file storage and photos"
+msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваше хранилище файлов и фотографий"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Это на�тройка по умолчанию дл� аудитории ваших веб-�траниц"
+
+#: ../../Zotlabs/Lib/Activity.php:2159
+#, php-format
+msgid "Likes %1$s's %2$s"
+msgstr "�равит�� %1$s %2$s"
+
+#: ../../Zotlabs/Lib/Activity.php:2162
+#, php-format
+msgid "Doesn't like %1$s's %2$s"
+msgstr "�е нравит�� %1$s %2$s"
+
+#: ../../Zotlabs/Lib/Activity.php:2168
+#, php-format
+msgid "Will attend %s's event"
+msgstr "При�оединит�� к меропри�тию %s"
+
+#: ../../Zotlabs/Lib/Activity.php:2171
+#, php-format
+msgid "Will not attend %s's event"
+msgstr "�е при�оединит�� к меропри�тию %s"
+
+#: ../../Zotlabs/Lib/Activity.php:2174
+#, php-format
+msgid "May attend %s's event"
+msgstr "Возможно при�оединит�� к меропри�тию %s"
+
+#: ../../Zotlabs/Lib/Activity.php:2177
+#, php-format
+msgid "May not attend %s's event"
+msgstr "Возможно не при�оединит�� к меропри�тию %s"
+
+#: ../../Zotlabs/Lib/Activity.php:3098 ../../Zotlabs/Lib/Activity.php:3290
+#: ../../include/network.php:1742
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1494
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1966
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2174
+msgid "ActivityPub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
-msgstr "�е о�тальные в�троенные материалы будут отфильтрованы, <strong>е�ли </strong> в�троенное �одержимое � �того �айта �вно заблокировано."
+#: ../../Zotlabs/Lib/Apps.php:324
+msgid "Apps"
+msgstr "Приложени�"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
-msgid "Block public"
-msgstr "Блокировать публичный до�туп"
+#: ../../Zotlabs/Lib/Apps.php:325
+msgid "Affinity Tool"
+msgstr "Степень �ход�тва"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
-msgstr "У�тановите флажок дл� блокировки публичного до�тупа ко в�ем другим общедо�тупным �траницам на �том �айте, е�ли вы в на�то�щее врем� не аутентифицированы."
+#: ../../Zotlabs/Lib/Apps.php:328
+msgid "Site Admin"
+msgstr "�дмини�тратор �айта"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid "Provide a cloud root directory"
-msgstr "Предо�тавить корневой каталог в облаке"
+#: ../../Zotlabs/Lib/Apps.php:329
+#: ../../extend/addon/hzaddons/buglink/buglink.php:16
+msgid "Report Bug"
+msgstr "Сообщить об ошибке"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid ""
-"The cloud root directory lists all channel names which provide public files"
-msgstr "В корневом каталоге облака показывают�� в�е имена каналов, которые предо�тавл�ют общедо�тупные файлы"
+#: ../../Zotlabs/Lib/Apps.php:330 ../../include/nav.php:490
+msgid "Bookmarks"
+msgstr "Закладки"
 
-#: ../../Zotlabs/Module/Admin/Security.php:103
-msgid "Show total disk space available to cloud uploads"
-msgstr "Показывать общее до�тупное дл� загрузок ме�то в хранилище"
+#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/nav.php:477 ../../include/nav.php:480
+msgid "Chatrooms"
+msgstr "Чаты"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
-msgid "Set \"Transport Security\" HTTP header"
-msgstr "У�тановить HTTP-заголовок \"Transport Security\""
+#: ../../Zotlabs/Lib/Apps.php:332
+msgid "Content Filter"
+msgstr "Фильтр �одержимого"
 
-#: ../../Zotlabs/Module/Admin/Security.php:105
-msgid "Set \"Content Security Policy\" HTTP header"
-msgstr "У�тановить HTTP-заголовок \"Content Security Policy\""
+#: ../../Zotlabs/Lib/Apps.php:333
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:135
+msgid "Content Import"
+msgstr "Импорт �одержимого"
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
-msgid "Allowed email domains"
-msgstr "Разрешённые домены email"
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Remote Diagnostics"
+msgstr "Удалённа� диагно�тика"
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
-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 "Спи�ок разделённых зап�тыми доменов дл� которых разрешена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены."
+#: ../../Zotlabs/Lib/Apps.php:336
+msgid "Suggest Channels"
+msgstr "Предлагаемые каналы"
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
-msgid "Not allowed email domains"
-msgstr "Запрещённые домены email"
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Stream"
+msgstr "Поток"
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
-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 "Спи�ок разделённых зап�тыми доменов дл� которых запрещена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны."
+#: ../../Zotlabs/Lib/Apps.php:343 ../../include/nav.php:539
+msgid "Wiki"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
-msgid "Allow communications only from these sites"
-msgstr "Разрешить �в�зь только � �тими �айтами"
+#: ../../Zotlabs/Lib/Apps.php:344 ../../include/features.php:104
+msgid "Channel Home"
+msgstr "Главна� канала"
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
+#: ../../Zotlabs/Lib/Apps.php:347 ../../include/nav.php:463
+#: ../../include/nav.php:466 ../../include/features.php:82
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../../Zotlabs/Lib/Apps.php:348 ../../include/features.php:192
+msgid "Directory"
+msgstr "Каталог"
+
+#: ../../Zotlabs/Lib/Apps.php:350
+msgid "Mail"
+msgstr "Перепи�ка"
+
+#: ../../Zotlabs/Lib/Apps.php:353
+msgid "Chat"
+msgstr "Чат"
+
+#: ../../Zotlabs/Lib/Apps.php:355
+msgid "Probe"
+msgstr "Проба"
+
+#: ../../Zotlabs/Lib/Apps.php:356
+msgid "Suggest"
+msgstr "Предложить"
+
+#: ../../Zotlabs/Lib/Apps.php:357
+msgid "Random Channel"
+msgstr "Случайный канал"
+
+#: ../../Zotlabs/Lib/Apps.php:358
+msgid "Invite"
+msgstr "Пригла�ить"
+
+#: ../../Zotlabs/Lib/Apps.php:359 ../../Zotlabs/Widget/Admin.php:26
+msgid "Features"
+msgstr "Функции"
+
+#: ../../Zotlabs/Lib/Apps.php:360
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Язык"
+
+#: ../../Zotlabs/Lib/Apps.php:362
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:58
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:59
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:60
+msgid "Profile Photo"
+msgstr "Фотографи� профил�"
+
+#: ../../Zotlabs/Lib/Apps.php:364 ../../include/features.php:382
+msgid "Profiles"
+msgstr "Редактировать профиль"
+
+#: ../../Zotlabs/Lib/Apps.php:366
+msgid "Notifications"
+msgstr "Оповещени�"
+
+#: ../../Zotlabs/Lib/Apps.php:367
+msgid "Order Apps"
+msgstr "Пор�док приложений"
+
+#: ../../Zotlabs/Lib/Apps.php:368
+msgid "CardDAV"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:370
+msgid "Guest Access"
+msgstr "Го�тевой до�туп"
+
+#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Widget/Notes.php:21
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2625
+msgid "Notes"
+msgstr "Запи�ки"
+
+#: ../../Zotlabs/Lib/Apps.php:372
+msgid "OAuth Apps Manager"
+msgstr "Менеджер OAuth"
+
+#: ../../Zotlabs/Lib/Apps.php:373
+msgid "OAuth2 Apps Manager"
+msgstr "Менеджер OAuth2"
+
+#: ../../Zotlabs/Lib/Apps.php:374
+msgid "PDL Editor"
+msgstr "Редактор PDL"
+
+#: ../../Zotlabs/Lib/Apps.php:377
+msgid "My Chatrooms"
+msgstr "Мои чаты"
+
+#: ../../Zotlabs/Lib/Apps.php:378
+msgid "Channel Export"
+msgstr "Эк�порт канала"
+
+#: ../../Zotlabs/Lib/Apps.php:555
+msgid "Purchase"
+msgstr "Купить"
+
+#: ../../Zotlabs/Lib/Apps.php:560
+msgid "Undelete"
+msgstr "Во��тановить"
+
+#: ../../Zotlabs/Lib/Apps.php:570
+msgid "Add to app-tray"
+msgstr "Добавить в правое меню"
+
+#: ../../Zotlabs/Lib/Apps.php:571
+msgid "Remove from app-tray"
+msgstr "Удалить из правого меню"
+
+#: ../../Zotlabs/Lib/Apps.php:572
+msgid "Pin to navbar"
+msgstr "Добавить на панель навигации"
+
+#: ../../Zotlabs/Lib/Apps.php:573
+msgid "Unpin from navbar"
+msgstr "Удалить � панели навигации"
+
+#: ../../Zotlabs/Lib/AccessList.php:28
 msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
-msgstr "Один �айт на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� без ограничений (по умочанию)."
+"A deleted list with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this list and any future members. If this is "
+"not what you intended, please create another list with a different name."
+msgstr "Во��тановлен удаленный �пи�ок � таким именем. Суще�твующие разрешени� на �лементы <strong>могут</strong> примен�ть�� к �тому �пи�ку и любым будущим уча�тникам. Е�ли не отвечает вашим намерени�м - �оздайте еще один �пи�ок � другим именем."
 
-#: ../../Zotlabs/Module/Admin/Security.php:109
-msgid "Block communications from these sites"
-msgstr "Блокировать �в�зь � �тими �айтами"
+#: ../../Zotlabs/Lib/AccessList.php:286
+msgid "Add new connections to this access list"
+msgstr "Добавить новый контакт в �пи�ок до�тупа"
 
-#: ../../Zotlabs/Module/Admin/Security.php:110
-msgid "Allow communications only from these channels"
-msgstr "Разрешить �в�зь только дл� �тих каналов"
+#: ../../Zotlabs/Lib/AccessList.php:331
+msgid "Lists"
+msgstr "Спи�ки"
 
-#: ../../Zotlabs/Module/Admin/Security.php:110
+#: ../../Zotlabs/Lib/AccessList.php:332
+msgid "Edit list"
+msgstr "Редактировать �пи�ок"
+
+#: ../../Zotlabs/Lib/AccessList.php:333
+msgid "Create new list"
+msgstr "Создать новый �пи�ок"
+
+#: ../../Zotlabs/Lib/AccessList.php:334
+msgid "Channels not in any access list"
+msgstr "Каналы, не вход�щие ни в один �пи�ок до�тупа"
+
+#: ../../Zotlabs/Lib/Enotify.php:60
+msgid "$Projectname Notification"
+msgstr "Оповещение $Projectname "
+
+#: ../../Zotlabs/Lib/Enotify.php:61
+#: ../../extend/addon/hzaddons/diaspora/util.php:337
+#: ../../extend/addon/hzaddons/diaspora/util.php:350
+#: ../../extend/addon/hzaddons/diaspora/p.php:48
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../Zotlabs/Lib/Enotify.php:63
+msgid "Thank You,"
+msgstr "Спа�ибо,"
+
+#: ../../Zotlabs/Lib/Enotify.php:65
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:33
+#, php-format
+msgid "%s Administrator"
+msgstr "админи�тратор %s"
+
+#: ../../Zotlabs/Lib/Enotify.php:66
+#, php-format
+msgid "This email was sent by %1$s at %2$s."
+msgstr "Это пи�ьмо было отправлено %1$s на %2$s."
+
+#: ../../Zotlabs/Lib/Enotify.php:67
+#, php-format
 msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
-msgstr "Один канал (или его х�ш) на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� � любым каналом (по умолчанию)."
+"To stop receiving these messages, please adjust your Notification Settings "
+"at %s"
+msgstr "Чтобы прекратить получать �ти �ообщени�, на�тройте параметры уведомлений в %s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:111
-msgid "Block communications from these channels"
-msgstr "Блокировать �в�зь � �тими каналами"
+#: ../../Zotlabs/Lib/Enotify.php:68
+#, php-format
+msgid "To stop receiving these messages, please adjust your %s."
+msgstr "Чтобы прекратить получать �ти �ообщени�, пожалуй�та измените %s."
 
-#: ../../Zotlabs/Module/Admin/Security.php:112
-msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr "Разрешать в�траивание только дл� безопа�ных (SSL/TLS) �айтов и ��ылок."
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr "Разрешить  в�траивать нефильтруемое HTML-�одержимое только дл� �тих доменов"
+#: ../../Zotlabs/Lib/Enotify.php:127
+#, php-format
+msgid "[$Projectname:Notify] New direct message received at %s"
+msgstr "[$Projectname:Notify] Получено новое �ообщение в %s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "One site per line. By default embedded content is filtered."
-msgstr "Один �айт на �троку. По умолчанию в�траиваемое �одержимое фильтрует��."
+#: ../../Zotlabs/Lib/Enotify.php:129
+#, php-format
+msgid "%1$s sent you a new direct message at %2$s."
+msgstr "%1$s отправил вам новое �ообщение в %2$s."
 
-#: ../../Zotlabs/Module/Admin/Security.php:114
-msgid "Block embedded HTML from these domains"
-msgstr "Блокировать в�траивание HTML-�одержимого дл� �тих доменов"
+#: ../../Zotlabs/Lib/Enotify.php:130
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s отправил вам %2$s."
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "Allow SVG thumbnails in file browser"
-msgstr "Разрешить SVG миниатюры в про�мотрщике файлов"
+#: ../../Zotlabs/Lib/Enotify.php:130
+msgid "a direct message"
+msgstr "�ообщение"
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "WARNING: SVG images may contain malicious code."
-msgstr "Внимание: изображени� SVG могут �одержать вредоно�ный код."
+#: ../../Zotlabs/Lib/Enotify.php:131
+#, php-format
+msgid "Please visit %s to view and/or reply to your direct messages."
+msgstr "Пожалуй�та, по�етите %s дл� про�мотра и/или ответа на ваши �ообщени�."
 
-#: ../../Zotlabs/Module/Admin/Security.php:116
-msgid "Allow embedded (inline) PDF files"
-msgstr "Разрешить в�траивание дл� файлов PDF"
+#: ../../Zotlabs/Lib/Enotify.php:144
+msgid "commented on"
+msgstr "прокомментировал"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:128
+#: ../../Zotlabs/Lib/Enotify.php:157
+msgid "liked"
+msgstr "понравило�ь"
+
+#: ../../Zotlabs/Lib/Enotify.php:160
+msgid "disliked"
+msgstr "не понравило�ь"
+
+#: ../../Zotlabs/Lib/Enotify.php:165
+msgid "voted on"
+msgstr "проголо�овал в"
+
+#: ../../Zotlabs/Lib/Enotify.php:208
 #, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] "%s аккаунт блокирован/разблокирован"
-msgstr[1] "%s аккаунта блокированы/разблокированы"
-msgstr[2] "%s аккаунтов блокированы/разблокированы"
+msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:135
+#: ../../Zotlabs/Lib/Enotify.php:216
 #, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] "%s аккаунт удалён"
-msgstr[1] "%s аккаунта удалёны"
-msgstr[2] "%s аккаунтов удалёны"
+msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Account not found"
-msgstr "�ккаунт не найден"
+#: ../../Zotlabs/Lib/Enotify.php:225
+#, php-format
+msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s %2$s [zrl=%3$s]ваш %4$s[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:192
+#: ../../Zotlabs/Lib/Enotify.php:237
 #, php-format
-msgid "Account '%s' blocked"
-msgstr "�ккаунт '%s' заблокирован"
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Отмодерирован комментарий к бе�еде #%1$d по %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:200
+#: ../../Zotlabs/Lib/Enotify.php:239
 #, php-format
-msgid "Account '%s' unblocked"
-msgstr "�ккаунт '%s' разблокирован"
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Комментарий к бе�еде #%1$d по %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:240
-msgid "Unverified"
-msgstr "�епроверено"
+#: ../../Zotlabs/Lib/Enotify.php:240
+#, php-format
+msgid "%1$s commented on an item/conversation you have been following."
+msgstr "%1$s прокомментировал тему / бе�еду за которым вы �ледите."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:243
-msgid "Expired"
-msgstr "И�тёк"
+#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324
+#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365
+#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Пожалуй�та, по�етите %s дл� про�мотра и / или ответа в бе�еде."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show verified registrations"
-msgstr "Показать проверенные реги�трации"
+#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
+msgstr "Пожалуй�та по�етитет %s дл� одобрени� и отклонени� комментари�."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show all registrations"
-msgstr "Показать в�е реги�трации"
+#: ../../Zotlabs/Lib/Enotify.php:306
+#, php-format
+msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
+msgstr "%1$s понравил�� [zrl=%2$s]ваш %3$s[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:312
-msgid "Select toggle"
-msgstr "Выбрать"
+#: ../../Zotlabs/Lib/Enotify.php:320
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Бе�еда получила отметку \"нравит��\" #%1$d от %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:313
-msgid "Deny selected"
-msgstr "Запретить выбранное"
+#: ../../Zotlabs/Lib/Enotify.php:321
+#, php-format
+msgid "%1$s liked an item/conversation you created."
+msgstr "%1$s нравит�� тема / бе�еда которую вы �оздали."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:314
-msgid "Approve selected"
-msgstr "Утвердить выбранное"
+#: ../../Zotlabs/Lib/Enotify.php:332
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
+msgstr "[$Projectname:Notify] %s �делал публикацию на �тене вашего профил�"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "All registrations"
-msgstr "В�е реги�трации"
+#: ../../Zotlabs/Lib/Enotify.php:334
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s �делал публикацию на �тене вашего профил� в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "Verified registrations waiting for approval"
-msgstr "Проверенные реги�трации ожидающие утверждени�"
+#: ../../Zotlabs/Lib/Enotify.php:336
+#, php-format
+msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
+msgstr "%1$s опубликовал на [zrl=%2$s]вашей �тене[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Request date"
-msgstr "Дата запро�а"
+#: ../../Zotlabs/Lib/Enotify.php:359
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
+msgstr "[$Projectname:Notify] %s отметил ва�"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Requests"
-msgstr "Запро�ы"
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s отметил ва� в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No registrations available"
-msgstr "�ет до�тупных реги�траций"
+#: ../../Zotlabs/Lib/Enotify.php:361
+#, php-format
+msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
+msgstr "%1$s [zrl=%2$s]отметил ва�[/zrl]."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No verified registrations available"
-msgstr "�ет до�тупных подтвержденных реги�траций "
+#: ../../Zotlabs/Lib/Enotify.php:372
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
+msgstr "[$Projectname:Notify] %1$s ткнул ва�"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:321
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Block"
-msgstr "Блокировать"
+#: ../../Zotlabs/Lib/Enotify.php:373
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s ткнул ва� в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:322
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Unblock"
-msgstr "Разблокировать"
+#: ../../Zotlabs/Lib/Enotify.php:374
+#, php-format
+msgid "%1$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s [zrl=%2$s]ткнул ва�[/zrl]."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:323
-msgid "Verified"
-msgstr "Подтверждён"
+#: ../../Zotlabs/Lib/Enotify.php:389
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
+msgstr "[$Projectname:Notify] %s отметил вашу публикацию"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:324
-msgid "Not yet verified"
-msgstr "Ещё не проверено"
+#: ../../Zotlabs/Lib/Enotify.php:390
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s отметил вашу публикацию на %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:329
-msgid "ID"
-msgstr ""
+#: ../../Zotlabs/Lib/Enotify.php:391
+#, php-format
+msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
+msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:331
-msgid "All channels"
-msgstr "В�е каналы"
+#: ../../Zotlabs/Lib/Enotify.php:402
+msgid "[$Projectname:Notify] Introduction received"
+msgstr "[$Projectname:Notify] Получено приглашение"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:332
-msgid "Register date"
-msgstr "Дата реги�трации"
+#: ../../Zotlabs/Lib/Enotify.php:403
+#, php-format
+msgid "You've received an new connection request from '%1$s' at %2$s"
+msgstr "Вы получили новый запро� контакта от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:333
-msgid "Last login"
-msgstr "По�ледний вход"
+#: ../../Zotlabs/Lib/Enotify.php:404
+#, php-format
+msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
+msgstr "Вы получили [zrl=%1$s]новый запро� контакта[/zrl] от %2$s."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:334
-msgid "Expires"
-msgstr "Срок дей�тви�"
+#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Вы можете увидеть его профиль по ��ылке %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:335
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Service class"
-msgstr "Кла�� об�луживани�"
+#: ../../Zotlabs/Lib/Enotify.php:409
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Пожалуй�та, по�етите %s, чтобы одобрить или отклонить запро� контакта."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:337
-msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
-"on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Выбранные учётные запи�и будут удалены!\n\nВ�ё что было ими опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
+#: ../../Zotlabs/Lib/Enotify.php:416
+msgid "[$Projectname:Notify] Friend suggestion received"
+msgstr "[$Projectname:Notify] Получено предложение дружить"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:338
-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 "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
+#: ../../Zotlabs/Lib/Enotify.php:417
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Вы получили предложение дружить от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:112
-msgid "Invalid input"
-msgstr "�еверный ввод"
+#: ../../Zotlabs/Lib/Enotify.php:418
+#, php-format
+msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
+msgstr "Вы получили [zrl=%1$s]предложение дружить[/zrl] дл� %2$s от %3$s."
 
-#: ../../Zotlabs/Module/Admin/Site.php:132
-msgid "Errors"
-msgstr "Ошибки"
+#: ../../Zotlabs/Lib/Enotify.php:423
+msgid "Name:"
+msgstr "Им�:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:225
-msgid "Site settings updated."
-msgstr "�а�тройки �айта обновлены."
+#: ../../Zotlabs/Lib/Enotify.php:424
+msgid "Photo:"
+msgstr "Фото:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:262
-#: ../../Zotlabs/Module/Settings/Display.php:118
+#: ../../Zotlabs/Lib/Enotify.php:427
 #, php-format
-msgid "%s - (Incompatible)"
-msgstr "%s - (не�овме�тимо)"
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Пожалуй�та, по�етите %s, чтобы одобрить или отклонить предложение."
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
-msgid "mobile"
-msgstr "мобильный"
+#: ../../Zotlabs/Lib/Enotify.php:652
+msgid "[$Projectname:Notify]"
+msgstr "[$Projectname:Уведомление]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:271
-msgid "experimental"
-msgstr "�к�периментальный"
+#: ../../Zotlabs/Lib/Enotify.php:820
+msgid "created a new poll"
+msgstr "�оздал новый опро�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
-msgid "unsupported"
-msgstr "неподдерживаемый"
+#: ../../Zotlabs/Lib/Enotify.php:820
+msgid "created a new post"
+msgstr "�оздал новую публикацию"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
-msgid "Yes - with approval"
-msgstr "Да - требует подтверждени�"
+#: ../../Zotlabs/Lib/Enotify.php:821
+#, php-format
+msgid "voted on %s's poll"
+msgstr "проголо�ова в опро�е %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
-msgid "My site is not a public server"
-msgstr "Мой �айт не �вл�ет�� публичным �ервером"
+#: ../../Zotlabs/Lib/Enotify.php:821
+#, php-format
+msgid "commented on %s's post"
+msgstr "прокомментировал публикацию %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
-msgid "My site has paid access only"
-msgstr "Мой �айт до�тупен только � оплатой "
+#: ../../Zotlabs/Lib/Enotify.php:825
+#, php-format
+msgid "repeated %s's post"
+msgstr "разме�тил публикацию %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
-msgid "My site has free access only"
-msgstr "�а моём �айте разрешён �вободный до�туп"
+#: ../../Zotlabs/Lib/Enotify.php:829 ../../Zotlabs/Lib/Enotify.php:931
+msgid "shared a file with you"
+msgstr "� вами поделили�ь файлом"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
-msgid "My site offers free accounts with optional paid upgrades"
-msgstr "�а моём �айте разрешены бе�платные аккаунты � дополнительными платными у�лугами"
+#: ../../Zotlabs/Lib/Enotify.php:837
+#, php-format
+msgid "edited a post dated %s"
+msgstr "отредактировал публикацию датированную %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid "Default permission role for new accounts"
-msgstr "Разрешени� по умолчанию дл� новых аккаунтов"
+#: ../../Zotlabs/Lib/Enotify.php:841
+#, php-format
+msgid "edited a comment dated %s"
+msgstr "отредактировал комментарий датированный %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid ""
-"This role will be used for the first channel created after registration."
-msgstr "Эта роль будет и�пользовать�� дл� первого канала, �озданного по�ле реги�трации."
+#: ../../Zotlabs/Lib/Enotify.php:914
+msgid "added your channel"
+msgstr "добавил ваш канал"
 
-#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
-msgid "Minute(s)"
-msgstr "Минут"
+#: ../../Zotlabs/Lib/Enotify.php:948
+msgid "sent you a direct message"
+msgstr "отправил вам �ообщение"
 
-#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399
-msgid "Hour(s)"
-msgstr "Ча�ов"
+#: ../../Zotlabs/Lib/Enotify.php:957
+msgid "g A l F d"
+msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400
-msgid "Day(s)"
-msgstr "Дней"
+#: ../../Zotlabs/Lib/Enotify.php:960
+msgid "[today]"
+msgstr "[�егодн�]"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
-msgid "Week(s)"
-msgstr "�едель"
+#: ../../Zotlabs/Lib/Enotify.php:970
+msgid "created an event"
+msgstr "�оздано �обытие"
 
-#: ../../Zotlabs/Module/Admin/Site.php:357
-msgid "Month(s)"
-msgstr "Ме��цев"
+#: ../../Zotlabs/Lib/Enotify.php:986
+msgid "status verified"
+msgstr "�тату� подтверждён"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
-msgid "Year(s)"
-msgstr "Лет"
+#: ../../Zotlabs/Lib/NativeWiki.php:146
+msgid "Wiki updated successfully"
+msgstr "Wiki у�пешно обновлена"
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
-msgid "Register verification delay"
-msgstr "Задержка проверки реги�трации"
+#: ../../Zotlabs/Lib/NativeWiki.php:206
+msgid "Wiki files deleted successfully"
+msgstr "Wiki у�пешно удалена"
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
-msgid "Time to wait before a registration can be verified"
-msgstr "Врем� ожидани� до того, как реги�траци� может быть проверена"
+#: ../../Zotlabs/Lib/Chatroom.php:25
+msgid "Missing room name"
+msgstr "От�ут�твует название комнаты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:372
-#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
-msgid "duration up from now"
-msgstr "продолжительно�ть � на�то�щего момента"
+#: ../../Zotlabs/Lib/Chatroom.php:34
+msgid "Duplicate room name"
+msgstr "�азвание комнаты дублирует��"
 
-#: ../../Zotlabs/Module/Admin/Site.php:388
-msgid "Register verification expiration time"
-msgstr "Врем� и�течени� �рока проверки реги�трации"
+#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
+msgid "Invalid room specifier."
+msgstr "�еверный указатель комнаты."
 
-#: ../../Zotlabs/Module/Admin/Site.php:391
-msgid "Time before an unverified registration will expire"
-msgstr "Врем� до и�течени� �рока непроверенной реги�трации "
+#: ../../Zotlabs/Lib/Chatroom.php:124
+msgid "Room not found."
+msgstr "Комната не найдена."
 
-#: ../../Zotlabs/Module/Admin/Site.php:414
-msgid "File upload"
-msgstr "Загрузка файла"
+#: ../../Zotlabs/Lib/Chatroom.php:145
+msgid "Room is full"
+msgstr "Комната переполнена"
 
-#: ../../Zotlabs/Module/Admin/Site.php:415
-msgid "Policies"
-msgstr "Правила"
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
+msgstr "�ачинающий / Базовый"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Banner/Logo"
-msgstr "Баннер / логотип"
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
+msgstr "1. �овичок - не опытный, но желающий учить��"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Unfiltered HTML/CSS/JS is allowed"
-msgstr "Разрешён нефильтруемый HTML/CSS/JS"
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
+msgstr "2. Промежуточный - более удобный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid "Administrator Information"
-msgstr "Информаци� об админи�траторе"
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
+msgstr "3. Продвинутый - очень удобный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Контактна� информаци� дл� админи�траторов �айта. Показывает�� на информационной �транице �айта. Можно и�пользовать BBCode."
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
+msgstr "4. Эк�перт - � умею программировать"
 
-#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
-msgid "Site Information"
-msgstr "Информаци� о �айте"
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
+msgstr "5. Волшебник - возможно � знаю больше чем ты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:424
-msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Публичное видимое опи�ание �айта. Показывает�� на информационной �транице �айта. Можно и�пользовать BBCode."
+#: ../../Zotlabs/Lib/Permcat.php:82
+msgctxt "permcat"
+msgid "default"
+msgstr "по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Site.php:425
-msgid "System language"
-msgstr "Язык �и�темы"
+#: ../../Zotlabs/Lib/Permcat.php:133
+msgctxt "permcat"
+msgid "follower"
+msgstr "поклонник"
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
-msgid "System theme"
-msgstr "Си�темна� тема"
+#: ../../Zotlabs/Lib/Permcat.php:137
+msgctxt "permcat"
+msgid "contributor"
+msgstr "уча�тник"
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Си�темна� тема по умолчанию  - может быть изменена в профиле пользовател� - <a href='#' id='cnftheme'>изменить параметры темы</a>."
+#: ../../Zotlabs/Lib/Permcat.php:141
+msgctxt "permcat"
+msgid "publisher"
+msgstr "издатель"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "Allow Feeds as Connections"
-msgstr "Разрешить ленты ново�тей как контакты"
+#: ../../Zotlabs/Lib/Libsync.php:737
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "�евозможно проверить подпи�ь �айта %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "(Heavy system resource usage)"
-msgstr "(Вы�окое и�пользование �и�темных ре�ур�ов)"
+#: ../../Zotlabs/Lib/Libzot.php:655
+msgid "Unable to verify channel signature"
+msgstr "�евозможно проверить подпи�ь канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
-msgid "Maximum image size"
-msgstr "Мак�имальный размер изображени�"
+#: ../../Zotlabs/Access/PermissionRoles.php:287
+msgid "Social Networking"
+msgstr "Социальна� Сеть"
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Мак�имальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений."
+#: ../../Zotlabs/Access/PermissionRoles.php:288
+msgid "Social - Federation"
+msgstr "Социальна� - Федераци�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age"
-msgstr "Минимальный возра�т"
+#: ../../Zotlabs/Access/PermissionRoles.php:289
+msgid "Social - Mostly Public"
+msgstr "Социальна� - В о�новном обще�твенный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age (in years) for who may register on this site."
-msgstr "Минимальный возра�т (в годах) дл� реги�трации на �том �айте."
+#: ../../Zotlabs/Access/PermissionRoles.php:290
+msgid "Social - Restricted"
+msgstr "Социальна� - Ограниченный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "Which best describes the types of account offered by this hub?"
-msgstr "Как лучше опи�ать тип учётных запи�ей предлагаемых на �том хабе?"
+#: ../../Zotlabs/Access/PermissionRoles.php:291
+msgid "Social - Private"
+msgstr "Социальна� - Ча�тный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "This is displayed on the public server site list."
-msgstr "Это отображает�� в �пи�ке общедо�тупных �ерверов."
+#: ../../Zotlabs/Access/PermissionRoles.php:294
+msgid "Community Forum"
+msgstr "Форум �ообще�тва"
 
-#: ../../Zotlabs/Module/Admin/Site.php:438
-msgid "Register text"
-msgstr "Тек�т реги�трации"
+#: ../../Zotlabs/Access/PermissionRoles.php:295
+msgid "Forum - Mostly Public"
+msgstr "Форум - В о�новном обще�твенный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:440
-msgid "This text will be displayed prominently at the registration page"
-msgstr "Этот тек�т будет отображать�� на видном ме�те на �транице реги�трации"
+#: ../../Zotlabs/Access/PermissionRoles.php:296
+msgid "Forum - Restricted"
+msgstr "Форум - Ограниченный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:444
-msgid "Does this site allow new member registration?"
-msgstr "Разрешает�� ли реги�траци� новых пользователей на �том �айте?"
+#: ../../Zotlabs/Access/PermissionRoles.php:297
+msgid "Forum - Private"
+msgstr "Форум - Ча�тный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:451
-msgid "Configure the registration open days/hours"
-msgstr "�а�тройте рабочие дни / ча�ы реги�трации"
+#: ../../Zotlabs/Access/PermissionRoles.php:300
+msgid "Feed Republish"
+msgstr "Публиковать ленты ново�тей"
 
-#: ../../Zotlabs/Module/Admin/Site.php:453
-msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
-msgstr "Пу�тое значение или '-:-' да�т возможно�ть реги�трировать�� 24/7 (по умолчанию) "
+#: ../../Zotlabs/Access/PermissionRoles.php:301
+msgid "Feed - Mostly Public"
+msgstr "Ленты ново�тей - В о�новном обще�твенный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:454
-msgid ""
-"Weekdays and hours must be separated by colon ':', From-To ranges with a "
-"dash `-` example: 1:800-1200"
-msgstr "Рабочие дни и ча�ы должны быть разделены двоеточием ':', диапазоны от-до - тире '-'. Пример: 1:800-1200"
+#: ../../Zotlabs/Access/PermissionRoles.php:302
+msgid "Feed - Restricted"
+msgstr "Ленты ново�тей - Ограниченный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:455
-msgid ""
-"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
-"2:900-1700"
-msgstr "День недели: пары ча�ов должны быть разделены пробелом ' ' пример: 1:900-1700 2:900-1700"
+#: ../../Zotlabs/Access/PermissionRoles.php:305
+msgid "Special Purpose"
+msgstr "Спец. назначение"
 
-#: ../../Zotlabs/Module/Admin/Site.php:456
-msgid ""
-"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
-"or 1-2,4-5:900-1700"
-msgstr "Диапазоны от-до должны быть разделены зап�той, например: 1:800-1200,1300-1700 или 1-2,4-5:900-1700"
+#: ../../Zotlabs/Access/PermissionRoles.php:306
+msgid "Special - Celebrity/Soapbox"
+msgstr "Спец. назначение - Знаменито�ть/Soapbox"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-msgid "Advanced examples:"
-msgstr "Дополнительные примеры:"
+#: ../../Zotlabs/Access/PermissionRoles.php:307
+msgid "Special - Group Repository"
+msgstr "Спец. назначение - Групповой репозиторий"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-#: ../../Zotlabs/Module/Settings/Channel.php:420
-msgid "or"
-msgstr "или"
+#: ../../Zotlabs/Access/PermissionRoles.php:311
+msgid "Custom/Expert Mode"
+msgstr "Эк�пертный режим"
 
-#: ../../Zotlabs/Module/Admin/Site.php:458
-msgid "Check your configuration"
-msgstr "Проверьте ваши на�тройки"
+#: ../../Zotlabs/Access/Permissions.php:56
+msgid "Can view my channel stream and posts"
+msgstr "Может про�матривать мой поток и �ообщени�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:462
-msgid "Max account registrations per day"
-msgstr "Мак�имальное количе�тво реги�траций в день"
+#: ../../Zotlabs/Access/Permissions.php:57
+msgid "Can send me their channel stream and posts"
+msgstr "Может при�ылать мне �вои потоки и �ообщени�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:464
-msgid "Unlimited if zero or no value - default 50"
-msgstr "Без ограничений е�ли значение не предо�тавлено или равно 0 (по умолчанию 50)"
+#: ../../Zotlabs/Access/Permissions.php:58
+msgid "Can view my default channel profile"
+msgstr "Может про�матривать мой �тандартный профиль канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:468
-msgid "Max account registrations from same IP"
-msgstr "Мак�имальное количе�тво реги�траций � одного IP-адре�а"
+#: ../../Zotlabs/Access/Permissions.php:59
+msgid "Can view my connections"
+msgstr "Может про�матривать мои контакты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:470
-msgid "Unlimited if zero or no value - default 3"
-msgstr "Без ограничений е�ли значение не предо�тавлено или равно 0 (по умолчанию 3)"
+#: ../../Zotlabs/Access/Permissions.php:60
+msgid "Can view my file storage and photos"
+msgstr "Может про�матривать мое хранилище файлов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:476
-msgid "Auto channel create"
-msgstr "�втоматиче�кое �оздание канала"
+#: ../../Zotlabs/Access/Permissions.php:61
+msgid "Can upload/modify my file storage and photos"
+msgstr "Может загружать/измен�ть мои файлы и фотографии в хранилище"
 
-#: ../../Zotlabs/Module/Admin/Site.php:478
-msgid ""
-"If disabled the channel will be created in a separate step during the "
-"registration process"
-msgstr "Е�ли отключено, канал будет �оздан на отдельном �тапе в проце��е реги�трации"
+#: ../../Zotlabs/Access/Permissions.php:62
+msgid "Can view my channel webpages"
+msgstr "Может про�матривать мои веб-�траницы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:482
-msgid "Require invite code"
-msgstr "Требует�� код приглашени�"
+#: ../../Zotlabs/Access/Permissions.php:63
+msgid "Can view my wiki pages"
+msgstr "Может про�матривать мои вики-�траницы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:487
-msgid "Allow invite code"
-msgstr "Разрешить и�пользовать код приглашени�"
+#: ../../Zotlabs/Access/Permissions.php:64
+msgid "Can create/edit my channel webpages"
+msgstr "Может редактировать мои веб-�траницы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:492
-msgid "Require email address"
-msgstr "Требует�� адре� �лектронной почты"
+#: ../../Zotlabs/Access/Permissions.php:65
+msgid "Can write to my wiki pages"
+msgstr "Может редактировать мои вики-�траницы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:494
-msgid "The provided email address will be verified (recommended)"
-msgstr "Предо�тавленный адре� �лектронной почты должен быт подтверждён (рекомендует��)"
+#: ../../Zotlabs/Access/Permissions.php:66
+msgid "Can post on my channel (wall) page"
+msgstr "Может публиковать на моей �транице канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:498
-msgid "Abandon account after x days"
-msgstr "Учётна� запи�ь �читает�� заброшенной по�ле X дней"
+#: ../../Zotlabs/Access/Permissions.php:67
+msgid "Can comment on or like my posts"
+msgstr "Может прокомментировать или отмечать как понравившие�� мои публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:500
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Си�темные ре�ур�ы не будут ра�ходовать�� дл� опро�а внешних �айтов дл� заброшенных аккаунтов. Введите 0 дл� от�ут�тви� ограничений."
+#: ../../Zotlabs/Access/Permissions.php:68
+msgid "Can send me private mail messages"
+msgstr "Может отправл�ть мне личные �ообщени� по �л. почте"
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
-msgid "Site homepage to show visitors (default: login box)"
-msgstr "Домашн�� �траница, котора� будет показывать�� по�етител�м �айт (по умочанию - форма входа)."
+#: ../../Zotlabs/Access/Permissions.php:69
+msgid "Can like/dislike profiles and profile things"
+msgstr "Может комментировать или отмечать как нравит��/ненравит�� мой профиль"
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
-msgid ""
-"example: 'pubstream' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
-msgstr "например: 'pubstream' дл� показа публичного потока, 'page/sys/home' дл� показа �и�темной домашней веб-�траницы или 'include:home.html' дл� включени� файла."
+#: ../../Zotlabs/Access/Permissions.php:70
+msgid "Can forward to all my channel connections via ! mentions in posts"
+msgstr "Может пере�ылать в�ем подпи�чикам моего канала и�пользу� ! в публикаци�х"
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid "Preserve site homepage URL"
-msgstr "Сохранить URL главной �траницы �айта"
+#: ../../Zotlabs/Access/Permissions.php:71
+msgid "Can chat with me"
+msgstr "Может общать�� �о мной в чате"
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
-msgstr "Показывать домашнюю �траницу �айта во фрейме вме�то �тандартной переадре�ации"
+#: ../../Zotlabs/Access/Permissions.php:72
+msgid "Can source my public posts in derived channels"
+msgstr "Может и�пользовать мои публичные �ообщени� в клонированных  лентах �ообщений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
-msgid "Allowed friend domains"
-msgstr "Разрешенные домены друзей"
+#: ../../Zotlabs/Access/Permissions.php:73
+msgid "Can administer my channel"
+msgstr "Может админи�трировать мой канал"
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Спи�ок разделённых зап�тыми доменов � которыми разрешено у�танавливать друже�кие отношени� на �том �айте. Wildcards разрешены. Пу�то означает разрешены любые домены."
+#: ../../Zotlabs/Widget/Cdav.php:37
+msgid "Select Channel"
+msgstr "Выбрать канал"
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
-msgid "Force publish"
-msgstr "Принудительно публиковать"
+#: ../../Zotlabs/Widget/Cdav.php:42
+msgid "Read-write"
+msgstr "Чтение-запи�ь"
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Включите дл� принудительного включени� в�ех учётных запи�ей на данном �айте в каталог."
+#: ../../Zotlabs/Widget/Cdav.php:43
+msgid "Read-only"
+msgstr "Только чтение"
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
-msgid "Import Public Streams"
-msgstr "Импортированные публичные потоки"
+#: ../../Zotlabs/Widget/Cdav.php:127
+msgid "Channel Calendar"
+msgstr "Календарь канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
-msgstr "Импортировать и разрешить публичный до�туп к загружаемым � других �айтов потоков. Внимание - �тот контент не может модерировать��."
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Shared CalDAV Calendars"
+msgstr "Общие календари CalDAV"
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
-msgid "Site only Public Streams"
-msgstr "Публичные потоки только � �айта"
+#: ../../Zotlabs/Widget/Cdav.php:135
+msgid "Share this calendar"
+msgstr "Поделить�� �тим календарём"
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
-msgid ""
-"Allow access to public content originating only from this site if Imported "
-"Public Streams are disabled."
-msgstr "Разрешить до�туп к общедо�тупному контенту, и�ход�щему только � �того �айта, е�ли импортированные публичные потоки отключены."
+#: ../../Zotlabs/Widget/Cdav.php:137
+msgid "Calendar name and color"
+msgstr "Им� и цвет календар�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid "Allow anybody on the internet to access the Public streams"
-msgstr "Разрешить в�ем до�туп к публичным потокам"
+#: ../../Zotlabs/Widget/Cdav.php:139
+msgid "Create new CalDAV calendar"
+msgstr "Создать новый календарь CalDAV"
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid ""
-"Disable to require authentication before viewing. Warning: this content is "
-"unmoderated."
-msgstr "Отключите е�ли дл� про�мотра требует�� аутентификаци�. Внимание - �тот контент не может модерировать��."
+#: ../../Zotlabs/Widget/Cdav.php:141
+msgid "Calendar Name"
+msgstr "Им� календар�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-msgid "Only import Public stream posts with this text"
-msgstr "Импортировать только публичные потоки � �тим тек�том"
+#: ../../Zotlabs/Widget/Cdav.php:142
+msgid "Calendar Tools"
+msgstr "Ин�трументы календар�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-#: ../../Zotlabs/Module/Admin/Site.php:513
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "�лова по одному в �троку, #тег,  /шаблон/ или lang=xxl; о�тавьте пу�тым дл� импорта в�ех публикаций"
+#: ../../Zotlabs/Widget/Cdav.php:144
+msgid "Import calendar"
+msgstr "Импортировать календарь"
 
-#: ../../Zotlabs/Module/Admin/Site.php:513
-msgid "Do not import Public stream posts with this text"
-msgstr "�е импортировать публичные потоки � �тим тек�том"
+#: ../../Zotlabs/Widget/Cdav.php:145
+msgid "Select a calendar to import to"
+msgstr "Выбрать календарь дл� импорта в"
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
-msgid "Login on Homepage"
-msgstr "Вход на домашней �транице"
+#: ../../Zotlabs/Widget/Cdav.php:172
+msgid "Addressbooks"
+msgstr "�дре�ные книги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
-msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
-msgstr "Предо�тавл�ть форму входа дл� по�етителей на домашней �транице е�ли другого �одержимого не на�троено."
+#: ../../Zotlabs/Widget/Cdav.php:174
+msgid "Addressbook name"
+msgstr "Им� адре�ной книги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid "Enable context help"
-msgstr "Включить контек�тную помощь"
+#: ../../Zotlabs/Widget/Cdav.php:176
+msgid "Create new addressbook"
+msgstr "Создать новую адре�ную книгу"
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
-msgstr "Показывать контек�тную помощь дл� текущей �транице при нажатии на кнопку \"Помощь\"."
+#: ../../Zotlabs/Widget/Cdav.php:177
+msgid "Addressbook Name"
+msgstr "Им� адре�ной книги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:519
-msgid "Reply-to email address for system generated email."
-msgstr "�дре� email Reply-to дл� генерируемых �и�темой �ообщений."
+#: ../../Zotlabs/Widget/Cdav.php:179
+msgid "Addressbook Tools"
+msgstr "Ин�трументы адре�ной книги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:520
-msgid "Sender (From) email address for system generated email."
-msgstr "�дре� email отправител� (From) дл� генерируемых �и�темой �ообщений."
+#: ../../Zotlabs/Widget/Cdav.php:180
+msgid "Import addressbook"
+msgstr "Импортировать адре�ную книгу"
 
-#: ../../Zotlabs/Module/Admin/Site.php:521
-msgid "Name of email sender for system generated email."
-msgstr "Им� отправител� дл� генерируемых �и�темой �ообщений."
+#: ../../Zotlabs/Widget/Cdav.php:181
+msgid "Select an addressbook to import to"
+msgstr "Выбрать адре�ную книгу дл� импорта в"
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Directory Server URL"
-msgstr "URL �ервера каталогов"
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
+msgstr "Обзор"
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Default directory server"
-msgstr "Сервер каталогов по умолчанию"
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
+msgstr "�рхивы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
-msgid "Enable SSE Notifications"
-msgstr "Включить уведомлени� SSE"
+#: ../../Zotlabs/Widget/Suggestions.php:53
+msgid "Suggestions"
+msgstr "Рекомендации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
-msgid ""
-"If disabled, traditional polling will be used. Warning: this setting might "
-"not be suited for shared hosting"
-msgstr "Е�ли выключено будет и�пользовать�� традиционный периодиче�кий опро�. Предупреждение: �тот режим не подходит дл� виртуального (shared) хо�тинга"
+#: ../../Zotlabs/Widget/Suggestions.php:54
+msgid "See more..."
+msgstr "Про�мотреть больше..."
 
-#: ../../Zotlabs/Module/Admin/Site.php:527
-msgid "Proxy user"
-msgstr "Им� пользовател� proxy-�ервера"
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
+msgstr "Закладки чатов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:528
-msgid "Proxy URL"
-msgstr "URL proxy-�ервера"
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
+msgstr "Реги�трации уча�тников, ожидающие подверждени�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Network timeout"
-msgstr "Врем� ожидани� �ети"
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
+msgstr "Про�мотр очереди"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Значение в �екундах. Е�ли у�тановлен в 0 - без ограничений (не рекомендует��)."
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
+msgstr "Обновление базы данных"
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
-msgid "Delivery interval"
-msgstr "Интервал до�тавки"
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:200
+msgid "Admin"
+msgstr "�дмини�трирование"
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Значение задержки фоновых проце��ов до�тавки в �екундах дл� �нижени� нагрузки на �и�тему. Рекомендует�� 4-5 дл� �ерверов �овме�тного и�пользовани�, 2-3 дл� ча�тных виртуальных и 0-1 дл� выделенных �ерверов."
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Addon Features"
+msgstr "�а�тройки ра�ширений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
-msgid "Deliveries per process"
-msgstr "До�тавок на проце��"
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
+msgstr "Рекомендуемые чаты"
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust "
-"if necessary to tune system performance. Recommend: 1-5."
-msgstr "Количе�тво до�тавок дл� одного проце��а. �а�тройте в �оответ�твии � производительно�тью �и�темы. Рекомендует�� 1-5."
+#: ../../Zotlabs/Widget/Hq_controls.php:17
+msgid "Toggle post editor"
+msgstr "Переключить редактор �ообщений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid "Queue Threshold"
-msgstr "Порог очереди"
+#: ../../Zotlabs/Widget/Hq_controls.php:29
+msgid "Toggle personal notes"
+msgstr "Переключить личные заметки"
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid ""
-"Always defer immediate delivery if queue contains more than this number of "
-"entries."
-msgstr "В�егда откладывать немедленную до�тавку, е�ли в очереди �одержит�� большее количе�тво запи�ей, чем �то."
+#: ../../Zotlabs/Widget/Affinity.php:54
+msgid "Refresh"
+msgstr "Обновить"
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
-msgid "Poll interval"
-msgstr "Интервал опро�а"
+#: ../../Zotlabs/Widget/Activity_filter.php:37
+#: ../../Zotlabs/Widget/Notifications.php:55
+msgid "Direct Messages"
+msgstr "Личные �ообщени�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Задержка фоновых проце��ов опро�а на указанное количе�тво �екунд дл� �нижени� нагрузки на �и�тему. Е�ли 0 - и�пользовать интервал до�тавки."
+#: ../../Zotlabs/Widget/Activity_filter.php:41
+msgid "Show direct (private) messages"
+msgstr "Показать личные (пр�мые) �ообщени�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
-msgid "Path to ImageMagick convert program"
-msgstr "Путь к ImageMagick"
+#: ../../Zotlabs/Widget/Activity_filter.php:46
+#: ../../Zotlabs/Widget/Notifications.php:74
+msgid "Events"
+msgstr "Событи�"
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
-msgid ""
-"If set, use this program to generate photo thumbnails for huge images ( > "
-"4000 pixels in either dimension), otherwise memory exhaustion may occur. "
-"Example: /usr/bin/convert"
-msgstr "При у�тановке �та программа генерирует миниатюры изображений дл� больших файлов (�выше 4000 в любом измерении) дл� предотвращени� утечки пам�ти. Пример: /usr/bin/convert"
+#: ../../Zotlabs/Widget/Activity_filter.php:50
+msgid "Show posts that include events"
+msgstr "Показывать публикации � �обыти�ми"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid "Maximum Load Average"
-msgstr "Мак�имальна� �редн�� нагрузка"
+#: ../../Zotlabs/Widget/Activity_filter.php:56
+msgid "Polls"
+msgstr "Опро�ы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Мак�имальна� нагрузка �и�темы дл� откладывани� проце��ов опро�а и до�тавки - по умолчанию 50."
+#: ../../Zotlabs/Widget/Activity_filter.php:60
+msgid "Show posts that include polls"
+msgstr "Показывать публикации � опро�ами"
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "Expiration period in days for imported (grid/network) content"
-msgstr "Срок хранени� в дн�х дл� импортированного �одержимого (из матрицы / �ети)."
+#: ../../Zotlabs/Widget/Activity_filter.php:83
+#, php-format
+msgid "Show posts related to the %s privacy group"
+msgstr "Показывать публикации отно��щие�� к группе конфиденциально�ти %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "0 for no expiration of imported content"
-msgstr "0 дл� по�то�нного хранени� импортированного �одержимого"
+#: ../../Zotlabs/Widget/Activity_filter.php:92
+msgid "Show my privacy groups"
+msgstr "Показывать мои группы конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Admin/Site.php:537
-msgid ""
-"Do not expire any posts which have comments less than this many days ago"
-msgstr "Продлевать �трок хранени� дл� любых публикаций, которые имеют комментарии возра�том менее �того значени�"
+#: ../../Zotlabs/Widget/Activity_filter.php:116
+msgid "Show posts to this forum"
+msgstr "Показывать публикации �того форума"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
-msgid ""
-"Public servers: Optional landing (marketing) webpage for new registrants"
-msgstr "Публичные �ерверы: необ�зательна� маркетингова� л�ндинг-�траница дл� новых пользователей"
+#: ../../Zotlabs/Widget/Activity_filter.php:123
+#: ../../Zotlabs/Widget/Notifications.php:124
+#: ../../Zotlabs/Widget/Notifications.php:125
+#: ../../Zotlabs/Widget/Forums.php:100 ../../include/acl_selectors.php:125
+msgid "Forums"
+msgstr "Форумы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
+#: ../../Zotlabs/Widget/Activity_filter.php:127
+msgid "Show forums"
+msgstr "Показывать форумы"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:141
+msgid "Starred Posts"
+msgstr "Отмеченные публикации"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:145
+msgid "Show posts that I have starred"
+msgstr "Показывать публикации которые � отметил"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:156
+msgid "Personal Posts"
+msgstr "Свои публикации"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:160
+msgid "Show posts that mention or involve me"
+msgstr "Показывать публикации где вы были упом�нуты или привлечены"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:183
 #, php-format
-msgid "Create this page first. Default is %s/register"
-msgstr "Создать �ту �траницу первой. По умолчанию %s/register"
+msgid "Show posts that I have filed to %s"
+msgstr "Показывать публикации которые � добавил в %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Page to display after creating a new channel"
-msgstr "Страница дл� показа по�ле �оздани� нового канала"
+#: ../../Zotlabs/Widget/Activity_filter.php:189
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/features.php:318
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Сохранённые каталоги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Default: profiles"
-msgstr "По умолчанию: profiles"
+#: ../../Zotlabs/Widget/Activity_filter.php:193
+msgid "Show filed post categories"
+msgstr "Показывать категории добавленных публикаций"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Optional: site location"
-msgstr "�еоб�зательно: ме�то размещени� �айта"
+#: ../../Zotlabs/Widget/Activity_filter.php:207
+msgid "Panel search"
+msgstr "Панель пои�ка"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Region or country"
-msgstr "Регион или �трана"
+#: ../../Zotlabs/Widget/Activity_filter.php:217
+msgid "Filter by name"
+msgstr "Отфильтровать по имени"
 
-#: ../../Zotlabs/Module/Admin/Site.php:625
-#: ../../Zotlabs/Module/Admin/Site.php:626
-msgid "Invalid 24h time value (hhmm/hmm)"
-msgstr "�еверное 24-ча�овое значение (допу�тимо \"ччмм\" или \"чмм\")"
+#: ../../Zotlabs/Widget/Activity_filter.php:232
+msgid "Remove active filter"
+msgstr "Удалить активный фильтр"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
-msgstr "�а�тройки журнала обновлены."
+#: ../../Zotlabs/Widget/Activity_filter.php:248
+msgid "Stream Filters"
+msgstr "Фильтры потока"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
-msgstr "Очи�тить"
+#: ../../Zotlabs/Widget/Appstore.php:11
+msgid "App Collections"
+msgstr "Коллекции приложений"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
-msgstr "Отладка"
+#: ../../Zotlabs/Widget/Appstore.php:13
+msgid "Installed apps"
+msgstr "У�тановленные приложени�"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
-msgstr "Файл журнала"
+#: ../../Zotlabs/Widget/Notifications.php:17
+msgid "New network activity notifications"
+msgstr "Уведомлени� о новой �етевой активно�ти "
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
-msgstr "Должен быть до�тупен дл� запи�и веб-�ервером. Пу�ть отно�ителен о�новного каталога веб-�айта."
+#: ../../Zotlabs/Widget/Notifications.php:20
+msgid "Network stream"
+msgstr "Сетевой поток"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
-msgstr "Уровень журнала"
+#: ../../Zotlabs/Widget/Notifications.php:23
+#: ../../Zotlabs/Widget/Notifications.php:62
+msgid "Mark all notifications read"
+msgstr "Пометить уведомлени� как прочитанные"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
-#, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] "%s канал цензурирует��/нецензурирует��"
-msgstr[1] "%s канала цензурируют��/нецензурируют��"
-msgstr[2] "%s каналов цензурируют��/нецензурируют��"
+#: ../../Zotlabs/Widget/Notifications.php:26
+#: ../../Zotlabs/Widget/Notifications.php:46
+#: ../../Zotlabs/Widget/Notifications.php:65
+#: ../../Zotlabs/Widget/Notifications.php:157
+msgid "Show new posts only"
+msgstr "Показывать только новые публикации"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
-#, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] "в %s канале код разрешён/запрещён"
-msgstr[1] "в %s каналах код разрешён/запрещён"
-msgstr[2] "в %s каналах код разрешён/запрещён"
+#: ../../Zotlabs/Widget/Notifications.php:27
+#: ../../Zotlabs/Widget/Notifications.php:47
+#: ../../Zotlabs/Widget/Notifications.php:66
+#: ../../Zotlabs/Widget/Notifications.php:127
+#: ../../Zotlabs/Widget/Notifications.php:158
+msgid "Filter by name or address"
+msgstr "Фильтровать по имени или адре�у"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] "%s канал удалён"
-msgstr[1] "%s канала удалены"
-msgstr[2] "%s каналов удалены"
+#: ../../Zotlabs/Widget/Notifications.php:37
+msgid "New home activity notifications"
+msgstr "Уведомлени� о взаимодей�твии � вами"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
-msgid "Channel not found"
-msgstr "Канал не найден"
+#: ../../Zotlabs/Widget/Notifications.php:40
+msgid "Home stream"
+msgstr "Ваш поток"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
-#, php-format
-msgid "Channel '%s' deleted"
-msgstr "Канал '%s' удалён"
+#: ../../Zotlabs/Widget/Notifications.php:43
+#: ../../Zotlabs/Widget/Notifications.php:154
+msgid "Mark all notifications seen"
+msgstr "Пометить уведомлени� как про�мотренные"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' censored"
-msgstr "Канал '%s' цензурирует��"
+#: ../../Zotlabs/Widget/Notifications.php:56
+msgid "New direct messages notifications"
+msgstr "Уведомлени� о новых �ообщени�х"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' uncensored"
-msgstr "Канал '%s' нецензурирует��"
+#: ../../Zotlabs/Widget/Notifications.php:59
+msgid "Direct messages stream"
+msgstr "Поток �ообщений"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Zotlabs/Widget/Notifications.php:75
+msgid "New events notifications"
+msgstr "Уведомлени� о новых �обыти�х"
+
+#: ../../Zotlabs/Widget/Notifications.php:78
+msgid "View events"
+msgstr "Про�мотреть �обыти�"
+
+#: ../../Zotlabs/Widget/Notifications.php:81
+msgid "Mark all events seen"
+msgstr "Пометить в�е �обыти� как про�мотренные"
+
+#: ../../Zotlabs/Widget/Notifications.php:90
+msgid "New connections notifications"
+msgstr "Уведомлени� о новых контактах"
+
+#: ../../Zotlabs/Widget/Notifications.php:93
+msgid "View all connections"
+msgstr "Про�мотр в�ех контактов"
+
+#: ../../Zotlabs/Widget/Notifications.php:102
+msgid "New files notifications"
+msgstr "Уведомлени� о новых файлах"
+
+#: ../../Zotlabs/Widget/Notifications.php:109
+#: ../../Zotlabs/Widget/Notifications.php:110
+msgid "Notices"
+msgstr "Оповещени�"
+
+#: ../../Zotlabs/Widget/Notifications.php:113
+msgid "View all notices"
+msgstr "Про�мотреть в�е оповещени�"
+
+#: ../../Zotlabs/Widget/Notifications.php:116
+msgid "Mark all notices seen"
+msgstr "Пометить в�е оповещени� как про�мотренные"
+
+#: ../../Zotlabs/Widget/Notifications.php:137
+msgid "Registrations"
+msgstr "Реги�трации"
+
+#: ../../Zotlabs/Widget/Notifications.php:138
+msgid "New registrations notifications"
+msgstr "Уведомлени� о новых реги�траци�х"
+
+#: ../../Zotlabs/Widget/Notifications.php:148
+msgid "New public stream notifications"
+msgstr "Уведомлени� о новом в публичном потоке"
+
+#: ../../Zotlabs/Widget/Notifications.php:151
+msgid "Public stream"
+msgstr "Публичный поток"
+
+#: ../../Zotlabs/Widget/Notifications.php:165
+msgid "Sorry, you have got no notifications at the moment"
+msgstr "Извините, но �ейча� у ва� нет уведомлений"
+
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
+msgstr "Ин�трументы дл� �обытий"
+
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
+msgstr "Эк�портировать календарь"
+
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
+msgstr "Импортировать календарь"
+
+#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:46
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:115
+#: ../../include/contact_widgets.php:159 ../../include/contact_widgets.php:204
+#: ../../include/contact_widgets.php:239
+msgid "Everything"
+msgstr "В�ё"
+
+#: ../../Zotlabs/Widget/Conversations.php:15
+msgid "Received Messages"
+msgstr "Полученные �ообщени�"
+
+#: ../../Zotlabs/Widget/Conversations.php:19
+msgid "Sent Messages"
+msgstr "Отправленные �ообщени�"
+
+#: ../../Zotlabs/Widget/Conversations.php:23
+msgid "Conversations"
+msgstr "Бе�еды"
+
+#: ../../Zotlabs/Widget/Conversations.php:33
+msgid "No messages."
+msgstr "Сообщений нет."
+
+#: ../../Zotlabs/Widget/Conversations.php:53
+msgid "Delete conversation"
+msgstr "Удалить бе�еду"
+
+#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+msgid "photo/image"
+msgstr "фотографи� / изображение"
+
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
+msgstr "Уча�тники чата"
+
+#: ../../Zotlabs/Widget/Newmember.php:31
+msgid "Profile Creation"
+msgstr "Создание профил�"
+
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "Upload profile photo"
+msgstr "Загрузить фотографию профил�"
+
+#: ../../Zotlabs/Widget/Newmember.php:34
+msgid "Upload cover photo"
+msgstr "Загрузить фотографию обложки"
+
+#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:120
+msgid "Edit your profile"
+msgstr "Редактировать профиль"
+
+#: ../../Zotlabs/Widget/Newmember.php:38
+msgid "Find and Connect with others"
+msgstr "�айти и в�тупить в контакт"
+
+#: ../../Zotlabs/Widget/Newmember.php:40
+msgid "View the directory"
+msgstr "Про�мотреть каталог"
+
+#: ../../Zotlabs/Widget/Newmember.php:42
+msgid "Manage your connections"
+msgstr "Управление вашими контактами"
+
+#: ../../Zotlabs/Widget/Newmember.php:45
+msgid "Communicate"
+msgstr "Св�зать��"
+
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "View your channel homepage"
+msgstr "Домашн�� �траница канала"
+
+#: ../../Zotlabs/Widget/Newmember.php:48
+msgid "View your network stream"
+msgstr "Про�мотреть ваш �етевой поток"
+
+#: ../../Zotlabs/Widget/Newmember.php:54
+msgid "Documentation"
+msgstr "Документаци�"
+
+#: ../../Zotlabs/Widget/Newmember.php:57
+msgid "Missing Features?"
+msgstr "От�ут�твует функци�?"
+
+#: ../../Zotlabs/Widget/Newmember.php:59
+msgid "Pin apps to navigation bar"
+msgstr "Прикрепить приложение к панели"
+
+#: ../../Zotlabs/Widget/Newmember.php:60
+msgid "Install more apps"
+msgstr "У�тановить больше приложений"
+
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "View public stream"
+msgstr "Про�мотреть публичный поток"
+
+#: ../../Zotlabs/Widget/Activity_order.php:90
+msgid "Commented Date"
+msgstr "По комментари�м"
+
+#: ../../Zotlabs/Widget/Activity_order.php:94
+msgid "Order by last commented date"
+msgstr "Сортировка по дате по�леднего комментари�"
+
+#: ../../Zotlabs/Widget/Activity_order.php:97
+msgid "Posted Date"
+msgstr "По публикаци�м"
+
+#: ../../Zotlabs/Widget/Activity_order.php:101
+msgid "Order by last posted date"
+msgstr "Сортировка по дате по�ледней публикации"
+
+#: ../../Zotlabs/Widget/Activity_order.php:104
+msgid "Date Unthreaded"
+msgstr "По пор�дку"
+
+#: ../../Zotlabs/Widget/Activity_order.php:108
+msgid "Order unthreaded by date"
+msgstr "Сортировка в пор�дке по�туплени�"
+
+#: ../../Zotlabs/Widget/Activity_order.php:123
+msgid "Stream Order"
+msgstr "Упор�дочить поток"
+
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
+msgstr "Удалить выражение"
+
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:310
+msgid "Saved Searches"
+msgstr "Сохранённые пои�ки"
+
+#: ../../Zotlabs/Widget/Messages.php:26
+msgid "Public and restricted messages"
+msgstr "Общедо�тупные и приватные �ообщени�"
+
+#: ../../Zotlabs/Widget/Messages.php:27
+msgid "Direct messages"
+msgstr "Сообщени�"
+
+#: ../../Zotlabs/Widget/Messages.php:28
+msgid "Starred messages"
+msgstr "Помеченные �ообщени�"
+
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
+msgstr "Меню личной перепи�ки"
+
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
+msgstr "Комбинированный вид"
+
+#: ../../Zotlabs/Widget/Mailmenu.php:20
+msgid "Inbox"
+msgstr "Вход�щие"
+
+#: ../../Zotlabs/Widget/Mailmenu.php:25
+msgid "Outbox"
+msgstr "И�ход�щие"
+
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
+msgstr "Ин�трументы оценки"
+
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
+msgstr "Оценить мен�"
+
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
+msgstr "Про�мотр оценок"
+
+#: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:323
+#: ../../include/taxonomy.php:460 ../../include/taxonomy.php:481
+msgid "Tags"
+msgstr "Теги"
+
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
+msgstr "�ктивно�ть"
+
+#: ../../Zotlabs/Widget/Follow.php:22
 #, php-format
-msgid "Channel '%s' code allowed"
-msgstr "Код в канале '%s' разрешён"
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "У ва� е�ть %1$.0f из %2$.0f разрешенных контактов."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
+msgstr "Добавить новый контакт"
+
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
+msgstr "Введите адре� канала"
+
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Пример: ivan@example.com, http://example.com/ivan"
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:34
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
+msgid "Add new page"
+msgstr "Добавить новую �траницу"
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:85
+msgid "Wiki Pages"
+msgstr "Wiki �траницы"
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:96
+msgid "Page name"
+msgstr "�азвание �траницы"
+
+#: ../../Zotlabs/Widget/Cover_photo.php:65
+msgid "Click to show more"
+msgstr "�ажмите чтобы показать больше"
+
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
+msgstr "Задачи"
+
+#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
 #, php-format
-msgid "Channel '%s' code disallowed"
-msgstr "Код в канале '%s' запрещён"
+msgid "View %s's profile - %s"
+msgstr "Про�мотр профил� %s - %s"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
-msgstr "выбрать в�е"
+#: ../../Zotlabs/Widget/Pinned.php:156
+msgid "Don't show"
+msgstr "�е показывать"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-#: ../../Zotlabs/Module/Directory.php:362
-msgid "Censor"
-msgstr "Цензурировать"
+#: ../../Zotlabs/Widget/Settings_menu.php:32
+msgid "Account settings"
+msgstr "�а�тройки аккаунта"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
-#: ../../Zotlabs/Module/Directory.php:362
-msgid "Uncensor"
-msgstr "�ецензурировать"
+#: ../../Zotlabs/Widget/Settings_menu.php:38
+msgid "Channel settings"
+msgstr "�а�тройки канала"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow Code"
-msgstr "Разрешить код"
+#: ../../Zotlabs/Widget/Settings_menu.php:46
+msgid "Display settings"
+msgstr "�а�тройки отображени�"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
-msgid "Disallow Code"
-msgstr "Запретить код"
+#: ../../Zotlabs/Widget/Settings_menu.php:53
+msgid "Manage locations"
+msgstr "Управление ме�тоположением"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
+#: ../../include/event.php:33 ../../include/event.php:110
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:162
-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 "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?"
+#: ../../include/event.php:41
+msgid "Starts:"
+msgstr "�ачало:"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
-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 "Канал {0} будет удалён!\n\nВ�ё что было опубликовано в �том канале на �том �айте будет удалено нав�егда!\n\nВы уверены?"
+#: ../../include/event.php:51
+msgid "Finishes:"
+msgstr "Окончание:"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
-msgstr "Пароль дл� аккаунта %d изменён."
+#: ../../include/event.php:110
+msgid "l F d, Y"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
-msgstr "�а�тройки аккаунта обновлены."
+#: ../../include/event.php:114
+msgid "Start:"
+msgstr "�ачало:"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
-msgstr "Учётна� запи�ь не найдена."
+#: ../../include/event.php:118
+msgid "End:"
+msgstr "Окончание:"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
-msgstr "Редактировать аккаунт"
+#: ../../include/event.php:123
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:67
+msgid "Timezone"
+msgstr "Ча�овой по��"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
-msgstr "�овый пароль"
+#: ../../include/event.php:1106
+msgid "This event has been added to your calendar."
+msgstr "Это �обытие было добавлено в ваш календарь."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
-msgstr "Повторите новый пароль"
+#: ../../include/event.php:1337
+msgid "Not specified"
+msgstr "�е указано"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Account language (for emails)"
-msgstr "Язык �ообщени� дл� email"
+#: ../../include/event.php:1338
+msgid "Needs Action"
+msgstr "Требует дей�тви�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "New Profile Field"
-msgstr "Поле нового профил�"
+#: ../../include/event.php:1339
+msgid "Completed"
+msgstr "Завершено"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "Field nickname"
-msgstr "П�евдоним пол�"
+#: ../../include/event.php:1340
+msgid "In Process"
+msgstr "В проце��е"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "System name of field"
-msgstr "Си�темное им� пол�"
+#: ../../include/event.php:1341
+msgid "Cancelled"
+msgstr "Отменено"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
-msgid "Input type"
-msgstr "Тип ввода"
+#: ../../include/event.php:1424 ../../include/connections.php:736
+msgid "Home, Voice"
+msgstr "Дом, голо�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Field Name"
-msgstr "Им� пол�"
+#: ../../include/event.php:1425 ../../include/connections.php:737
+msgid "Home, Fax"
+msgstr "Дом, фак�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Label on profile pages"
-msgstr "Метка на �транице профил�"
+#: ../../include/event.php:1427 ../../include/connections.php:739
+msgid "Work, Voice"
+msgstr "Работа, голо�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Help text"
-msgstr "Тек�т под�казки"
+#: ../../include/event.php:1428 ../../include/connections.php:740
+msgid "Work, Fax"
+msgstr "Работа, фак�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Additional info (optional)"
-msgstr "Дополнительна� информаци� (необ�зательно)"
+#: ../../include/channel.php:46
+msgid "Unable to obtain identity information from database"
+msgstr "�евозможно получить идентификационную информацию из базы данных"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
-msgid "Field definition not found"
-msgstr "Определени� пол� не найдено"
+#: ../../include/channel.php:79
+msgid "Empty name"
+msgstr "Пу�тое им�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
-msgid "Edit Profile Field"
-msgstr "Редактировать поле профил�"
+#: ../../include/channel.php:82
+msgid "Name too long"
+msgstr "Слишком длинное им�"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
-msgid "Basic Profile Fields"
-msgstr "О�новные пол� профил�"
+#: ../../include/channel.php:199
+msgid "No account identifier"
+msgstr "Идентификатор аккаунта от�ут�твует"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "Advanced Profile Fields"
-msgstr "Дополнительные пол� профил�"
+#: ../../include/channel.php:290
+msgid "Unable to retrieve created identity"
+msgstr "�е удает�� получить �озданный идентификатор"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "(In addition to basic fields)"
-msgstr "(к о�новым пол�м)"
+#: ../../include/channel.php:393
+msgid "Default Profile"
+msgstr "Профиль по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
-msgid "All available fields"
-msgstr "В�е до�тупные пол�"
+#: ../../include/channel.php:590 ../../include/channel.php:679
+msgid "Unable to retrieve modified identity"
+msgstr "�е удает�� найти изменённый идентификатор"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
-msgid "Custom Fields"
-msgstr "�а�траиваемые пол�"
+#: ../../include/channel.php:1330
+msgid "Requested channel is not available"
+msgstr "Запрошенный канал недо�тупен"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
-msgid "Create Custom Field"
-msgstr "Создать на�траиваемое поле"
+#: ../../include/channel.php:1487
+msgid "Create New Profile"
+msgstr "Создать новый профиль"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Update has been marked successful"
-msgstr "Обновление было помечено как у�пешное"
+#: ../../include/channel.php:1490 ../../include/nav.php:120
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:59
+msgid "Edit Profile"
+msgstr "Редактировать профиль"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Verification of update %s failed. Check system logs."
-msgstr "Проверка обновлени� %s не удала�ь. Проверьте �и�темный журнал."
+#: ../../include/channel.php:1508
+msgid "Visible to everybody"
+msgstr "Видно в�ем"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:35
-#: ../../Zotlabs/Module/Admin/Dbsync.php:74
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Обновление %s было у�пешно применено."
+#: ../../include/channel.php:1585 ../../include/channel.php:1713
+msgid "Gender:"
+msgstr "Пол:"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#: ../../include/channel.php:1586 ../../include/channel.php:1757
+msgid "Status:"
+msgstr "Стату�:"
+
+#: ../../include/channel.php:1587 ../../include/channel.php:1781
+msgid "Homepage:"
+msgstr "Домашн�� �траница:"
+
+#: ../../include/channel.php:1588
+msgid "Online Now"
+msgstr "Сейча� в �ети"
+
+#: ../../include/channel.php:1641
+msgid "Change your profile photo"
+msgstr "Изменить фотографию вашего профил�"
+
+#: ../../include/channel.php:1668 ../../include/selectors.php:60
+#: ../../include/selectors.php:77
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:87
+msgid "Female"
+msgstr "Женщина"
+
+#: ../../include/channel.php:1670 ../../include/selectors.php:60
+#: ../../include/selectors.php:77
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:85
+msgid "Male"
+msgstr "Мужчина"
+
+#: ../../include/channel.php:1672
+msgid "Trans"
+msgstr "Тран�ек�уал"
+
+#: ../../include/channel.php:1674 ../../include/selectors.php:60
+msgid "Neuter"
+msgstr "Среднего рода"
+
+#: ../../include/channel.php:1676 ../../include/selectors.php:60
+msgid "Non-specific"
+msgstr "�е�пецифиче�кий"
+
+#: ../../include/channel.php:1718
+msgid "Like this channel"
+msgstr "нравит�� �тот канал"
+
+#: ../../include/channel.php:1742
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1743
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1750
+msgid "Birthday:"
+msgstr "День рождени�:"
+
+#: ../../include/channel.php:1763
 #, php-format
-msgid "Verifying update %s did not return a status. Unknown if it succeeded."
-msgstr "Проверка обновлени� %s не вернула его �о�то�ние. �еизве�тно было ли оно у�пешным."
+msgid "for %1$d %2$s"
+msgstr "дл� %1$d %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#: ../../include/channel.php:1775
+msgid "Tags:"
+msgstr "Теги:"
+
+#: ../../include/channel.php:1779
+msgid "Sexual Preference:"
+msgstr "Сек�уальные предпочтени�:"
+
+#: ../../include/channel.php:1785
+msgid "Political Views:"
+msgstr "Политиче�кие взгл�ды:"
+
+#: ../../include/channel.php:1787
+msgid "Religion:"
+msgstr "Религи�:"
+
+#: ../../include/channel.php:1791
+msgid "Hobbies/Interests:"
+msgstr "Хобби / интере�ы:"
+
+#: ../../include/channel.php:1793
+msgid "Likes:"
+msgstr "Что вам нравит��:"
+
+#: ../../include/channel.php:1795
+msgid "Dislikes:"
+msgstr "Что вам не нравит��:"
+
+#: ../../include/channel.php:1797
+msgid "Contact information and Social Networks:"
+msgstr "Контактна� информаци� и �оциальные �ети:"
+
+#: ../../include/channel.php:1799
+msgid "My other channels:"
+msgstr "Мои другие каналы:"
+
+#: ../../include/channel.php:1801
+msgid "Musical interests:"
+msgstr "Музыкальные интере�ы:"
+
+#: ../../include/channel.php:1803
+msgid "Books, literature:"
+msgstr "Книги, литература:"
+
+#: ../../include/channel.php:1805
+msgid "Television:"
+msgstr "Телевидение:"
+
+#: ../../include/channel.php:1807
+msgid "Film/dance/culture/entertainment:"
+msgstr "Кино / танцы / культура / развлечени�:"
+
+#: ../../include/channel.php:1809
+msgid "Love/Romance:"
+msgstr "Любовь / романтика:"
+
+#: ../../include/channel.php:1811
+msgid "Work/employment:"
+msgstr "Работа / зан�то�ть:"
+
+#: ../../include/channel.php:1813
+msgid "School/education:"
+msgstr "Школа / образование:"
+
+#: ../../include/channel.php:1836
+msgid "Like this thing"
+msgstr "нравит�� �тo"
+
+#: ../../include/channel.php:1837
+msgid "Export"
+msgstr "Эк�порт"
+
+#: ../../include/activities.php:42
+msgid " and "
+msgstr " и "
+
+#: ../../include/activities.php:50
+msgid "public profile"
+msgstr "общедо�тупный профиль"
+
+#: ../../include/activities.php:59
 #, php-format
-msgid "Update %s does not contain a verification function."
-msgstr "Обновление %s не �одержит функцию проверки."
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s изменил %2$s на &ldquo;%3$s&rdquo;"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:46
-#: ../../Zotlabs/Module/Admin/Dbsync.php:81
+#: ../../include/activities.php:60
 #, php-format
-msgid "Update function %s could not be found."
-msgstr "Функци� обновлени� %s не может быть найдена."
+msgid "Visit %1$s's %2$s"
+msgstr "По�етить %1$s %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#: ../../include/activities.php:63
 #, php-format
-msgid "Executing update procedure %s failed. Check system logs."
-msgstr "�е удало�ь выполнить процедуру обновлени� %s.Проверьте �и�темный журнал."
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s обновлено %2$s, изменено %3$s."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#: ../../include/datetime.php:140
+msgid "Birthday"
+msgstr "День рождени�"
+
+#: ../../include/datetime.php:140
+msgid "Age: "
+msgstr "Возра�т:"
+
+#: ../../include/datetime.php:140
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD или MM-DD"
+
+#: ../../include/datetime.php:244
+msgid "less than a second ago"
+msgstr "менее чем одну �екунду"
+
+#: ../../include/datetime.php:262
 #, php-format
-msgid ""
-"Update %s did not return a status. It cannot be determined if it was "
-"successful."
-msgstr "Обновление %s не вернуло �вой �тату�. �евозможно определить было ли оно у�пешным."
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "%1$d %2$s назад"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:99
-msgid "Failed Updates"
-msgstr "Обновлени� � ошибками"
+#: ../../include/datetime.php:273
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "год"
+msgstr[1] "года"
+msgstr[2] "лет"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:101
-msgid "Mark success (if update was manually applied)"
-msgstr "Пометить у�пешным (е�ли обновление было применено вручную)"
+#: ../../include/datetime.php:276
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "ме��ц"
+msgstr[1] "ме��ца"
+msgstr[2] "ме��цев"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:102
-msgid "Attempt to verify this update if a verification procedure exists"
-msgstr "Попытайте�ь проверить �то обновление, е�ли �уще�твует процедура проверки"
+#: ../../include/datetime.php:279
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "неделю"
+msgstr[1] "недели"
+msgstr[2] "недель"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:103
-msgid "Attempt to execute this update step automatically"
-msgstr "Попытать�� применить �тот �тап обновлени� автоматиче�ки"
+#: ../../include/datetime.php:282
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "день"
+msgstr[1] "дн�"
+msgstr[2] "дней"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:108
-msgid "No failed updates."
-msgstr "Ошибок обновлений нет."
+#: ../../include/datetime.php:285
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "ча�"
+msgstr[1] "ча�а"
+msgstr[2] "ча�ов"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:290
+#: ../../include/datetime.php:288
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "минуту"
+msgstr[1] "минуты"
+msgstr[2] "минут"
+
+#: ../../include/datetime.php:291
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "�екунду"
+msgstr[1] "�екунды"
+msgstr[2] "�екунд"
+
+#: ../../include/datetime.php:520
 #, php-format
-msgid "Plugin %s disabled."
-msgstr "Плагин %s отключен."
+msgid "%1$s's birthday"
+msgstr "День рождени� %1$s"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:295
+#: ../../include/datetime.php:521
 #, php-format
-msgid "Plugin %s enabled."
-msgstr "Плагин %s включен."
+msgid "Happy Birthday %1$s"
+msgstr "С Днем рождени� %1$s !"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
-msgid "Minimum project version: "
-msgstr "Минимальна� вер�и� проекта: "
+#: ../../include/language.php:428 ../../include/text.php:2080
+msgid "default"
+msgstr "по умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
-msgid "Maximum project version: "
-msgstr "Мак�имальна� вер�и� проекта: "
+#: ../../include/language.php:441
+msgid "Select an alternate language"
+msgstr "Выбор дополнительного �зыка"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
-msgid "Minimum PHP version: "
-msgstr "Минимальна� вер�и� PHP: "
+#: ../../include/taxonomy.php:323
+msgid "Trending"
+msgstr "В тренде"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:357
-msgid "Compatible Server Roles: "
-msgstr "Совме�тимые роли �ервера: "
+#: ../../include/taxonomy.php:561
+msgid "Keywords"
+msgstr "Ключевые �лова"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:358
-msgid "Requires: "
-msgstr "�еобходимо:"
+#: ../../include/taxonomy.php:582
+msgid "have"
+msgstr "иметь"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:359
-#: ../../Zotlabs/Module/Admin/Addons.php:446
-msgid "Disabled - version incompatibility"
-msgstr "Отключено - не�овме�тимо�ть вер�ий"
+#: ../../include/taxonomy.php:582
+msgid "has"
+msgstr "е�ть"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:415
-msgid "Enter the public git repository URL of the addon repo."
-msgstr "Введите URL публичного репозитори� ра�ширений git"
+#: ../../include/taxonomy.php:583
+msgid "want"
+msgstr "хотеть"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:416
-msgid "Addon repo git URL"
-msgstr "URL репозитори� ра�ширений git"
+#: ../../include/taxonomy.php:583
+msgid "wants"
+msgstr "хотеть"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "Custom repo name"
-msgstr "Пользователь�кое им� репозитори�"
+#: ../../include/taxonomy.php:584
+msgid "likes"
+msgstr "нравит��"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "(optional)"
-msgstr "(необ�зательно)"
+#: ../../include/taxonomy.php:585
+msgid "dislikes"
+msgstr "не нравит��"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:418
-msgid "Download Addon Repo"
-msgstr "Загрузить репозиторий ра�ширений"
+#: ../../include/help.php:81
+msgid "Help:"
+msgstr "Помощь:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:425
-msgid "Install new repo"
-msgstr "У�тановить новый репозиторий"
+#: ../../include/help.php:130
+msgid "Not Found"
+msgstr "�е найдено"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:536
-msgid "Install"
-msgstr "У�тановить"
+#: ../../include/zid.php:403
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s привет�твует %2$s"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:449
-msgid "Manage Repos"
-msgstr "Управление репозитори�ми"
+#: ../../include/oembed.php:153
+msgid "View PDF"
+msgstr "Про�мотреть PDF"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:450
-msgid "Installed Addon Repositories"
-msgstr "У�тановленные репозитории ра�ширений"
+#: ../../include/oembed.php:365
+msgid " by "
+msgstr " из "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:451
-msgid "Install a New Addon Repository"
-msgstr "У�тановить новый репозиторий ра�ширений"
+#: ../../include/oembed.php:366
+msgid " on "
+msgstr " на "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:458
-msgid "Switch branch"
-msgstr "Переключить ветку"
+#: ../../include/oembed.php:395
+msgid "Embedded content"
+msgstr "В�троенное �одержимое"
 
-#: ../../Zotlabs/Module/Apps.php:50
-msgid "Installed Apps"
-msgstr "У�тановленные приложени�"
+#: ../../include/oembed.php:404
+msgid "Embedding disabled"
+msgstr "В�траивание отключено"
 
-#: ../../Zotlabs/Module/Apps.php:53
-msgid "Manage Apps"
-msgstr "Управление приложени�ми"
+#: ../../include/photos.php:151
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Файл превышает предельный размер дл� �айта в %lu байт"
 
-#: ../../Zotlabs/Module/Apps.php:54
-msgid "Create Custom App"
-msgstr "Создать пользователь�кое приложение"
+#: ../../include/photos.php:162
+msgid "Image file is empty."
+msgstr "Файл изображени� пу�т."
 
-#: ../../Zotlabs/Module/Achievements.php:38
-msgid "Some blurb about what to do when you're new here"
-msgstr "�екоторые предложени� о том, что делать, е�ли вы зде�ь новичок "
+#: ../../include/photos.php:324
+msgid "Photo storage failed."
+msgstr "Ошибка хранилища фотографий."
 
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
+#: ../../include/photos.php:373
+msgid "a new photo"
+msgstr "нова� фотографи�"
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
-msgstr "Удалить �тот канал"
+#: ../../include/photos.php:377
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s опубликовал %2$s в %3$s"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
-msgid "WARNING: "
-msgstr "ПРЕДУПРЕЖДЕ�ИЕ: "
+#: ../../include/photos.php:666 ../../include/nav.php:447
+msgid "Photo Albums"
+msgstr "Фотоальбомы"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
-msgstr "Этот канал будет полно�тью удалён из �ети. "
+#: ../../include/photos.php:671
+msgid "Upload New Photos"
+msgstr "Загрузить новые фотографии"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "Это дей�твие необратимо и не может быть отменено!"
+#: ../../include/opengraph.php:56
+#, php-format
+msgid "This is the home page of %s."
+msgstr "Это домашн�� �траница %s."
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
-msgid "Please enter your password for verification:"
-msgstr "Пожалуй�та, введите ваш пароль дл� проверки:"
+#: ../../include/connections.php:134
+msgid "New window"
+msgstr "�овое окно"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-msgid "Remove Channel"
-msgstr "Удаление канала"
+#: ../../include/connections.php:135
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Открыть выбранное ме�тоположение в другом окне или вкладке браузера"
 
-#: ../../Zotlabs/Module/Regate.php:81
-msgid "Email resent"
-msgstr "Электронна� почта повторно отправлена"
+#: ../../include/auth.php:194
+msgid "Delegation session ended."
+msgstr "Делегированна� �е��и� завершена."
 
-#: ../../Zotlabs/Module/Regate.php:81
-msgid "Email resend failed"
-msgstr "Ошибка повторной отправки �лектронной почты"
+#: ../../include/auth.php:198
+msgid "Logged out."
+msgstr "Вышел из �и�темы."
 
-#: ../../Zotlabs/Module/Regate.php:105
-msgid "Verify successfull"
-msgstr "Проверка прошла у�пешно"
+#: ../../include/auth.php:294
+msgid "Email validation is incomplete. Please check your email."
+msgstr "Проверка email не завершена. Пожалуй�та, проверьте вашу почту."
 
-#: ../../Zotlabs/Module/Regate.php:149
-msgid "Account successfull created"
-msgstr "Учётна� запи�ь у�пешно �оздана"
+#: ../../include/auth.php:310
+msgid "Failed authentication"
+msgstr "Ошибка аутентификации"
 
-#: ../../Zotlabs/Module/Regate.php:190
-msgid "Channel successfull created"
-msgstr "Канал у�пешно �оздан"
+#: ../../include/auth.php:320
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:188
+msgid "Login failed."
+msgstr "�е удало�ь войти."
 
-#: ../../Zotlabs/Module/Regate.php:196
-msgid "Automatic channel creation failed. Please create a channel."
-msgstr "�втоматиче�кой �оздание канала не удало�ь. Пожалуй�та �оздайте канал."
+#: ../../include/nav.php:95
+msgid "Remote authentication"
+msgstr "Удаленна� аутентификаци�"
 
-#: ../../Zotlabs/Module/Regate.php:208
-msgid "Account creation error"
-msgstr "Ошибка �оздани� учётной запи�и"
+#: ../../include/nav.php:95
+msgid "Click to authenticate to your home hub"
+msgstr "�ажмите, чтобы аутентифицировать �еб� на домашнем узле"
 
-#: ../../Zotlabs/Module/Regate.php:220
-msgid "Verify failed"
-msgstr "Проверка не удала�ь"
+#: ../../include/nav.php:101
+msgid "Manage your channels"
+msgstr "Управление вашими каналами"
 
-#: ../../Zotlabs/Module/Regate.php:225
-msgid "Token verification failed"
-msgstr "�еверный проверочный код"
+#: ../../include/nav.php:104
+msgid "Manage your privacy groups"
+msgstr "Управление вашим группами конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Regate.php:230
-msgid "Request not inside time frame"
-msgstr "Запро� в не у�тановленные �роки "
+#: ../../include/nav.php:106
+msgid "Account/Channel Settings"
+msgstr "�а�тройки аккаунта / канала"
 
-#: ../../Zotlabs/Module/Regate.php:236 ../../Zotlabs/Module/Regate.php:266
-msgid "Identity unknown"
-msgstr "Лично�ть не у�тановлена"
+#: ../../include/nav.php:112 ../../include/nav.php:142
+msgid "End this session"
+msgstr "Закончить �ту �е��ию"
 
-#: ../../Zotlabs/Module/Regate.php:242
-msgid "dId2 mistaken"
-msgstr "ошибочный dId2"
+#: ../../include/nav.php:115
+msgid "Your profile page"
+msgstr "Страницa вашего профил�"
 
-#: ../../Zotlabs/Module/Regate.php:270
-msgid "Your Registration ID"
-msgstr "Идентификатор вашей реги�трации"
+#: ../../include/nav.php:118
+msgid "Manage/Edit profiles"
+msgstr "Управление / редактирование профилей"
 
-#: ../../Zotlabs/Module/Regate.php:283 ../../Zotlabs/Module/Regate.php:374
-#: ../../Zotlabs/Module/Regate.php:403
-msgid "Registration verification"
-msgstr "Проверка реги�трации"
+#: ../../include/nav.php:127 ../../include/nav.php:131
+msgid "Sign in"
+msgstr "Войти"
 
-#: ../../Zotlabs/Module/Regate.php:290 ../../Zotlabs/Module/Regate.php:408
-msgid "Hold on, you can start verification in"
-msgstr "Подождите, вы можете начать проверку через "
+#: ../../include/nav.php:161
+msgid "Take me home"
+msgstr "Домой"
 
-#: ../../Zotlabs/Module/Regate.php:291
-msgid "Please remember your verification token for ID"
-msgstr "Пожалуй�та, запомните �вой код подтверждени� дл� идентификации"
+#: ../../include/nav.php:163
+msgid "Log me out of this site"
+msgstr "Выйти � �того �айта"
 
-#: ../../Zotlabs/Module/Regate.php:292
-msgid "Token validity"
-msgstr "Срок дей�тви� кода"
+#: ../../include/nav.php:168
+msgid "Create an account"
+msgstr "Создать аккаунт"
 
-#: ../../Zotlabs/Module/Regate.php:328
-msgid "Resend"
-msgstr "Отправить повторно"
+#: ../../include/nav.php:180
+msgid "Help and documentation"
+msgstr "Справочна� информаци� и документаци�"
 
-#: ../../Zotlabs/Module/Regate.php:333
-msgid "Registration status"
-msgstr "Стату� реги�трации"
+#: ../../include/nav.php:194
+msgid "Search site @name, !forum, #tag, ?docs, content"
+msgstr "И�кать на �айте @им�, !форум, #тег, ?документ, �одержимое"
 
-#: ../../Zotlabs/Module/Regate.php:336
-msgid "Verification successful!"
-msgstr "Проверка прошла у�пешно! "
+#: ../../include/nav.php:200
+msgid "Site Setup and Configuration"
+msgstr "У�тановка и конфигураци� �айта"
 
-#: ../../Zotlabs/Module/Regate.php:337
-msgid "Your login ID is"
-msgstr "Ваш логин дл� входа"
+#: ../../include/nav.php:330
+msgid "@name, !forum, #tag, ?doc, content"
+msgstr "@им�, !форум, #тег, ?документ, �одержимое"
 
-#: ../../Zotlabs/Module/Regate.php:338
-msgid ""
-"After your account has been approved by our administrator you will be able "
-"to login with your login ID and your provided password."
-msgstr "По�ле того, как ваша учетна� запи�ь будет одобрена нашим админи�тратором, вы �можете войти в �и�тему, указав �вой логин и пароль."
+#: ../../include/nav.php:331
+msgid "Please wait..."
+msgstr "Подождите пожалуй�та ..."
 
-#: ../../Zotlabs/Module/Regate.php:350
-msgid "Registration request revoked"
-msgstr "Запро� на реги�трацию был отозван"
+#: ../../include/nav.php:337
+msgid "Add Apps"
+msgstr "Добавить приложени�"
 
-#: ../../Zotlabs/Module/Regate.php:351
-msgid "Sorry for any inconvience. Thank you for your response."
-msgstr "Прино�им извинени� за неудоб�тва. Благодарим за ваш ответ."
+#: ../../include/nav.php:338
+msgid "Arrange Apps"
+msgstr "Упор�дочить приложени�"
 
-#: ../../Zotlabs/Module/Regate.php:375
-msgid "Please enter your verification token for ID"
-msgstr "Пожалуй�та введите ваш проверочный код дл� идентификации"
+#: ../../include/nav.php:339
+msgid "Toggle System Apps"
+msgstr "Показать �и�темные приложени�"
 
-#: ../../Zotlabs/Module/Regate.php:385
-msgid "Verification token"
-msgstr "Код проверки"
+#: ../../include/nav.php:424
+msgid "Status Messages and Posts"
+msgstr "Стату�ы и публикации"
 
-#: ../../Zotlabs/Module/Regate.php:396
-msgid "ID expired"
-msgstr "Срок дей�тви� идентификатора и�тёк"
+#: ../../include/nav.php:437
+msgid "Profile Details"
+msgstr "Информаци� о профиле"
 
-#: ../../Zotlabs/Module/Regate.php:409
-msgid "You will require the verification token for ID"
-msgstr "Вам потребует�� проверочный кода дл� идентификации"
+#: ../../include/nav.php:455
+msgid "Files and Storage"
+msgstr "Файлы и хранилище"
 
-#: ../../Zotlabs/Module/Regate.php:417
-msgid "Unknown or expired ID"
-msgstr "Идентификатор неизве�тен или � и�текшим �роком дей�тви�"
+#: ../../include/nav.php:493
+msgid "Saved Bookmarks"
+msgstr "Сохранённые закладки"
 
-#: ../../Zotlabs/Module/Regate.php:428
-msgid "dId2 malformed"
-msgstr "�еверный dId2"
+#: ../../include/nav.php:504
+msgid "View Cards"
+msgstr "Про�мотреть карточки"
 
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit event title"
-msgstr "Редактировать наименование �обыти�"
+#: ../../include/nav.php:515
+msgid "View Articles"
+msgstr "Про�мотр �татей"
 
-#: ../../Zotlabs/Module/Events.php:470
-msgid "Categories (comma-separated list)"
-msgstr "Категории (�пи�ок через зап�тую)"
+#: ../../include/nav.php:527
+msgid "View Webpages"
+msgstr "Про�мотр веб-�траниц"
 
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Edit Category"
-msgstr "Редактировать категорию"
+#: ../../include/feedutils.php:874 ../../include/text.php:1540
+msgid "unknown"
+msgstr "неизве�тный"
 
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Category"
-msgstr "Категори�"
+#: ../../include/bookmarks.php:34
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "Закладки пользовател� %1$s"
 
-#: ../../Zotlabs/Module/Events.php:474
-msgid "Edit start date and time"
-msgstr "Редактировать дату и врем� начала"
+#: ../../include/cdav.php:157
+msgid "INVALID EVENT DISMISSED!"
+msgstr "�ЕДЕЙСТВИТЕЛЬ�ОЕ СОБЫТИЕ ОТКЛО�Е�О!"
 
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
-msgid "Finish date and time are not known or not relevant"
-msgstr "Дата и врем� окончани� неизве�тны или неприменимы"
+#: ../../include/cdav.php:158
+msgid "Summary: "
+msgstr "Резюме: "
 
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Edit finish date and time"
-msgstr "Редактировать дату и врем� окончани�"
+#: ../../include/cdav.php:159
+msgid "Date: "
+msgstr "Дата: "
 
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Finish date and time"
-msgstr "Дата и врем� окончани�"
+#: ../../include/cdav.php:160 ../../include/cdav.php:168
+msgid "Reason: "
+msgstr "Причина: "
 
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
-msgid "Adjust for viewer timezone"
-msgstr "�а�тройте про�мотр ча�овых по��ов"
+#: ../../include/cdav.php:166
+msgid "INVALID CARD DISMISSED!"
+msgstr "�ЕДЕЙСТВИТЕЛЬ��Я К�РТОЧК� ОТКЛО�Е��!"
 
-#: ../../Zotlabs/Module/Events.php:479
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Важно дл� �обытий, которые прои�ход�т в определённом ме�те. �е подходит дл� в�еобщих праздников."
+#: ../../include/cdav.php:167
+msgid "Name: "
+msgstr "Им�: "
 
-#: ../../Zotlabs/Module/Events.php:481
-msgid "Edit Description"
-msgstr "Редактировать опи�ание"
+#: ../../include/conversation.php:183
+#, php-format
+msgid "likes %1$s's %2$s"
+msgstr "�равит�� %1$s %2$s"
 
-#: ../../Zotlabs/Module/Events.php:483
-msgid "Edit Location"
-msgstr "Редактировать ме�тоположение"
+#: ../../include/conversation.php:186
+#, php-format
+msgid "doesn't like %1$s's %2$s"
+msgstr "�е нравит�� %1$s %2$s"
 
-#: ../../Zotlabs/Module/Events.php:502
-msgid "Advanced Options"
-msgstr "Дополнительные на�тройки"
+#: ../../include/conversation.php:226 ../../include/conversation.php:228
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s теперь в контакте � %2$s"
 
-#: ../../Zotlabs/Module/Events.php:613
-msgid "l, F j"
-msgstr ""
+#: ../../include/conversation.php:263
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ткнул %2$s"
 
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Edit Event"
-msgstr "Редактировать �обытие"
+#: ../../include/conversation.php:267 ../../include/text.php:1236
+#: ../../include/text.php:1240
+msgid "poked"
+msgstr "ткнут"
+
+#: ../../include/conversation.php:781
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Про�мотреть профиль %s @ %s"
+
+#: ../../include/conversation.php:802
+msgid "Categories:"
+msgstr "Категории:"
+
+#: ../../include/conversation.php:803
+msgid "Filed under:"
+msgstr "Хранить под:"
+
+#: ../../include/conversation.php:828
+msgid "View in context"
+msgstr "Показать в контек�те"
+
+#: ../../include/conversation.php:930
+msgid "remove"
+msgstr "удалить"
+
+#: ../../include/conversation.php:934
+msgid "Loading..."
+msgstr "Загрузка..."
 
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Create Event"
-msgstr "Создать �обытие"
+#: ../../include/conversation.php:936
+msgid "Delete Selected Items"
+msgstr "Удалить выбранные �лементы"
 
-#: ../../Zotlabs/Module/Events.php:739
-msgid "Event removed"
-msgstr "Событие удалено"
+#: ../../include/conversation.php:980
+msgid "View Source"
+msgstr "Про�мотреть и�точник"
 
-#: ../../Zotlabs/Module/Manage.php:138 ../../Zotlabs/Module/New_channel.php:147
+#: ../../include/conversation.php:990
+msgid "Follow Thread"
+msgstr "Следить за темой"
+
+#: ../../include/conversation.php:999
+msgid "Unfollow Thread"
+msgstr "Прекратить от�леживать тему"
+
+#: ../../include/conversation.php:1108
+msgid "Edit Connection"
+msgstr "Редактировать контакт"
+
+#: ../../include/conversation.php:1260
 #, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Вы �оздали %1$.0f из %2$.0f возможных каналов."
+msgid "%s likes this."
+msgstr "%s нравит�� �то."
 
-#: ../../Zotlabs/Module/Manage.php:145
-msgid "Create a new channel"
-msgstr "Создать новый канал"
+#: ../../include/conversation.php:1260
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s не нравит�� �то."
 
-#: ../../Zotlabs/Module/Manage.php:171
-msgid "Current Channel"
-msgstr "Текущий канал"
+#: ../../include/conversation.php:1264
+#, 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] "<span  %1$s>%2$d человеку</span> �то нравит��."
+msgstr[1] "<span  %1$s>%2$d человекам</span> �то нравит��."
+msgstr[2] "<span  %1$s>%2$d человекам</span> �то нравит��."
 
-#: ../../Zotlabs/Module/Manage.php:173
-msgid "Switch to one of your channels by selecting it."
-msgstr "Выбрать и переключить�� на один из ваших каналов"
+#: ../../include/conversation.php:1266
+#, 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] "<span  %1$s>%2$d человеку</span> �то не нравит��."
+msgstr[1] "<span  %1$s>%2$d человекам</span> �то не нравит��."
+msgstr[2] "<span  %1$s>%2$d человекам</span> �то не нравит��."
 
-#: ../../Zotlabs/Module/Manage.php:174
-msgid "Default Channel"
-msgstr "О�новной канал"
+#: ../../include/conversation.php:1272
+msgid "and"
+msgstr "и"
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Make Default"
-msgstr "Сделать о�новным"
+#: ../../include/conversation.php:1275
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ", и ещё %d человеку"
+msgstr[1] ", и ещё %d человекам"
+msgstr[2] ", и ещё %d человекам"
 
-#: ../../Zotlabs/Module/Manage.php:178
+#: ../../include/conversation.php:1276
 #, php-format
-msgid "%d new messages"
-msgstr "%d новых �ообщений"
+msgid "%s like this."
+msgstr "%s нравит�� �то."
 
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../include/conversation.php:1276
 #, php-format
-msgid "%d new introductions"
-msgstr "%d новых пред�тавлений"
+msgid "%s don't like this."
+msgstr "%s не нравит�� �то."
 
-#: ../../Zotlabs/Module/Manage.php:181
-msgid "Delegated Channel"
-msgstr "Делегированный канал"
+#: ../../include/conversation.php:1327
+#: ../../extend/addon/hzaddons/hsse/hsse.php:82
+msgid "Set your location"
+msgstr "Задать �воё ме�тоположение"
 
-#: ../../Zotlabs/Module/Chanview.php:132
-msgid "toggle full screen mode"
-msgstr "переключение полно�кранного режима"
+#: ../../include/conversation.php:1328
+#: ../../extend/addon/hzaddons/hsse/hsse.php:83
+msgid "Clear browser location"
+msgstr "Очи�тить ме�тоположение из браузера"
 
-#: ../../Zotlabs/Module/Pubstream.php:20
-msgid "Public Stream App"
-msgstr "Приложение \"Публичный поток\""
+#: ../../include/conversation.php:1344
+#: ../../extend/addon/hzaddons/hsse/hsse.php:99
+msgid "Embed (existing) photo from your photo albums"
+msgstr "В�троить (�уще�твующее) фото из вашего фотоальбома"
 
-#: ../../Zotlabs/Module/Pubstream.php:21
-msgid "The unmoderated public stream of this hub"
-msgstr "�емодерируемый публичный поток � �того хаба"
+#: ../../include/conversation.php:1378
+#: ../../extend/addon/hzaddons/hsse/hsse.php:135
+msgid "Tag term:"
+msgstr "Теги:"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
-msgstr "�ет на ме�те"
+#: ../../include/conversation.php:1379
+#: ../../extend/addon/hzaddons/hsse/hsse.php:136
+msgid "Where are you right now?"
+msgstr "Где вы �ейча�?"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
-msgstr "В �ети"
+#: ../../include/conversation.php:1384
+#: ../../extend/addon/hzaddons/hsse/hsse.php:141
+msgid "Choose a different album..."
+msgstr "Выбрать другой альбом..."
 
-#: ../../Zotlabs/Module/Permcats.php:29
-msgid "Permission category name is required."
-msgstr "Требует�� категори� разрешений."
+#: ../../include/conversation.php:1388
+#: ../../extend/addon/hzaddons/hsse/hsse.php:145
+msgid "Comments enabled"
+msgstr "Комментарии включены"
 
-#: ../../Zotlabs/Module/Permcats.php:48
-msgid "Permission category saved."
-msgstr "Категори� разрешени� �охранена."
+#: ../../include/conversation.php:1389
+#: ../../extend/addon/hzaddons/hsse/hsse.php:146
+msgid "Comments disabled"
+msgstr "Комментарии отключены"
 
-#: ../../Zotlabs/Module/Permcats.php:63
-msgid "Permission Categories App"
-msgstr "Приложение \"Категории разрешений\""
+#: ../../include/conversation.php:1441
+#: ../../extend/addon/hzaddons/hsse/hsse.php:195
+msgid "Page link name"
+msgstr "�азвание ��ылки на �траницу "
 
-#: ../../Zotlabs/Module/Permcats.php:64
-msgid "Create custom connection permission limits"
-msgstr "Создать пользователь�кие ограничени� на до�туп к подключению"
+#: ../../include/conversation.php:1444
+#: ../../extend/addon/hzaddons/hsse/hsse.php:198
+msgid "Post as"
+msgstr "Опубликовать как"
 
-#: ../../Zotlabs/Module/Permcats.php:80
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr "И�пользуйте �ту форму дл� �оздани� правил разрешений дл� различных групп людей и контактов."
+#: ../../include/conversation.php:1458
+#: ../../extend/addon/hzaddons/hsse/hsse.php:212
+msgid "Toggle voting"
+msgstr "Переключить голо�ование"
 
-#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374
-msgid "Permission Categories"
-msgstr "Категории разрешений"
+#: ../../include/conversation.php:1459
+msgid "Toggle poll"
+msgstr "Переключить опро�"
 
-#: ../../Zotlabs/Module/Permcats.php:121
-msgid "Permission category name"
-msgstr "�аименование категории разрешений"
+#: ../../include/conversation.php:1460
+msgid "Option"
+msgstr "Вариант"
 
-#: ../../Zotlabs/Module/Email_resend.php:12
-#: ../../Zotlabs/Module/Email_validation.php:24
-msgid "Token verification failed."
-msgstr "�е удало�ь выполнить проверку токена."
+#: ../../include/conversation.php:1461
+msgid "Add option"
+msgstr "Добавить вариант"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
-msgid "Email verification resent"
-msgstr "Сообщение дл� проверки email отправлено повторно"
+#: ../../include/conversation.php:1462
+msgid "Minutes"
+msgstr "Минут"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
-msgid "Unable to resend email verification message."
-msgstr "�евозможно повторно отправить �ообщение дл� проверки email"
+#: ../../include/conversation.php:1462
+msgid "Hours"
+msgstr "Ча�ов"
+
+#: ../../include/conversation.php:1462
+msgid "Days"
+msgstr "Дней"
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr "Оценок нет"
+#: ../../include/conversation.php:1463
+msgid "Allow multiple answers"
+msgstr "Разрешить не�колько ответов"
 
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr "Оценкa:"
+#: ../../include/conversation.php:1465
+#: ../../extend/addon/hzaddons/hsse/hsse.php:215
+msgid "Disable comments"
+msgstr "Отключить комментарии"
 
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr "Веб-�айт:"
+#: ../../include/conversation.php:1466
+#: ../../extend/addon/hzaddons/hsse/hsse.php:216
+msgid "Toggle comments"
+msgstr "Переключить комментарии"
 
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr "Опи�ание:"
+#: ../../include/conversation.php:1473
+msgid "Summary (optional)"
+msgstr "Резюме (необ�зательно)"
 
-#: ../../Zotlabs/Module/Cal.php:62
-msgid "Permissions denied."
-msgstr "До�туп запрещен."
+#: ../../include/conversation.php:1476
+#: ../../extend/addon/hzaddons/hsse/hsse.php:224
+msgid "Categories (optional, comma-separated list)"
+msgstr "Категории (необ�зательно, �пи�ок через зап�тую)"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
-msgid "item"
-msgstr "пункт"
+#: ../../include/conversation.php:1477
+#: ../../extend/addon/hzaddons/hsse/hsse.php:225
+msgid "Permission settings"
+msgstr "�а�тройки разрешений"
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of Pinned Navbar Apps"
-msgstr "Изменить пор�док приложений на панели навигации"
+#: ../../include/conversation.php:1499
+#: ../../extend/addon/hzaddons/hsse/hsse.php:247
+msgid "Other networks and post services"
+msgstr "Другие �ети и �лужбы публикаций"
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of App Tray Apps"
-msgstr "Изменить пор�док приложений в лотке"
+#: ../../include/conversation.php:1502
+#: ../../extend/addon/hzaddons/hsse/hsse.php:250
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:209
+msgid "Set expiration date"
+msgstr "У�тановить �рок дей�тви�"
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid ""
-"Use arrows to move the corresponding app left (top) or right (bottom) in the "
-"navbar"
-msgstr "И�пользуйте �трелки дл� перемещени� приложени� влево (вверх) или вправо (вниз) в панели навигации"
+#: ../../include/conversation.php:1505
+#: ../../extend/addon/hzaddons/hsse/hsse.php:253
+msgid "Set publish date"
+msgstr "У�тановить дату публикации"
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid "Use arrows to move the corresponding app up or down in the app tray"
-msgstr "И�пользуйте �трелки дл� перемещени� приложени� вверх или вниз в лотке"
+#: ../../include/conversation.php:1750
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "По�етит"
+msgstr[1] "По�ет�т"
+msgstr[2] "По�ет�т"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "�евозможно найти ваш �ервер"
+#: ../../include/conversation.php:1753
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "�е по�етит"
+msgstr[1] "�е по�ет�т"
+msgstr[2] "�е по�ет�т"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "У�пешно опубликовано."
+#: ../../include/conversation.php:1756
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr "�е решил"
 
-#: ../../Zotlabs/Module/Moderate.php:67
-msgid "Comment approved"
-msgstr "Комментарий одобрен"
+#: ../../include/conversation.php:1759
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "Согла�ен"
+msgstr[1] "Согла�ны"
+msgstr[2] "Согла�ны"
 
-#: ../../Zotlabs/Module/Moderate.php:71
-msgid "Comment deleted"
-msgstr "Комментарий удалён"
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "�е �огла�ен"
+msgstr[1] "�е �огла�ны"
+msgstr[2] "�е �огла�ны"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "Воздержал��"
+msgstr[1] "Воздержали�ь"
+msgstr[2] "Воздержали�ь"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
-msgstr "Удалить �тот аккаунт"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Удалить �тот �лемент?"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr "Этот аккаунт и в�е его каналы будут полно�тью удалены из �ети."
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
+msgstr "%s показать меньше"
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:109
-msgid "Remove Account"
-msgstr "Удалить аккаунт"
+#: ../../include/js_strings.php:9
+#, php-format
+msgid "%s expand"
+msgstr "%s развернуть"
 
-#: ../../Zotlabs/Module/Lang.php:17
-msgid "Language App"
-msgstr "Приложение \"Язык\""
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
+msgstr "%s �вернуть"
 
-#: ../../Zotlabs/Module/Lang.php:18
-msgid "Change UI language"
-msgstr "Изменить �зык интерфей�а"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "Пароль �лишком короткий"
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid "Channel Export App"
-msgstr "Приложение \"Эк�порт канала\""
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "в�е"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your channel"
-msgstr "Эк�портировать ваш канал"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "Тайный пароль"
 
-#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74
-msgid "Export Channel"
-msgstr "Эк�порт канала"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Под�казка дл� парол�"
 
-#: ../../Zotlabs/Module/Uexport.php:75
-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 "Эк�портировать о�новную информацию из канала в файл. Служит в каче�тве резервной копии ваших контактов, о�новных данных и профил�, однако не включает �одержимое. Может быть и�пользовано дл� импорта ваши данных на новый �ервер."
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Уведомление: Права до�тупа изменили�ь, но до �их пор не �охранены."
 
-#: ../../Zotlabs/Module/Uexport.php:76
-msgid "Export Content"
-msgstr "Эк�портировать �одержимое"
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "закрыть в�е"
 
-#: ../../Zotlabs/Module/Uexport.php:77
-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 "Эк�портировать информацию из вашего канала и его �одержимое в резервную копию в формате JSON котора� может быть и�пользована дл� во��тановлени� или импорта на другом �ервере. Сохран�ет в�е ваши контакты, разрешени�, данные профил� и публикации за не�колько ме��цев. Файл может иметь очень большой размер. Пожалуй�та, будьте терпеливы и подождите не�колько минут пока не начнёт�� загрузка."
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Зде�ь нет ничего нового"
 
-#: ../../Zotlabs/Module/Uexport.php:79
-msgid "Export your posts from a given year."
-msgstr "Эк�портировать ваши публикации за данный год."
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr "Оценкa �тoго канала (общедо�тупно)"
 
-#: ../../Zotlabs/Module/Uexport.php:81
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr "Охарактеризовать (необ�зательно)"
+
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr "Пожалуй�та, введите URL ��ылки"
+
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr "Е�ть не�охраненные изменени�. Вы уверены, что хотите покинуть �ту �траницу?"
+
+#: ../../include/js_strings.php:26
+msgid "lovely"
+msgstr "прекра�но"
+
+#: ../../include/js_strings.php:27
+msgid "wonderful"
+msgstr "замечательно"
+
+#: ../../include/js_strings.php:28
+msgid "fantastic"
+msgstr "фанта�тично"
+
+#: ../../include/js_strings.php:29
+msgid "great"
+msgstr "отлично"
+
+#: ../../include/js_strings.php:30
 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 "Вы также можете �к�портировать ваши публикации и бе�еды за определённый ме��ц или год. Выберите дату в панели ме�тоположени� в браузере. Е�ли �к�порт будет неудачным (�то возможно, например, из-за и�черпани� пам�ти на �ервере), повторите попытку, выбрав меньший диапазон дат."
+"Your chosen nickname was either already taken or not valid. Please use our "
+"suggestion ("
+msgstr "Выбранный вами п�евдоним уже и�пользует�� или недей�твителен. Попробуйте и�пользовать наше предложение ("
 
-#: ../../Zotlabs/Module/Uexport.php:82
+#: ../../include/js_strings.php:31
+msgid ") or enter a new one."
+msgstr ") или введите новый."
+
+#: ../../include/js_strings.php:32
+msgid "Thank you, this nickname is valid."
+msgstr "Спа�ибо, �тот п�евдоним может быть и�пользован."
+
+#: ../../include/js_strings.php:33
+msgid "A channel name is required."
+msgstr "Требует�� название канала."
+
+#: ../../include/js_strings.php:34
+msgid "This is a "
+msgstr "Это "
+
+#: ../../include/js_strings.php:35
+msgid " channel name"
+msgstr " название канала"
+
+#: ../../include/js_strings.php:36
+msgid "Back to reply"
+msgstr "Вернуть�� к ответу"
+
+#: ../../include/js_strings.php:37
+msgid "Pinned"
+msgstr "Прикреплено"
+
+#: ../../include/js_strings.php:45
 #, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
-msgstr "Дл� выбора в�ех публикаций заданного года, например текущего, по�етите <a href=\"%1$s\">%2$s</a>"
+msgid "%d minutes"
+msgid_plural "%d minutes"
+msgstr[0] "%d минуту"
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
 
-#: ../../Zotlabs/Module/Uexport.php:83
+#: ../../include/js_strings.php:46
 #, 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 "Дл� выбора в�ех публикаций заданного ме��ца, например за �нварь �его года, по�етите <a href=\"%1$s\">%2$s</a>"
+msgid "about %d hours"
+msgid_plural "about %d hours"
+msgstr[0] "около %d ча�a"
+msgstr[1] "около %d ча�ов"
+msgstr[2] "около %d ча�ов"
 
-#: ../../Zotlabs/Module/Uexport.php:84
+#: ../../include/js_strings.php:47
 #, 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 "Данные файлы � �одержимым могут быть импортированы и во��тановлены на любом �одержащем ваш канал �айте. По�етите <a href=\"%1$s\">%2$s</a>. Дл� лучших результатов пожалуй�та производите импорт и во��тановление в пор�дке датировки (�тарые �начала)."
+msgid "%d days"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d дн�"
+msgstr[2] "%d дней"
 
-#: ../../Zotlabs/Module/Display.php:372
-msgid "Article"
-msgstr "Стать�"
+#: ../../include/js_strings.php:48
+#, php-format
+msgid "%d months"
+msgid_plural "%d months"
+msgstr[0] "%d ме��ц"
+msgstr[1] "%d ме��ца"
+msgstr[2] "%d ме��цев"
 
-#: ../../Zotlabs/Module/Display.php:417
-msgid "Item has been removed."
-msgstr "Элемент был удалён."
+#: ../../include/js_strings.php:49
+#, php-format
+msgid "%d years"
+msgid_plural "%d years"
+msgstr[0] "%d год"
+msgstr[1] "%d года"
+msgstr[2] "%d лет"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Канала нет."
+#: ../../include/js_strings.php:54
+msgid "timeago.prefixAgo"
+msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:45
-msgid "No connections in common."
-msgstr "Общих контактов нет."
+#: ../../include/js_strings.php:55
+msgid "timeago.prefixFromNow"
+msgstr "через"
 
-#: ../../Zotlabs/Module/Common.php:65
-msgid "View Common Connections"
-msgstr "Про�мотр общий контактов"
+#: ../../include/js_strings.php:56
+msgid "timeago.suffixAgo"
+msgstr "назад"
 
-#: ../../Zotlabs/Module/Impel.php:185
-#, php-format
-msgid "%s element installed"
-msgstr "%s �лемент у�тановлен"
+#: ../../include/js_strings.php:57
+msgid "timeago.suffixFromNow"
+msgstr "NONE"
 
-#: ../../Zotlabs/Module/Impel.php:188
-#, php-format
-msgid "%s element installation failed"
-msgstr "%sу�тановка �лемента неудачна."
+#: ../../include/js_strings.php:60
+msgid "less than a minute"
+msgstr "менее чем одну минуту"
 
-#: ../../Zotlabs/Module/New_channel.php:159
-msgid "Your real name is recommended."
-msgstr "Рекомендует�� и�пользовать ваше на�то�щее им�."
+#: ../../include/js_strings.php:61
+msgid "about a minute"
+msgstr "около минуты"
 
-#: ../../Zotlabs/Module/New_channel.php:160
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
-msgstr "Примеры: \"Иван Иванов\", \"Ок�ана и кони\", \"Футбол\", \"Тимур и его команда\""
+#: ../../include/js_strings.php:63
+msgid "about an hour"
+msgstr "около ча�а"
 
-#: ../../Zotlabs/Module/New_channel.php:165
-msgid ""
-"This will be used to create a unique network address (like an email address)."
-msgstr "Это будет и�пользовано дл� �оздани� уникального �етевого адре�а (наподобие email)."
+#: ../../include/js_strings.php:65
+msgid "a day"
+msgstr "день"
 
-#: ../../Zotlabs/Module/New_channel.php:167
-msgid "Allowed characters are a-z 0-9, - and _"
-msgstr "Разрешённые �имволы a-z 0-9, - и _"
+#: ../../include/js_strings.php:67
+msgid "about a month"
+msgstr "около ме��ца"
 
-#: ../../Zotlabs/Module/New_channel.php:175
-msgid "Channel name"
-msgstr "�азвание канала"
+#: ../../include/js_strings.php:69
+msgid "about a year"
+msgstr "около года"
 
-#: ../../Zotlabs/Module/New_channel.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:537
-msgid "Channel role and privacy"
-msgstr "Роль и конфиденциально�ть канала"
+#: ../../include/js_strings.php:71
+msgid " "
+msgstr " "
 
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid ""
-"Select a channel permission role compatible with your usage needs and "
-"privacy requirements."
-msgstr "Выберите разрешени� дл� канала в �оответ�твии � вашими потребно�т�ми и требовани�ми безопа�но�ти."
+#: ../../include/js_strings.php:72
+msgid "timeago.numbers"
+msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid "Read more about channel permission roles"
-msgstr "Прочитать больше о разрешени�х дл� каналов"
+#: ../../include/js_strings.php:74 ../../include/text.php:1480
+msgid "January"
+msgstr "Январь"
 
-#: ../../Zotlabs/Module/New_channel.php:181
-msgid "Create a Channel"
-msgstr "Создать канал"
+#: ../../include/js_strings.php:75 ../../include/text.php:1480
+msgid "February"
+msgstr "Февраль"
 
-#: ../../Zotlabs/Module/New_channel.php:182
-msgid ""
-"A channel is a unique network identity. It can represent a person (social "
-"network profile), a forum (group), a business or celebrity page, a newsfeed, "
-"and many other things."
-msgstr "Канал �то уникальна� �етева� идентично�ть. Он может пред�тавл�ть человека (профиль в �оциальной �ети), форум или группу, бизне� или �траницу знаменито�ти, ново�тную ленту и многие другие вещи."
+#: ../../include/js_strings.php:76 ../../include/text.php:1480
+msgid "March"
+msgstr "Март"
 
-#: ../../Zotlabs/Module/New_channel.php:183
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "или <a href=\"import\">импортировать �уще�твующий канал</a> из другого ме�та."
+#: ../../include/js_strings.php:77 ../../include/text.php:1480
+msgid "April"
+msgstr "�прель"
 
-#: ../../Zotlabs/Module/New_channel.php:188
-msgid "Validate"
-msgstr "Проверить"
+#: ../../include/js_strings.php:78
+msgctxt "long"
+msgid "May"
+msgstr "Май"
 
-#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948
-msgid "sent you a private message"
-msgstr "отправил вам личное �ообщение"
+#: ../../include/js_strings.php:79 ../../include/text.php:1480
+msgid "June"
+msgstr "Июнь"
 
-#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914
-msgid "added your channel"
-msgstr "добавил ваш канал"
+#: ../../include/js_strings.php:80 ../../include/text.php:1480
+msgid "July"
+msgstr "Июль"
 
-#: ../../Zotlabs/Module/Ping.php:418
-msgid "requires approval"
-msgstr "Требует�� подтверждение"
+#: ../../include/js_strings.php:81 ../../include/text.php:1480
+msgid "August"
+msgstr "�вгу�т"
 
-#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957
-msgid "g A l F d"
-msgstr "g A l F d"
+#: ../../include/js_strings.php:82 ../../include/text.php:1480
+msgid "September"
+msgstr "Сент�брь"
 
-#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960
-msgid "[today]"
-msgstr "[�егодн�]"
+#: ../../include/js_strings.php:83 ../../include/text.php:1480
+msgid "October"
+msgstr "Окт�брь"
 
-#: ../../Zotlabs/Module/Ping.php:456
-msgid "posted an event"
-msgstr "�обытие опубликовано"
+#: ../../include/js_strings.php:84 ../../include/text.php:1480
+msgid "November"
+msgstr "�о�брь"
 
-#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829
-#: ../../Zotlabs/Lib/Enotify.php:931
-msgid "shared a file with you"
-msgstr "� вами поделили�ь файлом"
+#: ../../include/js_strings.php:85 ../../include/text.php:1480
+msgid "December"
+msgstr "Декабрь"
 
-#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554
-msgid "Private forum"
-msgstr "Ча�тный форум"
+#: ../../include/js_strings.php:86
+msgid "Jan"
+msgstr "Янв"
 
-#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554
-msgid "Public forum"
-msgstr "Публичный форум"
+#: ../../include/js_strings.php:87
+msgid "Feb"
+msgstr "Фев"
 
-#: ../../Zotlabs/Module/Dircensor.php:42
-msgid "Entry censored"
-msgstr "Запи�ь цензурирована"
+#: ../../include/js_strings.php:88
+msgid "Mar"
+msgstr "Мар"
 
-#: ../../Zotlabs/Module/Dircensor.php:45
-msgid "Entry uncensored"
-msgstr "Запи�ь нецензурирована"
+#: ../../include/js_strings.php:89
+msgid "Apr"
+msgstr "�пр"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
-msgstr "Ограничений кла��а об�луживание не найдено."
+#: ../../include/js_strings.php:90
+msgctxt "short"
+msgid "May"
+msgstr "Май"
 
-#: ../../Zotlabs/Module/Mood.php:134
-msgid "Mood App"
-msgstr "Приложение \"�а�троение\""
+#: ../../include/js_strings.php:91
+msgid "Jun"
+msgstr "Июн"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Module/Mood.php:155
-msgid "Set your current mood and tell your friends"
-msgstr "У�тановить текущее на�троение и ра��казать друзь�м"
+#: ../../include/js_strings.php:92
+msgid "Jul"
+msgstr "Июл"
 
-#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350
-msgid "Mood"
-msgstr "�а�троение"
+#: ../../include/js_strings.php:93
+msgid "Aug"
+msgstr "�вг"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "About this site"
-msgstr "Об �том �айте"
+#: ../../include/js_strings.php:94
+msgid "Sep"
+msgstr "Сен"
 
-#: ../../Zotlabs/Module/Siteinfo.php:22
-msgid "Site Name"
-msgstr "�азвание �айта"
+#: ../../include/js_strings.php:95
+msgid "Oct"
+msgstr "Окт"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
-msgid "Administrator"
-msgstr "�дмини�тратор"
+#: ../../include/js_strings.php:96
+msgid "Nov"
+msgstr "�о�"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "Software and Project information"
-msgstr "Информаци� о программном обе�печении и проекте"
+#: ../../include/js_strings.php:97
+msgid "Dec"
+msgstr "Дек"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid "This site is powered by $Projectname"
-msgstr "Этот �айт работает на $Projectname"
+#: ../../include/js_strings.php:98 ../../include/text.php:1476
+msgid "Sunday"
+msgstr "Во�кре�енье"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr "Объединенные и децентрализованные �ети и �лужбы идентификациии обе�печивают�� Zot"
+#: ../../include/js_strings.php:99 ../../include/text.php:1476
+msgid "Monday"
+msgstr "Понедельник"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Additional federated transport protocols:"
-msgstr "Дополнительные федеративные тран�портные протоколы:"
+#: ../../include/js_strings.php:100 ../../include/text.php:1476
+msgid "Tuesday"
+msgstr "Вторник"
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
-#, php-format
-msgid "Version %s"
-msgstr "Вер�и� %s"
+#: ../../include/js_strings.php:101 ../../include/text.php:1476
+msgid "Wednesday"
+msgstr "Среда"
 
-#: ../../Zotlabs/Module/Siteinfo.php:37
-msgid "Project homepage"
-msgstr "Домашн�� �траница проекта"
+#: ../../include/js_strings.php:102 ../../include/text.php:1476
+msgid "Thursday"
+msgstr "Четверг"
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
-msgid "Developer homepage"
-msgstr "Домашн�� �траница разработчика"
+#: ../../include/js_strings.php:103 ../../include/text.php:1476
+msgid "Friday"
+msgstr "П�тница"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
-msgid "App installed."
-msgstr "Приложение у�тановлено."
+#: ../../include/js_strings.php:104 ../../include/text.php:1476
+msgid "Saturday"
+msgstr "Суббота"
 
-#: ../../Zotlabs/Module/Appman.php:49
-msgid "Malformed app."
-msgstr "�еработающее приложение."
+#: ../../include/js_strings.php:105
+msgid "Sun"
+msgstr "В�к"
 
-#: ../../Zotlabs/Module/Appman.php:132
-msgid "Embed code"
-msgstr "В�троить код"
+#: ../../include/js_strings.php:106
+msgid "Mon"
+msgstr "Пон"
 
-#: ../../Zotlabs/Module/Appman.php:138
-msgid "Edit App"
-msgstr "Редактировать приложение"
+#: ../../include/js_strings.php:107
+msgid "Tue"
+msgstr "Ð’Ñ‚"
 
-#: ../../Zotlabs/Module/Appman.php:138
-msgid "Create App"
-msgstr "Создать приложение"
+#: ../../include/js_strings.php:108
+msgid "Wed"
+msgstr "Ср"
 
-#: ../../Zotlabs/Module/Appman.php:143
-msgid "Name of app"
-msgstr "�аименование приложени�"
+#: ../../include/js_strings.php:109
+msgid "Thu"
+msgstr "Чет"
 
-#: ../../Zotlabs/Module/Appman.php:144
-msgid "Location (URL) of app"
-msgstr "Ме�тоположение (URL) приложени�"
+#: ../../include/js_strings.php:110
+msgid "Fri"
+msgstr "П�т"
 
-#: ../../Zotlabs/Module/Appman.php:146
-msgid "Photo icon URL"
-msgstr "URL пиктограммы"
+#: ../../include/js_strings.php:111
+msgid "Sat"
+msgstr "Суб"
 
-#: ../../Zotlabs/Module/Appman.php:146
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 пик�елей - необ�зательно"
+#: ../../include/js_strings.php:112
+msgctxt "calendar"
+msgid "today"
+msgstr "�егодн�"
 
-#: ../../Zotlabs/Module/Appman.php:147
-msgid "Categories (optional, comma separated list)"
-msgstr "Категории (необ�зательно, �пи�ок через зап�тую)"
+#: ../../include/js_strings.php:113
+msgctxt "calendar"
+msgid "month"
+msgstr "ме��ц"
 
-#: ../../Zotlabs/Module/Appman.php:148
-msgid "Version ID"
-msgstr "ID вер�ии"
+#: ../../include/js_strings.php:114
+msgctxt "calendar"
+msgid "week"
+msgstr "недел�"
 
-#: ../../Zotlabs/Module/Appman.php:149
-msgid "Price of app"
-msgstr "Цена приложени�"
+#: ../../include/js_strings.php:115
+msgctxt "calendar"
+msgid "day"
+msgstr "день"
 
-#: ../../Zotlabs/Module/Appman.php:150
-msgid "Location (URL) to purchase app"
-msgstr "С�ылка (URL) дл� покупки приложени�"
+#: ../../include/js_strings.php:116
+msgctxt "calendar"
+msgid "All day"
+msgstr "Ве�ь день"
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "Blocked accounts"
-msgstr "Заблокированные аккаунты"
+#: ../../include/js_strings.php:119
+msgid "Please stand by while your download is being prepared."
+msgstr "Пожалуй�та, подождите, пока готовит�� загрузка."
 
-#: ../../Zotlabs/Module/Admin.php:98
-msgid "Expired accounts"
-msgstr "Про�роченные аккаунты"
+#: ../../include/js_strings.php:122
+msgid "Email address not valid"
+msgstr "�дре� �лектронной почты недей�твителен"
 
-#: ../../Zotlabs/Module/Admin.php:99
-msgid "Expiring accounts"
-msgstr "Близкие к про�рочке аккаунты"
+#: ../../include/features.php:86
+msgid "Start calendar week on Monday"
+msgstr "�ачинать календарную неделю � понедельника"
 
-#: ../../Zotlabs/Module/Admin.php:123
-msgid "Message queues"
-msgstr "Очередь �ообщений"
+#: ../../include/features.php:87
+msgid "Default is Sunday"
+msgstr "По умолчанию - во�кре�енье"
 
-#: ../../Zotlabs/Module/Admin.php:137
-msgid "Your software should be updated"
-msgstr "Ваше программное обе�печение должно быть обновлено"
+#: ../../include/features.php:94
+msgid "Event Timezone Selection"
+msgstr "Выбор ча�ового по��а �обыти�"
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Summary"
-msgstr "Резюме"
+#: ../../include/features.php:95
+msgid "Allow event creation in timezones other than your own."
+msgstr "Разрешить �оздание �обыти� в ча�овой зоне отличной от вашей"
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Registered accounts"
-msgstr "Зареги�трированные аккаунты"
+#: ../../include/features.php:108
+msgid "Search by Date"
+msgstr "Пои�к по дате"
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Pending registrations"
-msgstr "Ждут утверждени�"
+#: ../../include/features.php:109
+msgid "Ability to select posts by date ranges"
+msgstr "Возможно�ть выбора �ообщений по диапазонам дат"
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Registered channels"
-msgstr "Зареги�трированные каналы"
+#: ../../include/features.php:116
+msgid "Tag Cloud"
+msgstr "Облако тегов"
 
-#: ../../Zotlabs/Module/Admin.php:148
-msgid "Active addons"
-msgstr "�ктивные ра�ширени�"
+#: ../../include/features.php:117
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Показывает личное облако тегов на �транице канала"
 
-#: ../../Zotlabs/Module/Admin.php:149
-msgid "Version"
-msgstr "Вер�и� �и�темы"
+#: ../../include/features.php:124 ../../include/features.php:358
+msgid "Use blog/list mode"
+msgstr "И�пользовать режим блога / �пи�ка"
 
-#: ../../Zotlabs/Module/Admin.php:150
-msgid "Repository version (master)"
-msgstr "Вер�и� репозитори� (master)"
+#: ../../include/features.php:125 ../../include/features.php:359
+msgid "Comments will be displayed separately"
+msgstr "Комментарии будут отображать�� отдельно"
 
-#: ../../Zotlabs/Module/Admin.php:151
-msgid "Repository version (dev)"
-msgstr "Вер�и� репозитори� (dev)"
+#: ../../include/features.php:137
+msgid "Connection Filtering"
+msgstr "Фильтраци� контактов"
 
-#: ../../Zotlabs/Module/Cards.php:51
-msgid "Cards App"
-msgstr "Приложение \"Карточки\""
+#: ../../include/features.php:138
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Фильтр вход�щих �ообщений от контактов на о�нове ключевых �лов / контента"
 
-#: ../../Zotlabs/Module/Cards.php:52
-msgid "Create personal planning cards"
-msgstr "Создать личные карточки планировани�"
+#: ../../include/features.php:146
+msgid "Conversation"
+msgstr "Диалоги"
 
-#: ../../Zotlabs/Module/Cards.php:112
-msgid "Add Card"
-msgstr "Добавить карточку"
+#: ../../include/features.php:158
+msgid "Emoji Reactions"
+msgstr "Реакции Emoji"
 
-#: ../../Zotlabs/Module/Directory.php:122
-msgid "No default suggestions were found."
-msgstr "Предложений по умолчанию не найдено."
+#: ../../include/features.php:159
+msgid "Add emoji reaction ability to posts"
+msgstr "Возможно�ть добавл�ть реакции Emoji к публикаци�м"
 
-#: ../../Zotlabs/Module/Directory.php:282
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d оценка"
-msgstr[1] "%d оценки"
-msgstr[2] "%d оценок"
+#: ../../include/features.php:166
+msgid "Dislike Posts"
+msgstr "�е нрав�щие�� публикации"
 
-#: ../../Zotlabs/Module/Directory.php:293
-msgid "Gender: "
-msgstr "Пол:"
+#: ../../include/features.php:167
+msgid "Ability to dislike posts/comments"
+msgstr "Возможно�ть отмечать не нрав�щие�� публикации / комментарии"
 
-#: ../../Zotlabs/Module/Directory.php:295
-msgid "Status: "
-msgstr "Стату�:"
+#: ../../include/features.php:174
+msgid "Star Posts"
+msgstr "Помечать �ообщени�"
 
-#: ../../Zotlabs/Module/Directory.php:297
-msgid "Homepage: "
-msgstr "Домашн�� �траница:"
+#: ../../include/features.php:175
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Возможно�ть отметить �пециальные �ообщени� индикатором-звёздочкой"
 
-#: ../../Zotlabs/Module/Directory.php:360
-msgid "Description:"
-msgstr "Опи�ание:"
+#: ../../include/features.php:182
+msgid "Reply on comment"
+msgstr "Ответить на комментарий"
 
-#: ../../Zotlabs/Module/Directory.php:371
-msgid "Public Forum:"
-msgstr "Публичный форум:"
+#: ../../include/features.php:183
+msgid "Ability to reply on selected comment"
+msgstr "Возможно�ть ответить на выбранный комментарий"
 
-#: ../../Zotlabs/Module/Directory.php:374
-msgid "Keywords: "
-msgstr "Ключевые �лова:"
+#: ../../include/features.php:196
+msgid "Advanced Directory Search"
+msgstr "Ра�ширенный пои�к в каталоге"
 
-#: ../../Zotlabs/Module/Directory.php:377
-msgid "Don't suggest"
-msgstr "�е предлагать"
+#: ../../include/features.php:197
+msgid "Allows creation of complex directory search queries"
+msgstr "Позвол�ет �оздание �ложных пои�ковых запро�ов в каталоге"
 
-#: ../../Zotlabs/Module/Directory.php:379
-msgid "Common connections (estimated):"
-msgstr "Общие контакты (оценочно):"
+#: ../../include/features.php:206
+msgid "Editor"
+msgstr "Редактор"
 
-#: ../../Zotlabs/Module/Directory.php:428
-msgid "Global Directory"
-msgstr "Глобальный каталог"
+#: ../../include/features.php:210
+msgid "Post Categories"
+msgstr "Категории публикаций"
 
-#: ../../Zotlabs/Module/Directory.php:428
-msgid "Local Directory"
-msgstr "Локальный каталог"
+#: ../../include/features.php:211
+msgid "Add categories to your posts"
+msgstr "Добавить категории дл� ваших публикаций"
 
-#: ../../Zotlabs/Module/Directory.php:434
-msgid "Finding:"
-msgstr "Пои�к:"
+#: ../../include/features.php:218
+msgid "Large Photos"
+msgstr "Большие фотографии"
 
-#: ../../Zotlabs/Module/Directory.php:439
-msgid "next page"
-msgstr "�ледующа� �траница"
+#: ../../include/features.php:219
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Включить большие (1024px) миниатюры изображений в публикаци�х. Е�ли не включено, и�пользовать маленькие (640px) миниатюры."
 
-#: ../../Zotlabs/Module/Directory.php:439
-msgid "previous page"
-msgstr "предыдуща� �траница"
+#: ../../include/features.php:226
+msgid "Even More Encryption"
+msgstr "Еще больше шифровани�"
 
-#: ../../Zotlabs/Module/Directory.php:440
-msgid "Sort options"
-msgstr "Параметры �ортировки"
+#: ../../include/features.php:227
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Разрешить дополнительное end-to-end шифрование �одержимого � общим �екретным ключом"
 
-#: ../../Zotlabs/Module/Directory.php:441
-msgid "Alphabetic"
-msgstr "По алфавиту"
+#: ../../include/features.php:234
+msgid "Disable Comments"
+msgstr "Отключить комментарии"
 
-#: ../../Zotlabs/Module/Directory.php:442
-msgid "Reverse Alphabetic"
-msgstr "Против алфавита"
+#: ../../include/features.php:235
+msgid "Provide the option to disable comments for a post"
+msgstr "Предо�тавить возможно�ть отключать комментарии дл� публикаций"
 
-#: ../../Zotlabs/Module/Directory.php:443
-msgid "Newest to Oldest"
-msgstr "От новых к �тарым"
+#: ../../include/features.php:242
+msgid "Delayed Posting"
+msgstr "Задержанна� публикаци�"
 
-#: ../../Zotlabs/Module/Directory.php:444
-msgid "Oldest to Newest"
-msgstr "От �тарых к новым"
+#: ../../include/features.php:243
+msgid "Allow posts to be published at a later date"
+msgstr "Разрешить размешать публикации �ледующими датами"
 
-#: ../../Zotlabs/Module/Directory.php:461
-msgid "No entries (some entries may be hidden)."
-msgstr "�ет запи�ей (некоторые запи�и могут быть �крыты)."
+#: ../../include/features.php:250
+msgid "Content Expiration"
+msgstr "И�течение �рока дей�тви� �одержимого"
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
-msgid "Authorize application connection"
-msgstr "�вторизовать подключение приложени�"
+#: ../../include/features.php:251
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Удал�ть публикации / комментарии и / или личные �ообщени�"
 
-#: ../../Zotlabs/Module/Api.php:75
-msgid "Return to your app and insert this Security Code:"
-msgstr "Верните�ь к �воему приложению и в�тавьте �тот код безопа�но�ти:"
+#: ../../include/features.php:258
+msgid "Suppress Duplicate Posts/Comments"
+msgstr "Подавл�ть дублирующие публикации / комментарии"
 
-#: ../../Zotlabs/Module/Api.php:85
-msgid "Please login to continue."
-msgstr "Пожалуй�та, войдите, чтобы продолжить."
+#: ../../include/features.php:259
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Предотвращает по�вление публикаций � одинаковым �одержимым е�ли интервал между ними менее 2 минут"
 
-#: ../../Zotlabs/Module/Api.php:97
+#: ../../include/features.php:266
+msgid "Auto-save drafts of posts and comments"
+msgstr "�втоматиче�ки �охран�ть черновики публикаций и комментариев"
+
+#: ../../include/features.php:267
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
-msgstr "Вы хотите авторизовать �то приложение дл� до�тупа к вашим публикаци�м и контактам и / или �озданию новых публикаций?"
+"Automatically saves post and comment drafts in local browser storage to help "
+"prevent accidental loss of compositions"
+msgstr "�втоматиче�ки �охран�ет черновики публикаций и комментариев в локальном хранилище браузера дл� предотвращени� их �лучайной утраты"
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
-msgstr "Пожалуй�та, войдите."
+#: ../../include/features.php:276
+msgid "Manage"
+msgstr "Управление"
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
-msgid "Block Name"
-msgstr "�азвание блока"
+#: ../../include/features.php:280
+msgid "Navigation Channel Select"
+msgstr "Выбор канала навигации"
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
-msgstr "Заблокировать заголовок"
+#: ../../include/features.php:281
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Изменить канал напр�мую из выпадающего меню"
 
-#: ../../Zotlabs/Module/Email_validation.php:36
-msgid "Email Verification Required"
-msgstr "Требует�� проверка адре�а email"
+#: ../../include/features.php:294
+msgid "Events Filter"
+msgstr "Фильтр �обытий"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
-#, php-format
+#: ../../include/features.php:295
+msgid "Ability to display only events"
+msgstr "Возможно�ть отображать только �обыти�"
+
+#: ../../include/features.php:302
+msgid "Polls Filter"
+msgstr "Фильтр голо�ований"
+
+#: ../../include/features.php:303
+msgid "Ability to display only polls"
+msgstr "Возможно�ть отображать только опро�ы"
+
+#: ../../include/features.php:311
+msgid "Save search terms for re-use"
+msgstr "Сохран�ть результаты пои�ка дл� повторного и�пользовани�"
+
+#: ../../include/features.php:319
+msgid "Ability to file posts under folders"
+msgstr "Возможно�ть размещать публикации в каталогах"
+
+#: ../../include/features.php:326
+msgid "Alternate Stream Order"
+msgstr "Отображение потока"
+
+#: ../../include/features.php:327
 msgid ""
-"A verification token was sent to your email address [%s]. Enter that token "
-"here to complete the account verification step. Please allow a few minutes "
-"for delivery, and check your spam folder if you do not see the message."
-msgstr "Проверочный токен был отправлен на ваш адре� �лектронной почты [%s]. Введите �тот токен зде�ь дл� завершени� �тапа проверки учётной запи�и. Пожалуй�та, подождите не�колько минут дл� завершени� до�тавки и проверьте вашу папку \"Спам\" е�ли вы не видите пи�ьма."
+"Ability to order the stream by last post date, last comment date or "
+"unthreaded activities"
+msgstr "Возможно�ть показывать поток по дате по�леднего �ообщени�, по�леднего комментари� или в пор�дке по�туплени�"
 
-#: ../../Zotlabs/Module/Email_validation.php:38
-msgid "Resend Email"
-msgstr "Вы�лать повторно"
+#: ../../include/features.php:334
+msgid "Contact Filter"
+msgstr "Фильтр контактов"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
-msgid "Validation token"
-msgstr "Проверочный код"
+#: ../../include/features.php:335
+msgid "Ability to display only posts of a selected contact"
+msgstr "Возможно�ть показа публикаций только от выбранных контактов"
 
-#: ../../Zotlabs/Module/Attach.php:68
-msgid "Item not available."
-msgstr "Элемент недо�тупен."
+#: ../../include/features.php:342
+msgid "Forum Filter"
+msgstr "Фильтр по форумам"
 
-#: ../../Zotlabs/Module/Vote.php:40
-msgid "Poll not found."
-msgstr "Опро� не найден"
+#: ../../include/features.php:343
+msgid "Ability to display only posts of a specific forum"
+msgstr "Возможно�ть показа публикаций только определённого форума"
 
-#: ../../Zotlabs/Module/Vote.php:71
-msgid "Invalid response."
-msgstr "�еверный ответ."
+#: ../../include/features.php:350
+msgid "Personal Posts Filter"
+msgstr "Пер�ональный фильтр публикаций"
 
-#: ../../Zotlabs/Module/Vote.php:132
-msgid "Response submitted. Updates may not appear instantly."
-msgstr "Ответ отправлен. Обновлени� могут отображать�� не �разу."
+#: ../../include/features.php:351
+msgid "Ability to display only posts that you've interacted on"
+msgstr "Возможно�ть показа только тех публикаций � которыми вы взаимодей�твовали"
 
-#: ../../Zotlabs/Module/Profile_photo.php:93
-#: ../../Zotlabs/Module/Cover_photo.php:85
-msgid "Image uploaded but image cropping failed."
-msgstr "Изображение загружено но обрезка не удала�ь."
+#: ../../include/features.php:372
+msgid "Photo Location"
+msgstr "Ме�тоположение фотографии"
 
-#: ../../Zotlabs/Module/Profile_photo.php:166
-#: ../../Zotlabs/Module/Cover_photo.php:212
-msgid "Image resize failed."
-msgstr "�е удало�ь изменить размер изображени�."
+#: ../../include/features.php:373
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Е�ли данные о ме�тоположении до�тупны на загруженных фотографий, �в�зать их � картой."
 
-#: ../../Zotlabs/Module/Profile_photo.php:296
-#: ../../Zotlabs/Module/Cover_photo.php:265
-msgid "Image upload failed."
-msgstr "Загрузка изображени� не удала�ь."
+#: ../../include/features.php:386
+msgid "Advanced Profiles"
+msgstr "Ра�ширенные профили"
 
-#: ../../Zotlabs/Module/Profile_photo.php:315
-#: ../../Zotlabs/Module/Cover_photo.php:282
-msgid "Unable to process image."
-msgstr "�евозможно обработать изображение."
+#: ../../include/features.php:387
+msgid "Additional profile sections and selections"
+msgstr "Дополнительные �екции и выборы профил�"
 
-#: ../../Zotlabs/Module/Profile_photo.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:431
-#: ../../Zotlabs/Module/Cover_photo.php:367
-#: ../../Zotlabs/Module/Cover_photo.php:382
-msgid "Photo not available."
-msgstr "Фотографи� недо�тупна."
+#: ../../include/features.php:394
+msgid "Profile Import/Export"
+msgstr "Импорт / �к�порт профил�"
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-msgid ""
-"Your default profile photo is visible to anybody on the internet. Profile "
-"photos for alternate profiles will inherit the permissions of the profile"
-msgstr "Фотографи� вашего профил� по умолчанию видна в�ем в Интернете. Фотографи�профил� дл� альтернативных профилей на�ледуют разрешени� текущего профил�"
+#: ../../include/features.php:395
+msgid "Save and load profile details across sites/channels"
+msgstr "Сохранение и загрузка на�троек профил� на в�ех �айтах / каналах"
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
-msgid ""
-"Your profile photo is visible to anybody on the internet and may be "
-"distributed to other websites."
-msgstr "Фотографи� вашего профил� видна в�ем в Интернете и может быть отправлена на другие �айты."
+#: ../../include/features.php:402
+msgid "Multiple Profiles"
+msgstr "�е�колько профилей"
 
-#: ../../Zotlabs/Module/Profile_photo.php:497
-#: ../../Zotlabs/Module/Cover_photo.php:420
-msgid "Upload File:"
-msgstr "Загрузить файл:"
+#: ../../include/features.php:403
+msgid "Ability to create multiple profiles"
+msgstr "Возможно�ть �оздани� не�кольких профилей"
 
-#: ../../Zotlabs/Module/Profile_photo.php:498
-#: ../../Zotlabs/Module/Cover_photo.php:421
-msgid "Select a profile:"
-msgstr "Выбрать профиль:"
+#: ../../include/selectors.php:18
+msgid "Profile to assign new connections"
+msgstr "�азначить профиль дл� новых контактов"
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
-msgid "Use Photo for Profile"
-msgstr "И�пользовать фотографию дл� профил�"
+#: ../../include/selectors.php:41
+msgid "Frequently"
+msgstr "Ча�то"
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
-msgid "Change Profile Photo"
-msgstr "Изменить фотографию профил�"
+#: ../../include/selectors.php:42
+msgid "Hourly"
+msgstr "Ежеча�но"
 
-#: ../../Zotlabs/Module/Profile_photo.php:500
-msgid "Use"
-msgstr "И�пользовать"
+#: ../../include/selectors.php:43
+msgid "Twice daily"
+msgstr "Дважды в день"
 
-#: ../../Zotlabs/Module/Profile_photo.php:505
-#: ../../Zotlabs/Module/Profile_photo.php:506
-#: ../../Zotlabs/Module/Cover_photo.php:426
-#: ../../Zotlabs/Module/Cover_photo.php:427
-msgid "Use a photo from your albums"
-msgstr "И�пользовать фотографию из ваших альбомов"
+#: ../../include/selectors.php:44
+msgid "Daily"
+msgstr "Ежедневно"
 
-#: ../../Zotlabs/Module/Profile_photo.php:511
-#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:404
-msgid "Choose a different album"
-msgstr "Выбрать другой альбом"
+#: ../../include/selectors.php:45
+msgid "Weekly"
+msgstr "Еженедельно"
 
-#: ../../Zotlabs/Module/Profile_photo.php:516
-#: ../../Zotlabs/Module/Cover_photo.php:438
-msgid "Select existing photo"
-msgstr "Выбрать �уще�твующую фотографию"
+#: ../../include/selectors.php:46
+msgid "Monthly"
+msgstr "Ежеме��чно"
 
-#: ../../Zotlabs/Module/Profile_photo.php:535
-#: ../../Zotlabs/Module/Cover_photo.php:455
-msgid "Crop Image"
-msgstr "Обрезать изображение"
+#: ../../include/selectors.php:60
+msgid "Currently Male"
+msgstr "В на�то�щее врем� муж�кой"
 
-#: ../../Zotlabs/Module/Profile_photo.php:536
-#: ../../Zotlabs/Module/Cover_photo.php:456
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Пожалуй�та на�тройте обрезку изображени� дл� оптимального про�мотра."
+#: ../../include/selectors.php:60
+msgid "Currently Female"
+msgstr "В на�то�щее врем� жен�кий"
 
-#: ../../Zotlabs/Module/Profile_photo.php:538
-#: ../../Zotlabs/Module/Cover_photo.php:458
-msgid "Done Editing"
-msgstr "Закончить редактирование"
+#: ../../include/selectors.php:60
+msgid "Mostly Male"
+msgstr "В о�новном муж�кой"
 
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
-msgstr "Редактировать блок"
+#: ../../include/selectors.php:60
+msgid "Mostly Female"
+msgstr "В о�новном жен�кий"
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "Enter a folder name"
-msgstr "Введите название каталога"
+#: ../../include/selectors.php:60
+msgid "Transgender"
+msgstr "Тран�гендер"
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "or select an existing folder (doubleclick)"
-msgstr "или выберите �уще�твующий каталог (двойной щелчок)"
+#: ../../include/selectors.php:60
+msgid "Intersex"
+msgstr "Интер�ек�уал"
 
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
-msgid "Save to Folder"
-msgstr "Сохранить в каталог"
+#: ../../include/selectors.php:60
+msgid "Transsexual"
+msgstr "Тран��ек�уал"
 
-#: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Name"
-msgstr "�азвание шаблона"
+#: ../../include/selectors.php:60
+msgid "Hermaphrodite"
+msgstr "Гермафродит"
 
-#: ../../Zotlabs/Module/Editlayout.php:129 ../../Zotlabs/Module/Layouts.php:132
-msgid "Layout Description (Optional)"
-msgstr "Опи�ание шаблона (необ�зательно)"
+#: ../../include/selectors.php:60
+msgid "Undecided"
+msgstr "�е решил"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
-msgid "Edit Layout"
-msgstr "Редактировать шаблон"
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
+msgid "Males"
+msgstr "Мужчины"
 
-#: ../../Zotlabs/Module/Connections.php:58
-#: ../../Zotlabs/Module/Connections.php:116
-#: ../../Zotlabs/Module/Connections.php:274
-msgid "Active"
-msgstr "�ктивен"
+#: ../../include/selectors.php:96 ../../include/selectors.php:115
+msgid "Females"
+msgstr "Женщины"
 
-#: ../../Zotlabs/Module/Connections.php:63
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:279
-msgid "Blocked"
-msgstr "Заблокирован"
+#: ../../include/selectors.php:96
+msgid "Gay"
+msgstr "Гей"
 
-#: ../../Zotlabs/Module/Connections.php:68
-#: ../../Zotlabs/Module/Connections.php:189
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Ignored"
-msgstr "Игнорирует��"
+#: ../../include/selectors.php:96
+msgid "Lesbian"
+msgstr "Ле�би�нка"
 
-#: ../../Zotlabs/Module/Connections.php:73
-#: ../../Zotlabs/Module/Connections.php:203
-#: ../../Zotlabs/Module/Connections.php:277
-msgid "Hidden"
-msgstr "Скрыт"
+#: ../../include/selectors.php:96
+msgid "No Preference"
+msgstr "Без предпочтений"
 
-#: ../../Zotlabs/Module/Connections.php:78
-#: ../../Zotlabs/Module/Connections.php:196
-msgid "Archived/Unreachable"
-msgstr "Заархивировано / недо�тупно"
+#: ../../include/selectors.php:96
+msgid "Bisexual"
+msgstr "Би�ек�уал"
 
-#: ../../Zotlabs/Module/Connections.php:83
-#: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:180
-#: ../../Zotlabs/Module/Notifications.php:53
-msgid "New"
-msgstr "�овые"
+#: ../../include/selectors.php:96
+msgid "Autosexual"
+msgstr "�вто�ек�уал"
 
-#: ../../Zotlabs/Module/Connections.php:158
-msgid "Active Connections"
-msgstr "�ктивные контакты"
+#: ../../include/selectors.php:96
+msgid "Abstinent"
+msgstr "Воздержание"
 
-#: ../../Zotlabs/Module/Connections.php:161
-msgid "Show active connections"
-msgstr "Показать активные контакты"
+#: ../../include/selectors.php:96
+msgid "Virgin"
+msgstr "Дев�твенник"
 
-#: ../../Zotlabs/Module/Connections.php:168
-msgid "Show pending (new) connections"
-msgstr "Про�мотр (новых) ожидающих контактов"
+#: ../../include/selectors.php:96
+msgid "Deviant"
+msgstr "Отклон�ющий�� от нормы"
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show blocked connections"
-msgstr "Показать только заблокированные контакты"
+#: ../../include/selectors.php:96
+msgid "Fetish"
+msgstr "Фетиши�т"
 
-#: ../../Zotlabs/Module/Connections.php:192
-msgid "Only show ignored connections"
-msgstr "Показать только проигнорированные контакты"
+#: ../../include/selectors.php:96
+msgid "Oodles"
+msgstr "Множе�твенный"
 
-#: ../../Zotlabs/Module/Connections.php:199
-msgid "Only show archived/unreachable connections"
-msgstr "Показать только заархивированные / недо�тупные контакты"
+#: ../../include/selectors.php:96
+msgid "Nonsexual"
+msgstr "��ек�уал"
 
-#: ../../Zotlabs/Module/Connections.php:206
-msgid "Only show hidden connections"
-msgstr "Показать только �крытые контакты"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Single"
+msgstr "Одиночка"
 
-#: ../../Zotlabs/Module/Connections.php:221
-msgid "Show all connections"
-msgstr "Про�мотр в�ех контактов"
+#: ../../include/selectors.php:134
+msgid "Lonely"
+msgstr "Одинокий"
 
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Pending approval"
-msgstr "Ожидающие подтверждени�"
+#: ../../include/selectors.php:134
+msgid "Available"
+msgstr "Свободен"
 
-#: ../../Zotlabs/Module/Connections.php:276
-msgid "Archived"
-msgstr "Зархивирован"
+#: ../../include/selectors.php:134
+msgid "Unavailable"
+msgstr "Зан�т"
 
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Not connected at this location"
-msgstr "�е подключено в �том ме�те"
+#: ../../include/selectors.php:134
+msgid "Has crush"
+msgstr "Влюблён"
 
-#: ../../Zotlabs/Module/Connections.php:319
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr ""
+#: ../../include/selectors.php:134
+msgid "Infatuated"
+msgstr "без ума"
 
-#: ../../Zotlabs/Module/Connections.php:320
-msgid "Edit connection"
-msgstr "Редактировать контакт"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Dating"
+msgstr "В�тречаю�ь"
 
-#: ../../Zotlabs/Module/Connections.php:322
-msgid "Delete connection"
-msgstr "Удалить контакт"
+#: ../../include/selectors.php:134
+msgid "Unfaithful"
+msgstr "�еверный"
 
-#: ../../Zotlabs/Module/Connections.php:331
-msgid "Channel address"
-msgstr "�дре� канала"
+#: ../../include/selectors.php:134
+msgid "Sex Addict"
+msgstr "Эротоман"
 
-#: ../../Zotlabs/Module/Connections.php:336
-msgid "Call"
-msgstr "Вызов"
+#: ../../include/selectors.php:134
+msgid "Friends/Benefits"
+msgstr "Друзь� / Выгоды"
 
-#: ../../Zotlabs/Module/Connections.php:338
-msgid "Status"
-msgstr "Стату�"
+#: ../../include/selectors.php:134
+msgid "Casual"
+msgstr "Легкомы�ленный"
 
-#: ../../Zotlabs/Module/Connections.php:340
-msgid "Connected"
-msgstr "Подключено"
+#: ../../include/selectors.php:134
+msgid "Engaged"
+msgstr "Помолвлен"
 
-#: ../../Zotlabs/Module/Connections.php:342
-msgid "Approve connection"
-msgstr "Утвердить контакт"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Married"
+msgstr "В браке"
 
-#: ../../Zotlabs/Module/Connections.php:344
-msgid "Ignore connection"
-msgstr "Игнорировать контакт"
+#: ../../include/selectors.php:134
+msgid "Imaginarily married"
+msgstr "В воображаемом браке"
 
-#: ../../Zotlabs/Module/Connections.php:345
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore"
-msgstr "Игнорировать"
+#: ../../include/selectors.php:134
+msgid "Partners"
+msgstr "Партнёр�тво"
 
-#: ../../Zotlabs/Module/Connections.php:346
-msgid "Recent activity"
-msgstr "По�ледние дей�тви�"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Cohabiting"
+msgstr "Сожитель�твующие"
 
-#: ../../Zotlabs/Module/Connections.php:352
-msgid "Connect at this location"
-msgstr "Подключить в �том ме�те"
+#: ../../include/selectors.php:134
+msgid "Common law"
+msgstr "Граждан�кий брак"
 
-#: ../../Zotlabs/Module/Connections.php:380
-msgid "Search your connections"
-msgstr "Пои�к ваших контактов"
+#: ../../include/selectors.php:134
+msgid "Happy"
+msgstr "Сча�тлив"
 
-#: ../../Zotlabs/Module/Connections.php:381
-msgid "Connections search"
-msgstr "Пои�к контаков"
+#: ../../include/selectors.php:134
+msgid "Not looking"
+msgstr "�е нуждаю�ь"
 
-#: ../../Zotlabs/Module/Cover_photo.php:196
-#: ../../Zotlabs/Module/Cover_photo.php:254
-msgid "Cover Photos"
-msgstr "Фотографии обложки"
+#: ../../include/selectors.php:134
+msgid "Swinger"
+msgstr "Свингер"
 
-#: ../../Zotlabs/Module/Cover_photo.php:418
-msgid "Your cover photo may be visible to anybody on the internet"
-msgstr "Фотографи� вашей обложки может быть видна в�ем в Интернете"
+#: ../../include/selectors.php:134
+msgid "Betrayed"
+msgstr "Предан"
 
-#: ../../Zotlabs/Module/Cover_photo.php:422
-msgid "Change Cover Photo"
-msgstr "Изменить фотографию обложки"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Separated"
+msgstr "Разделён"
 
-#: ../../Zotlabs/Module/Photos.php:80
-msgid "Page owner information could not be retrieved."
-msgstr "Информаци� о владельце �траницы не может быть получена."
+#: ../../include/selectors.php:134
+msgid "Unstable"
+msgstr "�е�табильно"
 
-#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
-msgid "Album not found."
-msgstr "�льбом не найден."
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Divorced"
+msgstr "В разводе"
 
-#: ../../Zotlabs/Module/Photos.php:105
-msgid "Delete Album"
-msgstr "Удалить альбом"
+#: ../../include/selectors.php:134
+msgid "Imaginarily divorced"
+msgstr "В воображаемом разводе"
 
-#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
-msgstr "Удалить фотографию"
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "Widowed"
+msgstr "Вдовец / вдова"
 
-#: ../../Zotlabs/Module/Photos.php:530
-msgid "No photos selected"
-msgstr "�икакие фотографии не выбраны"
+#: ../../include/selectors.php:134
+msgid "Uncertain"
+msgstr "�еопределенный"
 
-#: ../../Zotlabs/Module/Photos.php:579
-msgid "Access to this item is restricted."
-msgstr "До�туп к �тому �лементу ограничен."
+#: ../../include/selectors.php:134 ../../include/selectors.php:151
+msgid "It's complicated"
+msgstr "Это �ложно"
 
-#: ../../Zotlabs/Module/Photos.php:622
+#: ../../include/selectors.php:134
+msgid "Don't care"
+msgstr "В�ё равно"
+
+#: ../../include/selectors.php:134
+msgid "Ask me"
+msgstr "Спро�и мен�"
+
+#: ../../include/items.php:979 ../../include/items.php:1039
+msgid "(Unknown)"
+msgstr "(�еизве�тный)"
+
+#: ../../include/items.php:1243
+msgid "Visible to anybody on the internet."
+msgstr "Виден в�ем в интернете."
+
+#: ../../include/items.php:1245
+msgid "Visible to you only."
+msgstr "Видно только вам."
+
+#: ../../include/items.php:1247
+msgid "Visible to anybody in this network."
+msgstr "Видно в�ем в �той �ети."
+
+#: ../../include/items.php:1249
+msgid "Visible to anybody authenticated."
+msgstr "Видно в�ем аутентифицированным."
+
+#: ../../include/items.php:1251
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Вы и�пользовали %1$.2f мегабайт из %2$.2f дл� хранени� фото."
+msgid "Visible to anybody on %s."
+msgstr "Видно в�ем в %s."
 
-#: ../../Zotlabs/Module/Photos.php:625
+#: ../../include/items.php:1253
+msgid "Visible to all connections."
+msgstr "Видно в�ем контактам."
+
+#: ../../include/items.php:1255
+msgid "Visible to approved connections."
+msgstr "Видно только одобренным контактам."
+
+#: ../../include/items.php:1257
+msgid "Visible to specific connections."
+msgstr "Видно указанным контактам."
+
+#: ../../include/items.php:4257
+msgid "Privacy group is empty."
+msgstr "Группа конфиденциально�ти пу�та"
+
+#: ../../include/items.php:4264
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "Вы и�пользовали %1$.2f мегабайт дл� хранени� фото."
+msgid "Privacy group: %s"
+msgstr "Группа конфиденциально�ти: %s"
 
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Upload Photos"
-msgstr "Загрузить фотографии"
+#: ../../include/items.php:4276
+msgid "Connection not found."
+msgstr "Контакт не найден."
 
-#: ../../Zotlabs/Module/Photos.php:671
-msgid "Enter an album name"
-msgstr "Введите название альбома"
+#: ../../include/items.php:4629
+msgid "profile photo"
+msgstr "Фотографи� профил�"
 
-#: ../../Zotlabs/Module/Photos.php:672
-msgid "or select an existing album (doubleclick)"
-msgstr "или выберите �уще�твующий альбом (двойной щелчок)"
+#: ../../include/items.php:4821
+#, php-format
+msgid "[Edited %s]"
+msgstr "[Отредактировано %s]"
 
-#: ../../Zotlabs/Module/Photos.php:673
-msgid "Create a status post for this upload"
-msgstr "Сделать публикацию о �тату�е дл� �той загрузки"
+#: ../../include/items.php:4821
+msgctxt "edit_activity"
+msgid "Post"
+msgstr "Публикаци�"
 
-#: ../../Zotlabs/Module/Photos.php:675
-msgid "Description (optional)"
-msgstr "Опи�ание (необ�зательно)"
+#: ../../include/items.php:4821
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr "Комментарий"
 
-#: ../../Zotlabs/Module/Photos.php:761
-msgid "Show Newest First"
-msgstr "Показать новые первыми"
+#: ../../include/attach.php:273 ../../include/attach.php:324
+#: ../../include/attach.php:419
+msgid "Item was not found."
+msgstr "Элемент не найден."
 
-#: ../../Zotlabs/Module/Photos.php:763
-msgid "Show Oldest First"
-msgstr "Показать �тарые первыми"
+#: ../../include/attach.php:290
+msgid "Unknown error."
+msgstr "�еизве�тна� ошибка."
 
-#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364
-msgid "Add Photos"
-msgstr "Добавить фотографии"
+#: ../../include/attach.php:612
+msgid "No source file."
+msgstr "�ет и�ходного файла."
 
-#: ../../Zotlabs/Module/Photos.php:868
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "До�туп запрещен. До�туп к �тому �лементу может быть ограничен."
+#: ../../include/attach.php:634
+msgid "Cannot locate file to replace"
+msgstr "�е удает�� найти файл дл� замены"
 
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Photo not available"
-msgstr "Фотографи� не до�тупна"
+#: ../../include/attach.php:653
+msgid "Cannot locate file to revise/update"
+msgstr "�е удает�� найти файл дл� пере�мотра / обновлени�"
 
-#: ../../Zotlabs/Module/Photos.php:928
-msgid "Use as profile photo"
-msgstr "И�пользовать в каче�тве фотографии профил�"
+#: ../../include/attach.php:795
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Файл превышает предельный размер %d"
 
-#: ../../Zotlabs/Module/Photos.php:929
-msgid "Use as cover photo"
-msgstr "И�пользовать в каче�тве фотографии обложки"
+#: ../../include/attach.php:816
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Вы до�тигли предела %1$.0f Мбайт дл� хранени� вложений."
 
-#: ../../Zotlabs/Module/Photos.php:936
-msgid "Private Photo"
-msgstr "Лична� фотографи�"
+#: ../../include/attach.php:1004
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Загрузка файла не удала�ь. Возможно �и�тема перегружена или попытка прекращена."
 
-#: ../../Zotlabs/Module/Photos.php:951
-msgid "View Full Size"
-msgstr "По�мотреть в полный размер"
+#: ../../include/attach.php:1033
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Файл дл� �охранени� не может быть проверен. Загрузка не удала�ь."
 
-#: ../../Zotlabs/Module/Photos.php:1033
-msgid "Edit photo"
-msgstr "Редактировать фотографию"
+#: ../../include/attach.php:1105 ../../include/attach.php:1121
+msgid "Path not available."
+msgstr "Путь недо�тупен."
 
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CW (right)"
-msgstr "Повернуть CW (направо)"
+#: ../../include/attach.php:1169 ../../include/attach.php:1332
+msgid "Empty pathname"
+msgstr "Пу�тое им� пути"
 
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CCW (left)"
-msgstr "Повернуть CCW (налево)"
+#: ../../include/attach.php:1195
+msgid "duplicate filename or path"
+msgstr "дублирующее�� им� файла или пути"
 
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Move photo to album"
-msgstr "Переме�тить фотографию в альбом"
+#: ../../include/attach.php:1220
+msgid "Path not found."
+msgstr "Путь не найден."
 
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
-msgstr "Введите новое название альбома"
+#: ../../include/attach.php:1288
+msgid "mkdir failed."
+msgstr "mkdir не удал��"
 
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
-msgstr "или выбрать �уще�твующую (двойной щелчок)"
+#: ../../include/attach.php:1292
+msgid "database storage failed."
+msgstr "ошибка при запи�и базы данных."
 
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
-msgstr "Добавить тег"
+#: ../../include/attach.php:1338
+msgid "Empty path"
+msgstr "Пу�тое им� пути"
 
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../include/attach.php:2099
+#, php-format
+msgid "%s shared a %s with you"
+msgstr "%s поделил�� � вами %s"
 
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
-msgstr "Пометить как альбом \"дл� взро�лых\""
+#: ../../include/attach.php:2099
+#: ../../extend/addon/hzaddons/redfiles/redfilehelper.php:64
+msgid "file"
+msgstr "файл"
 
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
-msgid "I like this (toggle)"
-msgstr "мне �то нравит�� (переключение)"
+#: ../../include/network.php:1737 ../../include/network.php:1738
+msgid "Friendica"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
-msgid "I don't like this (toggle)"
-msgstr "мне �то не нравит�� (переключение)"
+#: ../../include/network.php:1739
+msgid "OStatus"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:824
-msgid "This is you"
-msgstr "Это вы"
+#: ../../include/network.php:1740
+msgid "GNU-Social"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
-msgid "View all"
-msgstr "Про�мотреть в�е"
+#: ../../include/network.php:1741
+msgid "RSS/Atom"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1247
-msgid "Photo Tools"
-msgstr "Фото-Ин�трументы"
+#: ../../include/network.php:1744
+msgid "Diaspora"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1256
-msgid "In This Photo:"
-msgstr "�а �той фотографии:"
+#: ../../include/network.php:1745
+msgid "Facebook"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1261
-msgid "Map"
-msgstr "Карта"
+#: ../../include/network.php:1746
+msgid "Zot"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:491
-msgctxt "noun"
-msgid "Likes"
-msgstr "�равит��"
+#: ../../include/network.php:1747
+msgid "LinkedIn"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:492
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "�е нравит��"
+#: ../../include/network.php:1748
+msgid "XMPP/IM"
+msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Дей�твительный аккаунт не найден."
+#: ../../include/network.php:1749
+msgid "MySpace"
+msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Запро� на �бро� парол� отправлен. Проверьте вашу �лектронную почту."
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
+#: ../../include/bbcode.php:1546 ../../include/bbcode.php:1554
+msgid "Image/photo"
+msgstr "Изображение / фотографи�"
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Уча�тник �айта (%s)"
+#: ../../include/bbcode.php:280 ../../include/bbcode.php:1571
+msgid "Encrypted content"
+msgstr "Зашифрованное �одержание"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#: ../../include/bbcode.php:334
 #, php-format
-msgid "Password reset requested at %s"
-msgstr "Запрошен �бро� парол� на %s"
+msgid "Install %1$s element %2$s"
+msgstr "У�тановить %1$s �лемент %2$s"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
+#: ../../include/bbcode.php:338
+#, php-format
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Запро� не может быть проверен. (Вы могли отправить его раньше). Сбро� парол� не возможен."
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Эта публикаци� �одержит у�танавливаемый %s �лемент, однако у ва� нет разрешений дл� его у�тановки на �том �айте."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725
-msgid "Password Reset"
-msgstr "Сбро�ить пароль"
+#: ../../include/bbcode.php:551
+msgid "card"
+msgstr "карточка"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr "Ваш пароль в �оответ�твии � про�ьбой �брошен."
+#: ../../include/bbcode.php:553
+msgid "article"
+msgstr "�тать�"
 
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr "Ваш новый пароль"
+#: ../../include/bbcode.php:559 ../../include/markdown.php:203
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s была �оздана %2$s %3$s"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr "Сохраните ваш новый пароль и затем"
+#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
+msgid "Click to open/close"
+msgstr "�ажмите, чтобы открыть/закрыть"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
-msgstr "нажмите зде�ь чтобы войти"
+#: ../../include/bbcode.php:644 ../../include/markdown.php:256
+msgid "spoiler"
+msgstr "�пойлер"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
+#: ../../include/bbcode.php:657
+msgid "View article"
+msgstr "Про�мотр �татьи"
+
+#: ../../include/bbcode.php:657
+msgid "View summary"
+msgstr "Про�мотр резюме"
+
+#: ../../include/bbcode.php:1522
+msgid "$1 wrote:"
+msgstr "$1 пи�ал:"
+
+#: ../../include/security.php:607
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Ваш пароль может быть изменён на �транице <em>�а�тройки</em> по�ле у�пешного входа."
+"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 "�еверный токен безопа�но�ти дл� формы. Веро�тно, �то произошло потому, что форма была открыта �лишком долго (> 3-х ча�ов) перед её отправкой."
 
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Пароль был изменен на %s"
+#: ../../include/account.php:38
+msgid "The provided email address is not valid"
+msgstr "Предо�тавленный адре� �лектронной почты недей�твителен"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
-msgstr "Забыли ваш пароль?"
+#: ../../include/account.php:41
+msgid "The provided email domain is not among those allowed on this site"
+msgstr "Домен �лектронной почты не входит в чи�ло разрешенных на �том �айте"
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../include/account.php:48
+msgid "The provided email address is already registered at this site"
+msgstr "Предо�тавленный адре� �лектронной почты уже зареги�трирован на �том �айте"
+
+#: ../../include/account.php:55
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Введите ваш адре� �лектронной почты и нажмите отправить чтобы �бро�ить пароль. Затем проверьте ваш почтовый �щик дл� дальнейших ин�трукций. "
+"There is a pending registration for this address - click \"Register\" to "
+"continue verification"
+msgstr "Дл� �того адре�а ожидает�� реги�траци� - нажмите \"Зареги�трировать��\", чтобы продолжить проверку"
 
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
-msgstr "�дре� �лектронной почты"
+#: ../../include/account.php:94
+msgid "An invitation is required."
+msgstr "Требует�� приглашение."
 
-#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78
-msgid "Reset"
-msgstr "Сбро�ить"
+#: ../../include/account.php:103
+msgid "Invitation could not be verified."
+msgstr "�е удало�ь проверить приглашение."
 
-#: ../../Zotlabs/Module/Follow.php:93
-msgid "Connection added."
-msgstr "Контакт добавлен."
+#: ../../include/account.php:191
+msgid "Please enter the required information."
+msgstr "Пожалуй�та, введите необходимую информацию."
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
-msgid "Invalid item."
-msgstr "�едей�твительный �лемент."
+#: ../../include/account.php:258 ../../include/account.php:366
+msgid "Failed to store account information."
+msgstr "�е удало�ь �охранить информацию аккаунта."
 
-#: ../../Zotlabs/Module/Page.php:173
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr ""
+#: ../../include/account.php:578
+#, php-format
+msgid "Registration request at %s"
+msgstr "Запро� реги�трации на %s"
 
-#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
-msgid "Profile not found."
-msgstr "Профиль не найден."
+#: ../../include/account.php:600
+msgid "your registration password"
+msgstr "ваш пароль реги�трации"
 
-#: ../../Zotlabs/Module/Profiles.php:46
-msgid "Profile deleted."
-msgstr "Профиль удален."
+#: ../../include/account.php:606 ../../include/account.php:695
+#, php-format
+msgid "Registration details for %s"
+msgstr "Реги�трационные данные дл� %s"
 
-#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
-msgid "Profile-"
-msgstr "Профиль -"
+#: ../../include/account.php:706
+msgid "Account approved."
+msgstr "�ккаунт утвержден."
 
-#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
-msgid "New profile created."
-msgstr "�овый профиль �оздан."
+#: ../../include/account.php:762
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Реги�траци� отозвана дл� %s"
 
-#: ../../Zotlabs/Module/Profiles.php:113
-msgid "Profile unavailable to clone."
-msgstr "Профиль недо�тупен дл� клонировани�."
+#: ../../include/account.php:769
+#, php-format
+msgid "Could not revoke registration for %s"
+msgstr "�е удало�ь отозвать реги�трацию дл� %s"
 
-#: ../../Zotlabs/Module/Profiles.php:148
-msgid "Profile unavailable to export."
-msgstr "Профиль недо�тупен дл� �к�порта."
+#: ../../include/account.php:1185 ../../include/account.php:1187
+msgid "Click here to upgrade."
+msgstr "�ажмите зде�ь дл� обновлени�."
 
-#: ../../Zotlabs/Module/Profiles.php:254
-msgid "Profile Name is required."
-msgstr "Требует�� им� профил�."
+#: ../../include/account.php:1193
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Это дей�твие превышает ограничени�, у�тановленные в вашем плане."
 
-#: ../../Zotlabs/Module/Profiles.php:461
-msgid "Marital Status"
-msgstr "Семейное положение"
+#: ../../include/account.php:1198
+msgid "This action is not available under your subscription plan."
+msgstr "Это дей�твие невозможно из-за ограничений в вашем плане."
 
-#: ../../Zotlabs/Module/Profiles.php:465
-msgid "Romantic Partner"
-msgstr "Романтиче�кий партнер"
+#: ../../include/account.php:1258
+msgid "open"
+msgstr "открыта"
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
-msgid "Likes"
-msgstr "�равит��"
+#: ../../include/account.php:1258
+msgid "closed"
+msgstr "закрыта"
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
-msgid "Dislikes"
-msgstr "�е нравит��"
+#: ../../include/account.php:1265
+msgid "Registration is currently"
+msgstr "В на�то�щее врем� реги�траци�"
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
-msgid "Work/Employment"
-msgstr "Работа / Зан�то�ть"
+#: ../../include/account.php:1274
+msgid "please come back"
+msgstr "пожалуй�та, возвращайте�ь позднее"
 
-#: ../../Zotlabs/Module/Profiles.php:480
-msgid "Religion"
-msgstr "Религи�"
+#: ../../include/acl_selectors.php:100
+msgid "Profile-Based Privacy Groups"
+msgstr "Группы конфиденциально�ти о�нованные на профиле"
 
-#: ../../Zotlabs/Module/Profiles.php:484
-msgid "Political Views"
-msgstr "Политиче�кие взгл�ды"
+#: ../../include/acl_selectors.php:119
+msgid "Private Forum"
+msgstr "Ча�тный форум"
 
-#: ../../Zotlabs/Module/Profiles.php:492
-msgid "Sexual Preference"
-msgstr "Сек�уальна� ориентаци�"
+#: ../../include/acl_selectors.php:143
+msgid "Share with"
+msgstr "Поделить�� �"
 
-#: ../../Zotlabs/Module/Profiles.php:496
-msgid "Homepage"
-msgstr "Домашн�� �траница"
+#: ../../include/acl_selectors.php:144
+msgid "Custom selection"
+msgstr "�а�траиваемый выбор"
 
-#: ../../Zotlabs/Module/Profiles.php:500
-msgid "Interests"
-msgstr "Интере�ы"
+#: ../../include/acl_selectors.php:146
+msgid ""
+"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and "
+"limit the scope of \"Allow\"."
+msgstr "Выберите \"Разрешить\" дл� разрешени� про�мотра. \"�е разрешать\" позвол�ет вам переопределить и ограничить разрешени�."
 
-#: ../../Zotlabs/Module/Profiles.php:596
-msgid "Profile updated."
-msgstr "Профиль обновлен."
+#: ../../include/acl_selectors.php:148
+msgid "Don't allow"
+msgstr "�е разрешать"
 
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Hide your connections list from viewers of this profile"
-msgstr "Скрывать от про�мотра ваш �пи�ок контактов в �том профиле"
+#: ../../include/acl_selectors.php:181
+#, 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."
+msgstr "Разрешени� публикации %s не могут быть изменены %s по�ле того, как ею поделили�ь. Эти разрешени� у�танавливают кому разрешено про�матривать �ту публикацию."
 
-#: ../../Zotlabs/Module/Profiles.php:724
-msgid "Edit Profile Details"
-msgstr "Редактирование профил�"
+#: ../../include/text.php:523
+msgid "prev"
+msgstr "предыдущий"
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "View this profile"
-msgstr "По�мотреть �тот профиль"
+#: ../../include/text.php:525
+msgid "first"
+msgstr "первый"
 
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Profile Tools"
-msgstr "Ин�трументы профил�"
+#: ../../include/text.php:554
+msgid "last"
+msgstr "по�ледний"
 
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Change cover photo"
-msgstr "Изменить фотографию обложки"
+#: ../../include/text.php:557
+msgid "next"
+msgstr "�ледующий"
 
-#: ../../Zotlabs/Module/Profiles.php:731
-msgid "Create a new profile using these settings"
-msgstr "Создать новый профиль � теми же на�тройками"
+#: ../../include/text.php:575
+msgid "older"
+msgstr "�тарше"
 
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Clone this profile"
-msgstr "Клонировать �тот профиль"
+#: ../../include/text.php:577
+msgid "newer"
+msgstr "новее"
 
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Delete this profile"
-msgstr "Удалить �тот профиль"
+#: ../../include/text.php:1018
+msgid "No connections"
+msgstr "�ет контактов"
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Add profile things"
-msgstr "Добавить в профиль"
+#: ../../include/text.php:1070
+#, php-format
+msgid "View all %s connections"
+msgstr "Про�мотреть в�е %s контактов"
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Personal"
-msgstr "Личное"
+#: ../../include/text.php:1133
+#, php-format
+msgid "Network: %s"
+msgstr "Сеть: %s"
 
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Relationship"
-msgstr "Отношени�"
+#: ../../include/text.php:1236 ../../include/text.php:1240
+msgid "poke"
+msgstr "Ткнуть"
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Import profile from file"
-msgstr "Импортировать профиль из файла"
+#: ../../include/text.php:1241
+msgid "ping"
+msgstr "Пингануть"
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Export profile to file"
-msgstr "Эк�портировать профиль в файл"
+#: ../../include/text.php:1241
+msgid "pinged"
+msgstr "Отпингован"
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Your gender"
-msgstr "Ваш пол"
+#: ../../include/text.php:1242
+msgid "prod"
+msgstr "Подтолкнуть"
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Marital status"
-msgstr "Семейное положение"
+#: ../../include/text.php:1242
+msgid "prodded"
+msgstr "Подтолкнут"
 
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Sexual preference"
-msgstr "Сек�уальна� ориентаци�"
+#: ../../include/text.php:1243
+msgid "slap"
+msgstr "Шлёпнуть"
 
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "Profile name"
-msgstr "Им� профил�"
+#: ../../include/text.php:1243
+msgid "slapped"
+msgstr "Шлёпнут"
 
-#: ../../Zotlabs/Module/Profiles.php:749
-msgid "This is your default profile."
-msgstr "Это ваш профиль по умолчанию."
+#: ../../include/text.php:1244
+msgid "finger"
+msgstr "Указать"
 
-#: ../../Zotlabs/Module/Profiles.php:751
-msgid "Your full name"
-msgstr "Ваше полное им�"
+#: ../../include/text.php:1244
+msgid "fingered"
+msgstr "Указан"
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Short title/description"
-msgstr "Краткий заголовок или наименование"
+#: ../../include/text.php:1245
+msgid "rebuff"
+msgstr "Дать отпор"
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Maximal 190 characters"
-msgstr "�е более 190 �имволов"
+#: ../../include/text.php:1245
+msgid "rebuffed"
+msgstr "Дан отпор"
 
-#: ../../Zotlabs/Module/Profiles.php:755
-msgid "Street address"
-msgstr "Улица, дом, квартира"
+#: ../../include/text.php:1268
+msgid "happy"
+msgstr "�ча�тливый"
 
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Locality/City"
-msgstr "�а�еленный пункт / город"
+#: ../../include/text.php:1269
+msgid "sad"
+msgstr "гру�тный"
 
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Region/State"
-msgstr "Регион / Обла�ть"
+#: ../../include/text.php:1270
+msgid "mellow"
+msgstr "�покойный"
 
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Postal/Zip code"
-msgstr "Почтовый индек�"
+#: ../../include/text.php:1271
+msgid "tired"
+msgstr "у�талый"
 
-#: ../../Zotlabs/Module/Profiles.php:764
-msgid "Who (if applicable)"
-msgstr "Кто (е�ли применимо)"
+#: ../../include/text.php:1272
+msgid "perky"
+msgstr "ве�ёлый"
 
-#: ../../Zotlabs/Module/Profiles.php:764
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
+#: ../../include/text.php:1273
+msgid "angry"
+msgstr "�ердитый"
 
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Since (date)"
-msgstr "С (дата)"
+#: ../../include/text.php:1274
+msgid "stupefied"
+msgstr "отупевший"
 
-#: ../../Zotlabs/Module/Profiles.php:768
-msgid "Tell us about yourself"
-msgstr "Ра��кажите нам о �ебе"
+#: ../../include/text.php:1275
+msgid "puzzled"
+msgstr "недоумевающий"
 
-#: ../../Zotlabs/Module/Profiles.php:770
-msgid "Hometown"
-msgstr "Родной город"
+#: ../../include/text.php:1276
+msgid "interested"
+msgstr "заинтере�ованный"
 
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Political views"
-msgstr "Политиче�кие взгл�ды"
+#: ../../include/text.php:1277
+msgid "bitter"
+msgstr "едкий"
 
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Religious views"
-msgstr "Религиозные взгл�ды"
+#: ../../include/text.php:1278
+msgid "cheerful"
+msgstr "бодрый"
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Keywords used in directory listings"
-msgstr "Ключевые �лова дл� уча�ти� в каталоге"
+#: ../../include/text.php:1279
+msgid "alive"
+msgstr "�нергичный"
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Example: fishing photography software"
-msgstr "�апример: fishing photography software"
+#: ../../include/text.php:1280
+msgid "annoyed"
+msgstr "раздражённый"
 
-#: ../../Zotlabs/Module/Profiles.php:776
-msgid "Musical interests"
-msgstr "Музыкальные интере�ы"
+#: ../../include/text.php:1281
+msgid "anxious"
+msgstr "обе�покоенный"
 
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Books, literature"
-msgstr "Книги, литература"
+#: ../../include/text.php:1282
+msgid "cranky"
+msgstr "капризный"
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Television"
-msgstr "Телевидение"
+#: ../../include/text.php:1283
+msgid "disturbed"
+msgstr "в�тревоженный"
 
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Film/Dance/Culture/Entertainment"
-msgstr "Кино / танцы / культура / развлечени�"
+#: ../../include/text.php:1284
+msgid "frustrated"
+msgstr "разочарованный"
 
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Hobbies/Interests"
-msgstr "Хобби / интере�ы"
+#: ../../include/text.php:1285
+msgid "depressed"
+msgstr "подавленный"
 
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Love/Romance"
-msgstr "Любовь / романтиче�кие отношени�"
+#: ../../include/text.php:1286
+msgid "motivated"
+msgstr "мотивированный"
 
-#: ../../Zotlabs/Module/Profiles.php:783
-msgid "School/Education"
-msgstr "Школа / образование"
+#: ../../include/text.php:1287
+msgid "relaxed"
+msgstr "ра��лабленный"
 
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "Contact information and social networks"
-msgstr "Информаци� и �оциальные �ети дл� �в�зи"
+#: ../../include/text.php:1288
+msgid "surprised"
+msgstr "удивленный"
 
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "My other channels"
-msgstr "Мои другие контакты"
+#: ../../include/text.php:1480
+msgid "May"
+msgstr "Май"
 
-#: ../../Zotlabs/Module/Profiles.php:787
-msgid "Communications"
-msgstr "Св�зи"
+#: ../../include/text.php:1538
+msgid "Unknown Attachment"
+msgstr "�еизве�тное вложение"
 
-#: ../../Zotlabs/Module/Subthread.php:128
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s от�леживает %2$s's %3$s"
+#: ../../include/text.php:1581
+msgid "remove category"
+msgstr "удалить категорию"
 
-#: ../../Zotlabs/Module/Subthread.php:130
+#: ../../include/text.php:1658
+msgid "remove from file"
+msgstr "удалить из файла"
+
+#: ../../include/text.php:1827
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:401
+msgid "Download binary/encrypted content"
+msgstr "Загрузить двоичное / зашифрованное �одержимое"
+
+#: ../../include/text.php:1898
+msgid "Poll has ended."
+msgstr "Опро� окончен."
+
+#: ../../include/text.php:1901
 #, php-format
-msgid "%1$s stopped following %2$s's %3$s"
-msgstr "%1$s прекратил от�леживать %2$s's %3$s"
+msgid "Poll ends: %s"
+msgstr "Опро� заканчивает�� %s"
 
-#: ../../Zotlabs/Module/Articles.php:52
-msgid "Articles App"
-msgstr "Приложение \"Статьи\""
+#: ../../include/text.php:2058
+msgid "Link to Source"
+msgstr "С�ылка на и�точник"
 
-#: ../../Zotlabs/Module/Articles.php:53
-msgid "Create interactive articles"
-msgstr "Создать интерактивные �татьи"
+#: ../../include/text.php:2088
+msgid "Page layout"
+msgstr "Шаблон �траницы"
 
-#: ../../Zotlabs/Module/Articles.php:116
-msgid "Add Article"
-msgstr "Добавить �татью"
+#: ../../include/text.php:2088
+msgid "You can create your own with the layouts tool"
+msgstr "Вы можете �оздать �вой �об�твенный � помощью ин�трумента шаблонов"
 
-#: ../../Zotlabs/Module/Bookmarks.php:62
-msgid "Bookmark added"
-msgstr "Закладка добавлена"
+#: ../../include/text.php:2099
+msgid "HTML"
+msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:78
-msgid "Bookmarks App"
-msgstr "Приложение \"Закладки\""
+#: ../../include/text.php:2102
+msgid "Comanche Layout"
+msgstr "Шаблон Comanche"
 
-#: ../../Zotlabs/Module/Bookmarks.php:79
-msgid "Bookmark links from posts and manage them"
-msgstr "Поме�тить ��ылки из публикации в закладки и управл�ть ими"
+#: ../../include/text.php:2107
+msgid "PHP"
+msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:92
-msgid "My Bookmarks"
-msgstr "Мои закладки"
+#: ../../include/text.php:2116
+msgid "Page content type"
+msgstr "Тип �одержимого �траницы"
 
-#: ../../Zotlabs/Module/Bookmarks.php:103
-msgid "My Connections Bookmarks"
-msgstr "Закладки моих контактов"
+#: ../../include/text.php:2249
+msgid "activity"
+msgstr "активно�ть"
 
-#: ../../Zotlabs/Module/Probe.php:19
-msgid "Remote Diagnostics App"
-msgstr "Приложение \"Удалённа� диагно�тика\""
+#: ../../include/text.php:2252
+msgid "poll"
+msgstr "голо�ование"
 
-#: ../../Zotlabs/Module/Probe.php:20
-msgid "Perform diagnostics on remote channels"
-msgstr "Производит диагно�тику удалённых каналов"
+#: ../../include/text.php:2365
+msgid "a-z, 0-9, -, and _ only"
+msgstr "Только a-z, 0-9, -, и _"
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
-msgid ""
-"Channel name changes are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Изменение названи� канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта."
+#: ../../include/text.php:2670
+msgid "Design Tools"
+msgstr "Ин�трументы дизайна"
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
-msgid "Change channel nickname/address"
-msgstr "Изменить п�евдоним / адре� канала"
+#: ../../include/text.php:2676
+msgid "Pages"
+msgstr "Страницы"
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
-msgid "Any/all connections on other networks will be lost!"
-msgstr "Любые / в�е контакты в других �ет�х будут утер�ны!"
+#: ../../include/text.php:2688
+msgid "Import"
+msgstr "Импортировать"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
-msgid "New channel address"
-msgstr "�овый адре� канала"
+#: ../../include/text.php:2689
+msgid "Import website..."
+msgstr "Импорт веб-�айта..."
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
-msgid "Rename Channel"
-msgstr "Переименовать канал"
+#: ../../include/text.php:2690
+msgid "Select folder to import"
+msgstr "Выбрать каталог дл� импорта"
 
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
-msgid "Invite App"
-msgstr "Приложение \"Пригла�ить\""
+#: ../../include/text.php:2691
+msgid "Import from a zipped folder:"
+msgstr "Импортировать из каталога в zip-архиве:"
 
-#: ../../Zotlabs/Module/Invite.php:68
-msgid "Register is closed"
-msgstr "Реги�траци� закрыта"
+#: ../../include/text.php:2692
+msgid "Import from cloud files:"
+msgstr "Импортировать из �етевых файлов:"
 
-#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
-msgid "Note, the invitation code is valid up to"
-msgstr "Обратите внимание: код приглашени� дей�твителен до "
+#: ../../include/text.php:2693
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:115
-#, php-format
-msgid "Too many recipients for one invitation (max %d)"
-msgstr "Слишком много получателей дл� одного кода приглашени� (не более %d)"
+#: ../../include/text.php:2694
+msgid "Enter path to website files"
+msgstr "Введите путь к файлам веб-�айта"
 
-#: ../../Zotlabs/Module/Invite.php:119
-msgid "No recipients for this invitation"
-msgstr "�ет получателей дл� �того приглашени�"
+#: ../../include/text.php:2695
+msgid "Select folder"
+msgstr "Выбрать каталог"
 
-#: ../../Zotlabs/Module/Invite.php:133
-#, php-format
-msgid "(%s) : Not a valid email address"
-msgstr "(%s) : �едей�твительный адре� �лектронной почты"
+#: ../../include/text.php:2696
+msgid "Export website..."
+msgstr "Эк�порт веб-�айта..."
 
-#: ../../Zotlabs/Module/Invite.php:138
-#, php-format
-msgid "(%s) : Not a real email address"
-msgstr "(%s) : �е на�то�щий адре� �лектронной почты"
+#: ../../include/text.php:2697
+msgid "Export to a zip file"
+msgstr "Эк�портировать в ZIP файл."
 
-#: ../../Zotlabs/Module/Invite.php:145
-#, php-format
-msgid "(%s) : Not allowed email address"
-msgstr "(%s) : �е разрешённый адре� �лектронной почты"
+#: ../../include/text.php:2698
+msgid "website.zip"
+msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:158
-#, php-format
-msgid "(%s) : email address already in use"
-msgstr "(%s) : �дре� �лектронной почты уже и�пользует��"
+#: ../../include/text.php:2699
+msgid "Enter a name for the zip file."
+msgstr "Введите им� дл� ZIP файла."
 
-#: ../../Zotlabs/Module/Invite.php:165
-#, php-format
-msgid "(%s) : Accepted email address"
-msgstr "%s) : Подтверждённый адре� �лектронной почты"
+#: ../../include/text.php:2700
+msgid "Export to cloud files"
+msgstr "Э�кпортировать в �етевые файлы:"
 
-#: ../../Zotlabs/Module/Invite.php:257
+#: ../../include/text.php:2701
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2702
+msgid "Enter a path to a cloud files destination."
+msgstr "Введите путь к ра�положению �етевых файлов."
+
+#: ../../include/text.php:2703
+msgid "Specify folder"
+msgstr "Указать каталог"
+
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "To %s : Message delivery success."
-msgstr "Дл� %s : Сообщение у�пешно до�тавлено."
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "до�тупно %d приглашение"
+msgstr[1] "до�тупны %d приглашени�"
+msgstr[2] "до�тупны %d приглашений"
 
-#: ../../Zotlabs/Module/Invite.php:289
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Пои�к каналов"
+
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Впишите им� или интере�"
+
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Подключить / от�леживать"
+
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Примеры: Владимир Ильич, Революционер"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Случайный профиль"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Пригла�ить друзей"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Ра�ширенный пример: name=ivan and country=russia"
+
+#: ../../include/contact_widgets.php:269
+msgid "Common Connections"
+msgstr "Общие контакты"
+
+#: ../../include/contact_widgets.php:273
 #, php-format
-msgid "%1$d mail(s) sent, %2$d mail error(s)"
-msgstr "%1$d пи�ем отправлено, %2$d ошибок до�тавки"
+msgid "View all %d common connections"
+msgstr "Про�мотреть в�е %d общих контактов"
 
-#: ../../Zotlabs/Module/Invite.php:315
-msgid "Invites not proposed by configuration"
-msgstr "И�пользование приглашений не предлагает��"
+#: ../../include/import.php:29
+msgid "Unable to import a removed channel."
+msgstr "�евозможно импортировать удалённый канал."
 
-#: ../../Zotlabs/Module/Invite.php:316
-msgid "Contact the site admin"
-msgstr "Св�зат�� � админи�тратором �айта"
+#: ../../include/import.php:55
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "�е удало�ь �оздать дублирующий�� идентификатор канала. Импорт невозможен."
 
-#: ../../Zotlabs/Module/Invite.php:332
-msgid "Invites by users not enabled"
-msgstr "Приглашени� от пользователей отключены"
+#: ../../include/import.php:76
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:44
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "�е удало�ь �оздать уникальный адре� канала. Импорт не завершен."
 
-#: ../../Zotlabs/Module/Invite.php:337
-msgid "You have no more invitations available"
-msgstr "У ва� больше нет приглашений"
+#: ../../include/import.php:121
+msgid "Cloned channel not found. Import failed."
+msgstr "Клон канала не найден. Импорт невозможен."
 
-#: ../../Zotlabs/Module/Invite.php:353
-msgid "Not on xchan"
-msgstr "�еизве�тный пользователь"
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
+msgstr "Канал-и�точник не найден."
 
-#: ../../Zotlabs/Module/Invite.php:386
-msgid "All users invitation limit exceeded."
-msgstr "Превышен лимит приглашений дл� в�ех пользователей."
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
+msgid "Focus (Hubzilla default)"
+msgstr "Фоку� (по умолчанию Hubzilla)"
 
-#: ../../Zotlabs/Module/Invite.php:404
-msgid "Invitation expires after"
-msgstr "Приглашение и�текает по�ле"
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Theme settings"
+msgstr "�а�тройки темы"
 
-#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
-msgid "Invitation"
-msgstr "Приглашение"
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Narrow navbar"
+msgstr "Узка� панель навигации"
 
-#: ../../Zotlabs/Module/Invite.php:534
-msgid "Send invitations"
-msgstr "Отправить приглашение"
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Navigation bar background color"
+msgstr "Панель навигации, цвет фона"
 
-#: ../../Zotlabs/Module/Invite.php:535
-msgid "Invitations I am using"
-msgstr "Приглашени�, которые � и�пользую"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Navigation bar icon color "
+msgstr "Панель навигации, цвет значков"
 
-#: ../../Zotlabs/Module/Invite.php:536
-msgid "Invitations we are using"
-msgstr "Приглашени�, которые мы и�пользуем"
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Navigation bar active icon color "
+msgstr "Панель навигации, цвет активного значка"
 
-#: ../../Zotlabs/Module/Invite.php:537
-msgid "§ Note, the email(s) sent will be recorded in the system logs"
-msgstr "Внимание: адре�а �лектронной почты будут запи�аны в �и�темные журналы."
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Link color"
+msgstr "Цвет ��ылок"
 
-#: ../../Zotlabs/Module/Invite.php:538
-msgid "Enter email addresses, one per line:"
-msgstr "Введите адре�а �лектронной почты, по одному в �троке:"
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Set font-color for banner"
+msgstr "Цвет тек�та в шапке"
 
-#: ../../Zotlabs/Module/Invite.php:540
-msgid "Invite template"
-msgstr "Шаблон приглашени�"
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set the background color"
+msgstr "Цвет фона"
 
-#: ../../Zotlabs/Module/Invite.php:548
-msgid "Here you may enter personal notes to the recipient(s)"
-msgstr "Зде�ь вы можете вве�ти личные заметки дл� получателей"
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set the background image"
+msgstr "Фоновое изображение"
 
-#: ../../Zotlabs/Module/Notes.php:57
-msgid "Notes App"
-msgstr "Приложение \"Запи�ки\""
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Set the background color of items"
+msgstr "Цвет фона �лементов"
 
-#: ../../Zotlabs/Module/Notes.php:58
-msgid "A simple notes app with a widget (note: notes are not encrypted)"
-msgstr "Про�тое приложение дл� запи�ок � виджетом (примечание: запи�ки не зашифрованы)"
+#: ../../view/theme/redbasic/php/config.php:108
+msgid "Set the background color of comments"
+msgstr "Цвет фона комментариев"
 
-#: ../../Zotlabs/Module/Xchan.php:10
-msgid "Xchan Lookup"
-msgstr "Пои�к Xchan"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Set font-size for the entire application"
+msgstr "У�тановить �и�темный размер шрифта"
 
-#: ../../Zotlabs/Module/Xchan.php:13
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Запро� Xchan начинает�� � (или webbie):"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Examples: 1rem, 100%, 16px"
+msgstr "�апример: 1rem, 100%, 16px"
 
-#: ../../Zotlabs/Module/Affinity.php:35
-msgid "Affinity Tool settings updated."
-msgstr "�а�тройки �тепени �ход�тва обновлены."
+#: ../../view/theme/redbasic/php/config.php:110
+msgid "Set font-color for posts and comments"
+msgstr "Цвет шрифта дл� публикаций и комментариев"
 
-#: ../../Zotlabs/Module/Affinity.php:47
-msgid ""
-"This app presents a slider control in your connection editor and also on "
-"your network page. The slider represents your degree of friendship "
-"(affinity) with each connection. It allows you to zoom in or out and display "
-"conversations from only your closest friends or everybody in your stream."
-msgstr "Это приложение пред�тавл�ет управление ползунком на �транице контактов и �етевом потоке, который позвол�ет выбирать вашу �тепень дружбы (�ход�тва). Это позвол�ет вам увеличивать или уменьшать ма�штаб и отображать разговоры только от ваших �амых близких друзей или в�ех в вашем потоке."
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Set radius of corners"
+msgstr "Радиу� �круглений"
 
-#: ../../Zotlabs/Module/Affinity.php:52
-msgid "Affinity Tool App"
-msgstr "Приложение \"Степень �ход�тва\""
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Example: 4px"
+msgstr "�апример: 4px"
 
-#: ../../Zotlabs/Module/Affinity.php:57
-msgid ""
-"The numbers below represent the minimum and maximum slider default positions "
-"for your network/stream page as a percentage."
-msgstr "Чи�ла ниже пред�тавл�ют минимальное и мак�имальное значение по умолчанию дл� вашей �ети / потока в процентах."
+#: ../../view/theme/redbasic/php/config.php:112
+msgid "Set shadow depth of photos"
+msgstr "Глубина теней фотографий"
 
-#: ../../Zotlabs/Module/Affinity.php:64
-msgid "Default maximum affinity level"
-msgstr "Мак�имальна� �тепень �ход�тва по умолчанию."
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Set maximum width of content region in pixel"
+msgstr "Мак�имальна� ширина �одержани� региона (в пик�ел�х)"
 
-#: ../../Zotlabs/Module/Affinity.php:64
-msgid "0-99 default 99"
-msgstr "0-99 (по умолчанию 99)"
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Leave empty for default width"
+msgstr "О�тавьте пу�тым дл� ширины по умолчанию"
 
-#: ../../Zotlabs/Module/Affinity.php:70
-msgid "Default minimum affinity level"
-msgstr "Мак�имальна� �тепень �ход�тва по умолчанию."
+#: ../../view/theme/redbasic/php/config.php:114
+msgid "Set size of conversation author photo"
+msgstr "Размер фотографии автора бе�еды"
 
-#: ../../Zotlabs/Module/Affinity.php:70
-msgid "0-99 - default 0"
-msgstr "0-99 (по умолчанию 0)"
+#: ../../view/theme/redbasic/php/config.php:115
+msgid "Set size of followup author photos"
+msgstr "Размер фотографий подпи�чиков"
 
-#: ../../Zotlabs/Module/Affinity.php:76
-msgid "Persistent affinity levels"
-msgstr "У�то�вшие�� �тепени �ход�тва"
+#: ../../view/theme/redbasic/php/config.php:116
+msgid "Show advanced settings"
+msgstr "Показать ра�ширенные на�тройки"
 
-#: ../../Zotlabs/Module/Affinity.php:76
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:51
+msgid "Your Webbie:"
+msgstr "Ваш Webbie:"
+
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:54
+msgid "Fontsize (px):"
+msgstr "Размер шрифта (px):"
+
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:68
+msgid "Link:"
+msgstr "С�ылка:"
+
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:70
+msgid "Like us on Hubzilla"
+msgstr "�равит�� на Hubzilla"
+
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:72
+msgid "Embed:"
+msgstr "В�троить:"
+
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:27
+msgid "Photo Cache settings saved."
+msgstr "�а�тройки к�шировани� изображений �охранены."
+
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:36
 msgid ""
-"If disabled the max and min levels will be reset to default after page reload"
-msgstr "Е�ли �тот параметр отключен, мак�имальный и минимальный уровни будут �брошены к значени�м по умолчанию по�ле перезагрузки �траницы"
+"Photo Cache addon saves a copy of images from external sites locally to "
+"increase your anonymity in the web."
+msgstr "Приложение \"К�шировние изображений\" �охран�ет копию изображений � внешних �айтов локально дл� повышени� вашей анонимно�ти в Интернет."
 
-#: ../../Zotlabs/Module/Affinity.php:84
-msgid "Affinity Tool Settings"
-msgstr "�а�тройки �тепени �ход�тва"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:42
+msgid "Photo Cache App"
+msgstr "Приложение \"К�ширование изображений\""
 
-#: ../../Zotlabs/Module/Rate.php:158
-msgid "Website:"
-msgstr "Веб-�айт:"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:53
+msgid "Minimal photo size for caching"
+msgstr "Минимальный размер изображений дл� к�шировани�"
 
-#: ../../Zotlabs/Module/Rate.php:161
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Удалённый канал [%s] (пока неизве�тен на �том �айте)"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:55
+msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
+msgstr "В пик�ел�х. От 1 до 1024, 0 будет заменён значением по умолчанию."
 
-#: ../../Zotlabs/Module/Rate.php:162
-msgid "Rating (this information is public)"
-msgstr "Оценка (�та информаци� общедо�тупна)"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:64
+msgid "Photo Cache"
+msgstr "К�ширование изображений"
 
-#: ../../Zotlabs/Module/Rate.php:163
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Объ��ните �вою оценку (необ�зательно; �та информаци� общедо�тупна)"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:101
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:102
+#: ../../extend/addon/hzaddons/cart/myshop.php:144
+#: ../../extend/addon/hzaddons/cart/myshop.php:180
+#: ../../extend/addon/hzaddons/cart/myshop.php:214
+#: ../../extend/addon/hzaddons/cart/myshop.php:261
+#: ../../extend/addon/hzaddons/cart/myshop.php:296
+#: ../../extend/addon/hzaddons/cart/myshop.php:319
+msgid "Access Denied"
+msgstr "До�туп запрещён"
 
-#: ../../Zotlabs/Module/Settings/Network.php:42
-#: ../../Zotlabs/Module/Settings/Channel_home.php:46
-msgid "Max height of content (in pixels)"
-msgstr "Мак�имальна� вы�ота �одержимого (в пик�ел�х)"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:109
+msgid "Enable Community Moderation"
+msgstr "Включить модерацию �ообще�тва"
 
-#: ../../Zotlabs/Module/Settings/Network.php:44
-#: ../../Zotlabs/Module/Settings/Channel_home.php:48
-msgid "Click to expand content exceeding this height"
-msgstr "�ажмите чтобы развернуть �одержимое превышающее �ту вы�оту"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:117
+msgid "Reputation automatically given to new members"
+msgstr "Репутаци� автоматиче�ки предо�тавл�ема� новым уча�тникам"
 
-#: ../../Zotlabs/Module/Settings/Network.php:59
-msgid "Stream Settings"
-msgstr "�а�тройки потока"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:118
+msgid "Reputation will never fall below this value"
+msgstr "Репутаци� никогда не упадёт ниже �того значени�"
 
-#: ../../Zotlabs/Module/Settings/Features.php:45
-msgid "Additional Features"
-msgstr "Дополнительные функции"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:119
+msgid "Minimum reputation before posting is allowed"
+msgstr "Минимальна� репутаци� дл� разрешени� возможно�ти размещать публикации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
-msgid "Nobody except yourself"
-msgstr "�икто кроме ва�"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:120
+msgid "Minimum reputation before commenting is allowed"
+msgstr "Минимальна� репутаци� дл� разрешени� комментировани�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:330
-msgid "Only those you specifically allow"
-msgstr "Только пер�онально разрешённые"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:121
+msgid "Minimum reputation before a member is able to moderate other posts"
+msgstr "Минимальна� репутаци� дл� возможно�ти модерировани� уча�тником чужих публикаций"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
-msgid "Approved connections"
-msgstr "Одобренные контакты"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:122
+msgid ""
+"Max ratio of moderator's reputation that can be added to/deducted from "
+"reputation of person being moderated"
+msgstr "Мак�имальное �оотношение репутации модератора, которое может быть добавлено / вычтено из репутации модерируемого уча�тника"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:332
-msgid "Any connections"
-msgstr "Любые контакты"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:123
+msgid "Reputation \"cost\" to post"
+msgstr "\"Стоимо�ть\" репутации дл� публикации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:333
-msgid "Anybody on this website"
-msgstr "Любой на �том �айте"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:124
+msgid "Reputation \"cost\" to comment"
+msgstr "\"Стоимо�ть\" репутации дл� комментировани�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:334
-msgid "Anybody in this network"
-msgstr "Любой в �той �ети"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:125
+msgid ""
+"Reputation automatically recovers at this rate per hour until it reaches "
+"minimum_to_post"
+msgstr "Репутаци� автоматиче�ки во��танавливает�� � �той �коро�тью в ча� пока не до�тигает значени� minimum_to_post"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:335
-msgid "Anybody authenticated"
-msgstr "Любой аутентифицированный"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:126
+msgid ""
+"When minimum_to_moderate > reputation > minimum_to_post reputation recovers "
+"at this rate per hour"
+msgstr "При minimum_to_moderate > репутаци� > minimum_to_post репутаци� во��танавливает�� � �той �коро�тью в ча�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:336
-msgid "Anybody on the internet"
-msgstr "Любой в интернете"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:140
+msgid "Community Moderation Settings"
+msgstr "�а�тройки модерировани� �ообще�тва"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:411
-msgid "Publish your default profile in the network directory"
-msgstr "Публиковать ваш профиль по умолчанию в �етевом каталоге"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:232
+msgid "Channel Reputation"
+msgstr "Репутаци� канала"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:416
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Разрешить предлагать ва� как потенциального друга дл� новых пользователей?"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:236
+msgid "An Error has occurred."
+msgstr "Произошла ошибка."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:429
-msgid "Your channel address is"
-msgstr "�дре� вашего канала"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:254
+msgid "Upvote"
+msgstr "За"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:432
-msgid "Your files/photos are accessible via WebDAV at"
-msgstr "Ваши файлы / фотографии до�тупны через WebDAV по"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:255
+msgid "Downvote"
+msgstr "Против"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-msgid "Automatic membership approval"
-msgstr "Член�тво одобрено автоматиче�ки"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:414
+msgid "Can moderate reputation on my channel."
+msgstr "Может модерировать репутацию на моём канале"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-#: ../../Zotlabs/Module/Defperms.php:256
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:104
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:176
+msgid "Network error"
+msgstr "Сетева� ошибка"
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:108
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:180
+msgid "API error"
+msgstr "Ошибка API"
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:112
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:184
+msgid "Unknown issue"
+msgstr "�еизве�тна� проблема"
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:168
+msgid "Unable to login using email address "
+msgstr "�евозможно войти, и�пользу� адре� �лектронной почты "
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:202
+msgid "Sign in to Hubzilla using a social account"
+msgstr "Войдите в Hubzilla, и�пользу� учетную запи�ь в �оциальных �ет�х"
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:207
+msgid "Social Authentication using your social media account"
+msgstr "Social Authentication � и�пользованием вашей учетной запи�и в �оциальных �ет�х"
+
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:211
 msgid ""
-"If enabled, connection requests will be approved without your interaction"
-msgstr "Е�ли включено, запро�ы контактов будут одобрены без вашего уча�ти�"
+"This app enables one or more social provider sign-in buttons on the login "
+"page."
+msgstr "Это приложение добавл�ет на �транице входа в �и�тему одну или не�колько кнопок дл� аутентификации при помощи учётных запи�ей в �оциальных �ет�х"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:493
-msgid "Channel Settings"
-msgstr "�а�тройки канала"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:229
+msgid "Add an identity provider"
+msgstr "Добавить провайдера идентификации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
-msgid "Basic Settings"
-msgstr "О�новные на�тройки"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:256
+msgid "Enable "
+msgstr "Включить "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-msgid "Email Address:"
-msgstr "�дре� email:"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:263
+msgid "Key"
+msgstr "Ключ"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid "Your Timezone:"
-msgstr "Ча�овой по��:"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:263
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:268
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:284
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:297
+msgid "Word"
+msgstr "Слово"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
-msgid "Default Post Location:"
-msgstr "Ра�положение по умолчанию:"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:268
+msgid "Secret"
+msgstr "Секрет"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
-msgid "Geographical location to display on your posts"
-msgstr "Показывать географиче�кое положение в ваших публикаци�х"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:297
+msgid "Add a custom provider"
+msgstr "Добавить �об�твенного провайдера"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
-msgid "Use Browser Location:"
-msgstr "Определ�ть ра�положение из браузера"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:317
+msgid "Remove an identity provider"
+msgstr "Удалить провайдера идентификации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Adult Content"
-msgstr "Содержимое дл� взро�лых"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:327
+msgid "Social authentication"
+msgstr "�утентификаци� в �оциальных �ет�х"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Этот канал ча�то или регул�рно публикует �одержимое дл� взро�лых. Пожалуй�та, помечайте любой такой материал тегом #NSFW"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:366
+msgid "Error while saving provider settings"
+msgstr "Ошибка при �охранении на�троек провайдера идентификации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Security and Privacy Settings"
-msgstr "Безопа�но�ть и на�тройки приватно�ти"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:382
+msgid "Custom provider already exists"
+msgstr "Соб�твенный провайдер уже �уще�твует"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Ваши разрешени� уже на�троены. �ажмите чтобы про�мотреть или изменить"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:399
+msgid "Social authentication settings saved."
+msgstr "�а�тройки Social authentication �охранены."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Hide my online presence"
-msgstr "Скрывать моё при�ут�твие онлайн"
+#: ../../extend/addon/hzaddons/visage/Mod_Visage.php:21
+msgid "Who viewed my channel/profile"
+msgstr "Кто �мотрел мой канал / профиль"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Предотвращает отображени� �тату�а \"в �ети\" в вашем профиле"
+#: ../../extend/addon/hzaddons/visage/Mod_Visage.php:25
+msgid "Recent Channel/Profile Viewers"
+msgstr "По�ледние про�мотры канала / профил�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:515
-msgid "Simple Privacy Settings:"
-msgstr "Про�тые на�тройки безопа�но�ти:"
+#: ../../extend/addon/hzaddons/visage/Mod_Visage.php:36
+msgid "No entries."
+msgstr "�ет запи�ей."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:516
+#: ../../extend/addon/hzaddons/testdrive/testdrive.php:104
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Ваш аккаунт на %s пере�танет работать через не�колько дней."
+
+#: ../../extend/addon/hzaddons/testdrive/testdrive.php:105
+msgid "Your $Productname test account is about to expire."
+msgstr "Ваша те�това� учётна� запи�ь в $Productname близка к окончанию �рока дей�тви�."
+
+#: ../../extend/addon/hzaddons/twitter/twitter.php:109
+msgid "Post to Twitter"
+msgstr "Опубликовать в Twitter"
+
+#: ../../extend/addon/hzaddons/twitter/twitter.php:496
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:95
+msgid "Submit Settings"
+msgstr "Отправить на�тройки"
+
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:65
+msgid "Twitter settings updated."
+msgstr "�а�тройки Twitter обновлены"
+
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:78
+msgid "Twitter Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Twitter\""
+
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:79
+msgid "Relay public posts to Twitter"
+msgstr "Пере�ылает общедо�тупные публикации в Twitter"
+
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:103
 msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Полно�тью открытый - <em>�верхлиберальный (должен и�пользовать�� � о�торожно�тью)</em>"
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "�е найдено пары ключей дл� Twitter. Пожалуй�та, �в�жите�ь � админи�тратором �айта."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:517
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:125
 msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Обычный - <em>открытый по умолчанию, приватно�ть по желанию (как в �оциальных �ет�х, но � улучшенными на�тройками)</em>"
+"At this Hubzilla instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
+msgstr "В �той у�тановке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Дл� �того нажмите на кнопку ниже дл� получени� PIN-кода от Twitter который нужно �копировать в поле ввода и отправить форму. Только ваши <strong>общедо�тупные</strong> публикации будут опубликованы в Twitter."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:518
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Ча�тный - <em>ча�тный по умочанию, не открытый и не публичный</em>"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:127
+msgid "Log in with Twitter"
+msgstr "Войти в Twitter"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Закрытый - <em>заблокированный по умолчанию от / дл� в�ех</em>"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:130
+msgid "Copy the PIN from Twitter here"
+msgstr "Скопируйте PIN-код из Twitter зде�ь"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid "Allow others to tag your posts"
-msgstr "Разрешить другим отмечать ваши публикации"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:147
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:272
+msgid "Currently connected to: "
+msgstr "В на�то�щее врем� подключён к: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:521
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:152
 msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Ча�то и�пользует�� �ообще�твом дл� маркировки неподобающего �одержани�"
+"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в Twitter, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-msgid "Channel Permission Limits"
-msgstr "Ограничени� разрешений канала"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:157
+msgid "Twitter post length"
+msgstr "Длина публикации Twitter"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Expire other channel content after this many days"
-msgstr "Храненить �одержимое других каналов, дней"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:157
+msgid "Maximum tweet length"
+msgstr "Мак�имальна� длина твита"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "0 or blank to use the website limit."
-msgstr "0 или пу�то - и�пользовать на�тройки �айта."
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:162
+msgid "Send public postings to Twitter by default"
+msgstr "Отправл�ть общедо�тупные публикации в Twitter по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-#, php-format
-msgid "This website expires after %d days."
-msgstr "Срок хранени� �одержимого �того �айта и�текает через %d дней"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:162
+msgid ""
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
+msgstr "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и Twitter по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "This website does not expire imported content."
-msgstr "Срок хранени� импортированного �одержимого �того �айта не ограничен."
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:171
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:291
+msgid "Clear OAuth configuration"
+msgstr "Очи�тить конфигурацию OAuth"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "The website limit takes precedence if lower than your limit."
-msgstr "Ограничение �айта имеет приоритет е�ли ниже вашего значени�."
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:181
+msgid "Twitter Crosspost Connector"
+msgstr "Публикаци� в Twitter"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
-msgid "Maximum Friend Requests/Day:"
-msgstr "Запро�ов в друзь� в день:"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:123
+msgid "generic profile image"
+msgstr "Стандартное изображение профил�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
-msgid "May reduce spam activity"
-msgstr "Может ограничить �пам активно�ть"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:124
+msgid "random geometric pattern"
+msgstr "Случайный геометриче�кий ри�унок"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
-msgid "Default Privacy Group"
-msgstr "Группа конфиденциально�ти по умолчанию"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:125
+msgid "monster face"
+msgstr "Лицо чудовища"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "Use my default audience setting for the type of object published"
-msgstr "И�пользовать на�тройки аудитории по умолчанию дл� типа опубликованного объекта"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:126
+msgid "computer generated face"
+msgstr "Сгенерированное компьютером лицо"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:538
-msgid "Default permissions category"
-msgstr "Категори� разрешений по умолчанию"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:127
+msgid "retro arcade style face"
+msgstr "Лицо в �тиле �тарой аркадной игры"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Мак�имально количе�тво �ообщений от незнакомых людей, в день:"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:128
+msgid "Hub default profile photo"
+msgstr "Фотографи� профил� по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Useful to reduce spamming"
-msgstr "Полезно дл� �окращени� количе�тва �пама"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:143
+msgid "Information"
+msgstr "Информаци�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:547
-#: ../../Zotlabs/Lib/Enotify.php:68
-msgid "Notification Settings"
-msgstr "�а�тройки уведомлений"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:143
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "Плагин Libravatar также у�тановлен. Пожалуй�та, отключите плагин Libravatar или �тот плагин Gravatar. Е�ли Плагин Libravatar ничего не найдёт, он вернёт�� в Gravatar."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "By default post a status message when:"
-msgstr "По умолчанию публиковать новый �тату� при:"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:150
+#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:46
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:43
+msgid "Save Settings"
+msgstr "Сохранить на�тройки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-msgid "accepting a friend request"
-msgstr "одобрении запро�а в друзь�"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:151
+msgid "Default avatar image"
+msgstr "Изображение аватара по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-msgid "joining a forum/community"
-msgstr "в�туплении в �ообще�тво / форум"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:151
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Выберите изображени� аватар по умолчанию е�ли ничего не было найдено в Gravatar (�м. README)."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
-msgid "making an <em>interesting</em> profile change"
-msgstr "<em>интере�ном</em> изменении профил�"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152
+msgid "Rating of images"
+msgstr "Оценки изображений"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
-msgid "Send a notification email when:"
-msgstr "Отправить уведомление по email когда:"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Выберите подход�щую оценку аватара дл� вашего �айта (�м. README)."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "You receive a connection request"
-msgstr "вы получили новый запро� контакта"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:165
+msgid "Gravatar settings updated."
+msgstr "�а�тройки Gravatar обновлены."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
-msgid "Your connections are confirmed"
-msgstr "Ваш запро� контакта был одобрен"
+#: ../../extend/addon/hzaddons/cart/widgets/catalogitem.php:57
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:263
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:659
+msgid "Price"
+msgstr "Цена"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-msgid "Someone writes on your profile wall"
-msgstr "Кто-то напи�ал на �тене вашего профил�"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:58
+msgid "Enable Test Catalog"
+msgstr "Включить те�товый каталог"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-msgid "Someone writes a followup comment"
-msgstr "Кто-то пишет комментарий"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:70
+msgid "Enable Manual Payments"
+msgstr "Включить ручные платежи"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
-msgid "You receive a private message"
-msgstr "Вы получили личное �ообщение"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:90
+msgid "Base Merchant Currency"
+msgstr "О�новна� торгова� валюта"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
-msgid "You receive a friend suggestion"
-msgstr "Вы получили предложение друзей"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:129
+#: ../../extend/addon/hzaddons/cart/cart.php:1375
+msgid "Cart Settings"
+msgstr "�а�тройки карточек"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
-msgid "You are tagged in a post"
-msgstr "Вы были отмечены в публикации"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:86
+msgid "Enable Paypal Button Module (API-v2)"
+msgstr "Включить модуль кнопки Paypal (API-v2)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Ва� толкнули, подтолкнули и т.п. в публикации"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:94
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:93
+msgid "Use Production Key"
+msgstr "И�пользовать ключ Production"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
-msgid "Someone likes your post/comment"
-msgstr "Кому-то нравит�� ваша публикаци� / комментарий"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:101
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:100
+msgid "Paypal Sandbox Client Key"
+msgstr "Ключ клиента Paypal Sandbox"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:565
-msgid "Show visual notifications including:"
-msgstr "Показывать визуальные оповещени� включа�:"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:108
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:107
+msgid "Paypal Sandbox Secret Key"
+msgstr "Секретный ключ Paypal Sandbox"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
-msgid "Unseen stream activity"
-msgstr "�ова� активно�ть в потоке"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:114
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:113
+msgid "Paypal Production Client Key"
+msgstr "Ключ клиента Paypal Production"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
-msgid "Unseen channel activity"
-msgstr "�ова� активно�ть в канале"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:121
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:120
+msgid "Paypal Production Secret Key"
+msgstr "Секретный ключ Paypal Production"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-msgid "Unseen private messages"
-msgstr "�овые личные �ообщени�"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:264
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:252
+msgid "Paypal button payments are not enabled."
+msgstr "Кнопка Paypal дл� платежей не включена."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "Recommended"
-msgstr "Рекомендовано"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:282
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:270
+msgid ""
+"Paypal button payments are not properly configured.  Please choose another "
+"payment option."
+msgstr "Кнопка Paypal дл� платежей на�троена неправильно. Пожалуй�та, и�пользуйте другой вариант оплаты."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
-msgid "Upcoming events"
-msgstr "Гр�дущие �обыти�"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:409
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:392
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:68
+#: ../../extend/addon/hzaddons/cart/cart.php:1578
+msgid "Order not found."
+msgstr "Заказ не найден."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-msgid "Events today"
-msgstr "Событи� �егодн�"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:61
+msgid "Enable Manual Cart Module"
+msgstr "Включить модуль ручного управлени� карточками"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Upcoming birthdays"
-msgstr "Гр�дущие дни рождени�"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:172
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:163
+msgid "New Sku"
+msgstr "�овый код"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Not available in all themes"
-msgstr "�е до�тупно во в�ех темах"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:208
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:198
+msgid "Cannot save edits to locked item."
+msgstr "�евозможно �охранить изменени� заблокированной позиции."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
-msgid "System (personal) notifications"
-msgstr "Си�темные (личные) уведомлени�"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:252
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:648
+msgid "Changes Locked"
+msgstr "Изменени� заблокированы"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-msgid "System info messages"
-msgstr "Сообщени� � �и�темной информацией"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:256
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:652
+msgid "Item available for purchase."
+msgstr "Позици� до�тупна дл� приобретени�."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-msgid "System critical alerts"
-msgstr "Критиче�кие уведомлени� �и�темы"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:266
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:662
+msgid "Photo URL"
+msgstr "URL изображени�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "New connections"
-msgstr "�овые контакты"
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:70
+msgid "Enable Order/Item Options"
+msgstr "Включить параметры заказа / позиции"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
-msgid "System Registrations"
-msgstr "Си�темные реги�трации"
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:333
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:357
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:433
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:457
+msgid "Label"
+msgstr "Метка"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
-msgid "Unseen shared files"
-msgstr "�овые общие файлы"
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:336
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:360
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:436
+#: ../../extend/addon/hzaddons/cart/submodules/orderoptions.php:460
+msgid "Instructions"
+msgstr "Ин�трукции"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
-msgid "Unseen public stream activity"
-msgstr "�ова� активно�ть в публичном потоке"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:64
+msgid "Enable Hubzilla Services Module"
+msgstr "Включить модуль �ерви�а Hubzilla"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
-msgid "Unseen likes and dislikes"
-msgstr "�овые лайки и ди�лайки"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:247
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:334
+msgid "SKU not found."
+msgstr "Код не найден."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
-msgid "Unseen forum posts"
-msgstr "�овые публикации на форуме"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:300
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:304
+msgid "Invalid Activation Directive."
+msgstr "�едей�твительна� директива активации."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
-msgid "Email notification hub (hostname)"
-msgstr "Центр уведомлений по email (им� хо�та)"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:375
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:379
+msgid "Invalid Deactivation Directive."
+msgstr "�едей�твительна� директива деактивации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
-#, php-format
-msgid ""
-"If your channel is mirrored to multiple hubs, set this to your preferred "
-"location. This will prevent duplicate email notifications. Example: %s"
-msgstr "Е�ли ваш канал зеркалирует�� в не�кольких ме�тах, �то ваше предпочтительное ме�тоположение. Это должно предотвратить дублировать уведомлений по email. �апример: %s"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:565
+msgid "Add to this privacy group"
+msgstr "Добавить в �ту группу конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
-msgid "Show new wall posts, private messages and connections under Notices"
-msgstr "Показать новые �ообщени� на �тене, личные �ообщени� и контакты в \"Уведомлени�х\""
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:581
+msgid "Set user service class"
+msgstr "У�тановить кла�� об�луживани� пользовател�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
-msgid "Notify me of events this many days in advance"
-msgstr "Уведомл�ть мен� о �обыти�х заранее, дней"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:608
+msgid "You must be using a local account to purchase this service."
+msgstr "Вы должны и�пользовать локальную учётноую запи�ь дл� покупки �того �ерви�а."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
-msgid "Must be greater than 0"
-msgstr "Должно быть больше 0"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:666
+msgid "Add buyer to privacy group"
+msgstr "Добавить покупател� в группу конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
-msgid "Advanced Account/Page Type Settings"
-msgstr "Дополнительные на�тройки учётной запи�и / �траницы"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:671
+msgid "Add buyer as connection"
+msgstr "Добавить покупател� как контакт"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:591
-msgid "Change the behaviour of this account for special situations"
-msgstr "Изменить поведение �того аккаунта в о�обых �итуаци�х"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:679
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:721
+msgid "Set Service Class"
+msgstr "У�тановить кла�� об�луживани�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:593
-msgid "Miscellaneous Settings"
-msgstr "Дополнительные на�тройки"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:151
+msgid "Enable Subscription Management Module"
+msgstr "Включить модуль управлени� подпи�ками"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
-msgid "Default photo upload folder"
-msgstr "Каталог загрузки фотографий по умолчанию"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:223
+msgid ""
+"Cannot include subscription items with different terms in the same order."
+msgstr "�ельз� включать �лементы подпи�ки � разными у�лови�ми в том же заказе."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
-#: ../../Zotlabs/Module/Settings/Channel.php:595
-msgid "%Y - current year, %m -  current month"
-msgstr "%Y - текущий год, %y - текущий ме��ц"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:372
+msgid "Select Subscription to Edit"
+msgstr "Выбрать подпи�ку дл� редактировани�"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
-msgid "Default file upload folder"
-msgstr "Каталог загрузки файлов по умолчанию"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:380
+msgid "Edit Subscriptions"
+msgstr "Редактировать подпи�ки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
-msgid "Remove this channel."
-msgstr "Удалить �тот канал."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:414
+msgid "Subscription SKU"
+msgstr "Код подпи�ки"
 
-#: ../../Zotlabs/Module/Settings/Account.php:21
-msgid "Not valid email."
-msgstr "�е дей�твительный адре� email."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:419
+msgid "Catalog Description"
+msgstr "Опи�ание каталога"
 
-#: ../../Zotlabs/Module/Settings/Account.php:24
-msgid "Protected email address. Cannot change to that email."
-msgstr "Защищенный адре� �лектронной почты. �ельз� изменить."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:423
+msgid "Subscription available for purchase."
+msgstr "Подпи�ка до�тупна дл� покупки."
 
-#: ../../Zotlabs/Module/Settings/Account.php:33
-msgid "System failure storing new email. Please try again."
-msgstr "Си�темна� ошибка �охранени� email. Пожалуй�та попробуйте ещё раз."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:428
+msgid "Maximum active subscriptions to this item per account."
+msgstr "Мак�имальное количе�тво подпи�ок на аккаунт дл� �той позиции"
 
-#: ../../Zotlabs/Module/Settings/Account.php:51
-msgid "Password verification failed."
-msgstr "�е удало�ь выполнить проверку парол�."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:431
+msgid "Subscription price."
+msgstr "Цена подпи�ки."
 
-#: ../../Zotlabs/Module/Settings/Account.php:58
-msgid "Passwords do not match. Password unchanged."
-msgstr "Пароли не �овпадают. Пароль не изменён."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:435
+msgid "Quantity"
+msgstr "Количе�тво"
 
-#: ../../Zotlabs/Module/Settings/Account.php:62
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Пу�тые пароли не допу�кают��. Пароль не изменён."
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:439
+msgid "Term"
+msgstr "У�лови�"
 
-#: ../../Zotlabs/Module/Settings/Account.php:76
-msgid "Password changed."
-msgstr "Пароль изменен."
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:85
+msgid "Enable Paypal Button Module"
+msgstr "Включить модуль кнопки Paypal"
 
-#: ../../Zotlabs/Module/Settings/Account.php:78
-msgid "Password update failed. Please try again."
-msgstr "Изменение парол� не удало�ь. Пожалуй�та, попробуйте ещё раз."
+#: ../../extend/addon/hzaddons/cart/myshop.php:30
+msgid "Access Denied."
+msgstr "До�туп запрещён."
 
-#: ../../Zotlabs/Module/Settings/Account.php:103
-msgid "Account Settings"
-msgstr "�а�тройки аккаунта"
+#: ../../extend/addon/hzaddons/cart/myshop.php:112
+#: ../../extend/addon/hzaddons/cart/cart.php:1446
+msgid "Order Not Found"
+msgstr "Заказ не найден"
 
-#: ../../Zotlabs/Module/Settings/Account.php:104
-msgid "Current Password"
-msgstr "Текущий пароль"
+#: ../../extend/addon/hzaddons/cart/myshop.php:189
+#: ../../extend/addon/hzaddons/cart/myshop.php:223
+#: ../../extend/addon/hzaddons/cart/myshop.php:271
+#: ../../extend/addon/hzaddons/cart/myshop.php:329
+msgid "Invalid Item"
+msgstr "�едей�твительный �лемент"
 
-#: ../../Zotlabs/Module/Settings/Account.php:105
-msgid "Enter New Password"
-msgstr "Введите новый пароль:"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:7
+msgid "Error: order mismatch. Please try again."
+msgstr "Ошибка: не�оответ�твие заказа. Пожалуй�та, попробуйте ещё раз"
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Confirm New Password"
-msgstr "Подтвердите новый пароль:"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:61
+msgid "Manual payments are not enabled."
+msgstr "Ручные платежи не подключены."
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Leave password fields blank unless changing"
-msgstr "О�тавьте пол� пу�тыми до измнени�"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:77
+msgid "Finished"
+msgstr "Завершено"
 
-#: ../../Zotlabs/Module/Settings/Account.php:108
-msgid "DId2 or Email Address:"
-msgstr "dId2 или адре� �лектронной почты:"
+#: ../../extend/addon/hzaddons/cart/cart.php:252
+msgid "DB Cleanup Failure"
+msgstr "Сбой очи�тки базы данных"
 
-#: ../../Zotlabs/Module/Settings/Account.php:110
-msgid "Remove this account including all its channels"
-msgstr "Удалить �тот аккаунт включа� в�е каналы"
+#: ../../extend/addon/hzaddons/cart/cart.php:674
+msgid "[cart] Item Added"
+msgstr "[cart] Элемент добавлен"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:25
-msgid "No feature settings configured"
-msgstr "Параметры функций не на�троены"
+#: ../../extend/addon/hzaddons/cart/cart.php:1063
+msgid "Order already checked out."
+msgstr "Заказ уже проверен."
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "Addon Settings"
-msgstr "�а�тройки ра�ширений"
+#: ../../extend/addon/hzaddons/cart/cart.php:1368
+msgid "Drop database tables when uninstalling."
+msgstr "Сбро�ить таблицы базы данных при деин�талл�ции"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:35
-msgid "Please save/submit changes to any panel before opening another."
-msgstr "Пожалуй�та �охраните / отправьте изменени� на панели прежде чем открывать другую."
+#: ../../extend/addon/hzaddons/cart/cart.php:1387
+#: ../../extend/addon/hzaddons/cart/cart.php:1390
+msgid "Shop"
+msgstr "Магазин"
 
-#: ../../Zotlabs/Module/Settings/Events.php:40
-msgid "Events Settings"
-msgstr "�а�тройки �обытий"
+#: ../../extend/addon/hzaddons/cart/cart.php:1507
+msgid "Cart utilities for orders and payments"
+msgstr "Утилиты карточек дл� заказов и платежей"
 
-#: ../../Zotlabs/Module/Settings/Manage.php:41
-msgid "Channel Manager Settings"
-msgstr "�а�тройки менеджера канала"
+#: ../../extend/addon/hzaddons/cart/cart.php:1545
+msgid "You must be logged into the Grid to shop."
+msgstr "Вы должны быть в �ети дл� до�тупа к магазину"
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:61
-msgid "Personal menu to display in your channel pages"
-msgstr "Пер�ональное меню дл� отображени� на �транице вашего канала"
+#: ../../extend/addon/hzaddons/cart/cart.php:1592
+msgid "Access denied."
+msgstr "До�туп запрещён."
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:88
-msgid "Channel Home Settings"
-msgstr "�а�тройки главной �траницы канала"
+#: ../../extend/addon/hzaddons/cart/cart.php:1644
+#: ../../extend/addon/hzaddons/cart/cart.php:1787
+msgid "No Order Found"
+msgstr "�ет найденных заказов"
 
-#: ../../Zotlabs/Module/Settings/Calendar.php:40
-msgid "Calendar Settings"
-msgstr "�а�тройки календар�"
+#: ../../extend/addon/hzaddons/cart/cart.php:1653
+msgid "An unknown error has occurred Please start again."
+msgstr "Произошла неизве�тна� ошибка. Пожалуй�та, начните �нова."
 
-#: ../../Zotlabs/Module/Settings/Display.php:127
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (�к�периментальный)"
+#: ../../extend/addon/hzaddons/cart/cart.php:1796
+msgid "Requirements not met."
+msgstr "Требовани� не �облюдены."
 
-#: ../../Zotlabs/Module/Settings/Display.php:183
-msgid "Display Settings"
-msgstr "�а�тройки отображени�"
+#: ../../extend/addon/hzaddons/cart/cart.php:1796
+msgid "Review your order and complete any needed requirements."
+msgstr "Ÿро�мотрите �вой заказ и выполните в�е необходимые требовани�"
 
-#: ../../Zotlabs/Module/Settings/Display.php:184
-msgid "Theme Settings"
-msgstr "�а�тройки темы"
+#: ../../extend/addon/hzaddons/cart/cart.php:1822
+msgid "Invalid Payment Type.  Please start again."
+msgstr "�едей�твительный тип платежа. Пожалуй�та, начните �нова."
 
-#: ../../Zotlabs/Module/Settings/Display.php:185
-msgid "Custom Theme Settings"
-msgstr "Дополнительные на�тройки темы"
+#: ../../extend/addon/hzaddons/cart/cart.php:1829
+msgid "Order not found"
+msgstr "Заказ не найден"
 
-#: ../../Zotlabs/Module/Settings/Display.php:186
-msgid "Content Settings"
-msgstr "�а�тройки �одержимого"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:57
+msgid "Errors encountered deleting database table "
+msgstr "Возникшие при удалении таблицы базы данных ошибки"
 
-#: ../../Zotlabs/Module/Settings/Display.php:192
-msgid "Display Theme:"
-msgstr "Тема отображени�:"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:96
+msgid "Drop tables when uninstalling?"
+msgstr "Удалить таблицы при деин�талл�ции?"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
-msgid "Select scheme"
-msgstr "Выбрать �хему"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:96
+msgid ""
+"If checked, the Rendezvous database tables will be deleted when the plugin "
+"is uninstalled."
+msgstr "Е�ли включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина."
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
-msgid "Preload images before rendering the page"
-msgstr "Предзагрузка изображений перед обработкой �траницы"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:97
+msgid "Mapbox Access Token"
+msgstr "Токен до�тупа к Mapbox"
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:97
 msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
-msgstr "Субъективное врем� загрузки �траницы будет длиннее, но �траница будет готова при отображении"
-
-#: ../../Zotlabs/Module/Settings/Display.php:196
-msgid "Enable user zoom on mobile devices"
-msgstr "Включить ма�штабирование на мобильных у�трой�твах"
+"If you enter a Mapbox access token, it will be used to retrieve map tiles "
+"from Mapbox instead of the default OpenStreetMap tile server."
+msgstr "Е�ли вы введете токен до�тупа к Mapbox, он будет и�пользовать�� дл� извлечени� фрагментов карты из Mapbox вме�то �тандартного �ервера OpenStreetMap."
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-msgid "Update browser every xx seconds"
-msgstr "Обновление браузера каждые N �екунд"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:162
+msgid "Rendezvous"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Минимум 10 �екунд, без мак�имума"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:167
+msgid ""
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
+msgstr "Этот идентификатор был удалён другим уча�тником из-за неактивно�ти. Пожалуй�та нажмите кнопку \"�овый идентификатор\" дл� обновлени� �траницы и получени� нового идентификатора. Вы можете и�пользовать то же им�."
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Мак�имальное количе�тво бе�ед дл� загрузки одновременно:"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:168
+msgid "Welcome to Rendezvous!"
+msgstr "Добро пожаловать в Rendezvous!"
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Maximum of 30 items"
-msgstr "�е более 30 �лементов"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:169
+msgid ""
+"Enter your name to join this rendezvous. To begin sharing your location with "
+"the other members, tap the GPS control. When your location is discovered, a "
+"red dot will appear and others will be able to see you on the map."
+msgstr "Введите ваше им� дл� в�туплени� в �то Rendezvous. Дл� того, чтобы делить�� вашим положением � другими уча�тниками, нажмите \"GPS control\". Когда ваше ме�тоположение определно, кра�на� точка по�вит�� и о�тальные �могут увидеть ва� на карте."
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
-msgid "Show emoticons (smilies) as images"
-msgstr "Показывать �мотиконы (�майлики) как изображени�"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:171
+msgid "Let's meet here"
+msgstr "Давайте в�третим�� зде�ь"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Provide channel menu in navigation bar"
-msgstr "Показывать меню канала в панели навигации"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:174
+msgid "New marker"
+msgstr "�овый маркер"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Default: channel menu located in app menu"
-msgstr "По умолчанию каналы ра�положены в меню приложени�"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:175
+msgid "Edit marker"
+msgstr "Редактировать маркер"
 
-#: ../../Zotlabs/Module/Settings/Display.php:201
-msgid "Link post titles to source"
-msgstr "С�ылки на и�точник заголовков публикаций"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:176
+msgid "New identity"
+msgstr "�овый идентификатор"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
-msgid "Display new member quick links menu"
-msgstr "Показать меню бы�трых ��ылок дл� новых уча�тников"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:177
+msgid "Delete marker"
+msgstr "Удалить маркер"
 
-#: ../../Zotlabs/Module/Settings/Directory.php:40
-msgid "Directory Settings"
-msgstr "�а�тройки каталога"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:178
+msgid "Delete member"
+msgstr "Удалить уча�тника"
 
-#: ../../Zotlabs/Module/Settings/Editor.php:40
-msgid "Editor Settings"
-msgstr "�а�тройки редактора"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:179
+msgid "Edit proximity alert"
+msgstr "Изменить оповещение о близо�ти"
 
-#: ../../Zotlabs/Module/Settings/Connections.php:40
-msgid "Connections Settings"
-msgstr "�а�тройки контактов"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180
+msgid ""
+"A proximity alert will be issued when this member is within a certain radius "
+"of you.<br><br>Enter a radius in meters (0 to disable):"
+msgstr "Оповещение о близо�ти будет произведено, е�ли �тот уча�тник находит�� на определённом ра��то�нии от ва�. <br><br>Введите радиу� в метрах (0 дл� отключени�):"
 
-#: ../../Zotlabs/Module/Settings/Photos.php:40
-msgid "Photos Settings"
-msgstr "�а�тройки фотографий"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:185
+msgid "distance"
+msgstr "ра��то�ние"
 
-#: ../../Zotlabs/Module/Settings/Profiles.php:49
-msgid "Profiles Settings"
-msgstr "�а�тройки профилей"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
+msgstr "Ра��то�ние дл� уведомлени� о близо�ти (метров)"
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:23
-msgid "Settings saved."
-msgstr "�а�тройки �охранены."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:182
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:184
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
+msgstr "Оповещение о близо�ти будет произведено, е�ли вы находите�ь на определённом ра��то�нии ме�тоположени� маркера. <br><br>Введите радиу� в метрах (0 дл� отключени�):"
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:25
-msgid "Settings saved. Reload page please."
-msgstr "�а�тройки �охранены. Пожалуй�та, перезагрузите �траницу."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
+msgstr "Маркер уведомлени� о близо�ти"
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:47
-msgid "Conversation Settings"
-msgstr "�а�тройки бе�ед"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:186
+msgid "Reminder note"
+msgstr "�апоминание"
 
-#: ../../Zotlabs/Module/Menu.php:68
-msgid "Unable to update menu."
-msgstr "�евозможно обновить меню."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:187
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
+msgstr "Введите �ообщение дл� отображени� когда вы находите�ь р�дом"
 
-#: ../../Zotlabs/Module/Menu.php:79
-msgid "Unable to create menu."
-msgstr "�евозможно �оздать меню."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
+msgstr "Добавить новое Rendezvous."
 
-#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
-msgid "Menu Name"
-msgstr "�азвание меню"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:200
+msgid ""
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or "
+"share their own locations with the group."
+msgstr "Создайте новое Rendezvous и поделите�ь ��ылкой до�тупа � теми, кого вы хотите пригла�ить в группу. Тот, кто откроет �ту ��ылку, �танет её уча�тником. Уча�тники могут видеть ме�тоположение, добавл�ть маркеры на карту или делит�� �воим �об�твенным ме�тоположением � группой."
 
-#: ../../Zotlabs/Module/Menu.php:161
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Уникальное название (не видимо на �транице) - требует��"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:232
+msgid "You have no rendezvous. Press the button above to create a rendezvous!"
+msgstr "У ва� нет Rendezvous. �ажмите на кнопку ниже чтобы �оздать его!"
 
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
-msgid "Menu Title"
-msgstr "Заголовок меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr "дал леща"
 
-#: ../../Zotlabs/Module/Menu.php:162
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Видимо�ть на �транице - о�тавьте пу�тым е�ли не хотите иметь заголовок"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr "получил леща"
 
-#: ../../Zotlabs/Module/Menu.php:163
-msgid "Allow Bookmarks"
-msgstr "Разрешить закладки"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20
+msgid "shag"
+msgstr "вздрючил"
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Меню может и�пользовать��, чтобы �охранить закладки"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr "вздрюченный"
 
-#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
-msgid "Submit and proceed"
-msgstr "Отправить и обработать"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21
+msgid "patent"
+msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:131
-msgid "Drop"
-msgstr "Удалить"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21
+msgid "patented"
+msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:181
-msgid "Bookmarks allowed"
-msgstr "Закладки разрешены"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22
+msgid "hug"
+msgstr "обн�л"
 
-#: ../../Zotlabs/Module/Menu.php:183
-msgid "Delete this menu"
-msgstr "Удалить �то меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22
+msgid "hugged"
+msgstr "обн�тый"
 
-#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
-msgid "Edit menu contents"
-msgstr "Редактировать �одержание меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23
+msgid "murder"
+msgstr "убил"
 
-#: ../../Zotlabs/Module/Menu.php:185
-msgid "Edit this menu"
-msgstr "Редактировать �то меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23
+msgid "murdered"
+msgstr "убитый"
 
-#: ../../Zotlabs/Module/Menu.php:201
-msgid "Menu could not be deleted."
-msgstr "Меню не может быть удалено."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24
+msgid "worship"
+msgstr "почитает"
 
-#: ../../Zotlabs/Module/Menu.php:214
-msgid "Edit Menu"
-msgstr "Редактировать меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24
+msgid "worshipped"
+msgstr "почитаемый"
 
-#: ../../Zotlabs/Module/Menu.php:218
-msgid "Add or remove entries to this menu"
-msgstr "Добавить или удалить пункты �того меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25
+msgid "kiss"
+msgstr "поцеловал"
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Menu name"
-msgstr "�азвание меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25
+msgid "kissed"
+msgstr "поцелованный"
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Must be unique, only seen by you"
-msgstr "Должно быть уникальным (видно только вам)"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26
+msgid "tempt"
+msgstr "и�кушает"
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title"
-msgstr "Заголовок меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26
+msgid "tempted"
+msgstr "и�кушённый"
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title as seen by others"
-msgstr "Видимый другими заголовок меню"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27
+msgid "raise eyebrows at"
+msgstr "подн�л брови"
 
-#: ../../Zotlabs/Module/Menu.php:222
-msgid "Allow bookmarks"
-msgstr "Разрешить закладки"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27
+msgid "raised their eyebrows at"
+msgstr "подн�л брови"
 
-#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
-msgid "Could not access contact record."
-msgstr "�е удало�ь получить до�туп к запи�и контакта."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28
+msgid "insult"
+msgstr "о�корбил"
 
-#: ../../Zotlabs/Module/Defperms.php:190
-msgid "Default Permissions App"
-msgstr "Приложение \"Разрешени� по умолчанию\""
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28
+msgid "insulted"
+msgstr "о�корблённый"
 
-#: ../../Zotlabs/Module/Defperms.php:191
-msgid "Set custom default permissions for new connections"
-msgstr "�а�тройка пользователь�ких разрешений по умолчанию дл� новых подключений "
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29
+msgid "praise"
+msgstr "похвалил"
 
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:860
-msgid "Connection Default Permissions"
-msgstr "Разрешени� по умолчанию дл� контакта"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29
+msgid "praised"
+msgstr "похваленный"
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:861
-msgid "Apply these permissions automatically"
-msgstr "Применить �ти разрешени� автоматиче�ки"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30
+msgid "be dubious of"
+msgstr "�омневает��"
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
-msgid "Permission role"
-msgstr "Роль разрешени�"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30
+msgid "was dubious of"
+msgstr "у�омнил��"
 
-#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:863
-msgid "Add permission role"
-msgstr "Добавить роль разрешени�"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31
+msgid "eat"
+msgstr "е�т"
 
-#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:876
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Разрешени�, указанные на �той �транице, будут примен�ть�� ко в�ем новым �оединени�м."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31
+msgid "ate"
+msgstr "�ъел"
 
-#: ../../Zotlabs/Module/Defperms.php:263
-msgid "Automatic approval settings"
-msgstr "�а�тройки автоматиче�кого одобрени�"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32
+msgid "giggle and fawn at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Defperms.php:271
-msgid ""
-"Some individual permissions may have been preset or locked based on your "
-"channel type and privacy settings."
-msgstr "�екоторые индивидуальные разрешени� могут быть преду�тановлены или заблокированы на о�новании типа вашего канала и на�троек приватно�ти."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32
+msgid "giggled and fawned at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Этот параметр требует �пециальной обработки и редактировани� и был заблокирован."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33
+msgid "doubt"
+msgstr "�омневает��"
 
-#: ../../Zotlabs/Module/Pconfig.php:57
-msgid "Configuration Editor"
-msgstr "Редактор конфигурации"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33
+msgid "doubted"
+msgstr "у�омнил��"
 
-#: ../../Zotlabs/Module/Pconfig.php:58
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
-msgstr "Предупреждение. Изменение некоторых на�троек может приве�ти к неработо�по�обно�ти вашего канала. Пожалуй�та, покиньте �ту �траницу, е�ли вы точно не знаете, как правильно и�пользовать �ту функцию."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34
+msgid "glare"
+msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:54
-msgid "Name and Secret are required"
-msgstr "Требуют�� им� и код"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34
+msgid "glared at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:106
-msgid "OAuth2 Apps Manager App"
-msgstr "Приложение \"Менеджер Oauth2\""
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35
+msgid "fuck"
+msgstr "трахает"
 
-#: ../../Zotlabs/Module/Oauth2.php:107
-msgid "OAuth2 authenticatication tokens for mobile and remote apps"
-msgstr "�утентификаци� OAuth2 дл� мобильных и удаленных приложений"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35
+msgid "fucked"
+msgstr "трахнул"
 
-#: ../../Zotlabs/Module/Oauth2.php:115
-msgid "Add OAuth2 application"
-msgstr "Добавить приложение OAuth2"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36
+msgid "bonk"
+msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
-msgid "Grant Types"
-msgstr "Разрешить типы"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36
+msgid "bonked"
+msgstr ""
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
-msgid "leave blank unless your application sepcifically requires this"
-msgstr "о�тавьте пу�тыми до тех пока ваше приложение не требует �того"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37
+msgid "declare undying love for"
+msgstr "признаёт�� в любви к"
 
-#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
-msgid "Authorization scope"
-msgstr "Обла�ть полномочий"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37
+msgid "declared undying love for"
+msgstr "признал�� в любви к"
 
-#: ../../Zotlabs/Module/Oauth2.php:134
-msgid "OAuth2 Application not found."
-msgstr "Приложение OAuth2 не найдено."
+#: ../../extend/addon/hzaddons/wppost/wppost.php:47
+msgid "Post to WordPress"
+msgstr "Опубликовать в WordPress"
 
-#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
-msgid "leave blank unless your application specifically requires this"
-msgstr "о�тавьте поле пу�тым, е�ли ваше приложение не требует �того"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:30
+msgid "Wordpress Settings saved."
+msgstr "�а�тройки WordPress �охранены."
 
-#: ../../Zotlabs/Module/Oauth2.php:192
-msgid "Connected OAuth2 Apps"
-msgstr "Подключённые приложени� OAuth2"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:43
+msgid "Wordpress Post App"
+msgstr "Приложение \"Публикаци� в Wordpress\""
 
-#: ../../Zotlabs/Module/Randprof.php:29
-msgid "Random Channel App"
-msgstr "Приложение \"Случайный канал\""
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:44
+msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
+msgstr "Опубликовать в WordPress или в чём-то ещё, поддерживающем wordpress XMLRPC API"
 
-#: ../../Zotlabs/Module/Randprof.php:30
-msgid "Visit a random channel in the $Projectname network"
-msgstr "По�ещение �лучайного канала в �ети $Projectname"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:69
+msgid "WordPress username"
+msgstr "Им� пользовател� WordPress"
 
-#: ../../Zotlabs/Module/Dreport.php:59
-msgid "Invalid message"
-msgstr "�еверное �ообщение"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:73
+msgid "WordPress password"
+msgstr "Пароль WordPress"
 
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "no results"
-msgstr "�ичего не найдено."
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:77
+msgid "WordPress API URL"
+msgstr "URL API WordPress"
 
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "channel sync processed"
-msgstr "�инхронизаци� канала завершена"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:78
+msgid "Typically https://your-blog.tld/xmlrpc.php"
+msgstr "Обычно https://your-blog.tld/xmlrpc.php"
 
-#: ../../Zotlabs/Module/Dreport.php:111
-msgid "queued"
-msgstr "в очереди"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:81
+msgid "WordPress blogid"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "posted"
-msgstr "опубликовано"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:82
+msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
+msgstr "Дл� многопользователь�ких �айтов, таких, как wordpress.com. В противном �лучае о�тавьте пу�тым"
 
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "accepted for delivery"
-msgstr "прин�то к до�тавке"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:86
+msgid "Post to WordPress by default"
+msgstr "Публиковать в WordPress по умолчанию"
 
-#: ../../Zotlabs/Module/Dreport.php:123
-msgid "updated"
-msgstr "обновлено"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:90
+msgid "Forward comments (requires hubzilla_wp plugin)"
+msgstr "Пере�ылать комментарии (требует�� плагин hubzilla_wp)"
 
-#: ../../Zotlabs/Module/Dreport.php:126
-msgid "update ignored"
-msgstr "обновление игнорирует��"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:94
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:71
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:65
+msgid "Add link to original post"
+msgstr "Добавить ��ылку на оригинальную заметку"
 
-#: ../../Zotlabs/Module/Dreport.php:129
-msgid "permission denied"
-msgstr "до�туп запрещен"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:98
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:69
+msgid "Link description (default:"
+msgstr "Опи�ание ��ылки (по-умолчанию:"
 
-#: ../../Zotlabs/Module/Dreport.php:133
-msgid "recipient not found"
-msgstr "получатель не найден"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:106
+msgid "Wordpress Post"
+msgstr "Публикаци� в WordPress"
 
-#: ../../Zotlabs/Module/Dreport.php:136
-msgid "mail recalled"
-msgstr "почта отозвана"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:21
+msgid "nofed Settings saved."
+msgstr "�а�тройки nofed �охранены."
 
-#: ../../Zotlabs/Module/Dreport.php:139
-msgid "duplicate mail received"
-msgstr "получено дублирующее �ообщение"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:33
+msgid "No Federation App"
+msgstr "Приложение No Federation"
 
-#: ../../Zotlabs/Module/Dreport.php:142
-msgid "mail delivered"
-msgstr "почта до�тавлен"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:34
+msgid ""
+"Prevent posting from being federated to anybody. It will exist only on your "
+"channel page."
+msgstr "Запрещает федеративные функций дл� публикаций. Они будут �уще�твовать только на �транице вашего канала."
 
-#: ../../Zotlabs/Module/Dreport.php:162
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr "Отчёт о до�тавке дл� %1$s"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:42
+msgid "Federate posts by default"
+msgstr "Разрешить федерацию публикаций по умолчанию"
 
-#: ../../Zotlabs/Module/Dreport.php:167
-msgid "Redeliver"
-msgstr "До�тавить повторно"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:50
+msgid "No Federation"
+msgstr "Отключить Federation"
 
-#: ../../Zotlabs/Module/Thing.php:122
-msgid "Thing updated"
-msgstr "Обновлено"
+#: ../../extend/addon/hzaddons/nofed/nofed.php:47
+msgid "Federate"
+msgstr "Федерировать"
 
-#: ../../Zotlabs/Module/Thing.php:174
-msgid "Object store: failed"
-msgstr "Хранлищие объектов: неудача"
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:58
+msgid "Gallery App"
+msgstr "Приложение \"Галере�\""
 
-#: ../../Zotlabs/Module/Thing.php:178
-msgid "Thing added"
-msgstr "Добавлено"
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:59
+msgid "A simple gallery for your photo albums"
+msgstr "Про�та� галлере� дл� ваших фотоальбомов"
 
-#: ../../Zotlabs/Module/Thing.php:204
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr ""
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:136
+#: ../../extend/addon/hzaddons/gallery/gallery.php:43
+msgid "Gallery"
+msgstr "Галере�"
 
-#: ../../Zotlabs/Module/Thing.php:267
-msgid "Show Thing"
-msgstr "Показать"
+#: ../../extend/addon/hzaddons/gallery/gallery.php:46
+msgid "Photo Gallery"
+msgstr "Фотогалере�"
 
-#: ../../Zotlabs/Module/Thing.php:274
-msgid "item not found."
-msgstr "Элемент не найден."
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:106
+msgid "Photos imported"
+msgstr "Фотографии импортированы"
 
-#: ../../Zotlabs/Module/Thing.php:307
-msgid "Edit Thing"
-msgstr "Редактировать"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:129
+msgid "Redmatrix Photo Album Import"
+msgstr "Импортировать альбом фотографий Redmatrix"
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
-msgid "Select a profile"
-msgstr "Выбрать профиль"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:130
+msgid "This will import all your Redmatrix photo albums to this channel."
+msgstr "Это позволит импортировать в�е ваши альбомы фотографий Redmatrix в �тот канал."
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Post an activity"
-msgstr "Опубликовать меропри�тие"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:131
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:121
+msgid "Redmatrix Server base URL"
+msgstr "Базовый URL �ервера Redmatrix"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Отправл�ть только подход�щий профиль"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:132
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:122
+msgid "Redmatrix Login Username"
+msgstr "Им� пользовател� Redmatrix"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
-msgid "Name of thing e.g. something"
-msgstr "�аименование, например \"нечто\""
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:133
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:123
+msgid "Redmatrix Login Password"
+msgstr "Пароль Redmatrix"
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
-msgid "URL of thing (optional)"
-msgstr "URL (необ�зательно)"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134
+msgid "Import just this album"
+msgstr "Импортировать только �тот альбом"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
-msgid "URL for photo of thing (optional)"
-msgstr "URL дл� фотографии (необ�зательно)"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134
+msgid "Leave blank to import all albums"
+msgstr "О�тавьте пу�тым дл� импорта в�ех альбомов"
 
-#: ../../Zotlabs/Module/Thing.php:364
-msgid "Add Thing to your Profile"
-msgstr "Добавить к вашему профилю"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135
+msgid "Maximum count to import"
+msgstr "Мак�имальное количе�тво дл� импорта"
 
-#: ../../Zotlabs/Module/Rmagic.php:46
-msgid "Authentication failed."
-msgstr "Ошибка аутентификации."
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135
+msgid "0 or blank to import all available"
+msgstr "0 или пу�то дл� импорта в�ех до�тупных"
 
-#: ../../Zotlabs/Module/Pdledit.php:27
-msgid "Layout updated."
-msgstr "Шаблон обновлен."
+#: ../../extend/addon/hzaddons/piwik/piwik.php:85
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Этот �айт от�леживает�� � помощью ин�трументов аналитики <a href='http://www.piwik.org'>Piwik</a>."
 
-#: ../../Zotlabs/Module/Pdledit.php:43
-msgid "PDL Editor App"
-msgstr "Приложение \"Редактор PDL\""
+#: ../../extend/addon/hzaddons/piwik/piwik.php:88
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Е�ли вы не хотите, чтобы ваши визиты реги�трировали�ь таким образом, вы <a href='%s'>можете отключить cookie � тем, чтобы Piwik не от�леживал дальнейшие по�ещени� �айта</a>."
 
-#: ../../Zotlabs/Module/Pdledit.php:44
-msgid "Provides the ability to edit system page layouts"
-msgstr "Предо�тавл�ет возможно�ть редактировать макеты �и�темных �траниц"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:96
+msgid "Piwik Base URL"
+msgstr "Базовый URL Piwik"
 
-#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100
-msgid "Edit System Page Description"
-msgstr "Редактировать опи�ание �и�темной �траницы"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:96
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "�б�олютный путь к вашей у�тановке Piwik (без типа протокола, � начальным �л�шем)"
 
-#: ../../Zotlabs/Module/Pdledit.php:78
-msgid "(modified)"
-msgstr "(изменено)"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:97
+msgid "Site ID"
+msgstr "ID �айта"
 
-#: ../../Zotlabs/Module/Pdledit.php:95
-msgid "Layout not found."
-msgstr "Шаблон не найден."
+#: ../../extend/addon/hzaddons/piwik/piwik.php:98
+msgid "Show opt-out cookie link?"
+msgstr "Показывать ��ылку на отказ от и�пользовани� cookies?"
 
-#: ../../Zotlabs/Module/Pdledit.php:101
-msgid "Module Name:"
-msgstr "Им� модул�:"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:99
+msgid "Asynchronous tracking"
+msgstr "��инхронное от�леживание"
 
-#: ../../Zotlabs/Module/Pdledit.php:102
-msgid "Layout Help"
-msgstr "Помощь к шаблону"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:100
+msgid "Enable frontend JavaScript error tracking"
+msgstr "Включить от�леживание ошибок JavaScript на фронтенде."
 
-#: ../../Zotlabs/Module/Pdledit.php:103
-msgid "Edit another layout"
-msgstr "Редактировать другой шаблон"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:100
+msgid "This feature requires Piwik >= 2.2.0"
+msgstr "Эта функци� требует вер�ию Piwik >= 2.2.0"
 
-#: ../../Zotlabs/Module/Pdledit.php:104
-msgid "System layout"
-msgstr "Си�темный шаблон"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:22
+msgid "Fuzzloc Settings updated."
+msgstr "�а�тройки примерного положени� обновлены."
 
-#: ../../Zotlabs/Module/Wiki.php:52
-msgid "Wiki App"
-msgstr "Приложение \"Wiki\""
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:34
+msgid "Fuzzy Location App"
+msgstr "Приложение \"Примерное положение\""
 
-#: ../../Zotlabs/Module/Wiki.php:53
-msgid "Provide a wiki for your channel"
-msgstr "Предо�тавьте Wiki дл� вашего канала"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:35
+msgid ""
+"Blur your precise location if your channel uses browser location mapping"
+msgstr "Размывает вашего точное ме�тоположение в �лучае е�ли ваш канал и�пользует отображение ме�тоположени� из браузера"
 
-#: ../../Zotlabs/Module/Wiki.php:132
-msgid "Error retrieving wiki"
-msgstr "Ошибка при получении Wiki"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:40
+msgid "Minimum offset in meters"
+msgstr "Минимальное �мещение в метрах"
 
-#: ../../Zotlabs/Module/Wiki.php:139
-msgid "Error creating zip file export folder"
-msgstr "Ошибка при �оздании zip-файла при �к�порте каталога"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:44
+msgid "Maximum offset in meters"
+msgstr "Мак�имальное �мещение в метрах"
 
-#: ../../Zotlabs/Module/Wiki.php:190
-msgid "Error downloading wiki: "
-msgstr "Ошибка загрузки Wiki:"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:53
+msgid "Fuzzy Location"
+msgstr "Примерное положение"
 
-#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404
-msgid "Download"
-msgstr "Загрузить"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:24
+msgid "Channel is required."
+msgstr "�еобходим канал."
 
-#: ../../Zotlabs/Module/Wiki.php:215
-msgid "Wiki name"
-msgstr "�азвание Wiki"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:38
+msgid "Hubzilla Crosspost Connector Settings saved."
+msgstr "�а�тройки пере�ылки публикаций Hubzilla �охранены."
 
-#: ../../Zotlabs/Module/Wiki.php:216
-msgid "Content type"
-msgstr "Тип �одержимого"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:50
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:146
+msgid "Hubzilla Crosspost Connector App"
+msgstr "Приложение \"Пере�ылка публикаций Hubzilla\""
 
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
-msgid "Type"
-msgstr "Тип"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:51
+msgid "Relay public postings to another Hubzilla channel"
+msgstr "Пере�ылает общедо�тупные публикации в другой канал Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:219
-msgid "Any&nbsp;type"
-msgstr "Любой&nbsp;тип"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:63
+msgid "Send public postings to Hubzilla channel by default"
+msgstr "Отправл�ть общедо�тупные публикации в канал Hubzilla по умолчанию"
 
-#: ../../Zotlabs/Module/Wiki.php:226
-msgid "Lock content type"
-msgstr "Зафик�ировать тип �одержимого"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:67
+msgid "Hubzilla API Path"
+msgstr "Путь к Hubzilla API"
 
-#: ../../Zotlabs/Module/Wiki.php:227
-msgid "Create a status post for this wiki"
-msgstr "Создать публикацию о �тату�е �той Wiki"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:67
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:53
+msgid "https://{sitename}/api"
+msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:228
-msgid "Edit Wiki Name"
-msgstr "Редактировать наименование Wiki"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:71
+msgid "Hubzilla login name"
+msgstr "Им� входа Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:273
-msgid "Wiki not found"
-msgstr "Wiki не найдена"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:75
+msgid "Hubzilla channel name"
+msgstr "�азвание канала Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:299
-msgid "Rename page"
-msgstr "Переименовать �траницу"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:79
+msgid "Hubzilla password"
+msgstr "Пароль Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:320
-msgid "Error retrieving page content"
-msgstr "Ошибка при получении �одержимого �траницы"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:87
+msgid "Hubzilla Crosspost Connector"
+msgstr "Пере�ылка публикаций Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330
-msgid "New page"
-msgstr "�ова� �траница"
+#: ../../extend/addon/hzaddons/redred/redred.php:50
+msgid "Post to Hubzilla"
+msgstr "Опубликовать в Hubzilla"
 
-#: ../../Zotlabs/Module/Wiki.php:365
-msgid "Revision Comparison"
-msgstr "Сравнение ревизий"
+#: ../../extend/addon/hzaddons/adultphotoflag/adultphotoflag.php:24
+msgid "Flag Adult Photos"
+msgstr "Пометка фотографий дл� взро�лых"
 
-#: ../../Zotlabs/Module/Wiki.php:373
-msgid "Short description of your changes (optional)"
-msgstr "Краткое опи�ание ваших изменений (необ�зательно)"
+#: ../../extend/addon/hzaddons/adultphotoflag/adultphotoflag.php:25
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
+msgstr "Предо�тавьте возможно�ть редактировани� фотографий, чтобы �крыть неприемлемые фотографии из альбома по умолчанию"
 
-#: ../../Zotlabs/Module/Wiki.php:393
-msgid "New page name"
-msgstr "�овое им� �траницы"
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:22
+msgid ""
+"Allow magic authentication only to websites of your immediate connections"
+msgstr "Разрешить волшебную аутентификацию только на �айтах ваших непо�ред�твенных �оединений"
 
-#: ../../Zotlabs/Module/Wiki.php:398
-msgid "Embed image from photo albums"
-msgstr "В�троить изображение из фотоальбома"
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:28
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:33
+msgid "Authchoose App"
+msgstr "Приложение Authchoose"
 
-#: ../../Zotlabs/Module/Wiki.php:409
-msgid "History"
-msgstr "И�тори�"
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:33
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:24
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:27
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:23
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:26
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:26
+msgid "Installed"
+msgstr "У�тановлено"
 
-#: ../../Zotlabs/Module/Wiki.php:487
-msgid "Error creating wiki. Invalid name."
-msgstr "Ошибка �оздани� Wiki. �еверное им�."
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:39
+msgid "Authchoose"
+msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:494
-msgid "A wiki with this name already exists."
-msgstr "Wiki � таким именем уже �уще�твует."
+#: ../../extend/addon/hzaddons/irc/irc.php:37
+msgid "Channels to auto connect"
+msgstr "Каналы дл� автоматиче�кого подключени�"
 
-#: ../../Zotlabs/Module/Wiki.php:507
-msgid "Wiki created, but error creating Home page."
-msgstr "Wiki �оздана, но возникла ошибка при �оздании домашней �траницы"
+#: ../../extend/addon/hzaddons/irc/irc.php:37
+#: ../../extend/addon/hzaddons/irc/irc.php:41
+msgid "Comma separated list"
+msgstr "Спи�ок, разделённый зап�тыми"
 
-#: ../../Zotlabs/Module/Wiki.php:514
-msgid "Error creating wiki"
-msgstr "Ошибка при �оздании Wiki"
+#: ../../extend/addon/hzaddons/irc/irc.php:41
+#: ../../extend/addon/hzaddons/irc/Mod_Irc.php:23
+msgid "Popular Channels"
+msgstr "Попул�рные каналы"
 
-#: ../../Zotlabs/Module/Wiki.php:538
-msgid "Error updating wiki. Invalid name."
-msgstr "Ошибка при обновлении Wiki. �еверное им�."
+#: ../../extend/addon/hzaddons/irc/irc.php:45
+msgid "IRC Settings"
+msgstr "�а�тройки IRC"
 
-#: ../../Zotlabs/Module/Wiki.php:557
-msgid "Error updating wiki"
-msgstr "Ошибка при обновлении Wiki"
+#: ../../extend/addon/hzaddons/irc/irc.php:54
+msgid "IRC settings saved."
+msgstr "�а�тройки IRC �охранены"
 
-#: ../../Zotlabs/Module/Wiki.php:572
-msgid "Wiki delete permission denied."
-msgstr "�ет прав на удаление Wiki."
+#: ../../extend/addon/hzaddons/irc/irc.php:58
+msgid "IRC Chatroom"
+msgstr "Чат IRC"
 
-#: ../../Zotlabs/Module/Wiki.php:582
-msgid "Error deleting wiki"
-msgstr "Ошибка удалени� Wiki"
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:145
+msgid "Post to GNU social"
+msgstr "Опубликовать в GNU Social"
 
-#: ../../Zotlabs/Module/Wiki.php:615
-msgid "New page created"
-msgstr "Создана нова� �траница"
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:594
+msgid "API URL"
+msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:741
-msgid "Cannot delete Home"
-msgstr "�евозможно удалить домашнюю �траницу"
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:597
+msgid "Application name"
+msgstr "�азвание приложени�"
 
-#: ../../Zotlabs/Module/Wiki.php:817
-msgid "Current Revision"
-msgstr "Текуща� ревизи�"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:61
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Пожалуй�та �в�жите�ь � админи�тратором �айта. <br />Предо�тавленный URL API недей�твителен."
 
-#: ../../Zotlabs/Module/Wiki.php:817
-msgid "Selected Revision"
-msgstr "Выбранна� ревизи�"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:98
+msgid "We could not contact the GNU social API with the Path you entered."
+msgstr "�ам не удало�ь у�тановить контакт � GNU Social API по введённому вами пути"
 
-#: ../../Zotlabs/Module/Wiki.php:872
-msgid "You must be authenticated."
-msgstr "Вы должны быть аутентифицированы."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:130
+msgid "GNU social settings updated."
+msgstr "�а�тройки GNU Social обновлены."
 
-#: ../../Zotlabs/Module/Home.php:104
-#, php-format
-msgid "Welcome to %s"
-msgstr "Добро пожаловать в %s"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:147
+msgid ""
+"Relay public postings to a connected GNU social account (formerly StatusNet)"
+msgstr "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь GNU social (бывша� StatusNet)"
 
-#: ../../Zotlabs/Module/Suggest.php:40
-msgid "Suggest Channels App"
-msgstr "Приложение \"Рекомендуемые каналы\""
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:181
+msgid "Globally Available GNU social OAuthKeys"
+msgstr "Глобально до�тупные ключи OAuthKeys GNU Social"
 
-#: ../../Zotlabs/Module/Suggest.php:41
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:183
 msgid ""
-"Suggestions for channels in the $Projectname network you might be interested "
-"in"
-msgstr "Предложени� по рекомендуемым каналам в �ети $Projectname которые могут ва� заинтере�овать"
+"There are preconfigured OAuth key pairs for some GNU social servers "
+"available. If you are using one of them, please use these credentials.<br /"
+">If not feel free to connect to any other GNU social instance (see below)."
+msgstr "Суще�твуют предварительно на�троенные пары ключей OAuth дл� некоторых до�тупных �ерверов GNU social. Е�ли вы и�пользуете один из них, и�пользуйте �ти учетные данные. <br />Е�ли вы не хотите подключать�� к какому-либо другому �ерверу GNU social (�м. ниже)."
 
-#: ../../Zotlabs/Module/Suggest.php:54
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:198
+msgid "Provide your own OAuth Credentials"
+msgstr "Предо�тавьте ваши �об�твенные реги�трационные данные OAuth"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:200
 msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "�ет предложений. Е�ли �то новый �айт, повторите попытку через 24 ча�а."
+"No consumer key pair for GNU social found. Register your Hubzilla Account as "
+"an desktop client on your GNU social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Hubzilla installation at your favourite GNU social installation."
+msgstr "�е найдена пользователь�ка� пара ключей дл� GNU social. Зареги�трируйте �вою учетную запи�ь Hubzilla в каче�тве на�тольного клиента в �воей учетной запи�и GNU social, �копируйте cюда пару ключей пользовател� и введите корневой каталог базы API. <br />Прежде чем реги�трировать �вою �об�твенную пару ключей OAuth, �про�ите админи�тратора, е�ли ли уже пара ключей дл� �той у�тановки Hubzilla в вашем GNU social."
 
-#: ../../Zotlabs/Module/Connedit.php:121
-msgid "Could not locate selected profile."
-msgstr "�е удало�ь обнаружить выбранный профиль."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:204
+msgid "OAuth Consumer Key"
+msgstr "Ключ клиента OAuth"
 
-#: ../../Zotlabs/Module/Connedit.php:265
-msgid "Connection updated."
-msgstr "Контакты обновлены."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:208
+msgid "OAuth Consumer Secret"
+msgstr "Пароль клиента OAuth"
 
-#: ../../Zotlabs/Module/Connedit.php:267
-msgid "Failed to update connection record."
-msgstr "�е удало�ь обновить запи�ь контакта."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:212
+msgid "Base API Path"
+msgstr "О�новной путь к API"
 
-#: ../../Zotlabs/Module/Connedit.php:310
-msgid "is now connected to"
-msgstr "теперь подключён к"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:212
+msgid "Remember the trailing /"
+msgstr "Запомнить закрывающий /"
 
-#: ../../Zotlabs/Module/Connedit.php:435
-msgid "Could not access address book record."
-msgstr "�е удало�ь получить до�туп к запи�и адре�ной книги."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:216
+msgid "GNU social application name"
+msgstr "Им� приложени� GNU social"
 
-#: ../../Zotlabs/Module/Connedit.php:483 ../../Zotlabs/Module/Connedit.php:487
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Обновление невозможно - в на�то�щее врем� канал недо�тупен."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:239
+msgid ""
+"To connect to your GNU social account click the button below to get a "
+"security code from GNU social which you have to copy into the input box "
+"below and submit the form. Only your <strong>public</strong> posts will be "
+"posted to GNU social."
+msgstr "Чтобы подключить�� к вашей учетной запи�и GNU social нажмите кнопку ниже дл� получени� кода безопа�но�ти из GNU social, который вы должны �копировать в поле ввода ниже и отправить форму. Только ваши общедо�тупные �ообщени� будут опубликованы в GNU social."
 
-#: ../../Zotlabs/Module/Connedit.php:502 ../../Zotlabs/Module/Connedit.php:511
-#: ../../Zotlabs/Module/Connedit.php:520 ../../Zotlabs/Module/Connedit.php:529
-#: ../../Zotlabs/Module/Connedit.php:542
-msgid "Unable to set address book parameters."
-msgstr "�е удало�ь получить до�туп к параметрам адре�ной книги."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:241
+msgid "Log in with GNU social"
+msgstr "Войти � GNU social"
 
-#: ../../Zotlabs/Module/Connedit.php:561
-msgid "Connection has been removed."
-msgstr "Контакт был удалён."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:244
+msgid "Copy the security code from GNU social here"
+msgstr "Скопируйте код безопа�но�ти GNU social зде�ь"
 
-#: ../../Zotlabs/Module/Connedit.php:604
-#, php-format
-msgid "View %s's profile"
-msgstr "Про�мотр %s профил�"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:254
+msgid "Cancel Connection Process"
+msgstr "Отменить проце�� подключени�"
 
-#: ../../Zotlabs/Module/Connedit.php:608
-msgid "Refresh Permissions"
-msgstr "Обновить разрешени�"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:256
+msgid "Current GNU social API is"
+msgstr "Текущий GNU social API"
 
-#: ../../Zotlabs/Module/Connedit.php:611
-msgid "Fetch updated permissions"
-msgstr "Получить обновлённые разрешени�"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:260
+msgid "Cancel GNU social Connection"
+msgstr "Отменить подключение � GNU social"
 
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Refresh Photo"
-msgstr "Обновить фотографию"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:277
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в GNU social, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен."
 
-#: ../../Zotlabs/Module/Connedit.php:618
-msgid "Fetch updated photo"
-msgstr "Получить обновлённую фотографию"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:282
+msgid "Post to GNU social by default"
+msgstr "Публиковать в GNU social по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:625
-msgid "View recent posts and comments"
-msgstr "Про�мотреть по�ледние публикации и комментарии"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:282
+msgid ""
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
+msgstr "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и GNU social по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:632
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Блокировать (или разблокировать) �в�зи � �тим контактом"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:303
+msgid "GNU-Social Crosspost Connector"
+msgstr "Подключение пере�ылки публикаций GNU Social"
 
-#: ../../Zotlabs/Module/Connedit.php:633
-msgid "This connection is blocked!"
-msgstr "Этот контакт заблокирован!"
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:218
+msgid "Not allowed."
+msgstr "Запрещено."
 
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Unignore"
-msgstr "�е игнорировать"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:81
+msgid "Hubzilla File Storage Import"
+msgstr "Импорт файлового хранилища Hubzilla"
 
-#: ../../Zotlabs/Module/Connedit.php:640
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Игнорировать (или не игнорировать) в�е �в�зи дл� �того контакта"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:82
+msgid "This will import all your cloud files from another server."
+msgstr "Это позволит импортировать в�е ваши файлы � другого �ервера."
 
-#: ../../Zotlabs/Module/Connedit.php:641
-msgid "This connection is ignored!"
-msgstr "Этот контакт игнорирует��!"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:83
+msgid "Hubzilla Server base URL"
+msgstr "Базовый URL �ервера Hubzilla"
 
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Unarchive"
-msgstr "Разархивировать"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:84
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:140
+msgid "Since modified date yyyy-mm-dd"
+msgstr "�ачина� � даты изменений yyyy-mm-dd"
 
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Archive"
-msgstr "Заархивировать"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:85
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:141
+msgid "Until modified date yyyy-mm-dd"
+msgstr "Заканчива� датой изменений yyyy-mm-dd"
 
-#: ../../Zotlabs/Module/Connedit.php:648
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:50
+msgid "Startpage App"
+msgstr "Приложение \"Стартова� �траница\""
+
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:51
+msgid "Set a preferred page to load on login from home page"
+msgstr "У�танавливает предпочтительную �траницу дл� загрузки при входе � домашней �траницы"
+
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:62
+msgid "Page to load after login"
+msgstr "Страница дл� загрузки по�ле входа"
+
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:62
 msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Заархивировать (или разархивировать) �тот контакт - пометить канал отключённым но �охранить �одержимое"
+"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
+"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
+"blank for default network page (grid)."
+msgstr "Примеры: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (о�тавьте пу�тым дл� дл� �траницы �ети по умолчанию)."
 
-#: ../../Zotlabs/Module/Connedit.php:649
-msgid "This connection is archived!"
-msgstr "Этот контакт заархивирован!"
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:70
+msgid "Startpage"
+msgstr "Стартова� �траница"
 
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Unhide"
-msgstr "Показать"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:51
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:129
+msgid "System defaults:"
+msgstr "Си�темные по умолчанию:"
 
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Hide"
-msgstr "Скрыть"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55
+msgid "Preferred Clipart IDs"
+msgstr "Предпочитаемый Clipart ID"
 
-#: ../../Zotlabs/Module/Connedit.php:656
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Скрыть или показать �тот контакт от / дл� о�тальных"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55
+msgid "List of preferred clipart ids. These will be shown first."
+msgstr "Спи�ок предпочитаемых Clipart ID. Эти будут показаны первыми."
 
-#: ../../Zotlabs/Module/Connedit.php:657
-msgid "This connection is hidden!"
-msgstr "Этот контакт �крыт!"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56
+msgid "Default Search Term"
+msgstr "У�ловие пои�ка по умолчанию"
 
-#: ../../Zotlabs/Module/Connedit.php:664
-msgid "Delete this connection"
-msgstr "Удалить �тот контакт"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56
+msgid "The default search term. These will be shown second."
+msgstr "У�ловие пои�ка по умолчанию. Показывают�� во вторую очередь."
 
-#: ../../Zotlabs/Module/Connedit.php:672
-msgid "Fetch Vcard"
-msgstr "Получить vCard"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57
+msgid "Return After"
+msgstr "Вернуть�� по�ле"
 
-#: ../../Zotlabs/Module/Connedit.php:675
-msgid "Fetch electronic calling card for this connection"
-msgstr "Получить �лектронную телефонную карточку дл� �того контакта"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57
+msgid "Page to load after image selection."
+msgstr "Страница дл� загрузки по�ле выбора изображени�."
 
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Open Individual Permissions section by default"
-msgstr "Открывать раздел \"Индивидуальные разрешени�\" по умолчанию"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:60
+msgid "Profile List"
+msgstr "Спи�ок профилей"
 
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Affinity"
-msgstr "Сход�тво"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:62
+msgid "Order of Preferred"
+msgstr "Пор�док предпочтени�"
 
-#: ../../Zotlabs/Module/Connedit.php:712
-msgid "Open Set Affinity section by default"
-msgstr "Открыть �екцию у�тановлени� �ход�тва по умолчанию"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:62
+msgid "Sort order of preferred clipart ids."
+msgstr "Пор�док �ортировки предпочитаемых Clipart ID. "
 
-#: ../../Zotlabs/Module/Connedit.php:749
-msgid "Filter"
-msgstr "Фильтр"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:63
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:69
+msgid "Newest first"
+msgstr "�овое первым"
 
-#: ../../Zotlabs/Module/Connedit.php:752
-msgid "Open Custom Filter section by default"
-msgstr "Открывать �екцию \"�а�траиваемый фильтр\" по умолчанию"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:66
+msgid "As entered"
+msgstr "По мере ввода"
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Approve this connection"
-msgstr "Утвердить �тот контакт"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:68
+msgid "Order of other"
+msgstr "Пор�док других"
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Accept connection to allow communication"
-msgstr "Прин�ть контакт чтобы разрешить �в�зь"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:68
+msgid "Sort order of other clipart ids."
+msgstr "Пор�док �ортировки о�тальных Clipart ID."
 
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Set Affinity"
-msgstr "У�тановить �ход�тво"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:70
+msgid "Most downloaded first"
+msgstr "Самое загружаемое первым"
 
-#: ../../Zotlabs/Module/Connedit.php:797
-msgid "Set Profile"
-msgstr "У�тановить профиль"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:71
+msgid "Most liked first"
+msgstr "Самое нрав�щее�� первым"
 
-#: ../../Zotlabs/Module/Connedit.php:800
-msgid "Set Affinity & Profile"
-msgstr "У�тановить �ход�тво и профиль"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:73
+msgid "Preferred IDs Message"
+msgstr "Сообщение от предпочитаемых ID"
 
-#: ../../Zotlabs/Module/Connedit.php:848
-msgid "This connection is unreachable from this location."
-msgstr "Этот контакт недо�тупен дл� данного ме�тоположени�"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:73
+msgid "Message to display above preferred results."
+msgstr "Отображаемое �ообщение над предпочитаемыми результатами."
 
-#: ../../Zotlabs/Module/Connedit.php:849
-msgid "This connection may be unreachable from other channel locations."
-msgstr "Этот контакт может быть недо�тупен из других ме�т размещени� канала"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:79
+msgid "Uploaded by: "
+msgstr "Загружено:"
 
-#: ../../Zotlabs/Module/Connedit.php:851
-msgid "Location independence is not supported by their network."
-msgstr "�езави�имое ме�тоположение не поддерживает�� их �етью."
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:79
+msgid "Drawn by: "
+msgstr "�ари�овано:"
 
-#: ../../Zotlabs/Module/Connedit.php:857
-msgid ""
-"This connection is unreachable from this location. Location independence is "
-"not supported by their network."
-msgstr "Этот контакт недо�тупен из данного ме�тоположени�. �езави�имое ме�тоположение не поддерживает�� их �етью."
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:183
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:195
+msgid "Use this image"
+msgstr "И�пользовать �то изображение"
 
-#: ../../Zotlabs/Module/Connedit.php:861
-msgid "Connection requests will be approved without your interaction"
-msgstr "Запро�ы контактов будут одобрены без вашего уча�ти�"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:193
+msgid "Or select from a free OpenClipart.org image:"
+msgstr "Или выберите из бе�платных изображений на OpenClipart.org"
 
-#: ../../Zotlabs/Module/Connedit.php:870
-msgid "This connection's primary address is"
-msgstr "Главный адре� �то контакта"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:196
+msgid "Search Term"
+msgstr "У�ловие пои�ка"
 
-#: ../../Zotlabs/Module/Connedit.php:871
-msgid "Available locations:"
-msgstr "До�тупные ра�положени�:"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:233
+msgid "Unknown error. Please try again later."
+msgstr "�еизве�тна� ошибка. Пожалуй�та, повторите попытку позже."
 
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Connection Tools"
-msgstr "Ин�трументы контактов"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:309
+msgid "Profile photo updated successfully."
+msgstr "Фотографи� профил� обновлена у�пешно."
 
-#: ../../Zotlabs/Module/Connedit.php:879
-msgid "Slide to adjust your degree of friendship"
-msgstr "Прокрутить дл� на�тройки �тепени дружбы"
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:20
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:24
+msgid "NSA Bait App"
+msgstr "Приложение NSA Bait"
 
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "Slide to adjust your rating"
-msgstr "Прокрутить дл� на�тройки оценки"
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:26
+msgid "Make yourself a political target"
+msgstr "Сделать �еб� политиче�кой мишенью"
 
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Connedit.php:887
-msgid "Optionally explain your rating"
-msgstr "Объ��ните �вою оценку (не об�зательно)"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:32
+msgid "Skeleton App"
+msgstr "Приложение \"Скелет\""
 
-#: ../../Zotlabs/Module/Connedit.php:884
-msgid "Custom Filter"
-msgstr "�а�траиваемый фильтр"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:33
+msgid "A skeleton for addons, you can copy/paste"
+msgstr "Скелет дл� приложений. Вы можете и�пользовать copy/paste"
 
-#: ../../Zotlabs/Module/Connedit.php:885
-msgid "Only import posts with this text"
-msgstr "Импортировать публикации только � �тим тек�том"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:40
+msgid "Some setting"
+msgstr "�екоторые на�тройки"
 
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "Do not import posts with this text"
-msgstr "�е импортировать публикации � �тим тек�том"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:40
+msgid "A setting"
+msgstr "�а�тройка"
 
-#: ../../Zotlabs/Module/Connedit.php:888
-msgid "This information is public!"
-msgstr "Эта информаци� общедо�тупна!"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:48
+msgid "Skeleton Settings"
+msgstr "�а�тройки �келета"
 
-#: ../../Zotlabs/Module/Connedit.php:893
-msgid "Connection Pending Approval"
-msgstr "Ожидающие подтверждени� контактов"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:25
+msgid "ActivityPub Protocol Settings updated."
+msgstr "�а�тройки протокола ActivityPub обновлены."
 
-#: ../../Zotlabs/Module/Connedit.php:898
-#, php-format
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:34
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Пожалуй�та, выберите профиль который вы хотит показывать в %s при безопа�ном про�мотре."
+"The activitypub protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "Протокол ActivityPub не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала."
+
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:40
+msgid "Activitypub Protocol App"
+msgstr "Приложение \"Протокол ActivityPub\""
 
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:50
+msgid "Deliver to ActivityPub recipients in privacy groups"
+msgstr "До�тавить получател�м ActivityPub в группах конфиденциально�ти"
+
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:50
 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 "�екоторые разрешени� могут быть уна�ледованы из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> вашего канала, которые могут иметь более вы�окий приоритет чем индивидуальные. Вы можете изменить �ти на�тройки, однако они не будут применены до изменени� переданных по на�лед�тву на�троек."
+"May result in a large number of mentions and expose all the members of your "
+"privacy group"
+msgstr "Может приве�ти к большому количе�тву упоминаний и ра�крытию уча�тников группы конфиденциально�ти"
 
-#: ../../Zotlabs/Module/Connedit.php:906
-msgid "Last update:"
-msgstr "По�леднее обновление:"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:54
+msgid "Send multi-media HTML articles"
+msgstr "Отправить HTML �татьи � мультимедиа"
 
-#: ../../Zotlabs/Module/Connedit.php:914
-msgid "Details"
-msgstr "Сведени�"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:54
+msgid "Not supported by some microblog services such as Mastodon"
+msgstr "�е поддерживает�� некоторыми микроблогами, например Mastodon"
 
-#: ../../Zotlabs/Module/Notifications.php:58 ../../Zotlabs/Module/Notify.php:61
-msgid "No more system notifications."
-msgstr "�ет новых оповещений �и�темы."
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:62
+msgid "Activitypub Protocol"
+msgstr "Протокол ActivityPub"
 
-#: ../../Zotlabs/Module/Notifications.php:62 ../../Zotlabs/Module/Notify.php:65
-msgid "System Notifications"
-msgstr "Си�темные оповещени� "
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:43
+msgid "Diaspora Protocol Settings updated."
+msgstr "�а�тройки протокола Diaspora обновлены."
 
-#: ../../Zotlabs/Module/Notifications.php:63
-#: ../../Zotlabs/Lib/ThreadItem.php:484
-msgid "Mark all seen"
-msgstr "Отметить как про�мотренное"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:52
+msgid ""
+"The diaspora protocol does not support location independence. Connections "
+"you make within that network may be unreachable from alternate channel "
+"locations."
+msgstr "Протокол Diaspora не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала."
 
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
-msgstr "Помощь по �зыку опи�ани� �траниц Comanche "
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:58
+msgid "Diaspora Protocol App"
+msgstr "Приложение \"Протокол Diaspora\""
 
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
-msgstr "Опи�ание шаблона"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:77
+msgid "Allow any Diaspora member to comment or like your public posts"
+msgstr "Разрешить любому уча�тнику Diaspora комментировать или отмечать понравившими�� ваши общедо�тупные �ообщени�"
 
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
-msgstr "Загрузить PDL файл"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:77
+msgid ""
+"If this setting is disabled only your contacts will be able to comment or "
+"like your public posts"
+msgstr "Е�ли �тот параметр отключен, только ваши контакты �могут комментировать или лайкать ваши общедо�тупные �ообщени�"
 
-#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:66
-msgid "Location not found."
-msgstr "Ме�тоположение не найдено"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:81
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr "Предотвратить перенаправление тегов на другие �айты"
 
-#: ../../Zotlabs/Module/Locs.php:75
-msgid "Location lookup failed."
-msgstr "Пои�к ме�тоположени� не удал��"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:85
+msgid "Sign and forward posts and comments with no existing Diaspora signature"
+msgstr "Подпи�ывать и отправл�ть публикации и комментарии � не�уще�твующей подпи�ью Diaspora"
 
-#: ../../Zotlabs/Module/Locs.php:79
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:90
+msgid "Followed hashtags (comma separated, do not include the #)"
+msgstr "От�леживаемые теги (через зап�тую, и�ключа� #)"
+
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:99
+msgid "Diaspora Protocol"
+msgstr "Протокол Diaspora"
+
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:19
+msgid "No username found in import file."
+msgstr "Им� пользовател� не найдено в файле дл� импорта."
+
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1571
+#, php-format
+msgid "%1$s dislikes %2$s's %3$s"
+msgstr "%1$s не нравит�� %2$s's %3$s"
+
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:75
 msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
-msgstr "Пожалуй�та, выберите другое ме�тоположение в каче�тве о�новного прежде чем удалить предыдущее"
+"Please install the statistics addon to be able to configure a diaspora relay"
+msgstr "Пожалуй�та, у�тановите ра�ширение �тати�тики, чтобы иметь возможно�ть на�траивать пере�ылку Diaspora"
 
-#: ../../Zotlabs/Module/Locs.php:108
-msgid "Syncing locations"
-msgstr "Синхронизировать ме�тоположение"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:85
+msgid "Diaspora Relay Handle"
+msgstr "Пере�ылка Diaspora"
 
-#: ../../Zotlabs/Module/Locs.php:117
-msgid "No locations found."
-msgstr "Ме�тоположений не найдено"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:85
+msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
+msgstr "�дре� пере�ылки Diaspora. �апример: relay@diasporarelay.tld"
 
-#: ../../Zotlabs/Module/Locs.php:127
-msgid "Manage Channel Locations"
-msgstr "Управление ме�тоположением канала"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:105
+msgid "Diaspora relay could not be imported"
+msgstr "�евозможно импортировать адре� пере�ылки Diaspora"
 
-#: ../../Zotlabs/Module/Locs.php:133
-msgid "Sync Now"
-msgstr "Синхронизировать"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:999
+msgid "No subject"
+msgstr "Без темы"
 
-#: ../../Zotlabs/Module/Locs.php:134
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Пожалуй�та, подождите не�колько минут между по�ледовательными операци�ми."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:133
+msgid "View Larger"
+msgstr "Увеличить"
 
-#: ../../Zotlabs/Module/Locs.php:135
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:156
+msgid "Tile Server URL"
+msgstr "URL �ервера Tile"
+
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:156
 msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
-msgstr "По возможно�ти, очи�тите ме�тоположение, войд� на �тот веб-�айт / хаб и удалив �вой канал."
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
+msgstr "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">общедо�тупных �ерверов</a>"
 
-#: ../../Zotlabs/Module/Locs.php:136
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "И�пользуйте �ту форму, чтобы удалить ме�тоположение, е�ли хаб больше не функционирует."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:157
+msgid "Nominatim (reverse geocoding) Server URL"
+msgstr "URL �ервера Nominatim (обратное геокодирование)"
 
-#: ../../Zotlabs/Module/Sources.php:41
-msgid "Failed to create source. No channel selected."
-msgstr "�е удало�ь �оздать и�точник. Канал не выбран."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:157
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\">Nominatim servers</a>"
+msgstr "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">�ерверов Nominatim</a>"
 
-#: ../../Zotlabs/Module/Sources.php:57
-msgid "Source created."
-msgstr "И�точник �оздан."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:158
+msgid "Default zoom"
+msgstr "Ма�штаб по умолчанию"
 
-#: ../../Zotlabs/Module/Sources.php:70
-msgid "Source updated."
-msgstr "И�точник обновлен."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:158
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+msgstr "Уровень размера по умолчанию (1 - ве�ь мир, 18 - мак�имальный; зави�ит от �ервера)."
 
-#: ../../Zotlabs/Module/Sources.php:88
-msgid "Sources App"
-msgstr "Приложение \"И�точники канала\""
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:159
+msgid "Include marker on map"
+msgstr "Включите маркер на карте"
 
-#: ../../Zotlabs/Module/Sources.php:89
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "�втоматиче�кий импорт контента из других каналов или лент"
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:159
+msgid "Include a marker on the map."
+msgstr "Включить маркер на карте"
 
-#: ../../Zotlabs/Module/Sources.php:101
-msgid "*"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:21
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tic-Tac-Toe в трёх измерени�х"
+
+#: ../../extend/addon/hzaddons/tictac/tictac.php:54
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368
-msgid "Channel Sources"
-msgstr "И�точники канала"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:59
+msgid "New game"
+msgstr "�ова� игра"
 
-#: ../../Zotlabs/Module/Sources.php:108
-msgid "Manage remote sources of content for your channel."
-msgstr "Управление удалённым и�точниками �одержимого дл� вашего канала"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:60
+msgid "New game with handicap"
+msgstr "�ова� игра � форой"
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
-msgid "New Source"
-msgstr "�овый и�точник"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:61
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "Трехмерный Tic-Tac-Toe похож на традиционную игру, за и�ключением того, что игра идёт на не�кольких уровн�х одновременно."
 
-#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
+#: ../../extend/addon/hzaddons/tictac/tictac.php:62
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Импортировать в�ё или выбранное �одержимое из �ледующего канала в �тот канал и ра�пределить его в �оответ�твии � вашими на�тройками."
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "Имеет�� три уровн�. Вы выигрываете, получа� три подр�д на любом уровне, а также вверх, вниз и по диагонали на разных уровн�х."
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
-msgid "Only import content with these words (one per line)"
-msgstr "Импортировать �одержимое только � �тим тек�том (по�трочно)"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:64
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "Игра � форой отключает центральную позицию на �реднем уровне, потому что игрок, претендующий на �тот квадрат, ча�то имеет не�праведливое преимуще�тво."
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
-msgid "Leave blank to import all public content"
-msgstr "О�тавьте пу�тым дл� импорта в�его общедо�тупного �одержимого"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:183
+msgid "You go first..."
+msgstr "Вы начинаете..."
 
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
-msgid "Channel Name"
-msgstr "�азвание канала"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:188
+msgid "I'm going first this time..."
+msgstr "�а �тот раз начинаю �..."
 
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
-msgstr "Добавить �ледующие категории к импортированным публикаци�м из �того и�точника (через зап�тые)"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:194
+msgid "You won!"
+msgstr "Вы выиграли!"
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-msgid "Resend posts with this channel as author"
-msgstr "Отправить публикации в �тот канал повторно как автор"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:200
+#: ../../extend/addon/hzaddons/tictac/tictac.php:225
+msgid "\"Cat\" game!"
+msgstr "�ичь�!"
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
-msgid "Copyrights may apply"
-msgstr "Могут примен�ть�� автор�кие права"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:223
+msgid "I won!"
+msgstr "Я выиграл!"
 
-#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
-msgid "Source not found."
-msgstr "И�точник не найден."
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:21
+msgid "Superblock App"
+msgstr "Приложение Superblock"
 
-#: ../../Zotlabs/Module/Sources.php:151
-msgid "Edit Source"
-msgstr "Редактировать и�точник"
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:22
+msgid "Block channels"
+msgstr "Заблокировать каналы"
 
-#: ../../Zotlabs/Module/Sources.php:152
-msgid "Delete Source"
-msgstr "Удалить и�точник"
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:64
+msgid "superblock settings updated"
+msgstr "�а�тройки Superblock обновлены."
 
-#: ../../Zotlabs/Module/Sources.php:182
-msgid "Source removed"
-msgstr "И�точник удален"
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:88
+msgid "Currently blocked"
+msgstr "В на�то�щее врем� заблокирован"
 
-#: ../../Zotlabs/Module/Sources.php:184
-msgid "Unable to remove source."
-msgstr "�евозможно удалить и�точник."
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:90
+msgid "No channels currently blocked"
+msgstr "В на�то�щее врем� никакие каналы не блокируют��"
 
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
-msgstr "Выбрать каталог дл� закладок"
+#: ../../extend/addon/hzaddons/superblock/superblock.php:337
+msgid "Block Completely"
+msgstr "Заблокировать полно�тью"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
-msgstr "Сохранить закладку"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:24
+msgid "Friendica Crosspost Connector Settings saved."
+msgstr "�а�тройки пере�ылки публикаций Friendica �охранены."
 
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
-msgstr "URL закладки"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:36
+msgid "Friendica Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Friendica\""
 
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
-msgstr "или введите новое им� каталога закладок"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:37
+msgid "Relay public postings to a connected Friendica account"
+msgstr "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь Friendica"
 
-#: ../../Zotlabs/Zot/Auth.php:154
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
-msgstr "Удалённа� аутентификаци� заблокирована. Вы вошли на �тот �айт локально. Пожалуй�та, выйдите и попробуйте ещё раз."
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:49
+msgid "Send public postings to Friendica by default"
+msgstr "Отправл�ть общедо�тупные публикации во Friendica по умолчанию"
 
-#: ../../Zotlabs/Lib/AccessList.php:28
-msgid ""
-"A deleted list with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this list and any future members. If this is "
-"not what you intended, please create another list with a different name."
-msgstr "Во��тановлен удаленный �пи�ок � таким именем. Суще�твующие разрешени� на �лементы <strong>могут</strong> примен�ть�� к �тому �пи�ку и любым будущим уча�тникам. Е�ли не отвечает вашим намерени�м - �оздайте еще один �пи�ок � другим именем."
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:53
+msgid "Friendica API Path"
+msgstr "Путь к Friendica API"
 
-#: ../../Zotlabs/Lib/AccessList.php:286
-msgid "Add new connections to this access list"
-msgstr "Добавить новый контакт в �пи�ок до�тупа"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:57
+msgid "Friendica login name"
+msgstr "Им� входа Friendica"
 
-#: ../../Zotlabs/Lib/AccessList.php:331
-msgid "Lists"
-msgstr "Спи�ки"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:61
+msgid "Friendica password"
+msgstr "Пароль Friendica"
 
-#: ../../Zotlabs/Lib/AccessList.php:332
-msgid "Edit list"
-msgstr "Редактировать �пи�ок"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:69
+msgid "Friendica Crosspost Connector"
+msgstr "Публикаци� в Friendica"
 
-#: ../../Zotlabs/Lib/AccessList.php:333
-msgid "Create new list"
-msgstr "Создать новый �пи�ок"
+#: ../../extend/addon/hzaddons/rtof/rtof.php:51
+msgid "Post to Friendica"
+msgstr "Опубликовать в Friendica"
 
-#: ../../Zotlabs/Lib/AccessList.php:334
-msgid "Channels not in any access list"
-msgstr "Каналы, не вход�щие ни в один �пи�ок до�тупа"
+#: ../../extend/addon/hzaddons/wholikesme/wholikesme.php:29
+msgid "Who likes me?"
+msgstr "Кому � нравлю�ь?"
 
-#: ../../Zotlabs/Lib/Permcat.php:82
-msgctxt "permcat"
-msgid "default"
-msgstr "по умолчанию"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:25
+msgid "Show Upload Limits"
+msgstr "Показать ограничени� на загрузку"
 
-#: ../../Zotlabs/Lib/Permcat.php:133
-msgctxt "permcat"
-msgid "follower"
-msgstr "поклонник"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:27
+msgid "Hubzilla configured maximum size: "
+msgstr "Мак�имальный размер на�троенный в Hubzilla:"
 
-#: ../../Zotlabs/Lib/Permcat.php:137
-msgctxt "permcat"
-msgid "contributor"
-msgstr "уча�тник"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:28
+msgid "PHP upload_max_filesize: "
+msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:141
-msgctxt "permcat"
-msgid "publisher"
-msgstr "издатель"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:29
+msgid "PHP post_max_size (must be larger than upload_max_filesize): "
+msgstr "PHP post_max_size (должен быть больше чем upload_max_filesize): "
 
-#: ../../Zotlabs/Lib/Activity.php:2163
-#, php-format
-msgid "Likes %1$s's %2$s"
-msgstr "�равит�� %1$s %2$s"
+#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:101
+msgid "An account has been created for you."
+msgstr "Учётна� запи�ь, котора� была дл� ва� �оздана."
 
-#: ../../Zotlabs/Lib/Activity.php:2166
-#, php-format
-msgid "Doesn't like %1$s's %2$s"
-msgstr "�е нравит�� %1$s %2$s"
+#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:108
+msgid "Authentication successful but rejected: account creation is disabled."
+msgstr "�утентификаци� выполнена у�пешно, но отклонена: �оздание учетной запи�и отключено."
 
-#: ../../Zotlabs/Lib/Activity.php:2172
-#, php-format
-msgid "Will attend %s's event"
-msgstr "При�оединит�� к меропри�тию %s"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:48
+msgid "QR code"
+msgstr "QR-код"
 
-#: ../../Zotlabs/Lib/Activity.php:2175
-#, php-format
-msgid "Will not attend %s's event"
-msgstr "�е при�оединит�� к меропри�тию %s"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:63
+msgid "QR Generator"
+msgstr "Генератор QR-кодов"
 
-#: ../../Zotlabs/Lib/Activity.php:2178
-#, php-format
-msgid "May attend %s's event"
-msgstr "Возможно при�оединит�� к меропри�тию %s"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:64
+msgid "Enter some text"
+msgstr "Введите любой тек�т"
+
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:19
+msgid "Send email to all members"
+msgstr "Отправить email в�ем уча�тникам"
+
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:50
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:50
+msgid "No recipients found."
+msgstr "Получателей не найдено."
 
-#: ../../Zotlabs/Lib/Activity.php:2181
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:73
 #, php-format
-msgid "May not attend %s's event"
-msgstr "Возможно не при�оединит�� к меропри�тию %s"
+msgid "%1$d of %2$d messages sent."
+msgstr "%1$d из %2$d �ообщений отправлено."
 
-#: ../../Zotlabs/Lib/Enotify.php:60
-msgid "$Projectname Notification"
-msgstr "Оповещение $Projectname "
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:81
+msgid "Send email to all hub members."
+msgstr "Отправить email в�ем уча�тникам узла."
 
-#: ../../Zotlabs/Lib/Enotify.php:63
-msgid "Thank You,"
-msgstr "Спа�ибо,"
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:92
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:96
+msgid "Message subject"
+msgstr "Тема �ообщени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:66
-#, php-format
-msgid "This email was sent by %1$s at %2$s."
-msgstr "Это пи�ьмо было отправлено %1$s на %2$s."
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:93
+msgid "Sender Email address"
+msgstr "�дре� �лектронной почты отправител�"
 
-#: ../../Zotlabs/Lib/Enotify.php:67
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:94
+msgid "Test mode (only send to hub administrator)"
+msgstr "Те�товый режим (отправка только админи�тратору узла)"
+
+#: ../../extend/addon/hzaddons/logrot/logrot.php:36
+msgid "Logfile archive directory"
+msgstr "Каталог архивировани� журнала"
+
+#: ../../extend/addon/hzaddons/logrot/logrot.php:36
+msgid "Directory to store rotated logs"
+msgstr "Каталог дл� хранени� заархивированных журналов"
+
+#: ../../extend/addon/hzaddons/logrot/logrot.php:37
+msgid "Logfile size in bytes before rotating"
+msgstr "Размер файла журнала в байтах дл� архивировани�"
+
+#: ../../extend/addon/hzaddons/logrot/logrot.php:38
+msgid "Number of logfiles to retain"
+msgstr "Количе�тво �охран�емых файлов журналов"
+
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:35
+msgid "Smileybutton App"
+msgstr "Приложение \"Кнопка �о �майликам\""
+
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:36
+msgid "Adds a smileybutton to the jot editor"
+msgstr "Добавл�ть кнопку �о �майликами в редактор Jot"
+
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:44
+msgid "Hide the button and show the smilies directly."
+msgstr "Скрыть кнопку и �разу показывать �майлики."
+
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:52
+msgid "Smileybutton Settings"
+msgstr "�а�тройки кнопки �о �майликами"
+
+#: ../../extend/addon/hzaddons/nsfw/nsfw.php:152
+msgid "Possible adult content"
+msgstr "Возможно �одержимое дл� взро�лых"
+
+#: ../../extend/addon/hzaddons/nsfw/nsfw.php:167
 #, php-format
+msgid "%s - view"
+msgstr "%s -  про�мотр"
+
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:22
+msgid "NSFW Settings saved."
+msgstr "�а�тройки NSFW �охранены."
+
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:33
+msgid "NSFW App"
+msgstr "Приложение NSFW"
+
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:34
+msgid "Collapse content that contains predefined words"
+msgstr "Свернуть �одержимое, �одержащее предопределенные �лова"
+
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:44
 msgid ""
-"To stop receiving these messages, please adjust your Notification Settings "
-"at %s"
-msgstr "Чтобы прекратить получать �ти �ообщени�, на�тройте параметры уведомлений в %s"
+"This app looks in posts for the words/text you specify below, and collapses "
+"any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
+msgstr "Это приложение про�матривает публикации дл� �лов / тек�та, которые вы указываете ниже, и �ворачивает любой контент, �одержащий �ти ключевые �лова, по�тому он не отображает�� в неподход�щее врем�, например, �ек�уальные ин�инуации, которые могут быть неправильными в на�тройке работы. �апример, мы рекомендуем отмечать любой контент, �одержащий наготу, тегом #NSFW. Этот фильтр также �по�обен реагировать на любое другое указанное вами �лово / тек�т и может и�пользовать�� в каче�тве фильтра �одержимого общего назначени�."
 
-#: ../../Zotlabs/Lib/Enotify.php:68
-#, php-format
-msgid "To stop receiving these messages, please adjust your %s."
-msgstr "Чтобы прекратить получать �ти �ообщени�, пожалуй�та измените %s."
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:49
+msgid "Comma separated list of keywords to hide"
+msgstr "Спи�ок ключевых �лов дл� �крыти�, через зап�тую"
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:49
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
+msgstr "�лово, /регул�рное_выражение/, lang=xx, lang!=xx"
+
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:58
+msgid "NSFW"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:127
-#, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
-msgstr "[$Projectname:Notify] Получено новое �ообщение в %s"
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:119
+msgid "Redmatrix File Storage Import"
+msgstr "Импорт файлового хранилища Redmatrix"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s отправил вам новое личное �ообщение в %2$s."
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:120
+msgid "This will import all your Redmatrix cloud files to this channel."
+msgstr "Это позволит импортировать в�е ваши файлы в Redmatrix в �тот канал."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "Ошибка протокола OpenID. Идентификатор не возвращён."
+
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:76
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:178
 #, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s отправил вам %2$s."
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Добро пожаловать %s. Удаленна� аутентификаци� у�пешно завершена."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
-msgid "a private message"
-msgstr "личное �ообщение"
+#: ../../extend/addon/hzaddons/openid/openid.php:49
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Мы �толкнули�ь � проблемой входа � предо�тавленным вами OpenID. Пожалуй�та, проверьте корректно�ть его напи�ани�."
 
-#: ../../Zotlabs/Lib/Enotify.php:131
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Пожалуй�та, по�етите %s дл� про�мотра и/или ответа на ваши личные �ообщени�."
+#: ../../extend/addon/hzaddons/openid/openid.php:49
+msgid "The error message was:"
+msgstr "Сообщение об ошибке было:"
 
-#: ../../Zotlabs/Lib/Enotify.php:144
-msgid "commented on"
-msgstr "прокомментировал"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:52
+msgid "First Name"
+msgstr "Им�"
 
-#: ../../Zotlabs/Lib/Enotify.php:157
-msgid "liked"
-msgstr "понравило�ь"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:53
+msgid "Last Name"
+msgstr "Фамили�"
 
-#: ../../Zotlabs/Lib/Enotify.php:160
-msgid "disliked"
-msgstr "не понравило�ь"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:55
+msgid "Full Name"
+msgstr "Полное им�"
 
-#: ../../Zotlabs/Lib/Enotify.php:165
-msgid "voted on"
-msgstr "проголо�овал в"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:61
+msgid "Profile Photo 16px"
+msgstr "Фотографи� профил� 16px"
 
-#: ../../Zotlabs/Lib/Enotify.php:208
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:62
+msgid "Profile Photo 32px"
+msgstr "Фотографи� профил� 32px"
 
-#: ../../Zotlabs/Lib/Enotify.php:216
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:63
+msgid "Profile Photo 48px"
+msgstr "Фотографи� профил� 48px"
 
-#: ../../Zotlabs/Lib/Enotify.php:225
-#, php-format
-msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s %2$s [zrl=%3$s]ваш %4$s[/zrl]"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:64
+msgid "Profile Photo 64px"
+msgstr "Фотографи� профил� 64px"
 
-#: ../../Zotlabs/Lib/Enotify.php:237
-#, php-format
-msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Отмодерирован комментарий к бе�еде #%1$d по %2$s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:65
+msgid "Profile Photo 80px"
+msgstr "Фотографи� профил� 80px"
 
-#: ../../Zotlabs/Lib/Enotify.php:239
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Комментарий к бе�еде #%1$d по %2$s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:66
+msgid "Profile Photo 128px"
+msgstr "Фотографи� профил� 128px"
 
-#: ../../Zotlabs/Lib/Enotify.php:240
-#, php-format
-msgid "%1$s commented on an item/conversation you have been following."
-msgstr "%1$s прокомментировал тему / бе�еду за которым вы �ледите."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:70
+msgid "Birth Year"
+msgstr "Год рождени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324
-#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365
-#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Пожалуй�та, по�етите %s дл� про�мотра и / или ответа в бе�еде."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:71
+msgid "Birth Month"
+msgstr "Ме��ц рождени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248
-#, php-format
-msgid "Please visit %s to approve or reject this comment."
-msgstr "Пожалуй�та по�етитет %s дл� одобрени� и отклонени� комментари�."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:72
+msgid "Birth Day"
+msgstr "День рождени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:306
-#, php-format
-msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
-msgstr "%1$s понравил�� [zrl=%2$s]ваш %3$s[/zrl]"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:73
+msgid "Birthdate"
+msgstr "Дата рождени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:320
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:26
 #, php-format
-msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Бе�еда получила отметку \"нравит��\" #%1$d от %2$s"
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr "И�кать %1$s (%2$s)"
 
-#: ../../Zotlabs/Lib/Enotify.php:321
-#, php-format
-msgid "%1$s liked an item/conversation you created."
-msgstr "%1$s нравит�� тема / бе�еда которую вы �оздали."
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:332
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
-msgstr "[$Projectname:Notify] %s �делал публикацию на �тене вашего профил�"
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:43
+msgid "Search $Projectname"
+msgstr "Пои�к $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:334
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s �делал публикацию на �тене вашего профил� в %2$s"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:38
+msgid "Livejournal Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Livejournal\""
 
-#: ../../Zotlabs/Lib/Enotify.php:336
-#, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
-msgstr "%1$s опубликовал на [zrl=%2$s]вашей �тене[/zrl]"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:39
+msgid "Relay public posts to Livejournal"
+msgstr "Пере�ылает общедо�тупные публикации в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:359
-#, php-format
-msgid "[$Projectname:Notify] %s tagged you"
-msgstr "[$Projectname:Notify] %s отметил ва�"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:55
+msgid "Livejournal username"
+msgstr "Им� пользовател� Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:360
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s отметил ва� в %2$s"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:59
+msgid "Livejournal password"
+msgstr "Пароль Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:361
-#, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
-msgstr "%1$s [zrl=%2$s]отметил ва�[/zrl]."
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:63
+msgid "Post to Livejournal by default"
+msgstr "Публиковать в Livejournal по умолчанию"
 
-#: ../../Zotlabs/Lib/Enotify.php:372
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
-msgstr "[$Projectname:Notify] %1$s ткнул ва�"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:67
+msgid "Send wall-to-wall posts to Livejournal"
+msgstr "Отправл�ть публикации на �тене в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:373
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s ткнул ва� в %2$s"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:79
+msgid "Livejournal Crosspost Connector"
+msgstr "Публикаци� в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:374
-#, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s [zrl=%2$s]ткнул ва�[/zrl]."
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:49
+msgid "Post to Livejournal"
+msgstr "Опубликовать в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:389
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
-msgstr "[$Projectname:Notify] %s отметил вашу публикацию"
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:127
+msgid "Posted by"
+msgstr "Опубликовано"
 
-#: ../../Zotlabs/Lib/Enotify.php:390
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s отметил вашу публикацию на %2$s"
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:23
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:27
+msgid "Hide Aside App"
+msgstr "Скрывать приложени�"
 
-#: ../../Zotlabs/Lib/Enotify.php:391
-#, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
-msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]"
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:24
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:28
+msgid "Fade out aside areas after a while when using endless scroll"
+msgstr "Через некоторое врем� при и�пользовании прокрутки обла�ть приложений и�чезает"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
-msgid "[$Projectname:Notify] Introduction received"
-msgstr "[$Projectname:Notify] Получено приглашение"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:40
+msgid "Pump.io Settings saved."
+msgstr "�а�тройки Pump.io �охранены."
 
-#: ../../Zotlabs/Lib/Enotify.php:403
-#, php-format
-msgid "You've received an new connection request from '%1$s' at %2$s"
-msgstr "Вы получили новый запро� контакта от '%1$s' в %2$s"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:53
+msgid "Pump.io Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Pump.io\""
 
-#: ../../Zotlabs/Lib/Enotify.php:404
-#, php-format
-msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
-msgstr "Вы получили [zrl=%1$s]новый запро� контакта[/zrl] от %2$s."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:54
+msgid "Relay public posts to pump.io"
+msgstr "Пере�ылает общедо�тупные публикации в Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Вы можете увидеть его профиль по ��ылке %s"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:73
+msgid "Pump.io servername"
+msgstr "Им� �ервера Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:409
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Пожалуй�та, по�етите %s, чтобы одобрить или отклонить запро� контакта."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:73
+msgid "Without \"http://\" or \"https://\""
+msgstr "Без \"http://\" или \"https://\""
 
-#: ../../Zotlabs/Lib/Enotify.php:416
-msgid "[$Projectname:Notify] Friend suggestion received"
-msgstr "[$Projectname:Notify] Получено предложение дружить"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:77
+msgid "Pump.io username"
+msgstr "Им� пользовател� Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Вы получили предложение дружить от '%1$s' в %2$s"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:77
+msgid "Without the servername"
+msgstr "без имени �ервера"
 
-#: ../../Zotlabs/Lib/Enotify.php:418
-#, php-format
-msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
-msgstr "Вы получили [zrl=%1$s]предложение дружить[/zrl] дл� %2$s от %3$s."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:88
+msgid "You are not authenticated to pumpio"
+msgstr "Вы не аутентифицированы на Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:423
-msgid "Name:"
-msgstr "Им�:"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:90
+msgid "(Re-)Authenticate your pump.io connection"
+msgstr "�утентифицировать (повторно) ваше �оединение � Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:424
-msgid "Photo:"
-msgstr "Фото:"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:94
+msgid "Post to pump.io by default"
+msgstr "Публиковать в Pump.io по умолчанию"
 
-#: ../../Zotlabs/Lib/Enotify.php:427
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Пожалуй�та, по�етите %s, чтобы одобрить или отклонить предложение."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:98
+msgid "Should posts be public"
+msgstr "Публикации должны быть общедо�тупными"
 
-#: ../../Zotlabs/Lib/Enotify.php:652
-msgid "[$Projectname:Notify]"
-msgstr "[$Projectname:Уведомление]"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:102
+msgid "Mirror all public posts"
+msgstr "Отображать в�е общедо�тупные публикации"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-msgid "created a new poll"
-msgstr "�оздал новый опро�"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:112
+msgid "Pump.io Crosspost Connector"
+msgstr "Публикаци� в Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-msgid "created a new post"
-msgstr "�оздал новую публикацию"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:152
+msgid "You are now authenticated to pumpio."
+msgstr "Вы аутентифицированы в Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:821
-#, php-format
-msgid "voted on %s's poll"
-msgstr "проголо�ова в опро�е %s"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:153
+msgid "return to the featured settings page"
+msgstr "Вернут�� к �транице на�троек"
 
-#: ../../Zotlabs/Lib/Enotify.php:821
-#, php-format
-msgid "commented on %s's post"
-msgstr "прокомментировал публикацию %s"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:168
+msgid "Post to Pump.io"
+msgstr "Опубликовать в Pump.io"
 
-#: ../../Zotlabs/Lib/Enotify.php:825
-#, php-format
-msgid "repeated %s's post"
-msgstr "разме�тил публикацию %s"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:48
+msgid "Your channel has been upgraded to $Projectname version"
+msgstr "Ваш канал был обновлён до вер�ии $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:837
-#, php-format
-msgid "edited a post dated %s"
-msgstr "отредактировал публикацию датированную %s"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:50
+msgid "Please have a look at the"
+msgstr "Пожалуй�та, взгл�ните на"
 
-#: ../../Zotlabs/Lib/Enotify.php:841
-#, php-format
-msgid "edited a comment dated %s"
-msgstr "отредактировал комментарий датированный %s"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:52
+msgid "git history"
+msgstr "журнал изменений"
 
-#: ../../Zotlabs/Lib/Enotify.php:970
-msgid "created an event"
-msgstr "�оздано �обытие"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:54
+msgid "change log"
+msgstr "и�торию git"
 
-#: ../../Zotlabs/Lib/Enotify.php:986
-msgid "verified"
-msgstr "проверено"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:55
+msgid "for further info."
+msgstr "дл� дополнительных �ведений."
 
-#: ../../Zotlabs/Lib/Connect.php:271
-msgid "error saving data"
-msgstr "ошибка �охранени� данных"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:60
+msgid "Upgrade Info"
+msgstr "Сведени� об обновлении"
 
-#: ../../Zotlabs/Lib/Chatroom.php:25
-msgid "Missing room name"
-msgstr "От�ут�твует название комнаты"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:64
+msgid "Do not show this again"
+msgstr "Больше не показывать"
 
-#: ../../Zotlabs/Lib/Chatroom.php:34
-msgid "Duplicate room name"
-msgstr "�азвание комнаты дублирует��"
+#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:47
+msgid "text to include in all outgoing posts from this site"
+msgstr "тек�т, который будет добавлен во в�е и�ход�щие публикации � �того �айта"
 
-#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
-msgid "Invalid room specifier."
-msgstr "�еверный указатель комнаты."
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:20
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:23
+msgid "Random Planet App"
+msgstr "Приложение \"Случайна� планета\""
 
-#: ../../Zotlabs/Lib/Chatroom.php:124
-msgid "Room not found."
-msgstr "Комната не найдена."
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:25
+msgid ""
+"Set a random planet from the Star Wars Empire as your location when posting"
+msgstr "У�тановить �лучайную планету из Империи Звездных Войн в каче�тве вашего ме�тоположени� при публикации"
 
-#: ../../Zotlabs/Lib/Chatroom.php:145
-msgid "Room is full"
-msgstr "Комната переполнена"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:23
+msgid "Insane Journal Crosspost Connector Settings saved."
+msgstr "�а�тройки пере�ылки публикаций Insane Journal �охранены."
 
-#: ../../Zotlabs/Lib/NativeWiki.php:146
-msgid "Wiki updated successfully"
-msgstr "Wiki у�пешно обновлена"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:35
+msgid "Insane Journal Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Insane Journal\""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:206
-msgid "Wiki files deleted successfully"
-msgstr "Wiki у�пешно удалена"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:36
+msgid "Relay public postings to Insane Journal"
+msgstr "Пере�ылает общедо�тупные публикации в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:323
-msgid "Apps"
-msgstr "Приложени�"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:53
+msgid "InsaneJournal username"
+msgstr "Им� пользовател� Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:324
-msgid "Affinity Tool"
-msgstr "Степень �ход�тва"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:57
+msgid "InsaneJournal password"
+msgstr "Пароль Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:327
-msgid "Site Admin"
-msgstr "�дмини�тратор �айта"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+msgid "Post to InsaneJournal by default"
+msgstr "Публиковать в Insane Journal по умолчанию"
 
-#: ../../Zotlabs/Lib/Apps.php:331
-msgid "Content Filter"
-msgstr "Фильтр �одержимого"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:69
+msgid "Insane Journal Crosspost Connector"
+msgstr "Публикаци� в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:334
-msgid "Remote Diagnostics"
-msgstr "Удалённа� диагно�тика"
+#: ../../extend/addon/hzaddons/ijpost/ijpost.php:44
+msgid "Post to Insane Journal"
+msgstr "Опубликовать в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Suggest Channels"
-msgstr "Предлагаемые каналы"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:15
+msgid "Add some colour to tag clouds"
+msgstr "Добавить немного цвета дл� облака тегов"
 
-#: ../../Zotlabs/Lib/Apps.php:338
-msgid "Stream"
-msgstr "Поток"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:21
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:26
+msgid "Rainbow Tag App"
+msgstr "Приложение \"Радуга тегов\""
 
-#: ../../Zotlabs/Lib/Apps.php:349
-msgid "Mail"
-msgstr "Перепи�ка"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:34
+msgid "Rainbow Tag"
+msgstr "Радуга тегов"
 
-#: ../../Zotlabs/Lib/Apps.php:352
-msgid "Chat"
-msgstr "Чат"
+#: ../../extend/addon/hzaddons/libertree/libertree.php:43
+msgid "Post to Libertree"
+msgstr "Опубликовать в Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:354
-msgid "Probe"
-msgstr "Проба"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:25
+msgid "Libertree Crosspost Connector Settings saved."
+msgstr "�а�тройки пере�ылки публикаций Libertree �охранены."
 
-#: ../../Zotlabs/Lib/Apps.php:355
-msgid "Suggest"
-msgstr "Предложить"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:35
+msgid "Libertree Crosspost Connector App"
+msgstr "Приложение \"Пере�ылка публикаций Libertree\""
 
-#: ../../Zotlabs/Lib/Apps.php:356
-msgid "Random Channel"
-msgstr "Случайный канал"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:36
+msgid "Relay public posts to Libertree"
+msgstr "Пере�ылает общедо�тупные публикации в Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:357
-msgid "Invite"
-msgstr "Пригла�ить"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:51
+msgid "Libertree API token"
+msgstr "Токен Libertree API"
 
-#: ../../Zotlabs/Lib/Apps.php:360 ../../Zotlabs/Storage/Browser.php:407
-msgid "Post"
-msgstr "Публикаци�"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:55
+msgid "Libertree site URL"
+msgstr "URL �айта Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:365
-msgid "Notifications"
-msgstr "Оповещени�"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:59
+msgid "Post to Libertree by default"
+msgstr "Публиковать в Libertree по умолчанию"
 
-#: ../../Zotlabs/Lib/Apps.php:366
-msgid "Order Apps"
-msgstr "Пор�док приложений"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:67
+msgid "Libertree Crosspost Connector"
+msgstr "Пере�ылка публикаций Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:367
-msgid "CardDAV"
-msgstr ""
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:27
+msgid "No server specified"
+msgstr "Сервер не указан"
 
-#: ../../Zotlabs/Lib/Apps.php:369
-msgid "Guest Access"
-msgstr "Го�тевой до�туп"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:73
+msgid "Posts imported"
+msgstr "Публикации импортированы"
 
-#: ../../Zotlabs/Lib/Apps.php:371
-msgid "OAuth Apps Manager"
-msgstr "Менеджер OAuth"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:113
+msgid "Files imported"
+msgstr "Файлы импортированы"
 
-#: ../../Zotlabs/Lib/Apps.php:372
-msgid "OAuth2 Apps Manager"
-msgstr "Менеджер OAuth2"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:122
+msgid ""
+"This addon app copies existing content and file storage to a cloned/copied "
+"channel. Once the app is installed, visit the newly installed app. This will "
+"allow you to set the location of your original channel and an optional date "
+"range of files/conversations to copy."
+msgstr "Это дополнительное приложение копирует �уще�твующее �одержимое и хранилище файлов в клонированный / �копированный канал. По�ле того, как приложение у�тановлено, по�етите его �траницу. Это позволит вам задать ме�тоположение вашего и�ходного канала и диапазон дат файлов / бе�ед дл� копировани�."
 
-#: ../../Zotlabs/Lib/Apps.php:373
-msgid "PDL Editor"
-msgstr "Редактор PDL"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:136
+msgid ""
+"This will import all your conversations and cloud files from a cloned "
+"channel on another server. This may take a while if you have lots of posts "
+"and or files."
+msgstr "Импортировать в�е ваши разговоры и хранилище файлов из клонируемого канала на другом �ервере. Это может зан�ть некоторое врем�, е�ли у ва� много публикаций и / или файлов."
 
-#: ../../Zotlabs/Lib/Apps.php:376
-msgid "My Chatrooms"
-msgstr "Мои чаты"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+msgid "Include posts"
+msgstr "Включа� публикации"
 
-#: ../../Zotlabs/Lib/Apps.php:377
-msgid "Channel Export"
-msgstr "Эк�порт канала"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+msgid "Conversations, Articles, Cards, and other posted content"
+msgstr "Бе�еды, Статьи, Карточки и другое опубликованное �одержимое"
 
-#: ../../Zotlabs/Lib/Apps.php:554
-msgid "Purchase"
-msgstr "Купить"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:138
+msgid "Include files"
+msgstr "Включа� файлы"
 
-#: ../../Zotlabs/Lib/Apps.php:559
-msgid "Undelete"
-msgstr "Во��тановить"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:138
+msgid "Files, Photos and other cloud storage"
+msgstr "Файлы, Фотографии и прочее из хранилища"
 
-#: ../../Zotlabs/Lib/Apps.php:569
-msgid "Add to app-tray"
-msgstr "Добавить в правое меню"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:139
+msgid "Original Server base URL"
+msgstr "Базовый URL �ервера-и�точника"
 
-#: ../../Zotlabs/Lib/Apps.php:570
-msgid "Remove from app-tray"
-msgstr "Удалить из правого меню"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:22
+msgid "pageheader Settings saved."
+msgstr "�а�тройки шапки �траницы �охранены."
 
-#: ../../Zotlabs/Lib/Apps.php:571
-msgid "Pin to navbar"
-msgstr "Добавить на панель навигации"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:34
+msgid "Page Header App"
+msgstr "Приложение \"Заголовок �траницы\""
 
-#: ../../Zotlabs/Lib/Apps.php:572
-msgid "Unpin from navbar"
-msgstr "Удалить � панели навигации"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:35
+msgid "Inserts a page header"
+msgstr "В�тавл�ет заголовок �траницы"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
-msgid "0. Beginner/Basic"
-msgstr "�ачинающий / Базовый"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:43
+msgid "Message to display on every page on this server"
+msgstr "Отображаемое �ообщение на каждой �транице на �том �ервере."
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
-msgid "1. Novice - not skilled but willing to learn"
-msgstr "1. �овичок - не опытный, но желающий учить��"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:51
+msgid "Page Header"
+msgstr "Заголовок �траницы"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
-msgid "2. Intermediate - somewhat comfortable"
-msgstr "2. Промежуточный - более удобный"
+#: ../../extend/addon/hzaddons/donate/donate.php:21
+msgid "Project Servers and Resources"
+msgstr "Серверы и ре�ур�ы проекта"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
-msgid "3. Advanced - very comfortable"
-msgstr "3. Продвинутый - очень удобный"
+#: ../../extend/addon/hzaddons/donate/donate.php:22
+msgid "Project Creator and Tech Lead"
+msgstr "Создатель проекта и техниче�кий руководитель"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
-msgid "4. Expert - I can write computer code"
-msgstr "4. Эк�перт - � умею программировать"
+#: ../../extend/addon/hzaddons/donate/donate.php:49
+msgid ""
+"And the hundreds of other people and organisations who helped make the "
+"Hubzilla possible."
+msgstr "И �отни других людей и организаций которые помогали в �оздании Hubzilla."
 
-#: ../../Zotlabs/Lib/Techlevels.php:15
-msgid "5. Wizard - I probably know more than you do"
-msgstr "5. Волшебник - возможно � знаю больше чем ты"
+#: ../../extend/addon/hzaddons/donate/donate.php:52
+msgid ""
+"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
+"their time and expertise - and often paying out of pocket for services they "
+"share with others."
+msgstr "Проекты Redmatrix / Hubzilla предо�тавл�ют��, в о�новном, добровольцами, которые предо�тавл�ют �вое врем� и опыт и, ча�то, оплачивают из �воего кармана у�луги, которыми они дел�т�� � другими."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:94
-msgid "(No Title)"
-msgstr "(нет заголовка)"
+#: ../../extend/addon/hzaddons/donate/donate.php:53
+msgid ""
+"There is no corporate funding and no ads, and we do not collect and sell "
+"your personal information. (We don't control your personal information - "
+"<strong>you do</strong>.)"
+msgstr "Зде�ь нет корпоративного финан�ировани� и рекламы, мы не �обираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - <strong>�то делаете вы</strong>.)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:109
-msgid "Wiki page create failed."
-msgstr "�е удало�ь �оздать �траницу Wiki."
+#: ../../extend/addon/hzaddons/donate/donate.php:54
+msgid ""
+"Help support our ground-breaking work in decentralisation, web identity, and "
+"privacy."
+msgstr "Помогите поддержать нашу новатор�кую работу в обла�т�х децентрализации, веб-идентификации и конфиденциально�ти."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:123
-msgid "Wiki not found."
-msgstr "Wiki не найдена."
+#: ../../extend/addon/hzaddons/donate/donate.php:56
+msgid ""
+"Your donations keep servers and services running and also helps us to "
+"provide innovative new features and continued development."
+msgstr "В ваших пожертвовани�х поддерживают �ерверы и �лужбы, а также помогают нам предо�тавл�ть новые возможно�ти и продолжать развитие."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:134
-msgid "Destination name already exists"
-msgstr "Им� назначени� уже �уще�твует"
+#: ../../extend/addon/hzaddons/donate/donate.php:59
+msgid "Donate"
+msgstr "Пожертвовать"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:167
-#: ../../Zotlabs/Lib/NativeWikiPage.php:368
-msgid "Page not found"
-msgstr "Страница не найдена."
+#: ../../extend/addon/hzaddons/donate/donate.php:61
+msgid ""
+"Choose a project, developer, or public hub to support with a one-time "
+"donation"
+msgstr "Выберите проект, разработчика или общедо�тупный узел дл� поддержки в форме единоразового пожертвовани�"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:200
-msgid "Error reading page content"
-msgstr "Ошибка чтени� �одержимого �траницы"
+#: ../../extend/addon/hzaddons/donate/donate.php:62
+msgid "Donate Now"
+msgstr "Пожертвовать �ейча�"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
-#: ../../Zotlabs/Lib/NativeWikiPage.php:409
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480
-#: ../../Zotlabs/Lib/NativeWikiPage.php:522
-msgid "Error reading wiki"
-msgstr "Ошибка чтени� Wiki"
+#: ../../extend/addon/hzaddons/donate/donate.php:63
+msgid ""
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
+msgstr "<strong><em>или</em></strong> �таньте �пон�ором проекта (только дл� Hubzilla)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:396
-msgid "Page update failed."
-msgstr "�е удало�ь обновить �траницу."
+#: ../../extend/addon/hzaddons/donate/donate.php:64
+msgid ""
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
+msgstr "Пожалуй�та, е�ли желаете, укажите ваше им� дл� отображени� в �пи�ке �пон�оров."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:431
-msgid "Nothing deleted"
-msgstr "�ичего не удалено"
+#: ../../extend/addon/hzaddons/donate/donate.php:65
+msgid "Sponsor"
+msgstr "Спон�ор"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:501
-msgid "Compare: object not found."
-msgstr "Сравнение: объект не найден."
+#: ../../extend/addon/hzaddons/donate/donate.php:68
+msgid "Special thanks to: "
+msgstr "О�обые благодарно�ти:"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
-msgid "Page updated"
-msgstr "Страница обновлена"
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:44
+msgid "Jabber BOSH host"
+msgstr "Узел Jabber BOSH"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:511
-msgid "Untitled"
-msgstr "�е озаглавлено"
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:45
+msgid "Use central userbase"
+msgstr "И�пользовать центральную базу данных"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:517
-msgid "Wiki resource_id required for git commit"
-msgstr "Требует�� resource_id Wiki дл� отправки в Git"
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:45
+msgid ""
+"If enabled, members will automatically login to an ejabberd server that has "
+"to be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr "Е�ли включено, уча�тники автоматиче�ки войдут на �ервер ejabberd, который должен быть у�тановлен на �том компьютере � �инхронизированными учетными данными через �крипт \"auth_ejabberd.php\"."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:131
-msgid "Privacy conflict. Discretion advised."
-msgstr "Конфиликт на�троек конфиденциально�ти."
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:23
+msgid "XMPP settings updated."
+msgstr "�а�тройки XMPP обновлены."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:175 ../../Zotlabs/Storage/Browser.php:369
-msgid "Admin Delete"
-msgstr "Удалено админи�тратором"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:35
+msgid "XMPP App"
+msgstr "Приложение XMPP"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "Reply on this comment"
-msgstr "Ответить на �тот комментарий"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:36
+msgid "Embedded XMPP (Jabber) client"
+msgstr "В�тренный клиент XMPP (Jabber)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "reply"
-msgstr "ответить"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:52
+msgid "Individual credentials"
+msgstr "Индивидуальные разрешени�"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
-msgid "Reply to"
-msgstr "Ответить"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:58
+msgid "Jabber BOSH server"
+msgstr "Сервер Jabber BOSH"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:340
-msgid "Delivery Report"
-msgstr "Отчёт о до�тавке"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:67
+msgid "XMPP Settings"
+msgstr "�а�тройки XMPP"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:359
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d комментарий"
-msgstr[1] "%d комментари�"
-msgstr[2] "%d комментариев"
+#: ../../extend/addon/hzaddons/mdpost/mdpost.php:42
+msgid "Use markdown for editing posts"
+msgstr "И�пользовать �зык разметки Markdown дл� редактировани� публикаций"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../extend/addon/hzaddons/dwpost/dwpost.php:49
+msgid "Post to Dreamwidth"
+msgstr "Публиковать в Dreamwidth"
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:26
+msgid "Dreamwidth Crosspost Connector Settings saved."
+msgstr "�а�тройки пере�ылки публикаций Dreamwidth �охранены."
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:39
+msgid "Dreamwidth Crosspost Connector App"
+msgstr "Приложение \"Публикаци� в Dreamwidth\""
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:40
+msgid "Relay public posts to Dreamwidth"
+msgstr "Пере�ылать общедо�тупные публикации в Dreamwidth"
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:53
+msgid "Dreamwidth username"
+msgstr "Им� пользовател� Dreamwidth"
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:57
+msgid "Dreamwidth password"
+msgstr "Пароль Dreamwidth"
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:61
+msgid "Post to Dreamwidth by default"
+msgstr "Публиковать в Dreamwidth по умолчанию"
+
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:77
+msgid "Dreamwidth Crosspost Connector"
+msgstr "Публикаци� в Dreamwidth"
+
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:34
+msgid "New registration"
+msgstr "�ова� реги�траци�"
+
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:42
 #, php-format
-msgid "%d unseen"
-msgstr "новых %d"
+msgid "Message sent to %s. New account registration: %s"
+msgstr "Сообщение отправлено в %s. Реги�траци� нового аккаунта: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:413
-msgid "to"
-msgstr "к"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:222
+msgid "Workflow user."
+msgstr "Пользователь \"Рабочего проце��а\"."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:415
-msgid "Wall-to-Wall"
-msgstr "Стена-на-Стену"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:272
+msgid "This channel"
+msgstr "Этот канал"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:416
-msgid "via Wall-To-Wall:"
-msgstr "через Стена-на-Стену:"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:541
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1437
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1456
+msgid "Workflow"
+msgstr "Рабочий проце��"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:444
-msgid "Attend"
-msgstr "По�етить"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1425
+msgid "No Workflows Available"
+msgstr "�ет до�тупных рабочих проце��ов"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:462
-msgid "Go to previous comment"
-msgstr "Перейти к предыдущему комментарию"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1455
+msgid "Add item to which workflow"
+msgstr "Подключить рабочий проце�� к �лементу"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:475
-msgid "Add to Calendar"
-msgstr "Добавить в календарь"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1515
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1634
+msgid "Create Workflow Item"
+msgstr "Создать �лемент рабочего проце��а"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:833
-msgid "Image"
-msgstr "Изображение"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2596
+msgid "Link"
+msgstr "С�ылка"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:835
-msgid "Insert Link"
-msgstr "В�тавить ��ылку"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2598
+msgid "Web link."
+msgstr "Веб-��ылка."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:836
-msgid "Video"
-msgstr "Видео"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2619
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2680
+msgid "Brief description or title"
+msgstr "Подробное опи�ание или заголовок"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:846
-msgid "Your full name (required)"
-msgstr "Ваше полное им� (требует��)"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2627
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2688
+msgid "Notes and Info"
+msgstr "Замечани� и информаци�"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:847
-msgid "Your email address (required)"
-msgstr "Ваш адре� �лектронной почты (требует��)"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2686
+msgid "Body"
+msgstr "Тек�т"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:848
-msgid "Your website URL (optional)"
-msgstr "URL вашего веб�айта (необ�зательно)"
+#: ../../extend/addon/hzaddons/workflow/Settings/Mod_WorkflowSettings.php:101
+msgid "Workflow Settings"
+msgstr "�а�тройки \"Рабочего проце��а\""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:67
-msgid "Source code of failed update: "
-msgstr "И�ходный код неудачного обновлени�: "
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:94
+msgid "Hubzilla Directory Stats"
+msgstr "Каталог �тати�тики Hubzilla"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:88
-#, php-format
-msgid "Update Error at %s"
-msgstr "Ошибка обновлени� на %s"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:95
+msgid "Total Hubs"
+msgstr "В�его хабов"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:94
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Выполнение %s неудачно. Проверьте �и�темный журнал."
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:97
+msgid "Hubzilla Hubs"
+msgstr "Хабы Hubzilla"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Public"
-msgstr "Общедо�тупно"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:99
+msgid "Friendica Hubs"
+msgstr "Хабы Friendica"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
-msgstr "Любому в �ети $Projectname"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:101
+msgid "Diaspora Pods"
+msgstr "Стручки Diaspora"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-#, php-format
-msgid "Any account on %s"
-msgstr "Любой аккаунт в %s"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:103
+msgid "Hubzilla Channels"
+msgstr "Каналы Hubzilla"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
-msgstr "Любой из моих контактов"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:105
+msgid "Friendica Channels"
+msgstr "Каналы Friendica"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
-msgstr "Только те контакты, кому � дам разрешение"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:107
+msgid "Diaspora Channels"
+msgstr "Каналы Diaspora"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Любой аутентифицированный (может включать по�етителей их других �етей)"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:109
+msgid "Aged 35 and above"
+msgstr "Возра�т 35 и выше"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Любые контакты включа� те, которые вы ещё не одобрили"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:111
+msgid "Aged 34 and under"
+msgstr "Возра�т 34 и ниже"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Это на�тройка по умолчанию дл� аудитории ваших обычных потоков и публикаций"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:113
+msgid "Average Age"
+msgstr "Средний возра�т"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать профиль вашего о�новного канала"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:115
+msgid "Known Chatrooms"
+msgstr "Изве�тные чаты"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid "This is your default setting for who can view your connections"
-msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваши контакты"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:117
+msgid "Known Tags"
+msgstr "Изве�тные теги"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:119
 msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваше хранилище файлов и фотографий"
+"Please note Diaspora and Friendica statistics are merely those **this "
+"directory** is aware of, and not all those known in the network.  This also "
+"applies to chatrooms,"
+msgstr "Обратите внимание, что �тати�тика Diaspora и Friendica �то только те, о которых ** �тот каталог ** знает, а не в�е изве�тные в �ети. Это также отно�ит�� и к чатам."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Это на�тройка по умолчанию дл� аудитории ваших веб-�траниц"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:15
+msgid "WYSIWYG status editor"
+msgstr "WYSIWYG редактор �тату�а "
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
-msgid "Social Networking"
-msgstr "Социальна� Сеть"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:21
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:26
+msgid "WYSIWYG Status App"
+msgstr "Приложение \"WYSIWYG �тату�\""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:288
-msgid "Social - Federation"
-msgstr "Социальна� - Федераци�"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:34
+msgid "WYSIWYG Status"
+msgstr "WYSIWYG �тату�"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:289
-msgid "Social - Mostly Public"
-msgstr "Социальна� - В о�новном обще�твенный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:19
+msgid "lonely"
+msgstr "одинокий"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
-msgid "Social - Restricted"
-msgstr "Социальна� - Ограниченный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:20
+msgid "drunk"
+msgstr "пь�ный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
-msgid "Social - Private"
-msgstr "Социальна� - Ча�тный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:21
+msgid "horny"
+msgstr "возбуждённый"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:294
-msgid "Community Forum"
-msgstr "Форум �ообще�тва"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:22
+msgid "stoned"
+msgstr "под кайфом"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:295
-msgid "Forum - Mostly Public"
-msgstr "Форум - В о�новном обще�твенный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:23
+msgid "fucked up"
+msgstr "облажал��"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
-msgid "Forum - Restricted"
-msgstr "Форум - Ограниченный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:24
+msgid "clusterfucked"
+msgstr "в полной заднице"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
-msgid "Forum - Private"
-msgstr "Форум - Ча�тный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:25
+msgid "crazy"
+msgstr "�ума�шедший"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:300
-msgid "Feed Republish"
-msgstr "Публиковать ленты ново�тей"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:26
+msgid "hurt"
+msgstr "обиженный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
-msgid "Feed - Mostly Public"
-msgstr "Ленты ново�тей - В о�новном обще�твенный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:27
+msgid "sleepy"
+msgstr "�онный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
-msgid "Feed - Restricted"
-msgstr "Ленты ново�тей - Ограниченный"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:28
+msgid "grumpy"
+msgstr "�ердитый"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:305
-msgid "Special Purpose"
-msgstr "Спец. назначение"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:29
+msgid "high"
+msgstr "кайфует"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
-msgid "Special - Celebrity/Soapbox"
-msgstr "Спец. назначение - Знаменито�ть/Soapbox"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:30
+msgid "semi-conscious"
+msgstr "в полубез�ознании"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
-msgid "Special - Group Repository"
-msgstr "Спец. назначение - Групповой репозиторий"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:31
+msgid "in love"
+msgstr "влюблённый"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:311
-msgid "Custom/Expert Mode"
-msgstr "Эк�пертный режим"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:32
+msgid "in lust"
+msgstr "похотливый"
 
-#: ../../Zotlabs/Access/Permissions.php:56
-msgid "Can view my channel stream and posts"
-msgstr "Может про�матривать мой поток и �ообщени�"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:33
+msgid "naked"
+msgstr "обнажённый"
 
-#: ../../Zotlabs/Access/Permissions.php:57
-msgid "Can send me their channel stream and posts"
-msgstr "Может при�ылать мне �вои потоки и �ообщени�"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:34
+msgid "stinky"
+msgstr "вонючий"
 
-#: ../../Zotlabs/Access/Permissions.php:58
-msgid "Can view my default channel profile"
-msgstr "Может про�матривать мой �тандартный профиль канала"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:35
+msgid "sweaty"
+msgstr "потный"
 
-#: ../../Zotlabs/Access/Permissions.php:59
-msgid "Can view my connections"
-msgstr "Может про�матривать мои контакты"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:36
+msgid "bleeding out"
+msgstr "и�текающий кровью"
 
-#: ../../Zotlabs/Access/Permissions.php:60
-msgid "Can view my file storage and photos"
-msgstr "Может про�матривать мое хранилище файлов"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:37
+msgid "victorious"
+msgstr "победивший"
 
-#: ../../Zotlabs/Access/Permissions.php:61
-msgid "Can upload/modify my file storage and photos"
-msgstr "Может загружать/измен�ть мои файлы и фотографии в хранилище"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:38
+msgid "defeated"
+msgstr "проигравший"
 
-#: ../../Zotlabs/Access/Permissions.php:62
-msgid "Can view my channel webpages"
-msgstr "Может про�матривать мои веб-�траницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:39
+msgid "envious"
+msgstr "завидует"
 
-#: ../../Zotlabs/Access/Permissions.php:63
-msgid "Can view my wiki pages"
-msgstr "Может про�матривать мои вики-�траницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:40
+msgid "jealous"
+msgstr "ревнует"
 
-#: ../../Zotlabs/Access/Permissions.php:64
-msgid "Can create/edit my channel webpages"
-msgstr "Может редактировать мои веб-�траницы"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:99
+msgid "You're welcome."
+msgstr "Пожалуй�та."
 
-#: ../../Zotlabs/Access/Permissions.php:65
-msgid "Can write to my wiki pages"
-msgstr "Может редактировать мои вики-�траницы"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:100
+msgid "Ah shucks..."
+msgstr "О, чёрт..."
 
-#: ../../Zotlabs/Access/Permissions.php:66
-msgid "Can post on my channel (wall) page"
-msgstr "Может публиковать на моей �транице канала"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:101
+msgid "Don't mention it."
+msgstr "�е �тоит благодарно�ти."
 
-#: ../../Zotlabs/Access/Permissions.php:67
-msgid "Can comment on or like my posts"
-msgstr "Может прокомментировать или отмечать как понравившие�� мои публикации"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:102
+msgid "&lt;blush&gt;"
+msgstr "&lt;кра�нею&gt;"
 
-#: ../../Zotlabs/Access/Permissions.php:68
-msgid "Can send me private mail messages"
-msgstr "Может отправл�ть мне личные �ообщени� по �л. почте"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:19
+msgid "Send test email"
+msgstr "Отправить те�товый email"
 
-#: ../../Zotlabs/Access/Permissions.php:69
-msgid "Can like/dislike profiles and profile things"
-msgstr "Может комментировать или отмечать как нравит��/ненравит�� мой профиль"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:66
+msgid "Mail sent."
+msgstr "Сообщение отправлено"
 
-#: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can forward to all my channel connections via ! mentions in posts"
-msgstr "Может пере�ылать в�ем подпи�чикам моего канала и�пользу� ! в публикаци�х"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:68
+msgid "Sending of mail failed."
+msgstr "�е удало�ь отправить �ообщение."
 
-#: ../../Zotlabs/Access/Permissions.php:71
-msgid "Can chat with me"
-msgstr "Может общать�� �о мной в чате"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:77
+msgid "Mail Test"
+msgstr "Те�товое �ообщение"
 
-#: ../../Zotlabs/Access/Permissions.php:72
-msgid "Can source my public posts in derived channels"
-msgstr "Может и�пользовать мои публичные �ообщени� в клонированных  лентах �ообщений"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:90
+msgid ""
+"You haven't set a TOTP secret yet.\n"
+"Please click the button below to generate one and register this site\n"
+"with your preferred authenticator app."
+msgstr "Вы еще не у�тановили �екретный код TOTP. Пожалуй�та, нажмите на кнопку ниже, чтобы �генерировать его и зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации."
 
-#: ../../Zotlabs/Access/Permissions.php:73
-msgid "Can administer my channel"
-msgstr "Может админи�трировать мой канал"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:93
+msgid "Your TOTP secret is"
+msgstr "Ваш �екретный код TOTP"
 
-#: ../../Zotlabs/Storage/Browser.php:292
-msgid "Change filename to"
-msgstr "Переименовать файл в"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:94
+msgid ""
+"Be sure to save it somewhere in case you lose or replace your mobile "
+"device.\n"
+"Use your mobile device to scan the QR code below to register this site\n"
+"with your preferred authenticator app."
+msgstr "Об�зательно �охраните его где-нибудь на �лучай потери или замены мобильного у�трой�тва. С помощью мобильного у�трой�тва от�канируйте приведенный ниже QR-код, чтобы зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации."
 
-#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
-msgid "Select a target location"
-msgstr "Выбрать ме�то назначени�"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:99
+msgid "Test"
+msgstr "Те�т"
 
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
-msgid "Copy to target location"
-msgstr "Скопировать в ме�то назнаени�"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:100
+msgid "Generate New Secret"
+msgstr "Сгенерировать новый код"
 
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
-msgid "Set permissions for all files and sub folders"
-msgstr "У�тановить разрешени� дл� в�ех файлов и подкаталогов"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:101
+msgid "Go"
+msgstr "Вперёд"
 
-#: ../../Zotlabs/Storage/Browser.php:312
-msgid "Notify your contacts about this file"
-msgstr "Сообщить �воим контактам об �том файле"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:102
+msgid "Enter your password"
+msgstr "Введите ваш пароль"
 
-#: ../../Zotlabs/Storage/Browser.php:351
-msgid "File category"
-msgstr "Категори� файла"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:103
+msgid "enter TOTP code from your device"
+msgstr "введите код TOTP из вашего у�трой�тва"
 
-#: ../../Zotlabs/Storage/Browser.php:362
-msgid "Total"
-msgstr "В�его"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:104
+msgid "Pass!"
+msgstr "Прин�то!"
 
-#: ../../Zotlabs/Storage/Browser.php:364
-msgid "Shared"
-msgstr "Общие"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:105
+msgid "Fail"
+msgstr "Отказано"
 
-#: ../../Zotlabs/Storage/Browser.php:366
-msgid "Add Files"
-msgstr "Добавить файлы"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:106
+msgid "Incorrect password, try again."
+msgstr "�еверный пароль, попробуйте �нова."
 
-#: ../../Zotlabs/Storage/Browser.php:381
-msgid "parent"
-msgstr "и�точник"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:107
+msgid "Record your new TOTP secret and rescan the QR code above."
+msgstr "Запишите ваш �екретный код TOTP и повторно от�канируйте приведенный ниже QR-код."
 
-#: ../../Zotlabs/Storage/Browser.php:399
-msgid "Select All"
-msgstr "Выбрать в�ё"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:115
+msgid "TOTP Settings"
+msgstr "�а�тройки TOTP"
 
-#: ../../Zotlabs/Storage/Browser.php:400
-msgid "Bulk Actions"
-msgstr "Группова� обработка"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:23
+msgid "TOTP Two-Step Verification"
+msgstr "Двух�тапна� верификаци� TOTP"
 
-#: ../../Zotlabs/Storage/Browser.php:401
-msgid "Adjust Permissions"
-msgstr "�а�троить разрешени�"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:24
+msgid "Enter the 2-step verification generated by your authenticator app:"
+msgstr "Введите код проверки, �озданный вашим приложением дл� аутентификации"
 
-#: ../../Zotlabs/Storage/Browser.php:402
-msgid "Move or Copy"
-msgstr "Переме�тить или копировать"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:25
+msgid "Success!"
+msgstr "У�пех!"
 
-#: ../../Zotlabs/Storage/Browser.php:405
-msgid "Info"
-msgstr "Информаци�"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:26
+msgid "Invalid code, please try again."
+msgstr "�еверный код. Пожалуй�та, попробуйте ещё раз."
 
-#: ../../Zotlabs/Storage/Browser.php:406
-msgid "Rename"
-msgstr "Переименовать"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:27
+msgid "Too many invalid codes..."
+msgstr "Слишком много неверных кодов..."
 
-#: ../../Zotlabs/Storage/Browser.php:408
-msgid "Attachment BBcode"
-msgstr "Вложение BBcode"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:28
+msgid "Verify"
+msgstr "Проверить"
 
-#: ../../Zotlabs/Storage/Browser.php:409
-msgid "Embed BBcode"
-msgstr "В�траивание BBcode"
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:14
+msgid "Send your identity to all websites"
+msgstr "Отправить ваши данные на в�е веб-�айты"
 
-#: ../../Zotlabs/Storage/Browser.php:410
-msgid "Link BBcode"
-msgstr "С�ылка BBcode"
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:20
+msgid "Sendzid App"
+msgstr "Приложение \"Отправить ZID\""
 
-#: ../../Zotlabs/Storage/Browser.php:480
-#, php-format
-msgid "You are using %1$s of your available file storage."
-msgstr "Вы и�пользуете %1$s из до�тупного вам хранилища файлов."
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:32
+msgid "Send ZID"
+msgstr "Отправить ZID"
 
-#: ../../Zotlabs/Storage/Browser.php:485
-#, php-format
-msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
-msgstr "Вы и�пользуете %1$s из %2$s до�тупного хранилища файлов (%3$s&#37;)."
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:36
+msgid "Messages"
+msgstr "Сообщени�"
 
-#: ../../Zotlabs/Storage/Browser.php:496
-msgid "WARNING:"
-msgstr "Предупреждение:"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:48
+msgid "message"
+msgstr "�ообщение"
 
-#: ../../Zotlabs/Storage/Browser.php:537
-msgid "Create new folder"
-msgstr "Создать новую папку"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:75
+msgid "Conversation removed."
+msgstr "Бе�еда удалена."
 
-#: ../../Zotlabs/Storage/Browser.php:539
-msgid "Upload file"
-msgstr "Загрузить файл"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:136
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "И�текает YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Storage/Browser.php:551
-msgid "Drop files here to immediately upload"
-msgstr "Поме�тите файлы �юда дл� немедленной загрузки"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:167
+msgid "Delete message"
+msgstr "Удалить �ообщение"
 
-#: ../../Zotlabs/Storage/Browser.php:554
-msgid ""
-"You can select files via the upload button or drop them right here or into "
-"an existing folder."
-msgstr "Вы можете выбрать файлы � помощью кнопки загрузки или перетащить их �юда или в �уще�твующую папку."
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:168
+msgid "Delivery report"
+msgstr "Отчёт о до�тавке"
 
-#: ../../boot.php:1695
-msgid "Create an account to access services and applications"
-msgstr "Создайте аккаунт дл� до�тупа к �лужбам и приложени�м"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:169
+msgid "Recall message"
+msgstr "Отозвать �ообщение"
 
-#: ../../boot.php:1719
-msgid "Login/Email"
-msgstr "Пользователь / email"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:171
+msgid "Message has been recalled."
+msgstr "Сообщение отозванно"
 
-#: ../../boot.php:1720
-msgid "Password"
-msgstr "Пароль"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:189
+msgid "Delete Conversation"
+msgstr "Удалить бе�еду"
 
-#: ../../boot.php:1721
-msgid "Remember me"
-msgstr "Запомнить мен�"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:191
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Безопа�на� �в�зь недо�тупна. Вы <strong>можете</strong> попытать�� ответить �о �траницы профил� отправител�."
 
-#: ../../boot.php:1724
-msgid "Forgot your password?"
-msgstr "Забыли пароль или логин?"
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:195
+msgid "Send Reply"
+msgstr "Отправить ответ"
 
-#: ../../boot.php:2603
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:196
+msgid "To:"
+msgstr "Кому:"
+
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:200
 #, php-format
-msgid "[$Projectname] Website SSL error for %s"
-msgstr "[$Projectname] Ошибка SSL/TLS веб-�айта дл� %s"
+msgid "Your message for %s (%s):"
+msgstr "Ваше �ообщение дл� %s (%s):"
 
-#: ../../boot.php:2608
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "SSL/TLS �ертификат веб-�айт недей�твителен. И�правьте �то."
+#: ../../extend/addon/hzaddons/mail/Mod_Mail.php:204
+msgid "Attach file"
+msgstr "Прикрепить файл"
 
-#: ../../boot.php:2724
-#, php-format
-msgid "[$Projectname] Cron tasks not running on %s"
-msgstr "[$Projectname] Задани� Cron не запущены на %s"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:77
+msgid "Max queueworker threads"
+msgstr "Мак�. количе�тво обработчиков очереди"
 
-#: ../../boot.php:2729
-msgid "Cron/Scheduled tasks not running."
-msgstr "Задани� Cron / планировщика не запущены."
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:79
+msgid "Minimum 4, default 4"
+msgstr "Минимум 4, по умолчанию 4"
+
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:90
+msgid "Assume workers dead after"
+msgstr "Считать обработчики неактивными по�ле"
+
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:92
+msgid "Minimum 120, default 300 seconds"
+msgstr "Минимум 120, по умолчанию 300 �екунд"
+
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:103
+msgid "Pause before starting next task"
+msgstr "Задержка перед запу�ком �ледующей задачи"
+
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:105
+msgid "Minimum 100, default 100 microseconds"
+msgstr "Минимум 100, по умолчанию 100 микро�екунд"
+
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:113
+msgid "Queueworker Settings"
+msgstr "�а�тройки обработчика очереди"
diff --git a/view/ru/hstrings.php b/view/ru/hstrings.php
index f9ed7d82c..e78c104ed 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -1,1906 +1,87 @@
 <?php
 
 if(! function_exists("string_plural_select_ru")) {
-	function string_plural_select_ru($n) {
-		return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2));
-	}
-}
+function string_plural_select_ru($n){
+	return ($n%10==1 && $n%100!=11 ? 0 : ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : 2));
+}}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2))";
-App::$strings["Default"] = "По умолчанию";
-App::$strings["Focus (Hubzilla default)"] = "Фоку� (по умолчанию Hubzilla)";
-App::$strings["Submit"] = "Отправить";
-App::$strings["Theme settings"] = "�а�тройки темы";
-App::$strings["Narrow navbar"] = "Узка� панель навигации";
-App::$strings["No"] = "�ет";
-App::$strings["Yes"] = "Да";
-App::$strings["Navigation bar background color"] = "Панель навигации, цвет фона";
-App::$strings["Navigation bar icon color "] = "Панель навигации, цвет значков";
-App::$strings["Navigation bar active icon color "] = "Панель навигации, цвет активного значка";
-App::$strings["Link color"] = "Цвет ��ылок";
-App::$strings["Set font-color for banner"] = "Цвет тек�та в шапке";
-App::$strings["Set the background color"] = "Цвет фона";
-App::$strings["Set the background image"] = "Фоновое изображение";
-App::$strings["Set the background color of items"] = "Цвет фона �лементов";
-App::$strings["Set the background color of comments"] = "Цвет фона комментариев";
-App::$strings["Set font-size for the entire application"] = "У�тановить �и�темный размер шрифта";
-App::$strings["Examples: 1rem, 100%, 16px"] = "�апример: 1rem, 100%, 16px";
-App::$strings["Set font-color for posts and comments"] = "Цвет шрифта дл� публикаций и комментариев";
-App::$strings["Set radius of corners"] = "Радиу� �круглений";
-App::$strings["Example: 4px"] = "�апример: 4px";
-App::$strings["Set shadow depth of photos"] = "Глубина теней фотографий";
-App::$strings["Set maximum width of content region in pixel"] = "Мак�имальна� ширина �одержани� региона (в пик�ел�х)";
-App::$strings["Leave empty for default width"] = "О�тавьте пу�тым дл� ширины по умолчанию";
-App::$strings["Set size of conversation author photo"] = "Размер фотографии автора бе�еды";
-App::$strings["Set size of followup author photos"] = "Размер фотографий подпи�чиков";
-App::$strings["Show advanced settings"] = "Показать ра�ширенные на�тройки";
-App::$strings["Source channel not found."] = "Канал-и�точник не найден.";
-App::$strings["Access Denied"] = "До�туп запрещён";
-App::$strings["Enable Community Moderation"] = "Включить модерацию �ообще�тва";
-App::$strings["Reputation automatically given to new members"] = "Репутаци� автоматиче�ки предо�тавл�ема� новым уча�тникам";
-App::$strings["Reputation will never fall below this value"] = "Репутаци� никогда не упадёт ниже �того значени�";
-App::$strings["Minimum reputation before posting is allowed"] = "Минимальна� репутаци� дл� разрешени� возможно�ти размещать публикации";
-App::$strings["Minimum reputation before commenting is allowed"] = "Минимальна� репутаци� дл� разрешени� комментировани�";
-App::$strings["Minimum reputation before a member is able to moderate other posts"] = "Минимальна� репутаци� дл� возможно�ти модерировани� уча�тником чужих публикаций";
-App::$strings["Max ratio of moderator's reputation that can be added to/deducted from reputation of person being moderated"] = "Мак�имальное �оотношение репутации модератора, которое может быть добавлено / вычтено из репутации модерируемого уча�тника";
-App::$strings["Reputation \"cost\" to post"] = "\"Стоимо�ть\" репутации дл� публикации";
-App::$strings["Reputation \"cost\" to comment"] = "\"Стоимо�ть\" репутации дл� комментировани�";
-App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = "Репутаци� автоматиче�ки во��танавливает�� � �той �коро�тью в ча� пока не до�тигает значени� minimum_to_post";
-App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "При minimum_to_moderate > репутаци� > minimum_to_post репутаци� во��танавливает�� � �той �коро�тью в ча�";
-App::$strings["Community Moderation Settings"] = "�а�тройки модерировани� �ообще�тва";
-App::$strings["Channel Reputation"] = "Репутаци� канала";
-App::$strings["Close"] = "Закрыть";
-App::$strings["An Error has occurred."] = "Произошла ошибка.";
-App::$strings["Upvote"] = "За";
-App::$strings["Downvote"] = "Против";
-App::$strings["Can moderate reputation on my channel."] = "Может модерировать репутацию на моём канале";
-App::$strings["Block Completely"] = "Заблокировать полно�тью";
-App::$strings["Superblock App"] = "Приложение Superblock";
-App::$strings["Not Installed"] = "не у�тановлено";
-App::$strings["Block channels"] = "Заблокировать каналы";
-App::$strings["superblock settings updated"] = "�а�тройки Superblock обновлены.";
-App::$strings["Currently blocked"] = "В на�то�щее врем� заблокирован";
-App::$strings["No channels currently blocked"] = "В на�то�щее врем� никакие каналы не блокируют��";
-App::$strings["Remove"] = "Удалить";
-App::$strings["NSA Bait App"] = "Приложение NSA Bait";
-App::$strings["Installed"] = "У�тановлено";
-App::$strings["Make yourself a political target"] = "Сделать �еб� политиче�кой мишенью";
-App::$strings["Who viewed my channel/profile"] = "Кто �мотрел мой канал / профиль";
-App::$strings["Recent Channel/Profile Viewers"] = "По�ледние про�мотры канала / профил�";
-App::$strings["No entries."] = "�ет запи�ей.";
-App::$strings["System defaults:"] = "Си�темные по умолчанию:";
-App::$strings["Preferred Clipart IDs"] = "Предпочитаемый Clipart ID";
-App::$strings["List of preferred clipart ids. These will be shown first."] = "Спи�ок предпочитаемых Clipart ID. Эти будут показаны первыми.";
-App::$strings["Default Search Term"] = "У�ловие пои�ка по умолчанию";
-App::$strings["The default search term. These will be shown second."] = "У�ловие пои�ка по умолчанию. Показывают�� во вторую очередь.";
-App::$strings["Return After"] = "Вернуть�� по�ле";
-App::$strings["Page to load after image selection."] = "Страница дл� загрузки по�ле выбора изображени�.";
-App::$strings["View Profile"] = "Про�мотреть профиль";
-App::$strings["Edit Profile"] = "Редактировать профиль";
-App::$strings["Profile List"] = "Спи�ок профилей";
-App::$strings["Order of Preferred"] = "Пор�док предпочтени�";
-App::$strings["Sort order of preferred clipart ids."] = "Пор�док �ортировки предпочитаемых Clipart ID. ";
-App::$strings["Newest first"] = "�овое первым";
-App::$strings["As entered"] = "По мере ввода";
-App::$strings["Order of other"] = "Пор�док других";
-App::$strings["Sort order of other clipart ids."] = "Пор�док �ортировки о�тальных Clipart ID.";
-App::$strings["Most downloaded first"] = "Самое загружаемое первым";
-App::$strings["Most liked first"] = "Самое нрав�щее�� первым";
-App::$strings["Preferred IDs Message"] = "Сообщение от предпочитаемых ID";
-App::$strings["Message to display above preferred results."] = "Отображаемое �ообщение над предпочитаемыми результатами.";
-App::$strings["Uploaded by: "] = "Загружено:";
-App::$strings["Drawn by: "] = "�ари�овано:";
-App::$strings["Use this image"] = "И�пользовать �то изображение";
-App::$strings["Or select from a free OpenClipart.org image:"] = "Или выберите из бе�платных изображений на OpenClipart.org";
-App::$strings["Search Term"] = "У�ловие пои�ка";
-App::$strings["Unknown error. Please try again later."] = "�еизве�тна� ошибка. Пожалуй�та, повторите попытку позже.";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Е�ли нова� фотографи� не отображает�� немедленно то нажмите Shift + \"Обновить\" дл� очи�тки к�ша браузера";
-App::$strings["Profile photo updated successfully."] = "Фотографи� профил� обновлена у�пешно.";
-App::$strings["Save Bookmarks"] = "Сохранить в закладках";
-App::$strings["Max queueworker threads"] = "Мак�. количе�тво обработчиков очереди";
-App::$strings["Minimum 4, default 4"] = "Минимум 4, по умолчанию 4";
-App::$strings["Assume workers dead after"] = "Считать обработчики неактивными по�ле";
-App::$strings["Minimum 120, default 300 seconds"] = "Минимум 120, по умолчанию 300 �екунд";
-App::$strings["Pause before starting next task"] = "Задержка перед запу�ком �ледующей задачи";
-App::$strings["Minimum 100, default 100 microseconds"] = "Минимум 100, по умолчанию 100 микро�екунд";
-App::$strings["Queueworker Settings"] = "�а�тройки обработчика очереди";
-App::$strings["Save"] = "Запомнить";
-App::$strings["Add some colour to tag clouds"] = "Добавить немного цвета дл� облака тегов";
-App::$strings["Rainbow Tag App"] = "Приложение \"Радуга тегов\"";
-App::$strings["Rainbow Tag"] = "Радуга тегов";
-App::$strings["Photo Cache settings saved."] = "�а�тройки к�шировани� изображений �охранены.";
-App::$strings["Photo Cache addon saves a copy of images from external sites locally to increase your anonymity in the web."] = "Приложение \"К�шировние изображений\" �охран�ет копию изображений � внешних �айтов локально дл� повышени� вашей анонимно�ти в Интернет.";
-App::$strings["Photo Cache App"] = "Приложение \"К�ширование изображений\"";
-App::$strings["Minimal photo size for caching"] = "Минимальный размер изображений дл� к�шировани�";
-App::$strings["In pixels. From 1 up to 1024, 0 will be replaced with system default."] = "В пик�ел�х. От 1 до 1024, 0 будет заменён значением по умолчанию.";
-App::$strings["Photo Cache"] = "К�ширование изображений";
-App::$strings["Gallery"] = "Галере�";
-App::$strings["Photo Gallery"] = "Фотогалере�";
-App::$strings["Requested profile is not available."] = "Запрашиваемый профиль не до�тупен.";
-App::$strings["Gallery App"] = "Приложение \"Галере�\"";
-App::$strings["A simple gallery for your photo albums"] = "Про�та� галлере� дл� ваших фотоальбомов";
-App::$strings["Random Planet App"] = "Приложение \"Случайна� планета\"";
-App::$strings["Set a random planet from the Star Wars Empire as your location when posting"] = "У�тановить �лучайную планету из Империи Звездных Войн в каче�тве вашего ме�тоположени� при публикации";
-App::$strings["Permission denied."] = "До�туп запрещен.";
-App::$strings["Male"] = "Мужчина";
-App::$strings["Female"] = "Женщина";
-App::$strings["OpenID protocol error. No ID returned."] = "Ошибка протокола OpenID. Идентификатор не возвращён.";
-App::$strings["Welcome %s. Remote authentication successful."] = "Добро пожаловать %s. Удаленна� аутентификаци� у�пешно завершена.";
-App::$strings["Login failed."] = "�е удало�ь войти.";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Мы �толкнули�ь � проблемой входа � предо�тавленным вами OpenID. Пожалуй�та, проверьте корректно�ть его напи�ани�.";
-App::$strings["The error message was:"] = "Сообщение об ошибке было:";
-App::$strings["First Name"] = "Им�";
-App::$strings["Last Name"] = "Фамили�";
+App::$strings["Create an account to access services and applications"] = "Создайте аккаунт дл� до�тупа к �лужбам и приложени�м";
+App::$strings["Register"] = "Реги�траци�";
+App::$strings["Email or nickname"] = "Электронна� почта или п�евдоним";
 App::$strings["Nickname"] = "П�евдоним";
-App::$strings["Full Name"] = "Полное им�";
-App::$strings["Email"] = "Электронна� почта";
-App::$strings["Profile Photo"] = "Фотографи� профил�";
-App::$strings["Profile Photo 16px"] = "Фотографи� профил� 16px";
-App::$strings["Profile Photo 32px"] = "Фотографи� профил� 32px";
-App::$strings["Profile Photo 48px"] = "Фотографи� профил� 48px";
-App::$strings["Profile Photo 64px"] = "Фотографи� профил� 64px";
-App::$strings["Profile Photo 80px"] = "Фотографи� профил� 80px";
-App::$strings["Profile Photo 128px"] = "Фотографи� профил� 128px";
-App::$strings["Timezone"] = "Ча�овой по��";
-App::$strings["Homepage URL"] = "URL домашней �траницы";
-App::$strings["Language"] = "Язык";
-App::$strings["Birth Year"] = "Год рождени�";
-App::$strings["Birth Month"] = "Ме��ц рождени�";
-App::$strings["Birth Day"] = "День рождени�";
-App::$strings["Birthdate"] = "Дата рождени�";
-App::$strings["Gender"] = "Гендер";
-App::$strings["lonely"] = "одинокий";
-App::$strings["drunk"] = "пь�ный";
-App::$strings["horny"] = "возбуждённый";
-App::$strings["stoned"] = "под кайфом";
-App::$strings["fucked up"] = "облажал��";
-App::$strings["clusterfucked"] = "в полной заднице";
-App::$strings["crazy"] = "�ума�шедший";
-App::$strings["hurt"] = "обиженный";
-App::$strings["sleepy"] = "�онный";
-App::$strings["grumpy"] = "�ердитый";
-App::$strings["high"] = "кайфует";
-App::$strings["semi-conscious"] = "в полубез�ознании";
-App::$strings["in love"] = "влюблённый";
-App::$strings["in lust"] = "похотливый";
-App::$strings["naked"] = "обнажённый";
-App::$strings["stinky"] = "вонючий";
-App::$strings["sweaty"] = "потный";
-App::$strings["bleeding out"] = "и�текающий кровью";
-App::$strings["victorious"] = "победивший";
-App::$strings["defeated"] = "проигравший";
-App::$strings["envious"] = "завидует";
-App::$strings["jealous"] = "ревнует";
-App::$strings["Hubzilla Directory Stats"] = "Каталог �тати�тики Hubzilla";
-App::$strings["Total Hubs"] = "В�его хабов";
-App::$strings["Hubzilla Hubs"] = "Хабы Hubzilla";
-App::$strings["Friendica Hubs"] = "Хабы Friendica";
-App::$strings["Diaspora Pods"] = "Стручки Diaspora";
-App::$strings["Hubzilla Channels"] = "Каналы Hubzilla";
-App::$strings["Friendica Channels"] = "Каналы Friendica";
-App::$strings["Diaspora Channels"] = "Каналы Diaspora";
-App::$strings["Aged 35 and above"] = "Возра�т 35 и выше";
-App::$strings["Aged 34 and under"] = "Возра�т 34 и ниже";
-App::$strings["Average Age"] = "Средний возра�т";
-App::$strings["Known Chatrooms"] = "Изве�тные чаты";
-App::$strings["Known Tags"] = "Изве�тные теги";
-App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network.  This also applies to chatrooms,"] = "Обратите внимание, что �тати�тика Diaspora и Friendica �то только те, о которых ** �тот каталог ** знает, а не в�е изве�тные в �ети. Это также отно�ит�� и к чатам.";
-App::$strings["Channel is required."] = "�еобходим канал.";
-App::$strings["Invalid channel."] = "�едей�твительный канал.";
-App::$strings["Hubzilla Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Hubzilla �охранены.";
-App::$strings["Hubzilla Crosspost Connector App"] = "Приложение \"Пере�ылка публикаций Hubzilla\"";
-App::$strings["Relay public postings to another Hubzilla channel"] = "Пере�ылает общедо�тупные публикации в другой канал Hubzilla";
-App::$strings["Send public postings to Hubzilla channel by default"] = "Отправл�ть общедо�тупные публикации в канал Hubzilla по умолчанию";
-App::$strings["Hubzilla API Path"] = "Путь к Hubzilla API";
-App::$strings["https://{sitename}/api"] = "";
-App::$strings["Hubzilla login name"] = "Им� входа Hubzilla";
-App::$strings["Hubzilla channel name"] = "�азвание канала Hubzilla";
-App::$strings["Hubzilla password"] = "Пароль Hubzilla";
-App::$strings["Hubzilla Crosspost Connector"] = "Пере�ылка публикаций Hubzilla";
-App::$strings["Post to Hubzilla"] = "Опубликовать в Hubzilla";
-App::$strings["Photos imported"] = "Фотографии импортированы";
-App::$strings["Permission denied"] = "До�туп запрещен";
-App::$strings["Redmatrix Photo Album Import"] = "Импортировать альбом фотографий Redmatrix";
-App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Это позволит импортировать в�е ваши альбомы фотографий Redmatrix в �тот канал.";
-App::$strings["Redmatrix Server base URL"] = "Базовый URL �ервера Redmatrix";
-App::$strings["Redmatrix Login Username"] = "Им� пользовател� Redmatrix";
-App::$strings["Redmatrix Login Password"] = "Пароль Redmatrix";
-App::$strings["Import just this album"] = "Импортировать только �тот альбом";
-App::$strings["Leave blank to import all albums"] = "О�тавьте пу�тым дл� импорта в�ех альбомов";
-App::$strings["Maximum count to import"] = "Мак�имальное количе�тво дл� импорта";
-App::$strings["0 or blank to import all available"] = "0 или пу�то дл� импорта в�ех до�тупных";
-App::$strings["photo"] = "фото";
-App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Пожалуй�та �в�жите�ь � админи�тратором �айта. <br />Предо�тавленный URL API недей�твителен.";
-App::$strings["We could not contact the GNU social API with the Path you entered."] = "�ам не удало�ь у�тановить контакт � GNU Social API по введённому вами пути";
-App::$strings["GNU social settings updated."] = "�а�тройки GNU Social обновлены.";
-App::$strings["Relay public postings to a connected GNU social account (formerly StatusNet)"] = "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь GNU social (бывша� StatusNet)";
-App::$strings["Globally Available GNU social OAuthKeys"] = "Глобально до�тупные ключи OAuthKeys GNU Social";
-App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.<br />If not feel free to connect to any other GNU social instance (see below)."] = "Суще�твуют предварительно на�троенные пары ключей OAuth дл� некоторых до�тупных �ерверов GNU social. Е�ли вы и�пользуете один из них, и�пользуйте �ти учетные данные. <br />Е�ли вы не хотите подключать�� к какому-либо другому �ерверу GNU social (�м. ниже).";
-App::$strings["Provide your own OAuth Credentials"] = "Предо�тавьте ваши �об�твенные реги�трационные данные OAuth";
-App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "�е найдена пользователь�ка� пара ключей дл� GNU social. Зареги�трируйте �вою учетную запи�ь Hubzilla в каче�тве на�тольного клиента в �воей учетной запи�и GNU social, �копируйте cюда пару ключей пользовател� и введите корневой каталог базы API. <br />Прежде чем реги�трировать �вою �об�твенную пару ключей OAuth, �про�ите админи�тратора, е�ли ли уже пара ключей дл� �той у�тановки Hubzilla в вашем GNU social.";
-App::$strings["OAuth Consumer Key"] = "Ключ клиента OAuth";
-App::$strings["OAuth Consumer Secret"] = "Пароль клиента OAuth";
-App::$strings["Base API Path"] = "О�новной путь к API";
-App::$strings["Remember the trailing /"] = "Запомнить закрывающий /";
-App::$strings["GNU social application name"] = "Им� приложени� GNU social";
-App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU social."] = "Чтобы подключить�� к вашей учетной запи�и GNU social нажмите кнопку ниже дл� получени� кода безопа�но�ти из GNU social, который вы должны �копировать в поле ввода ниже и отправить форму. Только ваши общедо�тупные �ообщени� будут опубликованы в GNU social.";
-App::$strings["Log in with GNU social"] = "Войти � GNU social";
-App::$strings["Copy the security code from GNU social here"] = "Скопируйте код безопа�но�ти GNU social зде�ь";
-App::$strings["Cancel Connection Process"] = "Отменить проце�� подключени�";
-App::$strings["Current GNU social API is"] = "Текущий GNU social API";
-App::$strings["Cancel GNU social Connection"] = "Отменить подключение � GNU social";
-App::$strings["Currently connected to: "] = "В на�то�щее врем� подключён к: ";
-App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в GNU social, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен.";
-App::$strings["Post to GNU social by default"] = "Публиковать в GNU social по умолчанию";
-App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и GNU social по умолчанию";
-App::$strings["Clear OAuth configuration"] = "Очи�тить конфигурацию OAuth";
-App::$strings["GNU-Social Crosspost Connector"] = "Подключение пере�ылки публикаций GNU Social";
-App::$strings["Post to GNU social"] = "Опубликовать в GNU Social";
-App::$strings["Site name"] = "�азвание �айта";
-App::$strings["API URL"] = "";
-App::$strings["Consumer Secret"] = "Код клиента";
-App::$strings["Consumer Key"] = "Ключ клиента";
-App::$strings["Application name"] = "�азвание приложени�";
-App::$strings["Friendica Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Friendica �охранены.";
-App::$strings["Friendica Crosspost Connector App"] = "Приложение \"Публикаци� в Friendica\"";
-App::$strings["Relay public postings to a connected Friendica account"] = "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь Friendica";
-App::$strings["Send public postings to Friendica by default"] = "Отправл�ть общедо�тупные публикации во Friendica по умолчанию";
-App::$strings["Friendica API Path"] = "Путь к Friendica API";
-App::$strings["Friendica login name"] = "Им� входа Friendica";
-App::$strings["Friendica password"] = "Пароль Friendica";
-App::$strings["Friendica Crosspost Connector"] = "Публикаци� в Friendica";
-App::$strings["Post to Friendica"] = "Опубликовать в Friendica";
-App::$strings["Post to WordPress"] = "Опубликовать в WordPress";
-App::$strings["Source"] = "И�точник";
-App::$strings["Wordpress Settings saved."] = "�а�тройки WordPress �охранены.";
-App::$strings["Wordpress Post App"] = "Приложение \"Публикаци� в Wordpress\"";
-App::$strings["Post to WordPress or anything else which uses the wordpress XMLRPC API"] = "Опубликовать в WordPress или в чём-то ещё, поддерживающем wordpress XMLRPC API";
-App::$strings["WordPress username"] = "Им� пользовател� WordPress";
-App::$strings["WordPress password"] = "Пароль WordPress";
-App::$strings["WordPress API URL"] = "URL API WordPress";
-App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Обычно https://your-blog.tld/xmlrpc.php";
-App::$strings["WordPress blogid"] = "";
-App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Дл� многопользователь�ких �айтов, таких, как wordpress.com. В противном �лучае о�тавьте пу�тым";
-App::$strings["Post to WordPress by default"] = "Публиковать в WordPress по умолчанию";
-App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Пере�ылать комментарии (требует�� плагин hubzilla_wp)";
-App::$strings["Add link to original post"] = "Добавить ��ылку на оригинальную заметку";
-App::$strings["Link description (default:"] = "Опи�ание ��ылки (по-умолчанию:";
-App::$strings["Wordpress Post"] = "Публикаци� в WordPress";
-App::$strings["No server specified"] = "Сервер не указан";
-App::$strings["Posts imported"] = "Публикации импортированы";
-App::$strings["Files imported"] = "Файлы импортированы";
-App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = "Это дополнительное приложение копирует �уще�твующее �одержимое и хранилище файлов в клонированный / �копированный канал. По�ле того, как приложение у�тановлено, по�етите его �траницу. Это позволит вам задать ме�тоположение вашего и�ходного канала и диапазон дат файлов / бе�ед дл� копировани�.";
-App::$strings["Content Import"] = "Импорт �одержимого";
-App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = "Импортировать в�е ваши разговоры и хранилище файлов из клонируемого канала на другом �ервере. Это может зан�ть некоторое врем�, е�ли у ва� много публикаций и / или файлов.";
-App::$strings["Include posts"] = "Включа� публикации";
-App::$strings["Conversations, Articles, Cards, and other posted content"] = "Бе�еды, Статьи, Карточки и другое опубликованное �одержимое";
-App::$strings["Include files"] = "Включа� файлы";
-App::$strings["Files, Photos and other cloud storage"] = "Файлы, Фотографии и прочее из хранилища";
-App::$strings["Original Server base URL"] = "Базовый URL �ервера-и�точника";
-App::$strings["Since modified date yyyy-mm-dd"] = "�ачина� � даты изменений yyyy-mm-dd";
-App::$strings["Until modified date yyyy-mm-dd"] = "Заканчива� датой изменений yyyy-mm-dd";
-App::$strings["Set your location"] = "Задать �воё ме�тоположение";
-App::$strings["Clear browser location"] = "Очи�тить ме�тоположение из браузера";
-App::$strings["Insert web link"] = "В�тавить веб-��ылку";
-App::$strings["Embed (existing) photo from your photo albums"] = "В�троить (�уще�твующее) фото из вашего фотоальбома";
-App::$strings["Please enter a link URL:"] = "Пожалуй�та введите URL ��ылки:";
-App::$strings["Tag term:"] = "Теги:";
-App::$strings["Where are you right now?"] = "Где вы �ейча�?";
-App::$strings["Choose images to embed"] = "Выбрать изображени� дл� в�траивани�";
-App::$strings["Choose an album"] = "Выбрать альбом";
-App::$strings["Choose a different album..."] = "Выбрать другой альбом...";
-App::$strings["Error getting album list"] = "Ошибка получени� �пи�ка альбомов";
-App::$strings["Error getting photo link"] = "Ошибка получени� ��ылки на фотографию";
-App::$strings["Error getting album"] = "Ошибка получени� альбома";
-App::$strings["Comments enabled"] = "Комментарии включены";
-App::$strings["Comments disabled"] = "Комментарии отключены";
-App::$strings["Preview"] = "Предварительный про�мотр";
-App::$strings["Share"] = "Поделить��";
-App::$strings["Page link name"] = "�азвание ��ылки на �траницу ";
-App::$strings["Post as"] = "Опубликовать как";
-App::$strings["Bold"] = "Жирный";
-App::$strings["Italic"] = "Кур�ив";
-App::$strings["Underline"] = "Подчеркнутый";
-App::$strings["Quote"] = "Цитата";
-App::$strings["Code"] = "Код";
-App::$strings["Attach/Upload file"] = "Прикрепить/загрузить файл";
-App::$strings["Embed an image from your albums"] = "В�троить изображение из ваших альбомов";
-App::$strings["Cancel"] = "Отменить";
-App::$strings["OK"] = "";
-App::$strings["Toggle voting"] = "Переключить голо�ование";
-App::$strings["Disable comments"] = "Отключить комментарии";
-App::$strings["Toggle comments"] = "Переключить комментарии";
-App::$strings["Title (optional)"] = "Заголовок (необ�зательно)";
-App::$strings["Categories (optional, comma-separated list)"] = "Категории (необ�зательно, �пи�ок через зап�тую)";
-App::$strings["Permission settings"] = "�а�тройки разрешений";
-App::$strings["Other networks and post services"] = "Другие �ети и �лужбы публикаций";
-App::$strings["Set expiration date"] = "У�тановить �рок дей�тви�";
-App::$strings["Set publish date"] = "У�тановить дату публикации";
-App::$strings["Encrypt text"] = "Зашифровать тек�т";
-App::$strings["WYSIWYG status editor"] = "WYSIWYG редактор �тату�а ";
-App::$strings["WYSIWYG Status App"] = "Приложение \"WYSIWYG �тату�\"";
-App::$strings["WYSIWYG Status"] = "WYSIWYG �тату�";
-App::$strings["View Larger"] = "Увеличить";
-App::$strings["Tile Server URL"] = "URL �ервера Tile";
-App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">общедо�тупных �ерверов</a>";
-App::$strings["Nominatim (reverse geocoding) Server URL"] = "URL �ервера Nominatim (обратное геокодирование)";
-App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim servers</a>"] = "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">�ерверов Nominatim</a>";
-App::$strings["Default zoom"] = "Ма�штаб по умолчанию";
-App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Уровень размера по умолчанию (1 - ве�ь мир, 18 - мак�имальный; зави�ит от �ервера).";
-App::$strings["Include marker on map"] = "Включите маркер на карте";
-App::$strings["Include a marker on the map."] = "Включить маркер на карте";
-App::$strings["Settings updated."] = "�а�тройки обновлены.";
-App::$strings["Insane Journal Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Insane Journal �охранены.";
-App::$strings["Insane Journal Crosspost Connector App"] = "Приложение \"Публикаци� в Insane Journal\"";
-App::$strings["Relay public postings to Insane Journal"] = "Пере�ылает общедо�тупные публикации в Insane Journal";
-App::$strings["InsaneJournal username"] = "Им� пользовател� Insane Journal";
-App::$strings["InsaneJournal password"] = "Пароль Insane Journal";
-App::$strings["Post to InsaneJournal by default"] = "Публиковать в Insane Journal по умолчанию";
-App::$strings["Insane Journal Crosspost Connector"] = "Публикаци� в Insane Journal";
-App::$strings["Post to Insane Journal"] = "Опубликовать в Insane Journal";
-App::$strings["Who likes me?"] = "Кому � нравлю�ь?";
-App::$strings["QR code"] = "QR-код";
-App::$strings["QR Generator"] = "Генератор QR-кодов";
-App::$strings["Enter some text"] = "Введите любой тек�т";
-App::$strings["Unknown"] = "�еизве�тный";
-App::$strings["ActivityPub"] = "";
-App::$strings["status"] = "�тату�";
-App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравит�� %3\$s %2\$s";
-App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравит�� %2\$s %3\$s";
-App::$strings["ActivityPub Protocol Settings updated."] = "�а�тройки протокола ActivityPub обновлены.";
-App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол ActivityPub не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала.";
-App::$strings["Activitypub Protocol App"] = "Приложение \"Протокол ActivityPub\"";
-App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "До�тавить получател�м ActivityPub в группах конфиденциально�ти";
-App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Может приве�ти к большому количе�тву упоминаний и ра�крытию уча�тников группы конфиденциально�ти";
-App::$strings["Send multi-media HTML articles"] = "Отправить HTML �татьи � мультимедиа";
-App::$strings["Not supported by some microblog services such as Mastodon"] = "�е поддерживает�� некоторыми микроблогами, например Mastodon";
-App::$strings["Activitypub Protocol"] = "Протокол ActivityPub";
-App::$strings["An account has been created for you."] = "Учётна� запи�ь, котора� была дл� ва� �оздана.";
-App::$strings["Authentication successful but rejected: account creation is disabled."] = "�утентификаци� выполнена у�пешно, но отклонена: �оздание учетной запи�и отключено.";
-App::$strings["Dreamwidth Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Dreamwidth �охранены.";
-App::$strings["Dreamwidth Crosspost Connector App"] = "Приложение \"Публикаци� в Dreamwidth\"";
-App::$strings["Relay public posts to Dreamwidth"] = "Пере�ылать общедо�тупные публикации в Dreamwidth";
-App::$strings["Dreamwidth username"] = "Им� пользовател� Dreamwidth";
-App::$strings["Dreamwidth password"] = "Пароль Dreamwidth";
-App::$strings["Post to Dreamwidth by default"] = "Публиковать в Dreamwidth по умолчанию";
-App::$strings["Dreamwidth Crosspost Connector"] = "Публикаци� в Dreamwidth";
-App::$strings["Post to Dreamwidth"] = "Публиковать в Dreamwidth";
-App::$strings["bitchslap"] = "дал леща";
-App::$strings["bitchslapped"] = "получил леща";
-App::$strings["shag"] = "вздрючил";
-App::$strings["shagged"] = "вздрюченный";
-App::$strings["patent"] = "";
-App::$strings["patented"] = "";
-App::$strings["hug"] = "обн�л";
-App::$strings["hugged"] = "обн�тый";
-App::$strings["murder"] = "убил";
-App::$strings["murdered"] = "убитый";
-App::$strings["worship"] = "почитает";
-App::$strings["worshipped"] = "почитаемый";
-App::$strings["kiss"] = "поцеловал";
-App::$strings["kissed"] = "поцелованный";
-App::$strings["tempt"] = "и�кушает";
-App::$strings["tempted"] = "и�кушённый";
-App::$strings["raise eyebrows at"] = "подн�л брови";
-App::$strings["raised their eyebrows at"] = "подн�л брови";
-App::$strings["insult"] = "о�корбил";
-App::$strings["insulted"] = "о�корблённый";
-App::$strings["praise"] = "похвалил";
-App::$strings["praised"] = "похваленный";
-App::$strings["be dubious of"] = "�омневает��";
-App::$strings["was dubious of"] = "у�омнил��";
-App::$strings["eat"] = "е�т";
-App::$strings["ate"] = "�ъел";
-App::$strings["giggle and fawn at"] = "";
-App::$strings["giggled and fawned at"] = "";
-App::$strings["doubt"] = "�омневает��";
-App::$strings["doubted"] = "у�омнил��";
-App::$strings["glare"] = "";
-App::$strings["glared at"] = "";
-App::$strings["fuck"] = "трахает";
-App::$strings["fucked"] = "трахнул";
-App::$strings["bonk"] = "";
-App::$strings["bonked"] = "";
-App::$strings["declare undying love for"] = "признаёт�� в любви к";
-App::$strings["declared undying love for"] = "признал�� в любви к";
-App::$strings["Errors encountered deleting database table "] = "Возникшие при удалении таблицы базы данных ошибки";
-App::$strings["Submit Settings"] = "Отправить на�тройки";
-App::$strings["Drop tables when uninstalling?"] = "Удалить таблицы при деин�талл�ции?";
-App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Е�ли включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина.";
-App::$strings["Mapbox Access Token"] = "Токен до�тупа к Mapbox";
-App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Е�ли вы введете токен до�тупа к Mapbox, он будет и�пользовать�� дл� извлечени� фрагментов карты из Mapbox вме�то �тандартного �ервера OpenStreetMap.";
-App::$strings["Rendezvous"] = "";
-App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Этот идентификатор был удалён другим уча�тником из-за неактивно�ти. Пожалуй�та нажмите кнопку \"�овый идентификатор\" дл� обновлени� �траницы и получени� нового идентификатора. Вы можете и�пользовать то же им�.";
-App::$strings["Welcome to Rendezvous!"] = "Добро пожаловать в Rendezvous!";
-App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Введите ваше им� дл� в�туплени� в �то Rendezvous. Дл� того, чтобы делить�� вашим положением � другими уча�тниками, нажмите \"GPS control\". Когда ваше ме�тоположение определно, кра�на� точка по�вит�� и о�тальные �могут увидеть ва� на карте.";
-App::$strings["Let's meet here"] = "Давайте в�третим�� зде�ь";
-App::$strings["Name"] = "Им�";
-App::$strings["Description"] = "Опи�ание";
-App::$strings["New marker"] = "�овый маркер";
-App::$strings["Edit marker"] = "Редактировать маркер";
-App::$strings["New identity"] = "�овый идентификатор";
-App::$strings["Delete marker"] = "Удалить маркер";
-App::$strings["Delete member"] = "Удалить уча�тника";
-App::$strings["Edit proximity alert"] = "Изменить оповещение о близо�ти";
-App::$strings["A proximity alert will be issued when this member is within a certain radius of you.<br><br>Enter a radius in meters (0 to disable):"] = "Оповещение о близо�ти будет произведено, е�ли �тот уча�тник находит�� на определённом ра��то�нии от ва�. <br><br>Введите радиу� в метрах (0 дл� отключени�):";
-App::$strings["distance"] = "ра��то�ние";
-App::$strings["Proximity alert distance (meters)"] = "Ра��то�ние дл� уведомлени� о близо�ти (метров)";
-App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.<br><br>Enter a radius in meters (0 to disable):"] = "Оповещение о близо�ти будет произведено, е�ли вы находите�ь на определённом ра��то�нии ме�тоположени� маркера. <br><br>Введите радиу� в метрах (0 дл� отключени�):";
-App::$strings["Marker proximity alert"] = "Маркер уведомлени� о близо�ти";
-App::$strings["Reminder note"] = "�апоминание";
-App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Введите �ообщение дл� отображени� когда вы находите�ь р�дом";
-App::$strings["Add new rendezvous"] = "Добавить новое Rendezvous.";
-App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Создайте новое Rendezvous и поделите�ь ��ылкой до�тупа � теми, кого вы хотите пригла�ить в группу. Тот, кто откроет �ту ��ылку, �танет её уча�тником. Уча�тники могут видеть ме�тоположение, добавл�ть маркеры на карту или делит�� �воим �об�твенным ме�тоположением � группой.";
-App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "У ва� нет Rendezvous. �ажмите на кнопку ниже чтобы �оздать его!";
-App::$strings["Errors encountered creating database tables."] = "При �оздании базы данных возникли ошибки.";
-App::$strings["Startpage App"] = "Приложение \"Стартова� �траница\"";
-App::$strings["Set a preferred page to load on login from home page"] = "У�танавливает предпочтительную �траницу дл� загрузки при входе � домашней �траницы";
-App::$strings["Page to load after login"] = "Страница дл� загрузки по�ле входа";
-App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Примеры: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (о�тавьте пу�тым дл� дл� �траницы �ети по умолчанию).";
-App::$strings["Startpage"] = "Стартова� �траница";
-App::$strings["Messages"] = "Сообщени�";
-App::$strings["message"] = "�ообщение";
-App::$strings["Message recalled."] = "Сообщение отозванно.";
-App::$strings["Conversation removed."] = "Бе�еда удалена.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "И�текает YYYY-MM-DD HH:MM";
-App::$strings["Requested channel is not in this network"] = "Запрашиваемый канал не до�тупен.";
-App::$strings["Send Private Message"] = "Отправить личное �ообщение";
-App::$strings["To:"] = "Кому:";
-App::$strings["Subject:"] = "Тема:";
-App::$strings["Your message:"] = "Сообщение:";
-App::$strings["Attach file"] = "Прикрепить файл";
-App::$strings["Send"] = "Отправить";
-App::$strings["Delete message"] = "Удалить �ообщение";
-App::$strings["Delivery report"] = "Отчёт о до�тавке";
-App::$strings["Recall message"] = "Отозвать �ообщение";
-App::$strings["Message has been recalled."] = "Сообщение отозванно";
-App::$strings["Delete Conversation"] = "Удалить бе�еду";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Безопа�на� �в�зь недо�тупна. Вы <strong>можете</strong> попытать�� ответить �о �траницы профил� отправител�.";
-App::$strings["Send Reply"] = "Отправить ответ";
-App::$strings["Your message for %s (%s):"] = "Ваше �ообщение дл� %s (%s):";
-App::$strings["Unable to lookup recipient."] = "�е удало�ь найти получател�.";
-App::$strings["Unable to communicate with requested channel."] = "�е удало�ь у�тановить �в�зь � запрашиваемым каналом.";
-App::$strings["Cannot verify requested channel."] = "�е удало�ь у�тановить подлинно�ть требуемого канала.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "Выбранный канал ограничивает ча�тные �ообщени�. Отправка не удала�ь.";
-App::$strings["Flag Adult Photos"] = "Пометка фотографий дл� взро�лых";
-App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Предо�тавьте возможно�ть редактировани� фотографий, чтобы �крыть неприемлемые фотографии из альбома по умолчанию";
-App::$strings["Your channel has been upgraded to \$Projectname version"] = "Ваш канал был обновлён до вер�ии \$Projectname";
-App::$strings["Please have a look at the"] = "Пожалуй�та, взгл�ните на";
-App::$strings["git history"] = "журнал изменений";
-App::$strings["change log"] = "и�торию git";
-App::$strings["for further info."] = "дл� дополнительных �ведений.";
-App::$strings["Upgrade Info"] = "Сведени� об обновлении";
-App::$strings["Do not show this again"] = "Больше не показывать";
-App::$strings["Twitter settings updated."] = "�а�тройки Twitter обновлены";
-App::$strings["Twitter Crosspost Connector App"] = "Приложение \"Публикаци� в Twitter\"";
-App::$strings["Relay public posts to Twitter"] = "Пере�ылает общедо�тупные публикации в Twitter";
-App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "�е найдено пары ключей дл� Twitter. Пожалуй�та, �в�жите�ь � админи�тратором �айта.";
-App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "В �той у�тановке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Дл� �того нажмите на кнопку ниже дл� получени� PIN-кода от Twitter который нужно �копировать в поле ввода и отправить форму. Только ваши <strong>общедо�тупные</strong> публикации будут опубликованы в Twitter.";
-App::$strings["Log in with Twitter"] = "Войти в Twitter";
-App::$strings["Copy the PIN from Twitter here"] = "Скопируйте PIN-код из Twitter зде�ь";
-App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в Twitter, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен.";
-App::$strings["Twitter post length"] = "Длина публикации Twitter";
-App::$strings["Maximum tweet length"] = "Мак�имальна� длина твита";
-App::$strings["Send public postings to Twitter by default"] = "Отправл�ть общедо�тупные публикации в Twitter по умолчанию";
-App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и Twitter по умолчанию";
-App::$strings["Twitter Crosspost Connector"] = "Публикаци� в Twitter";
-App::$strings["Post to Twitter"] = "Опубликовать в Twitter";
-App::$strings["You are now authenticated to pumpio."] = "Вы аутентифицированы в Pump.io";
-App::$strings["return to the featured settings page"] = "Вернут�� к �транице на�троек";
-App::$strings["Post to Pump.io"] = "Опубликовать в Pump.io";
-App::$strings["Pump.io Settings saved."] = "�а�тройки Pump.io �охранены.";
-App::$strings["Pump.io Crosspost Connector App"] = "Приложение \"Публикаци� в Pump.io\"";
-App::$strings["Relay public posts to pump.io"] = "Пере�ылает общедо�тупные публикации в Pump.io";
-App::$strings["Pump.io servername"] = "Им� �ервера Pump.io";
-App::$strings["Without \"http://\" or \"https://\""] = "Без \"http://\" или \"https://\"";
-App::$strings["Pump.io username"] = "Им� пользовател� Pump.io";
-App::$strings["Without the servername"] = "без имени �ервера";
-App::$strings["You are not authenticated to pumpio"] = "Вы не аутентифицированы на Pump.io";
-App::$strings["(Re-)Authenticate your pump.io connection"] = "�утентифицировать (повторно) ваше �оединение � Pump.io";
-App::$strings["Post to pump.io by default"] = "Публиковать в Pump.io по умолчанию";
-App::$strings["Should posts be public"] = "Публикации должны быть общедо�тупными";
-App::$strings["Mirror all public posts"] = "Отображать в�е общедо�тупные публикации";
-App::$strings["Pump.io Crosspost Connector"] = "Публикаци� в Pump.io";
-App::$strings["generic profile image"] = "Стандартное изображение профил�";
-App::$strings["random geometric pattern"] = "Случайный геометриче�кий ри�унок";
-App::$strings["monster face"] = "Лицо чудовища";
-App::$strings["computer generated face"] = "Сгенерированное компьютером лицо";
-App::$strings["retro arcade style face"] = "Лицо в �тиле �тарой аркадной игры";
-App::$strings["Hub default profile photo"] = "Фотографи� профил� по умолчанию";
-App::$strings["Information"] = "Информаци�";
-App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Плагин Libravatar также у�тановлен. Пожалуй�та, отключите плагин Libravatar или �тот плагин Gravatar. Е�ли Плагин Libravatar ничего не найдёт, он вернёт�� в Gravatar.";
-App::$strings["Save Settings"] = "Сохранить на�тройки";
-App::$strings["Default avatar image"] = "Изображение аватара по умолчанию";
-App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Выберите изображени� аватар по умолчанию е�ли ничего не было найдено в Gravatar (�м. README).";
-App::$strings["Rating of images"] = "Оценки изображений";
-App::$strings["Select the appropriate avatar rating for your site. See README"] = "Выберите подход�щую оценку аватара дл� вашего �айта (�м. README).";
-App::$strings["Gravatar settings updated."] = "�а�тройки Gravatar обновлены.";
-App::$strings["text to include in all outgoing posts from this site"] = "тек�т, который будет добавлен во в�е и�ход�щие публикации � �того �айта";
-App::$strings["Send your identity to all websites"] = "Отправить ваши данные на в�е веб-�айты";
-App::$strings["Sendzid App"] = "Приложение \"Отправить ZID\"";
-App::$strings["Send ZID"] = "Отправить ZID";
-App::$strings["Price"] = "Цена";
-App::$strings["Error: order mismatch. Please try again."] = "Ошибка: не�оответ�твие заказа. Пожалуй�та, попробуйте ещё раз";
-App::$strings["Manual payments are not enabled."] = "Ручные платежи не подключены.";
-App::$strings["Order not found."] = "Заказ не найден.";
-App::$strings["Finished"] = "Завершено";
-App::$strings["Invalid channel"] = "�едей�твительный канал";
-App::$strings["Enable Subscription Management Module"] = "Включить модуль управлени� подпи�ками";
-App::$strings["Cannot include subscription items with different terms in the same order."] = "�ельз� включать �лементы подпи�ки � разными у�лови�ми в том же заказе.";
-App::$strings["Select Subscription to Edit"] = "Выбрать подпи�ку дл� редактировани�";
-App::$strings["Edit Subscriptions"] = "Редактировать подпи�ки";
-App::$strings["Subscription SKU"] = "Код подпи�ки";
-App::$strings["Catalog Description"] = "Опи�ание каталога";
-App::$strings["Subscription available for purchase."] = "Подпи�ка до�тупна дл� покупки.";
-App::$strings["Maximum active subscriptions to this item per account."] = "Мак�имальное количе�тво подпи�ок на аккаунт дл� �той позиции";
-App::$strings["Subscription price."] = "Цена подпи�ки.";
-App::$strings["Quantity"] = "Количе�тво";
-App::$strings["Term"] = "У�лови�";
-App::$strings["Enable Hubzilla Services Module"] = "Включить модуль �ерви�а Hubzilla";
-App::$strings["New Sku"] = "�овый код";
-App::$strings["Cannot save edits to locked item."] = "�евозможно �охранить изменени� заблокированной позиции.";
-App::$strings["SKU not found."] = "Код не найден.";
-App::$strings["Invalid Activation Directive."] = "�едей�твительна� директива активации.";
-App::$strings["Invalid Deactivation Directive."] = "�едей�твительна� директива деактивации";
-App::$strings["Add to this privacy group"] = "Добавить в �ту группу конфиденциально�ти";
-App::$strings["Set user service class"] = "У�тановить кла�� об�луживани� пользовател�";
-App::$strings["You must be using a local account to purchase this service."] = "Вы должны и�пользовать локальную учётноую запи�ь дл� покупки �того �ерви�а.";
-App::$strings["Changes Locked"] = "Изменени� заблокированы";
-App::$strings["Item available for purchase."] = "Позици� до�тупна дл� приобретени�.";
-App::$strings["Photo URL"] = "URL изображени�";
-App::$strings["Add buyer to privacy group"] = "Добавить покупател� в группу конфиденциально�ти";
-App::$strings["Add buyer as connection"] = "Добавить покупател� как контакт";
-App::$strings["Set Service Class"] = "У�тановить кла�� об�луживани�";
-App::$strings["Enable Order/Item Options"] = "Включить параметры заказа / позиции";
-App::$strings["Label"] = "Метка";
-App::$strings["Required"] = "Требует��";
-App::$strings["Instructions"] = "Ин�трукции";
-App::$strings["Enable Paypal Button Module"] = "Включить модуль кнопки Paypal";
-App::$strings["Use Production Key"] = "И�пользовать ключ Production";
-App::$strings["Paypal Sandbox Client Key"] = "Ключ клиента Paypal Sandbox";
-App::$strings["Paypal Sandbox Secret Key"] = "Секретный ключ Paypal Sandbox";
-App::$strings["Paypal Production Client Key"] = "Ключ клиента Paypal Production";
-App::$strings["Paypal Production Secret Key"] = "Секретный ключ Paypal Production";
-App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal дл� платежей не включена.";
-App::$strings["Paypal button payments are not properly configured.  Please choose another payment option."] = "Кнопка Paypal дл� платежей на�троена неправильно. Пожалуй�та, и�пользуйте другой вариант оплаты.";
-App::$strings["Enable Paypal Button Module (API-v2)"] = "Включить модуль кнопки Paypal (API-v2)";
-App::$strings["Enable Manual Cart Module"] = "Включить модуль ручного управлени� карточками";
-App::$strings["Access Denied."] = "До�туп запрещён.";
-App::$strings["Order Not Found"] = "Заказ не найден";
-App::$strings["Invalid Item"] = "�едей�твительный �лемент";
-App::$strings["Enable Test Catalog"] = "Включить те�товый каталог";
-App::$strings["Enable Manual Payments"] = "Включить ручные платежи";
-App::$strings["Base Merchant Currency"] = "О�новна� торгова� валюта";
-App::$strings["Cart Settings"] = "�а�тройки карточек";
-App::$strings["DB Cleanup Failure"] = "Сбой очи�тки базы данных";
-App::$strings["[cart] Item Added"] = "[cart] Элемент добавлен";
-App::$strings["Order already checked out."] = "Заказ уже проверен.";
-App::$strings["Drop database tables when uninstalling."] = "Сбро�ить таблицы базы данных при деин�талл�ции";
-App::$strings["Shop"] = "Магазин";
-App::$strings["Profile Unavailable."] = "Профиль недо�тупен.";
-App::$strings["Cart utilities for orders and payments"] = "Утилиты карточек дл� заказов и платежей";
-App::$strings["You must be logged into the Grid to shop."] = "Вы должны быть в �ети дл� до�тупа к магазину";
-App::$strings["Access denied."] = "До�туп запрещён.";
-App::$strings["No Order Found"] = "�ет найденных заказов";
-App::$strings["An unknown error has occurred Please start again."] = "Произошла неизве�тна� ошибка. Пожалуй�та, начните �нова.";
-App::$strings["Requirements not met."] = "Требовани� не �облюдены.";
-App::$strings["Review your order and complete any needed requirements."] = "Ÿро�мотрите �вой заказ и выполните в�е необходимые требовани�";
-App::$strings["Invalid Payment Type.  Please start again."] = "�едей�твительный тип платежа. Пожалуй�та, начните �нова.";
-App::$strings["Order not found"] = "Заказ не найден";
-App::$strings["nofed Settings saved."] = "�а�тройки nofed �охранены.";
-App::$strings["No Federation App"] = "Приложение No Federation";
-App::$strings["Prevent posting from being federated to anybody. It will exist only on your channel page."] = "Запрещает федеративные функций дл� публикаций. Они будут �уще�твовать только на �транице вашего канала.";
-App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию";
-App::$strings["No Federation"] = "Отключить Federation";
-App::$strings["Federate"] = "Федерировать";
-App::$strings["Smileybutton App"] = "Приложение \"Кнопка �о �майликам\"";
-App::$strings["Adds a smileybutton to the jot editor"] = "Добавл�ть кнопку �о �майликами в редактор Jot";
-App::$strings["Hide the button and show the smilies directly."] = "Скрыть кнопку и �разу показывать �майлики.";
-App::$strings["Smileybutton Settings"] = "�а�тройки кнопки �о �майликами";
-App::$strings["file"] = "файл";
-App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix";
-App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать в�е ваши файлы в Redmatrix в �тот канал.";
-App::$strings["Please install the statistics addon to be able to configure a diaspora relay"] = "Пожалуй�та, у�тановите ра�ширение �тати�тики, чтобы иметь возможно�ть на�траивать пере�ылку Diaspora";
-App::$strings["Diaspora Relay Handle"] = "Пере�ылка Diaspora";
-App::$strings["Address of a diaspora relay. Example: relay@diasporarelay.tld"] = "�дре� пере�ылки Diaspora. �апример: relay@diasporarelay.tld";
-App::$strings["Diaspora relay could not be imported"] = "�евозможно импортировать адре� пере�ылки Diaspora";
-App::$strings["\$projectname"] = "\$projectname";
-App::$strings["No username found in import file."] = "Им� пользовател� не найдено в файле дл� импорта.";
-App::$strings["Unable to create a unique channel address. Import failed."] = "�е удало�ь �оздать уникальный адре� канала. Импорт не завершен.";
-App::$strings["Import completed."] = "Импорт завершен.";
-App::$strings["Diaspora Protocol Settings updated."] = "�а�тройки протокола Diaspora обновлены.";
-App::$strings["The diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол Diaspora не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала.";
-App::$strings["Diaspora Protocol App"] = "Приложение \"Протокол Diaspora\"";
-App::$strings["Allow any Diaspora member to comment or like your public posts"] = "Разрешить любому уча�тнику Diaspora комментировать или отмечать понравившими�� ваши общедо�тупные �ообщени�";
-App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = "Е�ли �тот параметр отключен, только ваши контакты �могут комментировать или лайкать ваши общедо�тупные �ообщени�";
-App::$strings["Prevent your hashtags from being redirected to other sites"] = "Предотвратить перенаправление тегов на другие �айты";
-App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Подпи�ывать и отправл�ть публикации и комментарии � не�уще�твующей подпи�ью Diaspora";
-App::$strings["Followed hashtags (comma separated, do not include the #)"] = "От�леживаемые теги (через зап�тую, и�ключа� #)";
-App::$strings["Diaspora Protocol"] = "Протокол Diaspora";
-App::$strings["%1\$s dislikes %2\$s's %3\$s"] = "%1\$s не нравит�� %2\$s's %3\$s";
-App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s по�ещает %2\$s%3\$s";
-App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s не по�ещает %2\$s%3\$s";
-App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s может по�етить %2\$s%3\$s";
-App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Этот �айт от�леживает�� � помощью ин�трументов аналитики <a href='http://www.piwik.org'>Piwik</a>.";
-App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Е�ли вы не хотите, чтобы ваши визиты реги�трировали�ь таким образом, вы <a href='%s'>можете отключить cookie � тем, чтобы Piwik не от�леживал дальнейшие по�ещени� �айта</a>.";
-App::$strings["Piwik Base URL"] = "Базовый URL Piwik";
-App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "�б�олютный путь к вашей у�тановке Piwik (без типа протокола, � начальным �л�шем)";
-App::$strings["Site ID"] = "ID �айта";
-App::$strings["Show opt-out cookie link?"] = "Показывать ��ылку на отказ от и�пользовани� cookies?";
-App::$strings["Asynchronous tracking"] = "��инхронное от�леживание";
-App::$strings["Enable frontend JavaScript error tracking"] = "Включить от�леживание ошибок JavaScript на фронтенде.";
-App::$strings["This feature requires Piwik >= 2.2.0"] = "Эта функци� требует вер�ию Piwik >= 2.2.0";
-App::$strings["Workflow user."] = "Пользователь \"Рабочего проце��а\".";
-App::$strings["This channel"] = "Этот канал";
-App::$strings["Primary"] = "О�новной";
-App::$strings["Workflow"] = "Рабочий проце��";
-App::$strings["No Workflows Available"] = "�ет до�тупных рабочих проце��ов";
-App::$strings["Add item to which workflow"] = "Подключить рабочий проце�� к �лементу";
-App::$strings["Create Workflow Item"] = "Создать �лемент рабочего проце��а";
-App::$strings["Link"] = "С�ылка";
-App::$strings["Web link."] = "Веб-��ылка.";
-App::$strings["Title"] = "�аименование";
-App::$strings["Brief description or title"] = "Подробное опи�ание или заголовок";
-App::$strings["Notes"] = "Запи�ки";
-App::$strings["Notes and Info"] = "Замечани� и информаци�";
-App::$strings["Body"] = "Тек�т";
-App::$strings["Workflow Settings"] = "�а�тройки \"Рабочего проце��а\"";
-App::$strings["Project Servers and Resources"] = "Серверы и ре�ур�ы проекта";
-App::$strings["Project Creator and Tech Lead"] = "Создатель проекта и техниче�кий руководитель";
-App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "И �отни других людей и организаций которые помогали в �оздании Hubzilla.";
-App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Проекты Redmatrix / Hubzilla предо�тавл�ют��, в о�новном, добровольцами, которые предо�тавл�ют �вое врем� и опыт и, ча�то, оплачивают из �воего кармана у�луги, которыми они дел�т�� � другими.";
-App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - <strong>you do</strong>.)"] = "Зде�ь нет корпоративного финан�ировани� и рекламы, мы не �обираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - <strong>�то делаете вы</strong>.)";
-App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Помогите поддержать нашу новатор�кую работу в обла�т�х децентрализации, веб-идентификации и конфиденциально�ти.";
-App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "В ваших пожертвовани�х поддерживают �ерверы и �лужбы, а также помогают нам предо�тавл�ть новые возможно�ти и продолжать развитие.";
-App::$strings["Donate"] = "Пожертвовать";
-App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Выберите проект, разработчика или общедо�тупный узел дл� поддержки в форме единоразового пожертвовани�";
-App::$strings["Donate Now"] = "Пожертвовать �ейча�";
-App::$strings["<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"] = "<strong><em>или</em></strong> �таньте �пон�ором проекта (только дл� Hubzilla)";
-App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Пожалуй�та, е�ли желаете, укажите ваше им� дл� отображени� в �пи�ке �пон�оров.";
-App::$strings["Sponsor"] = "Спон�ор";
-App::$strings["Special thanks to: "] = "О�обые благодарно�ти:";
-App::$strings["Your Webbie:"] = "Ваш Webbie:";
-App::$strings["Fontsize (px):"] = "Размер шрифта (px):";
-App::$strings["Link:"] = "С�ылка:";
-App::$strings["Like us on Hubzilla"] = "�равит�� на Hubzilla";
-App::$strings["Embed:"] = "В�троить:";
-App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "И�кать %1\$s (%2\$s)";
-App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Search \$Projectname"] = "Пои�к \$Projectname";
-App::$strings["Fuzzloc Settings updated."] = "�а�тройки примерного положени� обновлены.";
-App::$strings["Fuzzy Location App"] = "Приложение \"Примерное положение\"";
-App::$strings["Blur your precise location if your channel uses browser location mapping"] = "Размывает вашего точное ме�тоположение в �лучае е�ли ваш канал и�пользует отображение ме�тоположени� из браузера";
-App::$strings["Minimum offset in meters"] = "Минимальное �мещение в метрах";
-App::$strings["Maximum offset in meters"] = "Мак�имальное �мещение в метрах";
-App::$strings["Fuzzy Location"] = "Примерное положение";
-App::$strings["Send email to all members"] = "Отправить email в�ем уча�тникам";
-App::$strings["%s Administrator"] = "админи�тратор %s";
-App::$strings["No recipients found."] = "Получателей не найдено.";
-App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d из %2\$d �ообщений отправлено.";
-App::$strings["Send email to all hub members."] = "Отправить email в�ем уча�тникам узла.";
-App::$strings["Message subject"] = "Тема �ообщени�";
-App::$strings["Sender Email address"] = "�дре� �лектронной почты отправител�";
-App::$strings["Test mode (only send to hub administrator)"] = "Те�товый режим (отправка только админи�тратору узла)";
-App::$strings["New registration"] = "�ова� реги�траци�";
-App::$strings["%s : Message delivery failed."] = "%s : До�тавка �ообщени� не удала�ь.";
-App::$strings["Message sent to %s. New account registration: %s"] = "Сообщение отправлено в %s. Реги�траци� нового аккаунта: %s";
-App::$strings["Not allowed."] = "Запрещено.";
-App::$strings["Permissions"] = "Разрешени�";
-App::$strings["Set/edit permissions"] = "Редактировать разрешени�";
-App::$strings["Item not found."] = "Элемент не найден.";
-App::$strings["Post to Libertree"] = "Опубликовать в Libertree";
-App::$strings["Libertree Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Libertree �охранены.";
-App::$strings["Libertree Crosspost Connector App"] = "Приложение \"Пере�ылка публикаций Libertree\"";
-App::$strings["Relay public posts to Libertree"] = "Пере�ылает общедо�тупные публикации в Libertree";
-App::$strings["Libertree API token"] = "Токен Libertree API";
-App::$strings["Libertree site URL"] = "URL �айта Libertree";
-App::$strings["Post to Libertree by default"] = "Публиковать в Libertree по умолчанию";
-App::$strings["Libertree Crosspost Connector"] = "Пере�ылка публикаций Libertree";
-App::$strings["You're welcome."] = "Пожалуй�та.";
-App::$strings["Ah shucks..."] = "О, чёрт...";
-App::$strings["Don't mention it."] = "�е �тоит благодарно�ти.";
-App::$strings["&lt;blush&gt;"] = "&lt;кра�нею&gt;";
-App::$strings["Report Bug"] = "Сообщить об ошибке";
-App::$strings["TOTP Two-Step Verification"] = "Двух�тапна� верификаци� TOTP";
-App::$strings["Enter the 2-step verification generated by your authenticator app:"] = "Введите код проверки, �озданный вашим приложением дл� аутентификации";
-App::$strings["Success!"] = "У�пех!";
-App::$strings["Invalid code, please try again."] = "�еверный код. Пожалуй�та, попробуйте ещё раз.";
-App::$strings["Too many invalid codes..."] = "Слишком много неверных кодов...";
-App::$strings["Verify"] = "Проверить";
-App::$strings["You haven't set a TOTP secret yet.\nPlease click the button below to generate one and register this site\nwith your preferred authenticator app."] = "Вы еще не у�тановили �екретный код TOTP. Пожалуй�та, нажмите на кнопку ниже, чтобы �генерировать его и зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации.";
-App::$strings["Your TOTP secret is"] = "Ваш �екретный код TOTP";
-App::$strings["Be sure to save it somewhere in case you lose or replace your mobile device.\nUse your mobile device to scan the QR code below to register this site\nwith your preferred authenticator app."] = "Об�зательно �охраните его где-нибудь на �лучай потери или замены мобильного у�трой�тва. С помощью мобильного у�трой�тва от�канируйте приведенный ниже QR-код, чтобы зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации.";
-App::$strings["Test"] = "Те�т";
-App::$strings["Generate New Secret"] = "Сгенерировать новый код";
-App::$strings["Go"] = "Вперёд";
-App::$strings["Enter your password"] = "Введите ваш пароль";
-App::$strings["enter TOTP code from your device"] = "введите код TOTP из вашего у�трой�тва";
-App::$strings["Pass!"] = "Прин�то!";
-App::$strings["Fail"] = "Отказано";
-App::$strings["Incorrect password, try again."] = "�еверный пароль, попробуйте �нова.";
-App::$strings["Record your new TOTP secret and rescan the QR code above."] = "Запишите ваш �екретный код TOTP и повторно от�канируйте приведенный ниже QR-код.";
-App::$strings["TOTP Settings"] = "�а�тройки TOTP";
-App::$strings["Logfile archive directory"] = "Каталог архивировани� журнала";
-App::$strings["Directory to store rotated logs"] = "Каталог дл� хранени� заархивированных журналов";
-App::$strings["Logfile size in bytes before rotating"] = "Размер файла журнала в байтах дл� архивировани�";
-App::$strings["Number of logfiles to retain"] = "Количе�тво �охран�емых файлов журналов";
-App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s пере�танет работать через не�колько дней.";
-App::$strings["Your $Productname test account is about to expire."] = "Ваша те�това� учётна� запи�ь в $Productname близка к окончанию �рока дей�тви�.";
-App::$strings["Hide Aside App"] = "Скрывать приложени�";
-App::$strings["Fade out aside areas after a while when using endless scroll"] = "Через некоторое врем� при и�пользовании прокрутки обла�ть приложений и�чезает";
-App::$strings["Skeleton App"] = "Приложение \"Скелет\"";
-App::$strings["A skeleton for addons, you can copy/paste"] = "Скелет дл� приложений. Вы можете и�пользовать copy/paste";
-App::$strings["Some setting"] = "�екоторые на�тройки";
-App::$strings["A setting"] = "�а�тройка";
-App::$strings["Skeleton Settings"] = "�а�тройки �келета";
-App::$strings["Network error"] = "Сетева� ошибка";
-App::$strings["API error"] = "Ошибка API";
-App::$strings["Unknown issue"] = "�еизве�тна� проблема";
-App::$strings["Unable to login using email address "] = "�евозможно войти, и�пользу� адре� �лектронной почты ";
-App::$strings["Sign in to Hubzilla using a social account"] = "Войдите в Hubzilla, и�пользу� учетную запи�ь в �оциальных �ет�х";
-App::$strings["Social Authentication using your social media account"] = "Social Authentication � и�пользованием вашей учетной запи�и в �оциальных �ет�х";
-App::$strings["This app enables one or more social provider sign-in buttons on the login page."] = "Это приложение добавл�ет на �транице входа в �и�тему одну или не�колько кнопок дл� аутентификации при помощи учётных запи�ей в �оциальных �ет�х";
-App::$strings["Add an identity provider"] = "Добавить провайдера идентификации";
-App::$strings["Enable "] = "Включить ";
-App::$strings["Key"] = "Ключ";
-App::$strings["Word"] = "Слово";
-App::$strings["Secret"] = "Секрет";
-App::$strings["Add a custom provider"] = "Добавить �об�твенного провайдера";
-App::$strings["Remove an identity provider"] = "Удалить провайдера идентификации";
-App::$strings["Social authentication"] = "�утентификаци� в �оциальных �ет�х";
-App::$strings["Error while saving provider settings"] = "Ошибка при �охранении на�троек провайдера идентификации";
-App::$strings["Custom provider already exists"] = "Соб�твенный провайдер уже �уще�твует";
-App::$strings["Social authentication settings saved."] = "�а�тройки Social authentication �охранены.";
-App::$strings["Possible adult content"] = "Возможно �одержимое дл� взро�лых";
-App::$strings["%s - view"] = "%s -  про�мотр";
-App::$strings["NSFW Settings saved."] = "�а�тройки NSFW �охранены.";
-App::$strings["NSFW App"] = "Приложение NSFW";
-App::$strings["Collapse content that contains predefined words"] = "Свернуть �одержимое, �одержащее предопределенные �лова";
-App::$strings["This app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Это приложение про�матривает публикации дл� �лов / тек�та, которые вы указываете ниже, и �ворачивает любой контент, �одержащий �ти ключевые �лова, по�тому он не отображает�� в неподход�щее врем�, например, �ек�уальные ин�инуации, которые могут быть неправильными в на�тройке работы. �апример, мы рекомендуем отмечать любой контент, �одержащий наготу, тегом #NSFW. Этот фильтр также �по�обен реагировать на любое другое указанное вами �лово / тек�т и может и�пользовать�� в каче�тве фильтра �одержимого общего назначени�.";
-App::$strings["Comma separated list of keywords to hide"] = "Спи�ок ключевых �лов дл� �крыти�, через зап�тую";
-App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "�лово, /регул�рное_выражение/, lang=xx, lang!=xx";
-App::$strings["NSFW"] = "";
-App::$strings["Show Upload Limits"] = "Показать ограничени� на загрузку";
-App::$strings["Hubzilla configured maximum size: "] = "Мак�имальный размер на�троенный в Hubzilla:";
-App::$strings["PHP upload_max_filesize: "] = "";
-App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (должен быть больше чем upload_max_filesize): ";
-App::$strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe в трёх измерени�х";
-App::$strings["3D Tic-Tac-Toe"] = "";
-App::$strings["New game"] = "�ова� игра";
-App::$strings["New game with handicap"] = "�ова� игра � форой";
-App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Трехмерный Tic-Tac-Toe похож на традиционную игру, за и�ключением того, что игра идёт на не�кольких уровн�х одновременно.";
-App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Имеет�� три уровн�. Вы выигрываете, получа� три подр�д на любом уровне, а также вверх, вниз и по диагонали на разных уровн�х.";
-App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Игра � форой отключает центральную позицию на �реднем уровне, потому что игрок, претендующий на �тот квадрат, ча�то имеет не�праведливое преимуще�тво.";
-App::$strings["You go first..."] = "Вы начинаете...";
-App::$strings["I'm going first this time..."] = "�а �тот раз начинаю �...";
-App::$strings["You won!"] = "Вы выиграли!";
-App::$strings["\"Cat\" game!"] = "�ичь�!";
-App::$strings["I won!"] = "Я выиграл!";
-App::$strings["Follow"] = "От�леживать";
-App::$strings["%1\$s is now following %2\$s"] = "%1\$s �ейча� от�леживает %2\$s";
-App::$strings["The GNU-Social protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол GNU-Social не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала.";
-App::$strings["GNU-Social Protocol App"] = "Приложение \"Протокол GNU-Social\"";
-App::$strings["GNU-Social Protocol"] = "Протокол GNU-Social";
-App::$strings["Send test email"] = "Отправить те�товый email";
-App::$strings["Mail sent."] = "Сообщение отправлено";
-App::$strings["Sending of mail failed."] = "�е удало�ь отправить �ообщение.";
-App::$strings["Mail Test"] = "Те�товое �ообщение";
-App::$strings["Livejournal Crosspost Connector App"] = "Приложение \"Публикаци� в Livejournal\"";
-App::$strings["Relay public posts to Livejournal"] = "Пере�ылает общедо�тупные публикации в Livejournal";
-App::$strings["Livejournal username"] = "Им� пользовател� Livejournal";
-App::$strings["Livejournal password"] = "Пароль Livejournal";
-App::$strings["Post to Livejournal by default"] = "Публиковать в Livejournal по умолчанию";
-App::$strings["Send wall-to-wall posts to Livejournal"] = "Отправл�ть публикации на �тене в Livejournal";
-App::$strings["Livejournal Crosspost Connector"] = "Публикаци� в Livejournal";
-App::$strings["Post to Livejournal"] = "Опубликовать в Livejournal";
-App::$strings["Posted by"] = "Опубликовано";
-App::$strings["Markdown"] = "Разметка Markdown";
-App::$strings["Use markdown for editing posts"] = "И�пользовать �зык разметки Markdown дл� редактировани� публикаций";
-App::$strings["Hubzilla File Storage Import"] = "Импорт файлового хранилища Hubzilla";
-App::$strings["This will import all your cloud files from another server."] = "Это позволит импортировать в�е ваши файлы � другого �ервера.";
-App::$strings["Hubzilla Server base URL"] = "Базовый URL �ервера Hubzilla";
-App::$strings["Allow magic authentication only to websites of your immediate connections"] = "Разрешить волшебную аутентификацию только на �айтах ваших непо�ред�твенных �оединений";
-App::$strings["Authchoose App"] = "Приложение Authchoose";
-App::$strings["Authchoose"] = "";
-App::$strings["pageheader Settings saved."] = "�а�тройки шапки �траницы �охранены.";
-App::$strings["Page Header App"] = "Приложение \"Заголовок �траницы\"";
-App::$strings["Inserts a page header"] = "В�тавл�ет заголовок �траницы";
-App::$strings["Message to display on every page on this server"] = "Отображаемое �ообщение на каждой �транице на �том �ервере.";
-App::$strings["Page Header"] = "Заголовок �траницы";
-App::$strings["Popular Channels"] = "Попул�рные каналы";
-App::$strings["Channels to auto connect"] = "Каналы дл� автоматиче�кого подключени�";
-App::$strings["Comma separated list"] = "Спи�ок, разделённый зап�тыми";
-App::$strings["IRC Settings"] = "�а�тройки IRC";
-App::$strings["IRC settings saved."] = "�а�тройки IRC �охранены";
-App::$strings["IRC Chatroom"] = "Чат IRC";
-App::$strings["Jabber BOSH host"] = "Узел Jabber BOSH";
-App::$strings["Use central userbase"] = "И�пользовать центральную базу данных";
-App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Е�ли включено, уча�тники автоматиче�ки войдут на �ервер ejabberd, который должен быть у�тановлен на �том компьютере � �инхронизированными учетными данными через �крипт \"auth_ejabberd.php\".";
-App::$strings["XMPP settings updated."] = "�а�тройки XMPP обновлены.";
-App::$strings["XMPP App"] = "Приложение XMPP";
-App::$strings["Embedded XMPP (Jabber) client"] = "В�тренный клиент XMPP (Jabber)";
-App::$strings["Individual credentials"] = "Индивидуальные разрешени�";
-App::$strings["Jabber BOSH server"] = "Сервер Jabber BOSH";
-App::$strings["XMPP Settings"] = "�а�тройки XMPP";
-App::$strings["Invalid data packet"] = "�еверный пакет данных";
-App::$strings["Unable to verify channel signature"] = "�евозможно проверить подпи�ь канала";
-App::$strings["Unable to verify site signature for %s"] = "�евозможно проверить подпи�ь �айта %s";
-App::$strings["invalid target signature"] = "недопу�тима� целева� подпи�ь";
-App::$strings["prev"] = "предыдущий";
-App::$strings["first"] = "первый";
-App::$strings["last"] = "по�ледний";
-App::$strings["next"] = "�ледующий";
-App::$strings["older"] = "�тарше";
-App::$strings["newer"] = "новее";
-App::$strings["No connections"] = "�ет контактов";
-App::$strings["Connections"] = "Контакты";
-App::$strings["Accepts"] = "Принимает";
-App::$strings["Comments"] = "комментарии";
-App::$strings["Stream items"] = "публикации в потоке";
-App::$strings["Wall posts"] = "публикации на �тене";
-App::$strings["Nothing"] = "ничего";
-App::$strings["View all %s connections"] = "Про�мотреть в�е %s контактов";
-App::$strings["Network: %s"] = "Сеть: %s";
-App::$strings["Search"] = "Пои�к";
-App::$strings["poke"] = "Ткнуть";
-App::$strings["poked"] = "ткнут";
-App::$strings["ping"] = "Пингануть";
-App::$strings["pinged"] = "Отпингован";
-App::$strings["prod"] = "Подтолкнуть";
-App::$strings["prodded"] = "Подтолкнут";
-App::$strings["slap"] = "Шлёпнуть";
-App::$strings["slapped"] = "Шлёпнут";
-App::$strings["finger"] = "Указать";
-App::$strings["fingered"] = "Указан";
-App::$strings["rebuff"] = "Дать отпор";
-App::$strings["rebuffed"] = "Дан отпор";
-App::$strings["happy"] = "�ча�тливый";
-App::$strings["sad"] = "гру�тный";
-App::$strings["mellow"] = "�покойный";
-App::$strings["tired"] = "у�талый";
-App::$strings["perky"] = "ве�ёлый";
-App::$strings["angry"] = "�ердитый";
-App::$strings["stupefied"] = "отупевший";
-App::$strings["puzzled"] = "недоумевающий";
-App::$strings["interested"] = "заинтере�ованный";
-App::$strings["bitter"] = "едкий";
-App::$strings["cheerful"] = "бодрый";
-App::$strings["alive"] = "�нергичный";
-App::$strings["annoyed"] = "раздражённый";
-App::$strings["anxious"] = "обе�покоенный";
-App::$strings["cranky"] = "капризный";
-App::$strings["disturbed"] = "в�тревоженный";
-App::$strings["frustrated"] = "разочарованный";
-App::$strings["depressed"] = "подавленный";
-App::$strings["motivated"] = "мотивированный";
-App::$strings["relaxed"] = "ра��лабленный";
-App::$strings["surprised"] = "удивленный";
-App::$strings["Monday"] = "Понедельник";
-App::$strings["Tuesday"] = "Вторник";
-App::$strings["Wednesday"] = "Среда";
-App::$strings["Thursday"] = "Четверг";
-App::$strings["Friday"] = "П�тница";
-App::$strings["Saturday"] = "Суббота";
-App::$strings["Sunday"] = "Во�кре�енье";
-App::$strings["January"] = "Январь";
-App::$strings["February"] = "Февраль";
-App::$strings["March"] = "Март";
-App::$strings["April"] = "�прель";
-App::$strings["May"] = "Май";
-App::$strings["June"] = "Июнь";
-App::$strings["July"] = "Июль";
-App::$strings["August"] = "�вгу�т";
-App::$strings["September"] = "Сент�брь";
-App::$strings["October"] = "Окт�брь";
-App::$strings["November"] = "�о�брь";
-App::$strings["December"] = "Декабрь";
-App::$strings["Unknown Attachment"] = "�еизве�тное вложение";
-App::$strings["Size"] = "Размер";
-App::$strings["unknown"] = "неизве�тный";
-App::$strings["remove category"] = "удалить категорию";
-App::$strings["remove from file"] = "удалить из файла";
-App::$strings["Download binary/encrypted content"] = "Загрузить двоичное / зашифрованное �одержимое";
-App::$strings["Poll has ended."] = "Опро� окончен.";
-App::$strings["Poll ends: %s"] = "Опро� заканчивает�� %s";
-App::$strings["Vote"] = "Голо�овать";
-App::$strings["Link to Source"] = "С�ылка на и�точник";
-App::$strings["default"] = "по умолчанию";
-App::$strings["Page layout"] = "Шаблон �траницы";
-App::$strings["You can create your own with the layouts tool"] = "Вы можете �оздать �вой �об�твенный � помощью ин�трумента шаблонов";
-App::$strings["BBcode"] = "";
-App::$strings["HTML"] = "";
-App::$strings["Text"] = "Тек�т";
-App::$strings["Comanche Layout"] = "Шаблон Comanche";
-App::$strings["PHP"] = "";
-App::$strings["Page content type"] = "Тип �одержимого �траницы";
-App::$strings["event"] = "�обытие";
-App::$strings["post"] = "публикаци�";
-App::$strings["comment"] = "комментарий";
-App::$strings["activity"] = "активно�ть";
-App::$strings["poll"] = "голо�ование";
-App::$strings["a-z, 0-9, -, and _ only"] = "Только a-z, 0-9, -, и _";
-App::$strings["Design Tools"] = "Ин�трументы дизайна";
-App::$strings["Blocks"] = "Блокировки";
-App::$strings["Menus"] = "Меню";
-App::$strings["Layouts"] = "Шаблоны";
-App::$strings["Pages"] = "Страницы";
-App::$strings["Import"] = "Импортировать";
-App::$strings["Import website..."] = "Импорт веб-�айта...";
-App::$strings["Select folder to import"] = "Выбрать каталог дл� импорта";
-App::$strings["Import from a zipped folder:"] = "Импортировать из каталога в zip-архиве:";
-App::$strings["Import from cloud files:"] = "Импортировать из �етевых файлов:";
-App::$strings["/cloud/channel/path/to/folder"] = "";
-App::$strings["Enter path to website files"] = "Введите путь к файлам веб-�айта";
-App::$strings["Select folder"] = "Выбрать каталог";
-App::$strings["Export website..."] = "Эк�порт веб-�айта...";
-App::$strings["Export to a zip file"] = "Эк�портировать в ZIP файл.";
-App::$strings["website.zip"] = "";
-App::$strings["Enter a name for the zip file."] = "Введите им� дл� ZIP файла.";
-App::$strings["Export to cloud files"] = "Э�кпортировать в �етевые файлы:";
-App::$strings["/path/to/export/folder"] = "";
-App::$strings["Enter a path to a cloud files destination."] = "Введите путь к ра�положению �етевых файлов.";
-App::$strings["Specify folder"] = "Указать каталог";
-App::$strings["This is the home page of %s."] = "Это домашн�� �траница %s.";
-App::$strings["l F d, Y \\@ g:i A"] = "";
-App::$strings["Starts:"] = "�ачало:";
-App::$strings["Finishes:"] = "Окончание:";
-App::$strings["Location:"] = "Ме�тоположение:";
-App::$strings["l F d, Y"] = "";
-App::$strings["Start:"] = "�ачало:";
-App::$strings["End:"] = "Окончание:";
-App::$strings["This event has been added to your calendar."] = "Это �обытие было добавлено в ваш календарь.";
-App::$strings["Not specified"] = "�е указано";
-App::$strings["Needs Action"] = "Требует дей�тви�";
-App::$strings["Completed"] = "Завершено";
-App::$strings["In Process"] = "В проце��е";
-App::$strings["Cancelled"] = "Отменено";
-App::$strings["Mobile"] = "Мобильный";
-App::$strings["Home"] = "Домашний";
-App::$strings["Home, Voice"] = "Дом, голо�";
-App::$strings["Home, Fax"] = "Дом, фак�";
-App::$strings["Work"] = "Рабочий";
-App::$strings["Work, Voice"] = "Работа, голо�";
-App::$strings["Work, Fax"] = "Работа, фак�";
-App::$strings["Other"] = "Другой";
-App::$strings["Off"] = "Выкл.";
-App::$strings["On"] = "Вкл.";
-App::$strings["Calendar"] = "Календарь";
-App::$strings["Start calendar week on Monday"] = "�ачинать календарную неделю � понедельника";
-App::$strings["Default is Sunday"] = "По умолчанию - во�кре�енье";
-App::$strings["Event Timezone Selection"] = "Выбор ча�ового по��а �обыти�";
-App::$strings["Allow event creation in timezones other than your own."] = "Разрешить �оздание �обыти� в ча�овой зоне отличной от вашей";
-App::$strings["Channel Home"] = "Главна� канала";
-App::$strings["Search by Date"] = "Пои�к по дате";
-App::$strings["Ability to select posts by date ranges"] = "Возможно�ть выбора �ообщений по диапазонам дат";
-App::$strings["Tag Cloud"] = "Облако тегов";
-App::$strings["Provide a personal tag cloud on your channel page"] = "Показывает личное облако тегов на �транице канала";
-App::$strings["Use blog/list mode"] = "И�пользовать режим блога / �пи�ка";
-App::$strings["Comments will be displayed separately"] = "Комментарии будут отображать�� отдельно";
-App::$strings["Connection Filtering"] = "Фильтраци� контактов";
-App::$strings["Filter incoming posts from connections based on keywords/content"] = "Фильтр вход�щих �ообщений от контактов на о�нове ключевых �лов / контента";
-App::$strings["Conversation"] = "Диалоги";
-App::$strings["Emoji Reactions"] = "Реакции Emoji";
-App::$strings["Add emoji reaction ability to posts"] = "Возможно�ть добавл�ть реакции Emoji к публикаци�м";
-App::$strings["Dislike Posts"] = "�е нрав�щие�� публикации";
-App::$strings["Ability to dislike posts/comments"] = "Возможно�ть отмечать не нрав�щие�� публикации / комментарии";
-App::$strings["Star Posts"] = "Помечать �ообщени�";
-App::$strings["Ability to mark special posts with a star indicator"] = "Возможно�ть отметить �пециальные �ообщени� индикатором-звёздочкой";
-App::$strings["Reply on comment"] = "Ответить на комментарий";
-App::$strings["Ability to reply on selected comment"] = "Возможно�ть ответить на выбранный комментарий";
-App::$strings["Directory"] = "Каталог";
-App::$strings["Advanced Directory Search"] = "Ра�ширенный пои�к в каталоге";
-App::$strings["Allows creation of complex directory search queries"] = "Позвол�ет �оздание �ложных пои�ковых запро�ов в каталоге";
-App::$strings["Editor"] = "Редактор";
-App::$strings["Post Categories"] = "Категории публикаций";
-App::$strings["Add categories to your posts"] = "Добавить категории дл� ваших публикаций";
-App::$strings["Large Photos"] = "Большие фотографии";
-App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Включить большие (1024px) миниатюры изображений в публикаци�х. Е�ли не включено, и�пользовать маленькие (640px) миниатюры.";
-App::$strings["Even More Encryption"] = "Еще больше шифровани�";
-App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Разрешить дополнительное end-to-end шифрование �одержимого � общим �екретным ключом";
-App::$strings["Disable Comments"] = "Отключить комментарии";
-App::$strings["Provide the option to disable comments for a post"] = "Предо�тавить возможно�ть отключать комментарии дл� публикаций";
-App::$strings["Delayed Posting"] = "Задержанна� публикаци�";
-App::$strings["Allow posts to be published at a later date"] = "Разрешить размешать публикации �ледующими датами";
-App::$strings["Content Expiration"] = "И�течение �рока дей�тви� �одержимого";
-App::$strings["Remove posts/comments and/or private messages at a future time"] = "Удал�ть публикации / комментарии и / или личные �ообщени�";
-App::$strings["Suppress Duplicate Posts/Comments"] = "Подавл�ть дублирующие публикации / комментарии";
-App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Предотвращает по�вление публикаций � одинаковым �одержимым е�ли интервал между ними менее 2 минут";
-App::$strings["Auto-save drafts of posts and comments"] = "�втоматиче�ки �охран�ть черновики публикаций и комментариев";
-App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "�втоматиче�ки �охран�ет черновики публикаций и комментариев в локальном хранилище браузера дл� предотвращени� их �лучайной утраты";
-App::$strings["Manage"] = "Управление";
-App::$strings["Navigation Channel Select"] = "Выбор канала навигации";
-App::$strings["Change channels directly from within the navigation dropdown menu"] = "Изменить канал напр�мую из выпадающего меню";
-App::$strings["Network"] = "Сеть";
-App::$strings["Events Filter"] = "Фильтр �обытий";
-App::$strings["Ability to display only events"] = "Возможно�ть отображать только �обыти�";
-App::$strings["Polls Filter"] = "Фильтр голо�ований";
-App::$strings["Ability to display only polls"] = "Возможно�ть отображать только опро�ы";
-App::$strings["Saved Searches"] = "Сохранённые пои�ки";
-App::$strings["Save search terms for re-use"] = "Сохран�ть результаты пои�ка дл� повторного и�пользовани�";
-App::$strings["Saved Folders"] = "Сохранённые каталоги";
-App::$strings["Ability to file posts under folders"] = "Возможно�ть размещать публикации в каталогах";
-App::$strings["Alternate Stream Order"] = "Отображение потока";
-App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Возможно�ть показывать поток по дате по�леднего �ообщени�, по�леднего комментари� или в пор�дке по�туплени�";
-App::$strings["Contact Filter"] = "Фильтр контактов";
-App::$strings["Ability to display only posts of a selected contact"] = "Возможно�ть показа публикаций только от выбранных контактов";
-App::$strings["Forum Filter"] = "Фильтр по форумам";
-App::$strings["Ability to display only posts of a specific forum"] = "Возможно�ть показа публикаций только определённого форума";
-App::$strings["Personal Posts Filter"] = "Пер�ональный фильтр публикаций";
-App::$strings["Ability to display only posts that you've interacted on"] = "Возможно�ть показа только тех публикаций � которыми вы взаимодей�твовали";
-App::$strings["Photos"] = "Фотографии";
-App::$strings["Photo Location"] = "Ме�тоположение фотографии";
-App::$strings["If location data is available on uploaded photos, link this to a map."] = "Е�ли данные о ме�тоположении до�тупны на загруженных фотографий, �в�зать их � картой.";
-App::$strings["Profiles"] = "Редактировать профиль";
-App::$strings["Advanced Profiles"] = "Ра�ширенные профили";
-App::$strings["Additional profile sections and selections"] = "Дополнительные �екции и выборы профил�";
-App::$strings["Profile Import/Export"] = "Импорт / �к�порт профил�";
-App::$strings["Save and load profile details across sites/channels"] = "Сохранение и загрузка на�троек профил� на в�ех �айтах / каналах";
-App::$strings["Multiple Profiles"] = "�е�колько профилей";
-App::$strings["Ability to create multiple profiles"] = "Возможно�ть �оздани� не�кольких профилей";
-App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "�еверный токен безопа�но�ти дл� формы. Веро�тно, �то произошло потому, что форма была открыта �лишком долго (> 3-х ча�ов) перед её отправкой.";
-App::$strings["Delete this item?"] = "Удалить �тот �лемент?";
-App::$strings["Comment"] = "Комментарий";
-App::$strings["%s show all"] = "%s показать в�ё";
-App::$strings["%s show less"] = "%s показать меньше";
-App::$strings["%s expand"] = "%s развернуть";
-App::$strings["%s collapse"] = "%s �вернуть";
-App::$strings["Password too short"] = "Пароль �лишком короткий";
-App::$strings["Passwords do not match"] = "Пароли не �овпадают";
-App::$strings["everybody"] = "в�е";
-App::$strings["Secret Passphrase"] = "Тайный пароль";
-App::$strings["Passphrase hint"] = "Под�казка дл� парол�";
-App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Уведомление: Права до�тупа изменили�ь, но до �их пор не �охранены.";
-App::$strings["close all"] = "закрыть в�е";
-App::$strings["Nothing new here"] = "Зде�ь нет ничего нового";
-App::$strings["Rate This Channel (this is public)"] = "Оценкa �тoго канала (общедо�тупно)";
-App::$strings["Rating"] = "Оценка";
-App::$strings["Describe (optional)"] = "Охарактеризовать (необ�зательно)";
-App::$strings["Please enter a link URL"] = "Пожалуй�та, введите URL ��ылки";
-App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Е�ть не�охраненные изменени�. Вы уверены, что хотите покинуть �ту �траницу?";
-App::$strings["Location"] = "Ме�то";
-App::$strings["lovely"] = "прекра�но";
-App::$strings["wonderful"] = "замечательно";
-App::$strings["fantastic"] = "фанта�тично";
-App::$strings["great"] = "отлично";
-App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "Выбранный вами п�евдоним уже и�пользует�� или недей�твителен. Попробуйте и�пользовать наше предложение (";
-App::$strings[") or enter a new one."] = ") или введите новый.";
-App::$strings["Thank you, this nickname is valid."] = "Спа�ибо, �тот п�евдоним может быть и�пользован.";
-App::$strings["A channel name is required."] = "Требует�� название канала.";
-App::$strings["This is a "] = "Это ";
-App::$strings[" channel name"] = " название канала";
-App::$strings["Back to reply"] = "Вернуть�� к ответу";
-App::$strings["Pinned"] = "Прикреплено";
-App::$strings["Pin to the top"] = "Прикрепить �верху";
-App::$strings["Unpin from the top"] = "Открепить";
-App::$strings["%d minutes"] = array(
-	0 => "%d минуту",
-	1 => "%d минуты",
-	2 => "%d минут",
-);
-App::$strings["about %d hours"] = array(
-	0 => "около %d ча�a",
-	1 => "около %d ча�ов",
-	2 => "около %d ча�ов",
-);
-App::$strings["%d days"] = array(
-	0 => "%d день",
-	1 => "%d дн�",
-	2 => "%d дней",
-);
-App::$strings["%d months"] = array(
-	0 => "%d ме��ц",
-	1 => "%d ме��ца",
-	2 => "%d ме��цев",
-);
-App::$strings["%d years"] = array(
-	0 => "%d год",
-	1 => "%d года",
-	2 => "%d лет",
-);
-App::$strings["timeago.prefixAgo"] = "";
-App::$strings["timeago.prefixFromNow"] = "через";
-App::$strings["timeago.suffixAgo"] = "назад";
-App::$strings["timeago.suffixFromNow"] = "NONE";
-App::$strings["less than a minute"] = "менее чем одну минуту";
-App::$strings["about a minute"] = "около минуты";
-App::$strings["about an hour"] = "около ча�а";
-App::$strings["a day"] = "день";
-App::$strings["about a month"] = "около ме��ца";
-App::$strings["about a year"] = "около года";
-App::$strings[" "] = " ";
-App::$strings["timeago.numbers"] = "";
-App::$strings["__ctx:long__ May"] = "Май";
-App::$strings["Jan"] = "Янв";
-App::$strings["Feb"] = "Фев";
-App::$strings["Mar"] = "Мар";
-App::$strings["Apr"] = "�пр";
-App::$strings["__ctx:short__ May"] = "Май";
-App::$strings["Jun"] = "Июн";
-App::$strings["Jul"] = "Июл";
-App::$strings["Aug"] = "�вг";
-App::$strings["Sep"] = "Сен";
-App::$strings["Oct"] = "Окт";
-App::$strings["Nov"] = "�о�";
-App::$strings["Dec"] = "Дек";
-App::$strings["Sun"] = "В�к";
-App::$strings["Mon"] = "Пон";
-App::$strings["Tue"] = "Ð’Ñ‚";
-App::$strings["Wed"] = "Ср";
-App::$strings["Thu"] = "Чет";
-App::$strings["Fri"] = "П�т";
-App::$strings["Sat"] = "Суб";
-App::$strings["__ctx:calendar__ today"] = "�егодн�";
-App::$strings["__ctx:calendar__ month"] = "ме��ц";
-App::$strings["__ctx:calendar__ week"] = "недел�";
-App::$strings["__ctx:calendar__ day"] = "день";
-App::$strings["__ctx:calendar__ All day"] = "Ве�ь день";
-App::$strings["Please stand by while your download is being prepared."] = "Пожалуй�та, подождите, пока готовит�� загрузка.";
-App::$strings["Email address not valid"] = "�дре� �лектронной почты недей�твителен";
-App::$strings["Help:"] = "Помощь:";
-App::$strings["Help"] = "Помощь";
-App::$strings["Not Found"] = "�е найдено";
-App::$strings["Page not found."] = "Страница не найдена.";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Файл превышает предельный размер дл� �айта в %lu байт";
-App::$strings["Image file is empty."] = "Файл изображени� пу�т.";
-App::$strings["Unable to process image"] = "�е удает�� обработать изображение";
-App::$strings["Photo storage failed."] = "Ошибка хранилища фотографий.";
-App::$strings["a new photo"] = "нова� фотографи�";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s опубликовал %2\$s в %3\$s";
-App::$strings["Photo Albums"] = "Фотоальбомы";
-App::$strings["Recent Photos"] = "По�ледние фотографии";
-App::$strings["Upload New Photos"] = "Загрузить новые фотографии";
-App::$strings["Friendica"] = "";
-App::$strings["OStatus"] = "";
-App::$strings["GNU-Social"] = "";
-App::$strings["RSS/Atom"] = "";
-App::$strings["Diaspora"] = "";
-App::$strings["Facebook"] = "";
-App::$strings["Zot"] = "";
-App::$strings["LinkedIn"] = "";
-App::$strings["XMPP/IM"] = "";
-App::$strings["MySpace"] = "";
-App::$strings[" and "] = " и ";
-App::$strings["public profile"] = "общедо�тупный профиль";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s изменил %2\$s на &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "По�етить %1\$s %2\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s обновлено %2\$s, изменено %3\$s.";
-App::$strings["%d invitation available"] = array(
-	0 => "до�тупно %d приглашение",
-	1 => "до�тупны %d приглашени�",
-	2 => "до�тупны %d приглашений",
-);
-App::$strings["Advanced"] = "Дополнительно";
-App::$strings["Find Channels"] = "Пои�к каналов";
-App::$strings["Enter name or interest"] = "Впишите им� или интере�";
-App::$strings["Connect/Follow"] = "Подключить / от�леживать";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Примеры: Владимир Ильич, Революционер";
-App::$strings["Find"] = "Пои�к";
-App::$strings["Channel Suggestions"] = "Рекомендации каналов";
-App::$strings["Random Profile"] = "Случайный профиль";
-App::$strings["Invite Friends"] = "Пригла�ить друзей";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Ра�ширенный пример: name=ivan and country=russia";
-App::$strings["Everything"] = "В�ё";
-App::$strings["Categories"] = "Категории";
-App::$strings["Common Connections"] = "Общие контакты";
-App::$strings["View all %d common connections"] = "Про�мотреть в�е %d общих контактов";
-App::$strings["Select an alternate language"] = "Выбор дополнительного �зыка";
-App::$strings["Unable to import a removed channel."] = "�евозможно импортировать удалённый канал.";
-App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "�е удало�ь �оздать дублирующий�� идентификатор канала. Импорт невозможен.";
-App::$strings["Cloned channel not found. Import failed."] = "Клон канала не найден. Импорт невозможен.";
-App::$strings["Remote authentication"] = "Удаленна� аутентификаци�";
-App::$strings["Click to authenticate to your home hub"] = "�ажмите, чтобы аутентифицировать �еб� на домашнем узле";
-App::$strings["Channel Manager"] = "Менеджер каналов";
-App::$strings["Manage your channels"] = "Управление вашими каналами";
-App::$strings["Privacy Groups"] = "Группы конфиденциально�ти";
-App::$strings["Manage your privacy groups"] = "Управление вашим группами конфиденциально�ти";
-App::$strings["Settings"] = "�а�тройки";
-App::$strings["Account/Channel Settings"] = "�а�тройки аккаунта / канала";
 App::$strings["Logout"] = "Выход";
-App::$strings["End this session"] = "Закончить �ту �е��ию";
-App::$strings["Your profile page"] = "Страницa вашего профил�";
-App::$strings["Edit Profiles"] = "Редактирование профилей";
-App::$strings["Manage/Edit profiles"] = "Управление / редактирование профилей";
-App::$strings["Edit your profile"] = "Редактировать профиль";
 App::$strings["Login"] = "Войти";
-App::$strings["Sign in"] = "Войти";
-App::$strings["Take me home"] = "Домой";
-App::$strings["Log me out of this site"] = "Выйти � �того �айта";
-App::$strings["Register"] = "Реги�траци�";
-App::$strings["Create an account"] = "Создать аккаунт";
-App::$strings["Help and documentation"] = "Справочна� информаци� и документаци�";
-App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "И�кать на �айте @им�, !форум, #тег, ?документ, �одержимое";
-App::$strings["Admin"] = "�дмини�трирование";
-App::$strings["Site Setup and Configuration"] = "У�тановка и конфигураци� �айта";
-App::$strings["Loading"] = "Загрузка";
-App::$strings["@name, !forum, #tag, ?doc, content"] = "@им�, !форум, #тег, ?документ, �одержимое";
-App::$strings["Please wait..."] = "Подождите пожалуй�та ...";
-App::$strings["Add Apps"] = "Добавить приложени�";
-App::$strings["Arrange Apps"] = "Упор�дочить приложени�";
-App::$strings["Toggle System Apps"] = "Показать �и�темные приложени�";
-App::$strings["Channel"] = "Канал";
-App::$strings["Status Messages and Posts"] = "Стату�ы и публикации";
-App::$strings["About"] = "О �ебе";
-App::$strings["Profile Details"] = "Информаци� о профиле";
-App::$strings["Files"] = "Файлы";
-App::$strings["Files and Storage"] = "Файлы и хранилище";
-App::$strings["Chatrooms"] = "Чаты";
-App::$strings["Bookmarks"] = "Закладки";
-App::$strings["Saved Bookmarks"] = "Сохранённые закладки";
-App::$strings["Cards"] = "Карточки";
-App::$strings["View Cards"] = "Про�мотреть карточки";
-App::$strings["Articles"] = "Статьи";
-App::$strings["View Articles"] = "Про�мотр �татей";
-App::$strings["Webpages"] = "Веб-�траницы";
-App::$strings["View Webpages"] = "Про�мотр веб-�траниц";
-App::$strings["Wikis"] = "";
-App::$strings["Wiki"] = "";
-App::$strings["Delegation session ended."] = "Делегированна� �е��и� завершена.";
-App::$strings["Logged out."] = "Вышел из �и�темы.";
-App::$strings["Email validation is incomplete. Please check your email."] = "Проверка email не завершена. Пожалуй�та, проверьте вашу почту.";
-App::$strings["Failed authentication"] = "Ошибка аутентификации";
-App::$strings["Miscellaneous"] = "Прочее";
-App::$strings["Birthday"] = "День рождени�";
-App::$strings["Age: "] = "Возра�т:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD или MM-DD";
-App::$strings["never"] = "никогда";
-App::$strings["less than a second ago"] = "менее чем одну �екунду";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s назад";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "год",
-	1 => "года",
-	2 => "лет",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "ме��ц",
-	1 => "ме��ца",
-	2 => "ме��цев",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "неделю",
-	1 => "недели",
-	2 => "недель",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "день",
-	1 => "дн�",
-	2 => "дней",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "ча�",
-	1 => "ча�а",
-	2 => "ча�ов",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "минуту",
-	1 => "минуты",
-	2 => "минут",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "�екунду",
-	1 => "�екунды",
-	2 => "�екунд",
-);
-App::$strings["%1\$s's birthday"] = "День рождени� %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "С Днем рождени� %1\$s !";
-App::$strings["INVALID EVENT DISMISSED!"] = "�ЕДЕЙСТВИТЕЛЬ�ОЕ СОБЫТИЕ ОТКЛО�Е�О!";
-App::$strings["Summary: "] = "Резюме: ";
-App::$strings["Date: "] = "Дата: ";
-App::$strings["Reason: "] = "Причина: ";
-App::$strings["INVALID CARD DISMISSED!"] = "�ЕДЕЙСТВИТЕЛЬ��Я К�РТОЧК� ОТКЛО�Е��!";
-App::$strings["Name: "] = "Им�: ";
-App::$strings["Channel is blocked on this site."] = "Канал блокирует�� на �том �айте.";
-App::$strings["Channel location missing."] = "Ме�тоположение канала от�ут�твует.";
-App::$strings["Response from remote channel was incomplete."] = "Ответ удаленного канала неполный.";
-App::$strings["Premium channel - please visit:"] = "Премимум-канал - пожалуй�та по�етите:";
-App::$strings["Channel was deleted and no longer exists."] = "Канал удален и больше не �уще�твует.";
-App::$strings["Remote channel or protocol unavailable."] = "Удалённый канал или протокол недо�тупен.";
-App::$strings["Channel discovery failed."] = "�е удало�ь обнаружить канал.";
-App::$strings["Protocol disabled."] = "Протокол отключен.";
-App::$strings["Cannot connect to yourself."] = "�ельз� подключить�� к �амому �ебе.";
-App::$strings["channel"] = "канал";
-App::$strings["likes %1\$s's %2\$s"] = "�равит�� %1\$s %2\$s";
-App::$strings["doesn't like %1\$s's %2\$s"] = "�е нравит�� %1\$s %2\$s";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s теперь в контакте � %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s ткнул %2\$s";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s %2\$s";
-App::$strings["This is an unsaved preview"] = "Это не�охранённый про�мотр";
-App::$strings["__ctx:title__ Likes"] = "�равит��";
-App::$strings["__ctx:title__ Dislikes"] = "�е нравит��";
-App::$strings["__ctx:title__ Agree"] = "Согла�ен";
-App::$strings["__ctx:title__ Disagree"] = "�е �огла�ен";
-App::$strings["__ctx:title__ Abstain"] = "Воздержал��";
-App::$strings["__ctx:title__ Attending"] = "По�ещаю";
-App::$strings["__ctx:title__ Not attending"] = "�е по�ещаю";
-App::$strings["__ctx:title__ Might attend"] = "Возможно по�ещу";
-App::$strings["Select"] = "Выбрать";
-App::$strings["Delete"] = "Удалить";
-App::$strings["Toggle Star Status"] = "Переключить �тату� пометки";
-App::$strings["Private Message"] = "Личное �ообщение";
-App::$strings["Message signature validated"] = "Подпи�ь �ообщени� проверена";
-App::$strings["Message signature incorrect"] = "Подпи�ь �ообщени� неверна�";
-App::$strings["Approve"] = "Утвердить";
-App::$strings["View %s's profile @ %s"] = "Про�мотреть профиль %s @ %s";
-App::$strings["Categories:"] = "Категории:";
-App::$strings["Filed under:"] = "Хранить под:";
-App::$strings["from %s"] = "от %s";
-App::$strings["last edited: %s"] = "по�леднее редактирование: %s";
-App::$strings["Expires: %s"] = "Срок дей�тви�: %s";
-App::$strings["View in context"] = "Показать в контек�те";
-App::$strings["Please wait"] = "Подождите пожалуй�та";
-App::$strings["remove"] = "удалить";
-App::$strings["Loading..."] = "Загрузка...";
-App::$strings["Conversation Tools"] = "Ин�трументы общени�";
-App::$strings["Delete Selected Items"] = "Удалить выбранные �лементы";
-App::$strings["View Source"] = "Про�мотреть и�точник";
-App::$strings["Follow Thread"] = "Следить за темой";
-App::$strings["Unfollow Thread"] = "Прекратить от�леживать тему";
-App::$strings["Recent Activity"] = "По�ледние дей�тви�";
-App::$strings["Connect"] = "Подключить";
-App::$strings["Edit Connection"] = "Редактировать контакт";
-App::$strings["Message"] = "Сообщение";
-App::$strings["Ratings"] = "Оценки";
-App::$strings["Poke"] = "Ткнуть";
-App::$strings["%s likes this."] = "%s нравит�� �то.";
-App::$strings["%s doesn't like this."] = "%s не нравит�� �то.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d человеку</span> �то нравит��.",
-	1 => "<span  %1\$s>%2\$d человекам</span> �то нравит��.",
-	2 => "<span  %1\$s>%2\$d человекам</span> �то нравит��.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d человеку</span> �то не нравит��.",
-	1 => "<span  %1\$s>%2\$d человекам</span> �то не нравит��.",
-	2 => "<span  %1\$s>%2\$d человекам</span> �то не нравит��.",
-);
-App::$strings["and"] = "и";
-App::$strings[", and %d other people"] = array(
-	0 => ", и ещё %d человеку",
-	1 => ", и ещё %d человекам",
-	2 => ", и ещё %d человекам",
-);
-App::$strings["%s like this."] = "%s нравит�� �то.";
-App::$strings["%s don't like this."] = "%s не нравит�� �то.";
-App::$strings["Toggle poll"] = "Переключить опро�";
-App::$strings["Option"] = "Вариант";
-App::$strings["Add option"] = "Добавить вариант";
-App::$strings["Minutes"] = "Минут";
-App::$strings["Hours"] = "Ча�ов";
-App::$strings["Days"] = "Дней";
-App::$strings["Allow multiple answers"] = "Разрешить не�колько ответов";
-App::$strings["Summary (optional)"] = "Резюме (необ�зательно)";
-App::$strings["__ctx:noun__ Like"] = array(
-	0 => "�равит��",
-	1 => "�равит��",
-	2 => "�равит��",
-);
-App::$strings["__ctx:noun__ Dislike"] = array(
-	0 => "�е нравит��",
-	1 => "�е нравит��",
-	2 => "�е нравит��",
-);
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "По�етит",
-	1 => "По�ет�т",
-	2 => "По�ет�т",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "�е по�етит",
-	1 => "�е по�ет�т",
-	2 => "�е по�ет�т",
-);
-App::$strings["__ctx:noun__ Undecided"] = "�е решил";
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "Согла�ен",
-	1 => "Согла�ны",
-	2 => "Согла�ны",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "�е �огла�ен",
-	1 => "�е �огла�ны",
-	2 => "�е �огла�ны",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Воздержал��",
-	1 => "Воздержали�ь",
-	2 => "Воздержали�ь",
-);
-App::$strings["Profile to assign new connections"] = "�азначить профиль дл� новых контактов";
-App::$strings["Frequently"] = "Ча�то";
-App::$strings["Hourly"] = "Ежеча�но";
-App::$strings["Twice daily"] = "Дважды в день";
-App::$strings["Daily"] = "Ежедневно";
-App::$strings["Weekly"] = "Еженедельно";
-App::$strings["Monthly"] = "Ежеме��чно";
-App::$strings["Currently Male"] = "В на�то�щее врем� муж�кой";
-App::$strings["Currently Female"] = "В на�то�щее врем� жен�кий";
-App::$strings["Mostly Male"] = "В о�новном муж�кой";
-App::$strings["Mostly Female"] = "В о�новном жен�кий";
-App::$strings["Transgender"] = "Тран�гендер";
-App::$strings["Intersex"] = "Интер�ек�уал";
-App::$strings["Transsexual"] = "Тран��ек�уал";
-App::$strings["Hermaphrodite"] = "Гермафродит";
-App::$strings["Neuter"] = "Среднего рода";
-App::$strings["Non-specific"] = "�е�пецифиче�кий";
-App::$strings["Undecided"] = "�е решил";
-App::$strings["Males"] = "Мужчины";
-App::$strings["Females"] = "Женщины";
-App::$strings["Gay"] = "Гей";
-App::$strings["Lesbian"] = "Ле�би�нка";
-App::$strings["No Preference"] = "Без предпочтений";
-App::$strings["Bisexual"] = "Би�ек�уал";
-App::$strings["Autosexual"] = "�вто�ек�уал";
-App::$strings["Abstinent"] = "Воздержание";
-App::$strings["Virgin"] = "Дев�твенник";
-App::$strings["Deviant"] = "Отклон�ющий�� от нормы";
-App::$strings["Fetish"] = "Фетиши�т";
-App::$strings["Oodles"] = "Множе�твенный";
-App::$strings["Nonsexual"] = "��ек�уал";
-App::$strings["Single"] = "Одиночка";
-App::$strings["Lonely"] = "Одинокий";
-App::$strings["Available"] = "Свободен";
-App::$strings["Unavailable"] = "Зан�т";
-App::$strings["Has crush"] = "Влюблён";
-App::$strings["Infatuated"] = "без ума";
-App::$strings["Dating"] = "В�тречаю�ь";
-App::$strings["Unfaithful"] = "�еверный";
-App::$strings["Sex Addict"] = "Эротоман";
-App::$strings["Friends"] = "Друзь�";
-App::$strings["Friends/Benefits"] = "Друзь� / Выгоды";
-App::$strings["Casual"] = "Легкомы�ленный";
-App::$strings["Engaged"] = "Помолвлен";
-App::$strings["Married"] = "В браке";
-App::$strings["Imaginarily married"] = "В воображаемом браке";
-App::$strings["Partners"] = "Партнёр�тво";
-App::$strings["Cohabiting"] = "Сожитель�твующие";
-App::$strings["Common law"] = "Граждан�кий брак";
-App::$strings["Happy"] = "Сча�тлив";
-App::$strings["Not looking"] = "�е нуждаю�ь";
-App::$strings["Swinger"] = "Свингер";
-App::$strings["Betrayed"] = "Предан";
-App::$strings["Separated"] = "Разделён";
-App::$strings["Unstable"] = "�е�табильно";
-App::$strings["Divorced"] = "В разводе";
-App::$strings["Imaginarily divorced"] = "В воображаемом разводе";
-App::$strings["Widowed"] = "Вдовец / вдова";
-App::$strings["Uncertain"] = "�еопределенный";
-App::$strings["It's complicated"] = "Это �ложно";
-App::$strings["Don't care"] = "В�ё равно";
-App::$strings["Ask me"] = "Спро�и мен�";
-App::$strings["New window"] = "�овое окно";
-App::$strings["Open the selected location in a different window or browser tab"] = "Открыть выбранное ме�тоположение в другом окне или вкладке браузера";
-App::$strings["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."] = "Удаленна� группа � �тим названием была во��тановлена. Суще�твующие разрешени� пункт <strong>могут</strong> примен�ть�� к �той группе и к её будущих уча�тников. Е�ли �то не то, чего вы хотели, пожалуй�та, �оздайте другую группу � другим именем.";
-App::$strings["Add new connections to this privacy group"] = "Добавить новые контакты в группу конфиденциально�ти";
-App::$strings["edit"] = "редактировать";
-App::$strings["Edit group"] = "Редактировать группу";
-App::$strings["Add privacy group"] = "Добавить группу конфиденциально�ти";
-App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу конфиденциально�ти";
-App::$strings["add"] = "добавить";
-App::$strings["Trending"] = "В тренде";
-App::$strings["Tags"] = "Теги";
-App::$strings["Keywords"] = "Ключевые �лова";
-App::$strings["have"] = "иметь";
-App::$strings["has"] = "е�ть";
-App::$strings["want"] = "хотеть";
-App::$strings["wants"] = "хотеть";
-App::$strings["like"] = "нравит��";
-App::$strings["likes"] = "нравит��";
-App::$strings["dislike"] = "не нравит��";
-App::$strings["dislikes"] = "не нравит��";
-App::$strings["(Unknown)"] = "(�еизве�тный)";
-App::$strings["Visible to anybody on the internet."] = "Виден в�ем в интернете.";
-App::$strings["Visible to you only."] = "Видно только вам.";
-App::$strings["Visible to anybody in this network."] = "Видно в�ем в �той �ети.";
-App::$strings["Visible to anybody authenticated."] = "Видно в�ем аутентифицированным.";
-App::$strings["Visible to anybody on %s."] = "Видно в�ем в %s.";
-App::$strings["Visible to all connections."] = "Видно в�ем контактам.";
-App::$strings["Visible to approved connections."] = "Видно только одобренным контактам.";
-App::$strings["Visible to specific connections."] = "Видно указанным контактам.";
-App::$strings["Privacy group not found."] = "Группа конфиденциально�ти не найдена.";
-App::$strings["Privacy group is empty."] = "Группа конфиденциально�ти пу�та";
-App::$strings["Privacy group: %s"] = "Группа конфиденциально�ти: %s";
-App::$strings["Connection: %s"] = "Контакт: %s";
-App::$strings["Connection not found."] = "Контакт не найден.";
-App::$strings["female"] = "женщина";
-App::$strings["%1\$s updated her %2\$s"] = "%1\$s обновила её %2\$s";
-App::$strings["male"] = "мужчина";
-App::$strings["%1\$s updated his %2\$s"] = "%1\$s обновил его %2\$s";
-App::$strings["%1\$s updated their %2\$s"] = "%2\$s %1\$s обновлена";
-App::$strings["profile photo"] = "Фотографи� профил�";
-App::$strings["[Edited %s]"] = "[Отредактировано %s]";
-App::$strings["__ctx:edit_activity__ Post"] = "Публикаци�";
-App::$strings["__ctx:edit_activity__ Comment"] = "Комментарий";
-App::$strings["The provided email address is not valid"] = "Предо�тавленный адре� �лектронной почты недей�твителен";
-App::$strings["The provided email domain is not among those allowed on this site"] = "Домен �лектронной почты не входит в чи�ло разрешенных на �том �айте";
-App::$strings["The provided email address is already registered at this site"] = "Предо�тавленный адре� �лектронной почты уже зареги�трирован на �том �айте";
-App::$strings["An invitation is required."] = "Требует�� приглашение.";
-App::$strings["Invitation could not be verified."] = "�е удало�ь проверить приглашение.";
-App::$strings["Please enter the required information."] = "Пожалуй�та, введите необходимую информацию.";
-App::$strings["Failed to store account information."] = "�е удало�ь �охранить информацию аккаунта.";
-App::$strings["Registration confirmation for %s"] = "Подтверждение реги�трации на %s";
-App::$strings["Registration request at %s"] = "Запро� реги�трации на %s";
-App::$strings["your registration password"] = "ваш пароль реги�трации";
-App::$strings["Registration details for %s"] = "Реги�трационные данные дл� %s";
-App::$strings["Account approved."] = "�ккаунт утвержден.";
-App::$strings["Registration revoked for %s"] = "Реги�траци� отозвана дл� %s";
-App::$strings["Could not revoke registration for %s"] = "�е удало�ь отозвать реги�трацию дл� %s";
-App::$strings["Click here to upgrade."] = "�ажмите зде�ь дл� обновлени�.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Это дей�твие превышает ограничени�, у�тановленные в вашем плане.";
-App::$strings["This action is not available under your subscription plan."] = "Это дей�твие невозможно из-за ограничений в вашем плане.";
-App::$strings["open"] = "открыта";
-App::$strings["closed"] = "закрыта";
-App::$strings["Registration is currently"] = "В на�то�щее врем� реги�траци�";
-App::$strings["please come back"] = "пожалуй�та, возвращайте�ь позднее";
-App::$strings["Profile Photos"] = "Фотографии профил�";
-App::$strings["Item was not found."] = "Элемент не найден.";
-App::$strings["Unknown error."] = "�еизве�тна� ошибка.";
-App::$strings["No source file."] = "�ет и�ходного файла.";
-App::$strings["Cannot locate file to replace"] = "�е удает�� найти файл дл� замены";
-App::$strings["Cannot locate file to revise/update"] = "�е удает�� найти файл дл� пере�мотра / обновлени�";
-App::$strings["File exceeds size limit of %d"] = "Файл превышает предельный размер %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Вы до�тигли предела %1$.0f Мбайт дл� хранени� вложений.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Загрузка файла не удала�ь. Возможно �и�тема перегружена или попытка прекращена.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Файл дл� �охранени� не может быть проверен. Загрузка не удала�ь.";
-App::$strings["Path not available."] = "Путь недо�тупен.";
-App::$strings["Empty pathname"] = "Пу�тое им� пути";
-App::$strings["duplicate filename or path"] = "дублирующее�� им� файла или пути";
-App::$strings["Path not found."] = "Путь не найден.";
-App::$strings["mkdir failed."] = "mkdir не удал��";
-App::$strings["database storage failed."] = "ошибка при запи�и базы данных.";
-App::$strings["Empty path"] = "Пу�тое им� пути";
-App::$strings["%s shared a %s with you"] = "%s поделил�� � вами %s";
-App::$strings["%1\$s's bookmarks"] = "Закладки пользовател� %1\$s";
-App::$strings["Edit"] = "Изменить";
-App::$strings["Image/photo"] = "Изображение / фотографи�";
-App::$strings["Encrypted content"] = "Зашифрованное �одержание";
-App::$strings["Install %1\$s element %2\$s"] = "У�тановить %1\$s �лемент %2\$s";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Эта публикаци� �одержит у�танавливаемый %s �лемент, однако у ва� нет разрешений дл� его у�тановки на �том �айте.";
-App::$strings["webpage"] = "веб-�траница";
-App::$strings["layout"] = "шаблон";
-App::$strings["block"] = "заблокировать";
-App::$strings["menu"] = "меню";
-App::$strings["card"] = "карточка";
-App::$strings["article"] = "�тать�";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s была �оздана %2\$s %3\$s";
-App::$strings["Click to open/close"] = "�ажмите, чтобы открыть/закрыть";
-App::$strings["spoiler"] = "�пойлер";
-App::$strings["View article"] = "Про�мотр �татьи";
-App::$strings["View summary"] = "Про�мотр резюме";
-App::$strings["Different viewers will see this text differently"] = "Различные зрители увид�т �тот тек�т по-разному";
-App::$strings["$1 wrote:"] = "$1 пи�ал:";
-App::$strings["Unable to obtain identity information from database"] = "�евозможно получить идентификационную информацию из базы данных";
-App::$strings["Empty name"] = "Пу�тое им�";
-App::$strings["Name too long"] = "Слишком длинное им�";
-App::$strings["No account identifier"] = "Идентификатор аккаунта от�ут�твует";
-App::$strings["Nickname is required."] = "Требует�� п�евдоним.";
-App::$strings["Reserved nickname. Please choose another."] = "Зарезервированый п�евдоним. Пожалуй�та, выберите другой.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "П�евдоним имеет недопу�тимые �имволы или уже и�пользует�� на �том �айте.";
-App::$strings["Unable to retrieve created identity"] = "�е удает�� получить �озданный идентификатор";
-App::$strings["Default Profile"] = "Профиль по умолчанию";
-App::$strings["Unable to retrieve modified identity"] = "�е удает�� найти изменённый идентификатор";
-App::$strings["Requested channel is not available."] = "Запрошенный канал не до�тупен.";
-App::$strings["Change profile photo"] = "Изменить фотографию профил�";
-App::$strings["Create New Profile"] = "Создать новый профиль";
-App::$strings["Profile Image"] = "Изображение профил�";
-App::$strings["Visible to everybody"] = "Видно в�ем";
-App::$strings["Edit visibility"] = "Редактировать видимо�ть";
-App::$strings["Gender:"] = "Пол:";
-App::$strings["Status:"] = "Стату�:";
-App::$strings["Homepage:"] = "Домашн�� �траница:";
-App::$strings["Online Now"] = "Сейча� в �ети";
-App::$strings["Change your profile photo"] = "Изменить фотографию вашего профил�";
-App::$strings["Trans"] = "Тран�ек�уал";
-App::$strings["Full Name:"] = "Полное им�:";
-App::$strings["Like this channel"] = "нравит�� �тот канал";
-App::$strings["j F, Y"] = "";
-App::$strings["j F"] = "";
-App::$strings["Birthday:"] = "День рождени�:";
-App::$strings["Age:"] = "Возра�т:";
-App::$strings["for %1\$d %2\$s"] = "дл� %1\$d %2\$s";
-App::$strings["Tags:"] = "Теги:";
-App::$strings["Sexual Preference:"] = "Сек�уальные предпочтени�:";
-App::$strings["Hometown:"] = "Родной город:";
-App::$strings["Political Views:"] = "Политиче�кие взгл�ды:";
-App::$strings["Religion:"] = "Религи�:";
-App::$strings["About:"] = "О �ебе:";
-App::$strings["Hobbies/Interests:"] = "Хобби / интере�ы:";
-App::$strings["Likes:"] = "Что вам нравит��:";
-App::$strings["Dislikes:"] = "Что вам не нравит��:";
-App::$strings["Contact information and Social Networks:"] = "Контактна� информаци� и �оциальные �ети:";
-App::$strings["My other channels:"] = "Мои другие каналы:";
-App::$strings["Musical interests:"] = "Музыкальные интере�ы:";
-App::$strings["Books, literature:"] = "Книги, литература:";
-App::$strings["Television:"] = "Телевидение:";
-App::$strings["Film/dance/culture/entertainment:"] = "Кино / танцы / культура / развлечени�:";
-App::$strings["Love/Romance:"] = "Любовь / романтика:";
-App::$strings["Work/employment:"] = "Работа / зан�то�ть:";
-App::$strings["School/education:"] = "Школа / образование:";
-App::$strings["Profile"] = "Профиль";
-App::$strings["Like this thing"] = "нравит�� �тo";
-App::$strings["Export"] = "Эк�порт";
-App::$strings["cover photo"] = "фотографи� обложки";
 App::$strings["Remote Authentication"] = "Удаленна� аутентификаци�";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Введите адре� вашего канала (например: channel@example.com)";
-App::$strings["Authenticate"] = "Проверка подлинно�ти";
-App::$strings["Account '%s' deleted"] = "�ккаунт '%s' удален";
-App::$strings["Visible to your default audience"] = "Видно вашей аудитории по умолчанию.";
-App::$strings["Profile-Based Privacy Groups"] = "Группы конфиденциально�ти о�нованные на профиле";
-App::$strings["Private Forum"] = "Ча�тный форум";
-App::$strings["Forums"] = "Форумы";
-App::$strings["Only me"] = "Только мне";
-App::$strings["Share with"] = "Поделить�� �";
-App::$strings["Custom selection"] = "�а�траиваемый выбор";
-App::$strings["Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and limit the scope of \"Allow\"."] = "Выберите \"Разрешить\" дл� разрешени� про�мотра. \"�е разрешать\" позвол�ет вам переопределить и ограничить разрешени�.";
-App::$strings["Allow"] = "Разрешить";
-App::$strings["Don't allow"] = "�е разрешать";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Разрешени� публикации %s не могут быть изменены %s по�ле того, как ею поделили�ь. Эти разрешени� у�танавливают кому разрешено про�матривать �ту публикацию.";
-App::$strings["View PDF"] = "Про�мотреть PDF";
-App::$strings[" by "] = " из ";
-App::$strings[" on "] = " на ";
-App::$strings["Embedded content"] = "В�троенное �одержимое";
-App::$strings["Embedding disabled"] = "В�траивание отключено";
-App::$strings["Directory Options"] = "Параметры каталога";
-App::$strings["Safe Mode"] = "Безопа�ный режим";
-App::$strings["Public Forums Only"] = "Только публичные форумы";
-App::$strings["This Website Only"] = "Только �тот веб-�айт";
-App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s привет�твует %2\$s";
-App::$strings["Unable to determine sender."] = "�евозможно определить отправител�.";
-App::$strings["No recipient provided."] = "Получатель не предо�тавлен.";
-App::$strings["[no subject]"] = "[без темы]";
-App::$strings["Stored post could not be verified."] = "Сохранённа� публикаци� не может быть проверена.";
-App::$strings["Commented Date"] = "По комментари�м";
-App::$strings["Order by last commented date"] = "Сортировка по дате по�леднего комментари�";
-App::$strings["Posted Date"] = "По публикаци�м";
-App::$strings["Order by last posted date"] = "Сортировка по дате по�ледней публикации";
-App::$strings["Date Unthreaded"] = "По пор�дку";
-App::$strings["Order unthreaded by date"] = "Сортировка в пор�дке по�туплени�";
-App::$strings["Stream Order"] = "Упор�дочить поток";
-App::$strings["Archives"] = "�рхивы";
-App::$strings["Add new page"] = "Добавить новую �траницу";
-App::$strings["Options"] = "Параметры";
-App::$strings["Wiki Pages"] = "Wiki �траницы";
-App::$strings["Page name"] = "�азвание �траницы";
-App::$strings["View Photo"] = "По�мотреть фотографию";
-App::$strings["Edit Album"] = "Редактировать Фотоальбом";
-App::$strings["Upload"] = "Загрузка";
-App::$strings["Tasks"] = "Задачи";
-App::$strings["Public Hubs"] = "Публичные хабы";
-App::$strings["Received Messages"] = "Полученные �ообщени�";
-App::$strings["Sent Messages"] = "Отправленные �ообщени�";
-App::$strings["Conversations"] = "Бе�еды";
-App::$strings["No messages."] = "Сообщений нет.";
-App::$strings["Delete conversation"] = "Удалить бе�еду";
-App::$strings["Chat Members"] = "Уча�тники чата";
-App::$strings["I will attend"] = "Я буду уча�твовать";
-App::$strings["I will not attend"] = "Я не буду уча�твовать";
-App::$strings["I might attend"] = "Я возможно буду при�ут�твовать";
-App::$strings["I agree"] = "Я �огла�ен";
-App::$strings["I disagree"] = "Я не �огла�ен";
-App::$strings["I abstain"] = "Я воздержал��";
-App::$strings["Share This"] = "Поделить�� �тим";
-App::$strings["share"] = "поделить��";
-App::$strings["View %s's profile - %s"] = "Про�мотр профил� %s - %s";
-App::$strings["via"] = "через";
-App::$strings["Attendance Options"] = "Параметры по�ещаемо�ти";
-App::$strings["Voting Options"] = "Параметры голо�овани�";
-App::$strings["Pinned post"] = "Прикреплённа� заметка";
-App::$strings["Don't show"] = "�е показывать";
-App::$strings["__ctx:widget__ Activity"] = "�ктивно�ть";
-App::$strings["Select Channel"] = "Выбрать канал";
-App::$strings["Read-write"] = "Чтение-запи�ь";
-App::$strings["Read-only"] = "Только чтение";
-App::$strings["Channel Calendar"] = "Календарь канала";
-App::$strings["CalDAV Calendars"] = "Календари CalDAV";
-App::$strings["Shared CalDAV Calendars"] = "Общие календари CalDAV";
-App::$strings["Share this calendar"] = "Поделить�� �тим календарём";
-App::$strings["Calendar name and color"] = "Им� и цвет календар�";
-App::$strings["Create new CalDAV calendar"] = "Создать новый календарь CalDAV";
-App::$strings["Create"] = "Создать";
-App::$strings["Calendar Name"] = "Им� календар�";
-App::$strings["Calendar Tools"] = "Ин�трументы календар�";
-App::$strings["Channel Calendars"] = "Календари канала";
-App::$strings["Import calendar"] = "Импортировать календарь";
-App::$strings["Select a calendar to import to"] = "Выбрать календарь дл� импорта в";
-App::$strings["Addressbooks"] = "�дре�ные книги";
-App::$strings["Addressbook name"] = "Им� адре�ной книги";
-App::$strings["Create new addressbook"] = "Создать новую адре�ную книгу";
-App::$strings["Addressbook Name"] = "Им� адре�ной книги";
-App::$strings["Addressbook Tools"] = "Ин�трументы адре�ной книги";
-App::$strings["Import addressbook"] = "Импортировать адре�ную книгу";
-App::$strings["Select an addressbook to import to"] = "Выбрать адре�ную книгу дл� импорта в";
-App::$strings["Remove term"] = "Удалить термин";
-App::$strings["Suggested Chatrooms"] = "Рекомендуемые чаты";
-App::$strings["Account settings"] = "�а�тройки аккаунта";
-App::$strings["Channel settings"] = "�а�тройки канала";
-App::$strings["Display settings"] = "�а�тройки отображени�";
-App::$strings["Manage locations"] = "Управление ме�тоположением";
-App::$strings["Overview"] = "Обзор";
-App::$strings["Ignore/Hide"] = "Игнорировать / cкрыть";
-App::$strings["Suggestions"] = "Рекомендации";
-App::$strings["See more..."] = "Про�мотреть больше...";
-App::$strings["Bookmarked Chatrooms"] = "Закладки чатов";
-App::$strings["__ctx:wiki_history__ Message"] = "Сообщение";
-App::$strings["Date"] = "Дата";
-App::$strings["Revert"] = "Отменить";
-App::$strings["Compare"] = "Сравнить";
-App::$strings["HQ Control Panel"] = "Панель управлени� HQ";
-App::$strings["Create a new post"] = "Создать новую публикацию";
-App::$strings["Private Mail Menu"] = "Меню личной перепи�ки";
-App::$strings["Combined View"] = "Комбинированный вид";
-App::$strings["Inbox"] = "Вход�щие";
-App::$strings["Outbox"] = "И�ход�щие";
-App::$strings["New Message"] = "�овое �ообщение";
-App::$strings["photo/image"] = "фотографи� / изображение";
-App::$strings["Site"] = "Сайт";
-App::$strings["Accounts"] = "Учётные запи�и";
-App::$strings["Member registrations waiting for confirmation"] = "Реги�трации уча�тников, ожидающие подверждени�";
-App::$strings["Channels"] = "Каналы";
-App::$strings["Security"] = "Безопа�но�ть";
-App::$strings["Features"] = "Функции";
-App::$strings["Addons"] = "Ра�ширени�";
-App::$strings["Themes"] = "Темы";
-App::$strings["Inspect queue"] = "Про�мотр очереди";
-App::$strings["Profile Fields"] = "Пол� профил�";
-App::$strings["DB updates"] = "Обновление базы данных";
-App::$strings["Logs"] = "Журналы";
-App::$strings["Addon Features"] = "�а�тройки ра�ширений";
-App::$strings["Direct Messages"] = "Личные �ообщени�";
-App::$strings["Show direct (private) messages"] = "Показать личные (пр�мые) �ообщени�";
-App::$strings["Events"] = "Событи�";
-App::$strings["Show posts that include events"] = "Показывать публикации � �обыти�ми";
-App::$strings["Polls"] = "Опро�ы";
-App::$strings["Show posts that include polls"] = "Показывать публикации � опро�ами";
-App::$strings["Show posts related to the %s privacy group"] = "Показывать публикации отно��щие�� к группе конфиденциально�ти %s";
-App::$strings["Show my privacy groups"] = "Показывать мои группы конфиденциально�ти";
-App::$strings["Show posts to this forum"] = "Показывать публикации �того форума";
-App::$strings["Show forums"] = "Показывать форумы";
-App::$strings["Starred Posts"] = "Отмеченные публикации";
-App::$strings["Show posts that I have starred"] = "Показывать публикации которые � отметил";
-App::$strings["Personal Posts"] = "Свои публикации";
-App::$strings["Show posts that mention or involve me"] = "Показывать публикации где вы были упом�нуты или привлечены";
-App::$strings["Show posts that I have filed to %s"] = "Показывать публикации которые � добавил в %s";
-App::$strings["Show filed post categories"] = "Показывать категории добавленных публикаций";
-App::$strings["Panel search"] = "Панель пои�ка";
-App::$strings["Filter by name"] = "Отфильтровать по имени";
-App::$strings["Remove active filter"] = "Удалить активный фильтр";
-App::$strings["Stream Filters"] = "Фильтры потока";
-App::$strings["App Collections"] = "Коллекции приложений";
-App::$strings["Installed apps"] = "У�тановленные приложени�";
-App::$strings["Available Apps"] = "До�тупные приложени�";
-App::$strings["Events Tools"] = "Ин�трументы дл� �обытий";
-App::$strings["Export Calendar"] = "Эк�портировать календарь";
-App::$strings["Import Calendar"] = "Импортировать календарь";
-App::$strings["Rating Tools"] = "Ин�трументы оценки";
-App::$strings["Rate Me"] = "Оценить мен�";
-App::$strings["View Ratings"] = "Про�мотр оценок";
-App::$strings["Click to show more"] = "�ажмите чтобы показать больше";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "У ва� е�ть %1$.0f из %2$.0f разрешенных контактов.";
-App::$strings["Add New Connection"] = "Добавить новый контакт";
-App::$strings["Enter channel address"] = "Введите адре� канала";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Пример: ivan@example.com, http://example.com/ivan";
-App::$strings["Profile Creation"] = "Создание профил�";
-App::$strings["Upload profile photo"] = "Загрузить фотографию профил�";
-App::$strings["Upload cover photo"] = "Загрузить фотографию обложки";
-App::$strings["Find and Connect with others"] = "�айти и в�тупить в контакт";
-App::$strings["View the directory"] = "Про�мотреть каталог";
-App::$strings["View friend suggestions"] = "Про�мотр рекомендуемых друзей";
-App::$strings["Manage your connections"] = "Управление вашими контактами";
-App::$strings["Communicate"] = "Св�зать��";
-App::$strings["View your channel homepage"] = "Домашн�� �траница канала";
-App::$strings["View your network stream"] = "Про�мотреть ваш �етевой поток";
-App::$strings["Documentation"] = "Документаци�";
-App::$strings["Missing Features?"] = "От�ут�твует функци�?";
-App::$strings["Pin apps to navigation bar"] = "Прикрепить приложение к панели";
-App::$strings["Install more apps"] = "У�тановить больше приложений";
-App::$strings["View public stream"] = "Про�мотреть публичный поток";
-App::$strings["New Member Links"] = "С�ылки дл� новичков";
-App::$strings["Me"] = "Я";
-App::$strings["Family"] = "Семь�";
-App::$strings["Acquaintances"] = "Знакомые";
-App::$strings["All"] = "В�е";
-App::$strings["Refresh"] = "Обновить";
-App::$strings["New Network Activity"] = "�ова� �етева� активно�ть";
-App::$strings["New Network Activity Notifications"] = "�овые уведомлени� о �етевой активно�ти";
-App::$strings["View your network activity"] = "Про�мотреть вашу �етевую активно�ть";
-App::$strings["Mark all notifications read"] = "Пометить уведомлени� как прочитанные";
-App::$strings["Show new posts only"] = "Показывать только новые публикации";
-App::$strings["Filter by name or address"] = "Фильтровать по имени или адре�у";
-App::$strings["New Home Activity"] = "�ова� локальна� активно�ть";
-App::$strings["New Home Activity Notifications"] = "�овые уведомлени� локальной активно�ти";
-App::$strings["View your home activity"] = "Про�мотреть локальную активно�ть";
-App::$strings["Mark all notifications seen"] = "Пометить уведомлени� как про�мотренные";
-App::$strings["New Direct Messages"] = "�овое �ообщение";
-App::$strings["New Direct Messages Notifications"] = "Уведомлени� о новых �ообщени�х";
-App::$strings["View your direct messages"] = "Про�мотреть ваше �ообщение";
-App::$strings["New Mails"] = "�ова� перепи�ка";
-App::$strings["New Mails Notifications"] = "Уведомлени� о новой перепи�ке";
-App::$strings["View your private mails"] = "Про�мотреть вашу личную перепи�ку";
-App::$strings["Mark all messages seen"] = "Пометить �ообщени� как про�мотренные";
-App::$strings["New Events"] = "�овые �обыти�";
-App::$strings["New Events Notifications"] = "Уведомлени� о новых �обыти�х";
-App::$strings["View events"] = "Про�мотреть �обыти�";
-App::$strings["Mark all events seen"] = "Пометить в�е �обыти� как про�мотренные";
-App::$strings["New Connections"] = "�овые контакты";
-App::$strings["New Connections Notifications"] = "Уведомлени� о новых контактах";
-App::$strings["View all connections"] = "Про�мотр в�ех контактов";
-App::$strings["New Files"] = "�овые файлы";
-App::$strings["New Files Notifications"] = "Уведомлени� о новых файлах";
-App::$strings["Notices"] = "Оповещени�";
-App::$strings["View all notices"] = "Про�мотреть в�е оповещени�";
-App::$strings["Mark all notices seen"] = "Пометить в�е оповещени� как про�мотренные";
-App::$strings["New Registrations"] = "�овые реги�трации";
-App::$strings["New Registrations Notifications"] = "Уведомлени� о новых реги�траци�х";
-App::$strings["Public Stream"] = "Публичный поток";
-App::$strings["Public Stream Notifications"] = "Уведомлени� публичного потока";
-App::$strings["View the public stream"] = "Про�мотреть публичный поток";
-App::$strings["Sorry, you have got no notifications at the moment"] = "Извините, но �ейча� у ва� нет уведомлений";
-App::$strings["This channel is limited to %d tokens"] = "Этот канал ограничен %d токенами";
-App::$strings["Name and Password are required."] = "Требуют�� им� и пароль.";
-App::$strings["Token saved."] = "Токен �охранён.";
-App::$strings["Guest Access App"] = "Приложение \"Го�тевой до�туп\"";
-App::$strings["Create access tokens so that non-members can access private content"] = "Создайте токены до�тупа, чтобы �торонние пользователи могли получить до�туп к ча�тному �одержимому";
-App::$strings["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."] = "И�пользуйте �ту форму дл� �оздани� идентификаторов временного до�тупа дл� �торонних пользователей. Эти идентификаторы могут и�пользовать�� в �пи�ках контрол� до�тупа, и по�етители могут и�пользовать �ти учетные данные дл� до�тупа к ча�тному контенту.";
-App::$strings["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:"] = "Вы также можете предо�тавить до�туп в �тиле <em>dropbox</em> дл� друзей и коллег, добавив им� и пароль дл� входа на любой URL-адре� �айта. �апример:";
-App::$strings["Guest Access Tokens"] = "Токен го�тевого до�тупа";
-App::$strings["Login Name"] = "Им�";
-App::$strings["Login Password"] = "Пароль";
-App::$strings["Expires (yyyy-mm-dd)"] = "Срок дей�тви� (yyyy-mm-dd)";
-App::$strings["Their Settings"] = "Их на�тройки";
-App::$strings["My Settings"] = "Мои на�тройки";
-App::$strings["inherited"] = "на�ледует��";
-App::$strings["Individual Permissions"] = "Индивидуальные разрешени�";
-App::$strings["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."] = "�екоторые разрешени� могут на�ледовать из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> ваших каналов которые могут иметь более вы�окий приоритет чем индивидуальные. Вы <strong>не можете</strong> мен�ть �ти на�тройки зде�ь.";
-App::$strings["Item not found"] = "Элемент не найден";
-App::$strings["Channel not found."] = "Канал не найден.";
-App::$strings["Edit Article"] = "Редактировать �татью";
-App::$strings["File not found."] = "Файл не найден.";
-App::$strings["Can not copy folder into itself."] = "�евозможно �копировать каталог в �амого �еб�.";
-App::$strings["Can not move folder \"%s\" into itself."] = "�евозможно �копировать каталог \"%s\" в �амого �еб�.";
-App::$strings["No such group"] = "�ет такой группы";
-App::$strings["No such channel"] = "�ет такого канала";
-App::$strings["Search Results For:"] = "Результаты пои�ка дл�:";
-App::$strings["Reset form"] = "Очи�тить форму";
-App::$strings["Privacy group is empty"] = "Группа конфиденциально�ти пу�та";
-App::$strings["Privacy group: "] = "Группа конфиденциально�ти: ";
-App::$strings["Nothing to import."] = "�ичего импортировать.";
-App::$strings["Unable to download data from old server"] = "�евозможно загрузить данные �о �тарого �ервера";
-App::$strings["Imported file is empty."] = "Импортированный файл пу�т.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Предупреждение: Вер�и� базы данных отличает�� от %1\$d обновлени�.";
-App::$strings["Import completed"] = "Импорт завершён.";
-App::$strings["Import Items"] = "Импортировать объекты";
-App::$strings["Use this form to import existing posts and content from an export file."] = "И�пользуйте �ту форму дл� импорта �уще�твующих публикаций и �одержимого из файла.";
-App::$strings["File to Upload"] = "Файл дл� загрузки";
-App::$strings["Your service plan only allows %d channels."] = "Ваш кла�� об�луживани� разрешает только %d каналов.";
-App::$strings["No channel. Import failed."] = "Канала нет. Импорт невозможен.";
-App::$strings["You must be logged in to use this feature."] = "Вы должны войти в �и�тему, чтобы и�пользовать �ту функцию.";
-App::$strings["Import Channel"] = "Импортировать канал";
-App::$strings["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."] = "И�пользуйте �ту форм дл� импорта �уще�твующего канала � другого �ервера / хаба. Вы можете получить идентификационные данные канала �о �тарого �ервера / хаба через �еть или предо�тавить файл �к�порта.";
-App::$strings["Or provide the old server/hub details"] = "или предо�тавьте данные �тарого �ервера";
-App::$strings["Your old identity address (xyz@example.com)"] = "Ваш �тарый адре� канала (xyz@example.com)";
-App::$strings["Your old login email address"] = "Ваш �тарый адре� �лектронной почты";
-App::$strings["Your old login password"] = "Ваш �тарый пароль";
-App::$strings["Import a few months of posts if possible (limited by available memory"] = "Импортировать не�колько ме��цев публикаций е�ли возможно (ограничено до�тупной пам�тью)";
-App::$strings["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."] = "Дл� любого варианта, пожалуй�та, выберите, �ледует ли �делать �тот хаб вашим новым о�новным адре�ом, или ваше прежнее ме�тоположение должно продолжить выполн�ть �ту роль. Вы �можете отправл�ть �ообщени� из любого ме�тоположени�, но только одно может быть помечено как о�новное ме�то дл� файлов, фотографий и мультимедиа.";
-App::$strings["Make this hub my primary location"] = "Сделать �тот хаб главным";
-App::$strings["Move this channel (disable all previous locations)"] = "Переме�тить �то канал (отключить в�е предыдущие ме�тора�положени�)";
-App::$strings["Use this channel nickname instead of the one provided"] = "И�пользовать п�евдоним �того канала вме�то предо�тавленного";
-App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "О�тавьте пу�тым дл� �охранени� �уще�твующего п�евдонима канала. Вам будет �лучайным образом назначен похожий п�евдоним е�ли такое им� уже выделено на �том �айте.";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Проце�� может зан�ть не�колько минут. Пожалуй�та, отправьте форму только один раз и о�тавьте �ту �траницу открытой до завершени�.";
-App::$strings["You must be logged in to see this page."] = "Вы должны авторизовать��, чтобы увидеть �ту �траницу.";
+App::$strings["Password"] = "Пароль";
+App::$strings["Remember me"] = "Запомнить мен�";
+App::$strings["No"] = "�ет";
+App::$strings["Yes"] = "Да";
+App::$strings["Forgot your password?"] = "Забыли пароль или логин?";
+App::$strings["Password Reset"] = "Сбро�ить пароль";
+App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Ошибка SSL/TLS веб-�айта дл� %s";
+App::$strings["Website SSL certificate is not valid. Please correct."] = "SSL/TLS �ертификат веб-�айт недей�твителен. И�правьте �то.";
+App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Задани� Cron не запущены на %s";
+App::$strings["Cron/Scheduled tasks not running."] = "Задани� Cron / планировщика не запущены.";
+App::$strings["never"] = "никогда";
+App::$strings["Permission denied."] = "До�туп запрещен.";
+App::$strings["Item not found."] = "Элемент не найден.";
+App::$strings["item"] = "пункт";
 App::$strings["Update to Hubzilla 5.0 step 2"] = "Обновление Hubzilla 5.0, �тап 2";
 App::$strings["To complete the update please run"] = "Дл� завершени� обновлени� пожалуй�та выполните";
 App::$strings["php util/z6convert.php"] = "";
 App::$strings["from the terminal."] = "из терминала.";
+App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта.";
+App::$strings["Remove This Account"] = "Удалить �тот аккаунт";
+App::$strings["WARNING: "] = "ПРЕДУПРЕЖДЕ�ИЕ: ";
+App::$strings["This account and all its channels will be completely removed from the network. "] = "Этот аккаунт и в�е его каналы будут полно�тью удалены из �ети.";
+App::$strings["This action is permanent and can not be undone!"] = "Это дей�твие необратимо и не может быть отменено!";
+App::$strings["Please enter your password for verification:"] = "Пожалуй�та, введите ваш пароль дл� проверки:";
+App::$strings["Remove Account"] = "Удалить аккаунт";
+App::$strings["Unable to find your hub."] = "�евозможно найти ваш �ервер";
+App::$strings["Post successful."] = "У�пешно опубликовано.";
+App::$strings["Channel Export App"] = "Приложение \"Эк�порт канала\"";
+App::$strings["Not Installed"] = "не у�тановлено";
+App::$strings["Export your channel"] = "Эк�портировать ваш канал";
+App::$strings["Export Channel"] = "Эк�порт канала";
+App::$strings["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."] = "Эк�портировать о�новную информацию из канала в файл. Служит в каче�тве резервной копии ваших контактов, о�новных данных и профил�, однако не включает �одержимое. Может быть и�пользовано дл� импорта ваши данных на новый �ервер.";
+App::$strings["Export Content"] = "Эк�портировать �одержимое";
+App::$strings["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."] = "Эк�портировать информацию из вашего канала и его �одержимое в резервную копию в формате JSON котора� может быть и�пользована дл� во��тановлени� или импорта на другом �ервере. Сохран�ет в�е ваши контакты, разрешени�, данные профил� и публикации за не�колько ме��цев. Файл может иметь очень большой размер. Пожалуй�та, будьте терпеливы и подождите не�колько минут пока не начнёт�� загрузка.";
+App::$strings["Export your posts from a given year."] = "Эк�портировать ваши публикации за данный год.";
+App::$strings["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."] = "Вы также можете �к�портировать ваши публикации и бе�еды за определённый ме��ц или год. Выберите дату в панели ме�тоположени� в браузере. Е�ли �к�порт будет неудачным (�то возможно, например, из-за и�черпани� пам�ти на �ервере), повторите попытку, выбрав меньший диапазон дат.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Дл� выбора в�ех публикаций заданного года, например текущего, по�етите <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Дл� выбора в�ех публикаций заданного ме��ца, например за �нварь �его года, по�етите <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["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)."] = "Данные файлы � �одержимым могут быть импортированы и во��тановлены на любом �одержащем ваш канал �айте. По�етите <a href=\"%1\$s\">%2\$s</a>. Дл� лучших результатов пожалуй�та производите импорт и во��тановление в пор�дке датировки (�тарые �начала).";
+App::$strings["Away"] = "�ет на ме�те";
+App::$strings["Online"] = "В �ети";
+App::$strings["Invalid item."] = "�едей�твительный �лемент.";
+App::$strings["Channel not found."] = "Канал не найден.";
+App::$strings["Page not found."] = "Страница не найдена.";
+App::$strings["You must be logged in to see this page."] = "Вы должны авторизовать��, чтобы увидеть �ту �траницу.";
+App::$strings["Posts and comments"] = "Публикации и комментарии";
+App::$strings["Only posts"] = "Только публикации";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "�едо�таточно прав. Запро� перенаправлен на �траницу профил�.";
+App::$strings["Search Results For:"] = "Результаты пои�ка дл�:";
+App::$strings["Reset form"] = "Очи�тить форму";
+App::$strings["You must enable javascript for your browser to be able to view this content."] = "Дл� про�мотра �того �одержимого в вашем браузере должен быть включён JavaScript";
+App::$strings["Change Order of Pinned Navbar Apps"] = "Изменить пор�док приложений на панели навигации";
+App::$strings["Change Order of App Tray Apps"] = "Изменить пор�док приложений в лотке";
+App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "И�пользуйте �трелки дл� перемещени� приложени� влево (вверх) или вправо (вниз) в панели навигации";
+App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "И�пользуйте �трелки дл� перемещени� приложени� вверх или вниз в лотке";
+App::$strings["Nickname is required."] = "Требует�� п�евдоним.";
+App::$strings["Reserved nickname. Please choose another."] = "Зарезервированый п�евдоним. Пожалуй�та, выберите другой.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "П�евдоним имеет недопу�тимые �имволы или уже и�пользует�� на �том �айте.";
 App::$strings["Email address required"] = "Требует�� адре� �лектронной почты";
 App::$strings["No password provided"] = "Пароль не указан";
+App::$strings["Passwords do not match"] = "Пароли не �овпадают";
 App::$strings["Terms of Service not accepted"] = "У�лови� и�пользовани� не были прин�ты";
 App::$strings["Invitation code succesfully applied"] = "Код приглашени� прин�т у�пешно";
 App::$strings["Invitation not in time or too late"] = "Приглашение и�текло или введено не воврем�";
 App::$strings["Invitation email failed"] = "�е удало�ь отправить пи�ьмо � приглашением ";
 App::$strings["Invitation code failed"] = "�еверный код приглашени�";
 App::$strings["Invitations are not available"] = "Приглашени� не до�тупны";
-App::$strings["Email address already in use"] = "�дре� �лектронной почты уже и�пользует��";
 App::$strings["Registration on this hub is by invitation only"] = "Реги�траци� на �том хабе возможна только по приглашени�м";
+App::$strings["Registration confirmation for %s"] = "Подтверждение реги�трации на %s";
 App::$strings["New register request"] = "�овый запро� на реги�трацию";
 App::$strings["Error creating dId A"] = "Ошибка �оздани� dId A";
 App::$strings["Registration on this hub is disabled."] = "Реги�траци� на �том хабе отключена.";
@@ -1912,6 +93,7 @@ App::$strings["Terms of Service"] = "У�лови� предо�тавлени�
 App::$strings["I accept the %s for this website"] = "Я принимаю %s дл� �того веб-�айта.";
 App::$strings["I am over %s years of age and accept the %s for this website"] = "Мой возра�т превышает %s лет и � принимаю %s дл� �того веб-�айта.";
 App::$strings["Your email address"] = "Ваш адре� �лектронной почты";
+App::$strings["Required"] = "Требует��";
 App::$strings["Optional"] = "�еоб�зательно";
 App::$strings["Choose a password"] = "Выберите пароль";
 App::$strings["Please re-enter your password"] = "Пожалуй�та, введите пароль еще раз";
@@ -1925,410 +107,117 @@ App::$strings["This will help to review your registration"] = "Это помож
 App::$strings["Registration"] = "Реги�траци�";
 App::$strings["I have an invite code"] = "У мен� е�ть код приглашени�";
 App::$strings["This site has exceeded the number of allowed daily account registrations."] = "�а �том �айте превышено допу�тимое количе�тво ежедневных реги�траций учетных запи�ей.";
+App::$strings["Page owner information could not be retrieved."] = "Информаци� о владельце �траницы не может быть получена.";
+App::$strings["Album not found."] = "�льбом не найден.";
+App::$strings["Delete Album"] = "Удалить альбом";
+App::$strings["Delete Photo"] = "Удалить фотографию";
 App::$strings["Public access denied."] = "Публичный до�туп запрещен.";
-App::$strings["Items tagged with: %s"] = "Объекты помечены как: %s";
-App::$strings["Search results for: %s"] = "Результаты пои�ка дл�: %s";
-App::$strings["\$Projectname Server - Setup"] = "\$Projectname �ервер - У�тановка";
-App::$strings["Could not connect to database."] = "�е удало�ь подключить�� к �ерверу баз данных.";
-App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "�е удало�ь подключить�� к указанному URL. Веро�тно проблема � SSL �ертификатом или DNS.";
-App::$strings["Could not create table."] = "�е удало�ь �оздать таблицу.";
-App::$strings["Your site database has been installed."] = "Ваша база данных у�тановлена.";
-App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Вам может понадобит�� импортировать файл \"install/schema_xxx.sql\" вручную и�пользу� клиент базы данных.";
-App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Пожалуй�та, обратите�ь к файлу \"install/INSTALL.txt\".";
-App::$strings["System check"] = "Проверка �и�темы";
-App::$strings["Next"] = "Следующа�";
-App::$strings["Check again"] = "Перепроверить";
-App::$strings["Database connection"] = "Подключение к базе данных";
-App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Дл� у�тановки \$Projectname необходимо знать как подключить�� к ваше базе данных.";
-App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Пожалуй�та, �в�жите�ь � вашим хо�тинг провайдером или админи�трацией �айта е�ли у ва� е�ть вопро�ы об �тих на�тройках.";
-App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Указанна� ниже база данных должна �уще�твовать. Е�ли �то не так, пожалуй�та, �оздайте её перед тем, как продолжить.";
-App::$strings["Database Server Name"] = "Им� �ервера баз данных";
-App::$strings["Default is 127.0.0.1"] = "По умолчанию 127.0.0.1";
-App::$strings["Database Port"] = "Порт �ервера баз данных";
-App::$strings["Communication port number - use 0 for default"] = "Порт коммуникации - и�пользуйте 0 по умолчанию";
-App::$strings["Database Login Name"] = "Им� дл� подключени� к базе данных";
-App::$strings["Database Login Password"] = "Пароль дл� подключени� к базе данных";
-App::$strings["Database Name"] = "Им� базы данных";
-App::$strings["Database Type"] = "Тип базы данных";
-App::$strings["Site administrator email address"] = "�дре� �лектронной почты админи�тратора �айта";
-App::$strings["Your account email address must match this in order to use the web admin panel."] = "Ваш адре� �лектронной почты должен �оответ�твовать �тому дл� и�пользовани� веб-панели админи�тратора.";
-App::$strings["Website URL"] = "URL веб-�айта";
-App::$strings["Please use SSL (https) URL if available."] = "Пожалуй�та, и�пользуйте SSL (https) URL е�ли возможно.";
-App::$strings["Please select a default timezone for your website"] = "Пожалуй�та, выберите ча�овой по�� по умолчанию дл� вашего �айта";
-App::$strings["Site settings"] = "�а�тройки �айта";
-App::$strings["PHP version 7.1 or greater is required."] = "Требует�� PHP вер�ии 7.1 или �тарше.";
-App::$strings["PHP version"] = "Вер�и� PHP";
-App::$strings["Could not find a command line version of PHP in the web server PATH."] = "�е удало�ь найти кон�ольную вер�ию PHP в пут�х переменной PATH веб-�ервера.";
-App::$strings["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."] = "Е�ли у ва� на �ервере не у�тановлена кон�ольна� вер�и� PHP вы не �можете запу�тить фоновый опро� через cron. ";
-App::$strings["PHP executable path"] = "Пу�ть к и�полн�емому модулю PHP";
-App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Введите полный путь к и�полн�емому модулю PHP. Вы можете о�тавить его пу�тым дл� продолжени� у�тановки.";
-App::$strings["Command line PHP"] = "Командна� �трока PHP";
-App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "�евозможно проверить командную �троку PHP по�кольку требуема� функци� shell_exec() отключена.";
-App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "В кон�ольной вер�ии PHP в вашей �и�теме отключена опци� \"register_argc_argv\".";
-App::$strings["This is required for message delivery to work."] = "Это необходимо дл� функционировани� до�тавки �ообщений.";
-App::$strings["PHP register_argc_argv"] = "";
-App::$strings["This is not sufficient to upload larger images or files. You should be able to upload at least 4 MB at once."] = "Этого недо�таточно дл� загрузки больших изображений или файлов. Вы должны иметь возможно�ть загрузить как минимум 4 Мб за раз.";
-App::$strings["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."] = "Мак�имально разрешённый общий размер загрузок у�тановлен в %s. Мак�имальный размер одной загрузки у�тановлен в %s. Вам разрешено загружать до %d файлов за один приём.";
-App::$strings["You can adjust these settings in the server php.ini file."] = "Вы можете изменить �ти на�тройки в файле php.ini на �ервере.";
-App::$strings["PHP upload limits"] = "Мак�имальный размер загрузки в PHP";
-App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Ошибка: функци� \"openssl_pkey_new\" не может �генерировать ключи шифровани�";
-App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Е�ли работаете под Windows, �м. \"http://www.php.net/manual/en/openssl.installation.php\".";
-App::$strings["Generate encryption keys"] = "Генераци� ключей шифровани�";
-App::$strings["libCurl PHP module"] = "модуль PHP libcURL";
-App::$strings["GD graphics PHP module"] = "модуль графики PHP GD";
-App::$strings["OpenSSL PHP module"] = "модуль PHP OpenSSL";
-App::$strings["PDO database PHP module"] = "модуль баз данных PHP PDO";
-App::$strings["mb_string PHP module"] = "модуль PHP mb_string";
-App::$strings["xml PHP module"] = "модуль PHP xml";
-App::$strings["zip PHP module"] = "модуль PHP zip";
-App::$strings["Apache mod_rewrite module"] = "модуль Apache mod_rewrite";
-App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Ошибка: требуемый модуль mod_rewrite веб-�ервера Apache не у�тановлен.";
-App::$strings["exec"] = "";
-App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Ошибка: exec требует��, однако не у�тановлен или был отключён в php.ini";
-App::$strings["shell_exec"] = "";
-App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Ошибка: shell_exec требует��, однако не у�тановлен или был отключён в php.ini";
-App::$strings["Error: libCURL PHP module required but not installed."] = "Ошибка: модуль PHP lib�URL требует��, однако не у�тановлен";
-App::$strings["Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed."] = "Ошибка: модуль PHP GD � поддержкой JPEG или графиче�ка� библиотека ImageMagick требует��, однако не у�тановлена";
-App::$strings["Error: openssl PHP module required but not installed."] = "Ошибка: модуль PHP OpenSSL требует��, однако не у�тановлен";
-App::$strings["Error: PDO database PHP module missing a driver for either mysql or pgsql."] = "Ошибка: от�ут�твует драйвер MySQL или PgSQL в модуле баз данных PHP PDO";
-App::$strings["Error: PDO database PHP module required but not installed."] = "Ошибка: модуль баз данных PHP PDO требует��, однако не у�тановлен";
-App::$strings["Error: mb_string PHP module required but not installed."] = "Ошибка: модуль PHP mb_string требует��, однако не у�тановлен";
-App::$strings["Error: xml PHP module required for DAV but not installed."] = "Ошибка: модуль PHP xml требует�� дл� DAV, однако не у�тановлен";
-App::$strings["Error: zip PHP module required but not installed."] = "Ошибка: модуль PHP zip требует��, однако не у�тановлен";
-App::$strings[".htconfig.php is writable"] = ".htconfig.php до�тупен дл� запи�и";
-App::$strings["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."] = "Ин�талл�тор требует возможно�ти �оздать файл � именем \".htconfig.php\" в корневом каталоге вашего веб-�ервера но не может �того �делать.";
-App::$strings["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."] = "В большин�тве �лучаев �то проблема прав до�тупа. Веб-�ервер может не иметь возможно�ти запи�ывать файлы в �тот каталог даже е�ли вы можете �то делать.";
-App::$strings["Please see install/INSTALL.txt for additional information."] = "Пожалуй�та, ознакомьте�ь � install/INSTALL.txt дл� дополнительных �ведений.";
-App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Это программное обе�печение и�пользует шаблонизатор Smarty3 дл� отображени� �воих веб-�траниц. Smarty3 компилирует шаблоны дл� PHP дл� у�корени� рендеринга.";
-App::$strings["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."] = "Дл� хранени� �тих �компилированных шаблонов веб-�ервер должен иметь до�туп на запи�ь к каталогу %s в каталоге верхнего уровн�.";
-App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Убедите�ь, что пользователь от имени которого работает ваш веб-�ервер (например, www-data), имеет до�туп на запи�ь в �тот каталог.";
-App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Примечание. В каче�тве меры безопа�но�ти вы должны предо�тавить до�туп веб-�ерверу дл� запи�и только к %s но не к �одержащими�� в нём файлами шаблонов (.tpl).";
-App::$strings["%s is writable"] = "%s до�тупен дл� запи�и";
-App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Эта программа и�пользует каталог хранени� дл� загруженных файлов. Дл� веб-�ервера требует�� до�туп на запи�ь начина� � верхнего уровн� каталога хранени�.";
-App::$strings["store is writable"] = "хранилище до�тупно дл� запи�и";
-App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Замените его или отключите https до�туп к �тому �айту.";
-App::$strings["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!"] = "Е�ли у ва� е�ть https-до�туп к вашему �айту или разрешено подключение к TCP-порту 443 (порт https), вы ДОЛЖ�Ы и�пользовать �ертификат, дей�твительный дл� браузера. Вы �Е ДОЛЖ�Ы и�пользовать �амоподпи�анные �ертификаты!";
-App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Эти ограничени� прин�ты по�кольку ваши общедо�тупные публикации могут, например, �одержать ��ылки на изображени� на вашем �об�твенном хабе.";
-App::$strings["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."] = "Е�ли ваш �ертификат не признан, пользователи других �айтов (которые могут �ами иметь дей�твительные �ертификаты) получат предупреждающее �ообщение о проблемах � безопа�но�тью.";
-App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Это может приве�ти к проблемам удоб�тва и�пользовани� из других ме�т (не только на вашем �об�твенном �айте), по�тому мы на�таиваем на �том требовании.";
-App::$strings["Providers are available that issue free certificates which are browser-valid."] = "До�тупны по�тавщики, которые выдают дей�твительные дл� браузера бе�платные �ертификаты.";
-App::$strings["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."] = "Е�ли вы уверены, что �ертификат дей�твителен и подпи�ан доверенным органом, проверьте, у�тановлен ли промежуточные �ертификаты. Обычно они не требуют�� браузерами, но бывают необходимы дл� �в�зи между �ерверами.";
-App::$strings["SSL certificate validation"] = "Проверка SSL �ертификата";
-App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Перезапи�ь URL в .htaccess не работает. Проверьте на�тройки вашего �ервера.";
-App::$strings["Url rewrite is working"] = "Перезапи�ь URL работает";
-App::$strings["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."] = "Файл конфигурации базы данных \".htconfig.php\" не может быть запи�ан. И�пользуйте прилагаемый тек�т дл� �оздани� файла конфигурации в корневом каталоге веб-�ервера.";
-App::$strings["<h1>What next?</h1>"] = "<h1>Что дальше? </h1>";
-App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Вам понадобит�� [вручную] на�троить запланированную задачу дл� опрашивател�.";
-App::$strings["No connections."] = "Контактов нет.";
-App::$strings["Visit %s's profile [%s]"] = "По�етить %s ​​профиль [%s]";
-App::$strings["View Connections"] = "Про�мотр контактов";
-App::$strings["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."] = "Указанные хабы разрешают публичную реги�трацию дл� �ети \$Projectname. В�е хабы в �ети взаимо�в�заны, по�тому член�тво в любом из них передает член�тво во в�ю �еть. �екоторым хабам может потребовать�� подпи�ка или предо�тавление многоуровневых планов об�луживани�. Сам хаб <strong>может</strong> предо�тавить дополнительные �ведени�.";
-App::$strings["Hub URL"] = "URL �ервера";
-App::$strings["Access Type"] = "Тип до�тупа";
-App::$strings["Registration Policy"] = "Политика реги�трации";
-App::$strings["Stats"] = "Стати�тика";
-App::$strings["Software"] = "Программное обе�печение";
-App::$strings["Rate"] = "Оценка";
-App::$strings["View"] = "Про�мотр";
-App::$strings["Posts and comments"] = "Публикации и комментарии";
-App::$strings["Only posts"] = "Только публикации";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "�едо�таточно прав. Запро� перенаправлен на �траницу профил�.";
-App::$strings["You must enable javascript for your browser to be able to view this content."] = "Дл� про�мотра �того �одержимого в вашем браузере должен быть включён JavaScript";
-App::$strings["Invalid profile identifier."] = "�еверный идентификатор профил�";
-App::$strings["Profile Visibility Editor"] = "Редактор видимо�ти профил�";
-App::$strings["Click on a contact to add or remove."] = "�ажмите на контакт, чтобы добавить или удалить.";
-App::$strings["Visible To"] = "Видно";
-App::$strings["All Connections"] = "В�е контакты";
-App::$strings["Privacy group created."] = "Группа конфиденциально�ти �оздана.";
-App::$strings["Could not create privacy group."] = "�е удало�ь �оздать группу конфиденциально�ти.";
-App::$strings["Privacy group updated."] = "Группа конфиденциально�ти обновлена.";
-App::$strings["Privacy Groups App"] = "Приложение \"Группы конфиденциально�ти\"";
-App::$strings["Management of privacy groups"] = "Управление группами конфиденциально�ти.";
-App::$strings["Add Group"] = "Добавить группу";
-App::$strings["Privacy group name"] = "Им� группы конфиденциально�ти";
-App::$strings["Members are visible to other channels"] = "Уча�тники канала видимые дл� о�тальных";
-App::$strings["Members"] = "Уча�тники";
-App::$strings["Privacy group removed."] = "Группа конфиденциально�ти удалена.";
-App::$strings["Unable to remove privacy group."] = "�у удало�ь удалить группу конфиденциально�ти.";
-App::$strings["Privacy Group: %s"] = "Группа конфиденциально�ти: %s";
-App::$strings["Privacy group name: "] = "�азвание группы конфиденциально�ти: ";
-App::$strings["Delete Group"] = "Удалить группу";
-App::$strings["Group members"] = "Члены группы";
-App::$strings["Not in this group"] = "�е в �той группе";
-App::$strings["Click a channel to toggle membership"] = "�ажмите на канал дл� про�мотра член�тва";
-App::$strings["Edit Card"] = "Редактировать карточку";
-App::$strings["This page is available only to site members"] = "Эта �траница до�тупна только дл� подпи�чиков �айта";
-App::$strings["Welcome"] = "Добро пожаловать";
-App::$strings["What would you like to do?"] = "Что бы вы хотели �делать?";
-App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Пожалуй�та, запомните �ту �траницу е�ли вы хотите вернуть�� на неё в будущем";
-App::$strings["Upload a profile photo"] = "Загрузить фотографию профил�";
-App::$strings["Upload a cover photo"] = "Загрузить фотографию обложки";
-App::$strings["Edit your default profile"] = "Редактировать ваш профиль по умолчанию";
-App::$strings["View the channel directory"] = "Про�мотр каталога каналов";
-App::$strings["View/edit your channel settings"] = "Про�мотреть / редактировать на�тройки вашего канала";
-App::$strings["View the site or project documentation"] = "Про�мотр документации �айта / проекта";
-App::$strings["Visit your channel homepage"] = "По�етить �траницу вашего канала";
-App::$strings["View your connections and/or add somebody whose address you already know"] = "Про�мотреть ваши контакты и / или добавить кого-то чей адре� в уже знаете";
-App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ваш пер�ональный поток (может быть пу�т пока вы не добавите контакты)";
-App::$strings["View the public stream. Warning: this content is not moderated"] = "Про�мотр публичного потока. Предупреждение: �тот контент не модерирует��";
-App::$strings["Name is required"] = "�еобходимо им�";
-App::$strings["Key and Secret are required"] = "Требуют�� ключ и код";
-App::$strings["Update"] = "Обновить";
-App::$strings["OAuth Apps Manager App"] = "Приложение \"Менеджер Oauth\"";
-App::$strings["OAuth authentication tokens for mobile and remote apps"] = "Токены аутентификации OAuth дл� мобильный и удалённых приложений";
-App::$strings["Add application"] = "Добавить приложение";
-App::$strings["Name of application"] = "�азвание приложени�";
-App::$strings["Automatically generated - change if desired. Max length 20"] = "Сгенерирован автоматиче�кие - измените е�ли требует��. Мак�. длина 20";
-App::$strings["Redirect"] = "Перенаправление";
-App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI перенаправлени� - о�тавьте пу�тыми до тех пока ваше приложение не требует �того";
-App::$strings["Icon url"] = "URL значка";
-App::$strings["Application not found."] = "Приложение не найдено.";
-App::$strings["Connected OAuth Apps"] = "Подключенные приложени� OAuth";
-App::$strings["Client key starts with"] = "Ключ клиента начинает�� �";
-App::$strings["No name"] = "Без названи�";
-App::$strings["Remove authorization"] = "Удалить разрешение";
-App::$strings["Page link"] = "С�ылка �траницы";
-App::$strings["Edit Webpage"] = "Редактировать веб-�траницу";
-App::$strings["This site is not a directory server"] = "Этот �айт не �вл�ет�� �ервером каталога";
-App::$strings["This directory server requires an access token"] = "Дл� до�тупа к �тому �ерверу каталогов требует�� токен";
-App::$strings["Welcome to Hubzilla!"] = "Добро пожаловать в Hubzilla!";
-App::$strings["You have got no unseen posts..."] = "У ва� нет непро�мотренных публикаций...";
-App::$strings["Unable to locate original post."] = "�е удало�ь найти оригинальную публикацию.";
-App::$strings["Chatrooms App"] = "Приложение \"Мои чаты\"";
-App::$strings["Access Controlled Chatrooms"] = "Получить до�туп к контролируемым чатам";
-App::$strings["Room not found"] = "Комната не найдена";
-App::$strings["Leave Room"] = "Покинуть комнату";
-App::$strings["Delete Room"] = "Удалить комнату";
-App::$strings["I am away right now"] = "Я �ейча� отошёл";
-App::$strings["I am online"] = "Я на �в�зи";
-App::$strings["Bookmark this room"] = "Запомнить �ту комнату";
-App::$strings["New Chatroom"] = "�овый чат";
-App::$strings["Chatroom name"] = "�азвание чата";
-App::$strings["Expiration of chats (minutes)"] = "Завершение чатов (минут)";
-App::$strings["%1\$s's Chatrooms"] = "Чаты пользовател� %1\$s";
-App::$strings["No chatrooms available"] = "�ет до�тупных чатов";
-App::$strings["Create New"] = "Создать новый";
-App::$strings["Expiration"] = "Срок дей�тви�";
-App::$strings["min"] = "мин.";
-App::$strings["Event can not end before it has started."] = "Событие не может завершить�� до его начала.";
-App::$strings["Unable to generate preview."] = "�евозможно �оздать предварительный про�мотр.";
-App::$strings["Event title and start time are required."] = "Требуют�� наименование �обыти� и врем� начала.";
-App::$strings["Event not found."] = "Событие не найдено.";
-App::$strings["Edit event"] = "Редактировать �обытие";
-App::$strings["Delete event"] = "Удалить �обытие";
-App::$strings["Link to source"] = "С�ылка на и�точник";
-App::$strings["calendar"] = "календарь";
-App::$strings["Failed to remove event"] = "�е удало�ь удалить �обытие";
-App::$strings["Like/Dislike"] = "�равит�� / не нравит��";
-App::$strings["This action is restricted to members."] = "Это дей�твие до�тупно только уча�тникам.";
-App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Пожалуй�та, дл� продолжени� <a href=\"rmagic\"> войдите � вашим \$Projectname ID</a> или <a href=\"register\">зареги�трируйте�ь как новый уча�тник \$Projectname</a>.";
-App::$strings["Invalid request."] = "�еверный запро�.";
-App::$strings["thing"] = "предмет";
-App::$strings["Channel unavailable."] = "Канал недо�тупен.";
-App::$strings["Previous action reversed."] = "Предыдущее дей�твие отменено.";
-App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s �огла�ен � %2\$s %3\$s";
-App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s не �огла�ен � %2\$s %3\$s";
-App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s воздерживает�� от решени� по %2\$s%3\$s";
-App::$strings["Action completed."] = "Дей�твие завершено.";
-App::$strings["Thank you."] = "Спа�ибо.";
-App::$strings["Poke App"] = "Приложение \"Ткнуть\"";
-App::$strings["Poke somebody in your addressbook"] = "Ткнуть кого-нибудь в вашей адре�ной книге";
-App::$strings["Poke somebody"] = "Ткнуть кого-нибудь";
-App::$strings["Poke/Prod"] = "Толкнуть / подтолкнуть";
-App::$strings["Poke, prod or do other things to somebody"] = "Толкнуть, подтолкнуть или �делать что-то ещё � кем-то";
-App::$strings["Recipient"] = "Получатель";
-App::$strings["Choose what you wish to do to recipient"] = "Выбрать что вы хотите �делать � получателем";
-App::$strings["Make this post private"] = "Сделать �ту публикацию приватной";
-App::$strings["Calendar entries imported."] = "Событи� календар� импортированы.";
-App::$strings["No calendar entries found."] = "�е найдено �обытий в календаре.";
-App::$strings["CardDAV App"] = "Приложение CardDAV";
-App::$strings["CalDAV capable addressbook"] = "�дре�на� книга � поддержкой CalDAV";
-App::$strings["Event title"] = "�аименование �обыти�";
-App::$strings["Start date and time"] = "Дата и врем� начала";
-App::$strings["End date and time"] = "Дата и врем� окончани�";
-App::$strings["Timezone:"] = "Ча�овой по��:";
+App::$strings["No photos selected"] = "�икакие фотографии не выбраны";
+App::$strings["Access to this item is restricted."] = "До�туп к �тому �лементу ограничен.";
+App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Вы и�пользовали %1$.2f мегабайт из %2$.2f дл� хранени� фото.";
+App::$strings["%1$.2f MB photo storage used."] = "Вы и�пользовали %1$.2f мегабайт дл� хранени� фото.";
+App::$strings["Upload Photos"] = "Загрузить фотографии";
+App::$strings["Enter an album name"] = "Введите название альбома";
+App::$strings["or select an existing album (doubleclick)"] = "или выберите �уще�твующий альбом (двойной щелчок)";
+App::$strings["Create a status post for this upload"] = "Сделать публикацию о �тату�е дл� �той загрузки";
+App::$strings["Title (optional)"] = "Заголовок (необ�зательно)";
+App::$strings["Description (optional)"] = "Опи�ание (необ�зательно)";
+App::$strings["Permissions"] = "Разрешени�";
+App::$strings["Upload"] = "Загрузка";
+App::$strings["Show Newest First"] = "Показать новые первыми";
+App::$strings["Show Oldest First"] = "Показать �тарые первыми";
+App::$strings["View Photo"] = "По�мотреть фотографию";
+App::$strings["Unknown"] = "�еизве�тный";
+App::$strings["Edit Album"] = "Редактировать Фотоальбом";
+App::$strings["Add Photos"] = "Добавить фотографии";
+App::$strings["Permission denied. Access to this item may be restricted."] = "До�туп запрещен. До�туп к �тому �лементу может быть ограничен.";
+App::$strings["Photo not available"] = "Фотографи� не до�тупна";
+App::$strings["Use as profile photo"] = "И�пользовать в каче�тве фотографии профил�";
+App::$strings["Use as cover photo"] = "И�пользовать в каче�тве фотографии обложки";
+App::$strings["Private Photo"] = "Лична� фотографи�";
 App::$strings["Previous"] = "Предыдуща�";
-App::$strings["Today"] = "Сегодн�";
-App::$strings["Month"] = "Ме��ц";
-App::$strings["Week"] = "�едел�";
-App::$strings["Day"] = "День";
-App::$strings["List month"] = "Про�мотреть ме��ц";
-App::$strings["List week"] = "Про�мотреть неделю";
-App::$strings["List day"] = "Про�мотреть день";
-App::$strings["More"] = "Больше";
-App::$strings["Less"] = "Меньше";
-App::$strings["Select calendar"] = "Выбрать календарь";
-App::$strings["Delete all"] = "Удалить в�ё";
-App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Про�тите, но редактирование повтор�ющих�� �обытий пока не реализовано.";
-App::$strings["Organisation"] = "Организаци�";
-App::$strings["Phone"] = "Телефон";
-App::$strings["Instant messenger"] = "Ме��енджер";
-App::$strings["Website"] = "Веб-�айт";
-App::$strings["Address"] = "�дре�";
-App::$strings["Note"] = "Заметка";
-App::$strings["Add Contact"] = "Добавить контакт";
-App::$strings["Add Field"] = "Добавить поле";
-App::$strings["P.O. Box"] = "абонент�кий �щик";
-App::$strings["Additional"] = "Дополнительно";
-App::$strings["Street"] = "Улица";
-App::$strings["Locality"] = "�а�елённый пункт";
-App::$strings["Region"] = "Регион";
-App::$strings["ZIP Code"] = "Индек�";
-App::$strings["Country"] = "Страна";
-App::$strings["Default Calendar"] = "Календарь по умолчанию";
-App::$strings["Default Addressbook"] = "�дре�на� книга по умолчанию";
-App::$strings["Remote privacy information not available."] = "Удаленна� информаци� о конфиденциально�ти недо�тупна.";
-App::$strings["Visible to:"] = "Видимо дл�:";
-App::$strings["__ctx:acl__ Profile"] = "Профиль";
-App::$strings["Empty post discarded."] = "Пу�та� публикаци� отклонена.";
-App::$strings["Duplicate post suppressed."] = "Подавлена дублирующа��� публикаци�.";
-App::$strings["System error. Post not saved."] = "Си�темна� ошибка. Публикаци� не �охранена.";
-App::$strings["Your comment is awaiting approval."] = "Ваш комментарий ожидает одобрени�.";
-App::$strings["Unable to obtain post information from database."] = "�евозможно получить информацию о публикации из базы данных";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Вы до�тигли вашего ограничени� в %1$.0f публикаций вы�окого уровн�.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Вы до�тигли вашего ограничени� в %1$.0f  �траниц.";
-App::$strings["Menu not found."] = "Меню не найдено";
-App::$strings["Unable to create element."] = "�евозможно �оздать �лемент.";
-App::$strings["Unable to update menu element."] = "�евозможно обновить �лемент меню.";
-App::$strings["Unable to add menu element."] = "�евозможно добавить �лемент меню.";
-App::$strings["Not found."] = "�е найдено.";
-App::$strings["Menu Item Permissions"] = "Разрешени� на пункт меню";
-App::$strings["(click to open/close)"] = "(нажмите чтобы открыть/закрыть)";
-App::$strings["Link Name"] = "Им� ��ылки";
-App::$strings["Link or Submenu Target"] = "С�ылка или цель подменю";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Введите URL ��ылки или выберите им� меню дл� �оздани� подменю";
-App::$strings["Use magic-auth if available"] = "И�пользовать magic-auth е�ли возможно";
-App::$strings["Open link in new window"] = "Открыть ��ылку в новом окне";
-App::$strings["Order in list"] = "Пор�док в �пи�ке";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Большие значени� в конце �пи�ка";
-App::$strings["Submit and finish"] = "Отправить и завершить";
-App::$strings["Submit and continue"] = "Отправить и продолжить";
-App::$strings["Menu:"] = "Меню:";
-App::$strings["Link Target"] = "Цель ��ылки";
-App::$strings["Edit menu"] = "Редактировать меню";
-App::$strings["Edit element"] = "Редактировать �лемент";
-App::$strings["Drop element"] = "Удалить �лемент";
-App::$strings["New element"] = "�овый �лемент";
-App::$strings["Edit this menu container"] = "Редактировать контейнер меню";
-App::$strings["Add menu element"] = "Добавить �лемент меню";
-App::$strings["Delete this menu item"] = "Удалить �тот �лемент меню";
-App::$strings["Edit this menu item"] = "Редактировать �тот �лемент меню";
-App::$strings["Menu item not found."] = "Элемент меню не найден.";
-App::$strings["Menu item deleted."] = "Элемент меню удалён.";
-App::$strings["Menu item could not be deleted."] = "�евозможно удалить �лемент меню.";
-App::$strings["Edit Menu Element"] = "Редактировать �лемент меню";
-App::$strings["Link text"] = "Тек�т ��ылки";
-App::$strings["vcard"] = "vCard";
-App::$strings["Files: shared with me"] = "Файлы: поделили�ь �о мной";
-App::$strings["NEW"] = "�ОВОЕ";
-App::$strings["Last Modified"] = "По�леднее изменение";
-App::$strings["Remove all files"] = "Удалить в�е файлы";
-App::$strings["Remove this file"] = "Удалить �тот файл";
-App::$strings["Documentation Search"] = "Пои�к документации";
-App::$strings["Administrators"] = "�дмини�траторы";
-App::$strings["Developers"] = "Разработчики";
-App::$strings["Tutorials"] = "Руковод�тва";
-App::$strings["\$Projectname Documentation"] = "\$Projectname Документаци�";
-App::$strings["Contents"] = "Содержимое";
-App::$strings["Webpages App"] = "Приложение \"Веб-�траницы\"";
-App::$strings["Provide managed web pages on your channel"] = "Предо�тавл�ть управл�емые веб-�траницы на Вашем канале";
-App::$strings["Import Webpage Elements"] = "Импортировать ча�ти веб-�траницы";
-App::$strings["Import selected"] = "Импортировать выбранное";
-App::$strings["Export Webpage Elements"] = "Эк�портировать ча�ть веб-�траницы";
-App::$strings["Export selected"] = "Эк�портировать выбранное";
-App::$strings["Actions"] = "Дей�тви�";
-App::$strings["Page Link"] = "С�ылка �траницы";
-App::$strings["Page Title"] = "Заголовок �траницы";
-App::$strings["Created"] = "Создано";
-App::$strings["Edited"] = "Отредактировано";
-App::$strings["Invalid file type."] = "�еверный тип файла.";
-App::$strings["Error opening zip file"] = "Ошибка открыти� ZIP файла";
-App::$strings["Invalid folder path."] = "�еверный путь к каталогу.";
-App::$strings["No webpage elements detected."] = "�е обнаружено ча�тей веб-�траницы.";
-App::$strings["Import complete."] = "Импорт завершен.";
-App::$strings["Deprecated!"] = "�е рекомендовано!";
-App::$strings["Permission Denied."] = "До�туп запрещен.";
-App::$strings["Edit file permissions"] = "Редактировать разрешени� файла";
-App::$strings["Include all files and sub folders"] = "Включить в�е файлы и подкаталоги";
-App::$strings["Return to file list"] = "Вернут�� к �пи�ку файлов";
-App::$strings["Copy/paste this code to attach file to a post"] = "Копировать / в�тавить �тот код дл� прикреплени� файла к публикации";
-App::$strings["Copy/paste this URL to link file from a web page"] = "Копировать / в�тавить �ту URL дл� ��ылки на файл �о �траницы";
-App::$strings["Share this file"] = "Поделить�� �тим файлом";
-App::$strings["Show URL to this file"] = "Показать URL �того файла";
-App::$strings["Show in your contacts shared folder"] = "Показать общий каталог в ваших контактах";
-App::$strings["Tag removed"] = "Тег удалён";
-App::$strings["Remove Item Tag"] = "Удалить тег �лемента";
-App::$strings["Select a tag to remove: "] = "Выбрать тег дл� удалени�:";
-App::$strings["Continue"] = "Продолжить";
-App::$strings["Premium Channel Setup"] = "У�тановка премиального канала";
-App::$strings["Enable premium channel connection restrictions"] = "Включить ограничени� дл� премиального канала";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Пожалуй�та введите ваши ограничени� или у�лови�, такие, как оплата PayPal, правила и�пользовани� и т.п.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Этот канал до подключени� может требовать дополнительных шагов или подтверждений �ледующих у�ловий:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Потенциальные �оединени� будут видеть �ледующий предварительный тек�т:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Продолжа�, � подтверждаю что � выполнил в�е у�лови� пред�тавленные на данной �транице.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Владельцем канала не было пред�тавлено никаких �пециальных ин�трукций.)";
-App::$strings["Restricted or Premium Channel"] = "Ограниченный или премиальный канал";
-App::$strings["Not found"] = "�е найдено.";
-App::$strings["Unknown error"] = "�еизве�тна� ошибка";
-App::$strings["&#x1f501; Repeated %1\$s's %2\$s"] = "&#x1f501; Повторил %1\$s %2\$s";
-App::$strings["Post repeated"] = "Публикаци� повтор�ет��";
-App::$strings["network"] = "�еть";
-App::$strings["Item is not editable"] = "Элемент нельз� редактировать";
-App::$strings["Edit post"] = "Редактировать �ообщение";
-App::$strings["Post not found."] = "Публикаци� не найдена";
-App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s отметил тегом %4\$s %3\$s %2\$s";
-App::$strings["Unknown App"] = "�еизве�тное приложение";
-App::$strings["Authorize"] = "�вторизовать";
-App::$strings["Do you authorize the app %s to access your channel data?"] = "�вторизуете ли вы приложение %s дл� до�тупа к данным вашего канала?";
-App::$strings["Deny"] = "Запретить";
-App::$strings["Queue Statistics"] = "Стати�тика очереди";
-App::$strings["Total Entries"] = "В�его запи�ей";
-App::$strings["Priority"] = "Приоритет";
-App::$strings["Destination URL"] = "Конечный URL-адре�";
-App::$strings["Mark hub permanently offline"] = "Пометить хаб как по�то�нно отключенный";
-App::$strings["Empty queue for this hub"] = "О�вободить очередь дл� �того хаба";
-App::$strings["Last known contact"] = "По�ледний изве�тный контакт";
-App::$strings["Theme settings updated."] = "�а�тройки темы обновленны.";
-App::$strings["No themes found."] = "Темы не найдены.";
-App::$strings["Disable"] = "Запретить";
-App::$strings["Enable"] = "Разрешить";
-App::$strings["Screenshot"] = "Снимок �крана";
-App::$strings["Administration"] = "�дмини�трирование";
-App::$strings["Toggle"] = "Переключить";
-App::$strings["Author: "] = "�втор: ";
-App::$strings["Maintainer: "] = "Сопровождающий:";
-App::$strings["[Experimental]"] = "[�к�периментальный]";
-App::$strings["[Unsupported]"] = "[неподдерживаемый]";
-App::$strings["Lock feature %s"] = "Заблокировать функцию \"%s\"";
-App::$strings["Manage Additional Features"] = "Управление дополнительными функци�ми";
-App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "По умолчанию, HTML без фильтрации до�тупен во в�траиваемых медиа. Это небезопа�но.";
-App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Рекомендует�� на�троить разрешени� и�пользовать HTML без фильтрации только дл� �ледующих �айтов:";
-App::$strings["https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"] = "";
-App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "�е о�тальные в�троенные материалы будут отфильтрованы, <strong>е�ли </strong> в�троенное �одержимое � �того �айта �вно заблокировано.";
-App::$strings["Block public"] = "Блокировать публичный до�туп";
-App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "У�тановите флажок дл� блокировки публичного до�тупа ко в�ем другим общедо�тупным �траницам на �том �айте, е�ли вы в на�то�щее врем� не аутентифицированы.";
-App::$strings["Provide a cloud root directory"] = "Предо�тавить корневой каталог в облаке";
-App::$strings["The cloud root directory lists all channel names which provide public files"] = "В корневом каталоге облака показывают�� в�е имена каналов, которые предо�тавл�ют общедо�тупные файлы";
-App::$strings["Show total disk space available to cloud uploads"] = "Показывать общее до�тупное дл� загрузок ме�то в хранилище";
-App::$strings["Set \"Transport Security\" HTTP header"] = "У�тановить HTTP-заголовок \"Transport Security\"";
-App::$strings["Set \"Content Security Policy\" HTTP header"] = "У�тановить HTTP-заголовок \"Content Security Policy\"";
-App::$strings["Allowed email domains"] = "Разрешённые домены email";
-App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Спи�ок разделённых зап�тыми доменов дл� которых разрешена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены.";
-App::$strings["Not allowed email domains"] = "Запрещённые домены email";
-App::$strings["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."] = "Спи�ок разделённых зап�тыми доменов дл� которых запрещена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны.";
-App::$strings["Allow communications only from these sites"] = "Разрешить �в�зь только � �тими �айтами";
-App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Один �айт на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� без ограничений (по умочанию).";
-App::$strings["Block communications from these sites"] = "Блокировать �в�зь � �тими �айтами";
-App::$strings["Allow communications only from these channels"] = "Разрешить �в�зь только дл� �тих каналов";
-App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Один канал (или его х�ш) на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� � любым каналом (по умолчанию).";
-App::$strings["Block communications from these channels"] = "Блокировать �в�зь � �тими каналами";
-App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Разрешать в�траивание только дл� безопа�ных (SSL/TLS) �айтов и ��ылок.";
-App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Разрешить  в�траивать нефильтруемое HTML-�одержимое только дл� �тих доменов";
-App::$strings["One site per line. By default embedded content is filtered."] = "Один �айт на �троку. По умолчанию в�траиваемое �одержимое фильтрует��.";
-App::$strings["Block embedded HTML from these domains"] = "Блокировать в�траивание HTML-�одержимого дл� �тих доменов";
-App::$strings["Allow SVG thumbnails in file browser"] = "Разрешить SVG миниатюры в про�мотрщике файлов";
-App::$strings["WARNING: SVG images may contain malicious code."] = "Внимание: изображени� SVG могут �одержать вредоно�ный код.";
-App::$strings["Allow embedded (inline) PDF files"] = "Разрешить в�траивание дл� файлов PDF";
+App::$strings["View Full Size"] = "По�мотреть в полный размер";
+App::$strings["Next"] = "Следующа�";
+App::$strings["Remove"] = "Удалить";
+App::$strings["Edit photo"] = "Редактировать фотографию";
+App::$strings["Rotate CW (right)"] = "Повернуть CW (направо)";
+App::$strings["Rotate CCW (left)"] = "Повернуть CCW (налево)";
+App::$strings["Move photo to album"] = "Переме�тить фотографию в альбом";
+App::$strings["Enter a new album name"] = "Введите новое название альбома";
+App::$strings["or select an existing one (doubleclick)"] = "или выбрать �уще�твующую (двойной щелчок)";
+App::$strings["Add a Tag"] = "Добавить тег";
+App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Пример: @bob, @Barbara_Jensen, @jim@example.com";
+App::$strings["Flag as adult in album view"] = "Пометить как альбом \"дл� взро�лых\"";
+App::$strings["Submit"] = "Отправить";
+App::$strings["I like this (toggle)"] = "мне �то нравит�� (переключение)";
+App::$strings["I don't like this (toggle)"] = "мне �то не нравит�� (переключение)";
+App::$strings["Share"] = "Поделить��";
+App::$strings["Please wait"] = "Подождите пожалуй�та";
+App::$strings["This is you"] = "Это вы";
+App::$strings["Comment"] = "Комментарий";
+App::$strings["Preview"] = "Предварительный про�мотр";
+App::$strings["__ctx:title__ Likes"] = "�равит��";
+App::$strings["__ctx:title__ Dislikes"] = "�е нравит��";
+App::$strings["__ctx:title__ Agree"] = "Согла�ен";
+App::$strings["__ctx:title__ Disagree"] = "�е �огла�ен";
+App::$strings["__ctx:title__ Abstain"] = "Воздержал��";
+App::$strings["__ctx:title__ Attending"] = "По�ещаю";
+App::$strings["__ctx:title__ Not attending"] = "�е по�ещаю";
+App::$strings["__ctx:title__ Might attend"] = "Возможно по�ещу";
+App::$strings["View all"] = "Про�мотреть в�е";
+App::$strings["__ctx:noun__ Like"] = array(
+	0 => "�равит��",
+	1 => "�равит��",
+	2 => "�равит��",
+);
+App::$strings["__ctx:noun__ Dislike"] = array(
+	0 => "�е нравит��",
+	1 => "�е нравит��",
+	2 => "�е нравит��",
+);
+App::$strings["Delete"] = "Удалить";
+App::$strings["Photo Tools"] = "Фото-Ин�трументы";
+App::$strings["In This Photo:"] = "�а �той фотографии:";
+App::$strings["Map"] = "Карта";
+App::$strings["__ctx:noun__ Likes"] = "�равит��";
+App::$strings["__ctx:noun__ Dislikes"] = "�е нравит��";
+App::$strings["Close"] = "Закрыть";
+App::$strings["Recent Photos"] = "По�ледние фотографии";
+App::$strings["App installed."] = "Приложение у�тановлено.";
+App::$strings["Malformed app."] = "�еработающее приложение.";
+App::$strings["Embed code"] = "В�троить код";
+App::$strings["Edit App"] = "Редактировать приложение";
+App::$strings["Create App"] = "Создать приложение";
+App::$strings["Name of app"] = "�аименование приложени�";
+App::$strings["Location (URL) of app"] = "Ме�тоположение (URL) приложени�";
+App::$strings["Description"] = "Опи�ание";
+App::$strings["Photo icon URL"] = "URL пиктограммы";
+App::$strings["80 x 80 pixels - optional"] = "80 x 80 пик�елей - необ�зательно";
+App::$strings["Categories (optional, comma separated list)"] = "Категории (необ�зательно, �пи�ок через зап�тую)";
+App::$strings["Version ID"] = "ID вер�ии";
+App::$strings["Price of app"] = "Цена приложени�";
+App::$strings["Location (URL) to purchase app"] = "С�ылка (URL) дл� покупки приложени�";
+App::$strings["Update has been marked successful"] = "Обновление было помечено как у�пешное";
+App::$strings["Verification of update %s failed. Check system logs."] = "Проверка обновлени� %s не удала�ь. Проверьте �и�темный журнал.";
+App::$strings["Update %s was successfully applied."] = "Обновление %s было у�пешно применено.";
+App::$strings["Verifying update %s did not return a status. Unknown if it succeeded."] = "Проверка обновлени� %s не вернула его �о�то�ние. �еизве�тно было ли оно у�пешным.";
+App::$strings["Update %s does not contain a verification function."] = "Обновление %s не �одержит функцию проверки.";
+App::$strings["Update function %s could not be found."] = "Функци� обновлени� %s не может быть найдена.";
+App::$strings["Executing update procedure %s failed. Check system logs."] = "�е удало�ь выполнить процедуру обновлени� %s.Проверьте �и�темный журнал.";
+App::$strings["Update %s did not return a status. It cannot be determined if it was successful."] = "Обновление %s не вернуло �вой �тату�. �евозможно определить было ли оно у�пешным.";
+App::$strings["Failed Updates"] = "Обновлени� � ошибками";
+App::$strings["Mark success (if update was manually applied)"] = "Пометить у�пешным (е�ли обновление было применено вручную)";
+App::$strings["Attempt to verify this update if a verification procedure exists"] = "Попытайте�ь проверить �то обновление, е�ли �уще�твует процедура проверки";
+App::$strings["Attempt to execute this update step automatically"] = "Попытать�� применить �тот �тап обновлени� автоматиче�ки";
+App::$strings["No failed updates."] = "Ошибок обновлений нет.";
+App::$strings["Password changed for account %d."] = "Пароль дл� аккаунта %d изменён.";
+App::$strings["Account settings updated."] = "�а�тройки аккаунта обновлены.";
+App::$strings["Account not found."] = "Учётна� запи�ь не найдена.";
+App::$strings["Account Edit"] = "Редактировать аккаунт";
+App::$strings["New Password"] = "�овый пароль";
+App::$strings["New Password again"] = "Повторите новый пароль";
+App::$strings["Account language (for emails)"] = "Язык �ообщени� дл� email";
+App::$strings["Service class"] = "Кла�� об�луживани�";
 App::$strings["%s account blocked/unblocked"] = array(
 	0 => "%s аккаунт блокирован/разблокирован",
 	1 => "%s аккаунта блокированы/разблокированы",
@@ -2340,10 +229,13 @@ App::$strings["%s account deleted"] = array(
 	2 => "%s аккаунтов удалёны",
 );
 App::$strings["Account not found"] = "�ккаунт не найден";
+App::$strings["Account '%s' deleted"] = "�ккаунт '%s' удален";
 App::$strings["Account '%s' blocked"] = "�ккаунт '%s' заблокирован";
 App::$strings["Account '%s' unblocked"] = "�ккаунт '%s' разблокирован";
 App::$strings["Unverified"] = "�епроверено";
 App::$strings["Expired"] = "И�тёк";
+App::$strings["Administration"] = "�дмини�трирование";
+App::$strings["Accounts"] = "Учётные запи�и";
 App::$strings["Show verified registrations"] = "Показать проверенные реги�трации";
 App::$strings["Show all registrations"] = "Показать в�е реги�трации";
 App::$strings["Select toggle"] = "Выбрать";
@@ -2352,9 +244,12 @@ App::$strings["Approve selected"] = "Утвердить выбранное";
 App::$strings["All registrations"] = "В�е реги�трации";
 App::$strings["Verified registrations waiting for approval"] = "Проверенные реги�трации ожидающие утверждени�";
 App::$strings["Request date"] = "Дата запро�а";
+App::$strings["Email"] = "Электронна� почта";
 App::$strings["Requests"] = "Запро�ы";
 App::$strings["No registrations available"] = "�ет до�тупных реги�траций";
 App::$strings["No verified registrations available"] = "�ет до�тупных подтвержденных реги�траций ";
+App::$strings["Approve"] = "Утвердить";
+App::$strings["Deny"] = "Запретить";
 App::$strings["Block"] = "Блокировать";
 App::$strings["Unblock"] = "Разблокировать";
 App::$strings["Verified"] = "Подтверждён";
@@ -2364,12 +259,77 @@ App::$strings["All channels"] = "В�е каналы";
 App::$strings["Register date"] = "Дата реги�трации";
 App::$strings["Last login"] = "По�ледний вход";
 App::$strings["Expires"] = "Срок дей�тви�";
-App::$strings["Service class"] = "Кла�� об�луживани�";
 App::$strings["Selected accounts will be deleted!\\n\\nEverything these accounts had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Выбранные учётные запи�и будут удалены!\n\nВ�ё что было ими опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?";
 App::$strings["The account {0} will be deleted!\\n\\nEverything this account has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?";
+App::$strings["Message"] = "Сообщение";
+App::$strings["Queue Statistics"] = "Стати�тика очереди";
+App::$strings["Total Entries"] = "В�его запи�ей";
+App::$strings["Priority"] = "Приоритет";
+App::$strings["Destination URL"] = "Конечный URL-адре�";
+App::$strings["Mark hub permanently offline"] = "Пометить хаб как по�то�нно отключенный";
+App::$strings["Empty queue for this hub"] = "О�вободить очередь дл� �того хаба";
+App::$strings["Last known contact"] = "По�ледний изве�тный контакт";
+App::$strings["Theme settings updated."] = "�а�тройки темы обновленны.";
+App::$strings["No themes found."] = "Темы не найдены.";
+App::$strings["Disable"] = "Запретить";
+App::$strings["Enable"] = "Разрешить";
+App::$strings["Screenshot"] = "Снимок �крана";
+App::$strings["Themes"] = "Темы";
+App::$strings["Toggle"] = "Переключить";
+App::$strings["Settings"] = "�а�тройки";
+App::$strings["Author: "] = "�втор: ";
+App::$strings["Maintainer: "] = "Сопровождающий:";
+App::$strings["[Experimental]"] = "[�к�периментальный]";
+App::$strings["[Unsupported]"] = "[неподдерживаемый]";
+App::$strings["New Profile Field"] = "Поле нового профил�";
+App::$strings["Field nickname"] = "П�евдоним пол�";
+App::$strings["System name of field"] = "Си�темное им� пол�";
+App::$strings["Input type"] = "Тип ввода";
+App::$strings["Field Name"] = "Им� пол�";
+App::$strings["Label on profile pages"] = "Метка на �транице профил�";
+App::$strings["Help text"] = "Тек�т под�казки";
+App::$strings["Additional info (optional)"] = "Дополнительна� информаци� (необ�зательно)";
+App::$strings["Save"] = "Запомнить";
+App::$strings["Field definition not found"] = "Определени� пол� не найдено";
+App::$strings["Edit Profile Field"] = "Редактировать поле профил�";
+App::$strings["Profile Fields"] = "Пол� профил�";
+App::$strings["Basic Profile Fields"] = "О�новные пол� профил�";
+App::$strings["Advanced Profile Fields"] = "Дополнительные пол� профил�";
+App::$strings["(In addition to basic fields)"] = "(к о�новым пол�м)";
+App::$strings["All available fields"] = "В�е до�тупные пол�";
+App::$strings["Custom Fields"] = "�а�траиваемые пол�";
+App::$strings["Edit"] = "Изменить";
+App::$strings["Create Custom Field"] = "Создать на�траиваемое поле";
+App::$strings["Off"] = "Выкл.";
+App::$strings["On"] = "Вкл.";
+App::$strings["Lock feature %s"] = "Заблокировать функцию \"%s\"";
+App::$strings["Manage Additional Features"] = "Управление дополнительными функци�ми";
+App::$strings["Plugin %s disabled."] = "Плагин %s отключен.";
+App::$strings["Plugin %s enabled."] = "Плагин %s включен.";
+App::$strings["Addons"] = "Ра�ширени�";
+App::$strings["Minimum project version: "] = "Минимальна� вер�и� проекта: ";
+App::$strings["Maximum project version: "] = "Мак�имальна� вер�и� проекта: ";
+App::$strings["Minimum PHP version: "] = "Минимальна� вер�и� PHP: ";
+App::$strings["Compatible Server Roles: "] = "Совме�тимые роли �ервера: ";
+App::$strings["Requires: "] = "�еобходимо:";
+App::$strings["Disabled - version incompatibility"] = "Отключено - не�овме�тимо�ть вер�ий";
+App::$strings["Enter the public git repository URL of the addon repo."] = "Введите URL публичного репозитори� ра�ширений git";
+App::$strings["Addon repo git URL"] = "URL репозитори� ра�ширений git";
+App::$strings["Custom repo name"] = "Пользователь�кое им� репозитори�";
+App::$strings["(optional)"] = "(необ�зательно)";
+App::$strings["Download Addon Repo"] = "Загрузить репозиторий ра�ширений";
+App::$strings["Install new repo"] = "У�тановить новый репозиторий";
+App::$strings["Install"] = "У�тановить";
+App::$strings["Cancel"] = "Отменить";
+App::$strings["Manage Repos"] = "Управление репозитори�ми";
+App::$strings["Installed Addon Repositories"] = "У�тановленные репозитории ра�ширений";
+App::$strings["Install a New Addon Repository"] = "У�тановить новый репозиторий ра�ширений";
+App::$strings["Update"] = "Обновить";
+App::$strings["Switch branch"] = "Переключить ветку";
 App::$strings["Invalid input"] = "�еверный ввод";
 App::$strings["Errors"] = "Ошибки";
 App::$strings["Site settings updated."] = "�а�тройки �айта обновлены.";
+App::$strings["Default"] = "По умолчанию";
 App::$strings["%s - (Incompatible)"] = "%s - (не�овме�тимо)";
 App::$strings["mobile"] = "мобильный";
 App::$strings["experimental"] = "�к�периментальный";
@@ -2392,8 +352,11 @@ App::$strings["Time to wait before a registration can be verified"] = "ВремÑ
 App::$strings["duration up from now"] = "продолжительно�ть � на�то�щего момента";
 App::$strings["Register verification expiration time"] = "Врем� и�течени� �рока проверки реги�трации";
 App::$strings["Time before an unverified registration will expire"] = "Врем� до и�течени� �рока непроверенной реги�трации ";
+App::$strings["Site"] = "Сайт";
 App::$strings["File upload"] = "Загрузка файла";
 App::$strings["Policies"] = "Правила";
+App::$strings["Advanced"] = "Дополнительно";
+App::$strings["Site name"] = "�азвание �айта";
 App::$strings["Banner/Logo"] = "Баннер / логотип";
 App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Разрешён нефильтруемый HTML/CSS/JS";
 App::$strings["Administrator Information"] = "Информаци� об админи�траторе";
@@ -2443,7 +406,7 @@ App::$strings["Comma separated list of domains which are allowed to establish fr
 App::$strings["Force publish"] = "Принудительно публиковать";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Включите дл� принудительного включени� в�ех учётных запи�ей на данном �айте в каталог.";
 App::$strings["Import Public Streams"] = "Импортированные публичные потоки";
-App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Импортировать и разрешить публичный до�туп к загружаемым � других �айтов потоков. Внимание - �тот контент не может модерировать��.";
+App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Импортировать и разрешить в�ем до�туп к загружаемым � других �айтов потоков. Внимание - �тот контент не может модерировать��.";
 App::$strings["Site only Public Streams"] = "Публичные потоки только � �айта";
 App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Разрешить до�туп к общедо�тупному контенту, и�ход�щему только � �того �айта, е�ли импортированные публичные потоки отключены.";
 App::$strings["Allow anybody on the internet to access the Public streams"] = "Разрешить в�ем до�туп к публичным потокам";
@@ -2488,12 +451,6 @@ App::$strings["Default: profiles"] = "По умолчанию: profiles";
 App::$strings["Optional: site location"] = "�еоб�зательно: ме�то размещени� �айта";
 App::$strings["Region or country"] = "Регион или �трана";
 App::$strings["Invalid 24h time value (hhmm/hmm)"] = "�еверное 24-ча�овое значение (допу�тимо \"ччмм\" или \"чмм\")";
-App::$strings["Log settings updated."] = "�а�тройки журнала обновлены.";
-App::$strings["Clear"] = "Очи�тить";
-App::$strings["Debugging"] = "Отладка";
-App::$strings["Log file"] = "Файл журнала";
-App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Должен быть до�тупен дл� запи�и веб-�ервером. Пу�ть отно�ителен о�новного каталога веб-�айта.";
-App::$strings["Log level"] = "Уровень журнала";
 App::$strings["%s channel censored/uncensored"] = array(
 	0 => "%s канал цензурирует��/нецензурирует��",
 	1 => "%s канала цензурируют��/нецензурируют��",
@@ -2515,413 +472,104 @@ App::$strings["Channel '%s' censored"] = "Канал '%s' цензурирует
 App::$strings["Channel '%s' uncensored"] = "Канал '%s' нецензурирует��";
 App::$strings["Channel '%s' code allowed"] = "Код в канале '%s' разрешён";
 App::$strings["Channel '%s' code disallowed"] = "Код в канале '%s' запрещён";
+App::$strings["Channels"] = "Каналы";
 App::$strings["select all"] = "выбрать в�е";
 App::$strings["Censor"] = "Цензурировать";
 App::$strings["Uncensor"] = "�ецензурировать";
 App::$strings["Allow Code"] = "Разрешить код";
 App::$strings["Disallow Code"] = "Запретить код";
+App::$strings["Channel"] = "Канал";
 App::$strings["UID"] = "";
+App::$strings["Name"] = "Им�";
+App::$strings["Address"] = "�дре�";
 App::$strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Этот аккаунт {0} будет удалён!\n\nВ�ё что им было опубликовано на �том �айте будет удалено нав�егда!\n\nВы уверены?";
 App::$strings["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?"] = "Канал {0} будет удалён!\n\nВ�ё что было опубликовано в �том канале на �том �айте будет удалено нав�егда!\n\nВы уверены?";
-App::$strings["Password changed for account %d."] = "Пароль дл� аккаунта %d изменён.";
-App::$strings["Account settings updated."] = "�а�тройки аккаунта обновлены.";
-App::$strings["Account not found."] = "Учётна� запи�ь не найдена.";
-App::$strings["Account Edit"] = "Редактировать аккаунт";
-App::$strings["New Password"] = "�овый пароль";
-App::$strings["New Password again"] = "Повторите новый пароль";
-App::$strings["Account language (for emails)"] = "Язык �ообщени� дл� email";
-App::$strings["New Profile Field"] = "Поле нового профил�";
-App::$strings["Field nickname"] = "П�евдоним пол�";
-App::$strings["System name of field"] = "Си�темное им� пол�";
-App::$strings["Input type"] = "Тип ввода";
-App::$strings["Field Name"] = "Им� пол�";
-App::$strings["Label on profile pages"] = "Метка на �транице профил�";
-App::$strings["Help text"] = "Тек�т под�казки";
-App::$strings["Additional info (optional)"] = "Дополнительна� информаци� (необ�зательно)";
-App::$strings["Field definition not found"] = "Определени� пол� не найдено";
-App::$strings["Edit Profile Field"] = "Редактировать поле профил�";
-App::$strings["Basic Profile Fields"] = "О�новные пол� профил�";
-App::$strings["Advanced Profile Fields"] = "Дополнительные пол� профил�";
-App::$strings["(In addition to basic fields)"] = "(к о�новым пол�м)";
-App::$strings["All available fields"] = "В�е до�тупные пол�";
-App::$strings["Custom Fields"] = "�а�траиваемые пол�";
-App::$strings["Create Custom Field"] = "Создать на�траиваемое поле";
-App::$strings["Update has been marked successful"] = "Обновление было помечено как у�пешное";
-App::$strings["Verification of update %s failed. Check system logs."] = "Проверка обновлени� %s не удала�ь. Проверьте �и�темный журнал.";
-App::$strings["Update %s was successfully applied."] = "Обновление %s было у�пешно применено.";
-App::$strings["Verifying update %s did not return a status. Unknown if it succeeded."] = "Проверка обновлени� %s не вернула его �о�то�ние. �еизве�тно было ли оно у�пешным.";
-App::$strings["Update %s does not contain a verification function."] = "Обновление %s не �одержит функцию проверки.";
-App::$strings["Update function %s could not be found."] = "Функци� обновлени� %s не может быть найдена.";
-App::$strings["Executing update procedure %s failed. Check system logs."] = "�е удало�ь выполнить процедуру обновлени� %s.Проверьте �и�темный журнал.";
-App::$strings["Update %s did not return a status. It cannot be determined if it was successful."] = "Обновление %s не вернуло �вой �тату�. �евозможно определить было ли оно у�пешным.";
-App::$strings["Failed Updates"] = "Обновлени� � ошибками";
-App::$strings["Mark success (if update was manually applied)"] = "Пометить у�пешным (е�ли обновление было применено вручную)";
-App::$strings["Attempt to verify this update if a verification procedure exists"] = "Попытайте�ь проверить �то обновление, е�ли �уще�твует процедура проверки";
-App::$strings["Attempt to execute this update step automatically"] = "Попытать�� применить �тот �тап обновлени� автоматиче�ки";
-App::$strings["No failed updates."] = "Ошибок обновлений нет.";
-App::$strings["Plugin %s disabled."] = "Плагин %s отключен.";
-App::$strings["Plugin %s enabled."] = "Плагин %s включен.";
-App::$strings["Minimum project version: "] = "Минимальна� вер�и� проекта: ";
-App::$strings["Maximum project version: "] = "Мак�имальна� вер�и� проекта: ";
-App::$strings["Minimum PHP version: "] = "Минимальна� вер�и� PHP: ";
-App::$strings["Compatible Server Roles: "] = "Совме�тимые роли �ервера: ";
-App::$strings["Requires: "] = "�еобходимо:";
-App::$strings["Disabled - version incompatibility"] = "Отключено - не�овме�тимо�ть вер�ий";
-App::$strings["Enter the public git repository URL of the addon repo."] = "Введите URL публичного репозитори� ра�ширений git";
-App::$strings["Addon repo git URL"] = "URL репозитори� ра�ширений git";
-App::$strings["Custom repo name"] = "Пользователь�кое им� репозитори�";
-App::$strings["(optional)"] = "(необ�зательно)";
-App::$strings["Download Addon Repo"] = "Загрузить репозиторий ра�ширений";
-App::$strings["Install new repo"] = "У�тановить новый репозиторий";
-App::$strings["Install"] = "У�тановить";
-App::$strings["Manage Repos"] = "Управление репозитори�ми";
-App::$strings["Installed Addon Repositories"] = "У�тановленные репозитории ра�ширений";
-App::$strings["Install a New Addon Repository"] = "У�тановить новый репозиторий ра�ширений";
-App::$strings["Switch branch"] = "Переключить ветку";
-App::$strings["Installed Apps"] = "У�тановленные приложени�";
-App::$strings["Manage Apps"] = "Управление приложени�ми";
-App::$strings["Create Custom App"] = "Создать пользователь�кое приложение";
-App::$strings["Some blurb about what to do when you're new here"] = "�екоторые предложени� о том, что делать, е�ли вы зде�ь новичок ";
-App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта.";
-App::$strings["Remove This Channel"] = "Удалить �тот канал";
-App::$strings["WARNING: "] = "ПРЕДУПРЕЖДЕ�ИЕ: ";
-App::$strings["This channel will be completely removed from the network. "] = "Этот канал будет полно�тью удалён из �ети. ";
-App::$strings["This action is permanent and can not be undone!"] = "Это дей�твие необратимо и не может быть отменено!";
-App::$strings["Please enter your password for verification:"] = "Пожалуй�та, введите ваш пароль дл� проверки:";
-App::$strings["Remove Channel"] = "Удаление канала";
-App::$strings["Email resent"] = "Электронна� почта повторно отправлена";
-App::$strings["Email resend failed"] = "Ошибка повторной отправки �лектронной почты";
-App::$strings["Verify successfull"] = "Проверка прошла у�пешно";
-App::$strings["Account successfull created"] = "Учётна� запи�ь у�пешно �оздана";
-App::$strings["Channel successfull created"] = "Канал у�пешно �оздан";
-App::$strings["Automatic channel creation failed. Please create a channel."] = "�втоматиче�кой �оздание канала не удало�ь. Пожалуй�та �оздайте канал.";
-App::$strings["Account creation error"] = "Ошибка �оздани� учётной запи�и";
-App::$strings["Verify failed"] = "Проверка не удала�ь";
-App::$strings["Token verification failed"] = "�еверный проверочный код";
-App::$strings["Request not inside time frame"] = "Запро� в не у�тановленные �роки ";
-App::$strings["Identity unknown"] = "Лично�ть не у�тановлена";
-App::$strings["dId2 mistaken"] = "ошибочный dId2";
-App::$strings["Your Registration ID"] = "Идентификатор вашей реги�трации";
-App::$strings["Registration verification"] = "Проверка реги�трации";
-App::$strings["Hold on, you can start verification in"] = "Подождите, вы можете начать проверку через ";
-App::$strings["Please remember your verification token for ID"] = "Пожалуй�та, запомните �вой код подтверждени� дл� идентификации";
-App::$strings["Token validity"] = "Срок дей�тви� кода";
-App::$strings["Resend"] = "Отправить повторно";
-App::$strings["Registration status"] = "Стату� реги�трации";
-App::$strings["Verification successful!"] = "Проверка прошла у�пешно! ";
-App::$strings["Your login ID is"] = "Ваш логин дл� входа";
-App::$strings["After your account has been approved by our administrator you will be able to login with your login ID and your provided password."] = "По�ле того, как ваша учетна� запи�ь будет одобрена нашим админи�тратором, вы �можете войти в �и�тему, указав �вой логин и пароль.";
-App::$strings["Registration request revoked"] = "Запро� на реги�трацию был отозван";
-App::$strings["Sorry for any inconvience. Thank you for your response."] = "Прино�им извинени� за неудоб�тва. Благодарим за ваш ответ.";
-App::$strings["Please enter your verification token for ID"] = "Пожалуй�та введите ваш проверочный код дл� идентификации";
-App::$strings["Verification token"] = "Код проверки";
-App::$strings["ID expired"] = "Срок дей�тви� идентификатора и�тёк";
-App::$strings["You will require the verification token for ID"] = "Вам потребует�� проверочный кода дл� идентификации";
-App::$strings["Unknown or expired ID"] = "Идентификатор неизве�тен или � и�текшим �роком дей�тви�";
-App::$strings["dId2 malformed"] = "�еверный dId2";
-App::$strings["Edit event title"] = "Редактировать наименование �обыти�";
-App::$strings["Categories (comma-separated list)"] = "Категории (�пи�ок через зап�тую)";
-App::$strings["Edit Category"] = "Редактировать категорию";
-App::$strings["Category"] = "Категори�";
-App::$strings["Edit start date and time"] = "Редактировать дату и врем� начала";
-App::$strings["Finish date and time are not known or not relevant"] = "Дата и врем� окончани� неизве�тны или неприменимы";
-App::$strings["Edit finish date and time"] = "Редактировать дату и врем� окончани�";
-App::$strings["Finish date and time"] = "Дата и врем� окончани�";
-App::$strings["Adjust for viewer timezone"] = "�а�тройте про�мотр ча�овых по��ов";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Важно дл� �обытий, которые прои�ход�т в определённом ме�те. �е подходит дл� в�еобщих праздников.";
-App::$strings["Edit Description"] = "Редактировать опи�ание";
-App::$strings["Edit Location"] = "Редактировать ме�тоположение";
-App::$strings["Advanced Options"] = "Дополнительные на�тройки";
-App::$strings["l, F j"] = "";
-App::$strings["Edit Event"] = "Редактировать �обытие";
-App::$strings["Create Event"] = "Создать �обытие";
-App::$strings["Event removed"] = "Событие удалено";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Вы �оздали %1$.0f из %2$.0f возможных каналов.";
-App::$strings["Create a new channel"] = "Создать новый канал";
-App::$strings["Current Channel"] = "Текущий канал";
-App::$strings["Switch to one of your channels by selecting it."] = "Выбрать и переключить�� на один из ваших каналов";
-App::$strings["Default Channel"] = "О�новной канал";
-App::$strings["Make Default"] = "Сделать о�новным";
-App::$strings["%d new messages"] = "%d новых �ообщений";
-App::$strings["%d new introductions"] = "%d новых пред�тавлений";
-App::$strings["Delegated Channel"] = "Делегированный канал";
-App::$strings["toggle full screen mode"] = "переключение полно�кранного режима";
-App::$strings["Public Stream App"] = "Приложение \"Публичный поток\"";
-App::$strings["The unmoderated public stream of this hub"] = "�емодерируемый публичный поток � �того хаба";
-App::$strings["Away"] = "�ет на ме�те";
-App::$strings["Online"] = "В �ети";
-App::$strings["Permission category name is required."] = "Требует�� категори� разрешений.";
-App::$strings["Permission category saved."] = "Категори� разрешени� �охранена.";
-App::$strings["Permission Categories App"] = "Приложение \"Категории разрешений\"";
-App::$strings["Create custom connection permission limits"] = "Создать пользователь�кие ограничени� на до�туп к подключению";
-App::$strings["Use this form to create permission rules for various classes of people or connections."] = "И�пользуйте �ту форму дл� �оздани� правил разрешений дл� различных групп людей и контактов.";
-App::$strings["Permission Categories"] = "Категории разрешений";
-App::$strings["Permission category name"] = "�аименование категории разрешений";
-App::$strings["Token verification failed."] = "�е удало�ь выполнить проверку токена.";
-App::$strings["Email verification resent"] = "Сообщение дл� проверки email отправлено повторно";
-App::$strings["Unable to resend email verification message."] = "�евозможно повторно отправить �ообщение дл� проверки email";
-App::$strings["No ratings"] = "Оценок нет";
-App::$strings["Rating: "] = "Оценкa:";
-App::$strings["Website: "] = "Веб-�айт:";
-App::$strings["Description: "] = "Опи�ание:";
-App::$strings["Permissions denied."] = "До�туп запрещен.";
-App::$strings["item"] = "пункт";
-App::$strings["Change Order of Pinned Navbar Apps"] = "Изменить пор�док приложений на панели навигации";
-App::$strings["Change Order of App Tray Apps"] = "Изменить пор�док приложений в лотке";
-App::$strings["Use arrows to move the corresponding app left (top) or right (bottom) in the navbar"] = "И�пользуйте �трелки дл� перемещени� приложени� влево (вверх) или вправо (вниз) в панели навигации";
-App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "И�пользуйте �трелки дл� перемещени� приложени� вверх или вниз в лотке";
-App::$strings["Unable to find your hub."] = "�евозможно найти ваш �ервер";
-App::$strings["Post successful."] = "У�пешно опубликовано.";
-App::$strings["Comment approved"] = "Комментарий одобрен";
-App::$strings["Comment deleted"] = "Комментарий удалён";
-App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта.";
-App::$strings["Remove This Account"] = "Удалить �тот аккаунт";
-App::$strings["This account and all its channels will be completely removed from the network. "] = "Этот аккаунт и в�е его каналы будут полно�тью удалены из �ети.";
-App::$strings["Remove Account"] = "Удалить аккаунт";
-App::$strings["Language App"] = "Приложение \"Язык\"";
-App::$strings["Change UI language"] = "Изменить �зык интерфей�а";
-App::$strings["Channel Export App"] = "Приложение \"Эк�порт канала\"";
-App::$strings["Export your channel"] = "Эк�портировать ваш канал";
-App::$strings["Export Channel"] = "Эк�порт канала";
-App::$strings["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."] = "Эк�портировать о�новную информацию из канала в файл. Служит в каче�тве резервной копии ваших контактов, о�новных данных и профил�, однако не включает �одержимое. Может быть и�пользовано дл� импорта ваши данных на новый �ервер.";
-App::$strings["Export Content"] = "Эк�портировать �одержимое";
-App::$strings["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."] = "Эк�портировать информацию из вашего канала и его �одержимое в резервную копию в формате JSON котора� может быть и�пользована дл� во��тановлени� или импорта на другом �ервере. Сохран�ет в�е ваши контакты, разрешени�, данные профил� и публикации за не�колько ме��цев. Файл может иметь очень большой размер. Пожалуй�та, будьте терпеливы и подождите не�колько минут пока не начнёт�� загрузка.";
-App::$strings["Export your posts from a given year."] = "Эк�портировать ваши публикации за данный год.";
-App::$strings["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."] = "Вы также можете �к�портировать ваши публикации и бе�еды за определённый ме��ц или год. Выберите дату в панели ме�тоположени� в браузере. Е�ли �к�порт будет неудачным (�то возможно, например, из-за и�черпани� пам�ти на �ервере), повторите попытку, выбрав меньший диапазон дат.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Дл� выбора в�ех публикаций заданного года, например текущего, по�етите <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Дл� выбора в�ех публикаций заданного ме��ца, например за �нварь �его года, по�етите <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["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)."] = "Данные файлы � �одержимым могут быть импортированы и во��тановлены на любом �одержащем ваш канал �айте. По�етите <a href=\"%1\$s\">%2\$s</a>. Дл� лучших результатов пожалуй�та производите импорт и во��тановление в пор�дке датировки (�тарые �начала).";
-App::$strings["Article"] = "Стать�";
-App::$strings["Item has been removed."] = "Элемент был удалён.";
-App::$strings["No channel."] = "Канала нет.";
-App::$strings["No connections in common."] = "Общих контактов нет.";
-App::$strings["View Common Connections"] = "Про�мотр общий контактов";
-App::$strings["%s element installed"] = "%s �лемент у�тановлен";
-App::$strings["%s element installation failed"] = "%sу�тановка �лемента неудачна.";
-App::$strings["Your real name is recommended."] = "Рекомендует�� и�пользовать ваше на�то�щее им�.";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Иван Иванов\", \"Ок�ана и кони\", \"Футбол\", \"Тимур и его команда\"";
-App::$strings["This will be used to create a unique network address (like an email address)."] = "Это будет и�пользовано дл� �оздани� уникального �етевого адре�а (наподобие email).";
-App::$strings["Allowed characters are a-z 0-9, - and _"] = "Разрешённые �имволы a-z 0-9, - и _";
-App::$strings["Channel name"] = "�азвание канала";
-App::$strings["Channel role and privacy"] = "Роль и конфиденциально�ть канала";
-App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = "Выберите разрешени� дл� канала в �оответ�твии � вашими потребно�т�ми и требовани�ми безопа�но�ти.";
-App::$strings["Read more about channel permission roles"] = "Прочитать больше о разрешени�х дл� каналов";
-App::$strings["Create a Channel"] = "Создать канал";
-App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = "Канал �то уникальна� �етева� идентично�ть. Он может пред�тавл�ть человека (профиль в �оциальной �ети), форум или группу, бизне� или �траницу знаменито�ти, ново�тную ленту и многие другие вещи.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "или <a href=\"import\">импортировать �уще�твующий канал</a> из другого ме�та.";
-App::$strings["Validate"] = "Проверить";
-App::$strings["sent you a private message"] = "отправил вам личное �ообщение";
-App::$strings["added your channel"] = "добавил ваш канал";
-App::$strings["requires approval"] = "Требует�� подтверждение";
-App::$strings["g A l F d"] = "g A l F d";
-App::$strings["[today]"] = "[�егодн�]";
-App::$strings["posted an event"] = "�обытие опубликовано";
-App::$strings["shared a file with you"] = "� вами поделили�ь файлом";
-App::$strings["Private forum"] = "Ча�тный форум";
-App::$strings["Public forum"] = "Публичный форум";
-App::$strings["Entry censored"] = "Запи�ь цензурирована";
-App::$strings["Entry uncensored"] = "Запи�ь нецензурирована";
-App::$strings["No service class restrictions found."] = "Ограничений кла��а об�луживание не найдено.";
-App::$strings["Mood App"] = "Приложение \"�а�троение\"";
-App::$strings["Set your current mood and tell your friends"] = "У�тановить текущее на�троение и ра��казать друзь�м";
-App::$strings["Mood"] = "�а�троение";
-App::$strings["About this site"] = "Об �том �айте";
-App::$strings["Site Name"] = "�азвание �айта";
-App::$strings["Administrator"] = "�дмини�тратор";
-App::$strings["Software and Project information"] = "Информаци� о программном обе�печении и проекте";
-App::$strings["This site is powered by \$Projectname"] = "Этот �айт работает на \$Projectname";
-App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Объединенные и децентрализованные �ети и �лужбы идентификациии обе�печивают�� Zot";
-App::$strings["Additional federated transport protocols:"] = "Дополнительные федеративные тран�портные протоколы:";
-App::$strings["Version %s"] = "Вер�и� %s";
-App::$strings["Project homepage"] = "Домашн�� �траница проекта";
-App::$strings["Developer homepage"] = "Домашн�� �траница разработчика";
-App::$strings["App installed."] = "Приложение у�тановлено.";
-App::$strings["Malformed app."] = "�еработающее приложение.";
-App::$strings["Embed code"] = "В�троить код";
-App::$strings["Edit App"] = "Редактировать приложение";
-App::$strings["Create App"] = "Создать приложение";
-App::$strings["Name of app"] = "�аименование приложени�";
-App::$strings["Location (URL) of app"] = "Ме�тоположение (URL) приложени�";
-App::$strings["Photo icon URL"] = "URL пиктограммы";
-App::$strings["80 x 80 pixels - optional"] = "80 x 80 пик�елей - необ�зательно";
-App::$strings["Categories (optional, comma separated list)"] = "Категории (необ�зательно, �пи�ок через зап�тую)";
-App::$strings["Version ID"] = "ID вер�ии";
-App::$strings["Price of app"] = "Цена приложени�";
-App::$strings["Location (URL) to purchase app"] = "С�ылка (URL) дл� покупки приложени�";
-App::$strings["Blocked accounts"] = "Заблокированные аккаунты";
-App::$strings["Expired accounts"] = "Про�роченные аккаунты";
-App::$strings["Expiring accounts"] = "Близкие к про�рочке аккаунты";
-App::$strings["Message queues"] = "Очередь �ообщений";
-App::$strings["Your software should be updated"] = "Ваше программное обе�печение должно быть обновлено";
-App::$strings["Summary"] = "Резюме";
-App::$strings["Registered accounts"] = "Зареги�трированные аккаунты";
-App::$strings["Pending registrations"] = "Ждут утверждени�";
-App::$strings["Registered channels"] = "Зареги�трированные каналы";
-App::$strings["Active addons"] = "�ктивные ра�ширени�";
-App::$strings["Version"] = "Вер�и� �и�темы";
-App::$strings["Repository version (master)"] = "Вер�и� репозитори� (master)";
-App::$strings["Repository version (dev)"] = "Вер�и� репозитори� (dev)";
-App::$strings["Cards App"] = "Приложение \"Карточки\"";
-App::$strings["Create personal planning cards"] = "Создать личные карточки планировани�";
-App::$strings["Add Card"] = "Добавить карточку";
-App::$strings["No default suggestions were found."] = "Предложений по умолчанию не найдено.";
-App::$strings["%d rating"] = array(
-	0 => "%d оценка",
-	1 => "%d оценки",
-	2 => "%d оценок",
-);
-App::$strings["Gender: "] = "Пол:";
-App::$strings["Status: "] = "Стату�:";
-App::$strings["Homepage: "] = "Домашн�� �траница:";
-App::$strings["Description:"] = "Опи�ание:";
-App::$strings["Public Forum:"] = "Публичный форум:";
-App::$strings["Keywords: "] = "Ключевые �лова:";
-App::$strings["Don't suggest"] = "�е предлагать";
-App::$strings["Common connections (estimated):"] = "Общие контакты (оценочно):";
-App::$strings["Global Directory"] = "Глобальный каталог";
-App::$strings["Local Directory"] = "Локальный каталог";
-App::$strings["Finding:"] = "Пои�к:";
-App::$strings["next page"] = "�ледующа� �траница";
-App::$strings["previous page"] = "предыдуща� �траница";
-App::$strings["Sort options"] = "Параметры �ортировки";
-App::$strings["Alphabetic"] = "По алфавиту";
-App::$strings["Reverse Alphabetic"] = "Против алфавита";
-App::$strings["Newest to Oldest"] = "От новых к �тарым";
-App::$strings["Oldest to Newest"] = "От �тарых к новым";
-App::$strings["No entries (some entries may be hidden)."] = "�ет запи�ей (некоторые запи�и могут быть �крыты).";
-App::$strings["Authorize application connection"] = "�вторизовать подключение приложени�";
-App::$strings["Return to your app and insert this Security Code:"] = "Верните�ь к �воему приложению и в�тавьте �тот код безопа�но�ти:";
-App::$strings["Please login to continue."] = "Пожалуй�та, войдите, чтобы продолжить.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Вы хотите авторизовать �то приложение дл� до�тупа к вашим публикаци�м и контактам и / или �озданию новых публикаций?";
-App::$strings["Please login."] = "Пожалуй�та, войдите.";
-App::$strings["Block Name"] = "�азвание блока";
-App::$strings["Block Title"] = "Заблокировать заголовок";
-App::$strings["Email Verification Required"] = "Требует�� проверка адре�а email";
-App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Проверочный токен был отправлен на ваш адре� �лектронной почты [%s]. Введите �тот токен зде�ь дл� завершени� �тапа проверки учётной запи�и. Пожалуй�та, подождите не�колько минут дл� завершени� до�тавки и проверьте вашу папку \"Спам\" е�ли вы не видите пи�ьма.";
-App::$strings["Resend Email"] = "Вы�лать повторно";
-App::$strings["Validation token"] = "Проверочный код";
-App::$strings["Item not available."] = "Элемент недо�тупен.";
-App::$strings["Poll not found."] = "Опро� не найден";
-App::$strings["Invalid response."] = "�еверный ответ.";
-App::$strings["Response submitted. Updates may not appear instantly."] = "Ответ отправлен. Обновлени� могут отображать�� не �разу.";
-App::$strings["Image uploaded but image cropping failed."] = "Изображение загружено но обрезка не удала�ь.";
-App::$strings["Image resize failed."] = "�е удало�ь изменить размер изображени�.";
-App::$strings["Image upload failed."] = "Загрузка изображени� не удала�ь.";
-App::$strings["Unable to process image."] = "�евозможно обработать изображение.";
-App::$strings["Photo not available."] = "Фотографи� недо�тупна.";
-App::$strings["Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile"] = "Фотографи� вашего профил� по умолчанию видна в�ем в Интернете. Фотографи�профил� дл� альтернативных профилей на�ледуют разрешени� текущего профил�";
-App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = "Фотографи� вашего профил� видна в�ем в Интернете и может быть отправлена на другие �айты.";
-App::$strings["Upload File:"] = "Загрузить файл:";
-App::$strings["Select a profile:"] = "Выбрать профиль:";
-App::$strings["Use Photo for Profile"] = "И�пользовать фотографию дл� профил�";
-App::$strings["Change Profile Photo"] = "Изменить фотографию профил�";
-App::$strings["Use"] = "И�пользовать";
-App::$strings["Use a photo from your albums"] = "И�пользовать фотографию из ваших альбомов";
-App::$strings["Choose a different album"] = "Выбрать другой альбом";
-App::$strings["Select existing photo"] = "Выбрать �уще�твующую фотографию";
-App::$strings["Crop Image"] = "Обрезать изображение";
-App::$strings["Please adjust the image cropping for optimum viewing."] = "Пожалуй�та на�тройте обрезку изображени� дл� оптимального про�мотра.";
-App::$strings["Done Editing"] = "Закончить редактирование";
-App::$strings["Edit Block"] = "Редактировать блок";
-App::$strings["Enter a folder name"] = "Введите название каталога";
-App::$strings["or select an existing folder (doubleclick)"] = "или выберите �уще�твующий каталог (двойной щелчок)";
-App::$strings["Save to Folder"] = "Сохранить в каталог";
-App::$strings["Layout Name"] = "�азвание шаблона";
-App::$strings["Layout Description (Optional)"] = "Опи�ание шаблона (необ�зательно)";
-App::$strings["Edit Layout"] = "Редактировать шаблон";
-App::$strings["Active"] = "�ктивен";
-App::$strings["Blocked"] = "Заблокирован";
-App::$strings["Ignored"] = "Игнорирует��";
-App::$strings["Hidden"] = "Скрыт";
-App::$strings["Archived/Unreachable"] = "Заархивировано / недо�тупно";
-App::$strings["New"] = "�овые";
-App::$strings["Active Connections"] = "�ктивные контакты";
-App::$strings["Show active connections"] = "Показать активные контакты";
-App::$strings["Show pending (new) connections"] = "Про�мотр (новых) ожидающих контактов";
-App::$strings["Only show blocked connections"] = "Показать только заблокированные контакты";
-App::$strings["Only show ignored connections"] = "Показать только проигнорированные контакты";
-App::$strings["Only show archived/unreachable connections"] = "Показать только заархивированные / недо�тупные контакты";
-App::$strings["Only show hidden connections"] = "Показать только �крытые контакты";
-App::$strings["Show all connections"] = "Про�мотр в�ех контактов";
-App::$strings["Pending approval"] = "Ожидающие подтверждени�";
-App::$strings["Archived"] = "Зархивирован";
-App::$strings["Not connected at this location"] = "�е подключено в �том ме�те";
-App::$strings["%1\$s [%2\$s]"] = "";
-App::$strings["Edit connection"] = "Редактировать контакт";
-App::$strings["Delete connection"] = "Удалить контакт";
-App::$strings["Channel address"] = "�дре� канала";
-App::$strings["Call"] = "Вызов";
-App::$strings["Status"] = "Стату�";
-App::$strings["Connected"] = "Подключено";
-App::$strings["Approve connection"] = "Утвердить контакт";
-App::$strings["Ignore connection"] = "Игнорировать контакт";
-App::$strings["Ignore"] = "Игнорировать";
-App::$strings["Recent activity"] = "По�ледние дей�тви�";
-App::$strings["Connect at this location"] = "Подключить в �том ме�те";
-App::$strings["Search your connections"] = "Пои�к ваших контактов";
-App::$strings["Connections search"] = "Пои�к контаков";
-App::$strings["Cover Photos"] = "Фотографии обложки";
-App::$strings["Your cover photo may be visible to anybody on the internet"] = "Фотографи� вашей обложки может быть видна в�ем в Интернете";
-App::$strings["Change Cover Photo"] = "Изменить фотографию обложки";
-App::$strings["Page owner information could not be retrieved."] = "Информаци� о владельце �траницы не может быть получена.";
-App::$strings["Album not found."] = "�льбом не найден.";
-App::$strings["Delete Album"] = "Удалить альбом";
-App::$strings["Delete Photo"] = "Удалить фотографию";
-App::$strings["No photos selected"] = "�икакие фотографии не выбраны";
-App::$strings["Access to this item is restricted."] = "До�туп к �тому �лементу ограничен.";
-App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Вы и�пользовали %1$.2f мегабайт из %2$.2f дл� хранени� фото.";
-App::$strings["%1$.2f MB photo storage used."] = "Вы и�пользовали %1$.2f мегабайт дл� хранени� фото.";
-App::$strings["Upload Photos"] = "Загрузить фотографии";
-App::$strings["Enter an album name"] = "Введите название альбома";
-App::$strings["or select an existing album (doubleclick)"] = "или выберите �уще�твующий альбом (двойной щелчок)";
-App::$strings["Create a status post for this upload"] = "Сделать публикацию о �тату�е дл� �той загрузки";
-App::$strings["Description (optional)"] = "Опи�ание (необ�зательно)";
-App::$strings["Show Newest First"] = "Показать новые первыми";
-App::$strings["Show Oldest First"] = "Показать �тарые первыми";
-App::$strings["Add Photos"] = "Добавить фотографии";
-App::$strings["Permission denied. Access to this item may be restricted."] = "До�туп запрещен. До�туп к �тому �лементу может быть ограничен.";
-App::$strings["Photo not available"] = "Фотографи� не до�тупна";
-App::$strings["Use as profile photo"] = "И�пользовать в каче�тве фотографии профил�";
-App::$strings["Use as cover photo"] = "И�пользовать в каче�тве фотографии обложки";
-App::$strings["Private Photo"] = "Лична� фотографи�";
-App::$strings["View Full Size"] = "По�мотреть в полный размер";
-App::$strings["Edit photo"] = "Редактировать фотографию";
-App::$strings["Rotate CW (right)"] = "Повернуть CW (направо)";
-App::$strings["Rotate CCW (left)"] = "Повернуть CCW (налево)";
-App::$strings["Move photo to album"] = "Переме�тить фотографию в альбом";
-App::$strings["Enter a new album name"] = "Введите новое название альбома";
-App::$strings["or select an existing one (doubleclick)"] = "или выбрать �уще�твующую (двойной щелчок)";
-App::$strings["Add a Tag"] = "Добавить тег";
-App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Пример: @bob, @Barbara_Jensen, @jim@example.com";
-App::$strings["Flag as adult in album view"] = "Пометить как альбом \"дл� взро�лых\"";
-App::$strings["I like this (toggle)"] = "мне �то нравит�� (переключение)";
-App::$strings["I don't like this (toggle)"] = "мне �то не нравит�� (переключение)";
-App::$strings["This is you"] = "Это вы";
-App::$strings["View all"] = "Про�мотреть в�е";
-App::$strings["Photo Tools"] = "Фото-Ин�трументы";
-App::$strings["In This Photo:"] = "�а �той фотографии:";
-App::$strings["Map"] = "Карта";
-App::$strings["__ctx:noun__ Likes"] = "�равит��";
-App::$strings["__ctx:noun__ Dislikes"] = "�е нравит��";
-App::$strings["No valid account found."] = "Дей�твительный аккаунт не найден.";
-App::$strings["Password reset request issued. Check your email."] = "Запро� на �бро� парол� отправлен. Проверьте вашу �лектронную почту.";
-App::$strings["Site Member (%s)"] = "Уча�тник �айта (%s)";
-App::$strings["Password reset requested at %s"] = "Запрошен �бро� парол� на %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Запро� не может быть проверен. (Вы могли отправить его раньше). Сбро� парол� не возможен.";
-App::$strings["Password Reset"] = "Сбро�ить пароль";
-App::$strings["Your password has been reset as requested."] = "Ваш пароль в �оответ�твии � про�ьбой �брошен.";
-App::$strings["Your new password is"] = "Ваш новый пароль";
-App::$strings["Save or copy your new password - and then"] = "Сохраните ваш новый пароль и затем";
-App::$strings["click here to login"] = "нажмите зде�ь чтобы войти";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ваш пароль может быть изменён на �транице <em>�а�тройки</em> по�ле у�пешного входа.";
-App::$strings["Your password has changed at %s"] = "Пароль был изменен на %s";
-App::$strings["Forgot your Password?"] = "Забыли ваш пароль?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Введите ваш адре� �лектронной почты и нажмите отправить чтобы �бро�ить пароль. Затем проверьте ваш почтовый �щик дл� дальнейших ин�трукций. ";
-App::$strings["Email Address"] = "�дре� �лектронной почты";
-App::$strings["Reset"] = "Сбро�ить";
-App::$strings["Connection added."] = "Контакт добавлен.";
-App::$strings["Invalid item."] = "�едей�твительный �лемент.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "По умолчанию, HTML без фильтрации до�тупен во в�траиваемых медиа. Это небезопа�но.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Рекомендует�� на�троить разрешени� и�пользовать HTML без фильтрации только дл� �ледующих �айтов:";
+App::$strings["https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"] = "";
+App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "�е о�тальные в�троенные материалы будут отфильтрованы, <strong>е�ли </strong> в�троенное �одержимое � �того �айта �вно заблокировано.";
+App::$strings["Security"] = "Безопа�но�ть";
+App::$strings["Block public"] = "Блокировать публичный до�туп";
+App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "У�тановите флажок дл� блокировки публичного до�тупа ко в�ем другим общедо�тупным �траницам на �том �айте, е�ли вы в на�то�щее врем� не аутентифицированы.";
+App::$strings["Provide a cloud root directory"] = "Предо�тавить корневой каталог в облаке";
+App::$strings["The cloud root directory lists all channel names which provide public files"] = "В корневом каталоге облака показывают�� в�е имена каналов, которые предо�тавл�ют общедо�тупные файлы";
+App::$strings["Show total disk space available to cloud uploads"] = "Показывать общее до�тупное дл� загрузок ме�то в хранилище";
+App::$strings["Set \"Transport Security\" HTTP header"] = "У�тановить HTTP-заголовок \"Transport Security\"";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "У�тановить HTTP-заголовок \"Content Security Policy\"";
+App::$strings["Allowed email domains"] = "Разрешённые домены email";
+App::$strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Спи�ок разделённых зап�тыми доменов дл� которых разрешена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены.";
+App::$strings["Not allowed email domains"] = "Запрещённые домены email";
+App::$strings["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."] = "Спи�ок разделённых зап�тыми доменов дл� которых запрещена реги�траци� на �том �айте. Wildcards разрешены. Е�ли пу�то то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны.";
+App::$strings["Allow communications only from these sites"] = "Разрешить �в�зь только � �тими �айтами";
+App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Один �айт на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� без ограничений (по умочанию).";
+App::$strings["Block communications from these sites"] = "Блокировать �в�зь � �тими �айтами";
+App::$strings["Allow communications only from these channels"] = "Разрешить �в�зь только дл� �тих каналов";
+App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Один канал (или его х�ш) на �троку. О�тавьте пу�тым дл� разрешени� взаимодей�тви� � любым каналом (по умолчанию).";
+App::$strings["Block communications from these channels"] = "Блокировать �в�зь � �тими каналами";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Разрешать в�траивание только дл� безопа�ных (SSL/TLS) �айтов и ��ылок.";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Разрешить  в�траивать нефильтруемое HTML-�одержимое только дл� �тих доменов";
+App::$strings["One site per line. By default embedded content is filtered."] = "Один �айт на �троку. По умолчанию в�траиваемое �одержимое фильтрует��.";
+App::$strings["Block embedded HTML from these domains"] = "Блокировать в�траивание HTML-�одержимого дл� �тих доменов";
+App::$strings["Allow SVG thumbnails in file browser"] = "Разрешить SVG миниатюры в про�мотрщике файлов";
+App::$strings["WARNING: SVG images may contain malicious code."] = "Внимание: изображени� SVG могут �одержать вредоно�ный код.";
+App::$strings["Allow embedded (inline) PDF files"] = "Разрешить в�траивание дл� файлов PDF";
+App::$strings["Log settings updated."] = "�а�тройки журнала обновлены.";
+App::$strings["Logs"] = "Журналы";
+App::$strings["Clear"] = "Очи�тить";
+App::$strings["Debugging"] = "Отладка";
+App::$strings["Log file"] = "Файл журнала";
+App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Должен быть до�тупен дл� запи�и веб-�ервером. Пу�ть отно�ителен о�новного каталога веб-�айта.";
+App::$strings["Log level"] = "Уровень журнала";
+App::$strings["Unable to locate original post."] = "�е удало�ь найти оригинальную публикацию.";
+App::$strings["Empty post discarded."] = "Пу�та� публикаци� отклонена.";
+App::$strings["Duplicate post suppressed."] = "Подавлена дублирующа��� публикаци�.";
+App::$strings["System error. Post not saved."] = "Си�темна� ошибка. Публикаци� не �охранена.";
+App::$strings["Your comment is awaiting approval."] = "Ваш комментарий ожидает одобрени�.";
+App::$strings["Unable to obtain post information from database."] = "�евозможно получить информацию о публикации из базы данных";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Вы до�тигли вашего ограничени� в %1$.0f публикаций вы�окого уровн�.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Вы до�тигли вашего ограничени� в %1$.0f  �траниц.";
+App::$strings["Failed to create source. No channel selected."] = "�е удало�ь �оздать и�точник. Канал не выбран.";
+App::$strings["Source created."] = "И�точник �оздан.";
+App::$strings["Source updated."] = "И�точник обновлен.";
+App::$strings["Sources App"] = "Приложение \"И�точники канала\"";
+App::$strings["Automatically import channel content from other channels or feeds"] = "�втоматиче�кий импорт контента из других каналов или лент";
+App::$strings["*"] = "";
+App::$strings["Channel Sources"] = "И�точники канала";
+App::$strings["Manage remote sources of content for your channel."] = "Управление удалённым и�точниками �одержимого дл� вашего канала";
+App::$strings["New Source"] = "�овый и�точник";
+App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Импортировать в�ё или выбранное �одержимое из �ледующего канала в �тот канал и ра�пределить его в �оответ�твии � вашими на�тройками.";
+App::$strings["Only import content with these words (one per line)"] = "Импортировать �одержимое только � �тим тек�том (по�трочно)";
+App::$strings["Leave blank to import all public content"] = "О�тавьте пу�тым дл� импорта в�его общедо�тупного �одержимого";
+App::$strings["Channel Name"] = "�азвание канала";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Добавить �ледующие категории к импортированным публикаци�м из �того и�точника (через зап�тые)";
+App::$strings["Resend posts with this channel as author"] = "Отправить публикации в �тот канал повторно как автор";
+App::$strings["Copyrights may apply"] = "Могут примен�ть�� автор�кие права";
+App::$strings["Source not found."] = "И�точник не найден.";
+App::$strings["Edit Source"] = "Редактировать и�точник";
+App::$strings["Delete Source"] = "Удалить и�точник";
+App::$strings["Source removed"] = "И�точник удален";
+App::$strings["Unable to remove source."] = "�евозможно удалить и�точник.";
+App::$strings["__ctx:acl__ Profile"] = "Профиль";
+App::$strings["network"] = "�еть";
+App::$strings["Permission denied"] = "До�туп запрещен";
+App::$strings["Invalid profile identifier."] = "�еверный идентификатор профил�";
+App::$strings["Profile Visibility Editor"] = "Редактор видимо�ти профил�";
+App::$strings["Profile"] = "Профиль";
+App::$strings["Click on a contact to add or remove."] = "�ажмите на контакт, чтобы добавить или удалить.";
+App::$strings["Visible To"] = "Видно";
+App::$strings["All Connections"] = "В�е контакты";
+App::$strings["Poke App"] = "Приложение \"Ткнуть\"";
+App::$strings["Poke somebody in your addressbook"] = "Ткнуть кого-нибудь в вашей адре�ной книге";
+App::$strings["Poke"] = "Ткнуть";
+App::$strings["Poke somebody"] = "Ткнуть кого-нибудь";
+App::$strings["Poke/Prod"] = "Толкнуть / подтолкнуть";
+App::$strings["Poke, prod or do other things to somebody"] = "Толкнуть, подтолкнуть или �делать что-то ещё � кем-то";
+App::$strings["Recipient"] = "Получатель";
+App::$strings["Choose what you wish to do to recipient"] = "Выбрать что вы хотите �делать � получателем";
+App::$strings["Make this post private"] = "Сделать �ту публикацию приватной";
+App::$strings["Item not found"] = "Элемент не найден";
+App::$strings["Insert web link"] = "В�тавить веб-��ылку";
+App::$strings["Edit Card"] = "Редактировать карточку";
 App::$strings["Profile not found."] = "Профиль не найден.";
 App::$strings["Profile deleted."] = "Профиль удален.";
 App::$strings["Profile-"] = "Профиль -";
@@ -2936,21 +584,26 @@ App::$strings["Dislikes"] = "�е нравит��";
 App::$strings["Work/Employment"] = "Работа / Зан�то�ть";
 App::$strings["Religion"] = "Религи�";
 App::$strings["Political Views"] = "Политиче�кие взгл�ды";
+App::$strings["Gender"] = "Гендер";
 App::$strings["Sexual Preference"] = "Сек�уальна� ориентаци�";
 App::$strings["Homepage"] = "Домашн�� �траница";
 App::$strings["Interests"] = "Интере�ы";
+App::$strings["Location"] = "Ме�то";
 App::$strings["Profile updated."] = "Профиль обновлен.";
 App::$strings["Hide your connections list from viewers of this profile"] = "Скрывать от про�мотра ваш �пи�ок контактов в �том профиле";
 App::$strings["Edit Profile Details"] = "Редактирование профил�";
 App::$strings["View this profile"] = "По�мотреть �тот профиль";
+App::$strings["Edit visibility"] = "Редактировать видимо�ть";
 App::$strings["Profile Tools"] = "Ин�трументы профил�";
 App::$strings["Change cover photo"] = "Изменить фотографию обложки";
+App::$strings["Change profile photo"] = "Изменить фотографию профил�";
 App::$strings["Create a new profile using these settings"] = "Создать новый профиль � теми же на�тройками";
 App::$strings["Clone this profile"] = "Клонировать �тот профиль";
 App::$strings["Delete this profile"] = "Удалить �тот профиль";
 App::$strings["Add profile things"] = "Добавить в профиль";
 App::$strings["Personal"] = "Личное";
 App::$strings["Relationship"] = "Отношени�";
+App::$strings["Miscellaneous"] = "Прочее";
 App::$strings["Import profile from file"] = "Импортировать профиль из файла";
 App::$strings["Export profile to file"] = "Эк�портировать профиль в файл";
 App::$strings["Your gender"] = "Ваш пол";
@@ -2965,10 +618,12 @@ App::$strings["Street address"] = "Улица, дом, квартира";
 App::$strings["Locality/City"] = "�а�еленный пункт / город";
 App::$strings["Region/State"] = "Регион / Обла�ть";
 App::$strings["Postal/Zip code"] = "Почтовый индек�";
+App::$strings["Country"] = "Страна";
 App::$strings["Who (if applicable)"] = "Кто (е�ли применимо)";
 App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Примеры: ivan1990, Ivan Petrov, ivan@example.com";
 App::$strings["Since (date)"] = "С (дата)";
 App::$strings["Tell us about yourself"] = "Ра��кажите нам о �ебе";
+App::$strings["Homepage URL"] = "URL домашней �траницы";
 App::$strings["Hometown"] = "Родной город";
 App::$strings["Political views"] = "Политиче�кие взгл�ды";
 App::$strings["Religious views"] = "Религиозные взгл�ды";
@@ -2984,73 +639,417 @@ App::$strings["School/Education"] = "Школа / образование";
 App::$strings["Contact information and social networks"] = "Информаци� и �оциальные �ети дл� �в�зи";
 App::$strings["My other channels"] = "Мои другие контакты";
 App::$strings["Communications"] = "Св�зи";
+App::$strings["Phone"] = "Телефон";
+App::$strings["Instant messenger"] = "Ме��енджер";
+App::$strings["Website"] = "Веб-�айт";
+App::$strings["Note"] = "Заметка";
+App::$strings["Mobile"] = "Мобильный";
+App::$strings["Home"] = "Домашний";
+App::$strings["Work"] = "Рабочий";
+App::$strings["Other"] = "Другой";
+App::$strings["Add Contact"] = "Добавить контакт";
+App::$strings["Add Field"] = "Добавить поле";
+App::$strings["Create"] = "Создать";
+App::$strings["Profile Image"] = "Изображение профил�";
+App::$strings["Edit Profiles"] = "Редактирование профилей";
+App::$strings["Create New"] = "Создать новый";
+App::$strings["Blocked accounts"] = "Заблокированные аккаунты";
+App::$strings["Expired accounts"] = "Про�роченные аккаунты";
+App::$strings["Expiring accounts"] = "Близкие к про�рочке аккаунты";
+App::$strings["Message queues"] = "Очередь �ообщений";
+App::$strings["Your software should be updated"] = "Ваше программное обе�печение должно быть обновлено";
+App::$strings["Summary"] = "Резюме";
+App::$strings["Registered accounts"] = "Зареги�трированные аккаунты";
+App::$strings["Pending registrations"] = "Ждут утверждени�";
+App::$strings["Registered channels"] = "Зареги�трированные каналы";
+App::$strings["Active addons"] = "�ктивные ра�ширени�";
+App::$strings["Version"] = "Вер�и� �и�темы";
+App::$strings["Repository version (master)"] = "Вер�и� репозитори� (master)";
+App::$strings["Repository version (dev)"] = "Вер�и� репозитори� (dev)";
+App::$strings["Tag removed"] = "Тег удалён";
+App::$strings["Remove Item Tag"] = "Удалить тег �лемента";
+App::$strings["Select a tag to remove: "] = "Выбрать тег дл� удалени�:";
+App::$strings["Active"] = "�ктивен";
+App::$strings["Blocked"] = "Заблокирован";
+App::$strings["Ignored"] = "Игнорирует��";
+App::$strings["Hidden"] = "Скрыт";
+App::$strings["Archived/Unreachable"] = "Заархивировано / недо�тупно";
+App::$strings["New"] = "�овые";
+App::$strings["All"] = "В�е";
+App::$strings["Active Connections"] = "�ктивные контакты";
+App::$strings["Show active connections"] = "Показать активные контакты";
+App::$strings["New Connections"] = "�овые контакты";
+App::$strings["Show pending (new) connections"] = "Про�мотр (новых) ожидающих контактов";
+App::$strings["Only show blocked connections"] = "Показать только заблокированные контакты";
+App::$strings["Only show ignored connections"] = "Показать только проигнорированные контакты";
+App::$strings["Only show archived/unreachable connections"] = "Показать только заархивированные / недо�тупные контакты";
+App::$strings["Only show hidden connections"] = "Показать только �крытые контакты";
+App::$strings["Show all connections"] = "Про�мотр в�ех контактов";
+App::$strings["Pending approval"] = "Ожидающие подтверждени�";
+App::$strings["Archived"] = "Зархивирован";
+App::$strings["Not connected at this location"] = "�е подключено в �том ме�те";
+App::$strings["Accepts"] = "Принимает";
+App::$strings["Comments"] = "комментарии";
+App::$strings["Stream items"] = "публикации в потоке";
+App::$strings["Wall posts"] = "публикации на �тене";
+App::$strings["Nothing"] = "ничего";
+App::$strings["%1\$s [%2\$s]"] = "";
+App::$strings["Edit connection"] = "Редактировать контакт";
+App::$strings["Delete connection"] = "Удалить контакт";
+App::$strings["Channel address"] = "�дре� канала";
+App::$strings["Network"] = "Сеть";
+App::$strings["Call"] = "Вызов";
+App::$strings["Status"] = "Стату�";
+App::$strings["Connected"] = "Подключено";
+App::$strings["Approve connection"] = "Утвердить контакт";
+App::$strings["Ignore connection"] = "Игнорировать контакт";
+App::$strings["Ignore"] = "Игнорировать";
+App::$strings["Recent activity"] = "По�ледние дей�тви�";
+App::$strings["Connect"] = "Подключить";
+App::$strings["Connect at this location"] = "Подключить в �том ме�те";
+App::$strings["Connections"] = "Контакты";
+App::$strings["Search"] = "Пои�к";
+App::$strings["Search your connections"] = "Пои�к ваших контактов";
+App::$strings["Connections search"] = "Пои�к контаков";
+App::$strings["Find"] = "Пои�к";
+App::$strings["Image uploaded but image cropping failed."] = "Изображение загружено но обрезка не удала�ь.";
+App::$strings["Profile Photos"] = "Фотографии профил�";
+App::$strings["Image resize failed."] = "�е удало�ь изменить размер изображени�.";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Е�ли нова� фотографи� не отображает�� немедленно то нажмите Shift + \"Обновить\" дл� очи�тки к�ша браузера";
+App::$strings["Unable to process image"] = "�е удает�� обработать изображение";
+App::$strings["Image upload failed."] = "Загрузка изображени� не удала�ь.";
+App::$strings["Unable to process image."] = "�евозможно обработать изображение.";
+App::$strings["Photo not available."] = "Фотографи� недо�тупна.";
+App::$strings["Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile"] = "Фотографи� вашего профил� по умолчанию видна в�ем в Интернете. Фотографи�профил� дл� альтернативных профилей на�ледуют разрешени� текущего профил�";
+App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = "Фотографи� вашего профил� видна в�ем в Интернете и может быть отправлена на другие �айты.";
+App::$strings["Upload File:"] = "Загрузить файл:";
+App::$strings["Select a profile:"] = "Выбрать профиль:";
+App::$strings["Use Photo for Profile"] = "И�пользовать фотографию дл� профил�";
+App::$strings["Change Profile Photo"] = "Изменить фотографию профил�";
+App::$strings["Use"] = "И�пользовать";
+App::$strings["Use a photo from your albums"] = "И�пользовать фотографию из ваших альбомов";
+App::$strings["OK"] = "";
+App::$strings["Choose images to embed"] = "Выбрать изображени� дл� в�траивани�";
+App::$strings["Choose an album"] = "Выбрать альбом";
+App::$strings["Choose a different album"] = "Выбрать другой альбом";
+App::$strings["Error getting album list"] = "Ошибка получени� �пи�ка альбомов";
+App::$strings["Error getting photo link"] = "Ошибка получени� ��ылки на фотографию";
+App::$strings["Error getting album"] = "Ошибка получени� альбома";
+App::$strings["Select existing photo"] = "Выбрать �уще�твующую фотографию";
+App::$strings["Crop Image"] = "Обрезать изображение";
+App::$strings["Please adjust the image cropping for optimum viewing."] = "Пожалуй�та на�тройте обрезку изображени� дл� оптимального про�мотра.";
+App::$strings["Done Editing"] = "Закончить редактирование";
+App::$strings["Calendar entries imported."] = "Событи� календар� импортированы.";
+App::$strings["No calendar entries found."] = "�е найдено �обытий в календаре.";
+App::$strings["CardDAV App"] = "Приложение CardDAV";
+App::$strings["CalDAV capable addressbook"] = "�дре�на� книга � поддержкой CalDAV";
+App::$strings["Link to source"] = "С�ылка на и�точник";
+App::$strings["Event title"] = "�аименование �обыти�";
+App::$strings["Start date and time"] = "Дата и врем� начала";
+App::$strings["End date and time"] = "Дата и врем� окончани�";
+App::$strings["Timezone:"] = "Ча�овой по��:";
+App::$strings["Today"] = "Сегодн�";
+App::$strings["Month"] = "Ме��ц";
+App::$strings["Week"] = "�едел�";
+App::$strings["Day"] = "День";
+App::$strings["List month"] = "Про�мотреть ме��ц";
+App::$strings["List week"] = "Про�мотреть неделю";
+App::$strings["List day"] = "Про�мотреть день";
+App::$strings["More"] = "Больше";
+App::$strings["Less"] = "Меньше";
+App::$strings["Select calendar"] = "Выбрать календарь";
+App::$strings["Channel Calendars"] = "Календари канала";
+App::$strings["CalDAV Calendars"] = "Календари CalDAV";
+App::$strings["Delete all"] = "Удалить в�ё";
+App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Про�тите, но редактирование повтор�ющих�� �обытий пока не реализовано.";
+App::$strings["Categories"] = "Категории";
+App::$strings["Organisation"] = "Организаци�";
+App::$strings["Title"] = "�аименование";
+App::$strings["P.O. Box"] = "абонент�кий �щик";
+App::$strings["Additional"] = "Дополнительно";
+App::$strings["Street"] = "Улица";
+App::$strings["Locality"] = "�а�елённый пункт";
+App::$strings["Region"] = "Регион";
+App::$strings["ZIP Code"] = "Индек�";
+App::$strings["Default Calendar"] = "Календарь по умолчанию";
+App::$strings["Default Addressbook"] = "�дре�на� книга по умолчанию";
+App::$strings["toggle full screen mode"] = "переключение полно�кранного режима";
+App::$strings["Name is required"] = "�еобходимо им�";
+App::$strings["Key and Secret are required"] = "Требуют�� ключ и код";
+App::$strings["OAuth Apps Manager App"] = "Приложение \"Менеджер Oauth\"";
+App::$strings["OAuth authentication tokens for mobile and remote apps"] = "Токены аутентификации OAuth дл� мобильный и удалённых приложений";
+App::$strings["Add application"] = "Добавить приложение";
+App::$strings["Name of application"] = "�азвание приложени�";
+App::$strings["Consumer Key"] = "Ключ клиента";
+App::$strings["Automatically generated - change if desired. Max length 20"] = "Сгенерирован автоматиче�кие - измените е�ли требует��. Мак�. длина 20";
+App::$strings["Consumer Secret"] = "Код клиента";
+App::$strings["Redirect"] = "Перенаправление";
+App::$strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI перенаправлени� - о�тавьте пу�тыми до тех пока ваше приложение не требует �того";
+App::$strings["Icon url"] = "URL значка";
+App::$strings["Application not found."] = "Приложение не найдено.";
+App::$strings["Connected OAuth Apps"] = "Подключенные приложени� OAuth";
+App::$strings["Client key starts with"] = "Ключ клиента начинает�� �";
+App::$strings["No name"] = "Без названи�";
+App::$strings["Remove authorization"] = "Удалить разрешение";
+App::$strings["No valid account found."] = "Дей�твительный аккаунт не найден.";
+App::$strings["Password reset request issued. Check your email."] = "Запро� на �бро� парол� отправлен. Проверьте вашу �лектронную почту.";
+App::$strings["Site Member (%s)"] = "Уча�тник �айта (%s)";
+App::$strings["Password reset requested at %s"] = "Запрошен �бро� парол� на %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Запро� не может быть проверен. (Вы могли отправить его раньше). Сбро� парол� не возможен.";
+App::$strings["Your password has been reset as requested."] = "Ваш пароль в �оответ�твии � про�ьбой �брошен.";
+App::$strings["Your new password is"] = "Ваш новый пароль";
+App::$strings["Save or copy your new password - and then"] = "Сохраните ваш новый пароль и затем";
+App::$strings["click here to login"] = "нажмите зде�ь чтобы войти";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ваш пароль может быть изменён на �транице <em>�а�тройки</em> по�ле у�пешного входа.";
+App::$strings["Your password has changed at %s"] = "Пароль был изменен на %s";
+App::$strings["Forgot your Password?"] = "Забыли ваш пароль?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Введите ваш адре� �лектронной почты и нажмите отправить чтобы �бро�ить пароль. Затем проверьте ваш почтовый �щик дл� дальнейших ин�трукций. ";
+App::$strings["Email Address"] = "�дре� �лектронной почты";
+App::$strings["Reset"] = "Сбро�ить";
+App::$strings["No more system notifications."] = "�ет новых оповещений �и�темы.";
+App::$strings["System Notifications"] = "Си�темные оповещени� ";
+App::$strings["Mark all seen"] = "Отметить как про�мотренное";
+App::$strings["Remote privacy information not available."] = "Удаленна� информаци� о конфиденциально�ти недо�тупна.";
+App::$strings["Visible to:"] = "Видимо дл�:";
+App::$strings["Requested profile is not available."] = "Запрашиваемый профиль не до�тупен.";
+App::$strings["Continue"] = "Продолжить";
+App::$strings["Premium Channel Setup"] = "У�тановка премиального канала";
+App::$strings["Enable premium channel connection restrictions"] = "Включить ограничени� дл� премиального канала";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Пожалуй�та введите ваши ограничени� или у�лови�, такие, как оплата PayPal, правила и�пользовани� и т.п.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Этот канал до подключени� может требовать дополнительных шагов или подтверждений �ледующих у�ловий:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Потенциальные �оединени� будут видеть �ледующий предварительный тек�т:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Продолжа�, � подтверждаю что � выполнил в�е у�лови� пред�тавленные на данной �транице.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Владельцем канала не было пред�тавлено никаких �пециальных ин�трукций.)";
+App::$strings["Restricted or Premium Channel"] = "Ограниченный или премиальный канал";
+App::$strings["No channel."] = "Канала нет.";
+App::$strings["No connections in common."] = "Общих контактов нет.";
+App::$strings["View Common Connections"] = "Про�мотр общий контактов";
+App::$strings["photo"] = "фото";
+App::$strings["status"] = "�тату�";
 App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s от�леживает %2\$s's %3\$s";
 App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s прекратил от�леживать %2\$s's %3\$s";
-App::$strings["Articles App"] = "Приложение \"Статьи\"";
-App::$strings["Create interactive articles"] = "Создать интерактивные �татьи";
-App::$strings["Add Article"] = "Добавить �татью";
-App::$strings["Bookmark added"] = "Закладка добавлена";
-App::$strings["Bookmarks App"] = "Приложение \"Закладки\"";
-App::$strings["Bookmark links from posts and manage them"] = "Поме�тить ��ылки из публикации в закладки и управл�ть ими";
-App::$strings["My Bookmarks"] = "Мои закладки";
-App::$strings["My Connections Bookmarks"] = "Закладки моих контактов";
-App::$strings["Remote Diagnostics App"] = "Приложение \"Удалённа� диагно�тика\"";
-App::$strings["Perform diagnostics on remote channels"] = "Производит диагно�тику удалённых каналов";
+App::$strings["Page link"] = "С�ылка �траницы";
+App::$strings["Edit Webpage"] = "Редактировать веб-�траницу";
+App::$strings["Token verification failed."] = "�е удало�ь выполнить проверку токена.";
+App::$strings["Email verification resent"] = "Сообщение дл� проверки email отправлено повторно";
+App::$strings["Unable to resend email verification message."] = "�евозможно повторно отправить �ообщение дл� проверки email";
+App::$strings["Entry censored"] = "Запи�ь цензурирована";
+App::$strings["Entry uncensored"] = "Запи�ь нецензурирована";
+App::$strings["Nothing to import."] = "�ичего импортировать.";
+App::$strings["Unable to download data from old server"] = "�евозможно загрузить данные �о �тарого �ервера";
+App::$strings["Imported file is empty."] = "Импортированный файл пу�т.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Предупреждение: Вер�и� базы данных отличает�� от %1\$d обновлени�.";
+App::$strings["Import completed"] = "Импорт завершён.";
+App::$strings["Import Items"] = "Импортировать объекты";
+App::$strings["Use this form to import existing posts and content from an export file."] = "И�пользуйте �ту форму дл� импорта �уще�твующих публикаций и �одержимого из файла.";
+App::$strings["File to Upload"] = "Файл дл� загрузки";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "";
+App::$strings["Email resent"] = "Электронна� почта повторно отправлена";
+App::$strings["Email resend failed"] = "Ошибка повторной отправки �лектронной почты";
+App::$strings["Verification successful"] = "Проверка прошла у�пешно";
+App::$strings["Account successfull created"] = "Учётна� запи�ь у�пешно �оздана";
+App::$strings["Channel successfull created"] = "Канал у�пешно �оздан";
+App::$strings["Automatic channel creation failed. Please create a channel."] = "�втоматиче�кой �оздание канала не удало�ь. Пожалуй�та �оздайте канал.";
+App::$strings["Account creation error"] = "Ошибка �оздани� учётной запи�и";
+App::$strings["Verify failed"] = "Проверка не удала�ь";
+App::$strings["Token verification failed"] = "�еверный проверочный код";
+App::$strings["Request not inside time frame"] = "Запро� в не у�тановленные �роки ";
+App::$strings["Identity unknown"] = "Лично�ть не у�тановлена";
+App::$strings["dId2 mistaken"] = "ошибочный dId2";
+App::$strings["Your Registration ID"] = "Идентификатор вашей реги�трации";
+App::$strings["Registration verification"] = "Проверка реги�трации";
+App::$strings["Hold on, you can start verification in"] = "Подождите, вы можете начать проверку через ";
+App::$strings["Please remember your verification token for ID"] = "Пожалуй�та, запомните �вой код подтверждени� дл� идентификации";
+App::$strings["Token validity"] = "Срок дей�тви� кода";
+App::$strings["Resend email"] = "Отправить �лектронное пи�ьмо повторно";
+App::$strings["Registration status"] = "Стату� реги�трации";
+App::$strings["Verification successful!"] = "Проверка прошла у�пешно! ";
+App::$strings["Your login ID is"] = "Ваш логин дл� входа";
+App::$strings["After your account has been approved by our administrator you will be able to login with your login ID and your provided password."] = "По�ле того, как ваша учетна� запи�ь будет одобрена нашим админи�тратором, вы �можете войти в �и�тему, указав �вой логин и пароль.";
+App::$strings["Registration request revoked"] = "Запро� на реги�трацию был отозван";
+App::$strings["Sorry for any inconvience. Thank you for your response."] = "Прино�им извинени� за неудоб�тва. Благодарим за ваш ответ.";
+App::$strings["Please enter your verification token for ID"] = "Пожалуй�та введите ваш проверочный код дл� идентификации";
+App::$strings["Please check your email!"] = "Пожалуй�та, проверьте вашу �лектронную почту!";
+App::$strings["Verification token"] = "Код проверки";
+App::$strings["ID expired"] = "Срок дей�тви� идентификатора и�тёк";
+App::$strings["You will require the verification token for ID"] = "Вам потребует�� проверочный кода дл� идентификации";
+App::$strings["Unknown or expired ID"] = "Идентификатор неизве�тен или � и�текшим �роком дей�тви�";
+App::$strings["dId2 malformed"] = "�еверный dId2";
+App::$strings["&#x1f501; Repeated %1\$s's %2\$s"] = "&#x1f501; Повторил %1\$s %2\$s";
+App::$strings["Post repeated"] = "Публикаци� повтор�ет��";
+App::$strings["webpage"] = "веб-�траница";
+App::$strings["block"] = "заблокировать";
+App::$strings["layout"] = "шаблон";
+App::$strings["menu"] = "меню";
+App::$strings["%s element installed"] = "%s �лемент у�тановлен";
+App::$strings["%s element installation failed"] = "%sу�тановка �лемента неудачна.";
+App::$strings["This site is not a directory server"] = "Этот �айт не �вл�ет�� �ервером каталога";
 App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = "Изменение названи� канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта.";
 App::$strings["Change channel nickname/address"] = "Изменить п�евдоним / адре� канала";
 App::$strings["Any/all connections on other networks will be lost!"] = "Любые / в�е контакты в других �ет�х будут утер�ны!";
 App::$strings["New channel address"] = "�овый адре� канала";
 App::$strings["Rename Channel"] = "Переименовать канал";
-App::$strings["Invite App"] = "Приложение \"Пригла�ить\"";
-App::$strings["Register is closed"] = "Реги�траци� закрыта";
-App::$strings["Note, the invitation code is valid up to"] = "Обратите внимание: код приглашени� дей�твителен до ";
-App::$strings["Too many recipients for one invitation (max %d)"] = "Слишком много получателей дл� одного кода приглашени� (не более %d)";
-App::$strings["No recipients for this invitation"] = "�ет получателей дл� �того приглашени�";
-App::$strings["(%s) : Not a valid email address"] = "(%s) : �едей�твительный адре� �лектронной почты";
-App::$strings["(%s) : Not a real email address"] = "(%s) : �е на�то�щий адре� �лектронной почты";
-App::$strings["(%s) : Not allowed email address"] = "(%s) : �е разрешённый адре� �лектронной почты";
-App::$strings["(%s) : email address already in use"] = "(%s) : �дре� �лектронной почты уже и�пользует��";
-App::$strings["(%s) : Accepted email address"] = "%s) : Подтверждённый адре� �лектронной почты";
-App::$strings["To %s : Message delivery success."] = "Дл� %s : Сообщение у�пешно до�тавлено.";
-App::$strings["%1\$d mail(s) sent, %2\$d mail error(s)"] = "%1\$d пи�ем отправлено, %2\$d ошибок до�тавки";
-App::$strings["Invites not proposed by configuration"] = "И�пользование приглашений не предлагает��";
-App::$strings["Contact the site admin"] = "Св�зат�� � админи�тратором �айта";
-App::$strings["Invites by users not enabled"] = "Приглашени� от пользователей отключены";
-App::$strings["You have no more invitations available"] = "У ва� больше нет приглашений";
-App::$strings["Not on xchan"] = "�еизве�тный пользователь";
-App::$strings["All users invitation limit exceeded."] = "Превышен лимит приглашений дл� в�ех пользователей.";
-App::$strings["Invitation expires after"] = "Приглашение и�текает по�ле";
-App::$strings["Invitation"] = "Приглашение";
-App::$strings["Send invitations"] = "Отправить приглашение";
-App::$strings["Invitations I am using"] = "Приглашени�, которые � и�пользую";
-App::$strings["Invitations we are using"] = "Приглашени�, которые мы и�пользуем";
-App::$strings["§ Note, the email(s) sent will be recorded in the system logs"] = "Внимание: адре�а �лектронной почты будут запи�аны в �и�темные журналы.";
-App::$strings["Enter email addresses, one per line:"] = "Введите адре�а �лектронной почты, по одному в �троке:";
-App::$strings["Invite template"] = "Шаблон приглашени�";
-App::$strings["Here you may enter personal notes to the recipient(s)"] = "Зде�ь вы можете вве�ти личные заметки дл� получателей";
-App::$strings["Notes App"] = "Приложение \"Запи�ки\"";
-App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Про�тое приложение дл� запи�ок � виджетом (примечание: запи�ки не зашифрованы)";
+App::$strings["Layout Name"] = "�азвание шаблона";
+App::$strings["Layout Description (Optional)"] = "Опи�ание шаблона (необ�зательно)";
+App::$strings["Layouts"] = "Шаблоны";
+App::$strings["Help"] = "Помощь";
+App::$strings["Comanche page description language help"] = "Помощь по �зыку опи�ани� �траниц Comanche ";
+App::$strings["Layout Description"] = "Опи�ание шаблона";
+App::$strings["Created"] = "Создано";
+App::$strings["Edited"] = "Отредактировано";
+App::$strings["Download PDL file"] = "Загрузить PDL файл";
+App::$strings["View"] = "Про�мотр";
+App::$strings["Bookmark added"] = "Закладка добавлена";
+App::$strings["Bookmarks App"] = "Приложение \"Закладки\"";
+App::$strings["Bookmark links from posts and manage them"] = "Поме�тить ��ылки из публикации в закладки и управл�ть ими";
+App::$strings["My Bookmarks"] = "Мои закладки";
+App::$strings["My Connections Bookmarks"] = "Закладки моих контактов";
+App::$strings["Could not access contact record."] = "�е удало�ь получить до�туп к запи�и контакта.";
+App::$strings["Settings updated."] = "�а�тройки обновлены.";
+App::$strings["Default Permissions App"] = "Приложение \"Разрешени� по умолчанию\"";
+App::$strings["Set custom default permissions for new connections"] = "�а�тройка пользователь�ких разрешений по умолчанию дл� новых подключений ";
+App::$strings["Connection Default Permissions"] = "Разрешени� по умолчанию дл� контакта";
+App::$strings["Apply these permissions automatically"] = "Применить �ти разрешени� автоматиче�ки";
+App::$strings["If enabled, connection requests will be approved without your interaction"] = "Е�ли включено, запро�ы контактов будут одобрены без вашего уча�ти�";
+App::$strings["Permission role"] = "Роль разрешени�";
+App::$strings["Loading"] = "Загрузка";
+App::$strings["Add permission role"] = "Добавить роль разрешени�";
+App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Разрешени�, указанные на �той �транице, будут примен�ть�� ко в�ем новым �оединени�м.";
+App::$strings["Automatic approval settings"] = "�а�тройки автоматиче�кого одобрени�";
+App::$strings["inherited"] = "на�ледует��";
+App::$strings["My Settings"] = "Мои на�тройки";
+App::$strings["Individual Permissions"] = "Индивидуальные разрешени�";
+App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "�екоторые индивидуальные разрешени� могут быть преду�тановлены или заблокированы на о�новании типа вашего канала и на�троек приватно�ти.";
+App::$strings["Authorize application connection"] = "�вторизовать подключение приложени�";
+App::$strings["Return to your app and insert this Security Code:"] = "Верните�ь к �воему приложению и в�тавьте �тот код безопа�но�ти:";
+App::$strings["Please login to continue."] = "Пожалуй�та, войдите, чтобы продолжить.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Вы хотите авторизовать �то приложение дл� до�тупа к вашим публикаци�м и контактам и / или �озданию новых публикаций?";
 App::$strings["Xchan Lookup"] = "Пои�к Xchan";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Запро� Xchan начинает�� � (или webbie):";
-App::$strings["Affinity Tool settings updated."] = "�а�тройки �тепени �ход�тва обновлены.";
-App::$strings["This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream."] = "Это приложение пред�тавл�ет управление ползунком на �транице контактов и �етевом потоке, который позвол�ет выбирать вашу �тепень дружбы (�ход�тва). Это позвол�ет вам увеличивать или уменьшать ма�штаб и отображать разговоры только от ваших �амых близких друзей или в�ех в вашем потоке.";
-App::$strings["Affinity Tool App"] = "Приложение \"Степень �ход�тва\"";
-App::$strings["The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage."] = "Чи�ла ниже пред�тавл�ют минимальное и мак�имальное значение по умолчанию дл� вашей �ети / потока в процентах.";
-App::$strings["Default maximum affinity level"] = "Мак�имальна� �тепень �ход�тва по умолчанию.";
-App::$strings["0-99 default 99"] = "0-99 (по умолчанию 99)";
-App::$strings["Default minimum affinity level"] = "Мак�имальна� �тепень �ход�тва по умолчанию.";
-App::$strings["0-99 - default 0"] = "0-99 (по умолчанию 0)";
-App::$strings["Persistent affinity levels"] = "У�то�вшие�� �тепени �ход�тва";
-App::$strings["If disabled the max and min levels will be reset to default after page reload"] = "Е�ли �тот параметр отключен, мак�имальный и минимальный уровни будут �брошены к значени�м по умолчанию по�ле перезагрузки �траницы";
-App::$strings["Affinity Tool Settings"] = "�а�тройки �тепени �ход�тва";
-App::$strings["Website:"] = "Веб-�айт:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Удалённый канал [%s] (пока неизве�тен на �том �айте)";
-App::$strings["Rating (this information is public)"] = "Оценка (�та информаци� общедо�тупна)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Объ��ните �вою оценку (необ�зательно; �та информаци� общедо�тупна)";
+App::$strings["Not found."] = "�е найдено.";
+App::$strings["Edit Article"] = "Редактировать �татью";
+App::$strings["This directory server requires an access token"] = "Дл� до�тупа к �тому �ерверу каталогов требует�� токен";
+App::$strings["Suggest Channels App"] = "Приложение \"Рекомендуемые каналы\"";
+App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Предложени� по рекомендуемым каналам в �ети \$Projectname которые могут ва� заинтере�овать";
+App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "�ет предложений. Е�ли �то новый �айт, повторите попытку через 24 ча�а.";
+App::$strings["Ignore/Hide"] = "Игнорировать / cкрыть";
+App::$strings["Channel Suggestions"] = "Рекомендации каналов";
+App::$strings["Documentation Search"] = "Пои�к документации";
+App::$strings["About"] = "О �ебе";
+App::$strings["Members"] = "Уча�тники";
+App::$strings["Administrators"] = "�дмини�траторы";
+App::$strings["Developers"] = "Разработчики";
+App::$strings["Tutorials"] = "Руковод�тва";
+App::$strings["\$Projectname Documentation"] = "\$Projectname Документаци�";
+App::$strings["Contents"] = "Содержимое";
+App::$strings["Deprecated!"] = "�е рекомендовано!";
+App::$strings["File not found."] = "Файл не найден.";
+App::$strings["Permission Denied."] = "До�туп запрещен.";
+App::$strings["Edit file permissions"] = "Редактировать разрешени� файла";
+App::$strings["Set/edit permissions"] = "Редактировать разрешени�";
+App::$strings["Include all files and sub folders"] = "Включить в�е файлы и подкаталоги";
+App::$strings["Return to file list"] = "Вернут�� к �пи�ку файлов";
+App::$strings["Copy/paste this code to attach file to a post"] = "Копировать / в�тавить �тот код дл� прикреплени� файла к публикации";
+App::$strings["Copy/paste this URL to link file from a web page"] = "Копировать / в�тавить �ту URL дл� ��ылки на файл �о �траницы";
+App::$strings["Share this file"] = "Поделить�� �тим файлом";
+App::$strings["Show URL to this file"] = "Показать URL �того файла";
+App::$strings["Show in your contacts shared folder"] = "Показать общий каталог в ваших контактах";
+App::$strings["Permission category name is required."] = "Требует�� категори� разрешений.";
+App::$strings["Permission category saved."] = "Категори� разрешени� �охранена.";
+App::$strings["Permission Categories App"] = "Приложение \"Категории разрешений\"";
+App::$strings["Create custom connection permission limits"] = "Создать пользователь�кие ограничени� на до�туп к подключению";
+App::$strings["Use this form to create permission rules for various classes of people or connections."] = "И�пользуйте �ту форму дл� �оздани� правил разрешений дл� различных групп людей и контактов.";
+App::$strings["Permission Categories"] = "Категории разрешений";
+App::$strings["Permission category name"] = "�аименование категории разрешений";
+App::$strings["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."] = "�екоторые разрешени� могут на�ледовать из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> ваших каналов которые могут иметь более вы�окий приоритет чем индивидуальные. Вы <strong>не можете</strong> мен�ть �ти на�тройки зде�ь.";
+App::$strings["Block Name"] = "�азвание блока";
+App::$strings["Edit Block"] = "Редактировать блок";
+App::$strings["Post not found."] = "Публикаци� не найдена";
+App::$strings["event"] = "�обытие";
+App::$strings["post"] = "публикаци�";
+App::$strings["comment"] = "комментарий";
+App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s отметил тегом %4\$s %3\$s %2\$s";
+App::$strings["Layout updated."] = "Шаблон обновлен.";
+App::$strings["PDL Editor App"] = "Приложение \"Редактор PDL\"";
+App::$strings["Provides the ability to edit system page layouts"] = "Предо�тавл�ет возможно�ть редактировать макеты �и�темных �траниц";
+App::$strings["Edit System Page Description"] = "Редактировать опи�ание �и�темной �траницы";
+App::$strings["(modified)"] = "(изменено)";
+App::$strings["Layout not found."] = "Шаблон не найден.";
+App::$strings["Module Name:"] = "Им� модул�:";
+App::$strings["Layout Help"] = "Помощь к шаблону";
+App::$strings["Edit another layout"] = "Редактировать другой шаблон";
+App::$strings["System layout"] = "Си�темный шаблон";
+App::$strings["Chatrooms App"] = "Приложение \"Мои чаты\"";
+App::$strings["Access Controlled Chatrooms"] = "Получить до�туп к контролируемым чатам";
+App::$strings["Room not found"] = "Комната не найдена";
+App::$strings["Leave Room"] = "Покинуть комнату";
+App::$strings["Delete Room"] = "Удалить комнату";
+App::$strings["I am away right now"] = "Я �ейча� отошёл";
+App::$strings["I am online"] = "Я на �в�зи";
+App::$strings["Bookmark this room"] = "Запомнить �ту комнату";
+App::$strings["Please enter a link URL:"] = "Пожалуй�та введите URL ��ылки:";
+App::$strings["Encrypt text"] = "Зашифровать тек�т";
+App::$strings["New Chatroom"] = "�овый чат";
+App::$strings["Chatroom name"] = "�азвание чата";
+App::$strings["Expiration of chats (minutes)"] = "Завершение чатов (минут)";
+App::$strings["%1\$s's Chatrooms"] = "Чаты пользовател� %1\$s";
+App::$strings["No chatrooms available"] = "�ет до�тупных чатов";
+App::$strings["Expiration"] = "Срок дей�тви�";
+App::$strings["min"] = "мин.";
+App::$strings["Blocks"] = "Блокировки";
+App::$strings["Block Title"] = "Заблокировать заголовок";
+App::$strings["Directory Settings"] = "�а�тройки каталога";
+App::$strings["Not valid email."] = "�е дей�твительный адре� email.";
+App::$strings["Protected email address. Cannot change to that email."] = "Защищенный адре� �лектронной почты. �ельз� изменить.";
+App::$strings["System failure storing new email. Please try again."] = "Си�темна� ошибка �охранени� email. Пожалуй�та попробуйте ещё раз.";
+App::$strings["Password verification failed."] = "�е удало�ь выполнить проверку парол�.";
+App::$strings["Passwords do not match. Password unchanged."] = "Пароли не �овпадают. Пароль не изменён.";
+App::$strings["Empty passwords are not allowed. Password unchanged."] = "Пу�тые пароли не допу�кают��. Пароль не изменён.";
+App::$strings["Password changed."] = "Пароль изменен.";
+App::$strings["Password update failed. Please try again."] = "Изменение парол� не удало�ь. Пожалуй�та, попробуйте ещё раз.";
+App::$strings["Account Settings"] = "�а�тройки аккаунта";
+App::$strings["Current Password"] = "Текущий пароль";
+App::$strings["Enter New Password"] = "Введите новый пароль:";
+App::$strings["Confirm New Password"] = "Подтвердите новый пароль:";
+App::$strings["Leave password fields blank unless changing"] = "О�тавьте пол� пу�тыми до измнени�";
+App::$strings["DId2 or Email Address:"] = "dId2 или адре� �лектронной почты:";
+App::$strings["Remove this account including all its channels"] = "Удалить �тот аккаунт включа� в�е каналы";
+App::$strings["Calendar Settings"] = "�а�тройки календар�";
+App::$strings["Channel Manager Settings"] = "�а�тройки менеджера канала";
 App::$strings["Max height of content (in pixels)"] = "Мак�имальна� вы�ота �одержимого (в пик�ел�х)";
 App::$strings["Click to expand content exceeding this height"] = "�ажмите чтобы развернуть �одержимое превышающее �ту вы�оту";
 App::$strings["Stream Settings"] = "�а�тройки потока";
+App::$strings["Settings saved."] = "�а�тройки �охранены.";
+App::$strings["Settings saved. Reload page please."] = "�а�тройки �охранены. Пожалуй�та, перезагрузите �траницу.";
+App::$strings["Conversation Settings"] = "�а�тройки бе�ед";
 App::$strings["Additional Features"] = "Дополнительные функции";
+App::$strings["%s - (Experimental)"] = "%s - (�к�периментальный)";
+App::$strings["Display Settings"] = "�а�тройки отображени�";
+App::$strings["Theme Settings"] = "�а�тройки темы";
+App::$strings["Custom Theme Settings"] = "Дополнительные на�тройки темы";
+App::$strings["Content Settings"] = "�а�тройки �одержимого";
+App::$strings["Display Theme:"] = "Тема отображени�:";
+App::$strings["Select scheme"] = "Выбрать �хему";
+App::$strings["Preload images before rendering the page"] = "Предзагрузка изображений перед обработкой �траницы";
+App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Субъективное врем� загрузки �траницы будет длиннее, но �траница будет готова при отображении";
+App::$strings["Enable user zoom on mobile devices"] = "Включить ма�штабирование на мобильных у�трой�твах";
+App::$strings["Update browser every xx seconds"] = "Обновление браузера каждые N �екунд";
+App::$strings["Minimum of 10 seconds, no maximum"] = "Минимум 10 �екунд, без мак�имума";
+App::$strings["Maximum number of conversations to load at any time:"] = "Мак�имальное количе�тво бе�ед дл� загрузки одновременно:";
+App::$strings["Maximum of 30 items"] = "�е более 30 �лементов";
+App::$strings["Show emoticons (smilies) as images"] = "Показывать �мотиконы (�майлики) как изображени�";
+App::$strings["Provide channel menu in navigation bar"] = "Показывать меню канала в панели навигации";
+App::$strings["Default: channel menu located in app menu"] = "По умолчанию каналы ра�положены в меню приложени�";
+App::$strings["Link post titles to source"] = "С�ылки на и�точник заголовков публикаций";
+App::$strings["New Member Links"] = "С�ылки дл� новичков";
+App::$strings["Display new member quick links menu"] = "Показать меню бы�трых ��ылок дл� новых уча�тников";
+App::$strings["Editor Settings"] = "�а�тройки редактора";
+App::$strings["Photos Settings"] = "�а�тройки фотографий";
+App::$strings["Events Settings"] = "�а�тройки �обытий";
+App::$strings["Personal menu to display in your channel pages"] = "Пер�ональное меню дл� отображени� на �транице вашего канала";
+App::$strings["Channel Home Settings"] = "�а�тройки главной �траницы канала";
+App::$strings["Profiles Settings"] = "�а�тройки профилей";
+App::$strings["Friends"] = "Друзь�";
 App::$strings["Nobody except yourself"] = "�икто кроме ва�";
 App::$strings["Only those you specifically allow"] = "Только пер�онально разрешённые";
 App::$strings["Approved connections"] = "Одобренные контакты";
@@ -3064,9 +1063,9 @@ App::$strings["Allow us to suggest you as a potential friend to new members?"] =
 App::$strings["Your channel address is"] = "�дре� вашего канала";
 App::$strings["Your files/photos are accessible via WebDAV at"] = "Ваши файлы / фотографии до�тупны через WebDAV по";
 App::$strings["Automatic membership approval"] = "Член�тво одобрено автоматиче�ки";
-App::$strings["If enabled, connection requests will be approved without your interaction"] = "Е�ли включено, запро�ы контактов будут одобрены без вашего уча�ти�";
 App::$strings["Channel Settings"] = "�а�тройки канала";
 App::$strings["Basic Settings"] = "О�новные на�тройки";
+App::$strings["Full Name:"] = "Полное им�:";
 App::$strings["Email Address:"] = "�дре� email:";
 App::$strings["Your Timezone:"] = "Ча�овой по��:";
 App::$strings["Default Post Location:"] = "Ра�положение по умолчанию:";
@@ -3094,7 +1093,9 @@ App::$strings["The website limit takes precedence if lower than your limit."] =
 App::$strings["Maximum Friend Requests/Day:"] = "Запро�ов в друзь� в день:";
 App::$strings["May reduce spam activity"] = "Может ограничить �пам активно�ть";
 App::$strings["Default Privacy Group"] = "Группа конфиденциально�ти по умолчанию";
+App::$strings["(click to open/close)"] = "(нажмите чтобы открыть/закрыть)";
 App::$strings["Use my default audience setting for the type of object published"] = "И�пользовать на�тройки аудитории по умолчанию дл� типа опубликованного объекта";
+App::$strings["Channel role and privacy"] = "Роль и конфиденциально�ть канала";
 App::$strings["Default permissions category"] = "Категори� разрешений по умолчанию";
 App::$strings["Maximum private messages per day from unknown people:"] = "Мак�имально количе�тво �ообщений от незнакомых людей, в день:";
 App::$strings["Useful to reduce spamming"] = "Полезно дл� �окращени� количе�тва �пама";
@@ -3142,57 +1143,144 @@ App::$strings["Miscellaneous Settings"] = "Дополнительные на�т
 App::$strings["Default photo upload folder"] = "Каталог загрузки фотографий по умолчанию";
 App::$strings["%Y - current year, %m -  current month"] = "%Y - текущий год, %y - текущий ме��ц";
 App::$strings["Default file upload folder"] = "Каталог загрузки файлов по умолчанию";
+App::$strings["Remove Channel"] = "Удаление канала";
 App::$strings["Remove this channel."] = "Удалить �тот канал.";
-App::$strings["Not valid email."] = "�е дей�твительный адре� email.";
-App::$strings["Protected email address. Cannot change to that email."] = "Защищенный адре� �лектронной почты. �ельз� изменить.";
-App::$strings["System failure storing new email. Please try again."] = "Си�темна� ошибка �охранени� email. Пожалуй�та попробуйте ещё раз.";
-App::$strings["Password verification failed."] = "�е удало�ь выполнить проверку парол�.";
-App::$strings["Passwords do not match. Password unchanged."] = "Пароли не �овпадают. Пароль не изменён.";
-App::$strings["Empty passwords are not allowed. Password unchanged."] = "Пу�тые пароли не допу�кают��. Пароль не изменён.";
-App::$strings["Password changed."] = "Пароль изменен.";
-App::$strings["Password update failed. Please try again."] = "Изменение парол� не удало�ь. Пожалуй�та, попробуйте ещё раз.";
-App::$strings["Account Settings"] = "�а�тройки аккаунта";
-App::$strings["Current Password"] = "Текущий пароль";
-App::$strings["Enter New Password"] = "Введите новый пароль:";
-App::$strings["Confirm New Password"] = "Подтвердите новый пароль:";
-App::$strings["Leave password fields blank unless changing"] = "О�тавьте пол� пу�тыми до измнени�";
-App::$strings["DId2 or Email Address:"] = "dId2 или адре� �лектронной почты:";
-App::$strings["Remove this account including all its channels"] = "Удалить �тот аккаунт включа� в�е каналы";
+App::$strings["Connections Settings"] = "�а�тройки контактов";
 App::$strings["No feature settings configured"] = "Параметры функций не на�троены";
 App::$strings["Addon Settings"] = "�а�тройки ра�ширений";
 App::$strings["Please save/submit changes to any panel before opening another."] = "Пожалуй�та �охраните / отправьте изменени� на панели прежде чем открывать другую.";
-App::$strings["Events Settings"] = "�а�тройки �обытий";
-App::$strings["Channel Manager Settings"] = "�а�тройки менеджера канала";
-App::$strings["Personal menu to display in your channel pages"] = "Пер�ональное меню дл� отображени� на �транице вашего канала";
-App::$strings["Channel Home Settings"] = "�а�тройки главной �траницы канала";
-App::$strings["Calendar Settings"] = "�а�тройки календар�";
-App::$strings["%s - (Experimental)"] = "%s - (�к�периментальный)";
-App::$strings["Display Settings"] = "�а�тройки отображени�";
-App::$strings["Theme Settings"] = "�а�тройки темы";
-App::$strings["Custom Theme Settings"] = "Дополнительные на�тройки темы";
-App::$strings["Content Settings"] = "�а�тройки �одержимого";
-App::$strings["Display Theme:"] = "Тема отображени�:";
-App::$strings["Select scheme"] = "Выбрать �хему";
-App::$strings["Preload images before rendering the page"] = "Предзагрузка изображений перед обработкой �траницы";
-App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "Субъективное врем� загрузки �траницы будет длиннее, но �траница будет готова при отображении";
-App::$strings["Enable user zoom on mobile devices"] = "Включить ма�штабирование на мобильных у�трой�твах";
-App::$strings["Update browser every xx seconds"] = "Обновление браузера каждые N �екунд";
-App::$strings["Minimum of 10 seconds, no maximum"] = "Минимум 10 �екунд, без мак�имума";
-App::$strings["Maximum number of conversations to load at any time:"] = "Мак�имальное количе�тво бе�ед дл� загрузки одновременно:";
-App::$strings["Maximum of 30 items"] = "�е более 30 �лементов";
-App::$strings["Show emoticons (smilies) as images"] = "Показывать �мотиконы (�майлики) как изображени�";
-App::$strings["Provide channel menu in navigation bar"] = "Показывать меню канала в панели навигации";
-App::$strings["Default: channel menu located in app menu"] = "По умолчанию каналы ра�положены в меню приложени�";
-App::$strings["Link post titles to source"] = "С�ылки на и�точник заголовков публикаций";
-App::$strings["Display new member quick links menu"] = "Показать меню бы�трых ��ылок дл� новых уча�тников";
-App::$strings["Directory Settings"] = "�а�тройки каталога";
-App::$strings["Editor Settings"] = "�а�тройки редактора";
-App::$strings["Connections Settings"] = "�а�тройки контактов";
-App::$strings["Photos Settings"] = "�а�тройки фотографий";
-App::$strings["Profiles Settings"] = "�а�тройки профилей";
-App::$strings["Settings saved."] = "�а�тройки �охранены.";
-App::$strings["Settings saved. Reload page please."] = "�а�тройки �охранены. Пожалуй�та, перезагрузите �траницу.";
-App::$strings["Conversation Settings"] = "�а�тройки бе�ед";
+App::$strings["Poll not found."] = "Опро� не найден";
+App::$strings["Invalid response."] = "�еверный ответ.";
+App::$strings["Response submitted. Updates may not appear instantly."] = "Ответ отправлен. Обновлени� могут отображать�� не �разу.";
+App::$strings["Location not found."] = "Ме�тоположение не найдено";
+App::$strings["Location lookup failed."] = "Пои�к ме�тоположени� не удал��";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Пожалуй�та, выберите другое ме�тоположение в каче�тве о�новного прежде чем удалить предыдущее";
+App::$strings["Syncing locations"] = "Синхронизировать ме�тоположение";
+App::$strings["No locations found."] = "Ме�тоположений не найдено";
+App::$strings["Manage Channel Locations"] = "Управление ме�тоположением канала";
+App::$strings["Primary"] = "О�новной";
+App::$strings["Drop"] = "Удалить";
+App::$strings["Sync Now"] = "Синхронизировать";
+App::$strings["Please wait several minutes between consecutive operations."] = "Пожалуй�та, подождите не�колько минут между по�ледовательными операци�ми.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "По возможно�ти, очи�тите ме�тоположение, войд� на �тот веб-�айт / хаб и удалив �вой канал.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "И�пользуйте �ту форму, чтобы удалить ме�тоположение, е�ли хаб больше не функционирует.";
+App::$strings["Invite App"] = "Приложение \"Пригла�ить\"";
+App::$strings["Register is closed"] = "Реги�траци� закрыта";
+App::$strings["Note, the invitation code is valid up to"] = "Обратите внимание: код приглашени� дей�твителен до ";
+App::$strings["Too many recipients for one invitation (max %d)"] = "Слишком много получателей дл� одного кода приглашени� (не более %d)";
+App::$strings["No recipients for this invitation"] = "�ет получателей дл� �того приглашени�";
+App::$strings["(%s) : Not a valid email address"] = "(%s) : �едей�твительный адре� �лектронной почты";
+App::$strings["(%s) : Not a real email address"] = "(%s) : �е на�то�щий адре� �лектронной почты";
+App::$strings["(%s) : Not allowed email address"] = "(%s) : �е разрешённый адре� �лектронной почты";
+App::$strings["(%s) : email address already in use"] = "(%s) : �дре� �лектронной почты уже и�пользует��";
+App::$strings["(%s) : Accepted email address"] = "%s) : Подтверждённый адре� �лектронной почты";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["%s : Message delivery failed."] = "%s : До�тавка �ообщени� не удала�ь.";
+App::$strings["To %s : Message delivery success."] = "Дл� %s : Сообщение у�пешно до�тавлено.";
+App::$strings["%1\$d mail(s) sent, %2\$d mail error(s)"] = "%1\$d пи�ем отправлено, %2\$d ошибок до�тавки";
+App::$strings["Invites not proposed by configuration"] = "И�пользование приглашений не предлагает��";
+App::$strings["Contact the site admin"] = "Св�зат�� � админи�тратором �айта";
+App::$strings["Invites by users not enabled"] = "Приглашени� от пользователей отключены";
+App::$strings["You have no more invitations available"] = "У ва� больше нет приглашений";
+App::$strings["Not on xchan"] = "�еизве�тный пользователь";
+App::$strings["All users invitation limit exceeded."] = "Превышен лимит приглашений дл� в�ех пользователей.";
+App::$strings["Invitation expires after"] = "Приглашение и�текает по�ле";
+App::$strings["Invitation"] = "Приглашение";
+App::$strings["Send invitations"] = "Отправить приглашение";
+App::$strings["Invitations I am using"] = "Приглашени�, которые � и�пользую";
+App::$strings["Invitations we are using"] = "Приглашени�, которые мы и�пользуем";
+App::$strings["§ Note, the email(s) sent will be recorded in the system logs"] = "Внимание: адре�а �лектронной почты будут запи�аны в �и�темные журналы.";
+App::$strings["Enter email addresses, one per line:"] = "Введите адре�а �лектронной почты, по одному в �троке:";
+App::$strings["Your message:"] = "Сообщение:";
+App::$strings["Invite template"] = "Шаблон приглашени�";
+App::$strings["Subject:"] = "Тема:";
+App::$strings["Here you may enter personal notes to the recipient(s)"] = "Зде�ь вы можете вве�ти личные заметки дл� получателей";
+App::$strings["Cover Photos"] = "Фотографии обложки";
+App::$strings["female"] = "женщина";
+App::$strings["%1\$s updated her %2\$s"] = "%1\$s обновила её %2\$s";
+App::$strings["male"] = "мужчина";
+App::$strings["%1\$s updated his %2\$s"] = "%1\$s обновил его %2\$s";
+App::$strings["%1\$s updated their %2\$s"] = "%2\$s %1\$s обновлена";
+App::$strings["cover photo"] = "фотографи� обложки";
+App::$strings["Your cover photo may be visible to anybody on the internet"] = "Фотографи� вашей обложки может быть видна в�ем в Интернете";
+App::$strings["Change Cover Photo"] = "Изменить фотографию обложки";
+App::$strings["No such group"] = "�ет такой группы";
+App::$strings["No such channel"] = "�ет такого канала";
+App::$strings["Privacy group is empty"] = "Группа конфиденциально�ти пу�та";
+App::$strings["Privacy group: "] = "Группа конфиденциально�ти: ";
+App::$strings["Invalid channel."] = "�едей�твительный канал.";
+App::$strings["Invalid message"] = "�еверное �ообщение";
+App::$strings["no results"] = "�ичего не найдено.";
+App::$strings["channel sync processed"] = "�инхронизаци� канала завершена";
+App::$strings["queued"] = "в очереди";
+App::$strings["posted"] = "опубликовано";
+App::$strings["accepted for delivery"] = "прин�то к до�тавке";
+App::$strings["updated"] = "обновлено";
+App::$strings["update ignored"] = "обновление игнорирует��";
+App::$strings["permission denied"] = "до�туп запрещен";
+App::$strings["recipient not found"] = "получатель не найден";
+App::$strings["mail recalled"] = "почта отозвана";
+App::$strings["duplicate mail received"] = "получено дублирующее �ообщение";
+App::$strings["mail delivered"] = "почта до�тавлен";
+App::$strings["Delivery report for %1\$s"] = "Отчёт о до�тавке дл� %1\$s";
+App::$strings["Options"] = "Параметры";
+App::$strings["Redeliver"] = "До�тавить повторно";
+App::$strings["Affinity Tool settings updated."] = "�а�тройки �тепени �ход�тва обновлены.";
+App::$strings["This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (affinity) with each connection. It allows you to zoom in or out and display conversations from only your closest friends or everybody in your stream."] = "Это приложение пред�тавл�ет управление ползунком на �транице контактов и �етевом потоке, который позвол�ет выбирать вашу �тепень дружбы (�ход�тва). Это позвол�ет вам увеличивать или уменьшать ма�штаб и отображать разговоры только от ваших �амых близких друзей или в�ех в вашем потоке.";
+App::$strings["Affinity Tool App"] = "Приложение \"Степень �ход�тва\"";
+App::$strings["The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage."] = "Чи�ла ниже пред�тавл�ют минимальное и мак�имальное значение по умолчанию дл� вашей �ети / потока в процентах.";
+App::$strings["Default maximum affinity level"] = "Мак�имальна� �тепень �ход�тва по умолчанию.";
+App::$strings["0-99 default 99"] = "0-99 (по умолчанию 99)";
+App::$strings["Default minimum affinity level"] = "Мак�имальна� �тепень �ход�тва по умолчанию.";
+App::$strings["0-99 - default 0"] = "0-99 (по умолчанию 0)";
+App::$strings["Persistent affinity levels"] = "У�то�вшие�� �тепени �ход�тва";
+App::$strings["If disabled the max and min levels will be reset to default after page reload"] = "Е�ли �тот параметр отключен, мак�имальный и минимальный уровни будут �брошены к значени�м по умолчанию по�ле перезагрузки �траницы";
+App::$strings["Affinity Tool Settings"] = "�а�тройки �тепени �ход�тва";
+App::$strings["Enter a folder name"] = "Введите название каталога";
+App::$strings["or select an existing folder (doubleclick)"] = "или выберите �уще�твующий каталог (двойной щелчок)";
+App::$strings["Save to Folder"] = "Сохранить в каталог";
+App::$strings["Available Apps"] = "До�тупные приложени�";
+App::$strings["Installed Apps"] = "У�тановленные приложени�";
+App::$strings["Manage Apps"] = "Управление приложени�ми";
+App::$strings["Create Custom App"] = "Создать пользователь�кое приложение";
+App::$strings["Connection added."] = "Контакт добавлен.";
+App::$strings["Like/Dislike"] = "�равит�� / не нравит��";
+App::$strings["This action is restricted to members."] = "Это дей�твие до�тупно только уча�тникам.";
+App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Пожалуй�та, дл� продолжени� <a href=\"rmagic\"> войдите � вашим \$Projectname ID</a> или <a href=\"register\">зареги�трируйте�ь как новый уча�тник \$Projectname</a>.";
+App::$strings["Invalid request."] = "�еверный запро�.";
+App::$strings["channel"] = "канал";
+App::$strings["thing"] = "предмет";
+App::$strings["Channel unavailable."] = "Канал недо�тупен.";
+App::$strings["Previous action reversed."] = "Предыдущее дей�твие отменено.";
+App::$strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s нравит�� %3\$s %2\$s";
+App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s не нравит�� %2\$s %3\$s";
+App::$strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s �огла�ен � %2\$s %3\$s";
+App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s не �огла�ен � %2\$s %3\$s";
+App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s воздерживает�� от решени� по %2\$s%3\$s";
+App::$strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s по�ещает %2\$s%3\$s";
+App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s не по�ещает %2\$s%3\$s";
+App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s может по�етить %2\$s%3\$s";
+App::$strings["Action completed."] = "Дей�твие завершено.";
+App::$strings["Thank you."] = "Спа�ибо.";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Этот параметр требует �пециальной обработки и редактировани� и был заблокирован.";
+App::$strings["Configuration Editor"] = "Редактор конфигурации";
+App::$strings["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."] = "Предупреждение. Изменение некоторых на�троек может приве�ти к неработо�по�обно�ти вашего канала. Пожалуй�та, покиньте �ту �траницу, е�ли вы точно не знаете, как правильно и�пользовать �ту функцию.";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Вы �оздали %1$.0f из %2$.0f возможных каналов.";
+App::$strings["Your real name is recommended."] = "Рекомендует�� и�пользовать ваше на�то�щее им�.";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Примеры: \"Иван Иванов\", \"Ок�ана и кони\", \"Футбол\", \"Тимур и его команда\"";
+App::$strings["This will be used to create a unique network address (like an email address)."] = "Это будет и�пользовано дл� �оздани� уникального �етевого адре�а (наподобие email).";
+App::$strings["Allowed characters are a-z 0-9, - and _"] = "Разрешённые �имволы a-z 0-9, - и _";
+App::$strings["Channel name"] = "�азвание канала";
+App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = "Выберите разрешени� дл� канала в �оответ�твии � вашими потребно�т�ми и требовани�ми безопа�но�ти.";
+App::$strings["Read more about channel permission roles"] = "Прочитать больше о разрешени�х дл� каналов";
+App::$strings["Create a Channel"] = "Создать канал";
+App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = "Канал �то уникальна� �етева� идентично�ть. Он может пред�тавл�ть человека (профиль в �оциальной �ети), форум или группу, бизне� или �траницу знаменито�ти, ново�тную ленту и многие другие вещи.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "или <a href=\"import\">импортировать �уще�твующий канал</a> из другого ме�та.";
+App::$strings["Validate"] = "Проверить";
+App::$strings["Cards App"] = "Приложение \"Карточки\"";
+App::$strings["Create personal planning cards"] = "Создать личные карточки планировани�";
+App::$strings["Add Card"] = "Добавить карточку";
+App::$strings["Cards"] = "Карточки";
 App::$strings["Unable to update menu."] = "�евозможно обновить меню.";
 App::$strings["Unable to create menu."] = "�евозможно �оздать меню.";
 App::$strings["Menu Name"] = "�азвание меню";
@@ -3202,12 +1290,13 @@ App::$strings["Visible on webpage - leave empty for no title"] = "Видимо�
 App::$strings["Allow Bookmarks"] = "Разрешить закладки";
 App::$strings["Menu may be used to store saved bookmarks"] = "Меню может и�пользовать��, чтобы �охранить закладки";
 App::$strings["Submit and proceed"] = "Отправить и обработать";
-App::$strings["Drop"] = "Удалить";
+App::$strings["Menus"] = "Меню";
 App::$strings["Bookmarks allowed"] = "Закладки разрешены";
 App::$strings["Delete this menu"] = "Удалить �то меню";
 App::$strings["Edit menu contents"] = "Редактировать �одержание меню";
 App::$strings["Edit this menu"] = "Редактировать �то меню";
 App::$strings["Menu could not be deleted."] = "Меню не может быть удалено.";
+App::$strings["Menu not found."] = "Меню не найдено";
 App::$strings["Edit Menu"] = "Редактировать меню";
 App::$strings["Add or remove entries to this menu"] = "Добавить или удалить пункты �того меню";
 App::$strings["Menu name"] = "�азвание меню";
@@ -3215,46 +1304,32 @@ App::$strings["Must be unique, only seen by you"] = "Должно быть унÐ
 App::$strings["Menu title"] = "Заголовок меню";
 App::$strings["Menu title as seen by others"] = "Видимый другими заголовок меню";
 App::$strings["Allow bookmarks"] = "Разрешить закладки";
-App::$strings["Could not access contact record."] = "�е удало�ь получить до�туп к запи�и контакта.";
-App::$strings["Default Permissions App"] = "Приложение \"Разрешени� по умолчанию\"";
-App::$strings["Set custom default permissions for new connections"] = "�а�тройка пользователь�ких разрешений по умолчанию дл� новых подключений ";
-App::$strings["Connection Default Permissions"] = "Разрешени� по умолчанию дл� контакта";
-App::$strings["Apply these permissions automatically"] = "Применить �ти разрешени� автоматиче�ки";
-App::$strings["Permission role"] = "Роль разрешени�";
-App::$strings["Add permission role"] = "Добавить роль разрешени�";
-App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Разрешени�, указанные на �той �транице, будут примен�ть�� ко в�ем новым �оединени�м.";
-App::$strings["Automatic approval settings"] = "�а�тройки автоматиче�кого одобрени�";
-App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "�екоторые индивидуальные разрешени� могут быть преду�тановлены или заблокированы на о�новании типа вашего канала и на�троек приватно�ти.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Этот параметр требует �пециальной обработки и редактировани� и был заблокирован.";
-App::$strings["Configuration Editor"] = "Редактор конфигурации";
-App::$strings["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."] = "Предупреждение. Изменение некоторых на�троек может приве�ти к неработо�по�обно�ти вашего канала. Пожалуй�та, покиньте �ту �траницу, е�ли вы точно не знаете, как правильно и�пользовать �ту функцию.";
-App::$strings["Name and Secret are required"] = "Требуют�� им� и код";
-App::$strings["OAuth2 Apps Manager App"] = "Приложение \"Менеджер Oauth2\"";
-App::$strings["OAuth2 authenticatication tokens for mobile and remote apps"] = "�утентификаци� OAuth2 дл� мобильных и удаленных приложений";
-App::$strings["Add OAuth2 application"] = "Добавить приложение OAuth2";
-App::$strings["Grant Types"] = "Разрешить типы";
-App::$strings["leave blank unless your application sepcifically requires this"] = "о�тавьте пу�тыми до тех пока ваше приложение не требует �того";
-App::$strings["Authorization scope"] = "Обла�ть полномочий";
-App::$strings["OAuth2 Application not found."] = "Приложение OAuth2 не найдено.";
-App::$strings["leave blank unless your application specifically requires this"] = "о�тавьте поле пу�тым, е�ли ваше приложение не требует �того";
-App::$strings["Connected OAuth2 Apps"] = "Подключённые приложени� OAuth2";
-App::$strings["Random Channel App"] = "Приложение \"Случайный канал\"";
-App::$strings["Visit a random channel in the \$Projectname network"] = "По�ещение �лучайного канала в �ети \$Projectname";
-App::$strings["Invalid message"] = "�еверное �ообщение";
-App::$strings["no results"] = "�ичего не найдено.";
-App::$strings["channel sync processed"] = "�инхронизаци� канала завершена";
-App::$strings["queued"] = "в очереди";
-App::$strings["posted"] = "опубликовано";
-App::$strings["accepted for delivery"] = "прин�то к до�тавке";
-App::$strings["updated"] = "обновлено";
-App::$strings["update ignored"] = "обновление игнорирует��";
-App::$strings["permission denied"] = "до�туп запрещен";
-App::$strings["recipient not found"] = "получатель не найден";
-App::$strings["mail recalled"] = "почта отозвана";
-App::$strings["duplicate mail received"] = "получено дублирующее �ообщение";
-App::$strings["mail delivered"] = "почта до�тавлен";
-App::$strings["Delivery report for %1\$s"] = "Отчёт о до�тавке дл� %1\$s";
-App::$strings["Redeliver"] = "До�тавить повторно";
+App::$strings["Public Stream App"] = "Приложение \"Публичный поток\"";
+App::$strings["The unmoderated public stream of this hub"] = "�емодерируемый публичный поток � �того хаба";
+App::$strings["Public Stream"] = "Публичный поток";
+App::$strings["Items tagged with: %s"] = "Объекты помечены как: %s";
+App::$strings["Search results for: %s"] = "Результаты пои�ка дл�: %s";
+App::$strings["Unknown App"] = "�еизве�тное приложение";
+App::$strings["Authorize"] = "�вторизовать";
+App::$strings["Do you authorize the app %s to access your channel data?"] = "�вторизуете ли вы приложение %s дл� до�тупа к данным вашего канала?";
+App::$strings["Allow"] = "Разрешить";
+App::$strings["Edit Layout"] = "Редактировать шаблон";
+App::$strings["Select a bookmark folder"] = "Выбрать каталог дл� закладок";
+App::$strings["Save Bookmark"] = "Сохранить закладку";
+App::$strings["URL of bookmark"] = "URL закладки";
+App::$strings["Or enter new bookmark folder name"] = "или введите новое им� каталога закладок";
+App::$strings["About this site"] = "Об �том �айте";
+App::$strings["Site Name"] = "�азвание �айта";
+App::$strings["Administrator"] = "�дмини�тратор";
+App::$strings["Software and Project information"] = "Информаци� о программном обе�печении и проекте";
+App::$strings["This site is powered by \$Projectname"] = "Этот �айт работает на \$Projectname";
+App::$strings["Federated and decentralised networking and identity services provided by Zot"] = "Объединенные и децентрализованные �ети и �лужбы идентификациии обе�печивают�� Zot";
+App::$strings["Additional federated transport protocols:"] = "Дополнительные федеративные тран�портные протоколы:";
+App::$strings["Version %s"] = "Вер�и� %s";
+App::$strings["Project homepage"] = "Домашн�� �траница проекта";
+App::$strings["Developer homepage"] = "Домашн�� �траница разработчика";
+App::$strings["Notes App"] = "Приложение \"Запи�ки\"";
+App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Про�тое приложение дл� запи�ок � виджетом (примечание: запи�ки не зашифрованы)";
 App::$strings["Thing updated"] = "Обновлено";
 App::$strings["Object store: failed"] = "Хранлищие объектов: неудача";
 App::$strings["Thing added"] = "Добавлено";
@@ -3269,56 +1344,67 @@ App::$strings["Name of thing e.g. something"] = "Ð�аименование, наÐ
 App::$strings["URL of thing (optional)"] = "URL (необ�зательно)";
 App::$strings["URL for photo of thing (optional)"] = "URL дл� фотографии (необ�зательно)";
 App::$strings["Add Thing to your Profile"] = "Добавить к вашему профилю";
+App::$strings["Email Verification Required"] = "Требует�� проверка адре�а email";
+App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Проверочный токен был отправлен на ваш адре� �лектронной почты [%s]. Введите �тот токен зде�ь дл� завершени� �тапа проверки учётной запи�и. Пожалуй�та, подождите не�колько минут дл� завершени� до�тавки и проверьте вашу папку \"Спам\" е�ли вы не видите пи�ьма.";
+App::$strings["Resend Email"] = "Вы�лать повторно";
+App::$strings["Validation token"] = "Проверочный код";
+App::$strings["Webpages App"] = "Приложение \"Веб-�траницы\"";
+App::$strings["Provide managed web pages on your channel"] = "Предо�тавл�ть управл�емые веб-�траницы на Вашем канале";
+App::$strings["Import Webpage Elements"] = "Импортировать ча�ти веб-�траницы";
+App::$strings["Import selected"] = "Импортировать выбранное";
+App::$strings["Export Webpage Elements"] = "Эк�портировать ча�ть веб-�траницы";
+App::$strings["Export selected"] = "Эк�портировать выбранное";
+App::$strings["Webpages"] = "Веб-�траницы";
+App::$strings["Actions"] = "Дей�тви�";
+App::$strings["Page Link"] = "С�ылка �траницы";
+App::$strings["Page Title"] = "Заголовок �траницы";
+App::$strings["Invalid file type."] = "�еверный тип файла.";
+App::$strings["Error opening zip file"] = "Ошибка открыти� ZIP файла";
+App::$strings["Invalid folder path."] = "�еверный путь к каталогу.";
+App::$strings["No webpage elements detected."] = "�е обнаружено ча�тей веб-�траницы.";
+App::$strings["Import complete."] = "Импорт завершен.";
+App::$strings["Comment approved"] = "Комментарий одобрен";
+App::$strings["Comment deleted"] = "Комментарий удалён";
 App::$strings["Authentication failed."] = "Ошибка аутентификации.";
-App::$strings["Layout updated."] = "Шаблон обновлен.";
-App::$strings["PDL Editor App"] = "Приложение \"Редактор PDL\"";
-App::$strings["Provides the ability to edit system page layouts"] = "Предо�тавл�ет возможно�ть редактировать макеты �и�темных �траниц";
-App::$strings["Edit System Page Description"] = "Редактировать опи�ание �и�темной �траницы";
-App::$strings["(modified)"] = "(изменено)";
-App::$strings["Layout not found."] = "Шаблон не найден.";
-App::$strings["Module Name:"] = "Им� модул�:";
-App::$strings["Layout Help"] = "Помощь к шаблону";
-App::$strings["Edit another layout"] = "Редактировать другой шаблон";
-App::$strings["System layout"] = "Си�темный шаблон";
-App::$strings["Wiki App"] = "Приложение \"Wiki\"";
-App::$strings["Provide a wiki for your channel"] = "Предо�тавьте Wiki дл� вашего канала";
-App::$strings["Error retrieving wiki"] = "Ошибка при получении Wiki";
-App::$strings["Error creating zip file export folder"] = "Ошибка при �оздании zip-файла при �к�порте каталога";
-App::$strings["Error downloading wiki: "] = "Ошибка загрузки Wiki:";
-App::$strings["Download"] = "Загрузить";
-App::$strings["Wiki name"] = "�азвание Wiki";
-App::$strings["Content type"] = "Тип �одержимого";
-App::$strings["Type"] = "Тип";
-App::$strings["Any&nbsp;type"] = "Любой&nbsp;тип";
-App::$strings["Lock content type"] = "Зафик�ировать тип �одержимого";
-App::$strings["Create a status post for this wiki"] = "Создать публикацию о �тату�е �той Wiki";
-App::$strings["Edit Wiki Name"] = "Редактировать наименование Wiki";
-App::$strings["Wiki not found"] = "Wiki не найдена";
-App::$strings["Rename page"] = "Переименовать �траницу";
-App::$strings["Error retrieving page content"] = "Ошибка при получении �одержимого �траницы";
-App::$strings["New page"] = "�ова� �траница";
-App::$strings["Revision Comparison"] = "Сравнение ревизий";
-App::$strings["Short description of your changes (optional)"] = "Краткое опи�ание ваших изменений (необ�зательно)";
-App::$strings["New page name"] = "�овое им� �траницы";
-App::$strings["Embed image from photo albums"] = "В�троить изображение из фотоальбома";
-App::$strings["History"] = "И�тори�";
-App::$strings["Error creating wiki. Invalid name."] = "Ошибка �оздани� Wiki. �еверное им�.";
-App::$strings["A wiki with this name already exists."] = "Wiki � таким именем уже �уще�твует.";
-App::$strings["Wiki created, but error creating Home page."] = "Wiki �оздана, но возникла ошибка при �оздании домашней �траницы";
-App::$strings["Error creating wiki"] = "Ошибка при �оздании Wiki";
-App::$strings["Error updating wiki. Invalid name."] = "Ошибка при обновлении Wiki. �еверное им�.";
-App::$strings["Error updating wiki"] = "Ошибка при обновлении Wiki";
-App::$strings["Wiki delete permission denied."] = "�ет прав на удаление Wiki.";
-App::$strings["Error deleting wiki"] = "Ошибка удалени� Wiki";
-App::$strings["New page created"] = "Создана нова� �траница";
-App::$strings["Cannot delete Home"] = "�евозможно удалить домашнюю �траницу";
-App::$strings["Current Revision"] = "Текуща� ревизи�";
-App::$strings["Selected Revision"] = "Выбранна� ревизи�";
-App::$strings["You must be authenticated."] = "Вы должны быть аутентифицированы.";
-App::$strings["Welcome to %s"] = "Добро пожаловать в %s";
-App::$strings["Suggest Channels App"] = "Приложение \"Рекомендуемые каналы\"";
-App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Предложени� по рекомендуемым каналам в �ети \$Projectname которые могут ва� заинтере�овать";
-App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "�ет предложений. Е�ли �то новый �айт, повторите попытку через 24 ча�а.";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Введите адре� вашего канала (например: channel@example.com)";
+App::$strings["Authenticate"] = "Проверка подлинно�ти";
+App::$strings["Permissions denied."] = "До�туп запрещен.";
+App::$strings["Your service plan only allows %d channels."] = "Ваш кла�� об�луживани� разрешает только %d каналов.";
+App::$strings["No channel. Import failed."] = "Канала нет. Импорт невозможен.";
+App::$strings["Import completed."] = "Импорт завершен.";
+App::$strings["You must be logged in to use this feature."] = "Вы должны войти в �и�тему, чтобы и�пользовать �ту функцию.";
+App::$strings["Import Channel"] = "Импортировать канал";
+App::$strings["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."] = "И�пользуйте �ту форм дл� импорта �уще�твующего канала � другого �ервера / хаба. Вы можете получить идентификационные данные канала �о �тарого �ервера / хаба через �еть или предо�тавить файл �к�порта.";
+App::$strings["Or provide the old server/hub details"] = "или предо�тавьте данные �тарого �ервера";
+App::$strings["Your old identity address (xyz@example.com)"] = "Ваш �тарый адре� канала (xyz@example.com)";
+App::$strings["Your old login email address"] = "Ваш �тарый адре� �лектронной почты";
+App::$strings["Your old login password"] = "Ваш �тарый пароль";
+App::$strings["Import a few months of posts if possible (limited by available memory"] = "Импортировать не�колько ме��цев публикаций е�ли возможно (ограничено до�тупной пам�тью)";
+App::$strings["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."] = "Дл� любого варианта, пожалуй�та, выберите, �ледует ли �делать �тот хаб вашим новым о�новным адре�ом, или ваше прежнее ме�тоположение должно продолжить выполн�ть �ту роль. Вы �можете отправл�ть �ообщени� из любого ме�тоположени�, но только одно может быть помечено как о�новное ме�то дл� файлов, фотографий и мультимедиа.";
+App::$strings["Make this hub my primary location"] = "Сделать �тот хаб главным";
+App::$strings["Move this channel (disable all previous locations)"] = "Переме�тить �то канал (отключить в�е предыдущие ме�тора�положени�)";
+App::$strings["Use this channel nickname instead of the one provided"] = "И�пользовать п�евдоним �того канала вме�то предо�тавленного";
+App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "О�тавьте пу�тым дл� �охранени� �уще�твующего п�евдонима канала. Вам будет �лучайным образом назначен похожий п�евдоним е�ли такое им� уже выделено на �том �айте.";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Проце�� может зан�ть не�колько минут. Пожалуй�та, отправьте форму только один раз и о�тавьте �ту �траницу открытой до завершени�.";
+App::$strings["Privacy group created."] = "Группа конфиденциально�ти �оздана.";
+App::$strings["Could not create privacy group."] = "�е удало�ь �оздать группу конфиденциально�ти.";
+App::$strings["Privacy group not found."] = "Группа конфиденциально�ти не найдена.";
+App::$strings["Privacy group updated."] = "Группа конфиденциально�ти обновлена.";
+App::$strings["Privacy Groups App"] = "Приложение \"Группы конфиденциально�ти\"";
+App::$strings["Management of privacy groups"] = "Управление группами конфиденциально�ти.";
+App::$strings["Privacy Groups"] = "Группы конфиденциально�ти";
+App::$strings["Add Group"] = "Добавить группу";
+App::$strings["Privacy group name"] = "Им� группы конфиденциально�ти";
+App::$strings["Members are visible to other channels"] = "Уча�тники канала видимые дл� о�тальных";
+App::$strings["Privacy group removed."] = "Группа конфиденциально�ти удалена.";
+App::$strings["Unable to remove privacy group."] = "�у удало�ь удалить группу конфиденциально�ти.";
+App::$strings["Privacy Group: %s"] = "Группа конфиденциально�ти: %s";
+App::$strings["Privacy group name: "] = "�азвание группы конфиденциально�ти: ";
+App::$strings["Delete Group"] = "Удалить группу";
+App::$strings["Group members"] = "Члены группы";
+App::$strings["Not in this group"] = "�е в �той группе";
+App::$strings["Click a channel to toggle membership"] = "�ажмите на канал дл� про�мотра член�тва";
+App::$strings["vcard"] = "vCard";
 App::$strings["Could not locate selected profile."] = "�е удало�ь обнаружить выбранный профиль.";
 App::$strings["Connection updated."] = "Контакты обновлены.";
 App::$strings["Failed to update connection record."] = "�е удало�ь обновить запи�ь контакта.";
@@ -3327,11 +1413,13 @@ App::$strings["Could not access address book record."] = "�е удало�ь п
 App::$strings["Refresh failed - channel is currently unavailable."] = "Обновление невозможно - в на�то�щее врем� канал недо�тупен.";
 App::$strings["Unable to set address book parameters."] = "�е удало�ь получить до�туп к параметрам адре�ной книги.";
 App::$strings["Connection has been removed."] = "Контакт был удалён.";
+App::$strings["View Profile"] = "Про�мотреть профиль";
 App::$strings["View %s's profile"] = "Про�мотр %s профил�";
 App::$strings["Refresh Permissions"] = "Обновить разрешени�";
 App::$strings["Fetch updated permissions"] = "Получить обновлённые разрешени�";
 App::$strings["Refresh Photo"] = "Обновить фотографию";
 App::$strings["Fetch updated photo"] = "Получить обновлённую фотографию";
+App::$strings["Recent Activity"] = "По�ледние дей�тви�";
 App::$strings["View recent posts and comments"] = "Про�мотреть по�ледние публикации и комментарии";
 App::$strings["Block (or Unblock) all communications with this connection"] = "Блокировать (или разблокировать) �в�зи � �тим контактом";
 App::$strings["This connection is blocked!"] = "Этот контакт заблокирован!";
@@ -3352,6 +1440,9 @@ App::$strings["Fetch electronic calling card for this connection"] = "Получ
 App::$strings["Open Individual Permissions section by default"] = "Открывать раздел \"Индивидуальные разрешени�\" по умолчанию";
 App::$strings["Affinity"] = "Сход�тво";
 App::$strings["Open Set Affinity section by default"] = "Открыть �екцию у�тановлени� �ход�тва по умолчанию";
+App::$strings["Me"] = "Я";
+App::$strings["Family"] = "Семь�";
+App::$strings["Acquaintances"] = "Знакомые";
 App::$strings["Filter"] = "Фильтр";
 App::$strings["Open Custom Filter section by default"] = "Открывать �екцию \"�а�траиваемый фильтр\" по умолчанию";
 App::$strings["Approve this connection"] = "Утвердить �тот контакт";
@@ -3363,11 +1454,13 @@ App::$strings["This connection is unreachable from this location."] = "Этот
 App::$strings["This connection may be unreachable from other channel locations."] = "Этот контакт может быть недо�тупен из других ме�т размещени� канала";
 App::$strings["Location independence is not supported by their network."] = "�езави�имое ме�тоположение не поддерживает�� их �етью.";
 App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Этот контакт недо�тупен из данного ме�тоположени�. �езави�имое ме�тоположение не поддерживает�� их �етью.";
+App::$strings["Connection: %s"] = "Контакт: %s";
 App::$strings["Connection requests will be approved without your interaction"] = "Запро�ы контактов будут одобрены без вашего уча�ти�";
 App::$strings["This connection's primary address is"] = "Главный адре� �то контакта";
 App::$strings["Available locations:"] = "До�тупные ра�положени�:";
 App::$strings["Connection Tools"] = "Ин�трументы контактов";
 App::$strings["Slide to adjust your degree of friendship"] = "Прокрутить дл� на�тройки �тепени дружбы";
+App::$strings["Rating"] = "Оценка";
 App::$strings["Slide to adjust your rating"] = "Прокрутить дл� на�тройки оценки";
 App::$strings["Optionally explain your rating"] = "Объ��ните �вою оценку (не об�зательно)";
 App::$strings["Custom Filter"] = "�а�траиваемый фильтр";
@@ -3376,78 +1469,509 @@ App::$strings["Do not import posts with this text"] = "�е импортиров
 App::$strings["This information is public!"] = "Эта информаци� общедо�тупна!";
 App::$strings["Connection Pending Approval"] = "Ожидающие подтверждени� контактов";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Пожалуй�та, выберите профиль который вы хотит показывать в %s при безопа�ном про�мотре.";
+App::$strings["Their Settings"] = "Их на�тройки";
 App::$strings["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."] = "�екоторые разрешени� могут быть уна�ледованы из <a href=\"settings\"><strong>на�троек приватно�ти</strong></a> вашего канала, которые могут иметь более вы�окий приоритет чем индивидуальные. Вы можете изменить �ти на�тройки, однако они не будут применены до изменени� переданных по на�лед�тву на�троек.";
 App::$strings["Last update:"] = "По�леднее обновление:";
 App::$strings["Details"] = "Сведени�";
-App::$strings["No more system notifications."] = "�ет новых оповещений �и�темы.";
-App::$strings["System Notifications"] = "Си�темные оповещени� ";
-App::$strings["Mark all seen"] = "Отметить как про�мотренное";
-App::$strings["Comanche page description language help"] = "Помощь по �зыку опи�ани� �траниц Comanche ";
-App::$strings["Layout Description"] = "Опи�ание шаблона";
-App::$strings["Download PDL file"] = "Загрузить PDL файл";
-App::$strings["Location not found."] = "Ме�тоположение не найдено";
-App::$strings["Location lookup failed."] = "Пои�к ме�тоположени� не удал��";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Пожалуй�та, выберите другое ме�тоположение в каче�тве о�новного прежде чем удалить предыдущее";
-App::$strings["Syncing locations"] = "Синхронизировать ме�тоположение";
-App::$strings["No locations found."] = "Ме�тоположений не найдено";
-App::$strings["Manage Channel Locations"] = "Управление ме�тоположением канала";
-App::$strings["Sync Now"] = "Синхронизировать";
-App::$strings["Please wait several minutes between consecutive operations."] = "Пожалуй�та, подождите не�колько минут между по�ледовательными операци�ми.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "По возможно�ти, очи�тите ме�тоположение, войд� на �тот веб-�айт / хаб и удалив �вой канал.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "И�пользуйте �ту форму, чтобы удалить ме�тоположение, е�ли хаб больше не функционирует.";
-App::$strings["Failed to create source. No channel selected."] = "�е удало�ь �оздать и�точник. Канал не выбран.";
-App::$strings["Source created."] = "И�точник �оздан.";
-App::$strings["Source updated."] = "И�точник обновлен.";
-App::$strings["Sources App"] = "Приложение \"И�точники канала\"";
-App::$strings["Automatically import channel content from other channels or feeds"] = "�втоматиче�кий импорт контента из других каналов или лент";
-App::$strings["*"] = "";
-App::$strings["Channel Sources"] = "И�точники канала";
-App::$strings["Manage remote sources of content for your channel."] = "Управление удалённым и�точниками �одержимого дл� вашего канала";
-App::$strings["New Source"] = "�овый и�точник";
-App::$strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Импортировать в�ё или выбранное �одержимое из �ледующего канала в �тот канал и ра�пределить его в �оответ�твии � вашими на�тройками.";
-App::$strings["Only import content with these words (one per line)"] = "Импортировать �одержимое только � �тим тек�том (по�трочно)";
-App::$strings["Leave blank to import all public content"] = "О�тавьте пу�тым дл� импорта в�его общедо�тупного �одержимого";
-App::$strings["Channel Name"] = "�азвание канала";
-App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Добавить �ледующие категории к импортированным публикаци�м из �того и�точника (через зап�тые)";
-App::$strings["Resend posts with this channel as author"] = "Отправить публикации в �тот канал повторно как автор";
-App::$strings["Copyrights may apply"] = "Могут примен�ть�� автор�кие права";
-App::$strings["Source not found."] = "И�точник не найден.";
-App::$strings["Edit Source"] = "Редактировать и�точник";
-App::$strings["Delete Source"] = "Удалить и�точник";
-App::$strings["Source removed"] = "И�точник удален";
-App::$strings["Unable to remove source."] = "�евозможно удалить и�точник.";
-App::$strings["Select a bookmark folder"] = "Выбрать каталог дл� закладок";
-App::$strings["Save Bookmark"] = "Сохранить закладку";
-App::$strings["URL of bookmark"] = "URL закладки";
-App::$strings["Or enter new bookmark folder name"] = "или введите новое им� каталога закладок";
-App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Удалённа� аутентификаци� заблокирована. Вы вошли на �тот �айт локально. Пожалуй�та, выйдите и попробуйте ещё раз.";
-App::$strings["A deleted list with this name was revived. Existing item permissions <strong>may</strong> apply to this list and any future members. If this is not what you intended, please create another list with a different name."] = "Во��тановлен удаленный �пи�ок � таким именем. Суще�твующие разрешени� на �лементы <strong>могут</strong> примен�ть�� к �тому �пи�ку и любым будущим уча�тникам. Е�ли не отвечает вашим намерени�м - �оздайте еще один �пи�ок � другим именем.";
-App::$strings["Add new connections to this access list"] = "Добавить новый контакт в �пи�ок до�тупа";
-App::$strings["Lists"] = "Спи�ки";
-App::$strings["Edit list"] = "Редактировать �пи�ок";
-App::$strings["Create new list"] = "Создать новый �пи�ок";
-App::$strings["Channels not in any access list"] = "Каналы, не вход�щие ни в один �пи�ок до�тупа";
-App::$strings["__ctx:permcat__ default"] = "по умолчанию";
-App::$strings["__ctx:permcat__ follower"] = "поклонник";
-App::$strings["__ctx:permcat__ contributor"] = "уча�тник";
-App::$strings["__ctx:permcat__ publisher"] = "издатель";
+App::$strings["Item is not editable"] = "Элемент нельз� редактировать";
+App::$strings["Edit post"] = "Редактировать �ообщение";
+App::$strings["Create a new channel"] = "Создать новый канал";
+App::$strings["Channel Manager"] = "Менеджер каналов";
+App::$strings["Current Channel"] = "Текущий канал";
+App::$strings["Switch to one of your channels by selecting it."] = "Выбрать и переключить�� на один из ваших каналов";
+App::$strings["Default Channel"] = "О�новной канал";
+App::$strings["Make Default"] = "Сделать о�новным";
+App::$strings["%d new introductions"] = "%d новых пред�тавлений";
+App::$strings["Delegated Channel"] = "Делегированный канал";
+App::$strings["Articles App"] = "Приложение \"Статьи\"";
+App::$strings["Create interactive articles"] = "Создать интерактивные �татьи";
+App::$strings["Add Article"] = "Добавить �татью";
+App::$strings["Articles"] = "Статьи";
+App::$strings["Random Channel App"] = "Приложение \"Случайный канал\"";
+App::$strings["Visit a random channel in the \$Projectname network"] = "По�ещение �лучайного канала в �ети \$Projectname";
+App::$strings["Some blurb about what to do when you're new here"] = "�екоторые предложени� о том, что делать, е�ли вы зде�ь новичок ";
+App::$strings["Not found"] = "�е найдено.";
+App::$strings["Unknown error"] = "�еизве�тна� ошибка";
+App::$strings["Article"] = "Стать�";
+App::$strings["Item has been removed."] = "Элемент был удалён.";
+App::$strings["Item not available."] = "Элемент недо�тупен.";
+App::$strings["Welcome to %s"] = "Добро пожаловать в %s";
+App::$strings["\$Projectname Server - Setup"] = "\$Projectname �ервер - У�тановка";
+App::$strings["Could not connect to database."] = "�е удало�ь подключить�� к �ерверу баз данных.";
+App::$strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "�е удало�ь подключить�� к указанному URL. Веро�тно проблема � SSL �ертификатом или DNS.";
+App::$strings["Could not create table."] = "�е удало�ь �оздать таблицу.";
+App::$strings["Your site database has been installed."] = "Ваша база данных у�тановлена.";
+App::$strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Вам может понадобит�� импортировать файл \"install/schema_xxx.sql\" вручную и�пользу� клиент базы данных.";
+App::$strings["Please see the file \"install/INSTALL.txt\"."] = "Пожалуй�та, обратите�ь к файлу \"install/INSTALL.txt\".";
+App::$strings["System check"] = "Проверка �и�темы";
+App::$strings["Check again"] = "Перепроверить";
+App::$strings["Database connection"] = "Подключение к базе данных";
+App::$strings["In order to install \$Projectname we need to know how to connect to your database."] = "Дл� у�тановки \$Projectname необходимо знать как подключить�� к ваше базе данных.";
+App::$strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Пожалуй�та, �в�жите�ь � вашим хо�тинг провайдером или админи�трацией �айта е�ли у ва� е�ть вопро�ы об �тих на�тройках.";
+App::$strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Указанна� ниже база данных должна �уще�твовать. Е�ли �то не так, пожалуй�та, �оздайте её перед тем, как продолжить.";
+App::$strings["Database Server Name"] = "Им� �ервера баз данных";
+App::$strings["Default is 127.0.0.1"] = "По умолчанию 127.0.0.1";
+App::$strings["Database Port"] = "Порт �ервера баз данных";
+App::$strings["Communication port number - use 0 for default"] = "Порт коммуникации - и�пользуйте 0 по умолчанию";
+App::$strings["Database Login Name"] = "Им� дл� подключени� к базе данных";
+App::$strings["Database Login Password"] = "Пароль дл� подключени� к базе данных";
+App::$strings["Database Name"] = "Им� базы данных";
+App::$strings["Database Type"] = "Тип базы данных";
+App::$strings["Site administrator email address"] = "�дре� �лектронной почты админи�тратора �айта";
+App::$strings["Your account email address must match this in order to use the web admin panel."] = "Ваш адре� �лектронной почты должен �оответ�твовать �тому дл� и�пользовани� веб-панели админи�тратора.";
+App::$strings["Website URL"] = "URL веб-�айта";
+App::$strings["Please use SSL (https) URL if available."] = "Пожалуй�та, и�пользуйте SSL (https) URL е�ли возможно.";
+App::$strings["Please select a default timezone for your website"] = "Пожалуй�та, выберите ча�овой по�� по умолчанию дл� вашего �айта";
+App::$strings["Site settings"] = "�а�тройки �айта";
+App::$strings["PHP version 7.1 or greater is required."] = "Требует�� PHP вер�ии 7.1 или �тарше.";
+App::$strings["PHP version"] = "Вер�и� PHP";
+App::$strings["Could not find a command line version of PHP in the web server PATH."] = "�е удало�ь найти кон�ольную вер�ию PHP в пут�х переменной PATH веб-�ервера.";
+App::$strings["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."] = "Е�ли у ва� на �ервере не у�тановлена кон�ольна� вер�и� PHP вы не �можете запу�тить фоновый опро� через cron. ";
+App::$strings["PHP executable path"] = "Пу�ть к и�полн�емому модулю PHP";
+App::$strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Введите полный путь к и�полн�емому модулю PHP. Вы можете о�тавить его пу�тым дл� продолжени� у�тановки.";
+App::$strings["Command line PHP"] = "Командна� �трока PHP";
+App::$strings["Unable to check command line PHP, as shell_exec() is disabled. This is required."] = "�евозможно проверить командную �троку PHP по�кольку требуема� функци� shell_exec() отключена.";
+App::$strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "В кон�ольной вер�ии PHP в вашей �и�теме отключена опци� \"register_argc_argv\".";
+App::$strings["This is required for message delivery to work."] = "Это необходимо дл� функционировани� до�тавки �ообщений.";
+App::$strings["PHP register_argc_argv"] = "";
+App::$strings["This is not sufficient to upload larger images or files. You should be able to upload at least 4 MB at once."] = "Этого недо�таточно дл� загрузки больших изображений или файлов. Вы должны иметь возможно�ть загрузить как минимум 4 Мб за раз.";
+App::$strings["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."] = "Мак�имально разрешённый общий размер загрузок у�тановлен в %s. Мак�имальный размер одной загрузки у�тановлен в %s. Вам разрешено загружать до %d файлов за один приём.";
+App::$strings["You can adjust these settings in the server php.ini file."] = "Вы можете изменить �ти на�тройки в файле php.ini на �ервере.";
+App::$strings["PHP upload limits"] = "Мак�имальный размер загрузки в PHP";
+App::$strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Ошибка: функци� \"openssl_pkey_new\" не может �генерировать ключи шифровани�";
+App::$strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Е�ли работаете под Windows, �м. \"http://www.php.net/manual/en/openssl.installation.php\".";
+App::$strings["Generate encryption keys"] = "Генераци� ключей шифровани�";
+App::$strings["libCurl PHP module"] = "модуль PHP libcURL";
+App::$strings["GD graphics PHP module"] = "модуль графики PHP GD";
+App::$strings["OpenSSL PHP module"] = "модуль PHP OpenSSL";
+App::$strings["PDO database PHP module"] = "модуль баз данных PHP PDO";
+App::$strings["mb_string PHP module"] = "модуль PHP mb_string";
+App::$strings["xml PHP module"] = "модуль PHP xml";
+App::$strings["zip PHP module"] = "модуль PHP zip";
+App::$strings["Apache mod_rewrite module"] = "модуль Apache mod_rewrite";
+App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Ошибка: требуемый модуль mod_rewrite веб-�ервера Apache не у�тановлен.";
+App::$strings["exec"] = "";
+App::$strings["Error: exec is required but is either not installed or has been disabled in php.ini"] = "Ошибка: exec требует��, однако не у�тановлен или был отключён в php.ini";
+App::$strings["shell_exec"] = "";
+App::$strings["Error: shell_exec is required but is either not installed or has been disabled in php.ini"] = "Ошибка: shell_exec требует��, однако не у�тановлен или был отключён в php.ini";
+App::$strings["Error: libCURL PHP module required but not installed."] = "Ошибка: модуль PHP lib�URL требует��, однако не у�тановлен";
+App::$strings["Error: GD PHP module with JPEG support or ImageMagick graphics library required but not installed."] = "Ошибка: модуль PHP GD � поддержкой JPEG или графиче�ка� библиотека ImageMagick требует��, однако не у�тановлена";
+App::$strings["Error: openssl PHP module required but not installed."] = "Ошибка: модуль PHP OpenSSL требует��, однако не у�тановлен";
+App::$strings["Error: PDO database PHP module missing a driver for either mysql or pgsql."] = "Ошибка: от�ут�твует драйвер MySQL или PgSQL в модуле баз данных PHP PDO";
+App::$strings["Error: PDO database PHP module required but not installed."] = "Ошибка: модуль баз данных PHP PDO требует��, однако не у�тановлен";
+App::$strings["Error: mb_string PHP module required but not installed."] = "Ошибка: модуль PHP mb_string требует��, однако не у�тановлен";
+App::$strings["Error: xml PHP module required for DAV but not installed."] = "Ошибка: модуль PHP xml требует�� дл� DAV, однако не у�тановлен";
+App::$strings["Error: zip PHP module required but not installed."] = "Ошибка: модуль PHP zip требует��, однако не у�тановлен";
+App::$strings[".htconfig.php is writable"] = ".htconfig.php до�тупен дл� запи�и";
+App::$strings["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."] = "Ин�талл�тор требует возможно�ти �оздать файл � именем \".htconfig.php\" в корневом каталоге вашего веб-�ервера но не может �того �делать.";
+App::$strings["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."] = "В большин�тве �лучаев �то проблема прав до�тупа. Веб-�ервер может не иметь возможно�ти запи�ывать файлы в �тот каталог даже е�ли вы можете �то делать.";
+App::$strings["Please see install/INSTALL.txt for additional information."] = "Пожалуй�та, ознакомьте�ь � install/INSTALL.txt дл� дополнительных �ведений.";
+App::$strings["This software uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Это программное обе�печение и�пользует шаблонизатор Smarty3 дл� отображени� �воих веб-�траниц. Smarty3 компилирует шаблоны дл� PHP дл� у�корени� рендеринга.";
+App::$strings["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."] = "Дл� хранени� �тих �компилированных шаблонов веб-�ервер должен иметь до�туп на запи�ь к каталогу %s в каталоге верхнего уровн�.";
+App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Убедите�ь, что пользователь от имени которого работает ваш веб-�ервер (например, www-data), имеет до�туп на запи�ь в �тот каталог.";
+App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Примечание. В каче�тве меры безопа�но�ти вы должны предо�тавить до�туп веб-�ерверу дл� запи�и только к %s но не к �одержащими�� в нём файлами шаблонов (.tpl).";
+App::$strings["%s is writable"] = "%s до�тупен дл� запи�и";
+App::$strings["This software uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the top level web folder"] = "Эта программа и�пользует каталог хранени� дл� загруженных файлов. Дл� веб-�ервера требует�� до�туп на запи�ь начина� � верхнего уровн� каталога хранени�.";
+App::$strings["store is writable"] = "хранилище до�тупно дл� запи�и";
+App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Замените его или отключите https до�туп к �тому �айту.";
+App::$strings["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!"] = "Е�ли у ва� е�ть https-до�туп к вашему �айту или разрешено подключение к TCP-порту 443 (порт https), вы ДОЛЖ�Ы и�пользовать �ертификат, дей�твительный дл� браузера. Вы �Е ДОЛЖ�Ы и�пользовать �амоподпи�анные �ертификаты!";
+App::$strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Эти ограничени� прин�ты по�кольку ваши общедо�тупные публикации могут, например, �одержать ��ылки на изображени� на вашем �об�твенном хабе.";
+App::$strings["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."] = "Е�ли ваш �ертификат не признан, пользователи других �айтов (которые могут �ами иметь дей�твительные �ертификаты) получат предупреждающее �ообщение о проблемах � безопа�но�тью.";
+App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Это может приве�ти к проблемам удоб�тва и�пользовани� из других ме�т (не только на вашем �об�твенном �айте), по�тому мы на�таиваем на �том требовании.";
+App::$strings["Providers are available that issue free certificates which are browser-valid."] = "До�тупны по�тавщики, которые выдают дей�твительные дл� браузера бе�платные �ертификаты.";
+App::$strings["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."] = "Е�ли вы уверены, что �ертификат дей�твителен и подпи�ан доверенным органом, проверьте, у�тановлен ли промежуточные �ертификаты. Обычно они не требуют�� браузерами, но бывают необходимы дл� �в�зи между �ерверами.";
+App::$strings["SSL certificate validation"] = "Проверка SSL �ертификата";
+App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Перезапи�ь URL в .htaccess не работает. Проверьте на�тройки вашего �ервера.";
+App::$strings["Url rewrite is working"] = "Перезапи�ь URL работает";
+App::$strings["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."] = "Файл конфигурации базы данных \".htconfig.php\" не может быть запи�ан. И�пользуйте прилагаемый тек�т дл� �оздани� файла конфигурации в корневом каталоге веб-�ервера.";
+App::$strings["Errors encountered creating database tables."] = "При �оздании базы данных возникли ошибки.";
+App::$strings["<h1>What next?</h1>"] = "<h1>Что дальше? </h1>";
+App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Вам понадобит�� [вручную] на�троить запланированную задачу дл� опрашивател�.";
+App::$strings["Unable to create element."] = "�евозможно �оздать �лемент.";
+App::$strings["Unable to update menu element."] = "�евозможно обновить �лемент меню.";
+App::$strings["Unable to add menu element."] = "�евозможно добавить �лемент меню.";
+App::$strings["Menu Item Permissions"] = "Разрешени� на пункт меню";
+App::$strings["Link Name"] = "Им� ��ылки";
+App::$strings["Link or Submenu Target"] = "С�ылка или цель подменю";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Введите URL ��ылки или выберите им� меню дл� �оздани� подменю";
+App::$strings["Use magic-auth if available"] = "И�пользовать magic-auth е�ли возможно";
+App::$strings["Open link in new window"] = "Открыть ��ылку в новом окне";
+App::$strings["Order in list"] = "Пор�док в �пи�ке";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Большие значени� в конце �пи�ка";
+App::$strings["Submit and finish"] = "Отправить и завершить";
+App::$strings["Submit and continue"] = "Отправить и продолжить";
+App::$strings["Menu:"] = "Меню:";
+App::$strings["Link Target"] = "Цель ��ылки";
+App::$strings["Edit menu"] = "Редактировать меню";
+App::$strings["Edit element"] = "Редактировать �лемент";
+App::$strings["Drop element"] = "Удалить �лемент";
+App::$strings["New element"] = "�овый �лемент";
+App::$strings["Edit this menu container"] = "Редактировать контейнер меню";
+App::$strings["Add menu element"] = "Добавить �лемент меню";
+App::$strings["Delete this menu item"] = "Удалить �тот �лемент меню";
+App::$strings["Edit this menu item"] = "Редактировать �тот �лемент меню";
+App::$strings["Menu item not found."] = "Элемент меню не найден.";
+App::$strings["Menu item deleted."] = "Элемент меню удалён.";
+App::$strings["Menu item could not be deleted."] = "�евозможно удалить �лемент меню.";
+App::$strings["Edit Menu Element"] = "Редактировать �лемент меню";
+App::$strings["Link text"] = "Тек�т ��ылки";
+App::$strings["Public Hubs"] = "Публичные хабы";
+App::$strings["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."] = "Указанные хабы разрешают публичную реги�трацию дл� �ети \$Projectname. В�е хабы в �ети взаимо�в�заны, по�тому член�тво в любом из них передает член�тво во в�ю �еть. �екоторым хабам может потребовать�� подпи�ка или предо�тавление многоуровневых планов об�луживани�. Сам хаб <strong>может</strong> предо�тавить дополнительные �ведени�.";
+App::$strings["Hub URL"] = "URL �ервера";
+App::$strings["Access Type"] = "Тип до�тупа";
+App::$strings["Registration Policy"] = "Политика реги�трации";
+App::$strings["Stats"] = "Стати�тика";
+App::$strings["Software"] = "Программное обе�печение";
+App::$strings["Ratings"] = "Оценки";
+App::$strings["Rate"] = "Оценка";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s %2\$s";
+App::$strings["Mood App"] = "Приложение \"�а�троение\"";
+App::$strings["Set your current mood and tell your friends"] = "У�тановить текущее на�троение и ра��казать друзь�м";
+App::$strings["Mood"] = "�а�троение";
+App::$strings["This page is available only to site members"] = "Эта �траница до�тупна только дл� подпи�чиков �айта";
+App::$strings["Welcome"] = "Добро пожаловать";
+App::$strings["What would you like to do?"] = "Что бы вы хотели �делать?";
+App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Пожалуй�та, запомните �ту �траницу е�ли вы хотите вернуть�� на неё в будущем";
+App::$strings["Upload a profile photo"] = "Загрузить фотографию профил�";
+App::$strings["Upload a cover photo"] = "Загрузить фотографию обложки";
+App::$strings["Edit your default profile"] = "Редактировать ваш профиль по умолчанию";
+App::$strings["View friend suggestions"] = "Про�мотр рекомендуемых друзей";
+App::$strings["View the channel directory"] = "Про�мотр каталога каналов";
+App::$strings["View/edit your channel settings"] = "Про�мотреть / редактировать на�тройки вашего канала";
+App::$strings["View the site or project documentation"] = "Про�мотр документации �айта / проекта";
+App::$strings["Visit your channel homepage"] = "По�етить �траницу вашего канала";
+App::$strings["View your connections and/or add somebody whose address you already know"] = "Про�мотреть ваши контакты и / или добавить кого-то чей адре� в уже знаете";
+App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ваш пер�ональный поток (может быть пу�т пока вы не добавите контакты)";
+App::$strings["View the public stream. Warning: this content is not moderated"] = "Про�мотр публичного потока. Предупреждение: �тот контент не модерирует��";
+App::$strings["Event can not end before it has started."] = "Событие не может завершить�� до его начала.";
+App::$strings["Unable to generate preview."] = "�евозможно �оздать предварительный про�мотр.";
+App::$strings["Event title and start time are required."] = "Требуют�� наименование �обыти� и врем� начала.";
+App::$strings["Event not found."] = "Событие не найдено.";
+App::$strings["Edit event"] = "Редактировать �обытие";
+App::$strings["Delete event"] = "Удалить �обытие";
+App::$strings["calendar"] = "календарь";
+App::$strings["Failed to remove event"] = "�е удало�ь удалить �обытие";
+App::$strings["No connections."] = "Контактов нет.";
+App::$strings["Visit %s's profile [%s]"] = "По�етить %s ​​профиль [%s]";
+App::$strings["View Connections"] = "Про�мотр контактов";
+App::$strings["Files: shared with me"] = "Файлы: поделили�ь �о мной";
+App::$strings["NEW"] = "�ОВОЕ";
+App::$strings["Size"] = "Размер";
+App::$strings["Last Modified"] = "По�леднее изменение";
+App::$strings["Remove all files"] = "Удалить в�е файлы";
+App::$strings["Remove this file"] = "Удалить �тот файл";
+App::$strings["Please login."] = "Пожалуй�та, войдите.";
+App::$strings["Language App"] = "Приложение \"Язык\"";
+App::$strings["Change UI language"] = "Изменить �зык интерфей�а";
+App::$strings["Name and Secret are required"] = "Требуют�� им� и код";
+App::$strings["OAuth2 Apps Manager App"] = "Приложение \"Менеджер Oauth2\"";
+App::$strings["OAuth2 authenticatication tokens for mobile and remote apps"] = "�утентификаци� OAuth2 дл� мобильных и удаленных приложений";
+App::$strings["Add OAuth2 application"] = "Добавить приложение OAuth2";
+App::$strings["Grant Types"] = "Разрешить типы";
+App::$strings["leave blank unless your application sepcifically requires this"] = "о�тавьте пу�тыми до тех пока ваше приложение не требует �того";
+App::$strings["Authorization scope"] = "Обла�ть полномочий";
+App::$strings["OAuth2 Application not found."] = "Приложение OAuth2 не найдено.";
+App::$strings["leave blank unless your application specifically requires this"] = "о�тавьте поле пу�тым, е�ли ваше приложение не требует �того";
+App::$strings["Connected OAuth2 Apps"] = "Подключённые приложени� OAuth2";
+App::$strings["No default suggestions were found."] = "Предложений по умолчанию не найдено.";
+App::$strings["%d rating"] = array(
+	0 => "%d оценка",
+	1 => "%d оценки",
+	2 => "%d оценок",
+);
+App::$strings["Gender: "] = "Пол:";
+App::$strings["Status: "] = "Стату�:";
+App::$strings["Homepage: "] = "Домашн�� �траница:";
+App::$strings["Age:"] = "Возра�т:";
+App::$strings["Location:"] = "Ме�тоположение:";
+App::$strings["Description:"] = "Опи�ание:";
+App::$strings["Hometown:"] = "Родной город:";
+App::$strings["About:"] = "О �ебе:";
+App::$strings["Public Forum:"] = "Публичный форум:";
+App::$strings["Keywords: "] = "Ключевые �лова:";
+App::$strings["Don't suggest"] = "�е предлагать";
+App::$strings["Common connections (estimated):"] = "Общие контакты (оценочно):";
+App::$strings["Global Directory"] = "Глобальный каталог";
+App::$strings["Local Directory"] = "Локальный каталог";
+App::$strings["Finding:"] = "Пои�к:";
+App::$strings["next page"] = "�ледующа� �траница";
+App::$strings["previous page"] = "предыдуща� �траница";
+App::$strings["Sort options"] = "Параметры �ортировки";
+App::$strings["Alphabetic"] = "По алфавиту";
+App::$strings["Reverse Alphabetic"] = "Против алфавита";
+App::$strings["Newest to Oldest"] = "От новых к �тарым";
+App::$strings["Oldest to Newest"] = "От �тарых к новым";
+App::$strings["No entries (some entries may be hidden)."] = "�ет запи�ей (некоторые запи�и могут быть �крыты).";
+App::$strings["No service class restrictions found."] = "Ограничений кла��а об�луживание не найдено.";
+App::$strings["Private forum"] = "Ча�тный форум";
+App::$strings["Public forum"] = "Публичный форум";
+App::$strings["Can not copy folder into itself."] = "�евозможно �копировать каталог в �амого �еб�.";
+App::$strings["Can not move folder \"%s\" into itself."] = "�евозможно �копировать каталог \"%s\" в �амого �еб�.";
+App::$strings["Profile Unavailable."] = "Профиль недо�тупен.";
+App::$strings["Wiki App"] = "Приложение \"Wiki\"";
+App::$strings["Provide a wiki for your channel"] = "Предо�тавьте Wiki дл� вашего канала";
+App::$strings["Invalid channel"] = "�едей�твительный канал";
+App::$strings["Error retrieving wiki"] = "Ошибка при получении Wiki";
+App::$strings["Error creating zip file export folder"] = "Ошибка при �оздании zip-файла при �к�порте каталога";
+App::$strings["Error downloading wiki: "] = "Ошибка загрузки Wiki:";
+App::$strings["Wikis"] = "";
+App::$strings["Download"] = "Загрузить";
+App::$strings["Wiki name"] = "�азвание Wiki";
+App::$strings["Content type"] = "Тип �одержимого";
+App::$strings["Markdown"] = "Разметка Markdown";
+App::$strings["BBcode"] = "";
+App::$strings["Text"] = "Тек�т";
+App::$strings["Type"] = "Тип";
+App::$strings["Any&nbsp;type"] = "Любой&nbsp;тип";
+App::$strings["Lock content type"] = "Зафик�ировать тип �одержимого";
+App::$strings["Create a status post for this wiki"] = "Создать публикацию о �тату�е �той Wiki";
+App::$strings["Edit Wiki Name"] = "Редактировать наименование Wiki";
+App::$strings["Wiki not found"] = "Wiki не найдена";
+App::$strings["Rename page"] = "Переименовать �траницу";
+App::$strings["Error retrieving page content"] = "Ошибка при получении �одержимого �траницы";
+App::$strings["New page"] = "�ова� �траница";
+App::$strings["Revision Comparison"] = "Сравнение ревизий";
+App::$strings["Revert"] = "Отменить";
+App::$strings["Short description of your changes (optional)"] = "Краткое опи�ание ваших изменений (необ�зательно)";
+App::$strings["Source"] = "И�точник";
+App::$strings["New page name"] = "�овое им� �траницы";
+App::$strings["Embed image from photo albums"] = "В�троить изображение из фотоальбома";
+App::$strings["Embed an image from your albums"] = "В�троить изображение из ваших альбомов";
+App::$strings["History"] = "И�тори�";
+App::$strings["Error creating wiki. Invalid name."] = "Ошибка �оздани� Wiki. �еверное им�.";
+App::$strings["A wiki with this name already exists."] = "Wiki � таким именем уже �уще�твует.";
+App::$strings["Wiki created, but error creating Home page."] = "Wiki �оздана, но возникла ошибка при �оздании домашней �траницы";
+App::$strings["Error creating wiki"] = "Ошибка при �оздании Wiki";
+App::$strings["Error updating wiki. Invalid name."] = "Ошибка при обновлении Wiki. �еверное им�.";
+App::$strings["Error updating wiki"] = "Ошибка при обновлении Wiki";
+App::$strings["Wiki delete permission denied."] = "�ет прав на удаление Wiki.";
+App::$strings["Error deleting wiki"] = "Ошибка удалени� Wiki";
+App::$strings["New page created"] = "Создана нова� �траница";
+App::$strings["Cannot delete Home"] = "�евозможно удалить домашнюю �траницу";
+App::$strings["Current Revision"] = "Текуща� ревизи�";
+App::$strings["Selected Revision"] = "Выбранна� ревизи�";
+App::$strings["You must be authenticated."] = "Вы должны быть аутентифицированы.";
+App::$strings["Photos"] = "Фотографии";
+App::$strings["Files"] = "Файлы";
+App::$strings["This channel is limited to %d tokens"] = "Этот канал ограничен %d токенами";
+App::$strings["Name and Password are required."] = "Требуют�� им� и пароль.";
+App::$strings["Token saved."] = "Токен �охранён.";
+App::$strings["Guest Access App"] = "Приложение \"Го�тевой до�туп\"";
+App::$strings["Create access tokens so that non-members can access private content"] = "Создайте токены до�тупа, чтобы �торонние пользователи могли получить до�туп к ча�тному �одержимому";
+App::$strings["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."] = "И�пользуйте �ту форму дл� �оздани� идентификаторов временного до�тупа дл� �торонних пользователей. Эти идентификаторы могут и�пользовать�� в �пи�ках контрол� до�тупа, и по�етители могут и�пользовать �ти учетные данные дл� до�тупа к ча�тному контенту.";
+App::$strings["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:"] = "Вы также можете предо�тавить до�туп в �тиле <em>dropbox</em> дл� друзей и коллег, добавив им� и пароль дл� входа на любой URL-адре� �айта. �апример:";
+App::$strings["Guest Access Tokens"] = "Токен го�тевого до�тупа";
+App::$strings["Login Name"] = "Им�";
+App::$strings["Login Password"] = "Пароль";
+App::$strings["Expires (yyyy-mm-dd)"] = "Срок дей�тви� (yyyy-mm-dd)";
+App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Удаление канала не разрешает�� в течении 48 ча�ов по�ле �мены парол� у аккаунта.";
+App::$strings["Remove This Channel"] = "Удалить �тот канал";
+App::$strings["This channel will be completely removed from the network. "] = "Этот канал будет полно�тью удалён из �ети. ";
+App::$strings["Change filename to"] = "Переименовать файл в";
+App::$strings["Select a target location"] = "Выбрать ме�то назначени�";
+App::$strings["Copy to target location"] = "Скопировать в ме�то назнаени�";
+App::$strings["Set permissions for all files and sub folders"] = "У�тановить разрешени� дл� в�ех файлов и подкаталогов";
+App::$strings["Notify your contacts about this file"] = "Сообщить �воим контактам об �том файле";
+App::$strings["File category"] = "Категори� файла";
+App::$strings["Total"] = "В�его";
+App::$strings["Shared"] = "Общие";
+App::$strings["Add Files"] = "Добавить файлы";
+App::$strings["Admin Delete"] = "Удалено админи�тратором";
+App::$strings["parent"] = "и�точник";
+App::$strings["Select All"] = "Выбрать в�ё";
+App::$strings["Bulk Actions"] = "Группова� обработка";
+App::$strings["Adjust Permissions"] = "�а�троить разрешени�";
+App::$strings["Move or Copy"] = "Переме�тить или копировать";
+App::$strings["Info"] = "Информаци�";
+App::$strings["Rename"] = "Переименовать";
+App::$strings["Post"] = "Публикаци�";
+App::$strings["Attachment BBcode"] = "Вложение BBcode";
+App::$strings["Embed BBcode"] = "В�траивание BBcode";
+App::$strings["Link BBcode"] = "С�ылка BBcode";
+App::$strings["You are using %1\$s of your available file storage."] = "Вы и�пользуете %1\$s из до�тупного вам хранилища файлов.";
+App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Вы и�пользуете %1\$s из %2\$s до�тупного хранилища файлов (%3\$s&#37;).";
+App::$strings["WARNING:"] = "Предупреждение:";
+App::$strings["Create new folder"] = "Создать новую папку";
+App::$strings["Upload file"] = "Загрузить файл";
+App::$strings["Drop files here to immediately upload"] = "Поме�тите файлы �юда дл� немедленной загрузки";
+App::$strings["You can select files via the upload button or drop them right here or into an existing folder."] = "Вы можете выбрать файлы � помощью кнопки загрузки или перетащить их �юда или в �уще�твующую папку.";
+App::$strings["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."] = "Удаленна� группа � �тим названием была во��тановлена. Суще�твующие разрешени� пункт <strong>могут</strong> примен�ть�� к �той группе и к её будущих уча�тников. Е�ли �то не то, чего вы хотели, пожалуй�та, �оздайте другую группу � другим именем.";
+App::$strings["Add new connections to this privacy group"] = "Добавить новые контакты в группу конфиденциально�ти";
+App::$strings["edit"] = "редактировать";
+App::$strings["Edit group"] = "Редактировать группу";
+App::$strings["Add privacy group"] = "Добавить группу конфиденциально�ти";
+App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу конфиденциально�ти";
+App::$strings["add"] = "добавить";
+App::$strings["Channel is blocked on this site."] = "Канал блокирует�� на �том �айте.";
+App::$strings["Channel location missing."] = "Ме�тоположение канала от�ут�твует.";
+App::$strings["Remote channel or protocol unavailable."] = "Удалённый канал или протокол недо�тупен.";
+App::$strings["Channel discovery failed."] = "�е удало�ь обнаружить канал.";
+App::$strings["Protocol disabled."] = "Протокол отключен.";
+App::$strings["Cannot connect to yourself."] = "�ельз� подключить�� к �амому �ебе.";
+App::$strings["error saving data"] = "ошибка �охранени� данных";
+App::$strings["Source code of failed update: "] = "И�ходный код неудачного обновлени�: ";
+App::$strings["Update Error at %s"] = "Ошибка обновлени� на %s";
+App::$strings["Update %s failed. See error logs."] = "Выполнение %s неудачно. Проверьте �и�темный журнал.";
+App::$strings["(No Title)"] = "(нет заголовка)";
+App::$strings["Wiki page create failed."] = "�е удало�ь �оздать �траницу Wiki.";
+App::$strings["Wiki not found."] = "Wiki не найдена.";
+App::$strings["Destination name already exists"] = "Им� назначени� уже �уще�твует";
+App::$strings["Page not found"] = "Страница не найдена.";
+App::$strings["Error reading page content"] = "Ошибка чтени� �одержимого �траницы";
+App::$strings["Error reading wiki"] = "Ошибка чтени� Wiki";
+App::$strings["Page update failed."] = "�е удало�ь обновить �траницу.";
+App::$strings["Nothing deleted"] = "�ичего не удалено";
+App::$strings["Compare: object not found."] = "Сравнение: объект не найден.";
+App::$strings["Page updated"] = "Страница обновлена";
+App::$strings["Untitled"] = "�е озаглавлено";
+App::$strings["Wiki resource_id required for git commit"] = "Требует�� resource_id Wiki дл� отправки в Git";
+App::$strings["__ctx:wiki_history__ Message"] = "Сообщение";
+App::$strings["Date"] = "Дата";
+App::$strings["Compare"] = "Сравнить";
+App::$strings["Different viewers will see this text differently"] = "Различные зрители увид�т �тот тек�т по-разному";
+App::$strings["Private Message"] = "Личное �ообщение";
+App::$strings["Privacy conflict. Discretion advised."] = "Конфиликт на�троек конфиденциально�ти.";
+App::$strings["Select"] = "Выбрать";
+App::$strings["I will attend"] = "Я буду уча�твовать";
+App::$strings["I will not attend"] = "Я не буду уча�твовать";
+App::$strings["I might attend"] = "Я возможно буду при�ут�твовать";
+App::$strings["I agree"] = "Я �огла�ен";
+App::$strings["I disagree"] = "Я не �огла�ен";
+App::$strings["I abstain"] = "Я воздержал��";
+App::$strings["Toggle Star Status"] = "Переключить �тату� пометки";
+App::$strings["Message signature validated"] = "Подпи�ь �ообщени� проверена";
+App::$strings["Message signature incorrect"] = "Подпи�ь �ообщени� неверна�";
+App::$strings["Conversation Tools"] = "Ин�трументы общени�";
+App::$strings["like"] = "нравит��";
+App::$strings["dislike"] = "не нравит��";
+App::$strings["Reply on this comment"] = "Ответить на �тот комментарий";
+App::$strings["reply"] = "ответить";
+App::$strings["Reply to"] = "Ответить";
+App::$strings["Share This"] = "Поделить�� �тим";
+App::$strings["share"] = "поделить��";
+App::$strings["Delivery Report"] = "Отчёт о до�тавке";
+App::$strings["%d comment"] = array(
+	0 => "%d комментарий",
+	1 => "%d комментари�",
+	2 => "%d комментариев",
+);
+App::$strings["%d unseen"] = "новых %d";
+App::$strings["to"] = "к";
+App::$strings["via"] = "через";
+App::$strings["Wall-to-Wall"] = "Стена-на-Стену";
+App::$strings["via Wall-To-Wall:"] = "через Стена-на-Стену:";
+App::$strings["from %s"] = "от %s";
+App::$strings["last edited: %s"] = "по�леднее редактирование: %s";
+App::$strings["Expires: %s"] = "Срок дей�тви�: %s";
+App::$strings["Attend"] = "По�етить";
+App::$strings["Attendance Options"] = "Параметры по�ещаемо�ти";
+App::$strings["Vote"] = "Голо�овать";
+App::$strings["Voting Options"] = "Параметры голо�овани�";
+App::$strings["Go to previous comment"] = "Перейти к предыдущему комментарию";
+App::$strings["Pinned post"] = "Прикреплённа� заметка";
+App::$strings["Unpin from the top"] = "Открепить";
+App::$strings["Pin to the top"] = "Прикрепить �верху";
+App::$strings["Save Bookmarks"] = "Сохранить в закладках";
+App::$strings["Add to Calendar"] = "Добавить в календарь";
+App::$strings["This is an unsaved preview"] = "Это не�охранённый про�мотр";
+App::$strings["%s show all"] = "%s показать в�ё";
+App::$strings["Bold"] = "Жирный";
+App::$strings["Italic"] = "Кур�ив";
+App::$strings["Underline"] = "Подчеркнутый";
+App::$strings["Quote"] = "Цитата";
+App::$strings["Code"] = "Код";
+App::$strings["Image"] = "Изображение";
+App::$strings["Attach/Upload file"] = "Прикрепить/загрузить файл";
+App::$strings["Insert Link"] = "В�тавить ��ылку";
+App::$strings["Video"] = "Видео";
+App::$strings["Your full name (required)"] = "Ваше полное им� (требует��)";
+App::$strings["Your email address (required)"] = "Ваш адре� �лектронной почты (требует��)";
+App::$strings["Your website URL (optional)"] = "URL вашего веб�айта (необ�зательно)";
+App::$strings["Directory Options"] = "Параметры каталога";
+App::$strings["Safe Mode"] = "Безопа�ный режим";
+App::$strings["Public Forums Only"] = "Только публичные форумы";
+App::$strings["This Website Only"] = "Только �тот веб-�айт";
+App::$strings["Visible to your default audience"] = "Видно вашей аудитории по умолчанию.";
+App::$strings["Only me"] = "Только мне";
+App::$strings["Public"] = "Общедо�тупно";
+App::$strings["Anybody in the \$Projectname network"] = "Любому в �ети \$Projectname";
+App::$strings["Any account on %s"] = "Любой аккаунт в %s";
+App::$strings["Any of my connections"] = "Любой из моих контактов";
+App::$strings["Only connections I specifically allow"] = "Только те контакты, кому � дам разрешение";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Любой аутентифицированный (может включать по�етителей их других �етей)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Любые контакты включа� те, которые вы ещё не одобрили";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Это на�тройка по умолчанию дл� аудитории ваших обычных потоков и публикаций";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать профиль вашего о�новного канала";
+App::$strings["This is your default setting for who can view your connections"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваши контакты";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваше хранилище файлов и фотографий";
+App::$strings["This is your default setting for the audience of your webpages"] = "Это на�тройка по умолчанию дл� аудитории ваших веб-�траниц";
 App::$strings["Likes %1\$s's %2\$s"] = "�равит�� %1\$s %2\$s";
 App::$strings["Doesn't like %1\$s's %2\$s"] = "�е нравит�� %1\$s %2\$s";
 App::$strings["Will attend %s's event"] = "При�оединит�� к меропри�тию %s";
 App::$strings["Will not attend %s's event"] = "�е при�оединит�� к меропри�тию %s";
 App::$strings["May attend %s's event"] = "Возможно при�оединит�� к меропри�тию %s";
 App::$strings["May not attend %s's event"] = "Возможно не при�оединит�� к меропри�тию %s";
+App::$strings["ActivityPub"] = "";
+App::$strings["Apps"] = "Приложени�";
+App::$strings["Affinity Tool"] = "Степень �ход�тва";
+App::$strings["Site Admin"] = "�дмини�тратор �айта";
+App::$strings["Report Bug"] = "Сообщить об ошибке";
+App::$strings["Bookmarks"] = "Закладки";
+App::$strings["Chatrooms"] = "Чаты";
+App::$strings["Content Filter"] = "Фильтр �одержимого";
+App::$strings["Content Import"] = "Импорт �одержимого";
+App::$strings["Remote Diagnostics"] = "Удалённа� диагно�тика";
+App::$strings["Suggest Channels"] = "Предлагаемые каналы";
+App::$strings["Stream"] = "Поток";
+App::$strings["Wiki"] = "";
+App::$strings["Channel Home"] = "Главна� канала";
+App::$strings["Calendar"] = "Календарь";
+App::$strings["Directory"] = "Каталог";
+App::$strings["Mail"] = "Перепи�ка";
+App::$strings["Chat"] = "Чат";
+App::$strings["Probe"] = "Проба";
+App::$strings["Suggest"] = "Предложить";
+App::$strings["Random Channel"] = "Случайный канал";
+App::$strings["Invite"] = "Пригла�ить";
+App::$strings["Features"] = "Функции";
+App::$strings["Language"] = "Язык";
+App::$strings["Profile Photo"] = "Фотографи� профил�";
+App::$strings["Profiles"] = "Редактировать профиль";
+App::$strings["Notifications"] = "Оповещени�";
+App::$strings["Order Apps"] = "Пор�док приложений";
+App::$strings["CardDAV"] = "";
+App::$strings["Guest Access"] = "Го�тевой до�туп";
+App::$strings["Notes"] = "Запи�ки";
+App::$strings["OAuth Apps Manager"] = "Менеджер OAuth";
+App::$strings["OAuth2 Apps Manager"] = "Менеджер OAuth2";
+App::$strings["PDL Editor"] = "Редактор PDL";
+App::$strings["My Chatrooms"] = "Мои чаты";
+App::$strings["Channel Export"] = "Эк�порт канала";
+App::$strings["Purchase"] = "Купить";
+App::$strings["Undelete"] = "Во��тановить";
+App::$strings["Add to app-tray"] = "Добавить в правое меню";
+App::$strings["Remove from app-tray"] = "Удалить из правого меню";
+App::$strings["Pin to navbar"] = "Добавить на панель навигации";
+App::$strings["Unpin from navbar"] = "Удалить � панели навигации";
+App::$strings["A deleted list with this name was revived. Existing item permissions <strong>may</strong> apply to this list and any future members. If this is not what you intended, please create another list with a different name."] = "Во��тановлен удаленный �пи�ок � таким именем. Суще�твующие разрешени� на �лементы <strong>могут</strong> примен�ть�� к �тому �пи�ку и любым будущим уча�тникам. Е�ли не отвечает вашим намерени�м - �оздайте еще один �пи�ок � другим именем.";
+App::$strings["Add new connections to this access list"] = "Добавить новый контакт в �пи�ок до�тупа";
+App::$strings["Lists"] = "Спи�ки";
+App::$strings["Edit list"] = "Редактировать �пи�ок";
+App::$strings["Create new list"] = "Создать новый �пи�ок";
+App::$strings["Channels not in any access list"] = "Каналы, не вход�щие ни в один �пи�ок до�тупа";
 App::$strings["\$Projectname Notification"] = "Оповещение \$Projectname ";
+App::$strings["\$projectname"] = "\$projectname";
 App::$strings["Thank You,"] = "Спа�ибо,";
+App::$strings["%s Administrator"] = "админи�тратор %s";
 App::$strings["This email was sent by %1\$s at %2\$s."] = "Это пи�ьмо было отправлено %1\$s на %2\$s.";
 App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Чтобы прекратить получать �ти �ообщени�, на�тройте параметры уведомлений в %s";
 App::$strings["To stop receiving these messages, please adjust your %s."] = "Чтобы прекратить получать �ти �ообщени�, пожалуй�та измените %s.";
 App::$strings["%s <!item_type!>"] = "";
-App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Notify] Получено новое �ообщение в %s";
-App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s отправил вам новое личное �ообщение в %2\$s.";
+App::$strings["[\$Projectname:Notify] New direct message received at %s"] = "[\$Projectname:Notify] Получено новое �ообщение в %s";
+App::$strings["%1\$s sent you a new direct message at %2\$s."] = "%1\$s отправил вам новое �ообщение в %2\$s.";
 App::$strings["%1\$s sent you %2\$s."] = "%1\$s отправил вам %2\$s.";
-App::$strings["a private message"] = "личное �ообщение";
-App::$strings["Please visit %s to view and/or reply to your private messages."] = "Пожалуй�та, по�етите %s дл� про�мотра и/или ответа на ваши личные �ообщени�.";
+App::$strings["a direct message"] = "�ообщение";
+App::$strings["Please visit %s to view and/or reply to your direct messages."] = "Пожалуй�та, по�етите %s дл� про�мотра и/или ответа на ваши �ообщени�.";
 App::$strings["commented on"] = "прокомментировал";
 App::$strings["liked"] = "понравило�ь";
 App::$strings["disliked"] = "не понравило�ь";
@@ -3492,105 +2016,34 @@ App::$strings["created a new post"] = "Ñ�оздал новую публикацÐ
 App::$strings["voted on %s's poll"] = "проголо�ова в опро�е %s";
 App::$strings["commented on %s's post"] = "прокомментировал публикацию %s";
 App::$strings["repeated %s's post"] = "разме�тил публикацию %s";
+App::$strings["shared a file with you"] = "� вами поделили�ь файлом";
 App::$strings["edited a post dated %s"] = "отредактировал публикацию датированную %s";
 App::$strings["edited a comment dated %s"] = "отредактировал комментарий датированный %s";
+App::$strings["added your channel"] = "добавил ваш канал";
+App::$strings["sent you a direct message"] = "отправил вам �ообщение";
+App::$strings["g A l F d"] = "g A l F d";
+App::$strings["[today]"] = "[�егодн�]";
 App::$strings["created an event"] = "�оздано �обытие";
-App::$strings["verified"] = "проверено";
-App::$strings["error saving data"] = "ошибка �охранени� данных";
+App::$strings["status verified"] = "�тату� подтверждён";
+App::$strings["Wiki updated successfully"] = "Wiki у�пешно обновлена";
+App::$strings["Wiki files deleted successfully"] = "Wiki у�пешно удалена";
 App::$strings["Missing room name"] = "От�ут�твует название комнаты";
 App::$strings["Duplicate room name"] = "�азвание комнаты дублирует��";
 App::$strings["Invalid room specifier."] = "�еверный указатель комнаты.";
 App::$strings["Room not found."] = "Комната не найдена.";
 App::$strings["Room is full"] = "Комната переполнена";
-App::$strings["Wiki updated successfully"] = "Wiki у�пешно обновлена";
-App::$strings["Wiki files deleted successfully"] = "Wiki у�пешно удалена";
-App::$strings["Apps"] = "Приложени�";
-App::$strings["Affinity Tool"] = "Степень �ход�тва";
-App::$strings["Site Admin"] = "�дмини�тратор �айта";
-App::$strings["Content Filter"] = "Фильтр �одержимого";
-App::$strings["Remote Diagnostics"] = "Удалённа� диагно�тика";
-App::$strings["Suggest Channels"] = "Предлагаемые каналы";
-App::$strings["Stream"] = "Поток";
-App::$strings["Mail"] = "Перепи�ка";
-App::$strings["Chat"] = "Чат";
-App::$strings["Probe"] = "Проба";
-App::$strings["Suggest"] = "Предложить";
-App::$strings["Random Channel"] = "Случайный канал";
-App::$strings["Invite"] = "Пригла�ить";
-App::$strings["Post"] = "Публикаци�";
-App::$strings["Notifications"] = "Оповещени�";
-App::$strings["Order Apps"] = "Пор�док приложений";
-App::$strings["CardDAV"] = "";
-App::$strings["Guest Access"] = "Го�тевой до�туп";
-App::$strings["OAuth Apps Manager"] = "Менеджер OAuth";
-App::$strings["OAuth2 Apps Manager"] = "Менеджер OAuth2";
-App::$strings["PDL Editor"] = "Редактор PDL";
-App::$strings["My Chatrooms"] = "Мои чаты";
-App::$strings["Channel Export"] = "Эк�порт канала";
-App::$strings["Purchase"] = "Купить";
-App::$strings["Undelete"] = "Во��тановить";
-App::$strings["Add to app-tray"] = "Добавить в правое меню";
-App::$strings["Remove from app-tray"] = "Удалить из правого меню";
-App::$strings["Pin to navbar"] = "Добавить на панель навигации";
-App::$strings["Unpin from navbar"] = "Удалить � панели навигации";
 App::$strings["0. Beginner/Basic"] = "�ачинающий / Базовый";
 App::$strings["1. Novice - not skilled but willing to learn"] = "1. �овичок - не опытный, но желающий учить��";
 App::$strings["2. Intermediate - somewhat comfortable"] = "2. Промежуточный - более удобный";
 App::$strings["3. Advanced - very comfortable"] = "3. Продвинутый - очень удобный";
 App::$strings["4. Expert - I can write computer code"] = "4. Эк�перт - � умею программировать";
 App::$strings["5. Wizard - I probably know more than you do"] = "5. Волшебник - возможно � знаю больше чем ты";
-App::$strings["(No Title)"] = "(нет заголовка)";
-App::$strings["Wiki page create failed."] = "�е удало�ь �оздать �траницу Wiki.";
-App::$strings["Wiki not found."] = "Wiki не найдена.";
-App::$strings["Destination name already exists"] = "Им� назначени� уже �уще�твует";
-App::$strings["Page not found"] = "Страница не найдена.";
-App::$strings["Error reading page content"] = "Ошибка чтени� �одержимого �траницы";
-App::$strings["Error reading wiki"] = "Ошибка чтени� Wiki";
-App::$strings["Page update failed."] = "�е удало�ь обновить �траницу.";
-App::$strings["Nothing deleted"] = "�ичего не удалено";
-App::$strings["Compare: object not found."] = "Сравнение: объект не найден.";
-App::$strings["Page updated"] = "Страница обновлена";
-App::$strings["Untitled"] = "�е озаглавлено";
-App::$strings["Wiki resource_id required for git commit"] = "Требует�� resource_id Wiki дл� отправки в Git";
-App::$strings["Privacy conflict. Discretion advised."] = "Конфиликт на�троек конфиденциально�ти.";
-App::$strings["Admin Delete"] = "Удалено админи�тратором";
-App::$strings["Reply on this comment"] = "Ответить на �тот комментарий";
-App::$strings["reply"] = "ответить";
-App::$strings["Reply to"] = "Ответить";
-App::$strings["Delivery Report"] = "Отчёт о до�тавке";
-App::$strings["%d comment"] = array(
-	0 => "%d комментарий",
-	1 => "%d комментари�",
-	2 => "%d комментариев",
-);
-App::$strings["%d unseen"] = "новых %d";
-App::$strings["to"] = "к";
-App::$strings["Wall-to-Wall"] = "Стена-на-Стену";
-App::$strings["via Wall-To-Wall:"] = "через Стена-на-Стену:";
-App::$strings["Attend"] = "По�етить";
-App::$strings["Go to previous comment"] = "Перейти к предыдущему комментарию";
-App::$strings["Add to Calendar"] = "Добавить в календарь";
-App::$strings["Image"] = "Изображение";
-App::$strings["Insert Link"] = "В�тавить ��ылку";
-App::$strings["Video"] = "Видео";
-App::$strings["Your full name (required)"] = "Ваше полное им� (требует��)";
-App::$strings["Your email address (required)"] = "Ваш адре� �лектронной почты (требует��)";
-App::$strings["Your website URL (optional)"] = "URL вашего веб�айта (необ�зательно)";
-App::$strings["Source code of failed update: "] = "И�ходный код неудачного обновлени�: ";
-App::$strings["Update Error at %s"] = "Ошибка обновлени� на %s";
-App::$strings["Update %s failed. See error logs."] = "Выполнение %s неудачно. Проверьте �и�темный журнал.";
-App::$strings["Public"] = "Общедо�тупно";
-App::$strings["Anybody in the \$Projectname network"] = "Любому в �ети \$Projectname";
-App::$strings["Any account on %s"] = "Любой аккаунт в %s";
-App::$strings["Any of my connections"] = "Любой из моих контактов";
-App::$strings["Only connections I specifically allow"] = "Только те контакты, кому � дам разрешение";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Любой аутентифицированный (может включать по�етителей их других �етей)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Любые контакты включа� те, которые вы ещё не одобрили";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Это на�тройка по умолчанию дл� аудитории ваших обычных потоков и публикаций";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать профиль вашего о�новного канала";
-App::$strings["This is your default setting for who can view your connections"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваши контакты";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Это на�тройка по умолчанию дл� тех, кто может про�матривать ваше хранилище файлов и фотографий";
-App::$strings["This is your default setting for the audience of your webpages"] = "Это на�тройка по умолчанию дл� аудитории ваших веб-�траниц";
+App::$strings["__ctx:permcat__ default"] = "по умолчанию";
+App::$strings["__ctx:permcat__ follower"] = "поклонник";
+App::$strings["__ctx:permcat__ contributor"] = "уча�тник";
+App::$strings["__ctx:permcat__ publisher"] = "издатель";
+App::$strings["Unable to verify site signature for %s"] = "�евозможно проверить подпи�ь �айта %s";
+App::$strings["Unable to verify channel signature"] = "�евозможно проверить подпи�ь канала";
 App::$strings["Social Networking"] = "Социальна� Сеть";
 App::$strings["Social - Federation"] = "Социальна� - Федераци�";
 App::$strings["Social - Mostly Public"] = "Социальна� - В о�новном обще�твенный";
@@ -3625,38 +2078,1524 @@ App::$strings["Can forward to all my channel connections via ! mentions in posts
 App::$strings["Can chat with me"] = "Может общать�� �о мной в чате";
 App::$strings["Can source my public posts in derived channels"] = "Может и�пользовать мои публичные �ообщени� в клонированных  лентах �ообщений";
 App::$strings["Can administer my channel"] = "Может админи�трировать мой канал";
-App::$strings["Change filename to"] = "Переименовать файл в";
-App::$strings["Select a target location"] = "Выбрать ме�то назначени�";
-App::$strings["Copy to target location"] = "Скопировать в ме�то назнаени�";
-App::$strings["Set permissions for all files and sub folders"] = "У�тановить разрешени� дл� в�ех файлов и подкаталогов";
-App::$strings["Notify your contacts about this file"] = "Сообщить �воим контактам об �том файле";
-App::$strings["File category"] = "Категори� файла";
-App::$strings["Total"] = "В�его";
-App::$strings["Shared"] = "Общие";
-App::$strings["Add Files"] = "Добавить файлы";
-App::$strings["parent"] = "и�точник";
-App::$strings["Select All"] = "Выбрать в�ё";
-App::$strings["Bulk Actions"] = "Группова� обработка";
-App::$strings["Adjust Permissions"] = "�а�троить разрешени�";
-App::$strings["Move or Copy"] = "Переме�тить или копировать";
-App::$strings["Info"] = "Информаци�";
-App::$strings["Rename"] = "Переименовать";
-App::$strings["Attachment BBcode"] = "Вложение BBcode";
-App::$strings["Embed BBcode"] = "В�траивание BBcode";
-App::$strings["Link BBcode"] = "С�ылка BBcode";
-App::$strings["You are using %1\$s of your available file storage."] = "Вы и�пользуете %1\$s из до�тупного вам хранилища файлов.";
-App::$strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Вы и�пользуете %1\$s из %2\$s до�тупного хранилища файлов (%3\$s&#37;).";
-App::$strings["WARNING:"] = "Предупреждение:";
-App::$strings["Create new folder"] = "Создать новую папку";
-App::$strings["Upload file"] = "Загрузить файл";
-App::$strings["Drop files here to immediately upload"] = "Поме�тите файлы �юда дл� немедленной загрузки";
-App::$strings["You can select files via the upload button or drop them right here or into an existing folder."] = "Вы можете выбрать файлы � помощью кнопки загрузки или перетащить их �юда или в �уще�твующую папку.";
-App::$strings["Create an account to access services and applications"] = "Создайте аккаунт дл� до�тупа к �лужбам и приложени�м";
-App::$strings["Login/Email"] = "Пользователь / email";
-App::$strings["Password"] = "Пароль";
-App::$strings["Remember me"] = "Запомнить мен�";
-App::$strings["Forgot your password?"] = "Забыли пароль или логин?";
-App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Ошибка SSL/TLS веб-�айта дл� %s";
-App::$strings["Website SSL certificate is not valid. Please correct."] = "SSL/TLS �ертификат веб-�айт недей�твителен. И�правьте �то.";
-App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Задани� Cron не запущены на %s";
-App::$strings["Cron/Scheduled tasks not running."] = "Задани� Cron / планировщика не запущены.";
+App::$strings["Select Channel"] = "Выбрать канал";
+App::$strings["Read-write"] = "Чтение-запи�ь";
+App::$strings["Read-only"] = "Только чтение";
+App::$strings["Channel Calendar"] = "Календарь канала";
+App::$strings["Shared CalDAV Calendars"] = "Общие календари CalDAV";
+App::$strings["Share this calendar"] = "Поделить�� �тим календарём";
+App::$strings["Calendar name and color"] = "Им� и цвет календар�";
+App::$strings["Create new CalDAV calendar"] = "Создать новый календарь CalDAV";
+App::$strings["Calendar Name"] = "Им� календар�";
+App::$strings["Calendar Tools"] = "Ин�трументы календар�";
+App::$strings["Import calendar"] = "Импортировать календарь";
+App::$strings["Select a calendar to import to"] = "Выбрать календарь дл� импорта в";
+App::$strings["Addressbooks"] = "�дре�ные книги";
+App::$strings["Addressbook name"] = "Им� адре�ной книги";
+App::$strings["Create new addressbook"] = "Создать новую адре�ную книгу";
+App::$strings["Addressbook Name"] = "Им� адре�ной книги";
+App::$strings["Addressbook Tools"] = "Ин�трументы адре�ной книги";
+App::$strings["Import addressbook"] = "Импортировать адре�ную книгу";
+App::$strings["Select an addressbook to import to"] = "Выбрать адре�ную книгу дл� импорта в";
+App::$strings["Overview"] = "Обзор";
+App::$strings["Archives"] = "�рхивы";
+App::$strings["Suggestions"] = "Рекомендации";
+App::$strings["See more..."] = "Про�мотреть больше...";
+App::$strings["Bookmarked Chatrooms"] = "Закладки чатов";
+App::$strings["Member registrations waiting for confirmation"] = "Реги�трации уча�тников, ожидающие подверждени�";
+App::$strings["Inspect queue"] = "Про�мотр очереди";
+App::$strings["DB updates"] = "Обновление базы данных";
+App::$strings["Admin"] = "�дмини�трирование";
+App::$strings["Addon Features"] = "�а�тройки ра�ширений";
+App::$strings["Suggested Chatrooms"] = "Рекомендуемые чаты";
+App::$strings["Toggle post editor"] = "Переключить редактор �ообщений";
+App::$strings["Toggle personal notes"] = "Переключить личные заметки";
+App::$strings["Refresh"] = "Обновить";
+App::$strings["Direct Messages"] = "Личные �ообщени�";
+App::$strings["Show direct (private) messages"] = "Показать личные (пр�мые) �ообщени�";
+App::$strings["Events"] = "Событи�";
+App::$strings["Show posts that include events"] = "Показывать публикации � �обыти�ми";
+App::$strings["Polls"] = "Опро�ы";
+App::$strings["Show posts that include polls"] = "Показывать публикации � опро�ами";
+App::$strings["Show posts related to the %s privacy group"] = "Показывать публикации отно��щие�� к группе конфиденциально�ти %s";
+App::$strings["Show my privacy groups"] = "Показывать мои группы конфиденциально�ти";
+App::$strings["Show posts to this forum"] = "Показывать публикации �того форума";
+App::$strings["Forums"] = "Форумы";
+App::$strings["Show forums"] = "Показывать форумы";
+App::$strings["Starred Posts"] = "Отмеченные публикации";
+App::$strings["Show posts that I have starred"] = "Показывать публикации которые � отметил";
+App::$strings["Personal Posts"] = "Свои публикации";
+App::$strings["Show posts that mention or involve me"] = "Показывать публикации где вы были упом�нуты или привлечены";
+App::$strings["Show posts that I have filed to %s"] = "Показывать публикации которые � добавил в %s";
+App::$strings["Saved Folders"] = "Сохранённые каталоги";
+App::$strings["Show filed post categories"] = "Показывать категории добавленных публикаций";
+App::$strings["Panel search"] = "Панель пои�ка";
+App::$strings["Filter by name"] = "Отфильтровать по имени";
+App::$strings["Remove active filter"] = "Удалить активный фильтр";
+App::$strings["Stream Filters"] = "Фильтры потока";
+App::$strings["App Collections"] = "Коллекции приложений";
+App::$strings["Installed apps"] = "У�тановленные приложени�";
+App::$strings["New network activity notifications"] = "Уведомлени� о новой �етевой активно�ти ";
+App::$strings["Network stream"] = "Сетевой поток";
+App::$strings["Mark all notifications read"] = "Пометить уведомлени� как прочитанные";
+App::$strings["Show new posts only"] = "Показывать только новые публикации";
+App::$strings["Filter by name or address"] = "Фильтровать по имени или адре�у";
+App::$strings["New home activity notifications"] = "Уведомлени� о взаимодей�твии � вами";
+App::$strings["Home stream"] = "Ваш поток";
+App::$strings["Mark all notifications seen"] = "Пометить уведомлени� как про�мотренные";
+App::$strings["New direct messages notifications"] = "Уведомлени� о новых �ообщени�х";
+App::$strings["Direct messages stream"] = "Поток �ообщений";
+App::$strings["New events notifications"] = "Уведомлени� о новых �обыти�х";
+App::$strings["View events"] = "Про�мотреть �обыти�";
+App::$strings["Mark all events seen"] = "Пометить в�е �обыти� как про�мотренные";
+App::$strings["New connections notifications"] = "Уведомлени� о новых контактах";
+App::$strings["View all connections"] = "Про�мотр в�ех контактов";
+App::$strings["New files notifications"] = "Уведомлени� о новых файлах";
+App::$strings["Notices"] = "Оповещени�";
+App::$strings["View all notices"] = "Про�мотреть в�е оповещени�";
+App::$strings["Mark all notices seen"] = "Пометить в�е оповещени� как про�мотренные";
+App::$strings["Registrations"] = "Реги�трации";
+App::$strings["New registrations notifications"] = "Уведомлени� о новых реги�траци�х";
+App::$strings["New public stream notifications"] = "Уведомлени� о новом в публичном потоке";
+App::$strings["Public stream"] = "Публичный поток";
+App::$strings["Sorry, you have got no notifications at the moment"] = "Извините, но �ейча� у ва� нет уведомлений";
+App::$strings["Events Tools"] = "Ин�трументы дл� �обытий";
+App::$strings["Export Calendar"] = "Эк�портировать календарь";
+App::$strings["Import Calendar"] = "Импортировать календарь";
+App::$strings["Everything"] = "В�ё";
+App::$strings["Received Messages"] = "Полученные �ообщени�";
+App::$strings["Sent Messages"] = "Отправленные �ообщени�";
+App::$strings["Conversations"] = "Бе�еды";
+App::$strings["No messages."] = "Сообщений нет.";
+App::$strings["Delete conversation"] = "Удалить бе�еду";
+App::$strings["photo/image"] = "фотографи� / изображение";
+App::$strings["Chat Members"] = "Уча�тники чата";
+App::$strings["Profile Creation"] = "Создание профил�";
+App::$strings["Upload profile photo"] = "Загрузить фотографию профил�";
+App::$strings["Upload cover photo"] = "Загрузить фотографию обложки";
+App::$strings["Edit your profile"] = "Редактировать профиль";
+App::$strings["Find and Connect with others"] = "�айти и в�тупить в контакт";
+App::$strings["View the directory"] = "Про�мотреть каталог";
+App::$strings["Manage your connections"] = "Управление вашими контактами";
+App::$strings["Communicate"] = "Св�зать��";
+App::$strings["View your channel homepage"] = "Домашн�� �траница канала";
+App::$strings["View your network stream"] = "Про�мотреть ваш �етевой поток";
+App::$strings["Documentation"] = "Документаци�";
+App::$strings["Missing Features?"] = "От�ут�твует функци�?";
+App::$strings["Pin apps to navigation bar"] = "Прикрепить приложение к панели";
+App::$strings["Install more apps"] = "У�тановить больше приложений";
+App::$strings["View public stream"] = "Про�мотреть публичный поток";
+App::$strings["Commented Date"] = "По комментари�м";
+App::$strings["Order by last commented date"] = "Сортировка по дате по�леднего комментари�";
+App::$strings["Posted Date"] = "По публикаци�м";
+App::$strings["Order by last posted date"] = "Сортировка по дате по�ледней публикации";
+App::$strings["Date Unthreaded"] = "По пор�дку";
+App::$strings["Order unthreaded by date"] = "Сортировка в пор�дке по�туплени�";
+App::$strings["Stream Order"] = "Упор�дочить поток";
+App::$strings["Remove term"] = "Удалить выражение";
+App::$strings["Saved Searches"] = "Сохранённые пои�ки";
+App::$strings["Public and restricted messages"] = "Общедо�тупные и приватные �ообщени�";
+App::$strings["Direct messages"] = "Сообщени�";
+App::$strings["Starred messages"] = "Помеченные �ообщени�";
+App::$strings["Private Mail Menu"] = "Меню личной перепи�ки";
+App::$strings["Combined View"] = "Комбинированный вид";
+App::$strings["Inbox"] = "Вход�щие";
+App::$strings["Outbox"] = "И�ход�щие";
+App::$strings["Rating Tools"] = "Ин�трументы оценки";
+App::$strings["Rate Me"] = "Оценить мен�";
+App::$strings["View Ratings"] = "Про�мотр оценок";
+App::$strings["Tags"] = "Теги";
+App::$strings["__ctx:widget__ Activity"] = "�ктивно�ть";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "У ва� е�ть %1$.0f из %2$.0f разрешенных контактов.";
+App::$strings["Add New Connection"] = "Добавить новый контакт";
+App::$strings["Enter channel address"] = "Введите адре� канала";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Пример: ivan@example.com, http://example.com/ivan";
+App::$strings["Add new page"] = "Добавить новую �траницу";
+App::$strings["Wiki Pages"] = "Wiki �траницы";
+App::$strings["Page name"] = "�азвание �траницы";
+App::$strings["Click to show more"] = "�ажмите чтобы показать больше";
+App::$strings["Tasks"] = "Задачи";
+App::$strings["View %s's profile - %s"] = "Про�мотр профил� %s - %s";
+App::$strings["Don't show"] = "�е показывать";
+App::$strings["Account settings"] = "�а�тройки аккаунта";
+App::$strings["Channel settings"] = "�а�тройки канала";
+App::$strings["Display settings"] = "�а�тройки отображени�";
+App::$strings["Manage locations"] = "Управление ме�тоположением";
+App::$strings["l F d, Y \\@ g:i A"] = "";
+App::$strings["Starts:"] = "�ачало:";
+App::$strings["Finishes:"] = "Окончание:";
+App::$strings["l F d, Y"] = "";
+App::$strings["Start:"] = "�ачало:";
+App::$strings["End:"] = "Окончание:";
+App::$strings["Timezone"] = "Ча�овой по��";
+App::$strings["This event has been added to your calendar."] = "Это �обытие было добавлено в ваш календарь.";
+App::$strings["Not specified"] = "�е указано";
+App::$strings["Needs Action"] = "Требует дей�тви�";
+App::$strings["Completed"] = "Завершено";
+App::$strings["In Process"] = "В проце��е";
+App::$strings["Cancelled"] = "Отменено";
+App::$strings["Home, Voice"] = "Дом, голо�";
+App::$strings["Home, Fax"] = "Дом, фак�";
+App::$strings["Work, Voice"] = "Работа, голо�";
+App::$strings["Work, Fax"] = "Работа, фак�";
+App::$strings["Unable to obtain identity information from database"] = "�евозможно получить идентификационную информацию из базы данных";
+App::$strings["Empty name"] = "Пу�тое им�";
+App::$strings["Name too long"] = "Слишком длинное им�";
+App::$strings["No account identifier"] = "Идентификатор аккаунта от�ут�твует";
+App::$strings["Unable to retrieve created identity"] = "�е удает�� получить �озданный идентификатор";
+App::$strings["Default Profile"] = "Профиль по умолчанию";
+App::$strings["Unable to retrieve modified identity"] = "�е удает�� найти изменённый идентификатор";
+App::$strings["Requested channel is not available"] = "Запрошенный канал недо�тупен";
+App::$strings["Create New Profile"] = "Создать новый профиль";
+App::$strings["Edit Profile"] = "Редактировать профиль";
+App::$strings["Visible to everybody"] = "Видно в�ем";
+App::$strings["Gender:"] = "Пол:";
+App::$strings["Status:"] = "Стату�:";
+App::$strings["Homepage:"] = "Домашн�� �траница:";
+App::$strings["Online Now"] = "Сейча� в �ети";
+App::$strings["Change your profile photo"] = "Изменить фотографию вашего профил�";
+App::$strings["Female"] = "Женщина";
+App::$strings["Male"] = "Мужчина";
+App::$strings["Trans"] = "Тран�ек�уал";
+App::$strings["Neuter"] = "Среднего рода";
+App::$strings["Non-specific"] = "�е�пецифиче�кий";
+App::$strings["Like this channel"] = "нравит�� �тот канал";
+App::$strings["j F, Y"] = "";
+App::$strings["j F"] = "";
+App::$strings["Birthday:"] = "День рождени�:";
+App::$strings["for %1\$d %2\$s"] = "дл� %1\$d %2\$s";
+App::$strings["Tags:"] = "Теги:";
+App::$strings["Sexual Preference:"] = "Сек�уальные предпочтени�:";
+App::$strings["Political Views:"] = "Политиче�кие взгл�ды:";
+App::$strings["Religion:"] = "Религи�:";
+App::$strings["Hobbies/Interests:"] = "Хобби / интере�ы:";
+App::$strings["Likes:"] = "Что вам нравит��:";
+App::$strings["Dislikes:"] = "Что вам не нравит��:";
+App::$strings["Contact information and Social Networks:"] = "Контактна� информаци� и �оциальные �ети:";
+App::$strings["My other channels:"] = "Мои другие каналы:";
+App::$strings["Musical interests:"] = "Музыкальные интере�ы:";
+App::$strings["Books, literature:"] = "Книги, литература:";
+App::$strings["Television:"] = "Телевидение:";
+App::$strings["Film/dance/culture/entertainment:"] = "Кино / танцы / культура / развлечени�:";
+App::$strings["Love/Romance:"] = "Любовь / романтика:";
+App::$strings["Work/employment:"] = "Работа / зан�то�ть:";
+App::$strings["School/education:"] = "Школа / образование:";
+App::$strings["Like this thing"] = "нравит�� �тo";
+App::$strings["Export"] = "Эк�порт";
+App::$strings[" and "] = " и ";
+App::$strings["public profile"] = "общедо�тупный профиль";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s изменил %2\$s на &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "По�етить %1\$s %2\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s обновлено %2\$s, изменено %3\$s.";
+App::$strings["Birthday"] = "День рождени�";
+App::$strings["Age: "] = "Возра�т:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD или MM-DD";
+App::$strings["less than a second ago"] = "менее чем одну �екунду";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s назад";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "год",
+	1 => "года",
+	2 => "лет",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "ме��ц",
+	1 => "ме��ца",
+	2 => "ме��цев",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "неделю",
+	1 => "недели",
+	2 => "недель",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "день",
+	1 => "дн�",
+	2 => "дней",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "ча�",
+	1 => "ча�а",
+	2 => "ча�ов",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "минуту",
+	1 => "минуты",
+	2 => "минут",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "�екунду",
+	1 => "�екунды",
+	2 => "�екунд",
+);
+App::$strings["%1\$s's birthday"] = "День рождени� %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "С Днем рождени� %1\$s !";
+App::$strings["default"] = "по умолчанию";
+App::$strings["Select an alternate language"] = "Выбор дополнительного �зыка";
+App::$strings["Trending"] = "В тренде";
+App::$strings["Keywords"] = "Ключевые �лова";
+App::$strings["have"] = "иметь";
+App::$strings["has"] = "е�ть";
+App::$strings["want"] = "хотеть";
+App::$strings["wants"] = "хотеть";
+App::$strings["likes"] = "нравит��";
+App::$strings["dislikes"] = "не нравит��";
+App::$strings["Help:"] = "Помощь:";
+App::$strings["Not Found"] = "�е найдено";
+App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s привет�твует %2\$s";
+App::$strings["View PDF"] = "Про�мотреть PDF";
+App::$strings[" by "] = " из ";
+App::$strings[" on "] = " на ";
+App::$strings["Embedded content"] = "В�троенное �одержимое";
+App::$strings["Embedding disabled"] = "В�траивание отключено";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Файл превышает предельный размер дл� �айта в %lu байт";
+App::$strings["Image file is empty."] = "Файл изображени� пу�т.";
+App::$strings["Photo storage failed."] = "Ошибка хранилища фотографий.";
+App::$strings["a new photo"] = "нова� фотографи�";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s опубликовал %2\$s в %3\$s";
+App::$strings["Photo Albums"] = "Фотоальбомы";
+App::$strings["Upload New Photos"] = "Загрузить новые фотографии";
+App::$strings["This is the home page of %s."] = "Это домашн�� �траница %s.";
+App::$strings["New window"] = "�овое окно";
+App::$strings["Open the selected location in a different window or browser tab"] = "Открыть выбранное ме�тоположение в другом окне или вкладке браузера";
+App::$strings["Delegation session ended."] = "Делегированна� �е��и� завершена.";
+App::$strings["Logged out."] = "Вышел из �и�темы.";
+App::$strings["Email validation is incomplete. Please check your email."] = "Проверка email не завершена. Пожалуй�та, проверьте вашу почту.";
+App::$strings["Failed authentication"] = "Ошибка аутентификации";
+App::$strings["Login failed."] = "�е удало�ь войти.";
+App::$strings["Remote authentication"] = "Удаленна� аутентификаци�";
+App::$strings["Click to authenticate to your home hub"] = "�ажмите, чтобы аутентифицировать �еб� на домашнем узле";
+App::$strings["Manage your channels"] = "Управление вашими каналами";
+App::$strings["Manage your privacy groups"] = "Управление вашим группами конфиденциально�ти";
+App::$strings["Account/Channel Settings"] = "�а�тройки аккаунта / канала";
+App::$strings["End this session"] = "Закончить �ту �е��ию";
+App::$strings["Your profile page"] = "Страницa вашего профил�";
+App::$strings["Manage/Edit profiles"] = "Управление / редактирование профилей";
+App::$strings["Sign in"] = "Войти";
+App::$strings["Take me home"] = "Домой";
+App::$strings["Log me out of this site"] = "Выйти � �того �айта";
+App::$strings["Create an account"] = "Создать аккаунт";
+App::$strings["Help and documentation"] = "Справочна� информаци� и документаци�";
+App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "И�кать на �айте @им�, !форум, #тег, ?документ, �одержимое";
+App::$strings["Site Setup and Configuration"] = "У�тановка и конфигураци� �айта";
+App::$strings["@name, !forum, #tag, ?doc, content"] = "@им�, !форум, #тег, ?документ, �одержимое";
+App::$strings["Please wait..."] = "Подождите пожалуй�та ...";
+App::$strings["Add Apps"] = "Добавить приложени�";
+App::$strings["Arrange Apps"] = "Упор�дочить приложени�";
+App::$strings["Toggle System Apps"] = "Показать �и�темные приложени�";
+App::$strings["Status Messages and Posts"] = "Стату�ы и публикации";
+App::$strings["Profile Details"] = "Информаци� о профиле";
+App::$strings["Files and Storage"] = "Файлы и хранилище";
+App::$strings["Saved Bookmarks"] = "Сохранённые закладки";
+App::$strings["View Cards"] = "Про�мотреть карточки";
+App::$strings["View Articles"] = "Про�мотр �татей";
+App::$strings["View Webpages"] = "Про�мотр веб-�траниц";
+App::$strings["unknown"] = "неизве�тный";
+App::$strings["%1\$s's bookmarks"] = "Закладки пользовател� %1\$s";
+App::$strings["INVALID EVENT DISMISSED!"] = "�ЕДЕЙСТВИТЕЛЬ�ОЕ СОБЫТИЕ ОТКЛО�Е�О!";
+App::$strings["Summary: "] = "Резюме: ";
+App::$strings["Date: "] = "Дата: ";
+App::$strings["Reason: "] = "Причина: ";
+App::$strings["INVALID CARD DISMISSED!"] = "�ЕДЕЙСТВИТЕЛЬ��Я К�РТОЧК� ОТКЛО�Е��!";
+App::$strings["Name: "] = "Им�: ";
+App::$strings["likes %1\$s's %2\$s"] = "�равит�� %1\$s %2\$s";
+App::$strings["doesn't like %1\$s's %2\$s"] = "�е нравит�� %1\$s %2\$s";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s теперь в контакте � %2\$s";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s ткнул %2\$s";
+App::$strings["poked"] = "ткнут";
+App::$strings["View %s's profile @ %s"] = "Про�мотреть профиль %s @ %s";
+App::$strings["Categories:"] = "Категории:";
+App::$strings["Filed under:"] = "Хранить под:";
+App::$strings["View in context"] = "Показать в контек�те";
+App::$strings["remove"] = "удалить";
+App::$strings["Loading..."] = "Загрузка...";
+App::$strings["Delete Selected Items"] = "Удалить выбранные �лементы";
+App::$strings["View Source"] = "Про�мотреть и�точник";
+App::$strings["Follow Thread"] = "Следить за темой";
+App::$strings["Unfollow Thread"] = "Прекратить от�леживать тему";
+App::$strings["Edit Connection"] = "Редактировать контакт";
+App::$strings["%s likes this."] = "%s нравит�� �то.";
+App::$strings["%s doesn't like this."] = "%s не нравит�� �то.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d человеку</span> �то нравит��.",
+	1 => "<span  %1\$s>%2\$d человекам</span> �то нравит��.",
+	2 => "<span  %1\$s>%2\$d человекам</span> �то нравит��.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d человеку</span> �то не нравит��.",
+	1 => "<span  %1\$s>%2\$d человекам</span> �то не нравит��.",
+	2 => "<span  %1\$s>%2\$d человекам</span> �то не нравит��.",
+);
+App::$strings["and"] = "и";
+App::$strings[", and %d other people"] = array(
+	0 => ", и ещё %d человеку",
+	1 => ", и ещё %d человекам",
+	2 => ", и ещё %d человекам",
+);
+App::$strings["%s like this."] = "%s нравит�� �то.";
+App::$strings["%s don't like this."] = "%s не нравит�� �то.";
+App::$strings["Set your location"] = "Задать �воё ме�тоположение";
+App::$strings["Clear browser location"] = "Очи�тить ме�тоположение из браузера";
+App::$strings["Embed (existing) photo from your photo albums"] = "В�троить (�уще�твующее) фото из вашего фотоальбома";
+App::$strings["Tag term:"] = "Теги:";
+App::$strings["Where are you right now?"] = "Где вы �ейча�?";
+App::$strings["Choose a different album..."] = "Выбрать другой альбом...";
+App::$strings["Comments enabled"] = "Комментарии включены";
+App::$strings["Comments disabled"] = "Комментарии отключены";
+App::$strings["Page link name"] = "�азвание ��ылки на �траницу ";
+App::$strings["Post as"] = "Опубликовать как";
+App::$strings["Toggle voting"] = "Переключить голо�ование";
+App::$strings["Toggle poll"] = "Переключить опро�";
+App::$strings["Option"] = "Вариант";
+App::$strings["Add option"] = "Добавить вариант";
+App::$strings["Minutes"] = "Минут";
+App::$strings["Hours"] = "Ча�ов";
+App::$strings["Days"] = "Дней";
+App::$strings["Allow multiple answers"] = "Разрешить не�колько ответов";
+App::$strings["Disable comments"] = "Отключить комментарии";
+App::$strings["Toggle comments"] = "Переключить комментарии";
+App::$strings["Summary (optional)"] = "Резюме (необ�зательно)";
+App::$strings["Categories (optional, comma-separated list)"] = "Категории (необ�зательно, �пи�ок через зап�тую)";
+App::$strings["Permission settings"] = "�а�тройки разрешений";
+App::$strings["Other networks and post services"] = "Другие �ети и �лужбы публикаций";
+App::$strings["Set expiration date"] = "У�тановить �рок дей�тви�";
+App::$strings["Set publish date"] = "У�тановить дату публикации";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "По�етит",
+	1 => "По�ет�т",
+	2 => "По�ет�т",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "�е по�етит",
+	1 => "�е по�ет�т",
+	2 => "�е по�ет�т",
+);
+App::$strings["__ctx:noun__ Undecided"] = "�е решил";
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "Согла�ен",
+	1 => "Согла�ны",
+	2 => "Согла�ны",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "�е �огла�ен",
+	1 => "�е �огла�ны",
+	2 => "�е �огла�ны",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Воздержал��",
+	1 => "Воздержали�ь",
+	2 => "Воздержали�ь",
+);
+App::$strings["Delete this item?"] = "Удалить �тот �лемент?";
+App::$strings["%s show less"] = "%s показать меньше";
+App::$strings["%s expand"] = "%s развернуть";
+App::$strings["%s collapse"] = "%s �вернуть";
+App::$strings["Password too short"] = "Пароль �лишком короткий";
+App::$strings["everybody"] = "в�е";
+App::$strings["Secret Passphrase"] = "Тайный пароль";
+App::$strings["Passphrase hint"] = "Под�казка дл� парол�";
+App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Уведомление: Права до�тупа изменили�ь, но до �их пор не �охранены.";
+App::$strings["close all"] = "закрыть в�е";
+App::$strings["Nothing new here"] = "Зде�ь нет ничего нового";
+App::$strings["Rate This Channel (this is public)"] = "Оценкa �тoго канала (общедо�тупно)";
+App::$strings["Describe (optional)"] = "Охарактеризовать (необ�зательно)";
+App::$strings["Please enter a link URL"] = "Пожалуй�та, введите URL ��ылки";
+App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Е�ть не�охраненные изменени�. Вы уверены, что хотите покинуть �ту �траницу?";
+App::$strings["lovely"] = "прекра�но";
+App::$strings["wonderful"] = "замечательно";
+App::$strings["fantastic"] = "фанта�тично";
+App::$strings["great"] = "отлично";
+App::$strings["Your chosen nickname was either already taken or not valid. Please use our suggestion ("] = "Выбранный вами п�евдоним уже и�пользует�� или недей�твителен. Попробуйте и�пользовать наше предложение (";
+App::$strings[") or enter a new one."] = ") или введите новый.";
+App::$strings["Thank you, this nickname is valid."] = "Спа�ибо, �тот п�евдоним может быть и�пользован.";
+App::$strings["A channel name is required."] = "Требует�� название канала.";
+App::$strings["This is a "] = "Это ";
+App::$strings[" channel name"] = " название канала";
+App::$strings["Back to reply"] = "Вернуть�� к ответу";
+App::$strings["Pinned"] = "Прикреплено";
+App::$strings["%d minutes"] = array(
+	0 => "%d минуту",
+	1 => "%d минуты",
+	2 => "%d минут",
+);
+App::$strings["about %d hours"] = array(
+	0 => "около %d ча�a",
+	1 => "около %d ча�ов",
+	2 => "около %d ча�ов",
+);
+App::$strings["%d days"] = array(
+	0 => "%d день",
+	1 => "%d дн�",
+	2 => "%d дней",
+);
+App::$strings["%d months"] = array(
+	0 => "%d ме��ц",
+	1 => "%d ме��ца",
+	2 => "%d ме��цев",
+);
+App::$strings["%d years"] = array(
+	0 => "%d год",
+	1 => "%d года",
+	2 => "%d лет",
+);
+App::$strings["timeago.prefixAgo"] = "";
+App::$strings["timeago.prefixFromNow"] = "через";
+App::$strings["timeago.suffixAgo"] = "назад";
+App::$strings["timeago.suffixFromNow"] = "NONE";
+App::$strings["less than a minute"] = "менее чем одну минуту";
+App::$strings["about a minute"] = "около минуты";
+App::$strings["about an hour"] = "около ча�а";
+App::$strings["a day"] = "день";
+App::$strings["about a month"] = "около ме��ца";
+App::$strings["about a year"] = "около года";
+App::$strings[" "] = " ";
+App::$strings["timeago.numbers"] = "";
+App::$strings["January"] = "Январь";
+App::$strings["February"] = "Февраль";
+App::$strings["March"] = "Март";
+App::$strings["April"] = "�прель";
+App::$strings["__ctx:long__ May"] = "Май";
+App::$strings["June"] = "Июнь";
+App::$strings["July"] = "Июль";
+App::$strings["August"] = "�вгу�т";
+App::$strings["September"] = "Сент�брь";
+App::$strings["October"] = "Окт�брь";
+App::$strings["November"] = "�о�брь";
+App::$strings["December"] = "Декабрь";
+App::$strings["Jan"] = "Янв";
+App::$strings["Feb"] = "Фев";
+App::$strings["Mar"] = "Мар";
+App::$strings["Apr"] = "�пр";
+App::$strings["__ctx:short__ May"] = "Май";
+App::$strings["Jun"] = "Июн";
+App::$strings["Jul"] = "Июл";
+App::$strings["Aug"] = "�вг";
+App::$strings["Sep"] = "Сен";
+App::$strings["Oct"] = "Окт";
+App::$strings["Nov"] = "�о�";
+App::$strings["Dec"] = "Дек";
+App::$strings["Sunday"] = "Во�кре�енье";
+App::$strings["Monday"] = "Понедельник";
+App::$strings["Tuesday"] = "Вторник";
+App::$strings["Wednesday"] = "Среда";
+App::$strings["Thursday"] = "Четверг";
+App::$strings["Friday"] = "П�тница";
+App::$strings["Saturday"] = "Суббота";
+App::$strings["Sun"] = "В�к";
+App::$strings["Mon"] = "Пон";
+App::$strings["Tue"] = "Ð’Ñ‚";
+App::$strings["Wed"] = "Ср";
+App::$strings["Thu"] = "Чет";
+App::$strings["Fri"] = "П�т";
+App::$strings["Sat"] = "Суб";
+App::$strings["__ctx:calendar__ today"] = "�егодн�";
+App::$strings["__ctx:calendar__ month"] = "ме��ц";
+App::$strings["__ctx:calendar__ week"] = "недел�";
+App::$strings["__ctx:calendar__ day"] = "день";
+App::$strings["__ctx:calendar__ All day"] = "Ве�ь день";
+App::$strings["Please stand by while your download is being prepared."] = "Пожалуй�та, подождите, пока готовит�� загрузка.";
+App::$strings["Email address not valid"] = "�дре� �лектронной почты недей�твителен";
+App::$strings["Start calendar week on Monday"] = "�ачинать календарную неделю � понедельника";
+App::$strings["Default is Sunday"] = "По умолчанию - во�кре�енье";
+App::$strings["Event Timezone Selection"] = "Выбор ча�ового по��а �обыти�";
+App::$strings["Allow event creation in timezones other than your own."] = "Разрешить �оздание �обыти� в ча�овой зоне отличной от вашей";
+App::$strings["Search by Date"] = "Пои�к по дате";
+App::$strings["Ability to select posts by date ranges"] = "Возможно�ть выбора �ообщений по диапазонам дат";
+App::$strings["Tag Cloud"] = "Облако тегов";
+App::$strings["Provide a personal tag cloud on your channel page"] = "Показывает личное облако тегов на �транице канала";
+App::$strings["Use blog/list mode"] = "И�пользовать режим блога / �пи�ка";
+App::$strings["Comments will be displayed separately"] = "Комментарии будут отображать�� отдельно";
+App::$strings["Connection Filtering"] = "Фильтраци� контактов";
+App::$strings["Filter incoming posts from connections based on keywords/content"] = "Фильтр вход�щих �ообщений от контактов на о�нове ключевых �лов / контента";
+App::$strings["Conversation"] = "Диалоги";
+App::$strings["Emoji Reactions"] = "Реакции Emoji";
+App::$strings["Add emoji reaction ability to posts"] = "Возможно�ть добавл�ть реакции Emoji к публикаци�м";
+App::$strings["Dislike Posts"] = "�е нрав�щие�� публикации";
+App::$strings["Ability to dislike posts/comments"] = "Возможно�ть отмечать не нрав�щие�� публикации / комментарии";
+App::$strings["Star Posts"] = "Помечать �ообщени�";
+App::$strings["Ability to mark special posts with a star indicator"] = "Возможно�ть отметить �пециальные �ообщени� индикатором-звёздочкой";
+App::$strings["Reply on comment"] = "Ответить на комментарий";
+App::$strings["Ability to reply on selected comment"] = "Возможно�ть ответить на выбранный комментарий";
+App::$strings["Advanced Directory Search"] = "Ра�ширенный пои�к в каталоге";
+App::$strings["Allows creation of complex directory search queries"] = "Позвол�ет �оздание �ложных пои�ковых запро�ов в каталоге";
+App::$strings["Editor"] = "Редактор";
+App::$strings["Post Categories"] = "Категории публикаций";
+App::$strings["Add categories to your posts"] = "Добавить категории дл� ваших публикаций";
+App::$strings["Large Photos"] = "Большие фотографии";
+App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Включить большие (1024px) миниатюры изображений в публикаци�х. Е�ли не включено, и�пользовать маленькие (640px) миниатюры.";
+App::$strings["Even More Encryption"] = "Еще больше шифровани�";
+App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Разрешить дополнительное end-to-end шифрование �одержимого � общим �екретным ключом";
+App::$strings["Disable Comments"] = "Отключить комментарии";
+App::$strings["Provide the option to disable comments for a post"] = "Предо�тавить возможно�ть отключать комментарии дл� публикаций";
+App::$strings["Delayed Posting"] = "Задержанна� публикаци�";
+App::$strings["Allow posts to be published at a later date"] = "Разрешить размешать публикации �ледующими датами";
+App::$strings["Content Expiration"] = "И�течение �рока дей�тви� �одержимого";
+App::$strings["Remove posts/comments and/or private messages at a future time"] = "Удал�ть публикации / комментарии и / или личные �ообщени�";
+App::$strings["Suppress Duplicate Posts/Comments"] = "Подавл�ть дублирующие публикации / комментарии";
+App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Предотвращает по�вление публикаций � одинаковым �одержимым е�ли интервал между ними менее 2 минут";
+App::$strings["Auto-save drafts of posts and comments"] = "�втоматиче�ки �охран�ть черновики публикаций и комментариев";
+App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "�втоматиче�ки �охран�ет черновики публикаций и комментариев в локальном хранилище браузера дл� предотвращени� их �лучайной утраты";
+App::$strings["Manage"] = "Управление";
+App::$strings["Navigation Channel Select"] = "Выбор канала навигации";
+App::$strings["Change channels directly from within the navigation dropdown menu"] = "Изменить канал напр�мую из выпадающего меню";
+App::$strings["Events Filter"] = "Фильтр �обытий";
+App::$strings["Ability to display only events"] = "Возможно�ть отображать только �обыти�";
+App::$strings["Polls Filter"] = "Фильтр голо�ований";
+App::$strings["Ability to display only polls"] = "Возможно�ть отображать только опро�ы";
+App::$strings["Save search terms for re-use"] = "Сохран�ть результаты пои�ка дл� повторного и�пользовани�";
+App::$strings["Ability to file posts under folders"] = "Возможно�ть размещать публикации в каталогах";
+App::$strings["Alternate Stream Order"] = "Отображение потока";
+App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Возможно�ть показывать поток по дате по�леднего �ообщени�, по�леднего комментари� или в пор�дке по�туплени�";
+App::$strings["Contact Filter"] = "Фильтр контактов";
+App::$strings["Ability to display only posts of a selected contact"] = "Возможно�ть показа публикаций только от выбранных контактов";
+App::$strings["Forum Filter"] = "Фильтр по форумам";
+App::$strings["Ability to display only posts of a specific forum"] = "Возможно�ть показа публикаций только определённого форума";
+App::$strings["Personal Posts Filter"] = "Пер�ональный фильтр публикаций";
+App::$strings["Ability to display only posts that you've interacted on"] = "Возможно�ть показа только тех публикаций � которыми вы взаимодей�твовали";
+App::$strings["Photo Location"] = "Ме�тоположение фотографии";
+App::$strings["If location data is available on uploaded photos, link this to a map."] = "Е�ли данные о ме�тоположении до�тупны на загруженных фотографий, �в�зать их � картой.";
+App::$strings["Advanced Profiles"] = "Ра�ширенные профили";
+App::$strings["Additional profile sections and selections"] = "Дополнительные �екции и выборы профил�";
+App::$strings["Profile Import/Export"] = "Импорт / �к�порт профил�";
+App::$strings["Save and load profile details across sites/channels"] = "Сохранение и загрузка на�троек профил� на в�ех �айтах / каналах";
+App::$strings["Multiple Profiles"] = "�е�колько профилей";
+App::$strings["Ability to create multiple profiles"] = "Возможно�ть �оздани� не�кольких профилей";
+App::$strings["Profile to assign new connections"] = "�азначить профиль дл� новых контактов";
+App::$strings["Frequently"] = "Ча�то";
+App::$strings["Hourly"] = "Ежеча�но";
+App::$strings["Twice daily"] = "Дважды в день";
+App::$strings["Daily"] = "Ежедневно";
+App::$strings["Weekly"] = "Еженедельно";
+App::$strings["Monthly"] = "Ежеме��чно";
+App::$strings["Currently Male"] = "В на�то�щее врем� муж�кой";
+App::$strings["Currently Female"] = "В на�то�щее врем� жен�кий";
+App::$strings["Mostly Male"] = "В о�новном муж�кой";
+App::$strings["Mostly Female"] = "В о�новном жен�кий";
+App::$strings["Transgender"] = "Тран�гендер";
+App::$strings["Intersex"] = "Интер�ек�уал";
+App::$strings["Transsexual"] = "Тран��ек�уал";
+App::$strings["Hermaphrodite"] = "Гермафродит";
+App::$strings["Undecided"] = "�е решил";
+App::$strings["Males"] = "Мужчины";
+App::$strings["Females"] = "Женщины";
+App::$strings["Gay"] = "Гей";
+App::$strings["Lesbian"] = "Ле�би�нка";
+App::$strings["No Preference"] = "Без предпочтений";
+App::$strings["Bisexual"] = "Би�ек�уал";
+App::$strings["Autosexual"] = "�вто�ек�уал";
+App::$strings["Abstinent"] = "Воздержание";
+App::$strings["Virgin"] = "Дев�твенник";
+App::$strings["Deviant"] = "Отклон�ющий�� от нормы";
+App::$strings["Fetish"] = "Фетиши�т";
+App::$strings["Oodles"] = "Множе�твенный";
+App::$strings["Nonsexual"] = "��ек�уал";
+App::$strings["Single"] = "Одиночка";
+App::$strings["Lonely"] = "Одинокий";
+App::$strings["Available"] = "Свободен";
+App::$strings["Unavailable"] = "Зан�т";
+App::$strings["Has crush"] = "Влюблён";
+App::$strings["Infatuated"] = "без ума";
+App::$strings["Dating"] = "В�тречаю�ь";
+App::$strings["Unfaithful"] = "�еверный";
+App::$strings["Sex Addict"] = "Эротоман";
+App::$strings["Friends/Benefits"] = "Друзь� / Выгоды";
+App::$strings["Casual"] = "Легкомы�ленный";
+App::$strings["Engaged"] = "Помолвлен";
+App::$strings["Married"] = "В браке";
+App::$strings["Imaginarily married"] = "В воображаемом браке";
+App::$strings["Partners"] = "Партнёр�тво";
+App::$strings["Cohabiting"] = "Сожитель�твующие";
+App::$strings["Common law"] = "Граждан�кий брак";
+App::$strings["Happy"] = "Сча�тлив";
+App::$strings["Not looking"] = "�е нуждаю�ь";
+App::$strings["Swinger"] = "Свингер";
+App::$strings["Betrayed"] = "Предан";
+App::$strings["Separated"] = "Разделён";
+App::$strings["Unstable"] = "�е�табильно";
+App::$strings["Divorced"] = "В разводе";
+App::$strings["Imaginarily divorced"] = "В воображаемом разводе";
+App::$strings["Widowed"] = "Вдовец / вдова";
+App::$strings["Uncertain"] = "�еопределенный";
+App::$strings["It's complicated"] = "Это �ложно";
+App::$strings["Don't care"] = "В�ё равно";
+App::$strings["Ask me"] = "Спро�и мен�";
+App::$strings["(Unknown)"] = "(�еизве�тный)";
+App::$strings["Visible to anybody on the internet."] = "Виден в�ем в интернете.";
+App::$strings["Visible to you only."] = "Видно только вам.";
+App::$strings["Visible to anybody in this network."] = "Видно в�ем в �той �ети.";
+App::$strings["Visible to anybody authenticated."] = "Видно в�ем аутентифицированным.";
+App::$strings["Visible to anybody on %s."] = "Видно в�ем в %s.";
+App::$strings["Visible to all connections."] = "Видно в�ем контактам.";
+App::$strings["Visible to approved connections."] = "Видно только одобренным контактам.";
+App::$strings["Visible to specific connections."] = "Видно указанным контактам.";
+App::$strings["Privacy group is empty."] = "Группа конфиденциально�ти пу�та";
+App::$strings["Privacy group: %s"] = "Группа конфиденциально�ти: %s";
+App::$strings["Connection not found."] = "Контакт не найден.";
+App::$strings["profile photo"] = "Фотографи� профил�";
+App::$strings["[Edited %s]"] = "[Отредактировано %s]";
+App::$strings["__ctx:edit_activity__ Post"] = "Публикаци�";
+App::$strings["__ctx:edit_activity__ Comment"] = "Комментарий";
+App::$strings["Item was not found."] = "Элемент не найден.";
+App::$strings["Unknown error."] = "�еизве�тна� ошибка.";
+App::$strings["No source file."] = "�ет и�ходного файла.";
+App::$strings["Cannot locate file to replace"] = "�е удает�� найти файл дл� замены";
+App::$strings["Cannot locate file to revise/update"] = "�е удает�� найти файл дл� пере�мотра / обновлени�";
+App::$strings["File exceeds size limit of %d"] = "Файл превышает предельный размер %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Вы до�тигли предела %1$.0f Мбайт дл� хранени� вложений.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Загрузка файла не удала�ь. Возможно �и�тема перегружена или попытка прекращена.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Файл дл� �охранени� не может быть проверен. Загрузка не удала�ь.";
+App::$strings["Path not available."] = "Путь недо�тупен.";
+App::$strings["Empty pathname"] = "Пу�тое им� пути";
+App::$strings["duplicate filename or path"] = "дублирующее�� им� файла или пути";
+App::$strings["Path not found."] = "Путь не найден.";
+App::$strings["mkdir failed."] = "mkdir не удал��";
+App::$strings["database storage failed."] = "ошибка при запи�и базы данных.";
+App::$strings["Empty path"] = "Пу�тое им� пути";
+App::$strings["%s shared a %s with you"] = "%s поделил�� � вами %s";
+App::$strings["file"] = "файл";
+App::$strings["Friendica"] = "";
+App::$strings["OStatus"] = "";
+App::$strings["GNU-Social"] = "";
+App::$strings["RSS/Atom"] = "";
+App::$strings["Diaspora"] = "";
+App::$strings["Facebook"] = "";
+App::$strings["Zot"] = "";
+App::$strings["LinkedIn"] = "";
+App::$strings["XMPP/IM"] = "";
+App::$strings["MySpace"] = "";
+App::$strings["Image/photo"] = "Изображение / фотографи�";
+App::$strings["Encrypted content"] = "Зашифрованное �одержание";
+App::$strings["Install %1\$s element %2\$s"] = "У�тановить %1\$s �лемент %2\$s";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Эта публикаци� �одержит у�танавливаемый %s �лемент, однако у ва� нет разрешений дл� его у�тановки на �том �айте.";
+App::$strings["card"] = "карточка";
+App::$strings["article"] = "�тать�";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s была �оздана %2\$s %3\$s";
+App::$strings["Click to open/close"] = "�ажмите, чтобы открыть/закрыть";
+App::$strings["spoiler"] = "�пойлер";
+App::$strings["View article"] = "Про�мотр �татьи";
+App::$strings["View summary"] = "Про�мотр резюме";
+App::$strings["$1 wrote:"] = "$1 пи�ал:";
+App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "�еверный токен безопа�но�ти дл� формы. Веро�тно, �то произошло потому, что форма была открыта �лишком долго (> 3-х ча�ов) перед её отправкой.";
+App::$strings["The provided email address is not valid"] = "Предо�тавленный адре� �лектронной почты недей�твителен";
+App::$strings["The provided email domain is not among those allowed on this site"] = "Домен �лектронной почты не входит в чи�ло разрешенных на �том �айте";
+App::$strings["The provided email address is already registered at this site"] = "Предо�тавленный адре� �лектронной почты уже зареги�трирован на �том �айте";
+App::$strings["There is a pending registration for this address - click \"Register\" to continue verification"] = "Дл� �того адре�а ожидает�� реги�траци� - нажмите \"Зареги�трировать��\", чтобы продолжить проверку";
+App::$strings["An invitation is required."] = "Требует�� приглашение.";
+App::$strings["Invitation could not be verified."] = "�е удало�ь проверить приглашение.";
+App::$strings["Please enter the required information."] = "Пожалуй�та, введите необходимую информацию.";
+App::$strings["Failed to store account information."] = "�е удало�ь �охранить информацию аккаунта.";
+App::$strings["Registration request at %s"] = "Запро� реги�трации на %s";
+App::$strings["your registration password"] = "ваш пароль реги�трации";
+App::$strings["Registration details for %s"] = "Реги�трационные данные дл� %s";
+App::$strings["Account approved."] = "�ккаунт утвержден.";
+App::$strings["Registration revoked for %s"] = "Реги�траци� отозвана дл� %s";
+App::$strings["Could not revoke registration for %s"] = "�е удало�ь отозвать реги�трацию дл� %s";
+App::$strings["Click here to upgrade."] = "�ажмите зде�ь дл� обновлени�.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Это дей�твие превышает ограничени�, у�тановленные в вашем плане.";
+App::$strings["This action is not available under your subscription plan."] = "Это дей�твие невозможно из-за ограничений в вашем плане.";
+App::$strings["open"] = "открыта";
+App::$strings["closed"] = "закрыта";
+App::$strings["Registration is currently"] = "В на�то�щее врем� реги�траци�";
+App::$strings["please come back"] = "пожалуй�та, возвращайте�ь позднее";
+App::$strings["Profile-Based Privacy Groups"] = "Группы конфиденциально�ти о�нованные на профиле";
+App::$strings["Private Forum"] = "Ча�тный форум";
+App::$strings["Share with"] = "Поделить�� �";
+App::$strings["Custom selection"] = "�а�траиваемый выбор";
+App::$strings["Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and limit the scope of \"Allow\"."] = "Выберите \"Разрешить\" дл� разрешени� про�мотра. \"�е разрешать\" позвол�ет вам переопределить и ограничить разрешени�.";
+App::$strings["Don't allow"] = "�е разрешать";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Разрешени� публикации %s не могут быть изменены %s по�ле того, как ею поделили�ь. Эти разрешени� у�танавливают кому разрешено про�матривать �ту публикацию.";
+App::$strings["prev"] = "предыдущий";
+App::$strings["first"] = "первый";
+App::$strings["last"] = "по�ледний";
+App::$strings["next"] = "�ледующий";
+App::$strings["older"] = "�тарше";
+App::$strings["newer"] = "новее";
+App::$strings["No connections"] = "�ет контактов";
+App::$strings["View all %s connections"] = "Про�мотреть в�е %s контактов";
+App::$strings["Network: %s"] = "Сеть: %s";
+App::$strings["poke"] = "Ткнуть";
+App::$strings["ping"] = "Пингануть";
+App::$strings["pinged"] = "Отпингован";
+App::$strings["prod"] = "Подтолкнуть";
+App::$strings["prodded"] = "Подтолкнут";
+App::$strings["slap"] = "Шлёпнуть";
+App::$strings["slapped"] = "Шлёпнут";
+App::$strings["finger"] = "Указать";
+App::$strings["fingered"] = "Указан";
+App::$strings["rebuff"] = "Дать отпор";
+App::$strings["rebuffed"] = "Дан отпор";
+App::$strings["happy"] = "�ча�тливый";
+App::$strings["sad"] = "гру�тный";
+App::$strings["mellow"] = "�покойный";
+App::$strings["tired"] = "у�талый";
+App::$strings["perky"] = "ве�ёлый";
+App::$strings["angry"] = "�ердитый";
+App::$strings["stupefied"] = "отупевший";
+App::$strings["puzzled"] = "недоумевающий";
+App::$strings["interested"] = "заинтере�ованный";
+App::$strings["bitter"] = "едкий";
+App::$strings["cheerful"] = "бодрый";
+App::$strings["alive"] = "�нергичный";
+App::$strings["annoyed"] = "раздражённый";
+App::$strings["anxious"] = "обе�покоенный";
+App::$strings["cranky"] = "капризный";
+App::$strings["disturbed"] = "в�тревоженный";
+App::$strings["frustrated"] = "разочарованный";
+App::$strings["depressed"] = "подавленный";
+App::$strings["motivated"] = "мотивированный";
+App::$strings["relaxed"] = "ра��лабленный";
+App::$strings["surprised"] = "удивленный";
+App::$strings["May"] = "Май";
+App::$strings["Unknown Attachment"] = "�еизве�тное вложение";
+App::$strings["remove category"] = "удалить категорию";
+App::$strings["remove from file"] = "удалить из файла";
+App::$strings["Download binary/encrypted content"] = "Загрузить двоичное / зашифрованное �одержимое";
+App::$strings["Poll has ended."] = "Опро� окончен.";
+App::$strings["Poll ends: %s"] = "Опро� заканчивает�� %s";
+App::$strings["Link to Source"] = "С�ылка на и�точник";
+App::$strings["Page layout"] = "Шаблон �траницы";
+App::$strings["You can create your own with the layouts tool"] = "Вы можете �оздать �вой �об�твенный � помощью ин�трумента шаблонов";
+App::$strings["HTML"] = "";
+App::$strings["Comanche Layout"] = "Шаблон Comanche";
+App::$strings["PHP"] = "";
+App::$strings["Page content type"] = "Тип �одержимого �траницы";
+App::$strings["activity"] = "активно�ть";
+App::$strings["poll"] = "голо�ование";
+App::$strings["a-z, 0-9, -, and _ only"] = "Только a-z, 0-9, -, и _";
+App::$strings["Design Tools"] = "Ин�трументы дизайна";
+App::$strings["Pages"] = "Страницы";
+App::$strings["Import"] = "Импортировать";
+App::$strings["Import website..."] = "Импорт веб-�айта...";
+App::$strings["Select folder to import"] = "Выбрать каталог дл� импорта";
+App::$strings["Import from a zipped folder:"] = "Импортировать из каталога в zip-архиве:";
+App::$strings["Import from cloud files:"] = "Импортировать из �етевых файлов:";
+App::$strings["/cloud/channel/path/to/folder"] = "";
+App::$strings["Enter path to website files"] = "Введите путь к файлам веб-�айта";
+App::$strings["Select folder"] = "Выбрать каталог";
+App::$strings["Export website..."] = "Эк�порт веб-�айта...";
+App::$strings["Export to a zip file"] = "Эк�портировать в ZIP файл.";
+App::$strings["website.zip"] = "";
+App::$strings["Enter a name for the zip file."] = "Введите им� дл� ZIP файла.";
+App::$strings["Export to cloud files"] = "Э�кпортировать в �етевые файлы:";
+App::$strings["/path/to/export/folder"] = "";
+App::$strings["Enter a path to a cloud files destination."] = "Введите путь к ра�положению �етевых файлов.";
+App::$strings["Specify folder"] = "Указать каталог";
+App::$strings["%d invitation available"] = array(
+	0 => "до�тупно %d приглашение",
+	1 => "до�тупны %d приглашени�",
+	2 => "до�тупны %d приглашений",
+);
+App::$strings["Find Channels"] = "Пои�к каналов";
+App::$strings["Enter name or interest"] = "Впишите им� или интере�";
+App::$strings["Connect/Follow"] = "Подключить / от�леживать";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Примеры: Владимир Ильич, Революционер";
+App::$strings["Random Profile"] = "Случайный профиль";
+App::$strings["Invite Friends"] = "Пригла�ить друзей";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Ра�ширенный пример: name=ivan and country=russia";
+App::$strings["Common Connections"] = "Общие контакты";
+App::$strings["View all %d common connections"] = "Про�мотреть в�е %d общих контактов";
+App::$strings["Unable to import a removed channel."] = "�евозможно импортировать удалённый канал.";
+App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "�е удало�ь �оздать дублирующий�� идентификатор канала. Импорт невозможен.";
+App::$strings["Unable to create a unique channel address. Import failed."] = "�е удало�ь �оздать уникальный адре� канала. Импорт не завершен.";
+App::$strings["Cloned channel not found. Import failed."] = "Клон канала не найден. Импорт невозможен.";
+App::$strings["Source channel not found."] = "Канал-и�точник не найден.";
+App::$strings["Focus (Hubzilla default)"] = "Фоку� (по умолчанию Hubzilla)";
+App::$strings["Theme settings"] = "�а�тройки темы";
+App::$strings["Narrow navbar"] = "Узка� панель навигации";
+App::$strings["Navigation bar background color"] = "Панель навигации, цвет фона";
+App::$strings["Navigation bar icon color "] = "Панель навигации, цвет значков";
+App::$strings["Navigation bar active icon color "] = "Панель навигации, цвет активного значка";
+App::$strings["Link color"] = "Цвет ��ылок";
+App::$strings["Set font-color for banner"] = "Цвет тек�та в шапке";
+App::$strings["Set the background color"] = "Цвет фона";
+App::$strings["Set the background image"] = "Фоновое изображение";
+App::$strings["Set the background color of items"] = "Цвет фона �лементов";
+App::$strings["Set the background color of comments"] = "Цвет фона комментариев";
+App::$strings["Set font-size for the entire application"] = "У�тановить �и�темный размер шрифта";
+App::$strings["Examples: 1rem, 100%, 16px"] = "�апример: 1rem, 100%, 16px";
+App::$strings["Set font-color for posts and comments"] = "Цвет шрифта дл� публикаций и комментариев";
+App::$strings["Set radius of corners"] = "Радиу� �круглений";
+App::$strings["Example: 4px"] = "�апример: 4px";
+App::$strings["Set shadow depth of photos"] = "Глубина теней фотографий";
+App::$strings["Set maximum width of content region in pixel"] = "Мак�имальна� ширина �одержани� региона (в пик�ел�х)";
+App::$strings["Leave empty for default width"] = "О�тавьте пу�тым дл� ширины по умолчанию";
+App::$strings["Set size of conversation author photo"] = "Размер фотографии автора бе�еды";
+App::$strings["Set size of followup author photos"] = "Размер фотографий подпи�чиков";
+App::$strings["Show advanced settings"] = "Показать ра�ширенные на�тройки";
+App::$strings["Your Webbie:"] = "Ваш Webbie:";
+App::$strings["Fontsize (px):"] = "Размер шрифта (px):";
+App::$strings["Link:"] = "С�ылка:";
+App::$strings["Like us on Hubzilla"] = "�равит�� на Hubzilla";
+App::$strings["Embed:"] = "В�троить:";
+App::$strings["Photo Cache settings saved."] = "�а�тройки к�шировани� изображений �охранены.";
+App::$strings["Photo Cache addon saves a copy of images from external sites locally to increase your anonymity in the web."] = "Приложение \"К�шировние изображений\" �охран�ет копию изображений � внешних �айтов локально дл� повышени� вашей анонимно�ти в Интернет.";
+App::$strings["Photo Cache App"] = "Приложение \"К�ширование изображений\"";
+App::$strings["Minimal photo size for caching"] = "Минимальный размер изображений дл� к�шировани�";
+App::$strings["In pixels. From 1 up to 1024, 0 will be replaced with system default."] = "В пик�ел�х. От 1 до 1024, 0 будет заменён значением по умолчанию.";
+App::$strings["Photo Cache"] = "К�ширование изображений";
+App::$strings["Access Denied"] = "До�туп запрещён";
+App::$strings["Enable Community Moderation"] = "Включить модерацию �ообще�тва";
+App::$strings["Reputation automatically given to new members"] = "Репутаци� автоматиче�ки предо�тавл�ема� новым уча�тникам";
+App::$strings["Reputation will never fall below this value"] = "Репутаци� никогда не упадёт ниже �того значени�";
+App::$strings["Minimum reputation before posting is allowed"] = "Минимальна� репутаци� дл� разрешени� возможно�ти размещать публикации";
+App::$strings["Minimum reputation before commenting is allowed"] = "Минимальна� репутаци� дл� разрешени� комментировани�";
+App::$strings["Minimum reputation before a member is able to moderate other posts"] = "Минимальна� репутаци� дл� возможно�ти модерировани� уча�тником чужих публикаций";
+App::$strings["Max ratio of moderator's reputation that can be added to/deducted from reputation of person being moderated"] = "Мак�имальное �оотношение репутации модератора, которое может быть добавлено / вычтено из репутации модерируемого уча�тника";
+App::$strings["Reputation \"cost\" to post"] = "\"Стоимо�ть\" репутации дл� публикации";
+App::$strings["Reputation \"cost\" to comment"] = "\"Стоимо�ть\" репутации дл� комментировани�";
+App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = "Репутаци� автоматиче�ки во��танавливает�� � �той �коро�тью в ча� пока не до�тигает значени� minimum_to_post";
+App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = "При minimum_to_moderate > репутаци� > minimum_to_post репутаци� во��танавливает�� � �той �коро�тью в ча�";
+App::$strings["Community Moderation Settings"] = "�а�тройки модерировани� �ообще�тва";
+App::$strings["Channel Reputation"] = "Репутаци� канала";
+App::$strings["An Error has occurred."] = "Произошла ошибка.";
+App::$strings["Upvote"] = "За";
+App::$strings["Downvote"] = "Против";
+App::$strings["Can moderate reputation on my channel."] = "Может модерировать репутацию на моём канале";
+App::$strings["Network error"] = "Сетева� ошибка";
+App::$strings["API error"] = "Ошибка API";
+App::$strings["Unknown issue"] = "�еизве�тна� проблема";
+App::$strings["Unable to login using email address "] = "�евозможно войти, и�пользу� адре� �лектронной почты ";
+App::$strings["Sign in to Hubzilla using a social account"] = "Войдите в Hubzilla, и�пользу� учетную запи�ь в �оциальных �ет�х";
+App::$strings["Social Authentication using your social media account"] = "Social Authentication � и�пользованием вашей учетной запи�и в �оциальных �ет�х";
+App::$strings["This app enables one or more social provider sign-in buttons on the login page."] = "Это приложение добавл�ет на �транице входа в �и�тему одну или не�колько кнопок дл� аутентификации при помощи учётных запи�ей в �оциальных �ет�х";
+App::$strings["Add an identity provider"] = "Добавить провайдера идентификации";
+App::$strings["Enable "] = "Включить ";
+App::$strings["Key"] = "Ключ";
+App::$strings["Word"] = "Слово";
+App::$strings["Secret"] = "Секрет";
+App::$strings["Add a custom provider"] = "Добавить �об�твенного провайдера";
+App::$strings["Remove an identity provider"] = "Удалить провайдера идентификации";
+App::$strings["Social authentication"] = "�утентификаци� в �оциальных �ет�х";
+App::$strings["Error while saving provider settings"] = "Ошибка при �охранении на�троек провайдера идентификации";
+App::$strings["Custom provider already exists"] = "Соб�твенный провайдер уже �уще�твует";
+App::$strings["Social authentication settings saved."] = "�а�тройки Social authentication �охранены.";
+App::$strings["Who viewed my channel/profile"] = "Кто �мотрел мой канал / профиль";
+App::$strings["Recent Channel/Profile Viewers"] = "По�ледние про�мотры канала / профил�";
+App::$strings["No entries."] = "�ет запи�ей.";
+App::$strings["Your account on %s will expire in a few days."] = "Ваш аккаунт на %s пере�танет работать через не�колько дней.";
+App::$strings["Your $Productname test account is about to expire."] = "Ваша те�това� учётна� запи�ь в $Productname близка к окончанию �рока дей�тви�.";
+App::$strings["Post to Twitter"] = "Опубликовать в Twitter";
+App::$strings["Submit Settings"] = "Отправить на�тройки";
+App::$strings["Twitter settings updated."] = "�а�тройки Twitter обновлены";
+App::$strings["Twitter Crosspost Connector App"] = "Приложение \"Публикаци� в Twitter\"";
+App::$strings["Relay public posts to Twitter"] = "Пере�ылает общедо�тупные публикации в Twitter";
+App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "�е найдено пары ключей дл� Twitter. Пожалуй�та, �в�жите�ь � админи�тратором �айта.";
+App::$strings["At this Hubzilla instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "В �той у�тановке Hubzilla плагин Twitter был включён, однако пока он не подключён к вашему аккаунту в Twitter. Дл� �того нажмите на кнопку ниже дл� получени� PIN-кода от Twitter который нужно �копировать в поле ввода и отправить форму. Только ваши <strong>общедо�тупные</strong> публикации будут опубликованы в Twitter.";
+App::$strings["Log in with Twitter"] = "Войти в Twitter";
+App::$strings["Copy the PIN from Twitter here"] = "Скопируйте PIN-код из Twitter зде�ь";
+App::$strings["Currently connected to: "] = "В на�то�щее врем� подключён к: ";
+App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в Twitter, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен.";
+App::$strings["Twitter post length"] = "Длина публикации Twitter";
+App::$strings["Maximum tweet length"] = "Мак�имальна� длина твита";
+App::$strings["Send public postings to Twitter by default"] = "Отправл�ть общедо�тупные публикации в Twitter по умолчанию";
+App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и Twitter по умолчанию";
+App::$strings["Clear OAuth configuration"] = "Очи�тить конфигурацию OAuth";
+App::$strings["Twitter Crosspost Connector"] = "Публикаци� в Twitter";
+App::$strings["generic profile image"] = "Стандартное изображение профил�";
+App::$strings["random geometric pattern"] = "Случайный геометриче�кий ри�унок";
+App::$strings["monster face"] = "Лицо чудовища";
+App::$strings["computer generated face"] = "Сгенерированное компьютером лицо";
+App::$strings["retro arcade style face"] = "Лицо в �тиле �тарой аркадной игры";
+App::$strings["Hub default profile photo"] = "Фотографи� профил� по умолчанию";
+App::$strings["Information"] = "Информаци�";
+App::$strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Плагин Libravatar также у�тановлен. Пожалуй�та, отключите плагин Libravatar или �тот плагин Gravatar. Е�ли Плагин Libravatar ничего не найдёт, он вернёт�� в Gravatar.";
+App::$strings["Save Settings"] = "Сохранить на�тройки";
+App::$strings["Default avatar image"] = "Изображение аватара по умолчанию";
+App::$strings["Select default avatar image if none was found at Gravatar. See README"] = "Выберите изображени� аватар по умолчанию е�ли ничего не было найдено в Gravatar (�м. README).";
+App::$strings["Rating of images"] = "Оценки изображений";
+App::$strings["Select the appropriate avatar rating for your site. See README"] = "Выберите подход�щую оценку аватара дл� вашего �айта (�м. README).";
+App::$strings["Gravatar settings updated."] = "�а�тройки Gravatar обновлены.";
+App::$strings["Price"] = "Цена";
+App::$strings["Enable Test Catalog"] = "Включить те�товый каталог";
+App::$strings["Enable Manual Payments"] = "Включить ручные платежи";
+App::$strings["Base Merchant Currency"] = "О�новна� торгова� валюта";
+App::$strings["Cart Settings"] = "�а�тройки карточек";
+App::$strings["Enable Paypal Button Module (API-v2)"] = "Включить модуль кнопки Paypal (API-v2)";
+App::$strings["Use Production Key"] = "И�пользовать ключ Production";
+App::$strings["Paypal Sandbox Client Key"] = "Ключ клиента Paypal Sandbox";
+App::$strings["Paypal Sandbox Secret Key"] = "Секретный ключ Paypal Sandbox";
+App::$strings["Paypal Production Client Key"] = "Ключ клиента Paypal Production";
+App::$strings["Paypal Production Secret Key"] = "Секретный ключ Paypal Production";
+App::$strings["Paypal button payments are not enabled."] = "Кнопка Paypal дл� платежей не включена.";
+App::$strings["Paypal button payments are not properly configured.  Please choose another payment option."] = "Кнопка Paypal дл� платежей на�троена неправильно. Пожалуй�та, и�пользуйте другой вариант оплаты.";
+App::$strings["Order not found."] = "Заказ не найден.";
+App::$strings["Enable Manual Cart Module"] = "Включить модуль ручного управлени� карточками";
+App::$strings["New Sku"] = "�овый код";
+App::$strings["Cannot save edits to locked item."] = "�евозможно �охранить изменени� заблокированной позиции.";
+App::$strings["Changes Locked"] = "Изменени� заблокированы";
+App::$strings["Item available for purchase."] = "Позици� до�тупна дл� приобретени�.";
+App::$strings["Photo URL"] = "URL изображени�";
+App::$strings["Enable Order/Item Options"] = "Включить параметры заказа / позиции";
+App::$strings["Label"] = "Метка";
+App::$strings["Instructions"] = "Ин�трукции";
+App::$strings["Enable Hubzilla Services Module"] = "Включить модуль �ерви�а Hubzilla";
+App::$strings["SKU not found."] = "Код не найден.";
+App::$strings["Invalid Activation Directive."] = "�едей�твительна� директива активации.";
+App::$strings["Invalid Deactivation Directive."] = "�едей�твительна� директива деактивации";
+App::$strings["Add to this privacy group"] = "Добавить в �ту группу конфиденциально�ти";
+App::$strings["Set user service class"] = "У�тановить кла�� об�луживани� пользовател�";
+App::$strings["You must be using a local account to purchase this service."] = "Вы должны и�пользовать локальную учётноую запи�ь дл� покупки �того �ерви�а.";
+App::$strings["Add buyer to privacy group"] = "Добавить покупател� в группу конфиденциально�ти";
+App::$strings["Add buyer as connection"] = "Добавить покупател� как контакт";
+App::$strings["Set Service Class"] = "У�тановить кла�� об�луживани�";
+App::$strings["Enable Subscription Management Module"] = "Включить модуль управлени� подпи�ками";
+App::$strings["Cannot include subscription items with different terms in the same order."] = "�ельз� включать �лементы подпи�ки � разными у�лови�ми в том же заказе.";
+App::$strings["Select Subscription to Edit"] = "Выбрать подпи�ку дл� редактировани�";
+App::$strings["Edit Subscriptions"] = "Редактировать подпи�ки";
+App::$strings["Subscription SKU"] = "Код подпи�ки";
+App::$strings["Catalog Description"] = "Опи�ание каталога";
+App::$strings["Subscription available for purchase."] = "Подпи�ка до�тупна дл� покупки.";
+App::$strings["Maximum active subscriptions to this item per account."] = "Мак�имальное количе�тво подпи�ок на аккаунт дл� �той позиции";
+App::$strings["Subscription price."] = "Цена подпи�ки.";
+App::$strings["Quantity"] = "Количе�тво";
+App::$strings["Term"] = "У�лови�";
+App::$strings["Enable Paypal Button Module"] = "Включить модуль кнопки Paypal";
+App::$strings["Access Denied."] = "До�туп запрещён.";
+App::$strings["Order Not Found"] = "Заказ не найден";
+App::$strings["Invalid Item"] = "�едей�твительный �лемент";
+App::$strings["Error: order mismatch. Please try again."] = "Ошибка: не�оответ�твие заказа. Пожалуй�та, попробуйте ещё раз";
+App::$strings["Manual payments are not enabled."] = "Ручные платежи не подключены.";
+App::$strings["Finished"] = "Завершено";
+App::$strings["DB Cleanup Failure"] = "Сбой очи�тки базы данных";
+App::$strings["[cart] Item Added"] = "[cart] Элемент добавлен";
+App::$strings["Order already checked out."] = "Заказ уже проверен.";
+App::$strings["Drop database tables when uninstalling."] = "Сбро�ить таблицы базы данных при деин�талл�ции";
+App::$strings["Shop"] = "Магазин";
+App::$strings["Cart utilities for orders and payments"] = "Утилиты карточек дл� заказов и платежей";
+App::$strings["You must be logged into the Grid to shop."] = "Вы должны быть в �ети дл� до�тупа к магазину";
+App::$strings["Access denied."] = "До�туп запрещён.";
+App::$strings["No Order Found"] = "�ет найденных заказов";
+App::$strings["An unknown error has occurred Please start again."] = "Произошла неизве�тна� ошибка. Пожалуй�та, начните �нова.";
+App::$strings["Requirements not met."] = "Требовани� не �облюдены.";
+App::$strings["Review your order and complete any needed requirements."] = "Ÿро�мотрите �вой заказ и выполните в�е необходимые требовани�";
+App::$strings["Invalid Payment Type.  Please start again."] = "�едей�твительный тип платежа. Пожалуй�та, начните �нова.";
+App::$strings["Order not found"] = "Заказ не найден";
+App::$strings["Errors encountered deleting database table "] = "Возникшие при удалении таблицы базы данных ошибки";
+App::$strings["Drop tables when uninstalling?"] = "Удалить таблицы при деин�талл�ции?";
+App::$strings["If checked, the Rendezvous database tables will be deleted when the plugin is uninstalled."] = "Е�ли включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина.";
+App::$strings["Mapbox Access Token"] = "Токен до�тупа к Mapbox";
+App::$strings["If you enter a Mapbox access token, it will be used to retrieve map tiles from Mapbox instead of the default OpenStreetMap tile server."] = "Е�ли вы введете токен до�тупа к Mapbox, он будет и�пользовать�� дл� извлечени� фрагментов карты из Mapbox вме�то �тандартного �ервера OpenStreetMap.";
+App::$strings["Rendezvous"] = "";
+App::$strings["This identity has been deleted by another member due to inactivity. Please press the \"New identity\" button or refresh the page to register a new identity. You may use the same name."] = "Этот идентификатор был удалён другим уча�тником из-за неактивно�ти. Пожалуй�та нажмите кнопку \"�овый идентификатор\" дл� обновлени� �траницы и получени� нового идентификатора. Вы можете и�пользовать то же им�.";
+App::$strings["Welcome to Rendezvous!"] = "Добро пожаловать в Rendezvous!";
+App::$strings["Enter your name to join this rendezvous. To begin sharing your location with the other members, tap the GPS control. When your location is discovered, a red dot will appear and others will be able to see you on the map."] = "Введите ваше им� дл� в�туплени� в �то Rendezvous. Дл� того, чтобы делить�� вашим положением � другими уча�тниками, нажмите \"GPS control\". Когда ваше ме�тоположение определно, кра�на� точка по�вит�� и о�тальные �могут увидеть ва� на карте.";
+App::$strings["Let's meet here"] = "Давайте в�третим�� зде�ь";
+App::$strings["New marker"] = "�овый маркер";
+App::$strings["Edit marker"] = "Редактировать маркер";
+App::$strings["New identity"] = "�овый идентификатор";
+App::$strings["Delete marker"] = "Удалить маркер";
+App::$strings["Delete member"] = "Удалить уча�тника";
+App::$strings["Edit proximity alert"] = "Изменить оповещение о близо�ти";
+App::$strings["A proximity alert will be issued when this member is within a certain radius of you.<br><br>Enter a radius in meters (0 to disable):"] = "Оповещение о близо�ти будет произведено, е�ли �тот уча�тник находит�� на определённом ра��то�нии от ва�. <br><br>Введите радиу� в метрах (0 дл� отключени�):";
+App::$strings["distance"] = "ра��то�ние";
+App::$strings["Proximity alert distance (meters)"] = "Ра��то�ние дл� уведомлени� о близо�ти (метров)";
+App::$strings["A proximity alert will be issued when you are within a certain radius of the marker location.<br><br>Enter a radius in meters (0 to disable):"] = "Оповещение о близо�ти будет произведено, е�ли вы находите�ь на определённом ра��то�нии ме�тоположени� маркера. <br><br>Введите радиу� в метрах (0 дл� отключени�):";
+App::$strings["Marker proximity alert"] = "Маркер уведомлени� о близо�ти";
+App::$strings["Reminder note"] = "�апоминание";
+App::$strings["Enter a note to be displayed when you are within the specified proximity..."] = "Введите �ообщение дл� отображени� когда вы находите�ь р�дом";
+App::$strings["Add new rendezvous"] = "Добавить новое Rendezvous.";
+App::$strings["Create a new rendezvous and share the access link with those you wish to invite to the group. Those who open the link become members of the rendezvous. They can view other member locations, add markers to the map, or share their own locations with the group."] = "Создайте новое Rendezvous и поделите�ь ��ылкой до�тупа � теми, кого вы хотите пригла�ить в группу. Тот, кто откроет �ту ��ылку, �танет её уча�тником. Уча�тники могут видеть ме�тоположение, добавл�ть маркеры на карту или делит�� �воим �об�твенным ме�тоположением � группой.";
+App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "У ва� нет Rendezvous. �ажмите на кнопку ниже чтобы �оздать его!";
+App::$strings["bitchslap"] = "дал леща";
+App::$strings["bitchslapped"] = "получил леща";
+App::$strings["shag"] = "вздрючил";
+App::$strings["shagged"] = "вздрюченный";
+App::$strings["patent"] = "";
+App::$strings["patented"] = "";
+App::$strings["hug"] = "обн�л";
+App::$strings["hugged"] = "обн�тый";
+App::$strings["murder"] = "убил";
+App::$strings["murdered"] = "убитый";
+App::$strings["worship"] = "почитает";
+App::$strings["worshipped"] = "почитаемый";
+App::$strings["kiss"] = "поцеловал";
+App::$strings["kissed"] = "поцелованный";
+App::$strings["tempt"] = "и�кушает";
+App::$strings["tempted"] = "и�кушённый";
+App::$strings["raise eyebrows at"] = "подн�л брови";
+App::$strings["raised their eyebrows at"] = "подн�л брови";
+App::$strings["insult"] = "о�корбил";
+App::$strings["insulted"] = "о�корблённый";
+App::$strings["praise"] = "похвалил";
+App::$strings["praised"] = "похваленный";
+App::$strings["be dubious of"] = "�омневает��";
+App::$strings["was dubious of"] = "у�омнил��";
+App::$strings["eat"] = "е�т";
+App::$strings["ate"] = "�ъел";
+App::$strings["giggle and fawn at"] = "";
+App::$strings["giggled and fawned at"] = "";
+App::$strings["doubt"] = "�омневает��";
+App::$strings["doubted"] = "у�омнил��";
+App::$strings["glare"] = "";
+App::$strings["glared at"] = "";
+App::$strings["fuck"] = "трахает";
+App::$strings["fucked"] = "трахнул";
+App::$strings["bonk"] = "";
+App::$strings["bonked"] = "";
+App::$strings["declare undying love for"] = "признаёт�� в любви к";
+App::$strings["declared undying love for"] = "признал�� в любви к";
+App::$strings["Post to WordPress"] = "Опубликовать в WordPress";
+App::$strings["Wordpress Settings saved."] = "�а�тройки WordPress �охранены.";
+App::$strings["Wordpress Post App"] = "Приложение \"Публикаци� в Wordpress\"";
+App::$strings["Post to WordPress or anything else which uses the wordpress XMLRPC API"] = "Опубликовать в WordPress или в чём-то ещё, поддерживающем wordpress XMLRPC API";
+App::$strings["WordPress username"] = "Им� пользовател� WordPress";
+App::$strings["WordPress password"] = "Пароль WordPress";
+App::$strings["WordPress API URL"] = "URL API WordPress";
+App::$strings["Typically https://your-blog.tld/xmlrpc.php"] = "Обычно https://your-blog.tld/xmlrpc.php";
+App::$strings["WordPress blogid"] = "";
+App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Дл� многопользователь�ких �айтов, таких, как wordpress.com. В противном �лучае о�тавьте пу�тым";
+App::$strings["Post to WordPress by default"] = "Публиковать в WordPress по умолчанию";
+App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Пере�ылать комментарии (требует�� плагин hubzilla_wp)";
+App::$strings["Add link to original post"] = "Добавить ��ылку на оригинальную заметку";
+App::$strings["Link description (default:"] = "Опи�ание ��ылки (по-умолчанию:";
+App::$strings["Wordpress Post"] = "Публикаци� в WordPress";
+App::$strings["nofed Settings saved."] = "�а�тройки nofed �охранены.";
+App::$strings["No Federation App"] = "Приложение No Federation";
+App::$strings["Prevent posting from being federated to anybody. It will exist only on your channel page."] = "Запрещает федеративные функций дл� публикаций. Они будут �уще�твовать только на �транице вашего канала.";
+App::$strings["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию";
+App::$strings["No Federation"] = "Отключить Federation";
+App::$strings["Federate"] = "Федерировать";
+App::$strings["Gallery App"] = "Приложение \"Галере�\"";
+App::$strings["A simple gallery for your photo albums"] = "Про�та� галлере� дл� ваших фотоальбомов";
+App::$strings["Gallery"] = "Галере�";
+App::$strings["Photo Gallery"] = "Фотогалере�";
+App::$strings["Photos imported"] = "Фотографии импортированы";
+App::$strings["Redmatrix Photo Album Import"] = "Импортировать альбом фотографий Redmatrix";
+App::$strings["This will import all your Redmatrix photo albums to this channel."] = "Это позволит импортировать в�е ваши альбомы фотографий Redmatrix в �тот канал.";
+App::$strings["Redmatrix Server base URL"] = "Базовый URL �ервера Redmatrix";
+App::$strings["Redmatrix Login Username"] = "Им� пользовател� Redmatrix";
+App::$strings["Redmatrix Login Password"] = "Пароль Redmatrix";
+App::$strings["Import just this album"] = "Импортировать только �тот альбом";
+App::$strings["Leave blank to import all albums"] = "О�тавьте пу�тым дл� импорта в�ех альбомов";
+App::$strings["Maximum count to import"] = "Мак�имальное количе�тво дл� импорта";
+App::$strings["0 or blank to import all available"] = "0 или пу�то дл� импорта в�ех до�тупных";
+App::$strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Этот �айт от�леживает�� � помощью ин�трументов аналитики <a href='http://www.piwik.org'>Piwik</a>.";
+App::$strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Е�ли вы не хотите, чтобы ваши визиты реги�трировали�ь таким образом, вы <a href='%s'>можете отключить cookie � тем, чтобы Piwik не от�леживал дальнейшие по�ещени� �айта</a>.";
+App::$strings["Piwik Base URL"] = "Базовый URL Piwik";
+App::$strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "�б�олютный путь к вашей у�тановке Piwik (без типа протокола, � начальным �л�шем)";
+App::$strings["Site ID"] = "ID �айта";
+App::$strings["Show opt-out cookie link?"] = "Показывать ��ылку на отказ от и�пользовани� cookies?";
+App::$strings["Asynchronous tracking"] = "��инхронное от�леживание";
+App::$strings["Enable frontend JavaScript error tracking"] = "Включить от�леживание ошибок JavaScript на фронтенде.";
+App::$strings["This feature requires Piwik >= 2.2.0"] = "Эта функци� требует вер�ию Piwik >= 2.2.0";
+App::$strings["Fuzzloc Settings updated."] = "�а�тройки примерного положени� обновлены.";
+App::$strings["Fuzzy Location App"] = "Приложение \"Примерное положение\"";
+App::$strings["Blur your precise location if your channel uses browser location mapping"] = "Размывает вашего точное ме�тоположение в �лучае е�ли ваш канал и�пользует отображение ме�тоположени� из браузера";
+App::$strings["Minimum offset in meters"] = "Минимальное �мещение в метрах";
+App::$strings["Maximum offset in meters"] = "Мак�имальное �мещение в метрах";
+App::$strings["Fuzzy Location"] = "Примерное положение";
+App::$strings["Channel is required."] = "�еобходим канал.";
+App::$strings["Hubzilla Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Hubzilla �охранены.";
+App::$strings["Hubzilla Crosspost Connector App"] = "Приложение \"Пере�ылка публикаций Hubzilla\"";
+App::$strings["Relay public postings to another Hubzilla channel"] = "Пере�ылает общедо�тупные публикации в другой канал Hubzilla";
+App::$strings["Send public postings to Hubzilla channel by default"] = "Отправл�ть общедо�тупные публикации в канал Hubzilla по умолчанию";
+App::$strings["Hubzilla API Path"] = "Путь к Hubzilla API";
+App::$strings["https://{sitename}/api"] = "";
+App::$strings["Hubzilla login name"] = "Им� входа Hubzilla";
+App::$strings["Hubzilla channel name"] = "�азвание канала Hubzilla";
+App::$strings["Hubzilla password"] = "Пароль Hubzilla";
+App::$strings["Hubzilla Crosspost Connector"] = "Пере�ылка публикаций Hubzilla";
+App::$strings["Post to Hubzilla"] = "Опубликовать в Hubzilla";
+App::$strings["Flag Adult Photos"] = "Пометка фотографий дл� взро�лых";
+App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Предо�тавьте возможно�ть редактировани� фотографий, чтобы �крыть неприемлемые фотографии из альбома по умолчанию";
+App::$strings["Allow magic authentication only to websites of your immediate connections"] = "Разрешить волшебную аутентификацию только на �айтах ваших непо�ред�твенных �оединений";
+App::$strings["Authchoose App"] = "Приложение Authchoose";
+App::$strings["Installed"] = "У�тановлено";
+App::$strings["Authchoose"] = "";
+App::$strings["Channels to auto connect"] = "Каналы дл� автоматиче�кого подключени�";
+App::$strings["Comma separated list"] = "Спи�ок, разделённый зап�тыми";
+App::$strings["Popular Channels"] = "Попул�рные каналы";
+App::$strings["IRC Settings"] = "�а�тройки IRC";
+App::$strings["IRC settings saved."] = "�а�тройки IRC �охранены";
+App::$strings["IRC Chatroom"] = "Чат IRC";
+App::$strings["Post to GNU social"] = "Опубликовать в GNU Social";
+App::$strings["API URL"] = "";
+App::$strings["Application name"] = "�азвание приложени�";
+App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Пожалуй�та �в�жите�ь � админи�тратором �айта. <br />Предо�тавленный URL API недей�твителен.";
+App::$strings["We could not contact the GNU social API with the Path you entered."] = "�ам не удало�ь у�тановить контакт � GNU Social API по введённому вами пути";
+App::$strings["GNU social settings updated."] = "�а�тройки GNU Social обновлены.";
+App::$strings["Relay public postings to a connected GNU social account (formerly StatusNet)"] = "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь GNU social (бывша� StatusNet)";
+App::$strings["Globally Available GNU social OAuthKeys"] = "Глобально до�тупные ключи OAuthKeys GNU Social";
+App::$strings["There are preconfigured OAuth key pairs for some GNU social servers available. If you are using one of them, please use these credentials.<br />If not feel free to connect to any other GNU social instance (see below)."] = "Суще�твуют предварительно на�троенные пары ключей OAuth дл� некоторых до�тупных �ерверов GNU social. Е�ли вы и�пользуете один из них, и�пользуйте �ти учетные данные. <br />Е�ли вы не хотите подключать�� к какому-либо другому �ерверу GNU social (�м. ниже).";
+App::$strings["Provide your own OAuth Credentials"] = "Предо�тавьте ваши �об�твенные реги�трационные данные OAuth";
+App::$strings["No consumer key pair for GNU social found. Register your Hubzilla Account as an desktop client on your GNU social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Hubzilla installation at your favourite GNU social installation."] = "�е найдена пользователь�ка� пара ключей дл� GNU social. Зареги�трируйте �вою учетную запи�ь Hubzilla в каче�тве на�тольного клиента в �воей учетной запи�и GNU social, �копируйте cюда пару ключей пользовател� и введите корневой каталог базы API. <br />Прежде чем реги�трировать �вою �об�твенную пару ключей OAuth, �про�ите админи�тратора, е�ли ли уже пара ключей дл� �той у�тановки Hubzilla в вашем GNU social.";
+App::$strings["OAuth Consumer Key"] = "Ключ клиента OAuth";
+App::$strings["OAuth Consumer Secret"] = "Пароль клиента OAuth";
+App::$strings["Base API Path"] = "О�новной путь к API";
+App::$strings["Remember the trailing /"] = "Запомнить закрывающий /";
+App::$strings["GNU social application name"] = "Им� приложени� GNU social";
+App::$strings["To connect to your GNU social account click the button below to get a security code from GNU social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU social."] = "Чтобы подключить�� к вашей учетной запи�и GNU social нажмите кнопку ниже дл� получени� кода безопа�но�ти из GNU social, который вы должны �копировать в поле ввода ниже и отправить форму. Только ваши общедо�тупные �ообщени� будут опубликованы в GNU social.";
+App::$strings["Log in with GNU social"] = "Войти � GNU social";
+App::$strings["Copy the security code from GNU social here"] = "Скопируйте код безопа�но�ти GNU social зде�ь";
+App::$strings["Cancel Connection Process"] = "Отменить проце�� подключени�";
+App::$strings["Current GNU social API is"] = "Текущий GNU social API";
+App::$strings["Cancel GNU social Connection"] = "Отменить подключение � GNU social";
+App::$strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Замечание</strong>: Из-за на�троек конфиденциально�ти (<em>�крыть данные �воего профил� от неизве�тных зрителей?</em>) c�ылка, потенциально включенна� в общедо�тупные публикации, переданные в GNU social, приведет по�етител� к пу�той �транице, информирующей его о том, что до�туп к вашему профилю был ограничен.";
+App::$strings["Post to GNU social by default"] = "Публиковать в GNU social по умолчанию";
+App::$strings["If enabled your public postings will be posted to the associated GNU-social account by default"] = "Е�ли включено, ваши общедо�тупные публикации будут опубликованы в �в�занной учётной запи�и GNU social по умолчанию";
+App::$strings["GNU-Social Crosspost Connector"] = "Подключение пере�ылки публикаций GNU Social";
+App::$strings["Not allowed."] = "Запрещено.";
+App::$strings["Hubzilla File Storage Import"] = "Импорт файлового хранилища Hubzilla";
+App::$strings["This will import all your cloud files from another server."] = "Это позволит импортировать в�е ваши файлы � другого �ервера.";
+App::$strings["Hubzilla Server base URL"] = "Базовый URL �ервера Hubzilla";
+App::$strings["Since modified date yyyy-mm-dd"] = "�ачина� � даты изменений yyyy-mm-dd";
+App::$strings["Until modified date yyyy-mm-dd"] = "Заканчива� датой изменений yyyy-mm-dd";
+App::$strings["Startpage App"] = "Приложение \"Стартова� �траница\"";
+App::$strings["Set a preferred page to load on login from home page"] = "У�танавливает предпочтительную �траницу дл� загрузки при входе � домашней �траницы";
+App::$strings["Page to load after login"] = "Страница дл� загрузки по�ле входа";
+App::$strings["Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave blank for default network page (grid)."] = "Примеры: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy collection), &quot;channel&quot; or &quot;notifications/system&quot; (о�тавьте пу�тым дл� дл� �траницы �ети по умолчанию).";
+App::$strings["Startpage"] = "Стартова� �траница";
+App::$strings["System defaults:"] = "Си�темные по умолчанию:";
+App::$strings["Preferred Clipart IDs"] = "Предпочитаемый Clipart ID";
+App::$strings["List of preferred clipart ids. These will be shown first."] = "Спи�ок предпочитаемых Clipart ID. Эти будут показаны первыми.";
+App::$strings["Default Search Term"] = "У�ловие пои�ка по умолчанию";
+App::$strings["The default search term. These will be shown second."] = "У�ловие пои�ка по умолчанию. Показывают�� во вторую очередь.";
+App::$strings["Return After"] = "Вернуть�� по�ле";
+App::$strings["Page to load after image selection."] = "Страница дл� загрузки по�ле выбора изображени�.";
+App::$strings["Profile List"] = "Спи�ок профилей";
+App::$strings["Order of Preferred"] = "Пор�док предпочтени�";
+App::$strings["Sort order of preferred clipart ids."] = "Пор�док �ортировки предпочитаемых Clipart ID. ";
+App::$strings["Newest first"] = "�овое первым";
+App::$strings["As entered"] = "По мере ввода";
+App::$strings["Order of other"] = "Пор�док других";
+App::$strings["Sort order of other clipart ids."] = "Пор�док �ортировки о�тальных Clipart ID.";
+App::$strings["Most downloaded first"] = "Самое загружаемое первым";
+App::$strings["Most liked first"] = "Самое нрав�щее�� первым";
+App::$strings["Preferred IDs Message"] = "Сообщение от предпочитаемых ID";
+App::$strings["Message to display above preferred results."] = "Отображаемое �ообщение над предпочитаемыми результатами.";
+App::$strings["Uploaded by: "] = "Загружено:";
+App::$strings["Drawn by: "] = "�ари�овано:";
+App::$strings["Use this image"] = "И�пользовать �то изображение";
+App::$strings["Or select from a free OpenClipart.org image:"] = "Или выберите из бе�платных изображений на OpenClipart.org";
+App::$strings["Search Term"] = "У�ловие пои�ка";
+App::$strings["Unknown error. Please try again later."] = "�еизве�тна� ошибка. Пожалуй�та, повторите попытку позже.";
+App::$strings["Profile photo updated successfully."] = "Фотографи� профил� обновлена у�пешно.";
+App::$strings["NSA Bait App"] = "Приложение NSA Bait";
+App::$strings["Make yourself a political target"] = "Сделать �еб� политиче�кой мишенью";
+App::$strings["Skeleton App"] = "Приложение \"Скелет\"";
+App::$strings["A skeleton for addons, you can copy/paste"] = "Скелет дл� приложений. Вы можете и�пользовать copy/paste";
+App::$strings["Some setting"] = "�екоторые на�тройки";
+App::$strings["A setting"] = "�а�тройка";
+App::$strings["Skeleton Settings"] = "�а�тройки �келета";
+App::$strings["ActivityPub Protocol Settings updated."] = "�а�тройки протокола ActivityPub обновлены.";
+App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол ActivityPub не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала.";
+App::$strings["Activitypub Protocol App"] = "Приложение \"Протокол ActivityPub\"";
+App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "До�тавить получател�м ActivityPub в группах конфиденциально�ти";
+App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Может приве�ти к большому количе�тву упоминаний и ра�крытию уча�тников группы конфиденциально�ти";
+App::$strings["Send multi-media HTML articles"] = "Отправить HTML �татьи � мультимедиа";
+App::$strings["Not supported by some microblog services such as Mastodon"] = "�е поддерживает�� некоторыми микроблогами, например Mastodon";
+App::$strings["Activitypub Protocol"] = "Протокол ActivityPub";
+App::$strings["Diaspora Protocol Settings updated."] = "�а�тройки протокола Diaspora обновлены.";
+App::$strings["The diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "Протокол Diaspora не поддерживает незави�имо�ть от ра�положени�. Ваши контакты у�тановленные в �той �ети могут быть недо�тупны из альтернативных ме�т размещени� канала.";
+App::$strings["Diaspora Protocol App"] = "Приложение \"Протокол Diaspora\"";
+App::$strings["Allow any Diaspora member to comment or like your public posts"] = "Разрешить любому уча�тнику Diaspora комментировать или отмечать понравившими�� ваши общедо�тупные �ообщени�";
+App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = "Е�ли �тот параметр отключен, только ваши контакты �могут комментировать или лайкать ваши общедо�тупные �ообщени�";
+App::$strings["Prevent your hashtags from being redirected to other sites"] = "Предотвратить перенаправление тегов на другие �айты";
+App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Подпи�ывать и отправл�ть публикации и комментарии � не�уще�твующей подпи�ью Diaspora";
+App::$strings["Followed hashtags (comma separated, do not include the #)"] = "От�леживаемые теги (через зап�тую, и�ключа� #)";
+App::$strings["Diaspora Protocol"] = "Протокол Diaspora";
+App::$strings["No username found in import file."] = "Им� пользовател� не найдено в файле дл� импорта.";
+App::$strings["%1\$s dislikes %2\$s's %3\$s"] = "%1\$s не нравит�� %2\$s's %3\$s";
+App::$strings["Please install the statistics addon to be able to configure a diaspora relay"] = "Пожалуй�та, у�тановите ра�ширение �тати�тики, чтобы иметь возможно�ть на�траивать пере�ылку Diaspora";
+App::$strings["Diaspora Relay Handle"] = "Пере�ылка Diaspora";
+App::$strings["Address of a diaspora relay. Example: relay@diasporarelay.tld"] = "�дре� пере�ылки Diaspora. �апример: relay@diasporarelay.tld";
+App::$strings["Diaspora relay could not be imported"] = "�евозможно импортировать адре� пере�ылки Diaspora";
+App::$strings["No subject"] = "Без темы";
+App::$strings["View Larger"] = "Увеличить";
+App::$strings["Tile Server URL"] = "URL �ервера Tile";
+App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">общедо�тупных �ерверов</a>";
+App::$strings["Nominatim (reverse geocoding) Server URL"] = "URL �ервера Nominatim (обратное геокодирование)";
+App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">Nominatim servers</a>"] = "Спи�ок <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">�ерверов Nominatim</a>";
+App::$strings["Default zoom"] = "Ма�штаб по умолчанию";
+App::$strings["The default zoom level. (1:world, 18:highest, also depends on tile server)"] = "Уровень размера по умолчанию (1 - ве�ь мир, 18 - мак�имальный; зави�ит от �ервера).";
+App::$strings["Include marker on map"] = "Включите маркер на карте";
+App::$strings["Include a marker on the map."] = "Включить маркер на карте";
+App::$strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe в трёх измерени�х";
+App::$strings["3D Tic-Tac-Toe"] = "";
+App::$strings["New game"] = "�ова� игра";
+App::$strings["New game with handicap"] = "�ова� игра � форой";
+App::$strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Трехмерный Tic-Tac-Toe похож на традиционную игру, за и�ключением того, что игра идёт на не�кольких уровн�х одновременно.";
+App::$strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Имеет�� три уровн�. Вы выигрываете, получа� три подр�д на любом уровне, а также вверх, вниз и по диагонали на разных уровн�х.";
+App::$strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Игра � форой отключает центральную позицию на �реднем уровне, потому что игрок, претендующий на �тот квадрат, ча�то имеет не�праведливое преимуще�тво.";
+App::$strings["You go first..."] = "Вы начинаете...";
+App::$strings["I'm going first this time..."] = "�а �тот раз начинаю �...";
+App::$strings["You won!"] = "Вы выиграли!";
+App::$strings["\"Cat\" game!"] = "�ичь�!";
+App::$strings["I won!"] = "Я выиграл!";
+App::$strings["Superblock App"] = "Приложение Superblock";
+App::$strings["Block channels"] = "Заблокировать каналы";
+App::$strings["superblock settings updated"] = "�а�тройки Superblock обновлены.";
+App::$strings["Currently blocked"] = "В на�то�щее врем� заблокирован";
+App::$strings["No channels currently blocked"] = "В на�то�щее врем� никакие каналы не блокируют��";
+App::$strings["Block Completely"] = "Заблокировать полно�тью";
+App::$strings["Friendica Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Friendica �охранены.";
+App::$strings["Friendica Crosspost Connector App"] = "Приложение \"Публикаци� в Friendica\"";
+App::$strings["Relay public postings to a connected Friendica account"] = "Пере�ылает общедо�тупные публикации на подключённую учётную запи�ь Friendica";
+App::$strings["Send public postings to Friendica by default"] = "Отправл�ть общедо�тупные публикации во Friendica по умолчанию";
+App::$strings["Friendica API Path"] = "Путь к Friendica API";
+App::$strings["Friendica login name"] = "Им� входа Friendica";
+App::$strings["Friendica password"] = "Пароль Friendica";
+App::$strings["Friendica Crosspost Connector"] = "Публикаци� в Friendica";
+App::$strings["Post to Friendica"] = "Опубликовать в Friendica";
+App::$strings["Who likes me?"] = "Кому � нравлю�ь?";
+App::$strings["Show Upload Limits"] = "Показать ограничени� на загрузку";
+App::$strings["Hubzilla configured maximum size: "] = "Мак�имальный размер на�троенный в Hubzilla:";
+App::$strings["PHP upload_max_filesize: "] = "";
+App::$strings["PHP post_max_size (must be larger than upload_max_filesize): "] = "PHP post_max_size (должен быть больше чем upload_max_filesize): ";
+App::$strings["An account has been created for you."] = "Учётна� запи�ь, котора� была дл� ва� �оздана.";
+App::$strings["Authentication successful but rejected: account creation is disabled."] = "�утентификаци� выполнена у�пешно, но отклонена: �оздание учетной запи�и отключено.";
+App::$strings["QR code"] = "QR-код";
+App::$strings["QR Generator"] = "Генератор QR-кодов";
+App::$strings["Enter some text"] = "Введите любой тек�т";
+App::$strings["Send email to all members"] = "Отправить email в�ем уча�тникам";
+App::$strings["No recipients found."] = "Получателей не найдено.";
+App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d из %2\$d �ообщений отправлено.";
+App::$strings["Send email to all hub members."] = "Отправить email в�ем уча�тникам узла.";
+App::$strings["Message subject"] = "Тема �ообщени�";
+App::$strings["Sender Email address"] = "�дре� �лектронной почты отправител�";
+App::$strings["Test mode (only send to hub administrator)"] = "Те�товый режим (отправка только админи�тратору узла)";
+App::$strings["Logfile archive directory"] = "Каталог архивировани� журнала";
+App::$strings["Directory to store rotated logs"] = "Каталог дл� хранени� заархивированных журналов";
+App::$strings["Logfile size in bytes before rotating"] = "Размер файла журнала в байтах дл� архивировани�";
+App::$strings["Number of logfiles to retain"] = "Количе�тво �охран�емых файлов журналов";
+App::$strings["Smileybutton App"] = "Приложение \"Кнопка �о �майликам\"";
+App::$strings["Adds a smileybutton to the jot editor"] = "Добавл�ть кнопку �о �майликами в редактор Jot";
+App::$strings["Hide the button and show the smilies directly."] = "Скрыть кнопку и �разу показывать �майлики.";
+App::$strings["Smileybutton Settings"] = "�а�тройки кнопки �о �майликами";
+App::$strings["Possible adult content"] = "Возможно �одержимое дл� взро�лых";
+App::$strings["%s - view"] = "%s -  про�мотр";
+App::$strings["NSFW Settings saved."] = "�а�тройки NSFW �охранены.";
+App::$strings["NSFW App"] = "Приложение NSFW";
+App::$strings["Collapse content that contains predefined words"] = "Свернуть �одержимое, �одержащее предопределенные �лова";
+App::$strings["This app looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Это приложение про�матривает публикации дл� �лов / тек�та, которые вы указываете ниже, и �ворачивает любой контент, �одержащий �ти ключевые �лова, по�тому он не отображает�� в неподход�щее врем�, например, �ек�уальные ин�инуации, которые могут быть неправильными в на�тройке работы. �апример, мы рекомендуем отмечать любой контент, �одержащий наготу, тегом #NSFW. Этот фильтр также �по�обен реагировать на любое другое указанное вами �лово / тек�т и может и�пользовать�� в каче�тве фильтра �одержимого общего назначени�.";
+App::$strings["Comma separated list of keywords to hide"] = "Спи�ок ключевых �лов дл� �крыти�, через зап�тую";
+App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "�лово, /регул�рное_выражение/, lang=xx, lang!=xx";
+App::$strings["NSFW"] = "";
+App::$strings["Redmatrix File Storage Import"] = "Импорт файлового хранилища Redmatrix";
+App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Это позволит импортировать в�е ваши файлы в Redmatrix в �тот канал.";
+App::$strings["OpenID protocol error. No ID returned."] = "Ошибка протокола OpenID. Идентификатор не возвращён.";
+App::$strings["Welcome %s. Remote authentication successful."] = "Добро пожаловать %s. Удаленна� аутентификаци� у�пешно завершена.";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Мы �толкнули�ь � проблемой входа � предо�тавленным вами OpenID. Пожалуй�та, проверьте корректно�ть его напи�ани�.";
+App::$strings["The error message was:"] = "Сообщение об ошибке было:";
+App::$strings["First Name"] = "Им�";
+App::$strings["Last Name"] = "Фамили�";
+App::$strings["Full Name"] = "Полное им�";
+App::$strings["Profile Photo 16px"] = "Фотографи� профил� 16px";
+App::$strings["Profile Photo 32px"] = "Фотографи� профил� 32px";
+App::$strings["Profile Photo 48px"] = "Фотографи� профил� 48px";
+App::$strings["Profile Photo 64px"] = "Фотографи� профил� 64px";
+App::$strings["Profile Photo 80px"] = "Фотографи� профил� 80px";
+App::$strings["Profile Photo 128px"] = "Фотографи� профил� 128px";
+App::$strings["Birth Year"] = "Год рождени�";
+App::$strings["Birth Month"] = "Ме��ц рождени�";
+App::$strings["Birth Day"] = "День рождени�";
+App::$strings["Birthdate"] = "Дата рождени�";
+App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "И�кать %1\$s (%2\$s)";
+App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
+App::$strings["Search \$Projectname"] = "Пои�к \$Projectname";
+App::$strings["Livejournal Crosspost Connector App"] = "Приложение \"Публикаци� в Livejournal\"";
+App::$strings["Relay public posts to Livejournal"] = "Пере�ылает общедо�тупные публикации в Livejournal";
+App::$strings["Livejournal username"] = "Им� пользовател� Livejournal";
+App::$strings["Livejournal password"] = "Пароль Livejournal";
+App::$strings["Post to Livejournal by default"] = "Публиковать в Livejournal по умолчанию";
+App::$strings["Send wall-to-wall posts to Livejournal"] = "Отправл�ть публикации на �тене в Livejournal";
+App::$strings["Livejournal Crosspost Connector"] = "Публикаци� в Livejournal";
+App::$strings["Post to Livejournal"] = "Опубликовать в Livejournal";
+App::$strings["Posted by"] = "Опубликовано";
+App::$strings["Hide Aside App"] = "Скрывать приложени�";
+App::$strings["Fade out aside areas after a while when using endless scroll"] = "Через некоторое врем� при и�пользовании прокрутки обла�ть приложений и�чезает";
+App::$strings["Pump.io Settings saved."] = "�а�тройки Pump.io �охранены.";
+App::$strings["Pump.io Crosspost Connector App"] = "Приложение \"Публикаци� в Pump.io\"";
+App::$strings["Relay public posts to pump.io"] = "Пере�ылает общедо�тупные публикации в Pump.io";
+App::$strings["Pump.io servername"] = "Им� �ервера Pump.io";
+App::$strings["Without \"http://\" or \"https://\""] = "Без \"http://\" или \"https://\"";
+App::$strings["Pump.io username"] = "Им� пользовател� Pump.io";
+App::$strings["Without the servername"] = "без имени �ервера";
+App::$strings["You are not authenticated to pumpio"] = "Вы не аутентифицированы на Pump.io";
+App::$strings["(Re-)Authenticate your pump.io connection"] = "�утентифицировать (повторно) ваше �оединение � Pump.io";
+App::$strings["Post to pump.io by default"] = "Публиковать в Pump.io по умолчанию";
+App::$strings["Should posts be public"] = "Публикации должны быть общедо�тупными";
+App::$strings["Mirror all public posts"] = "Отображать в�е общедо�тупные публикации";
+App::$strings["Pump.io Crosspost Connector"] = "Публикаци� в Pump.io";
+App::$strings["You are now authenticated to pumpio."] = "Вы аутентифицированы в Pump.io";
+App::$strings["return to the featured settings page"] = "Вернут�� к �транице на�троек";
+App::$strings["Post to Pump.io"] = "Опубликовать в Pump.io";
+App::$strings["Your channel has been upgraded to \$Projectname version"] = "Ваш канал был обновлён до вер�ии \$Projectname";
+App::$strings["Please have a look at the"] = "Пожалуй�та, взгл�ните на";
+App::$strings["git history"] = "журнал изменений";
+App::$strings["change log"] = "и�торию git";
+App::$strings["for further info."] = "дл� дополнительных �ведений.";
+App::$strings["Upgrade Info"] = "Сведени� об обновлении";
+App::$strings["Do not show this again"] = "Больше не показывать";
+App::$strings["text to include in all outgoing posts from this site"] = "тек�т, который будет добавлен во в�е и�ход�щие публикации � �того �айта";
+App::$strings["Random Planet App"] = "Приложение \"Случайна� планета\"";
+App::$strings["Set a random planet from the Star Wars Empire as your location when posting"] = "У�тановить �лучайную планету из Империи Звездных Войн в каче�тве вашего ме�тоположени� при публикации";
+App::$strings["Insane Journal Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Insane Journal �охранены.";
+App::$strings["Insane Journal Crosspost Connector App"] = "Приложение \"Публикаци� в Insane Journal\"";
+App::$strings["Relay public postings to Insane Journal"] = "Пере�ылает общедо�тупные публикации в Insane Journal";
+App::$strings["InsaneJournal username"] = "Им� пользовател� Insane Journal";
+App::$strings["InsaneJournal password"] = "Пароль Insane Journal";
+App::$strings["Post to InsaneJournal by default"] = "Публиковать в Insane Journal по умолчанию";
+App::$strings["Insane Journal Crosspost Connector"] = "Публикаци� в Insane Journal";
+App::$strings["Post to Insane Journal"] = "Опубликовать в Insane Journal";
+App::$strings["Add some colour to tag clouds"] = "Добавить немного цвета дл� облака тегов";
+App::$strings["Rainbow Tag App"] = "Приложение \"Радуга тегов\"";
+App::$strings["Rainbow Tag"] = "Радуга тегов";
+App::$strings["Post to Libertree"] = "Опубликовать в Libertree";
+App::$strings["Libertree Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Libertree �охранены.";
+App::$strings["Libertree Crosspost Connector App"] = "Приложение \"Пере�ылка публикаций Libertree\"";
+App::$strings["Relay public posts to Libertree"] = "Пере�ылает общедо�тупные публикации в Libertree";
+App::$strings["Libertree API token"] = "Токен Libertree API";
+App::$strings["Libertree site URL"] = "URL �айта Libertree";
+App::$strings["Post to Libertree by default"] = "Публиковать в Libertree по умолчанию";
+App::$strings["Libertree Crosspost Connector"] = "Пере�ылка публикаций Libertree";
+App::$strings["No server specified"] = "Сервер не указан";
+App::$strings["Posts imported"] = "Публикации импортированы";
+App::$strings["Files imported"] = "Файлы импортированы";
+App::$strings["This addon app copies existing content and file storage to a cloned/copied channel. Once the app is installed, visit the newly installed app. This will allow you to set the location of your original channel and an optional date range of files/conversations to copy."] = "Это дополнительное приложение копирует �уще�твующее �одержимое и хранилище файлов в клонированный / �копированный канал. По�ле того, как приложение у�тановлено, по�етите его �траницу. Это позволит вам задать ме�тоположение вашего и�ходного канала и диапазон дат файлов / бе�ед дл� копировани�.";
+App::$strings["This will import all your conversations and cloud files from a cloned channel on another server. This may take a while if you have lots of posts and or files."] = "Импортировать в�е ваши разговоры и хранилище файлов из клонируемого канала на другом �ервере. Это может зан�ть некоторое врем�, е�ли у ва� много публикаций и / или файлов.";
+App::$strings["Include posts"] = "Включа� публикации";
+App::$strings["Conversations, Articles, Cards, and other posted content"] = "Бе�еды, Статьи, Карточки и другое опубликованное �одержимое";
+App::$strings["Include files"] = "Включа� файлы";
+App::$strings["Files, Photos and other cloud storage"] = "Файлы, Фотографии и прочее из хранилища";
+App::$strings["Original Server base URL"] = "Базовый URL �ервера-и�точника";
+App::$strings["pageheader Settings saved."] = "�а�тройки шапки �траницы �охранены.";
+App::$strings["Page Header App"] = "Приложение \"Заголовок �траницы\"";
+App::$strings["Inserts a page header"] = "В�тавл�ет заголовок �траницы";
+App::$strings["Message to display on every page on this server"] = "Отображаемое �ообщение на каждой �транице на �том �ервере.";
+App::$strings["Page Header"] = "Заголовок �траницы";
+App::$strings["Project Servers and Resources"] = "Серверы и ре�ур�ы проекта";
+App::$strings["Project Creator and Tech Lead"] = "Создатель проекта и техниче�кий руководитель";
+App::$strings["And the hundreds of other people and organisations who helped make the Hubzilla possible."] = "И �отни других людей и организаций которые помогали в �оздании Hubzilla.";
+App::$strings["The Redmatrix/Hubzilla projects are provided primarily by volunteers giving their time and expertise - and often paying out of pocket for services they share with others."] = "Проекты Redmatrix / Hubzilla предо�тавл�ют��, в о�новном, добровольцами, которые предо�тавл�ют �вое врем� и опыт и, ча�то, оплачивают из �воего кармана у�луги, которыми они дел�т�� � другими.";
+App::$strings["There is no corporate funding and no ads, and we do not collect and sell your personal information. (We don't control your personal information - <strong>you do</strong>.)"] = "Зде�ь нет корпоративного финан�ировани� и рекламы, мы не �обираем и не продаем вашу личную информацию. (Мы не контролируем вашу личную информацию - <strong>�то делаете вы</strong>.)";
+App::$strings["Help support our ground-breaking work in decentralisation, web identity, and privacy."] = "Помогите поддержать нашу новатор�кую работу в обла�т�х децентрализации, веб-идентификации и конфиденциально�ти.";
+App::$strings["Your donations keep servers and services running and also helps us to provide innovative new features and continued development."] = "В ваших пожертвовани�х поддерживают �ерверы и �лужбы, а также помогают нам предо�тавл�ть новые возможно�ти и продолжать развитие.";
+App::$strings["Donate"] = "Пожертвовать";
+App::$strings["Choose a project, developer, or public hub to support with a one-time donation"] = "Выберите проект, разработчика или общедо�тупный узел дл� поддержки в форме единоразового пожертвовани�";
+App::$strings["Donate Now"] = "Пожертвовать �ейча�";
+App::$strings["<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"] = "<strong><em>или</em></strong> �таньте �пон�ором проекта (только дл� Hubzilla)";
+App::$strings["Please indicate if you would like your first name or full name (or nothing) to appear in our sponsor listing"] = "Пожалуй�та, е�ли желаете, укажите ваше им� дл� отображени� в �пи�ке �пон�оров.";
+App::$strings["Sponsor"] = "Спон�ор";
+App::$strings["Special thanks to: "] = "О�обые благодарно�ти:";
+App::$strings["Jabber BOSH host"] = "Узел Jabber BOSH";
+App::$strings["Use central userbase"] = "И�пользовать центральную базу данных";
+App::$strings["If enabled, members will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Е�ли включено, уча�тники автоматиче�ки войдут на �ервер ejabberd, который должен быть у�тановлен на �том компьютере � �инхронизированными учетными данными через �крипт \"auth_ejabberd.php\".";
+App::$strings["XMPP settings updated."] = "�а�тройки XMPP обновлены.";
+App::$strings["XMPP App"] = "Приложение XMPP";
+App::$strings["Embedded XMPP (Jabber) client"] = "В�тренный клиент XMPP (Jabber)";
+App::$strings["Individual credentials"] = "Индивидуальные разрешени�";
+App::$strings["Jabber BOSH server"] = "Сервер Jabber BOSH";
+App::$strings["XMPP Settings"] = "�а�тройки XMPP";
+App::$strings["Use markdown for editing posts"] = "И�пользовать �зык разметки Markdown дл� редактировани� публикаций";
+App::$strings["Post to Dreamwidth"] = "Публиковать в Dreamwidth";
+App::$strings["Dreamwidth Crosspost Connector Settings saved."] = "�а�тройки пере�ылки публикаций Dreamwidth �охранены.";
+App::$strings["Dreamwidth Crosspost Connector App"] = "Приложение \"Публикаци� в Dreamwidth\"";
+App::$strings["Relay public posts to Dreamwidth"] = "Пере�ылать общедо�тупные публикации в Dreamwidth";
+App::$strings["Dreamwidth username"] = "Им� пользовател� Dreamwidth";
+App::$strings["Dreamwidth password"] = "Пароль Dreamwidth";
+App::$strings["Post to Dreamwidth by default"] = "Публиковать в Dreamwidth по умолчанию";
+App::$strings["Dreamwidth Crosspost Connector"] = "Публикаци� в Dreamwidth";
+App::$strings["New registration"] = "�ова� реги�траци�";
+App::$strings["Message sent to %s. New account registration: %s"] = "Сообщение отправлено в %s. Реги�траци� нового аккаунта: %s";
+App::$strings["Workflow user."] = "Пользователь \"Рабочего проце��а\".";
+App::$strings["This channel"] = "Этот канал";
+App::$strings["Workflow"] = "Рабочий проце��";
+App::$strings["No Workflows Available"] = "�ет до�тупных рабочих проце��ов";
+App::$strings["Add item to which workflow"] = "Подключить рабочий проце�� к �лементу";
+App::$strings["Create Workflow Item"] = "Создать �лемент рабочего проце��а";
+App::$strings["Link"] = "С�ылка";
+App::$strings["Web link."] = "Веб-��ылка.";
+App::$strings["Brief description or title"] = "Подробное опи�ание или заголовок";
+App::$strings["Notes and Info"] = "Замечани� и информаци�";
+App::$strings["Body"] = "Тек�т";
+App::$strings["Workflow Settings"] = "�а�тройки \"Рабочего проце��а\"";
+App::$strings["Hubzilla Directory Stats"] = "Каталог �тати�тики Hubzilla";
+App::$strings["Total Hubs"] = "В�его хабов";
+App::$strings["Hubzilla Hubs"] = "Хабы Hubzilla";
+App::$strings["Friendica Hubs"] = "Хабы Friendica";
+App::$strings["Diaspora Pods"] = "Стручки Diaspora";
+App::$strings["Hubzilla Channels"] = "Каналы Hubzilla";
+App::$strings["Friendica Channels"] = "Каналы Friendica";
+App::$strings["Diaspora Channels"] = "Каналы Diaspora";
+App::$strings["Aged 35 and above"] = "Возра�т 35 и выше";
+App::$strings["Aged 34 and under"] = "Возра�т 34 и ниже";
+App::$strings["Average Age"] = "Средний возра�т";
+App::$strings["Known Chatrooms"] = "Изве�тные чаты";
+App::$strings["Known Tags"] = "Изве�тные теги";
+App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network.  This also applies to chatrooms,"] = "Обратите внимание, что �тати�тика Diaspora и Friendica �то только те, о которых ** �тот каталог ** знает, а не в�е изве�тные в �ети. Это также отно�ит�� и к чатам.";
+App::$strings["WYSIWYG status editor"] = "WYSIWYG редактор �тату�а ";
+App::$strings["WYSIWYG Status App"] = "Приложение \"WYSIWYG �тату�\"";
+App::$strings["WYSIWYG Status"] = "WYSIWYG �тату�";
+App::$strings["lonely"] = "одинокий";
+App::$strings["drunk"] = "пь�ный";
+App::$strings["horny"] = "возбуждённый";
+App::$strings["stoned"] = "под кайфом";
+App::$strings["fucked up"] = "облажал��";
+App::$strings["clusterfucked"] = "в полной заднице";
+App::$strings["crazy"] = "�ума�шедший";
+App::$strings["hurt"] = "обиженный";
+App::$strings["sleepy"] = "�онный";
+App::$strings["grumpy"] = "�ердитый";
+App::$strings["high"] = "кайфует";
+App::$strings["semi-conscious"] = "в полубез�ознании";
+App::$strings["in love"] = "влюблённый";
+App::$strings["in lust"] = "похотливый";
+App::$strings["naked"] = "обнажённый";
+App::$strings["stinky"] = "вонючий";
+App::$strings["sweaty"] = "потный";
+App::$strings["bleeding out"] = "и�текающий кровью";
+App::$strings["victorious"] = "победивший";
+App::$strings["defeated"] = "проигравший";
+App::$strings["envious"] = "завидует";
+App::$strings["jealous"] = "ревнует";
+App::$strings["You're welcome."] = "Пожалуй�та.";
+App::$strings["Ah shucks..."] = "О, чёрт...";
+App::$strings["Don't mention it."] = "�е �тоит благодарно�ти.";
+App::$strings["&lt;blush&gt;"] = "&lt;кра�нею&gt;";
+App::$strings["Send test email"] = "Отправить те�товый email";
+App::$strings["Mail sent."] = "Сообщение отправлено";
+App::$strings["Sending of mail failed."] = "�е удало�ь отправить �ообщение.";
+App::$strings["Mail Test"] = "Те�товое �ообщение";
+App::$strings["You haven't set a TOTP secret yet.\nPlease click the button below to generate one and register this site\nwith your preferred authenticator app."] = "Вы еще не у�тановили �екретный код TOTP. Пожалуй�та, нажмите на кнопку ниже, чтобы �генерировать его и зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации.";
+App::$strings["Your TOTP secret is"] = "Ваш �екретный код TOTP";
+App::$strings["Be sure to save it somewhere in case you lose or replace your mobile device.\nUse your mobile device to scan the QR code below to register this site\nwith your preferred authenticator app."] = "Об�зательно �охраните его где-нибудь на �лучай потери или замены мобильного у�трой�тва. С помощью мобильного у�трой�тва от�канируйте приведенный ниже QR-код, чтобы зареги�трировать �тот �айт в предпочитаемом вами приложении дл� аутентификации.";
+App::$strings["Test"] = "Те�т";
+App::$strings["Generate New Secret"] = "Сгенерировать новый код";
+App::$strings["Go"] = "Вперёд";
+App::$strings["Enter your password"] = "Введите ваш пароль";
+App::$strings["enter TOTP code from your device"] = "введите код TOTP из вашего у�трой�тва";
+App::$strings["Pass!"] = "Прин�то!";
+App::$strings["Fail"] = "Отказано";
+App::$strings["Incorrect password, try again."] = "�еверный пароль, попробуйте �нова.";
+App::$strings["Record your new TOTP secret and rescan the QR code above."] = "Запишите ваш �екретный код TOTP и повторно от�канируйте приведенный ниже QR-код.";
+App::$strings["TOTP Settings"] = "�а�тройки TOTP";
+App::$strings["TOTP Two-Step Verification"] = "Двух�тапна� верификаци� TOTP";
+App::$strings["Enter the 2-step verification generated by your authenticator app:"] = "Введите код проверки, �озданный вашим приложением дл� аутентификации";
+App::$strings["Success!"] = "У�пех!";
+App::$strings["Invalid code, please try again."] = "�еверный код. Пожалуй�та, попробуйте ещё раз.";
+App::$strings["Too many invalid codes..."] = "Слишком много неверных кодов...";
+App::$strings["Verify"] = "Проверить";
+App::$strings["Send your identity to all websites"] = "Отправить ваши данные на в�е веб-�айты";
+App::$strings["Sendzid App"] = "Приложение \"Отправить ZID\"";
+App::$strings["Send ZID"] = "Отправить ZID";
+App::$strings["Messages"] = "Сообщени�";
+App::$strings["message"] = "�ообщение";
+App::$strings["Conversation removed."] = "Бе�еда удалена.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "И�текает YYYY-MM-DD HH:MM";
+App::$strings["Delete message"] = "Удалить �ообщение";
+App::$strings["Delivery report"] = "Отчёт о до�тавке";
+App::$strings["Recall message"] = "Отозвать �ообщение";
+App::$strings["Message has been recalled."] = "Сообщение отозванно";
+App::$strings["Delete Conversation"] = "Удалить бе�еду";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Безопа�на� �в�зь недо�тупна. Вы <strong>можете</strong> попытать�� ответить �о �траницы профил� отправител�.";
+App::$strings["Send Reply"] = "Отправить ответ";
+App::$strings["To:"] = "Кому:";
+App::$strings["Your message for %s (%s):"] = "Ваше �ообщение дл� %s (%s):";
+App::$strings["Attach file"] = "Прикрепить файл";
+App::$strings["Max queueworker threads"] = "Мак�. количе�тво обработчиков очереди";
+App::$strings["Minimum 4, default 4"] = "Минимум 4, по умолчанию 4";
+App::$strings["Assume workers dead after"] = "Считать обработчики неактивными по�ле";
+App::$strings["Minimum 120, default 300 seconds"] = "Минимум 120, по умолчанию 300 �екунд";
+App::$strings["Pause before starting next task"] = "Задержка перед запу�ком �ледующей задачи";
+App::$strings["Minimum 100, default 100 microseconds"] = "Минимум 100, по умолчанию 100 микро�екунд";
+App::$strings["Queueworker Settings"] = "�а�тройки обработчика очереди";
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5f469eb7b..3b74c5ea1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -47,14 +47,13 @@ main {
 }
 
 #overlay {
-	position: absolute;
+	position: fixed;
 	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: rgba(0, 0, 0, .5);
+	left: $left_aside_widthpx;
+	width: 100vw;
+	height: 100vh;
+	background: rgba(0, 0, 0, .3);
 	cursor: pointer;
-	z-index: 1028;
 }
 
 h1, .h1 {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index b0b8d5dfc..9312d8390 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
 			if($(window).width() < 992) {
 				$('main').css('width', $(window).width() + $('aside').outerWidth() );
 			} else {
-				$('main').css('width', '100%' );
+				$('main').css('width', '100%');
 			}
 		});
 	}
@@ -20,15 +20,15 @@ $(document).ready(function() {
 	stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
 	stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
 
-	$('#expand-aside').on('click', toggleAside);
-
-	$('section').on('click', function() {
+	$('#expand-aside').on('click', function() {
 		if($('main').hasClass('region_1-on')){
-			toggleAside();
+			toggleAside('left');
+		}
+		else {
+			toggleAside('right');
 		}
 	});
 
-
 	$('.usermenu').click(function() {
 		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
 			$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
@@ -69,6 +69,49 @@ $(document).ready(function() {
 		}
 	}
 	setInterval(function () {checkNotify();}, 10 * 1000);
+
+	var touch_start = null;
+	var touch_max = window.innerWidth / 10;
+
+	window.addEventListener('touchstart', function(e) {
+		if (e.touches.length === 1){
+			//just one finger touched
+			touch_start = e.touches.item(0).clientX;
+			if (touch_start < touch_max) {
+				$('html, body').css('overflow-y', 'hidden');
+			}
+		}
+		else {
+			//a second finger hit the screen, abort the touch
+			touch_start = null;
+		}
+	});
+
+	window.addEventListener('touchend', function(e) {
+		$('html, body').css('overflow-y', '');
+
+		let touch_offset = 30; //at least 30px are a swipe
+		if (touch_start) {
+			//the only finger that hit the screen left it
+			let touch_end = e.changedTouches.item(0).clientX;
+
+			if (touch_end > (touch_start + touch_offset)) {
+				//a left -> right swipe
+				if (touch_start < touch_max) {
+					toggleAside('right');
+				}
+			}
+			if (touch_end < (touch_start - touch_offset)) {
+				//a right -> left swipe
+				//toggleAside('left');
+			}
+		}
+	});
+
+	$(document).on('hz:hqControlsClickAction', function(e) {
+		toggleAside('left');
+	});
+
 });
 
 function setStyle(element, cssProperty) {
@@ -136,16 +179,18 @@ function makeFullScreen(full) {
 	}
 }
 
-function toggleAside() {
-	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-	if($('main').hasClass('region_1-on')){
-		$('html, body').css('overflow-x', '');
-		$('main').removeClass('region_1-on')
+function toggleAside(swipe) {
+
+	if ($('main').hasClass('region_1-on') && swipe === 'left') {
+		$('#expand-aside-icon').addClass('fa-arrow-circle-right').removeClass('fa-arrow-circle-left');
+		$('html, body').css({ 'position': '', left: '' });
+		$('main').removeClass('region_1-on');
 		$('#overlay').remove();
 	}
-	else {
-		$('html, body').css('overflow-x', 'hidden');
-		$('main').addClass('region_1-on')
-		$('<div id="overlay"></div>').appendTo('section');
+	if (!$('main').hasClass('region_1-on') && swipe === 'right') {
+		$('#expand-aside-icon').removeClass('fa-arrow-circle-right').addClass('fa-arrow-circle-left');
+		$('html, body').css({ 'position': 'sticky',  'left': '0px'});
+		$('main').addClass('region_1-on');
+		$('<div id="overlay"></div>').appendTo('body').one('click', function() { toggleAside('left'); });
 	}
 }
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 2b90ae85f..3c07e1582 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -4,8 +4,8 @@
  *   * Name: Redbasic
  *   * Description: Hubzilla standard theme
  *   * Version: 2.1
- *   * MinVersion: 2.3.1
- *   * MaxVersion: 6.0
+ *   * MinVersion: 5.9
+ *   * MaxVersion: 7.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin
  *   * Maintainer: Mario Vavti
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
index 28cd11b2e..823453843 100644
--- a/view/tpl/cdav_calendar.tpl
+++ b/view/tpl/cdav_calendar.tpl
@@ -24,16 +24,16 @@ $(document).ready(function() {
 	calendar = new FullCalendar.Calendar(calendarEl, {
 		plugins: [ 'interaction', 'dayGrid', 'timeGrid', 'list' ],
 		eventSources: [ {{$sources}} ],
-		
+
 		timeZone: '{{$timezone}}',
 
 		locale: '{{$lang}}',
 
 		eventTextColor: 'white',
 		header: false,
-		
+
 		height: 'auto',
-		
+
 		firstDay: {{$first_day}},
 
 		defaultView: default_view,
@@ -59,7 +59,7 @@ $(document).ready(function() {
 		allDayText: aStr['allday'],
 
 		snapDuration: '00:05:00',
-		
+
 		dateClick: function(info) {
 			if(new_event.id) {
 				var event_poi = calendar.getEventById(new_event.id);
@@ -151,7 +151,7 @@ $(document).ready(function() {
 				event_poi.remove();
 				new_event = {};
 			}
-			
+
 			var calendar_id = ((event.extendedProps.calendar_id.constructor === Array) ? event.extendedProps.calendar_id[0] + ':' + event.extendedProps.calendar_id[1] : event.extendedProps.calendar_id);
 
 			if(!event.extendedProps.recurrent) {
@@ -209,7 +209,7 @@ $(document).ready(function() {
 				$('#calendar_select').val(calendar_id).attr('disabled', true).trigger('change');
 			}
 		},
-		
+
 		eventResize: function(info) {
 
 			var event = info.event._def;
@@ -258,13 +258,13 @@ $(document).ready(function() {
 				});
 			}
 		},
-		
+
 		eventDrop: function(info) {
 
 			var event = info.event._def;
 			var dtstart = new Date(info.event._instance.range.start);
 			var dtend = new Date(info.event._instance.range.end);
-			
+
 			$('#id_title').val(event.title);
 			$('#id_dtstart').val(dtstart.toUTCString().slice(0, -4));
 			$('#id_dtend').val(dtend.toUTCString().slice(0, -4));
@@ -316,24 +316,24 @@ $(document).ready(function() {
 				$('#today-btn > i').show();
 			}
 		}
-		
+
 	});
-	
+
 	calendar.render();
 
 	$('#title').text(calendar.view.title);
 	$('#view_selector').html(views[calendar.view.type]);
-	
+
 	$('#today-btn').on('click', function() {
 		calendar.today();
 		$('#title').text(calendar.view.title);
 	});
-	
+
 	$('#prev-btn').on('click', function() {
  		 calendar.prev();
  		 $('#title').text(calendar.view.title);
 	});
-	
+
 	$('#next-btn').on('click', function() {
  		 calendar.next();
  		 $('#title').text(calendar.view.title);
@@ -345,7 +345,7 @@ $(document).ready(function() {
 		else
 			$('#dbtn-acl, #id_categories_wrapper').addClass('d-none');
 	});
-	
+
 	$('.color-edit').colorpicker({ input: '.color-edit-input' });
 
 	$(document).on('click','#fullscreen-btn', updateSize);
@@ -481,9 +481,13 @@ function on_submit() {
 		})
 		.done(function() {
 			var eventSource = calendar.getEventSourceById('channel_calendar');
-			eventSource.refetch();
+			if (eventSource) {
+				eventSource.refetch();
+			}
+			else {
+				$.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 });
+			}
 			reset_form();
-
 		});
 
 	}
@@ -503,9 +507,13 @@ function on_submit() {
 		.done(function() {
 			var parts = $('#calendar_select').val().split(':');
 			var eventSource = calendar.getEventSourceById(parts[0]);
-			eventSource.refetch();
+			if (eventSource) {
+				eventSource.refetch();
+			}
+			else {
+				$.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 });
+			}
 			reset_form();
-
 		});
 	}
 }
@@ -549,7 +557,7 @@ function reset_form() {
 		event_poi.remove();
 		new_event = {};
 	}
-	
+
 	if($('#more_block').hasClass('open'))
 		on_more();
 }
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index 63e09ec05..0ff52831d 100644
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -37,10 +37,6 @@
 	<div class="channel-notifications-wrapper">
 		{{if !$channel.delegate}}
 		<div class="channel-notification">
-			<i class="fa fa-fw fa-envelope{{if $channel.mail != 0}} text-danger{{/if}}"></i>
-			{{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}}
-		</div>
-		<div class="channel-notification">
 			<i class="fa fa-fw fa-user{{if $channel.intros != 0}} text-danger{{/if}}"></i>
 			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
 		</div>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 7ef957b7e..2f224b3cf 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -110,7 +110,9 @@ $(document).ready(function() {
 	$('#chatroom_bookmarks, #vcard').hide();
 	$('#chatroom_list, #chatroom_members').show();
 	adjustInlineTopBarHeight();
-    chatNotificationInit();
+	$('#toggle-notifications').one('click', function() {
+		chatNotificationInit();
+	});
 });
 
 $(window).resize(function () {
@@ -141,7 +143,7 @@ function load_chats() {
 			$('#chat-top-spinner').hide();
 		}
 	});
-	
+
 	chat_timer = setTimeout(load_chats,10000);
 
 }
@@ -218,7 +220,7 @@ var chat_notify_audio = {};
 // Request notification access from the user
 // TODO: Check Hubzilla member config setting before requesting permission
 function chatNotificationInit() {
-  
+
     if (!("Notification" in window)) {
         window.console.log("This browser does not support system notifications");
     }
@@ -258,8 +260,8 @@ var chat_issue_notification = function (theBody,theTitle) {
     }
     var n = new Notification(theTitle,options);
     n.onclick = function (event) {
-        setTimeout(n.close.bind(n), 300); 
-    } 
+        setTimeout(n.close.bind(n), 300);
+    }
     if(chat_notify_audio_enabled) {
       chat_notify_audio.play();
     }
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 361392796..2134f86e7 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -189,11 +189,11 @@
 									{{/foreach}}
 									{{/if}}
 									{{if $item.drop.dropping}}
-									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}', '{{$item.mid}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 									{{/if}}
 									{{if $item.dropdown_extras}}
 									<div class="dropdown-divider"></div>
-                                                                        {{$item.dropdown_extras}}
+									{{$item.dropdown_extras}}
 									{{/if}}
 									{{if $item.edpost && $item.dreport}}
 									<div class="dropdown-divider"></div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index ee5dc9742..af6cc0557 100644
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -124,7 +124,7 @@
 									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
 										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
+									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
 										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
 									</a>
@@ -169,12 +169,16 @@
 									{{/foreach}}
 									{{/if}}
 									{{if $item.drop.dropping}}
-									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
+									<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}', '{{$item.mid}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 									{{/if}}
-									<div class="dropdown-divider"></div>
 									{{if $item.edpost && $item.dreport}}
+									<div class="dropdown-divider"></div>
 									<a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a>
 									{{/if}}
+									{{if $item.settings}}
+									<div class="dropdown-divider"></div>
+									<a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a>
+									{{/if}}
 								</div>
 							</div>
 						</div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index ecb30afd3..bf61a7ee4 100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -17,6 +17,7 @@
 	var channelId = {{if $channel_id}}{{$channel_id}}{{else}}false{{/if}};{{* Used in e.g. autocomplete *}}
 	var preloadImages = {{$preload_images}};
 	var auto_save_draft = {{$auto_save_draft}};
+	{{if $module}}var module = '{{$module}}';{{/if}}
 </script>
 
 
diff --git a/view/tpl/hq.tpl b/view/tpl/hq.tpl
deleted file mode 100644
index 099d892bb..000000000
--- a/view/tpl/hq.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="jot-popup">
-{{$editor}}
-</div>
-
diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl
index d7f6d436f..3adbfa7c0 100644
--- a/view/tpl/hq_controls.tpl
+++ b/view/tpl/hq_controls.tpl
@@ -1,8 +1,7 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{foreach $menu as $m}}
-		<li class="nav-item"><a href="{{$m.href}}" id="{{$m.id}}" class="nav-link{{if $m.class}} {{$m.class}}{{/if}}">{{$m.label}}</a></li>
-		{{/foreach}}
-	</ul>
+<div class="mb-3{{if $wrapper_class}} {{$wrapper_class}}{{/if}}">
+	{{foreach $entries as $e}}
+	<button class="{{$e.class}} rounded-circle{{if $entry_class}} {{$entry_class}}{{/if}}" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}>
+		{{if $e.icon}}<i class="fa fa-{{$e.icon}} mt-1 mb-1"></i>{{/if}}
+	</button>
+	{{/foreach}}
 </div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index b24283664..8da7b429d 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -320,7 +320,9 @@ var activeCommentText = '';
 
 		postSaveChanges('clean');
 
-		{{if $reset}}
+		{{if $popup}}
+		$("#profile-jot-text").focus();
+		{{else if $reset}}
 		$(".jothidden").hide();
 		$("#profile-jot-text").removeClass('jot-expanded');
 		$("#profile-jot-tools").addClass('d-none');
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index b0497fe99..adc7734ec 100644
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -24,9 +24,11 @@
 				<i class="fa fa-cog"></i>
 			</button>
 			<div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
-				{{if $mail.can_recall}}
+				{{** if $mail.can_recall}}
 				<a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
-				{{/if}}
+				{{/if **}}
+				<a class="dropdown-item" href="mail/{{$mail.id}}/download" id="mail-conv-download-icon-{{$mail.id}}"><i class="fa fa-fw fa-download"></i>&nbsp;{{$mail.download}}</a>
+				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
 				{{if $mail.can_recall}}
 				<div class="dropdown-divider"></div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index 2ac61bf76..a45d1d177 100644
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -4,6 +4,8 @@
 		<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
 		<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
 		<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
+{{**
 		<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
+**}}
 	</ul>
 </div>
diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl
new file mode 100644
index 000000000..2d7ab99df
--- /dev/null
+++ b/view/tpl/messages_widget.tpl
@@ -0,0 +1,134 @@
+<ul class="nav nav-tabs nav-fill clearfix">
+	<li class="nav-item">
+		<a class="nav-link active messages-type" href="#" title="{{$strings.messages_title}}" data-messages_type="">
+			<i class="fa fa-fw fa-comment-o"></i>
+		</a>
+	</li>
+	<li class="nav-item">
+		<a class="nav-link messages-type" href="#" title="{{$strings.direct_messages_title}}" data-messages_type="direct">
+			<i class="fa fa-fw fa-envelope-o"></i>
+		</a>
+	</li>
+	{{if $feature_star}}
+	<li class="nav-item">
+		<a class="nav-link messages-type" href="#" title="{{$strings.starred_messages_title}}" data-messages_type="starred">
+			<i class="fa fa-fw fa-star"></i>
+		</a>
+	</li>
+	{{/if}}
+</ul>
+<div id="messages-widget" class="border border-top-0 overflow-auto mb-3 clearfix" style="height: 70vh;">
+	<div id="messages-template" rel="template" class="d-none">
+		<a href="{6}" class="list-group-item list-group-item-action message" data-b64mid="{0}">
+			<div class="d-flex w-100 justify-content-between">
+				<div class="mb-1 text-truncate" title="{5}">
+					{7}
+					<strong>{4}</strong>
+				</div>
+				<small class="messages-timeago text-nowrap" title="{1}"></small>
+			</div>
+			<div class="mb-1">
+				<div class="text-break">{2}</div>
+			</div>
+			<small>{3}</small>
+		</a>
+	</div>
+	<div id="dm-container" class="list-group list-group-flush" data-offset="10">
+		{{foreach $entries as $e}}
+		<a href="{{$e.href}}" class="list-group-item list-group-item-action message" data-b64mid="{{$e.b64mid}}">
+			<div class="d-flex w-100 justify-content-between">
+				<div class="mb-1 text-truncate" title="{{$e.author_addr}}">
+					{{$e.icon}}
+					<strong>{{$e.author_name}}</strong>
+				</div>
+				<small class="messages-timeago text-nowrap" title="{{$e.created}}"></small>
+			</div>
+			<div class="mb-1">
+				<div class="text-break">{{$e.summary}}</div>
+			</div>
+			<small>{{$e.info}}</small>
+		</a>
+		{{/foreach}}
+		<div id="messages-empty" class="list-group-item border-0"{{if $entries}} style="display: none;"{{/if}}>
+			{{$strings.empty}}...
+		</div>
+		<div id="messages-loading" class="list-group-item" style="display: none;">
+			{{$strings.loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
+		</div>
+	</div>
+</div>
+<script>
+	var messages_offset = {{$offset}};
+	var get_messages_page_active = false;
+	var messages_type;
+
+	$(document).ready(function () {
+		$('.messages-timeago').timeago();
+		$('.message[data-b64mid=\'' + bParam_mid + '\']').addClass('active');
+	});
+
+	$('#messages-widget').on('scroll', function() {
+		if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) {
+			get_messages_page();
+		}
+	});
+
+	$(document).on('click', '.messages-type', function(e) {
+		e.preventDefault();
+		$('.messages-type').removeClass('active');
+		$(this).addClass('active');
+		messages_offset = 0;
+		messages_type = $(this).data('messages_type');
+		$('#dm-container .message').remove();
+		get_messages_page();
+	});
+
+	function get_messages_page() {
+
+		if (get_messages_page_active)
+			return;
+
+		if (messages_offset === -1)
+			return;
+
+		get_messages_page_active = true;
+		$('#messages-loading').show();
+		$('#messages-empty').hide();
+
+		$.ajax({
+			type: 'post',
+			url: 'hq',
+			data: {
+				offset: messages_offset,
+				type: messages_type
+			}
+		}).done(function(obj) {
+			get_messages_page_active = false;
+			messages_offset = obj.offset;
+			let html;
+			let tpl = $('#messages-template[rel=template]').html();
+			if (obj.entries.length) {
+				obj.entries.forEach(function(e) {
+					html = tpl.format(
+						e.b64mid,
+						e.created,
+						e.summary,
+						e.info,
+						e.author_name,
+						e.author_addr,
+						e.href,
+						e.icon
+					);
+					$('#messages-loading').before(html);
+				});
+			}
+			else {
+				$('#messages-empty').show();
+			}
+			$('.message[data-b64mid=\'' + bParam_mid + '\']').addClass('active');
+			$('#messages-loading').hide();
+			$('.messages-timeago').timeago();
+
+		});
+	}
+</script>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index e8542b087..d49303453 100644
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,3 +1,4 @@
+{{**
 <script src="vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js"></script>
 <script src="vendor/blueimp/jquery-file-upload/js/jquery.iframe-transport.js"></script>
 <script src="vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js"></script>
@@ -73,9 +74,9 @@
 	function addmailtext(data) {
 		var currentText = $("#prvmail-text").val();
 		$("#prvmail-text").val(currentText + data);
-	}	
+	}
 
 
 
 </script>
-
+**}}
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 4bee02aa0..0ae0604ef 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,24 +1,18 @@
 {{if $app}}
-<div class="generic-content-wrapper">
+<div id="personal-notes" class="generic-content-wrapper{{if $hidden}} d-none{{/if}}">
 	<div class="section-title-wrapper">
 		<h2>{{$banner}}</h2>
 	</div>
 	<div class="section-content-wrapper">
 {{else}}
-<div class="widget">
+<div id="personal-notes" class="widget{{if $hidden}} d-none{{/if}}">
 	<h3>{{$banner}}</h3>
 {{/if}}
-	<textarea name="note_text" id="note-text">{{$text}}</textarea>
+	<textarea name="note_text" id="note-text" class="{{if $app}}form-control border-0{{/if}}">{{$text}}</textarea>
 	<script>
 		var noteSaveTimer = null;
 		var noteText = $('#note-text');
 
-		$(document).ready(function(e){
-			noteText.on('change keyup keydown paste cut', function () {
-				noteText.height(0).height(noteText[0].scrollHeight);
-			}).change();
-		});
-
 		$(document).on('focusout',"#note-text",function(e){
 			if(noteSaveTimer)
 				clearTimeout(noteSaveTimer);
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1092bc155..5cbfcc214 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -1,20 +1,23 @@
-{{if $notifications}}
 <script>
-	var notifications_parent;
+	var sse_bs_active = false;
+	var sse_offset = 0;
+	var sse_type;
+	var sse_partial_result = false;
+	var sse_rmids = [];
+	var sse_fallback_interval;
 
 	$(document).ready(function() {
-		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+		let notifications_parent;
+		if ($('#notifications_wrapper').length) {
+			notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+		}
+
 		$('.notifications-btn').click(function() {
 			if($('#notifications_wrapper').hasClass('fs')) {
 				$('#notifications_wrapper').prependTo('#' + notifications_parent);
-				//undo scrollbar remove
-				$('section').css('height', '');
 			}
 			else {
 				$('#notifications_wrapper').prependTo('section');
-				//remove superfluous scrollbar
-				//setting overflow to hidden here has issues with some browsers
-				$('section').css('height', '100vh');
 			}
 
 			$('#notifications_wrapper').toggleClass('fs');
@@ -23,60 +26,118 @@
 			}
 		});
 
-		window.onpopstate = function(e) {
-			if(e.state !== null && e.state.b64mid !== bParam_mid)
-				getData(e.state.b64mid, '');
-		};
-	});
+		$(document).on('click', '.notification', function() {
+			if($('#notifications_wrapper').hasClass('fs')) {
+				$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
+			}
+		});
 
-	{{if $module == 'display' || $module == 'hq' || $startpage == 'hq'}}
-	$(document).on('click', '.notification', function(e) {
-		var b64mid = $(this).data('b64mid');
-		var notify_id = $(this).data('notify_id');
-		var path = $(this)[0].pathname.substr(1,7);
-		var stateObj = { b64mid: b64mid };
+		if(sse_enabled) {
+			if(typeof(window.SharedWorker) === 'undefined') {
+				// notifications with multiple tabs open will not work very well in this scenario
+				var evtSource = new EventSource('/sse');
 
-		if(! b64mid && ! notify_id)
-			return;
+				evtSource.addEventListener('notifications', function(e) {
+					var obj = JSON.parse(e.data);
+					sse_handleNotifications(obj, false, false);
+				}, false);
 
-		{{if $module != 'hq' && $startpage == 'hq'}}
-			e.preventDefault();
-			if(notify_id != null) {
-				$.post(
-					"hq",
-					{
-						"notify_id" : notify_id
+				document.addEventListener('visibilitychange', function() {
+					if (!document.hidden) {
+						sse_offset = 0;
+						sse_bs_init();
 					}
-				);
+				}, false);
+
 			}
-			window.location.href = 'hq/' + b64mid;
-			return;
-		{{else}}
-			{{if $module == 'display'}}
-			history.pushState(stateObj, '', 'display/' + b64mid);
-			{{/if}}
-
-			{{if $module == 'hq'}}
-			history.pushState(stateObj, '', 'hq/' + b64mid);
-			{{/if}}
-
-			{{if $module == 'hq'}}
-			if(b64mid) {
-			{{else}}
-			if(path === 'display' && b64mid) {
-			{{/if}}
-				e.preventDefault();
-
-				if(! page_load) {
-					getData(b64mid, notify_id);
+			else {
+				var myWorker = new SharedWorker('/view/js/sse_worker.js', localUser);
+
+				myWorker.port.onmessage = function(e) {
+					obj = e.data;
+					console.log(obj);
+					sse_handleNotifications(obj, false, false);
+				}
+
+				myWorker.onerror = function(e) {
+					myWorker.port.close();
+				}
+
+				myWorker.port.start();
+			}
+		}
+		else {
+			if (!document.hidden)
+				sse_fallback_interval = setInterval(sse_fallback, updateInterval);
+
+			document.addEventListener('visibilitychange', function() {
+				if (document.hidden) {
+					clearInterval(sse_fallback_interval);
 				}
+				else {
+					sse_offset = 0;
+					sse_bs_init();
+					sse_fallback_interval = setInterval(sse_fallback, updateInterval);
+				}
+
+			}, false);
+		}
+
+		$('.notification-link').on('click', { replace: true, followup: false }, sse_bs_notifications);
+
+		$('.notification-filter').on('keypress', function(e) {
+			if(e.which == 13) { // enter
+				this.blur();
+				sse_offset = 0;
+				$("#nav-" + sse_type + "-menu").html('');
+				$("#nav-" + sse_type + "-loading").show();
 
-				if($('#notifications_wrapper').hasClass('fs'))
-					$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
+				var cn_val = $('#cn-' + sse_type + '-input').length ? $('#cn-' + sse_type + '-input').val().toString().toLowerCase() : '';
+
+				$.get('/sse_bs/' + sse_type + '/' + sse_offset + '?nquery=' + encodeURIComponent(cn_val), function(obj) {
+					console.log('sse: bootstraping ' + sse_type);
+					console.log(obj);
+
+					sse_bs_active = false;
+					sse_partial_result = true;
+					sse_offset = obj[sse_type].offset;
+					if(sse_offset < 0)
+						$("#nav-" + sse_type + "-loading").hide();
+
+					sse_handleNotifications(obj, true, false);
+
+				});
 			}
-		{{/if}}
+		});
+
+		$('.notifications-textinput-clear').on('click', function(e) {
+			if(! sse_partial_result)
+				return;
+
+			$("#nav-" + sse_type + "-menu").html('');
+			$("#nav-" + sse_type + "-loading").show();
+			$.get('/sse_bs/' + sse_type, function(obj) {
+				console.log('sse: bootstraping ' + sse_type);
+				console.log(obj);
+
+				sse_bs_active = false;
+				sse_partial_result = false;
+				sse_offset = obj[sse_type].offset;
+				if(sse_offset < 0)
+					$("#nav-" + sse_type + "-loading").hide();
+
+				sse_handleNotifications(obj, true, false);
+
+			});
+		});
+
+		$('.notification-content').on('scroll', function() {
+			if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) {
+				sse_bs_notifications(sse_type, false, true);
+			}
+		});
+
 	});
-	{{/if}}
 
 	{{foreach $notifications as $notification}}
 	{{if $notification.filter}}
@@ -88,15 +149,21 @@
 		else {
 			$('#nav-{{$notification.type}}-menu .notification[data-thread_top=false]').addClass('tt-filter-active');
 			$(this).addClass('active sticky-top');
+			// load more notifications if visible notifications count is low
+			if(sse_type  && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children(':visible').length < 15) {
+				sse_bs_notifications(sse_type, false, true);
+			}
 		}
 
 	});
+
 	$(document).on('click', '#cn-{{$notification.type}}-input-clear', function(e) {
 		$('#cn-{{$notification.type}}-input').val('');
 		$('#cn-{{$notification.type}}-only').removeClass('active sticky-top');
 		$("#nav-{{$notification.type}}-menu .notification").removeClass('cn-filter-active');
 		$('#cn-{{$notification.type}}-input-clear').addClass('d-none');
 	});
+
 	$(document).on('input', '#cn-{{$notification.type}}-input', function(e) {
 		var val = $('#cn-{{$notification.type}}-input').val().toString().toLowerCase();
 		if(val) {
@@ -122,18 +189,287 @@
 	{{/if}}
 	{{/foreach}}
 
-	function getData(b64mid, notify_id) {
-		$(document).scrollTop(0);
-		$('.thread-wrapper').remove();
-		bParam_mid = b64mid;
-		mode = 'replace';
-		page_load = true;
-		{{if $module == 'hq'}}
-		liveUpdate(notify_id);
-		{{/if}}
-		{{if $module == 'display'}}
-		liveUpdate();
-		{{/if}}
+	function sse_bs_init() {
+		if(sessionStorage.getItem('notification_open') !== null || typeof sse_type !== 'undefined' ) {
+			if(typeof sse_type === 'undefined')
+				sse_type = sessionStorage.getItem('notification_open');
+
+			$("#nav-" + sse_type + "-sub").addClass('show');
+			sse_bs_notifications(sse_type, true, false);
+		}
+		else {
+			sse_bs_counts();
+		}
+	}
+
+	function sse_bs_counts() {
+		if(sse_bs_active)
+			return;
+
+		sse_bs_active = true;
+
+		$.ajax({
+			type: 'post',
+			url: '/sse_bs',
+			data: { sse_rmids }
+		}).done( function(obj) {
+			console.log(obj);
+			sse_bs_active = false;
+			sse_rmids = [];
+			sse_handleNotifications(obj, true, false);
+		});
+	}
+
+	function sse_bs_notifications(e, replace, followup) {
+
+		if(sse_bs_active)
+			return;
+
+		var manual = false;
+
+		if(typeof replace === 'undefined')
+			replace = e.data.replace;
+
+		if(typeof followup === 'undefined')
+			followup = e.data.followup;
+
+		if(typeof e === 'string') {
+			sse_type = e;
+		}
+		else {
+			manual = true;
+			sse_offset = 0;
+			sse_type = e.target.dataset.sse_type;
+		}
+
+		if(typeof sse_type === 'undefined')
+			return;
+
+		if(followup || !manual || !($('#nav-' + sse_type + '-sub').hasClass('collapse') && $('#nav-' + sse_type + '-sub').hasClass('show'))) {
+
+			if(sse_offset >= 0) {
+				$("#nav-" + sse_type + "-loading").show();
+			}
+
+			sessionStorage.setItem('notification_open', sse_type);
+			if(sse_offset !== -1 || replace) {
+
+				var cn_val = (($('#cn-' + sse_type + '-input').length && sse_partial_result) ? $('#cn-' + sse_type + '-input').val().toString().toLowerCase() : '');
+
+				$("#nav-" + sse_type + "-loading").show();
+
+				sse_bs_active = true;
+
+				$.ajax({
+					type: 'post',
+					url: '/sse_bs/' + sse_type + '/' + sse_offset,
+					nquery: encodeURIComponent(cn_val),
+					data: { sse_rmids }
+				}).done(function(obj) {
+					console.log('sse: bootstraping ' + sse_type);
+					console.log(obj);
+					sse_bs_active = false;
+					sse_rmids = [];
+					$("#nav-" + sse_type + "-loading").hide();
+					sse_offset = obj[sse_type].offset;
+					sse_handleNotifications(obj, replace, followup);
+				});
+			}
+			else
+				$("#nav-" + sse_type + "-loading").hide();
+
+		}
+		else {
+			sessionStorage.removeItem('notification_open');
+		}
+	}
+
+	function sse_handleNotifications(obj, replace, followup) {
+
+		var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files'];
+		var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
+		var all_notifications = primary_notifications.concat(secondary_notifications);
+
+		all_notifications.forEach(function(type, index) {
+			if(typeof obj[type] === typeof undefined)
+				return true;
+
+			if(obj[type].count) {
+				$('.' + type + '-button').fadeIn();
+				if(replace || followup)
+					$('.' + type + '-update').html(Number(obj[type].count));
+				else
+					$('.' + type + '-update').html(Number(obj[type].count) + Number($('.' + type + '-update').html()));
+			}
+			else {
+				$('.' + type + '-update').html('0');
+				$('.' + type + '-button').fadeOut(function() {
+					sse_setNotificationsStatus();
+				});
+			}
+			if(obj[type].notifications.length)
+				sse_handleNotificationsItems(type, obj[type].notifications, replace, followup);
+		});
+
+		sse_setNotificationsStatus();
+
+		// notice and info
+		$.jGrowl.defaults.closerTemplate = '<div>[ ' + aStr.closeAll + ']</div>';
+
+		if(obj.notice) {
+			$(obj.notice.notifications).each(function() {
+				$.jGrowl(this, { sticky: true, theme: 'notice' });
+			});
+		}
+
+		if(obj.info) {
+			$(obj.info.notifications).each(function(){
+				$.jGrowl(this, { sticky: false, theme: 'info', life: 10000 });
+			});
+		}
+
+		// load more notifications if visible notifications count becomes low
+		if(sse_type  && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children(':not(.tt-filter-active)').length < 15) {
+			sse_bs_notifications(sse_type, false, true);
+		}
+
+
+	}
+
+	function sse_handleNotificationsItems(notifyType, data, replace, followup) {
+
+		var notifications_tpl = ((notifyType == 'forums') ? decodeURIComponent($("#nav-notifications-forums-template[rel=template]").html().replace('data-src', 'src')) : decodeURIComponent($("#nav-notifications-template[rel=template]").html().replace('data-src', 'src')));
+		var notify_menu = $("#nav-" + notifyType + "-menu");
+		var notify_loading = $("#nav-" + notifyType + "-loading");
+		var notify_count = $("." + notifyType + "-update");
+
+		if(replace && !followup) {
+			notify_menu.html('');
+			notify_loading.hide();
+		}
+
+		$(data).each(function() {
+
+			// do not add a notification if it is already present
+			if($('#nav-' + notifyType + '-menu .notification[data-b64mid=\'' + this.b64mid + '\']').length)
+				return true;
+
+			if(!replace && !followup && (this.thread_top && notifyType === 'network')) {
+				$(document).trigger('hz:handleNetworkNotificationsItems', this);
+			}
+
+			html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum, encodeURIComponent(this.mids), this.body);
+			notify_menu.append(html);
+		});
+
+		if(!replace && !followup) {
+			$("#nav-" + notifyType + "-menu .notification").sort(function(a,b) {
+				a = new Date(a.dataset.when);
+				b = new Date(b.dataset.when);
+				return a > b ? -1 : a < b ? 1 : 0;
+			}).appendTo('#nav-' + notifyType + '-menu');
+		}
+
+		$("#nav-" + notifyType + "-menu .notifications-autotime").timeago();
+
+		if($('#tt-' + notifyType + '-only').hasClass('active'))
+			$('#nav-' + notifyType + '-menu [data-thread_top=false]').addClass('tt-filter-active');
+
+		if($('#cn-' + notifyType + '-input').length) {
+			var filter = $('#cn-' + notifyType + '-input').val().toString().toLowerCase();
+			if(filter) {
+				filter = filter.indexOf('%') == 0 ? filter.substring(1) : filter;
+
+				$('#nav-' + notifyType + '-menu .notification').each(function(i, el) {
+					var cn = $(el).data('contact_name').toString().toLowerCase();
+					var ca = $(el).data('contact_addr').toString().toLowerCase();
+					if(cn.indexOf(filter) === -1 && ca.indexOf(filter) === -1)
+						$(el).addClass('cn-filter-active');
+					else
+						$(el).removeClass('cn-filter-active');
+				});
+			}
+		}
+	}
+
+	function sse_updateNotifications(type, mid) {
+
+		if(type === 'pubs')
+			return true;
+
+		if(type === 'notify' && (mid !== bParam_mid || sse_type !== 'notify'))
+			return true;
+	/*
+		var count = Number($('.' + type + '-update').html());
+
+		count--;
+
+		if(count < 1) {
+			$('.' + type + '-update').html(count);
+			$('.' + type + '-button').fadeOut(function() {
+				sse_setNotificationsStatus();
+			});
+		}
+		else {
+			$('.' + type + '-update').html(count);
+		}
+	*/
+
+		$('#nav-' + type + '-menu .notification[data-b64mid=\'' + mid + '\']').fadeOut(function() {
+			this.remove();
+		});
+
+	}
+
+	function sse_setNotificationsStatus() {
+		var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files'];
+		var secondary_notifications = ['network', 'forums', 'all_events', 'pubs'];
+		var all_notifications = primary_notifications.concat(secondary_notifications);
+
+		var primary_available = false;
+		var any_available = false;
+
+		all_notifications.forEach(function(type, index) {
+			if($('.' + type + '-button').css('display') == 'block') {
+				any_available = true;
+				if(primary_notifications.indexOf(type) > -1)
+					primary_available = true;
+			}
+		});
+
+		if(primary_available) {
+			$('.notifications-btn-icon').removeClass('fa-exclamation-circle');
+			$('.notifications-btn-icon').addClass('fa-exclamation-triangle');
+		}
+		else {
+			$('.notifications-btn-icon').removeClass('fa-exclamation-triangle');
+			$('.notifications-btn-icon').addClass('fa-exclamation-circle');
+		}
+
+		if(any_available) {
+			$('.notifications-btn').css('opacity', 1);
+			$('#no_notifications').hide();
+			$('#notifications').show();
+		}
+		else {
+			$('.notifications-btn').css('opacity', 0.5);
+			$('#navbar-collapse-1').removeClass('show');
+			$('#no_notifications').show();
+			$('#notifications').hide();
+		}
+
+	}
+
+	function sse_fallback() {
+		$.get('/sse', function(obj) {
+			if(! obj)
+				return;
+
+			console.log('sse fallback');
+			console.log(obj);
+
+			sse_handleNotifications(obj, false, false);
+		});
 	}
 </script>
 
@@ -142,7 +478,7 @@
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
 	<div id="nav-notifications-template" rel="template">
-		<a class="list-group-item text-decoration-none text-darkclearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
+		<a class="list-group-item text-decoration-none text-dark clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
 			<img class="menu-img-3" data-src="{1}" loading="lazy">
 			<div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div>
 			<span class="text-muted">{4}</span><br>
@@ -199,4 +535,3 @@
 		{{/foreach}}
 	</div>
 </div>
-{{/if}}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 6d566cab9..7698fb437 100644
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -66,10 +66,12 @@
 				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
 				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
 			</div>
+			{{*
 			<div class="form-group">
 				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
 				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
 			</div>
+			*}}
 			<div class="form-group">
 				{{include file="field_select.tpl" field=$edit.album_select}}
 			</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b8c81539d..ea7de0b4c 100644
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,3 +1,5 @@
+{{**
+
 {{if $new}}
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
@@ -105,3 +107,4 @@
 	</div>
 </div>
 {{/if}}
+**}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index f94aaf37d..49b324f9d 100644
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -71,6 +71,7 @@
 							<div class="spinner s"></div>
 						</div>
 					</div>
+					{{if $item.star || $item.thread_action_menu || $item.drop.dropping}}
 					<div class="btn-group">
 						<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
 							<i class="fa fa-cog"></i>
@@ -81,14 +82,15 @@
 							{{/if}}
 							{{if $item.thread_action_menu}}
 							{{foreach $item.thread_action_menu as $mitem}}
-							<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-fw fa-{{$mitem.icon}} generic-icons-nav"></i>{{$mitem.title}}</a></li>
+							<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-fw fa-{{$mitem.icon}} generic-icons-nav"></i>{{$mitem.title}}</a>
 							{{/foreach}}
 							{{/if}}
 							{{if $item.drop.dropping}}
-							<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-fw fa-trash-o generic-icons-nav"></i>{{$item.drop.delete}}</a></li>
+							<a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}', '{{$item.mid}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a>
 							{{/if}}
 						</div>
 					</div>
+					{{/if}}
 				</div>
 				{{if $item.star && $item.star.isstarred}}
 				<div class="btn-group" id="star-button-{{$item.id}}">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index c0808272d..e185707a8 100644
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -106,7 +106,12 @@
 					<div class="section-content-tools-wrapper">
 						<div id="settings-notifications">
 
-								{{include file="field_input.tpl" field=$mailhost}}
+							<div id="desktop-notifications-info" class="section-content-warning-wrapper" style="display: none;">
+								{{$desktop_notifications_info}}<br>
+								<a id="desktop-notifications-request" href="#">{{$desktop_notifications_request}}</a>
+							</div>
+
+							{{include file="field_input.tpl" field=$mailhost}}
 
 							<h3>{{$activity_options}}</h3>
 							<div class="group">