Merge branch '7.4RC'7.4

439 files changed, 23452 insertions, 41095 deletions

diff --git a/CHANGELOG b/CHANGELOG
index bfeab32d2..90caa11df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,37 @@
+Hubzilla 7.4 (2022-06-01)
+	Updated russian translations
+	Raise min PHP version to 8.0
+	Rewrite inbound attachment handling
+	Move photo flag feature from addon to core
+	Adjust default production php logging
+	Update composer libs
+	Add a hidden config to enable the hs2019 http signature algorithm
+	Allow starring of pubstream items
+	Update spanish translations
+	Add the title in forum post reshares if applicable
+	Implement inbound pleroma reactions
+	Add real name info to the navbar template data
+	Add the updated date to the icon url so that other platforms will pick it up on change
+	Move wiki from core to addon
+	Move articles from core to addon
+	Move cards from core to addon
+
+	Addons
+	Rendezvous: add missing default value to sql schema
+	Wiki: moved from core to addons
+	Articles: moved from core to addons
+	Cards: moved from core to addons
+	Photoflag: moved to core
+	Sse: fix issue where notifications were emited for created tasks
+
+	Bugfixes
+	- Fix issue where inbound activitypub items lost image descriptions (issue 1679)
+	- Fix issue where observer tags were not rendered correctly in event items (issue 1674)
+	- Fix forum posts leaked into network stream
+	- Fix tags not found in search if not logged in (issue 1677)
+	- Fix dislikes causing stuck notifications (issue 1676)
+
+
 Hubzilla 7.2.2 (2022-04-26)
 	- Fix item_verified not set due to data structure changes
 
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 9b3cab9d0..8e24dde41 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -670,24 +670,36 @@ class Activity {
 		return $ret;
 	}
 
-	static function decode_attachment($item) {
+	public static function decode_attachment($item) {
 
 		$ret = [];
 
 		if (array_key_exists('attachment', $item) && is_array($item['attachment'])) {
-			foreach ($item['attachment'] as $att) {
+			$ptr = $item['attachment'];
+			if (!array_key_exists(0, $ptr)) {
+				$ptr = [$ptr];
+			}
+			foreach ($ptr as $att) {
 				$entry = [];
-				if (array_key_exists('href', $att))
+				if (array_key_exists('href', $att) && $att['href']) {
 					$entry['href'] = $att['href'];
-				elseif (array_key_exists('url', $att))
+				} elseif (array_key_exists('url', $att) && $att['url']) {
 					$entry['href'] = $att['url'];
-				if (array_key_exists('mediaType', $att))
+				}
+				if (array_key_exists('mediaType', $att) && $att['mediaType']) {
 					$entry['type'] = $att['mediaType'];
-				elseif (array_key_exists('type', $att) && $att['type'] === 'Image')
+				} elseif (array_key_exists('type', $att) && $att['type'] === 'Image') {
 					$entry['type'] = 'image/jpeg';
-				if ($entry)
+				}
+				if (array_key_exists('name', $att) && $att['name']) {
+					$entry['name'] = html2plain(purify_html($att['name']), 256);
+				}
+				if ($entry) {
 					$ret[] = $entry;
+				}
 			}
+		} elseif (isset($item['attachment']) && is_string($item['attachment'])) {
+			btlogger('not an array: ' . $item['attachment']);
 		}
 
 		return $ret;
@@ -1013,7 +1025,7 @@ class Activity {
 			'type'      => 'Image',
 			'mediaType' => (($p['xchan_photo_mimetype']) ? $p['xchan_photo_mimetype'] : 'image/png'),
 			'updated'   => datetime_convert('UTC', 'UTC', $p['xchan_photo_date'], ATOM_TIME),
-			'url'       => $p['xchan_photo_l'],
+			'url'       => $p['xchan_photo_l'] . '?rev=' . strtotime($p['xchan_photo_date']),
 			'height'    => 300,
 			'width'     => 300,
 		];
@@ -2195,20 +2207,20 @@ class Activity {
 			$s['created']   = datetime_convert('UTC', 'UTC', $act->data['published']);
 			$s['commented'] = $s['created'];
 		}
-		elseif (array_key_exists('published', $act->obj)) {
+		elseif (is_array($act->obj) && array_key_exists('published', $act->obj)) {
 			$s['created']   = datetime_convert('UTC', 'UTC', $act->obj['published']);
 			$s['commented'] = $s['created'];
 		}
 		if (array_key_exists('updated', $act->data)) {
 			$s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']);
 		}
-		elseif (array_key_exists('updated', $act->obj)) {
+		elseif (is_array($act->obj) && array_key_exists('updated', $act->obj)) {
 			$s['edited'] = datetime_convert('UTC', 'UTC', $act->obj['updated']);
 		}
 		if (array_key_exists('expires', $act->data)) {
 			$s['expires'] = datetime_convert('UTC', 'UTC', $act->data['expires']);
 		}
-		elseif (array_key_exists('expires', $act->obj)) {
+		elseif (is_array($act->obj) && array_key_exists('expires', $act->obj)) {
 			$s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']);
 		}
 
@@ -2270,9 +2282,18 @@ class Activity {
 				$s['mid'] = $act->obj['id'];
 				$s['parent_mid'] = $act->obj['id'];
 			}
+
 			if ($act->type === 'emojiReaction') {
 				$content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';');
 			}
+
+			if (in_array($act->type, ['EmojiReaction', 'EmojiReact'])) {
+				// Pleroma reactions
+				$t = trim(self::get_textfield($act->data, 'content'));
+				if (mb_strlen($t) === 1) {
+					$content['content'] = $t;
+				}
+			}
 		}
 
 		$s['item_thread_top'] = 0;
@@ -2408,7 +2429,6 @@ class Activity {
 					}
 				}
 			}
-
 		}
 
 		$a = self::decode_attachment($act->obj);
@@ -2423,8 +2443,11 @@ class Activity {
 
 		if (array_key_exists('type', $act->obj)) {
 
-			if ($act->obj['type'] === 'Note' && $s['attach']) {
-				$s['body'] = self::bb_attach($s['attach'], $s['body']) . $s['body'];
+			// Objects that might have media attachments which aren't already provided in the content element.
+			// We'll check specific media objects separately.
+
+			if (in_array($act->obj['type'], ['Article', 'Document', 'Event', 'Note', 'Page', 'Place', 'Question']) && isset($s['attach']) && $s['attach']) {
+				$s = self::bb_attach($s);
 			}
 
 			if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) {
@@ -2513,13 +2536,13 @@ class Activity {
 						usort($mps,[ '\Zotlabs\Lib\Activity', 'vid_sort' ]);
 						foreach ($mps as $m) {
 							if (intval($m['height']) < 500 && Activity::media_not_in_body($m['href'],$s['body'])) {
-								$s['body'] = $tag . $m['href'] . '[/video]' . "\n\n" . $s['body'];
+								$s['body'] = $tag . $m['href'] . '[/video]' . "\r\n" . $s['body'];
 								break;
 							}
 						}
 					}
 					elseif (is_string($act->obj['url']) && Activity::media_not_in_body($act->obj['url'],$s['body'])) {
-						$s['body'] = $tag . $act->obj['url'] . '[/video]' . "\n\n" . $s['body'];
+						$s['body'] = $tag . $act->obj['url'] . '[/video]' . "\r\n" . $s['body'];
 					}
 
 				}
@@ -2545,13 +2568,13 @@ class Activity {
 						}
 						foreach ($ptr as $vurl) {
 							if (in_array($vurl['mediaType'], $atypes) && self::media_not_in_body($vurl['href'], $s['body'])) {
-								$s['body'] = '[audio]' . $vurl['href'] . '[/audio]' . "\n\n" . $s['body'];
+								$s['body'] = '[audio]' . $vurl['href'] . '[/audio]' . "\r\n" . $s['body'];
 								break;
 							}
 						}
 					}
 					elseif (is_string($act->obj['url']) && self::media_not_in_body($act->obj['url'], $s['body'])) {
-						$s['body'] = '[audio]' . $act->obj['url'] . '[/audio]' . "\n\n" . $s['body'];
+						$s['body'] = '[audio]' . $act->obj['url'] . '[/audio]' . "\r\n" . $s['body'];
 					}
 				}
 
@@ -2571,7 +2594,7 @@ class Activity {
 						}
 						foreach ($ptr as $vurl) {
 							if (strpos($s['body'], $vurl['href']) === false) {
-								$bb_imgs = '[zmg]' . $vurl['href'] . '[/zmg]' . "\n\n";
+								$bb_imgs = '[zmg]' . $vurl['href'] . '[/zmg]' . "\r\n";
 								break;
 							}
 						}
@@ -2579,7 +2602,7 @@ class Activity {
 					}
 					elseif (is_string($act->obj['url'])) {
 						if (strpos($s['body'], $act->obj['url']) === false) {
-							$s['body'] .= '[zmg]' . $act->obj['url'] . '[/zmg]' . "\n\n" . $s['body'];
+							$s['body'] .= '[zmg]' . $act->obj['url'] . '[/zmg]' . "\r\n" . $s['body'];
 						}
 					}
 				}
@@ -2616,10 +2639,10 @@ class Activity {
 					if ($purl) {
 						$li = z_fetch_url(z_root() . '/linkinfo?binurl=' . bin2hex($purl));
 						if ($li['success'] && $li['body']) {
-							$s['body'] .= "\n" . $li['body'];
+							$s['body'] .= "\r\n" . $li['body'];
 						}
 						else {
-							$s['body'] .= "\n\n" . $purl;
+							$s['body'] .= "\r\n" . $purl;
 						}
 					}
 				}
@@ -3574,38 +3597,76 @@ class Activity {
 		return;
 	}
 
-	static function bb_attach($attach, $body) {
+	public static function bb_attach($item) {
 
 		$ret = false;
 
-		foreach ($attach as $a) {
+		if (!(is_array($item['attach']) && $item['attach'])) {
+			return $item;
+		}
+
+		foreach ($item['attach'] as $a) {
+
 			if (array_key_exists('type', $a) && stripos($a['type'], 'image') !== false) {
-				if (self::media_not_in_body($a['href'], $body)) {
-					$ret .= "\n\n" . '[img]' . $a['href'] . '[/img]';
+				// don't add inline image if it's an svg and we already have an inline svg
+				if ($a['type'] === 'image/svg+xml' && strpos($item['body'], '[/svg]')) {
+					continue;
+				}
+				if (self::media_not_in_body($a['href'], $item['body'])) {
+					if (isset($a['name']) && $a['name']) {
+						$alt = htmlspecialchars($a['name'], ENT_QUOTES);
+						$item['body'] = '[img=' . $a['href']  . ']' . $alt . '[/img]' . "\r\n" . $item['body'];
+					} else {
+						$item['body'] = '[img]' . $a['href'] . '[/img]' . "\r\n" . $item['body'];
+					}
 				}
 			}
+
 			if (array_key_exists('type', $a) && stripos($a['type'], 'video') !== false) {
-				if (self::media_not_in_body($a['href'], $body)) {
-					$ret .= "\n\n" . '[video]' . $a['href'] . '[/video]';
+				if (self::media_not_in_body($a['href'], $item['body'])) {
+					$item['body'] = '[video]' . $a['href'] . '[/video]' . "\r\n" . $item['body'];
 				}
 			}
 			if (array_key_exists('type', $a) && stripos($a['type'], 'audio') !== false) {
-				if (self::media_not_in_body($a['href'], $body)) {
-					$ret .= "\n\n" . '[audio]' . $a['href'] . '[/audio]';
+				if (self::media_not_in_body($a['href'], $item['body'])) {
+					$item['body'] = '[audio]' . $a['href'] . '[/audio]' . "\r\n" . $item['body'];
 				}
 			}
+			//if (array_key_exists('type', $a) && stripos($a['type'], 'activity') !== false) {
+				//if (self::media_not_in_body($a['href'], $item['body'])) {
+					//$item = self::get_quote($a['href'], $item);
+				//}
+			//}
 		}
 
-		return $ret;
+		return $item;
 	}
 
+
 	// check for the existence of existing media link in body
-	static function media_not_in_body($s, $body) {
 
-		if ((strpos($body, ']' . $s . '[/img]') === false) &&
+	public static function media_not_in_body($s, $body) {
+
+		$s_alt = htmlspecialchars($s, ENT_QUOTES, 'UTF-8');
+
+		if (
+			(strpos($body, ']' . $s . '[/img]') === false) &&
+			(strpos($body, '[img=' . $s . ']') === false) &&
 			(strpos($body, ']' . $s . '[/zmg]') === false) &&
+			(strpos($body, '[zmg=' . $s . ']') === false) &&
 			(strpos($body, ']' . $s . '[/video]') === false) &&
-			(strpos($body, ']' . $s . '[/audio]') === false)) {
+			(strpos($body, ']' . $s . '[/zvideo]') === false) &&
+			(strpos($body, ']' . $s . '[/audio]') === false) &&
+			(strpos($body, ']' . $s . '[/zaudio]') === false) &&
+			(strpos($body, ']' . $s_alt . '[/img]') === false) &&
+			(strpos($body, '[img=' . $s_alt . ']') === false) &&
+			(strpos($body, ']' . $s_alt . '[/zmg]') === false) &&
+			(strpos($body, '[zmg=' . $s_alt . ']') === false) &&
+			(strpos($body, ']' . $s_alt . '[/video]') === false) &&
+			(strpos($body, ']' . $s_alt . '[/zvideo]') === false) &&
+			(strpos($body, ']' . $s_alt . '[/audio]') === false) &&
+			(strpos($body, ']' . $s_alt . '[/zaudio]') === false)
+		) {
 			return true;
 		}
 		return false;
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index 1c278f2ee..e77b501b3 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -70,9 +70,12 @@ class ActivityStreams {
 				}
 			}
 
+			// This indicates only that we have sucessfully decoded JSON.
 			$this->valid = true;
 
-			if (array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) {
+			// Special handling for Mastodon "delete actor" activities which will often fail to verify
+			// because the key cannot be fetched. We will catch this condition elsewhere.
+			if (is_array($this->data) && array_key_exists('type', $this->data) && array_key_exists('actor', $this->data) && array_key_exists('object', $this->data)) {
 				if ($this->data['type'] === 'Delete' && $this->data['actor'] === $this->data['object']) {
 					$this->deleted = $this->data['actor'];
 					$this->valid   = false;
@@ -81,6 +84,7 @@ class ActivityStreams {
 
 		}
 
+		// Attempt to assemble an Activity from what we were given.
 		if ($this->is_valid()) {
 			$this->id     = $this->get_property_obj('id');
 			$this->type   = $this->get_primary_type();
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 1421c72ae..59e4d9a4e 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -256,8 +256,8 @@ class Enotify {
 
 		$itemlink =  $params['link'];
 
-		if (array_key_exists('item',$params) && activity_match($params['item']['verb'],ACTIVITY_LIKE)) {
-			if(! $always_show_in_notices  || !($vnotify & VNOTIFY_LIKE)) {
+		if (array_key_exists('item',$params) && (activity_match($params['item']['verb'], ACTIVITY_LIKE) || activity_match($params['item']['verb'], ACTIVITY_DISLIKE))) {
+			if(! $always_show_in_notices  || !($vnotify & VNOTIFY_LIKE) || !feature_enabled($recip['channel_id'], 'dislike')) {
 				logger('notification: not a visible activity. Ignoring.');
 				pop_lang();
 				return;
@@ -291,22 +291,29 @@ class Enotify {
 			);
 		}
 
+		if (!$p) {
+			pop_lang();
+			return;
+		}
+
 		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'];
 
 		$parent_item = $p[0];
 
+		$verb = ((activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) ? t('disliked') : t('liked'));
 
 		// "your post"
 		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]'),
+			$dest_str = sprintf(t('%1$s %2$s [zrl=%3$s]your %4$s[/zrl]'),
 				'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
+				$verb,
 				$itemlink,
-				$item_post_type);
+				$item_post_type
+			);
 		else {
 			pop_lang();
 			return;
@@ -824,6 +831,14 @@ class Enotify {
 				$itemem_text = sprintf( t('repeated %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
 			}
 
+			if($item['verb'] === ACTIVITY_LIKE) {
+				$itemem_text = sprintf( t('liked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
+			}
+
+			if($item['verb'] === ACTIVITY_DISLIKE) {
+				$itemem_text = sprintf( t('disliked %s\'s post'), '[bdi]' . $item['author']['xchan_name'] . '[/bdi]');
+			}
+
 			if(in_array($item['obj_type'], ['Document', 'Video', 'Audio', 'Image'])) {
 				$itemem_text = t('shared a file with you');
 			}
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 379b329c7..8eb5ce647 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1627,7 +1627,7 @@ class Libzot {
 					// doesn't exist.
 
 					if ($perm === 'send_stream') {
-						if ($force || get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false) || $arr['verb'] === ACTIVITY_SHARE) {
+						if ($force || get_pconfig($channel['channel_id'], 'system', 'hyperdrive', false)) {
 							$allowed = true;
 						}
 					}
@@ -1673,6 +1673,10 @@ class Libzot {
 					$DR->update('comment parent not found');
 					$result[] = $DR->get();
 
+					if ($relay || $request || $local_public) {
+						continue;
+					}
+
 					// 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
@@ -1684,10 +1688,10 @@ class Libzot {
 					// 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, 'send_stream')) {
+					if (perm_is_allowed($channel['channel_id'], $sender, 'send_stream')) {
 						self::fetch_conversation($channel, $arr['parent_mid']);
 					}
+
 					continue;
 				}
 
diff --git a/Zotlabs/Lib/MessageFilter.php b/Zotlabs/Lib/MessageFilter.php
index 95721e7c7..70b0188c4 100644
--- a/Zotlabs/Lib/MessageFilter.php
+++ b/Zotlabs/Lib/MessageFilter.php
@@ -8,7 +8,7 @@ class MessageFilter {
 
 	public static function evaluate($item, $incl, $excl) {
 
-		$text = prepare_text($item['body'],((isset($item['mimetype'])) ? $item['mimetype'] : 'text/x-multicode'));
+		$text = prepare_text($item['body'],((isset($item['mimetype'])) ? $item['mimetype'] : 'text/bbcode'));
 		$text = html2plain(($item['title']) ? $item['title'] . ' ' . $text : $text);
 
 		$lang = null;
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
deleted file mode 100644
index bf4ac8e87..000000000
--- a/Zotlabs/Lib/NativeWiki.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-
-namespace Zotlabs\Lib;
-
-use Zotlabs\Lib\Libsync;
-
-define ( 'NWIKI_ITEM_RESOURCE_TYPE', 'nwiki' );
-
-class NativeWiki {
-
-
-	public static function listwikis($channel, $observer_hash) {
-
-		$sql_extra = item_permissions_sql($channel['channel_id'], $observer_hash);
-		$wikis = q("SELECT * FROM item
-			WHERE resource_type = '%s' AND mid = parent_mid AND uid = %d AND item_deleted = 0 $sql_extra",
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			intval($channel['channel_id'])
-		);
-
-		if($wikis) {
-			foreach($wikis as &$w) {
-
-				$w['json_allow_cid']  = acl2json($w['allow_cid']);
-				$w['json_allow_gid']  = acl2json($w['allow_gid']);
-				$w['json_deny_cid']   = acl2json($w['deny_cid']);
-				$w['json_deny_gid']   = acl2json($w['deny_gid']);
-
-				$w['rawName']  = get_iconfig($w, 'wiki', 'rawName');
-				$w['htmlName'] = escape_tags($w['rawName']);
-				//$w['urlName']  = urlencode(urlencode($w['rawName']));
-				$w['urlName']  = self::name_encode($w['rawName']);
-				$w['mimeType'] = get_iconfig($w, 'wiki', 'mimeType');
-				$w['typelock'] = get_iconfig($w, 'wiki', 'typelock');
-				$w['lockstate']     = (($w['allow_cid'] || $w['allow_gid'] || $w['deny_cid'] || $w['deny_gid']) ? 'lock' : 'unlock');
-			}
-		}
-		// TODO: query db for wikis the observer can access. Return with two lists, for read and write access
-		return array('wikis' => $wikis);
-	}
-
-
-	public static function create_wiki($channel, $observer_hash, $wiki, $acl) {
-
-		$resource_id = new_uuid();
-		$uuid = new_uuid();
-
-		$ac = $acl->get();
-		$mid = z_root() . '/item/' . $uuid;
-
-		$arr = array();	// Initialize the array of parameters for the post
-		$item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0);
-		$wiki_url = z_root() . '/wiki/' . $channel['channel_address'] . '/' . $wiki['urlName'];
-		$arr['aid'] = $channel['channel_account_id'];
-		$arr['uuid'] = $uuid;
-		$arr['uid'] = $channel['channel_id'];
-		$arr['mid'] = $mid;
-		$arr['parent_mid'] = $mid;
-		$arr['item_hidden'] = $item_hidden;
-		$arr['resource_type'] = NWIKI_ITEM_RESOURCE_TYPE;
-		$arr['resource_id'] = $resource_id;
-		$arr['owner_xchan'] = $channel['channel_hash'];
-		$arr['author_xchan'] = $observer_hash;
-		$arr['plink'] = $mid;
-		$arr['llink'] = z_root() . '/display/' . gen_link_id($mid);
-		$arr['title'] = $wiki['htmlName'];  // name of new wiki;
-		$arr['allow_cid'] = $ac['allow_cid'];
-		$arr['allow_gid'] = $ac['allow_gid'];
-		$arr['deny_cid'] = $ac['deny_cid'];
-		$arr['deny_gid'] = $ac['deny_gid'];
-		$arr['item_wall'] = 1;
-		$arr['item_origin'] = 1;
-		$arr['item_thread_top'] = 1;
-		$arr['item_private'] = intval($acl->is_private());
-		$arr['verb'] = ACTIVITY_CREATE;
-		$arr['obj_type'] = 'Document';
-		$arr['body'] = '[table][tr][td][h1]New Wiki[/h1][/td][/tr][tr][td][zrl=' . $wiki_url . ']' . $wiki['htmlName'] . '[/zrl][/td][/tr][/table]';
-
-		$arr['public_policy'] = map_scope(\Zotlabs\Access\PermissionLimits::Get($channel['channel_id'],'view_wiki'),true);
-
-		// Save the wiki name information using iconfig. This is shareable.
-		if(! set_iconfig($arr, 'wiki', 'rawName', $wiki['rawName'], true)) {
-			return array('item' => null, 'success' => false);
-		}
-		if(! set_iconfig($arr, 'wiki', 'mimeType', $wiki['mimeType'], true)) {
-			return array('item' => null, 'success' => false);
-		}
-
-		set_iconfig($arr,'wiki','typelock',$wiki['typelock'],true);
-
-		$post = item_store($arr);
-
-		$item_id = $post['item_id'];
-
-		if($item_id) {
-			\Zotlabs\Daemon\Master::Summon(array('Notifier', 'activity', $item_id));
-			return array('item' => $post['item'], 'item_id' => $item_id, 'success' => true);
-		}
-		else {
-			return array('item' => null, 'success' => false);
-		}
-	}
-
-
-	public static function update_wiki($channel_id, $observer_hash, $arr, $acl) {
-
-		$w = self::get_wiki($channel_id, $observer_hash, $arr['resource_id']);
-		$item = $w['wiki'];
-
-		if(! $item) {
-			return array('item' => null, 'success' => false);
-		}
-
-		$x = $acl->get();
-
-		$item['allow_cid']    = $x['allow_cid'];
-		$item['allow_gid']    = $x['allow_gid'];
-		$item['deny_cid']     = $x['deny_cid'];
-		$item['deny_gid']     = $x['deny_gid'];
-		$item['item_private'] = intval($acl->is_private());
-
-		$update_title = false;
-
-		if($item['title'] !== $arr['updateRawName']) {
-			$update_title = true;
-			$item['title'] = $arr['updateRawName'];
-		}
-
-		$update = item_store_update($item);
-
-		$item_id = $update['item_id'];
-
-		// update acl for any existing wiki pages
-
-		q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d where resource_type = 'nwikipage' and resource_id = '%s'",
-			dbesc($item['allow_cid']),
-			dbesc($item['allow_gid']),
-			dbesc($item['deny_cid']),
-			dbesc($item['deny_gid']),
-			dbesc($item['item_private']),
-			dbesc($arr['resource_id'])
-		);
-
-
-		if($update['item_id']) {
-			info( t('Wiki updated successfully'));
-			if($update_title) {
-				// Update the wiki name information using iconfig.
-				if(! set_iconfig($update['item_id'], 'wiki', 'rawName', $arr['updateRawName'], true)) {
-					return array('item' => null, 'success' => false);
-				}
-			}
-			return array('item' => $update['item'], 'item_id' => $update['item_id'], 'success' => $update['success']);
-		}
-		else {
-			return array('item' => null, 'success' => false);
-		}
-	}
-
-
-	public static function sync_a_wiki_item($uid,$id,$resource_id) {
-
-		$r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ",
-			intval($uid),
-			intval($id),
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			dbesc($resource_id)
-		);
-		if($r) {
-
-			$q = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s'",
-				dbesc($r[0]['resource_id'])
-			);
-			if($q) {
-				$r = array_merge($r,$q);
-			}
-			xchan_query($r);
-			$sync_item = fetch_post_tags($r);
-			if($sync_item) {
-				$pkt = [];
-				foreach($sync_item as $w) {
-					$pkt[] = encode_item($w,true);
-				}
-				Libsync::build_sync_packet($uid,array('wiki' => $pkt));
-			}
-		}
-	}
-
-
-	public static function delete_wiki($channel_id,$observer_hash,$resource_id) {
-
-		$w = self::get_wiki($channel_id,$observer_hash,$resource_id);
-		if(! $w['wiki']) {
-			return [ 'success' => false ];
-		}
-		else {
-
-			$r = q("SELECT id FROM item WHERE uid = %s AND resource_id = '%s'",
-				intval($channel_id),
-				dbesc($resource_id)
-			);
-
-			$ids = array_column($r, 'id');
-			drop_items($ids, true, DROPITEM_PHASE1);
-
-			info(t('Wiki files deleted successfully'));
-
-			return [ 'success' => true ];
-		}
-	}
-
-
-	public static function get_wiki($channel_id, $observer_hash, $resource_id) {
-
-		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
-
-		$item = q("SELECT * FROM item WHERE uid = %d AND resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0
-			$sql_extra ORDER BY id LIMIT 1",
-			intval($channel_id),
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			dbesc($resource_id)
-		);
-		if(! $item) {
-			return [ 'wiki' => null ];
-		}
-		else {
-
-			$w = $item[0];	// wiki item table record
-			// Get wiki metadata
-			$rawName  = get_iconfig($w, 'wiki', 'rawName');
-			$mimeType = get_iconfig($w, 'wiki', 'mimeType');
-			$typelock = get_iconfig($w, 'wiki', 'typelock');
-
-			return array(
-				'wiki'     => $w,
-				'rawName'  => $rawName,
-				'htmlName' => escape_tags($rawName),
-				//'urlName'  => urlencode(urlencode($rawName)),
-				'urlName'  => self::name_encode($rawName),
-				'mimeType' => $mimeType,
-				'typelock' => $typelock
-			);
-		}
-	}
-
-
-	public static function exists_by_name($uid, $urlName) {
-
-		$sql_extra = item_permissions_sql($uid);
-
-		$item = q("SELECT item.id, resource_id FROM item left join iconfig on iconfig.iid = item.id
-			WHERE resource_type = '%s' AND iconfig.v = '%s' AND uid = %d
-			AND item_deleted = 0 $sql_extra limit 1",
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			//dbesc(urldecode($urlName)),
-			dbesc(self::name_decode($urlName)),
-			intval($uid)
-		);
-
-		if($item) {
-			return array('id' => $item[0]['id'], 'resource_id' => $item[0]['resource_id']);
-		}
-		else {
-			return array('id' => null, 'resource_id' => null);
-		}
-	}
-
-
-	public static function get_permissions($resource_id, $owner_id, $observer_hash) {
-
-		// TODO: For now, only the owner can edit
-		$sql_extra = item_permissions_sql($owner_id, $observer_hash);
-
-		if(local_channel() && local_channel() == $owner_id) {
-			return [ 'read' => true, 'write' => true, 'success' => true ];
-		}
-
-		$r = q("SELECT * FROM item WHERE uid = %d and resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1",
-			intval($owner_id),
-			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			dbesc($resource_id)
-		);
-
-		if(! $r) {
-			return array('read' => false, 'write' => false, 'success' => true);
-		}
-		else {
-			$write = perm_is_allowed($owner_id, $observer_hash,'write_wiki');
-			return array('read' => true, 'write' => $write, 'success' => true);
-		}
-	}
-
-
-	public static function name_encode ($string) {
-
-		$string = html_entity_decode($string);
-		$encoding = mb_internal_encoding();
-		mb_internal_encoding("UTF-8");
-		$ret = mb_ereg_replace_callback ('[^A-Za-z0-9\-\_\.\~]',function ($char) {
-	                $charhex = unpack('H*',$char[0]);
-                	$ret = '('.$charhex[1].')';
-                	return $ret;
- 			}
-			,$string);
-		mb_internal_encoding($encoding);
-		return $ret;
-	}
-
-
-	public static function name_decode ($string) {
-
-		$encoding = mb_internal_encoding();
-		mb_internal_encoding("UTF-8");
-		$ret = mb_ereg_replace_callback ('(\(([0-9a-f]+)\))',function ($chars) {
-			return pack('H*',$chars[2]);
-			}
-			,$string);
-		mb_internal_encoding($encoding);
-		return $ret;
-	}
-
-}
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
deleted file mode 100644
index 1e944f7ac..000000000
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-
-namespace Zotlabs\Lib;
-
-use App;
-use Zotlabs\Access\PermissionLimits;
-
-class NativeWikiPage {
-
-	static public function page_list($channel_id, $observer_hash, $resource_id) {
-
-		// TODO: Create item table records for pages so that metadata like title can be applied
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
-		$pages[] = [
-			'resource_id' => '',
-			'title'       => 'Home',
-			'url'         => 'Home',
-			'link_id'     => 'id_wiki_home_0'
-		];
-
-		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
-
-		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0
-			$sql_extra order by title asc",
-			dbesc($resource_id),
-			intval($channel_id)
-		);
-		if ($r) {
-			$x = [];
-			$y = [];
-
-			foreach ($r as $rv) {
-				if (!in_array($rv['mid'], $x)) {
-					$y[] = $rv;
-					$x[] = $rv['mid'];
-				}
-			}
-
-			$items = fetch_post_tags($y, true);
-
-			foreach ($items as $page_item) {
-				$title = get_iconfig($page_item['id'], 'nwikipage', 'pagetitle', t('(No Title)'));
-				if (urldecode($title) !== 'Home') {
-					$pages[] = [
-						'resource_id' => $resource_id,
-						'title'       => escape_tags($title),
-						//'url'         => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))),
-						'url'         => NativeWiki::name_encode($title),
-						'link_id'     => 'id_' . substr($resource_id, 0, 10) . '_' . $page_item['id']
-					];
-				}
-			}
-		}
-
-		return ['pages' => $pages, 'wiki' => $w];
-	}
-
-
-	static public function create_page($channel, $observer_hash, $name, $resource_id, $mimetype = 'text/bbcode') {
-
-		logger('mimetype: ' . $mimetype);
-
-		if (!in_array($mimetype, ['text/markdown', 'text/bbcode', 'text/plain', 'text/html']))
-			$mimetype = 'text/markdown';
-
-		$w = NativeWiki::get_wiki($channel['channel_id'], $observer_hash, $resource_id);
-
-		if (!$w['wiki']) {
-			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
-		}
-
-		// backslashes won't work well in the javascript functions
-		$name = str_replace('\\', '', $name);
-
-		$uuid = new_uuid();
-		$mid  = z_root() . '/item/' . $uuid;
-
-		// create an empty activity
-		$arr                    = [];
-		$arr['aid']             = $channel['channel_account_id'];
-		$arr['uid']             = $channel['channel_id'];
-		$arr['mid']             = $mid;
-		$arr['parent_mid']      = $w['wiki']['mid'];
-		$arr['parent']          = $w['wiki']['parent'];
-		$arr['uuid']            = $uuid;
-		$arr['item_hidden']     = $w['wiki']['item_hidden'];
-		$arr['plink']           = $mid;
-		$arr['llink']           = z_root() . '/display/' . gen_link_id($mid);
-		$arr['author_xchan']    = $observer_hash;
-		$arr['mimetype']        = $mimetype;
-		$arr['title']           = $name;
-		$arr['resource_type']   = 'nwikipage';
-		$arr['resource_id']     = $resource_id;
-		$arr['allow_cid']       = $w['wiki']['allow_cid'];
-		$arr['allow_gid']       = $w['wiki']['allow_gid'];
-		$arr['deny_cid']        = $w['wiki']['deny_cid'];
-		$arr['deny_gid']        = $w['wiki']['deny_gid'];
-		$arr['item_private']    = $w['wiki']['item_private'];
-		$arr['item_wall']       = 1;
-		$arr['item_origin']     = 1;
-		$arr['item_thread_top'] = 1;
-		$arr['verb']            = ACTIVITY_CREATE;
-		$arr['obj_type']        = 'Document';
-		// TODO: add an object?
-		$arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'], 'view_wiki'), true);
-
-		// We may wish to change this some day.
-		$arr['item_unpublished'] = 1;
-
-		set_iconfig($arr, 'nwikipage', 'pagetitle', (($name) ? $name : t('(No Title)')), true);
-		$p = item_store($arr, false, false);
-
-		if ($p['item_id']) {
-			$page = [
-				'rawName'  => $name,
-				'htmlName' => escape_tags($name),
-				//'urlName'  => urlencode($name),
-				'urlName'  => NativeWiki::name_encode($name)
-
-			];
-
-			return ['page' => $page, 'item_id' => $p['item_id'], 'item' => $p['activity'], 'wiki' => $w, 'message' => '', 'success' => true];
-		}
-		return ['success' => false, 'message' => t('Wiki page create failed.')];
-	}
-
-
-	static public function rename_page($arr) {
-
-		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$pageNewName   = ((array_key_exists('pageNewName', $arr)) ? $arr['pageNewName'] : '');
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['message' => t('Wiki not found.'), 'success' => false];
-		}
-
-
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id
-			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
-			intval($channel_id),
-			dbesc($pageNewName)
-		);
-
-		if ($ic) {
-			return ['success' => false, 'message' => t('Destination name already exists')];
-		}
-
-
-		$ids = [];
-
-		$ic = q("select *, item.id as item_id from iconfig left join item on iconfig.iid = item.id
-			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
-			intval($channel_id),
-			dbesc($pageUrlName)
-		);
-
-		if ($ic) {
-			foreach ($ic as $c) {
-				set_iconfig($c['item_id'], 'nwikipage', 'pagetitle', $pageNewName);
-				$ids[] = $c['item_id'];
-			}
-
-			$str_ids = implode(',', $ids);
-			q("update item set title = '%s' where id in ($str_ids)",
-				dbesc($pageNewName)
-			);
-
-			$page = [
-				'rawName'  => $pageNewName,
-				'htmlName' => escape_tags($pageNewName),
-				//'urlName'  => urlencode(escape_tags($pageNewName))
-				'urlName'  => NativeWiki::name_encode($pageNewName)
-			];
-
-			return ['success' => true, 'page' => $page];
-		}
-
-		return ['success' => false, 'message' => t('Page not found')];
-
-	}
-
-
-	static public function get_page_content($arr) {
-
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? intval($arr['channel_id']) : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
-		}
-
-		$item = self::load_page($arr);
-
-		if ($item) {
-			$content = $item['body'];
-
-			return [
-				'content'      => $content,
-				'mimeType'     => $w['mimeType'],
-				'pageMimeType' => $item['mimetype'],
-				'message'      => '',
-				'success'      => true
-			];
-		}
-
-		return ['content' => null, 'message' => t('Error reading page content'), 'success' => false];
-
-	}
-
-
-	static public function page_history($arr) {
-
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['history' => null, 'message' => 'Error reading wiki', 'success' => false];
-		}
-
-		$items = self::load_page_history($arr);
-
-		$history = [];
-
-		if ($items) {
-			$processed = 0;
-			foreach ($items as $item) {
-				if ($processed > 1000)
-					break;
-				$processed++;
-				$history[] = [
-					'revision' => $item['revision'],
-					'date'     => datetime_convert('UTC', date_default_timezone_get(), $item['edited']),
-					'name'     => $item['author']['xchan_name'],
-					'title'    => get_iconfig($item, 'nwikipage', 'commit_msg')
-				];
-
-			}
-
-			return ['success' => true, 'history' => $history];
-		}
-
-		return ['success' => false];
-
-	}
-
-
-	static public function load_page($arr) {
-
-		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-		$revision      = ((array_key_exists('revision', $arr)) ? $arr['revision'] : (-1));
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
-		if (!$w['wiki']) {
-			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
-		}
-
-		$ids = '';
-
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
-			intval($channel_id),
-			dbesc($pageUrlName)
-		);
-
-		if ($ic) {
-			foreach ($ic as $c) {
-				if ($ids)
-					$ids .= ',';
-				$ids .= intval($c['iid']);
-			}
-		}
-
-		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
-
-		if ($revision == (-1))
-			$sql_extra .= " order by revision desc ";
-		elseif ($revision)
-			$sql_extra .= " and revision = " . intval($revision) . " ";
-
-		$r = null;
-
-
-		if ($ids) {
-			$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) $sql_extra limit 1",
-				dbesc($resource_id),
-				intval($channel_id)
-			);
-
-			if ($r) {
-				$items = fetch_post_tags($r, true);
-				return $items[0];
-			}
-		}
-
-		return null;
-	}
-
-
-	static public function load_page_history($arr) {
-
-		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['content' => null, 'message' => 'Error reading wiki', 'success' => false];
-		}
-
-		$ids = '';
-
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
-			intval($channel_id),
-			dbesc($pageUrlName)
-		);
-
-		if ($ic) {
-			foreach ($ic as $c) {
-				if ($ids)
-					$ids .= ',';
-				$ids .= intval($c['iid']);
-			}
-		}
-
-		$sql_extra = item_permissions_sql($channel_id, $observer_hash);
-
-		$sql_extra .= " order by revision desc ";
-
-		$r = null;
-		if ($ids) {
-			$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and id in ( $ids ) and item_deleted = 0 $sql_extra",
-				dbesc($resource_id),
-				intval($channel_id)
-			);
-			if ($r) {
-				xchan_query($r);
-				$items = fetch_post_tags($r, true);
-				return $items;
-			}
-		}
-
-		return null;
-	}
-
-
-	static public function save_page($arr) {
-		$pageUrlName   = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$content       = ((array_key_exists('content', $arr)) ? $arr['content'] : '');
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
-		if (!$w['wiki']) {
-			return ['message' => t('Error reading wiki'), 'success' => false];
-		}
-
-
-		// fetch the most recently saved revision.
-
-		$item = self::load_page($arr);
-
-		if (!$item) {
-			return ['message' => t('Page not found'), 'success' => false];
-		}
-
-		$mimetype = $item['mimetype'];
-
-		// change just the fields we need to change to create a revision;
-
-		unset($item['id']);
-		unset($item['author']);
-		$item['parent']       = 0;
-		$item['body']         = $content;
-		$item['author_xchan'] = $observer_hash;
-		$item['revision']     = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1);
-		$item['edited']       = datetime_convert();
-		$item['mimetype']     = $mimetype;
-
-		if ($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) {
-			for ($x = 0; $x < count($item['iconfig']); $x++) {
-				unset($item['iconfig'][$x]['id']);
-				unset($item['iconfig'][$x]['iid']);
-			}
-		}
-
-		$ret = item_store($item, false, false);
-
-		if ($ret['item_id'])
-			return ['message' => '', 'item_id' => $ret['item_id'], 'filename' => $pageUrlName, 'success' => true];
-		else
-			return ['message' => t('Page update failed.'), 'success' => false];
-	}
-
-
-	static public function delete_page($arr) {
-
-		$pageUrlName   = (array_key_exists('pageUrlName', $arr) ? $arr['pageUrlName'] : '');
-		$resource_id   = (array_key_exists('resource_id', $arr) ? $arr['resource_id'] : '');
-		$observer_hash = (array_key_exists('observer_hash', $arr) ? $arr['observer_hash'] : '');
-		$channel_id    = (array_key_exists('channel_id', $arr) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['success' => false, 'message' => t('Error reading wiki')];
-		}
-
-		$ids = [];
-
-		$ic = q("select * from iconfig left join item on iconfig.iid = item.id
-			where uid = %d and cat = 'nwikipage' and k = 'pagetitle' and v = '%s'",
-			intval($channel_id),
-			dbesc($pageUrlName)
-		);
-
-		if ($ic) {
-			foreach ($ic as $c) {
-				$ids[] = intval($c['iid']);
-			}
-		}
-
-		if ($ids) {
-			drop_items($ids, true, DROPITEM_PHASE1);
-			return ['success' => true];
-		}
-
-		return ['success' => false, 'message' => t('Nothing deleted')];
-	}
-
-
-	static public function revert_page($arr) {
-
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$commitHash    = ((array_key_exists('commitHash', $arr)) ? $arr['commitHash'] : null);
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		if (!$commitHash) {
-			return ['message' => 'No commit was provided', 'success' => false];
-		}
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['message' => 'Error reading wiki', 'success' => false];
-		}
-
-		$x = $arr;
-
-		if (intval($commitHash) > 0) {
-			unset($x['commitHash']);
-			$x['revision'] = intval($commitHash) - 1;
-			$loaded        = self::load_page($x);
-
-			if ($loaded) {
-				$content = $loaded['body'];
-				return ['content' => $content, 'success' => true];
-			}
-			return ['success' => false];
-		}
-	}
-
-
-	static public function compare_page($arr) {
-
-		$resource_id   = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-		$compareCommit = ((array_key_exists('compareCommit', $arr)) ? $arr['compareCommit'] : 0);
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-
-		if (!$w['wiki']) {
-			return ['message' => t('Error reading wiki'), 'success' => false];
-		}
-
-		$x             = $arr;
-		$x['revision'] = (-1);
-
-		$currpage = self::load_page($x);
-		if ($currpage)
-			$currentContent = $currpage['body'];
-
-		$x['revision'] = $compareCommit;
-		$comppage      = self::load_page($x);
-		if ($comppage)
-			$compareContent = $comppage['body'];
-
-		if ($currpage && $comppage) {
-			require_once('library/class.Diff.php');
-			$diff = \Diff::toTable(\Diff::compare($currentContent, $compareContent));
-
-			return ['success' => true, 'diff' => $diff];
-		}
-		return ['success' => false, 'message' => t('Compare: object not found.')];
-
-	}
-
-
-	static public function commit($arr) {
-
-		$commit_msg    = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : t('Page updated'));
-		$observer_hash = ((array_key_exists('observer_hash', $arr)) ? $arr['observer_hash'] : '');
-		$channel_id    = ((array_key_exists('channel_id', $arr)) ? $arr['channel_id'] : 0);
-
-		if (array_key_exists('resource_id', $arr)) {
-			$resource_id = $arr['resource_id'];
-		}
-		else {
-			return ['message' => t('Wiki resource_id required for git commit'), 'success' => false];
-		}
-
-		$w = NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
-		if (!$w['wiki']) {
-			return ['message' => t('Error reading wiki'), 'success' => false];
-		}
-
-
-		$page = self::load_page($arr);
-
-		if ($page) {
-			set_iconfig($page['id'], 'nwikipage', 'commit_msg', escape_tags($commit_msg), true);
-			return ['success' => true, 'item_id' => $page['id'], 'page' => $page];
-		}
-
-		return ['success' => false, 'message' => t('Page not found.')];
-
-	}
-
-	static public function convert_links($s, $wikiURL) {
-
-		if (strpos($s, '[[') !== false) {
-			preg_match_all("/\[\[(.*?)\]\]/", $s, $match);
-			$pages = $pageURLs = [];
-			foreach ($match[1] as $m) {
-				// TODO: Why do we need to double urlencode for this to work?
-				//$pageURLs[] = urlencode(urlencode(escape_tags($m)));
-				$titleUri   = explode('|', $m);
-				$page       = $titleUri[0] ?? '';
-				$title      = $titleUri[1] ?? $page;
-				$pageURLs[] = NativeWiki::name_encode(escape_tags($page));
-				$pages[]    = $title;
-			}
-			$idx = 0;
-			while (strpos($s, '[[') !== false) {
-				$replace = '<a href="' . $wikiURL . '/' . $pageURLs[$idx] . '">' . $pages[$idx] . '</a>';
-				$s       = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1);
-				$idx++;
-			}
-		}
-		return $s;
-	}
-
-	static public function render_page_history($arr) {
-
-		$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-
-		$pageHistory = self::page_history([
-			'channel_id'    => App::$profile_uid,
-			'observer_hash' => get_observer_hash(),
-			'resource_id'   => $resource_id,
-			'pageUrlName'   => $pageUrlName
-		]);
-
-		return replace_macros(get_markup_template('nwiki_page_history.tpl'), [
-			'$pageHistory' => $pageHistory['history'],
-			'$permsWrite'  => $arr['permsWrite'],
-			'$name_lbl'    => t('Name'),
-			'$msg_label'   => t('Message', 'wiki_history'),
-			'$date_lbl'    => t('Date'),
-			'$revert_btn'  => t('Revert'),
-			'$compare_btn' => t('Compare')
-		]);
-
-	}
-
-
-	/**
-	 * Replace the instances of the string [toc] with a list element that will be populated by
-	 * a table of contents by the JavaScript library
-	 * @param string $s
-	 * @return string
-	 */
-	static public function generate_toc($s) {
-		if (strpos($s, '[toc]') !== false) {
-			//$toc_md = wiki_toc($s);	// Generate Markdown-formatted list prior to HTML render
-			$toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/
-			$s      = preg_replace("/\[toc\]/", $toc_md, $s, -1);
-		}
-		return $s;
-	}
-
-
-	/**
-	 *  Converts a select set of bbcode tags. Much of the code is copied from include/bbcode.php
-	 * @param string $s
-	 * @return string
-	 */
-	static public function bbcode($s) {
-
-		$s = str_replace(['[baseurl]', '[sitename]'], [z_root(), get_config('system', 'sitename')], $s);
-
-		$s = preg_replace_callback("/\[observer\.language\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_callback', $s);
-
-		$s = preg_replace_callback("/\[observer\.language\!\=(.*?)\](.*?)\[\/observer\]/ism", 'oblanguage_necallback', $s);
-
-
-		$observer = App::get_observer();
-		if ($observer) {
-			$s1         = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
-			$s2         = '</span>';
-			$obsBaseURL = $observer['xchan_connurl'];
-			$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);
-			$s          = str_replace('[observer.baseurl]', $obsBaseURL, $s);
-			$s          = str_replace('[observer.url]', $observer['xchan_url'], $s);
-			$s          = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s);
-			$s          = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s);
-			$s          = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s);
-			$s          = str_replace('[observer.photo]', '', $s);
-		}
-		else {
-			$s = str_replace('[observer.baseurl]', '', $s);
-			$s = str_replace('[observer.url]', '', $s);
-			$s = str_replace('[observer.name]', '', $s);
-			$s = str_replace('[observer.address]', '', $s);
-			$s = str_replace('[observer.webname]', '', $s);
-			$s = str_replace('[observer.photo]', '', $s);
-		}
-
-		return $s;
-	}
-
-
-	static public function get_file_ext($arr) {
-
-		if ($arr['mimetype'] === 'text/bbcode')
-			return '.bb';
-		elseif ($arr['mimetype'] === 'text/markdown')
-			return '.md';
-		elseif ($arr['mimetype'] === 'text/plain')
-			return '.txt';
-
-	}
-
-	// This function is derived from
-	// http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
-	static public function toc($content) {
-		// ensure using only "\n" as line-break
-		$source = str_replace(["\r\n", "\r"], "\n", $content);
-
-		// look for markdown TOC items
-		preg_match_all(
-			'/^(?:=|-|#).*$/m',
-			$source,
-			$matches,
-			PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
-		);
-
-		// preprocess: iterate matched lines to create an array of items
-		// where each item is an array(level, text)
-		$file_size = strlen($source);
-		foreach ($matches[0] as $item) {
-			$found_mark = substr($item[0], 0, 1);
-			if ($found_mark == '#') {
-				// text is the found item
-				$item_text  = $item[0];
-				$item_level = strrpos($item_text, '#') + 1;
-				$item_text  = substr($item_text, $item_level);
-			}
-			else {
-				// text is the previous line (empty if <hr>)
-				$item_offset      = $item[1];
-				$prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2));
-				$item_text        =
-					substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1);
-				$item_text        = trim($item_text);
-				$item_level       = $found_mark == '=' ? 1 : 2;
-			}
-			if (!trim($item_text) or strpos($item_text, '|') !== FALSE) {
-				// item is an horizontal separator or a table header, don't mind
-				continue;
-			}
-			$raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)];
-		}
-		$o = '';
-		foreach ($raw_toc as $t) {
-			$level = intval($t['level']);
-			$text  = $t['text'];
-			switch ($level) {
-				case 1:
-					$li = '* ';
-					break;
-				case 2:
-					$li = '  * ';
-					break;
-				case 3:
-					$li = '    * ';
-					break;
-				case 4:
-					$li = '      * ';
-					break;
-				default:
-					$li = '* ';
-					break;
-			}
-			$o .= $li . $text . "\n";
-		}
-		return $o;
-	}
-
-}
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 8d20935a1..a02c1415e 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -162,24 +162,11 @@ class ThreadItem {
 
 		$mode = $conv->get_mode();
 
-		switch($item['item_type']) {
-			case ITEM_TYPE_CARD:
-				$edlink = 'card_edit';
-				break;
-			case ITEM_TYPE_ARTICLE:
-				$edlink = 'article_edit';
-				break;
-			default:
-				$edlink = 'editpost';
-				break;
-		}
-
 		if(local_channel() && $observer['xchan_hash'] === $item['author_xchan'])
-			$edpost = array(z_root() . '/' . $edlink . '/' . $item['id'], t('Edit'));
+			$edpost = array(z_root() . '/editpost/' . $item['id'], t('Edit'));
 		else
 			$edpost = false;
 
-
 		if($observer && $observer['xchan_hash']
 			&& ($observer['xchan_hash'] == $this->get_data_value('author_xchan')
 			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan')
@@ -297,7 +284,7 @@ class ThreadItem {
 
 		if($this->is_toplevel()) {
 			// FIXME check this permission
-			if(($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) {
+			if($conv->get_profile_owner() === local_channel() || intval($item['item_private']) === 0) {
 
 				$star = array(
 					'toggle' => t("Toggle Star Status"),
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 7fe8fcc2e..2ad24a690 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -69,12 +69,12 @@ class ThreadStream {
 			case 'cards':
 				$this->profile_owner = \App::$profile['profile_uid'];
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
-				$this->reload = $_SESSION['return_url'];
+				//$this->reload = $_SESSION['return_url'];
 				break;
 			case 'articles':
 				$this->profile_owner = \App::$profile['profile_uid'];
 				$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
-				$this->reload = $_SESSION['return_url'];
+				//$this->reload = $_SESSION['return_url'];
 				break;
 			case 'display':
 				// in this mode we set profile_owner after initialisation (from conversation()) and then
diff --git a/Zotlabs/Module/Article_edit.php b/Zotlabs/Module/Article_edit.php
deleted file mode 100644
index 97c87f2ba..000000000
--- a/Zotlabs/Module/Article_edit.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/channel.php');
-require_once('include/acl_selectors.php');
-require_once('include/conversation.php');
-
-class Article_edit extends \Zotlabs\Web\Controller {
-
-
-	function get() {
-
-		// Figure out which post we're editing
-		$post_id = ((argc() > 1) ? intval(argv(1)) : 0);
-
-		if(! $post_id) {
-			notice( t('Item not found') . EOL);
-			return;
-		}
-
-		$itm = q("SELECT * FROM item WHERE id = %d and item_type = %d LIMIT 1",
-			intval($post_id),
-			intval(ITEM_TYPE_ARTICLE)
-		);
-		if($itm) {
-			$item_id = q("select * from iconfig where cat = 'system' and k = 'ARTICLE' and iid = %d limit 1",
-				intval($itm[0]['id'])
-			);
-			if($item_id)
-				$card_title = $item_id[0]['v'];
-		}
-		else {
-			notice( t('Item not found') . EOL);
-			return;
-		}
-
-		$owner = $itm[0]['uid'];
-		$uid = local_channel();
-
-		$observer = \App::get_observer();
-
-		$channel = channelx_by_n($owner);
-		if(! $channel) {
-			notice( t('Channel not found.') . EOL);
-			return;
-		}
-
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-		if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		$is_owner = (($uid && $uid == $owner) ? true : false);
-
-		$o = '';
-
-
-
-		$category = '';
-		$catsenabled = ((feature_enabled($owner,'categories')) ? 'categories' : '');
-
-		if ($catsenabled){
-		        $itm = fetch_post_tags($itm);
-
-	                $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-
-		        foreach ($cats as $cat) {
-		                if (strlen($category))
-		                        $category .= ', ';
-		                $category .= $cat['term'];
-		        }
-		}
-
-		if($itm[0]['attach']) {
-			$j = json_decode($itm[0]['attach'],true);
-			if($j) {
-				foreach($j as $jj) {
-					$itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
-				}
-			}
-		}
-
-
-		$mimetype = $itm[0]['mimetype'];
-
-		$content = $itm[0]['body'];
-
-		$rp = 'articles/' . $channel['channel_address'];
-
-		$x = array(
-			'nickname' => $channel['channel_address'],
-			'bbco_autocomplete'=> 'bbcode',
-			'return_path' => $rp,
-			'webpage' => ITEM_TYPE_ARTICLE,
-			'button' => t('Edit'),
-			'writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_pages'),
-			'weblink' => t('Insert web link'),
-			'hide_voting' => false,
-			'hide_future' => false,
-			'hide_location' => false,
-			'hide_expire' => false,
-			'showacl' => true,
-			'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
-			'permissions' => $itm[0],
-			'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'),
-			'ptyp' => $itm[0]['type'],
-			'mimeselect' => false,
-			'mimetype' => $itm[0]['mimetype'],
-			'body' => undo_post_tagging($content),
-			'post_id' => $post_id,
-			'visitor' => true,
-			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-			'summary' => htmlspecialchars($itm[0]['summary'],ENT_COMPAT,'UTF-8'),
-			'placeholdertitle' => t('Title (optional)'),
-			'pagetitle' => $card_title,
-			'profile_uid' => (intval($channel['channel_id'])),
-			'catsenabled' => $catsenabled,
-			'category' => $category,
-			'bbcode' => (($mimetype  == 'text/bbcode') ? true : false)
-		);
-
-		$editor = status_editor($a, $x, false, 'Article_edit');
-
-		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-			'$title' => t('Edit Article'),
-			'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-			'$id' => $itm[0]['id'],
-			'$cancel' => t('Cancel'),
-			'$editor' => $editor
-		));
-
-		return $o;
-
-	}
-
-}
diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php
deleted file mode 100644
index 0db098a31..000000000
--- a/Zotlabs/Module/Articles.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\PermissionDescription;
-
-require_once('include/channel.php');
-require_once('include/conversation.php');
-require_once('include/acl_selectors.php');
-require_once('include/opengraph.php');
-
-
-class Articles extends Controller {
-
-	function init() {
-
-		if(argc() > 1)
-			$which = argv(1);
-
-                if(! $which) {
-                        if(local_channel()) {
-                                $channel = App::get_channel();
-                                if($channel && $channel['channel_address'])
-                                $which = $channel['channel_address'];
-                        } else {
-				return;
-			}
-                }
-
-		profile_load($which);
-
-	}
-
-	function get($update = 0, $load = false) {
-
-		if(observer_prohibited(true)) {
-			return login();
-		}
-
-		if(! App::$profile) {
-			notice( t('Requested profile is not available.') . EOL );
-			App::$error = 404;
-			return;
-		}
-
-		if(! Apps::system_app_installed(App::$profile_uid, 'Articles')) {
-			//Do not display any associated widgets at this point
-			App::$pdl = '';
-			$papp = Apps::get_papp('Articles');
-			return Apps::app_render($papp, 'module');
-		}
-
-		nav_set_selected('Articles');
-
-		head_add_link([
-			'rel'   => 'alternate',
-			'type'  => 'application/json+oembed',
-			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-			'title' => 'oembed'
-		]);
-
-
-		$category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
-
-		if($category) {
-			$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'],'item', $category, TERM_CATEGORY));
-		}
-
-		$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
-		$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
-
-		$which = argv(1);
-
-		$selected_card = ((argc() > 2) ? argv(2) : '');
-
-		$_SESSION['return_url'] = App::$query_string;
-
-		$uid      = local_channel();
-		$owner    = App::$profile_uid;
-		$observer = App::get_observer();
-
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-		if(! perm_is_allowed($owner,$ob_hash,'view_pages')) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		$is_owner = ($uid && $uid == $owner);
-
-		$channel = channelx_by_n($owner);
-
-		if($channel) {
-			$channel_acl = array(
-				'allow_cid' => $channel['channel_allow_cid'],
-				'allow_gid' => $channel['channel_allow_gid'],
-				'deny_cid'  => $channel['channel_deny_cid'],
-				'deny_gid'  => $channel['channel_deny_gid']
-			);
-		}
-		else {
-			$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
-		}
-
-
-
-		if(perm_is_allowed($owner,$ob_hash,'write_pages')) {
-
-			$x = [
-				'webpage'           => ITEM_TYPE_ARTICLE,
-				'is_owner'          => true,
-				'content_label'     => t('Add Article'),
-				'button'            => t('Save'),
-				'nickname'          => $channel['channel_address'],
-				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
-					|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'               => (($is_owner) ? populate_acl($channel_acl, false,
-					PermissionDescription::fromGlobalPermission('view_pages')) : ''),
-				'permissions'       => $channel_acl,
-				'showacl'           => (($is_owner) ? true : false),
-				'visitor'           => true,
-				'hide_location'     => false,
-				'hide_voting'       => false,
-				'profile_uid'       => intval($owner),
-				'mimetype'          => 'text/bbcode',
-				'mimeselect'        => false,
-				'layoutselect'      => false,
-				'expanded'          => false,
-				'novoting'          => false,
-				'catsenabled'       => feature_enabled($owner,'categories'),
-				'bbco_autocomplete' => 'bbcode',
-				'bbcode'            => true
-			];
-
-			if($_REQUEST['title'])
-				$x['title'] = $_REQUEST['title'];
-			if($_REQUEST['body'])
-				$x['body'] = $_REQUEST['body'];
-			$editor = status_editor($a,$x,false,'Articles');
-
-		}
-		else {
-			$editor = '';
-		}
-
-		$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']));
-
-
-		$sql_extra = item_permissions_sql($owner);
-		$sql_item = '';
-
-		if($selected_card) {
-			$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.v = '%s' limit 1",
-				dbesc($selected_card)
-			);
-			if($r) {
-				$sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
-			}
-		}
-		if($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
-			$order = 'post';
-		}
-		if($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2))));
-		}
-
-		if($datequery || $datequery2) {
-			$sql_extra2 .= " and item.item_thread_top != 0 ";
-		}
-
-		$r = q("select * from item
-			where item.uid = %d and item_type = %d
-			$sql_extra $sql_extra2 $sql_item order by item.created desc $pager_sql",
-			intval($owner),
-			intval(ITEM_TYPE_ARTICLE)
-		);
-
-		$item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-		if($r) {
-
-			$pager_total = count($r);
-
-			$parents_str = ids_to_querystr($r,'id');
-
-			$r = q("SELECT item.*, item.id AS item_id
-				FROM item
-				WHERE item.uid = %d $item_normal
-				AND item.parent IN ( %s )
-				$sql_extra $sql_extra2 ",
-				intval(App::$profile['profile_uid']),
-				dbesc($parents_str)
-			);
-			if($r) {
-				xchan_query($r);
-				$items = fetch_post_tags($r, true);
-				$items = conv_sort($items,'updated');
-			}
-			else
-				$items = [];
-		}
-
-		// Add Opengraph markup
-		opengraph_add_meta((! empty($items) ? $r[0] : []), $channel);
-
-		$mode = 'articles';
-
-		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
-            $page_mode = 'pager_list';
-        else
-            $page_mode = 'traditional';
-
-     	$content = conversation($items,$mode,false,$page_mode);
-
-		$o = replace_macros(get_markup_template('cards.tpl'), [
-			'$title' => t('Articles'),
-			'$editor' => $editor,
-			'$content' => $content,
-			'$pager' => alt_pager($pager_total)
-		]);
-
-        return $o;
-    }
-
-}
diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php
deleted file mode 100644
index c57a0f043..000000000
--- a/Zotlabs/Module/Card_edit.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-require_once('include/channel.php');
-require_once('include/acl_selectors.php');
-require_once('include/conversation.php');
-
-class Card_edit extends \Zotlabs\Web\Controller {
-
-
-	function get() {
-
-		// Figure out which post we're editing
-		$post_id = ((argc() > 1) ? intval(argv(1)) : 0);
-
-		if(! $post_id) {
-			notice( t('Item not found') . EOL);
-			return;
-		}
-
-		$itm = q("SELECT * FROM item WHERE id = %d and item_type = %d LIMIT 1",
-			intval($post_id),
-			intval(ITEM_TYPE_CARD)
-		);
-		if($itm) {
-			$item_id = q("select * from iconfig where cat = 'system' and k = 'CARD' and iid = %d limit 1",
-				intval($itm[0]['id'])
-			);
-			if($item_id)
-				$card_title = $item_id[0]['v'];
-		}
-		else {
-			notice( t('Item not found') . EOL);
-			return;
-		}
-
-		$owner = $itm[0]['uid'];
-		$uid = local_channel();
-
-		$observer = \App::get_observer();
-
-		$channel = channelx_by_n($owner);
-		if(! $channel) {
-			notice( t('Channel not found.') . EOL);
-			return;
-		}
-
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-		if(! perm_is_allowed($owner,$ob_hash,'write_pages')) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		$is_owner = (($uid && $uid == $owner) ? true : false);
-
-		$o = '';
-
-
-
-		$category = '';
-		$catsenabled = ((feature_enabled($owner,'categories')) ? 'categories' : '');
-
-		if ($catsenabled){
-		        $itm = fetch_post_tags($itm);
-
-	                $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY);
-
-		        foreach ($cats as $cat) {
-		                if (strlen($category))
-		                        $category .= ', ';
-		                $category .= $cat['term'];
-		        }
-		}
-
-		if($itm[0]['attach']) {
-			$j = json_decode($itm[0]['attach'],true);
-			if($j) {
-				foreach($j as $jj) {
-					$itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
-				}
-			}
-		}
-
-
-		$mimetype = $itm[0]['mimetype'];
-
-		$content = $itm[0]['body'];
-
-
-
-		$rp = 'cards/' . $channel['channel_address'];
-
-		$x = array(
-			'nickname' => $channel['channel_address'],
-			'bbco_autocomplete'=> 'bbcode',
-			'return_path' => $rp,
-			'webpage' => ITEM_TYPE_CARD,
-			'button' => t('Edit'),
-			'writefiles' => perm_is_allowed($owner, get_observer_hash(), 'write_pages'),
-			'weblink' => t('Insert web link'),
-			'hide_voting' => false,
-			'hide_future' => false,
-			'hide_location' => false,
-			'hide_expire' => false,
-			'showacl' => true,
-			'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
-			'permissions' => $itm[0],
-			'lockstate' => (($itm[0]['allow_cid'] || $itm[0]['allow_gid'] || $itm[0]['deny_cid'] || $itm[0]['deny_gid']) ? 'lock' : 'unlock'),
-			'ptyp' => $itm[0]['type'],
-			'mimeselect' => false,
-			'mimetype' => $itm[0]['mimetype'],
-			'body' => undo_post_tagging($content),
-			'post_id' => $post_id,
-			'visitor' => true,
-			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-			'summary' => htmlspecialchars($itm[0]['summary'],ENT_COMPAT,'UTF-8'),
-			'placeholdertitle' => t('Title (optional)'),
-			'pagetitle' => $card_title,
-			'profile_uid' => (intval($channel['channel_id'])),
-			'catsenabled' => $catsenabled,
-			'category' => $category,
-			'bbcode' => (($mimetype  == 'text/bbcode') ? true : false)
-		);
-
-		$editor = status_editor($a, $x, false, 'Card_edit');
-
-		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-			'$title' => t('Edit Card'),
-			'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-			'$id' => $itm[0]['id'],
-			'$cancel' => t('Cancel'),
-			'$editor' => $editor
-		));
-
-		return $o;
-
-	}
-
-}
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
deleted file mode 100644
index b71af6044..000000000
--- a/Zotlabs/Module/Cards.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\PermissionDescription;
-
-require_once('include/channel.php');
-require_once('include/conversation.php');
-require_once('include/acl_selectors.php');
-
-/**
- * @brief Provides the Cards module.
- *
- */
-class Cards extends Controller {
-
-	public function init() {
-
-		if(argc() > 1)
-			$which = argv(1);
-		else
-			return;
-
-		profile_load($which);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see \\Zotlabs\\Web\\Controller::get()
-	 *
-	 * @return string Parsed HTML from template 'cards.tpl'
-	 */
-	public function get($update = 0, $load = false) {
-
-		if(observer_prohibited(true)) {
-			return login();
-		}
-
-		if(! App::$profile) {
-			notice( t('Requested profile is not available.') . EOL );
-			App::$error = 404;
-			return;
-		}
-
-		if(! Apps::system_app_installed(App::$profile_uid, 'Cards')) {
-			//Do not display any associated widgets at this point
-			App::$pdl = '';
-			$papp = Apps::get_papp('Cards');
-			return Apps::app_render($papp, 'module');
-		}
-
-		nav_set_selected('Cards');
-
-		head_add_link([
-			'rel'   => 'alternate',
-			'type'  => 'application/json+oembed',
-			'href'  => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . App::$query_string),
-			'title' => 'oembed'
-		]);
-
-
-		$category = (($_REQUEST['cat']) ? escape_tags(trim($_REQUEST['cat'])) : '');
-
-		if($category) {
-			$sql_extra2 .= protect_sprintf(term_item_parent_query(App::$profile['profile_uid'], 'item', $category, TERM_CATEGORY));
-		}
-
-
-		$which = argv(1);
-
-		$selected_card = ((argc() > 2) ? argv(2) : '');
-
-		$_SESSION['return_url'] = App::$query_string;
-
-		$uid      = local_channel();
-		$owner    = App::$profile_uid;
-		$observer = App::get_observer();
-
-		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-
-		if(! perm_is_allowed($owner, $ob_hash, 'view_pages')) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		$is_owner = ($uid && $uid == $owner);
-
-		$channel = channelx_by_n($owner);
-
-		if($channel) {
-			$channel_acl = [
-				'allow_cid' => $channel['channel_allow_cid'],
-				'allow_gid' => $channel['channel_allow_gid'],
-				'deny_cid'  => $channel['channel_deny_cid'],
-				'deny_gid'  => $channel['channel_deny_gid']
-			];
-		}
-		else {
-			$channel_acl = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
-		}
-
-
-		if(perm_is_allowed($owner, $ob_hash, 'write_pages')) {
-
-			$x = [
-				'webpage'           => ITEM_TYPE_CARD,
-				'is_owner'          => true,
-				'content_label'     => t('Add Card'),
-				'button'            => t('Save'),
-				'nickname'          => $channel['channel_address'],
-				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid']
-					|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'               => (($is_owner) ? populate_acl($channel_acl, false,
-					PermissionDescription::fromGlobalPermission('view_pages')) : ''),
-				'permissions'       => $channel_acl,
-				'showacl'           => (($is_owner) ? true : false),
-				'visitor'           => true,
-				'hide_location'     => false,
-				'hide_voting'       => false,
-				'profile_uid'       => intval($owner),
-				'mimetype'          => 'text/bbcode',
-				'mimeselect'        => false,
-				'layoutselect'      => false,
-				'expanded'          => false,
-				'novoting'          => false,
-				'catsenabled'       => feature_enabled($owner, 'categories'),
-				'bbco_autocomplete' => 'bbcode',
-				'bbcode'            => true
-			];
-
-			if($_REQUEST['title'])
-				$x['title'] = $_REQUEST['title'];
-			if($_REQUEST['body'])
-				$x['body'] = $_REQUEST['body'];
-
-			$editor = status_editor($a, $x, false, 'Cards');
-		}
-		else {
-			$editor = '';
-		}
-
-
-		$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']));
-
-
-		$sql_extra = item_permissions_sql($owner);
-		$sql_item = '';
-
-		if($selected_card) {
-			$r = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.v = '%s' limit 1",
-				dbesc($selected_card)
-			);
-			if($r) {
-				$sql_item = "and item.id = " . intval($r[0]['iid']) . " ";
-			}
-		}
-
-		$r = q("select * from item
-			where uid = %d and item_type = %d
-			$sql_extra $sql_item order by item.created desc $pager_sql",
-			intval($owner),
-			intval(ITEM_TYPE_CARD)
-		);
-
-		$item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
-			and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-			and item.item_blocked = 0 ";
-
-		$items_result = [];
-		if($r) {
-
-			$pager_total = count($r);
-
-			$parents_str = ids_to_querystr($r, 'id');
-
-			$items = q("SELECT item.*, item.id AS item_id
-				FROM item
-				WHERE item.uid = %d $item_normal
-				AND item.parent IN ( %s )
-				$sql_extra $sql_extra2 ",
-				intval(App::$profile['profile_uid']),
-				dbesc($parents_str)
-			);
-			if($items) {
-				xchan_query($items);
-				$items = fetch_post_tags($items, true);
-				$items_result = conv_sort($items, 'updated');
-			}
-		}
-
-		$mode = 'cards';
-
-		if(get_pconfig(local_channel(),'system','articles_list_mode') && (! $selected_card))
-			$page_mode = 'pager_list';
-		else
-			$page_mode = 'traditional';
-
-		$content = conversation($items_result, $mode, false, $page_mode);
-
-		$o = replace_macros(get_markup_template('cards.tpl'), [
-			'$title' => t('Cards'),
-			'$editor' => $editor,
-			'$content' => $content,
-			'$pager' => alt_pager($pager_total)
-		]);
-
-		return $o;
-	}
-
-}
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 02a79f854..0d29c3451 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -143,48 +143,8 @@ class Display extends \Zotlabs\Web\Controller {
 			 	return '';
 			}
 		}
-		if($target_item['item_type']  == ITEM_TYPE_ARTICLE) {
-			$x = q("select * from channel where channel_id = %d limit 1",
-				intval($target_item['uid'])
-			);
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id
-				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and item.id = %d limit 1",
-				intval($target_item['uid']),
-				intval($target_item['parent'])
-			);
-			if($x && $y) {
-				goaway(z_root() . '/articles/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
-			}
-			else {
-				notice( t('Page not found.') . EOL);
-			 	return '';
-			}
-		}
-		if($target_item['item_type']  == ITEM_TYPE_CARD) {
 
-			$x = q("select * from channel where channel_id = %d limit 1",
-				intval($target_item['uid'])
-			);
-
-			$y = q("select * from iconfig left join item on iconfig.iid = item.id
-				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'CARD' and item.id = %d limit 1",
-				intval($target_item['uid']),
-				intval($target_item['parent'])
-			);
-
-			if($x && $y) {
-				goaway(z_root() . '/cards/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
-			}
-			else {
-				notice( t('Page not found.') . EOL);
-			 	return '';
-			}
-		}
-		if ($target_item['item_type'] == ITEM_TYPE_CUSTOM) {
-			call_hooks('item_custom_display',$target_item);
-			notice( t('Page not found.') . EOL);
-			return '';
-		}
+		call_hooks('item_custom_display', $target_item);
 
 		$simple_update = '';
 		if($update && $_SESSION['loadtime'])
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 574a90c1a..e1ba2b2f0 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -743,6 +743,8 @@ class Item extends Controller {
 				$webpage       = $parent_item['item_type'];
 			}
 
+
+
 			if ((!$allow_empty) && (!strlen($body))) {
 				if ($preview)
 					killme();
@@ -807,7 +809,6 @@ class Item extends Controller {
 
 		$post_tags = [];
 
-
 		if ($mimetype === 'text/bbcode') {
 
 			require_once('include/text.php');
@@ -919,15 +920,7 @@ class Item extends Controller {
 			$cats = explode(',', $categories);
 			foreach ($cats as $cat) {
 
-				if ($webpage == ITEM_TYPE_CARD) {
-					$catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
-				}
-				elseif ($webpage == ITEM_TYPE_ARTICLE) {
-					$catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
-				}
-				else {
-					$catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
-				}
+				$catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
 
 				$post_tags[] = [
 					'uid'   => $profile_uid,
@@ -1040,7 +1033,7 @@ class Item extends Controller {
 			$parent_mid = $parent_item['mid'];
 
 
-		// Fallback so that we alway have a thr_parent
+		// Fallback so that we always have a thr_parent
 
 		if (!$thr_parent)
 			$thr_parent = $mid;
@@ -1048,36 +1041,7 @@ class Item extends Controller {
 
 		$item_thread_top = ((!$parent) ? 1 : 0);
 
-
-		// fix permalinks for cards
-
-		if ($webpage == ITEM_TYPE_CARD) {
-			$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
-		}
-		if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
-			$r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
-				intval($parent_item['id'])
-			);
-			if ($r) {
-				$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
-			}
-		}
-
-		if ($webpage == ITEM_TYPE_ARTICLE) {
-			$plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : $uuid);
-		}
-		if (($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_ARTICLE)) {
-			$r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'ARTICLE' and iconfig.iid = %d limit 1",
-				intval($parent_item['id'])
-			);
-			if ($r) {
-				$plink = z_root() . '/articles/' . $channel['channel_address'] . '/' . $r[0]['v'];
-			}
-		}
-
 		if ((!$plink) && ($item_thread_top)) {
-			// $plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . gen_link_id($mid);
-			// $plink = substr($plink,0,190);
 			$plink = $mid;
 		}
 
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index fdc251b07..efea7bbdd 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -177,49 +177,46 @@ class Search extends Controller {
 
 		}
 
-		$item_normal = item_normal_search();
-		$pub_sql     = public_permissions_sql($observer_hash);
-
-		require_once('include/channel.php');
-
-		$sys = get_sys_channel();
-
 		if (($update) && ($load)) {
 			$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']));
 
-			// in case somebody turned off public access to sys channel content with permissions
+			$item_normal = item_normal_search();
+			$pub_sql     = item_permissions_sql(0, $observer_hash);
 
-			if (!perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream'))
-				$sys['xchan_hash'] .= 'disabled';
+			$sys = get_sys_channel();
+
+			// in case somebody turned off public access to sys channel content using permissions
+			// make that content unsearchable by ensuring the owner uid can't match
+			$sys_id = perm_is_allowed($sys['channel_id'], $observer_hash, 'view_stream') ? $sys['channel_id'] : 0;
 
 			if ($load) {
 				$r = null;
 
 				if (local_channel()) {
-					$r = q("SELECT mid, MAX(id) as item_id from item
-						WHERE ((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item_private = 0 )
-						OR ( item.uid = %d )) OR item.owner_xchan = '%s' )
+					$r = q("SELECT mid, MAX(id) AS item_id FROM item
+						WHERE (( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = '' AND item.deny_gid  = '' AND item.item_private = 0 )
+						OR ( item.uid = %d ))
 						$item_normal
 						$sql_extra
-						group by mid, created order by created desc $pager_sql ",
-						intval(local_channel()),
-						dbesc($sys['xchan_hash'])
+						GROUP BY mid, created ORDER BY created DESC $pager_sql ",
+						intval(local_channel())
 					);
 				}
-				if ($r === null) {
-					$r = q("SELECT mid, MAX(id) as item_id from item
-						WHERE (((( item.allow_cid = ''  AND item.allow_gid = '' AND item.deny_cid  = ''
-						AND item.deny_gid  = '' AND item_private = 0 )
-						and owner_xchan in ( " . stream_perms_xchans(($observer) ? (PERMS_NETWORK | PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
-							$pub_sql ) OR owner_xchan = '%s')
+
+				if (!$r) {
+					$r = q("SELECT mid, MAX(id) AS item_id FROM item
+						WHERE (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid  = ''	AND item.deny_gid  = '' AND item.item_private = 0 )
+						AND item.uid IN ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK | PERMS_PUBLIC) : PERMS_PUBLIC) . " ))
+						$pub_sql ) OR item.uid = %d)
 						$item_normal
 						$sql_extra
-						group by mid, created order by created desc $pager_sql",
-						dbesc($sys['xchan_hash'])
+						GROUP BY mid, created ORDER BY created DESC $pager_sql",
+						intval($sys_id)
 					);
 				}
+
 				if ($r) {
 					$str = ids_to_querystr($r, 'item_id');
 					$r   = dbq("select *, id as item_id from item where id in ( " . $str . ") order by created desc");
@@ -232,13 +229,12 @@ class Search extends Controller {
 
 		}
 
+		$items = [];
+
 		if ($r) {
 			xchan_query($r);
 			$items = fetch_post_tags($r, true);
 		}
-		else {
-			$items = [];
-		}
 
 		if ($format === 'json') {
 			$result = [];
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index f068cbef8..3a188d9ce 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -387,8 +387,8 @@ class Setup extends \Zotlabs\Web\Controller {
 	function check_php(&$phpath, &$checks) {
 		$help = '';
 
-		if(version_compare(PHP_VERSION, '7.1') < 0) {
-			$help .= t('PHP version 7.1 or greater is required.');
+		if(version_compare(PHP_VERSION, '8.0') < 0) {
+			$help .= t('PHP version 8.0 or greater is required.');
 			$this->check_add($checks, t('PHP version'), false, true, $help);
 		}
 
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 3a13b0a6f..ad9be0938 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -160,8 +160,12 @@ class Sse_bs extends Controller {
 		$offset = self::$offset;
 
 		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
+		if (!(self::$vnotify & VNOTIFY_LIKE)) {
 			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
+		elseif (!feature_enabled(self::$uid, 'dislike')) {
+			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
 
 		$sql_extra2 = '';
 		if(self::$xchans)
@@ -236,8 +240,12 @@ class Sse_bs extends Controller {
 		$offset = self::$offset;
 
 		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
+		if (!(self::$vnotify & VNOTIFY_LIKE)) {
 			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
+		elseif (!feature_enabled(self::$uid, 'dislike')) {
+			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
 
 		$sql_extra2 = '';
 		if(self::$xchans)
@@ -311,8 +319,12 @@ class Sse_bs extends Controller {
 		$offset = self::$offset;
 
 		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
+		if (!(self::$vnotify & VNOTIFY_LIKE)) {
 			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
+		elseif (!feature_enabled(self::$uid, 'dislike')) {
+			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
 
 		$sql_extra2 = '';
 		if(self::$xchans)
@@ -398,8 +410,12 @@ class Sse_bs extends Controller {
 
 		$sys = get_sys_channel();
 		$sql_extra = '';
-		if(! (self::$vnotify & VNOTIFY_LIKE))
+		if (!(self::$vnotify & VNOTIFY_LIKE)) {
 			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
+		elseif (!feature_enabled(self::$uid, 'dislike')) {
+			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_DISLIKE) . "') ";
+		}
 
 		$sql_extra2 = '';
 		if(self::$xchans)
diff --git a/Zotlabs/Module/Starred.php b/Zotlabs/Module/Starred.php
index 2d7063669..a9542f590 100644
--- a/Zotlabs/Module/Starred.php
+++ b/Zotlabs/Module/Starred.php
@@ -1,31 +1,46 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
 use Zotlabs\Lib\Libsync;
 
-
 class Starred extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		$starred = 0;
-	
+
 		if(! local_channel())
 			killme();
 		if(argc() > 1)
 			$message_id = intval(argv(1));
 		if(! $message_id)
 			killme();
-	
-		$r = q("SELECT item_starred FROM item WHERE uid = %d AND id = %d LIMIT 1",
+
+		$sys = get_sys_channel();
+
+		$r = q("SELECT * FROM item WHERE (uid = %d OR uid = %d) AND id = %d
+			and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0
+			and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
 			intval(local_channel()),
+			intval($sys['channel_id']),
 			intval($message_id)
 		);
-		if(! count($r))
+
+        if ($r) {
+            if ($r[0]['uid'] === $sys['channel_id']) {
+                $r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
+            }
+        }
+
+		if(!$r)
 			killme();
-	
+
+		// reset $message_id to the fetched copy of message if applicable
+		$message_id = $r[0]['id'];
+
 		$item_starred = (intval($r[0]['item_starred']) ? 0 : 1);
-	
+
 		$r = q("UPDATE item SET item_starred = %d WHERE uid = %d and id = %d",
 			intval($item_starred),
 			intval(local_channel()),
@@ -38,8 +53,8 @@ class Starred extends \Zotlabs\Web\Controller {
 		if($r) {
 			xchan_query($r);
 			$sync_item = fetch_post_tags($r);
-			Libsync::build_sync_packet(local_channel(),[ 
-				'item' => [ 
+			Libsync::build_sync_packet(local_channel(),[
+				'item' => [
 					encode_item($sync_item[0],true)
 				]
 			]);
@@ -49,5 +64,5 @@ class Starred extends \Zotlabs\Web\Controller {
 		echo json_encode(array('result' => $item_starred));
 		killme();
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
deleted file mode 100644
index 3d0c07492..000000000
--- a/Zotlabs/Module/Wiki.php
+++ /dev/null
@@ -1,873 +0,0 @@
-<?php /** @file */
-
-namespace Zotlabs\Module;
-
-use App;
-use Zotlabs\Web\Controller;
-use Zotlabs\Lib\Apps;
-use Zotlabs\Lib\PermissionDescription;
-use Zotlabs\Lib\NativeWiki;
-use Zotlabs\Lib\NativeWikiPage;
-use Zotlabs\Lib\MarkdownSoap;
-use Michelf\MarkdownExtra;
-
-require_once('include/acl_selectors.php');
-require_once('include/conversation.php');
-require_once('include/bbcode.php');
-
-class Wiki extends Controller {
-
-	private $wiki = null;
-
-	function init() {
-		// Determine which channel's wikis to display to the observer
-		$nick = null;
-		if (argc() > 1)
-			$nick = argv(1); // if the channel name is in the URL, use that
-		if (! $nick && local_channel()) { // if no channel name was provided, assume the current logged in channel
-			$channel = \App::get_channel();
-			if ($channel && $channel['channel_address']) {
-				$nick = $channel['channel_address'];
-				goaway(z_root() . '/wiki/' . $nick);
-			}
-		}
-		if (! $nick) {
-			notice( t('Profile Unavailable.') . EOL);
-			goaway(z_root());
-		}
-
-		profile_load($nick);
-	}
-
-	function get() {
-
-		if(observer_prohibited(true)) {
-			return login();
-		}
-
-		if(! Apps::system_app_installed(App::$profile_uid, 'Wiki')) {
-			//Do not display any associated widgets at this point
-			App::$pdl = '';
-			$papp = Apps::get_papp('Wiki');
-			return Apps::app_render($papp, 'module');
-		}
-
-
-		if(! perm_is_allowed(\App::$profile_uid,get_observer_hash(),'view_wiki')) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		// TODO: Combine the interface configuration into a unified object
-		// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)
-
-		$wiki_owner = false;
-		$showNewWikiButton = false;
-		$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);
-		$owner = channelx_by_nick($nick);  // The channel who owns the wikis being viewed
-		if(! $owner) {
-			notice( t('Invalid channel') . EOL);
-			goaway('/' . argv(0));
-		}
-
-		$observer_hash = get_observer_hash();
-
-		// Determine if the observer is the channel owner so the ACL dialog can be populated
-		if (local_channel() === intval($owner['channel_id'])) {
-
-			$wiki_owner = true;
-
-			nav_set_selected('Wiki');
-
-			// Obtain the default permission settings of the channel
-			$owner_acl = array(
-				'allow_cid' => $owner['channel_allow_cid'],
-				'allow_gid' => $owner['channel_allow_gid'],
-				'deny_cid' => $owner['channel_deny_cid'],
-				'deny_gid' => $owner['channel_deny_gid']
-			);
-
-			// Initialize the ACL to the channel default permissions
-
-			$x = array(
-					'lockstate' => (( $owner['channel_allow_cid'] ||
-						$owner['channel_allow_gid'] ||
-						$owner['channel_deny_cid'] ||
-						$owner['channel_deny_gid'])
-						? 'lock' : 'unlock'
-					),
-					'acl' => populate_acl($owner_acl, false, PermissionDescription::fromGlobalPermission('view_wiki')),
-					'allow_cid' => acl2json($owner_acl['allow_cid']),
-					'allow_gid' => acl2json($owner_acl['allow_gid']),
-					'deny_cid'  => acl2json($owner_acl['deny_cid']),
-					'deny_gid'  => acl2json($owner_acl['deny_gid']),
-					'bang' => ''
-			);
-		}
-		else {
-			// Not the channel owner
-			$owner_acl = $x = array();
-		}
-
-		$is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
-
-		$o = '';
-
-		// Download a wiki
-
-		if((argc() > 3) && (argv(2) === 'download') && (argv(3) === 'wiki')) {
-
-			$resource_id = argv(4);
-			$w = NativeWiki::get_wiki($owner['channel_id'],$observer_hash,$resource_id);
-//			$w = NativeWiki::get_wiki($owner,$observer_hash,$resource_id);
-			if(! $w['htmlName']) {
-				notice(t('Error retrieving wiki') . EOL);
-			}
-
-			$zip_folder_name = random_string(10);
-			$zip_folderpath = '/tmp/' . $zip_folder_name;
-			if(!mkdir($zip_folderpath, 0770, false)) {
-				logger('Error creating zip file export folder: ' . $zip_folderpath, LOGGER_NORMAL);
-				notice(t('Error creating zip file export folder') . EOL);
-			}
-
-			$zip_filename = $w['urlName'];
-			$zip_filepath = '/tmp/' . $zip_folder_name . '/' . $zip_filename;
-
-
-			// Generate the zip file
-
-			$zip = new \ZipArchive;
-			$r = $zip->open($zip_filepath, \ZipArchive::CREATE);
-			if($r === true) {
-				$pages = [];
-				$i = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' order by revision desc",
-					dbesc($resource_id)
-				);
-
-				if($i) {
-					foreach($i as $iv) {
-						if(in_array($iv['mid'],$pages))
-							continue;
-
-						if($iv['mimetype'] === 'text/plain') {
-							$content = html_entity_decode($iv['body'],ENT_COMPAT,'UTF-8');
-						}
-						elseif($iv['mimetype'] === 'text/bbcode') {
-							$content = html_entity_decode($iv['body'],ENT_COMPAT,'UTF-8');
-						}
-						elseif($iv['mimetype'] === 'text/markdown') {
-							$content = html_entity_decode(MarkdownSoap::unescape($iv['body']),ENT_COMPAT,'UTF-8');
-						}
-						$fname = get_iconfig($iv['id'],'nwikipage','pagetitle') . NativeWikiPage::get_file_ext($iv);
-						$zip->addFromString($fname,$content);
-						$pages[] = $iv['mid'];
-					}
-
-
-				}
-
-			}
-			$zip->close();
-
-			// Output the file for download
-
-			header('Content-disposition: attachment; filename="' . $zip_filename . '.zip"');
-			header('Content-Type: application/zip');
-
-			$success = readfile($zip_filepath);
-
-			if(!$success) {
-				logger('Error downloading wiki: ' . $resource_id);
-				notice(t('Error downloading wiki: ' . $resource_id) . EOL);
-			}
-
-			// delete temporary files
-			rrmdir($zip_folderpath);
-			killme();
-
-		}
-
-		switch(argc()) {
-			case 2:
-				$wikis = NativeWiki::listwikis($owner, get_observer_hash());
-
-				if($wikis) {
-					$o .= replace_macros(get_markup_template('wikilist.tpl'), array(
-						'$header' => t('Wikis'),
-						'$channel' => $owner['channel_address'],
-						'$wikis' => $wikis['wikis'],
-						// If the observer is the local channel owner, show the wiki controls
-						'$owner' => ((local_channel() && local_channel() === intval(\App::$profile['uid'])) ? true : false),
-						'$edit' => t('Edit'),
-						'$download' => t('Download'),
-						'$view' => t('View'),
-						'$create' => t('Create New'),
-						'$submit' => t('Submit'),
-						'$wikiName' => array('wikiName', t('Wiki name')),
-						'$mimeType' => array('mimeType', t('Content type'), '', '', ['text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
-						'$name' => t('Name'),
-						'$type' => t('Type'),
-						'$unlocked' => t('Any&nbsp;type'),
-						'$lockstate' => (x($x,'lockstate') ? $x['lockstate'] : ''),
-						'$acl' 	     => (x($x,'acl') ? $x['acl'] : ''),
-						'$allow_cid' => (x($x,'allow_cid') ? $x['allow_cid'] : ''),
-						'$allow_gid' => (x($x,'allow_gid') ? $x['allow_gid'] : ''),
-						'$deny_cid'  => (x($x,'deny_cid') ? $x['deny_cid'] : ''),
-						'$deny_gid'  => (x($x,'deny_gid') ? $x['deny_gid'] : ''),
-						'$typelock' => array('typelock', t('Lock content type'), '', '', array(t('No'), t('Yes'))),
-						'$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))),
-						'$edit_wiki_name' => t('Edit Wiki Name')
-					));
-
-					return $o;
-				}
-				break;
-
-			case 3:
-
-				// /wiki/channel/wiki -> No page was specified, so redirect to Home.md
-
-				//$wikiUrlName = urlencode(argv(2));
-				$wikiUrlName = NativeWiki::name_encode(argv(2));
-				goaway(z_root() . '/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/Home');
-
-			case 4:
-			default:
-
-				// GET /wiki/channel/wiki/page
-				// Fetch the wiki info and determine observer permissions
-
-				//$wikiUrlName = urldecode(argv(2));
-				$wikiUrlName = NativeWiki::name_decode(argv(2));
-
-				$page_name = '';
-				$ignore_language = false;
-
-				for($x = 3; $x < argc(); $x ++) {
-					if($page_name === '' && argv($x) === '-') {
-						$ignore_language = true;
-						continue;
-					}
-					if($page_name) {
-						$page_name .= '/';
-					}
-					$page_name .= argv($x);
-				}
-
-				//$pageUrlName = urldecode($page_name);
-				$pageUrlName = NativeWiki::name_decode($page_name);
-				$langPageUrlName = \App::$language . '/' . $pageUrlName;
-
-				$w = NativeWiki::exists_by_name($owner['channel_id'], $wikiUrlName);
-
-				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();
-					$perms = NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
-					if(! $perms['read']) {
-						notice(t('Permission denied.') . EOL);
-						goaway(z_root() . '/' . argv(0) . '/' . argv(1));
-						return; //not reached
-					}
-					$wiki_editor = (($perms['write']) ? true : false);
-				}
-				else {
-					$wiki_editor = true;
-				}
-
-				//$wikiheaderName = urldecode($wikiUrlName);
-				$wikiheaderName = escape_tags(NativeWiki::name_decode($wikiUrlName));
-				//$wikiheaderPage = urldecode($pageUrlName);
-				$wikiheaderPage = escape_tags(NativeWiki::name_decode($pageUrlName));
-
-				$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
-				$sharePage  = t('Share');
-
-				$p = [];
-
-				if(! $ignore_language) {
-					$p = NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $langPageUrlName));
-				}
-				if(! ($p && $p['success'])) {
-					$p = NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
-				}
-				if(! ($p && $p['success'])) {
-			                $x = new \Zotlabs\Widget\Wiki_pages();
-
-			                $html = $x->create_missing_page([
-				                'resource_id' => $resource_id,
-				                'channel_id' => $owner['channel_id'],
-				                'channel_address' => $owner['channel_address'],
-				                'refresh' => 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));
-				        $showPageControls = $wiki_editor;
-				}
-                                else {
-				    $mimeType = $p['pageMimeType'];
-
-				    $sampleContent = (($mimeType == 'text/bbcode') ? '[h3]' . t('New page') . '[/h3]' : '### ' . t('New page'));
-				    if($mimeType === 'text/plain')
-				        $sampleContent = t('New page');
-
-				    $content = (($p['content'] == '') ? $sampleContent : $p['content']);
-
-				    $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)));
-					$renderedContent = NativeWikiPage::convert_links($renderedContent,argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName));
-				    }
-			 	    elseif($mimeType === 'text/plain') {
-				        $renderedContent = str_replace(["\n",' ',"\t"],[EOL,'&nbsp;','&nbsp;&nbsp;&nbsp;&nbsp;'],htmlentities($content,ENT_COMPAT,'UTF-8',false));
-				    }
-				    elseif($mimeType === 'text/markdown') {
-				     $content = MarkdownSoap::unescape($content);
-				     //$html = NativeWikiPage::generate_toc(zidify_text(MarkdownExtra::defaultTransform(NativeWikiPage::bbcode($content))));
-				     //$renderedContent = NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName);
-				     $html = NativeWikiPage::convert_links($content, argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName));
-				     $renderedContent = NativeWikiPage::generate_toc(zidify_text(MarkdownExtra::defaultTransform(NativeWikiPage::bbcode($html))));
-				    }
-				    $showPageControls = $wiki_editor;
-                                }
-				break;
-//			default:	// Strip the extraneous URL components
-//				goaway('/' . argv(0) . '/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . $pageUrlName);
-		}
-
-
-		$wikiModalID = random_string(3);
-
-		$wikiModal = replace_macros(get_markup_template('generic_modal.tpl'), array(
-			'$id' => $wikiModalID,
-			'$title' => t('Revision Comparison'),
-			'$ok' => (($showPageControls) ? t('Revert') : ''),
-			'$cancel' => t('Cancel')
-		));
-
-		$types = [ 'text/bbcode' => t('BBcode'), 'text/markdown' => t('Markdown'), 'text/plain' => 'Text' ];
-		$currenttype = $types[$mimeType];
-
-		$placeholder = t('Short description of your changes (optional)');
-
-		$zrl = z_root() . '/wiki/' . argv(1) . '/' . NativeWiki::name_encode($wikiUrlName) . '/' . NativeWiki::name_encode($pageUrlName);
-		$o .= replace_macros(get_markup_template('wiki.tpl'),array(
-			'$wikiheaderName' => $wikiheaderName,
-			'$wikiheaderPage' => $wikiheaderPage,
-			'$renamePage' => $renamePage,
-			'$sharePage' => $sharePage,
-			'$shareLink' => urlencode('#^[zrl=' . $zrl . ']' . '[ ' . $owner['channel_name'] . ' ] ' . $wikiheaderName . ' - ' . $wikiheaderPage . '[/zrl]'),
-			'$showPageControls' => $showPageControls,
-			'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
-			'$tools_label' => 'Page Tools',
-			'$channel_address' => $owner['channel_address'],
-			'$channel_id' => $owner['channel_id'],
-			'$resource_id' => $resource_id,
-			'$page' => $pageUrlName,
-			'$mimeType' => $mimeType,
-			'$typename' => $currenttype,
-			'$content' => $content,
-			'$renderedContent' => $renderedContent,
-			'$pageRename' => array('pageRename', t('New page name'), '', ''),
-			'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="' . $placeholder . '"'),
-			'$wikiModal' => $wikiModal,
-			'$wikiModalID' => $wikiModalID,
-			'$commit' => 'HEAD',
-			'$embedPhotos' => t('Embed image from photo albums'),
-			'$embedPhotosModalTitle' => t('Embed an image from your albums'),
-			'$embedPhotosModalCancel' => t('Cancel'),
-			'$embedPhotosModalOK' => t('OK'),
-			'$modalchooseimages' => t('Choose images to embed'),
-			'$modalchoosealbum' => t('Choose an album'),
-			'$modaldiffalbum' => t('Choose a different album'),
-			'$modalerrorlist' => t('Error getting album list'),
-			'$modalerrorlink' => t('Error getting photo link'),
-			'$modalerroralbum' => t('Error getting album'),
-			'$view_lbl' => t('View'),
-			'$history_lbl' => t('History')
-		));
-
-		if($p['pageMimeType'] === 'text/markdown')
-			head_add_js('/library/ace/ace.js');	// Ace Code Editor
-
-		return $o;
-	}
-
-	function post() {
-
-		require_once('include/bbcode.php');
-
-		$nick = argv(1);
-		$owner = channelx_by_nick($nick);
-		$observer_hash = get_observer_hash();
-
-		if(! $owner) {
-			notice( t('Permission denied.') . EOL);
-			return;
-		}
-
-		// /wiki/channel/preview
-		// Render mardown-formatted text in HTML for preview
-		if((argc() > 2) && (argv(2) === 'preview')) {
-			$content = $_POST['content'];
-			$resource_id = $_POST['resource_id'];
-
-			$w = NativeWiki::get_wiki($owner['channel_id'],$observer_hash,$resource_id);
-
-			$wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName'];
-
-			$mimeType = $_POST['mimetype'];
-
-			if($mimeType === 'text/bbcode') {
-				$html = zidify_links(smilies(bbcode($content)));
-				$html = NativeWikiPage::convert_links($html,$wikiURL);
-			}
-			elseif($mimeType === 'text/markdown') {
-				$linkconverted = NativeWikiPage::convert_links($content,$wikiURL);
-				$bb = NativeWikiPage::bbcode($linkconverted);
-				$x = new MarkdownSoap($bb);
-				$md = $x->clean();
-				$md = MarkdownSoap::unescape($md);
-				$html = MarkdownExtra::defaultTransform($md);
-				$html = NativeWikiPage::generate_toc(zidify_text($html));
-			}
-			elseif($mimeType === 'text/plain') {
-				$html = str_replace(["\n",' ',"\t"],[EOL,'&nbsp;','&nbsp;&nbsp;&nbsp;&nbsp;'],htmlentities($content,ENT_COMPAT,'UTF-8',false));
-			}
-			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
-			// more detail permissions framework
-
-			if (local_channel() !== intval($owner['channel_id'])) {
-				goaway('/' . argv(0) . '/' . $nick . '/');
-			}
-			$wiki = array();
-
-			// backslashes won't work well in the javascript functions
-			$name = str_replace('\\','',$_POST['wikiName']);
-
-			// Generate new wiki info from input name
-			$wiki['postVisible'] = ((intval($_POST['postVisible'])) ? 1 : 0);
-			$wiki['rawName']     = $name;
-			$wiki['htmlName']    = escape_tags($name);
-			//$wiki['urlName']     = urlencode(urlencode($name));
-			$wiki['urlName']     = NativeWiki::name_encode($name);
-			$wiki['mimeType']    = $_POST['mimeType'];
-			$wiki['typelock']    = $_POST['typelock'];
-
-			if($wiki['urlName'] === '') {
-				notice( t('Error creating wiki. Invalid name.') . EOL);
-				goaway('/wiki');
-				return; //not reached
-			}
-
-			$exists = NativeWiki::exists_by_name($owner['channel_id'], $wiki['urlName']);
-			if($exists['id']) {
-				notice( t('A wiki with this name already exists.') . EOL);
-				goaway('/wiki');
-				return; //not reached
-			}
-
-			// Get ACL for permissions
-			$acl = new \Zotlabs\Access\AccessList($owner);
-			$acl->set_from_array($_POST);
-			$r = NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl);
-			if($r['success']) {
-				NativeWiki::sync_a_wiki_item($owner['channel_id'],$r['item_id'],$r['item']['resource_id']);
-				$homePage = NativeWikiPage::create_page($owner, $observer_hash, 'Home', $r['item']['resource_id'], $wiki['mimeType']);
-				if(! $homePage['success']) {
-					notice( t('Wiki created, but error creating Home page.'));
-					goaway(z_root() . '/wiki/' . $nick . '/' . NativeWiki::name_encode($wiki['urlName']));
-				}
-				NativeWiki::sync_a_wiki_item($owner['channel_id'], $homePage['item_id'], $r['item']['resource_id']);
-				goaway(z_root() . '/wiki/' . $nick . '/' . NativeWiki::name_encode($wiki['urlName']) . '/' . NativeWiki::name_encode($homePage['page']['urlName']));
-			}
-			else {
-				notice( t('Error creating wiki'));
-				goaway(z_root() . '/wiki');
-			}
-		}
-
-		// 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
-			// more detail permissions framework
-
-			if (local_channel() !== intval($owner['channel_id'])) {
-				goaway('/' . argv(0) . '/' . $nick . '/');
-			}
-
-			$arr = [];
-
-			//$arr['urlName'] = urlencode(urlencode($_POST['origRawName']));
-			$arr['urlName'] = NativeWiki::name_encode($_POST['origRawName']);
-
-			if($_POST['updateRawName'])
-				$arr['updateRawName'] = $_POST['updateRawName'];
-
-			if(($arr['urlName'] || $arr['updateRawName']) === '') {
-				notice( t('Error updating wiki. Invalid name.') . EOL);
-				goaway('/wiki');
-				return; //not reached
-			}
-
-			$wiki = NativeWiki::exists_by_name($owner['channel_id'], $arr['urlName']);
-			if($wiki['resource_id']) {
-
-				$arr['resource_id'] = $wiki['resource_id'];
-
-				$acl = new \Zotlabs\Access\AccessList($owner);
-				$acl->set_from_array($_POST);
-
-				$r = NativeWiki::update_wiki($owner['channel_id'], $observer_hash, $arr, $acl);
-				if($r['success']) {
-					NativeWiki::sync_a_wiki_item($owner['channel_id'], $r['item_id'], $r['item']['resource_id']);
-					goaway(z_root() . '/wiki/' . $nick);
-				}
-				else {
-					notice( t('Error updating wiki'));
-					goaway(z_root() . '/wiki');
-				}
-
-			}
-			goaway(z_root() . '/wiki');
-		}
-
-		// 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
-			// 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'];
-			$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));
-			}
-		}
-
-
-		// Create a page
-		if ((argc() === 4) && (argv(2) === 'create') && (argv(3) === 'page')) {
-
-			$mimetype = $_POST['mimetype'];
-
-			$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);
-			if(! $perms['write']) {
-				logger('Wiki write permission denied. ' . EOL);
-				json_return_and_die(array('success' => false));
-			}
-
-			$name = isset($_POST['pageName']) ? $_POST['pageName'] : $_POST['missingPageName']; //Get new page name
-
-			// backslashes won't work well in the javascript functions
-			$name = str_replace('\\','',$name);
-
-			if(NativeWiki::name_encode(escape_tags($name)) === '') {
-				json_return_and_die(array('message' => 'Error creating page. Invalid name (' . print_r($_POST,true) . ').', 'success' => false));
-			}
-
-			$page = NativeWikiPage::create_page($owner, $observer_hash, $name, $resource_id, $mimetype);
-			if($page['item_id']) {
-
-				$commit = NativeWikiPage::commit([
-					'commit_msg'    => t('New page created'),
-					'resource_id'   => $resource_id,
-					'channel_id'    => $owner['channel_id'],
-					'observer_hash' => $observer_hash,
-					'pageUrlName'   => $name
-				]);
-				if($commit['success']) {
-					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));
-				}
-
-
-			}
-			else {
-				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
-
-			$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));
-			}
-
-			// @FIXME - we shouldn't invoke this if it isn't in the PDL or has been over-ridden
-
-			$x = new \Zotlabs\Widget\Wiki_pages();
-
-			$page_list_html = $x->widget([
-				'resource_id' => $resource_id,
-				'channel_id' => $owner['channel_id'],
-				'channel_address' => $owner['channel_address'],
-				'refresh' => 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'];
-			$pageUrlName = $_POST['name'];
-			$pageHtmlName = escape_tags($_POST['name']);
-			$content = $_POST['content']; //Get new content
-			$commitMsg = $_POST['commitMsg'];
-			if ($commitMsg === '') {
-				$commitMsg = 'Updated ' . $pageHtmlName;
-			}
-
-			// Determine if observer has permission to save content
-			$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));
-			}
-
-			$saved = NativeWikiPage::save_page([
-				'channel_id' => $owner['channel_id'],
-				'observer_hash' => $observer_hash,
-				'resource_id' => $resource_id,
-				'pageUrlName' => $pageUrlName,
-				'content' => $content
-			]);
-			if($saved['success']) {
-
-				$commit = NativeWikiPage::commit([
-					'commit_msg' => $commitMsg,
-					'pageUrlName' => $pageUrlName,
-					'resource_id' => $resource_id,
-					'channel_id'    => $owner['channel_id'],
-					'observer_hash' => $observer_hash,
-					'revision' => (-1)
-				]);
-				if($commit['success']) {
-					NativeWiki::sync_a_wiki_item($owner['channel_id'], $commit['item_id'], $resource_id);
-					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));
-				}
-			}
-			else {
-				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);
-			if(! $perms['read']) {
-				logger('Wiki read permission denied.' . EOL);
-				json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false));
-			}
-
-			$historyHTML = \Zotlabs\Lib\NativeWikiPage::render_page_history(array(
-				'resource_id' => $resource_id,
-				'pageUrlName' => $pageUrlName,
-				'permsWrite'  => $perms['write']
-			));
-
-			json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true));
-		}
-
-		// Delete a page
-		if ((argc() === 4) && (argv(2) === 'delete') && (argv(3) === 'page')) {
-
-			$resource_id = $_POST['resource_id'];
-			$pageUrlName = $_POST['name'];
-
-			if ($pageUrlName === 'Home') {
-				json_return_and_die(array('message' => t('Cannot delete Home'),'success' => false));
-			}
-
-			// Determine if observer has permission to delete pages
-			// 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));
-			}
-
-			$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));
-			}
-
-			$deleted = NativeWikiPage::delete_page([
-				'channel_id' => $owner['channel_id'],
-				'observer_hash' => $observer_hash,
-				'resource_id' => $resource_id,
-				'pageUrlName' => $pageUrlName
-			]);
-			if($deleted['success']) {
-				NativeWiki::sync_a_wiki_item($owner['channel_id'], 0, $resource_id);
-				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));
-			}
-		}
-
-		// Revert a page
-		if ((argc() === 4) && (argv(2) === 'revert') && (argv(3) === 'page')) {
-
-			$resource_id = $_POST['resource_id'];
-			$pageUrlName = $_POST['name'];
-			$commitHash = $_POST['commitHash'];
-
-			// Determine if observer has permission to revert pages
-			$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));
-			}
-
-			$reverted = NativeWikiPage::revert_page([
-				'channel_id' => $owner['channel_id'],
-				'observer_hash' => $observer_hash,
-				'commitHash' => $commitHash,
-				'resource_id' => $resource_id,
-				'pageUrlName' => $pageUrlName
-			]);
-			if($reverted['success']) {
-				json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));
-			}
-			else {
-				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'];
-			$pageUrlName = $_POST['name'];
-			$compareCommit = $_POST['compareCommit'];
-			$currentCommit = $_POST['currentCommit'];
-			// Determine if observer has permission to revert pages
-
-			$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));
-			}
-
-			$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));
-			} else {
-				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'];
-			$pageUrlName = $_POST['oldName'];
-			$pageNewName = str_replace('\\','',$_POST['newName']);
-			if ($pageUrlName === 'Home') {
-				json_return_and_die(array('message' => 'Cannot rename Home','success' => false));
-			}
-			if(NativeWiki::name_encode(escape_tags($pageNewName)) === '') {
-				json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false));
-			}
-			// Determine if observer has permission to rename pages
-
-			$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));
-			}
-
-			$renamed = NativeWikiPage::rename_page([
-				'channel_id' => $owner['channel_id'],
-				'observer_hash' => $observer_hash,
-				'resource_id' => $resource_id,
-				'pageUrlName' => $pageUrlName,
-				'pageNewName' => $pageNewName
-			]);
-			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,
-					'observer_hash' => $observer_hash,
-					'pageUrlName' => $pageNewName
-				]);
-				if($commit['success']) {
-					NativeWiki::sync_a_wiki_item($owner['channel_id'], $commit['item_id'], $resource_id);
-					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));
-				}
-			}
-			else {
-				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/Photo/PhotoDriver.php b/Zotlabs/Photo/PhotoDriver.php
index 6bdb89ab1..f50ef17ae 100644
--- a/Zotlabs/Photo/PhotoDriver.php
+++ b/Zotlabs/Photo/PhotoDriver.php
@@ -344,19 +344,13 @@ abstract class PhotoDriver {
 			return false;
 		}
 
-		/*
-		 * PHP 7.2 allows you to use a stream resource, which should reduce/avoid
-		 * memory exhaustion on large images.
-		 */
-
-		if(version_compare(PHP_VERSION, '7.2.0') >= 0) {
-			$f = @fopen($filename, 'rb');
-		} else {
-			$f = $filename;
-		}
+		$f = @fopen($filename, 'rb');
 
 		if($f) {
-			return @exif_read_data($f, null, true);
+			// exif_read_data accepts a stream resource in php > 7.2
+			$x = @exif_read_data($f, null, true);
+			fclose($f);
+			return $x;
 		}
 
 		return false;
diff --git a/Zotlabs/Update/_1253.php b/Zotlabs/Update/_1253.php
new file mode 100644
index 000000000..3b0e6899a
--- /dev/null
+++ b/Zotlabs/Update/_1253.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1253 {
+
+	function run() {
+
+		dbq("START TRANSACTION");
+
+		$r = dbq("DELETE FROM app WHERE app_name IN ('Wiki', 'Cards', 'Articles') AND app_plugin = ''");
+
+		if($r) {
+			dbq("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		dbq("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index 4177477a1..cb41c2b7d 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -502,8 +502,11 @@ class HTTPSig {
 
 		$x = self::sign($head, $prvkey, $alg);
 
-		// TODO: should we default to hs2019?
-		// $headerval = 'keyId="' . $keyid . '",algorithm="' . (($algorithm === 'rsa-sha256') ? 'hs2019' : $algorithm) . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
+		// TODO: should we default to hs2019? cavage-http-signatures-12 is not very wide spread yet
+
+		if (get_config('system', 'use_hs2019', false) && $algorithm === 'rsa-sha256') {
+			$algorithm = 'hs2019';
+		}
 
 		$headerval = 'keyId="' . $keyid . '",algorithm="' . $algorithm . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
 
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php
index 0c6996d55..0a1c80061 100644
--- a/Zotlabs/Widget/Categories.php
+++ b/Zotlabs/Widget/Categories.php
@@ -17,36 +17,22 @@ class Categories {
 
 	function widget($arr) {
 
-		$cards = ((array_key_exists('cards',$arr) && $arr['cards']) ? true : false);
-
-		if(($cards) && (! Apps::system_app_installed(App::$profile['profile_uid'], 'Cards')))
-			return '';
-
-		$articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false);
-
-		if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles')))
-			return '';
-
 		$files = ((array_key_exists('files',$arr) && $arr['files']) ? true : false);
 
-		if((! App::$profile['profile_uid'])
-			|| (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) {
+		if(!App::$profile['profile_uid'] || !perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream')) {
 			return '';
 		}
 
-		$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
-		$srchurl = (($cards) ? App::$argv[0] . '/' . App::$argv[1] : App::$query_string);
-		$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-		$srchurl = str_replace(array('?f=','&f=', '/?'),array('', '', ''),$srchurl);
+		$cat = ((x($_REQUEST, 'cat')) ? htmlspecialchars($_REQUEST['cat'], ENT_COMPAT, 'UTF-8') : '');
+		$srchurl = App::$query_string;
+		$srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is', '', $srchurl), '&');
+		$srchurl = str_replace(['?f=','&f=', '/?'], ['', '', ''], $srchurl);
 
-		if($cards)
-			return cardcategories_widget($srchurl, $cat);
-		elseif($articles)
-			return articlecategories_widget($srchurl, $cat);
-		elseif($files)
+		if($files) {
 			return filecategories_widget($srchurl, $cat);
-		else
-			return categories_widget($srchurl, $cat);
+		}
+
+		return categories_widget($srchurl, $cat);
 
 	}
 }
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
index 2e8e04e93..c9d08c6b7 100644
--- a/Zotlabs/Widget/Notes.php
+++ b/Zotlabs/Widget/Notes.php
@@ -10,6 +10,7 @@
 
 namespace Zotlabs\Widget;
 
+use App;
 use Zotlabs\Lib\Apps;
 
 class Notes {
@@ -18,6 +19,9 @@ class Notes {
 		if(! local_channel())
 			return EMPTY_STR;
 
+		if(App::$profile_uid !== local_channel())
+			return EMPTY_STR;
+
 		if(! Apps::system_app_installed(local_channel(), 'Notes'))
 			return EMPTY_STR;
 
diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php
index 5ecfd5a27..96b70af15 100644
--- a/Zotlabs/Widget/Tasklist.php
+++ b/Zotlabs/Widget/Tasklist.php
@@ -7,12 +7,17 @@
 
 namespace Zotlabs\Widget;
 
+use App;
+
 class Tasklist {
 
 	function widget($arr) {
 
-		if (! local_channel())
-			return;
+		if(! local_channel())
+			return EMPTY_STR;
+
+		if(App::$profile_uid !== local_channel())
+			return EMPTY_STR;
 
 		$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
 		$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
diff --git a/Zotlabs/Widget/Wiki_list.php b/Zotlabs/Widget/Wiki_list.php
deleted file mode 100644
index 217ab8706..000000000
--- a/Zotlabs/Widget/Wiki_list.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- *   * Name: Wiki list
- *   * Description: A list of existing wikis
- */
-
-namespace Zotlabs\Widget;
-
-class Wiki_list {
-
-	function widget($arr) {
-
-		$channel = channelx_by_n(\App::$profile_uid);
-
-		$wikis = \Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash());
-
-		if($wikis) {
-			return replace_macros(get_markup_template('wikilist_widget.tpl'), array(
-				'$header' => t('Wikis'),
-				'$channel' => $channel['channel_address'],
-				'$wikis' => $wikis['wikis']
-			));
-		}
-		return '';
-	}
-
-}
diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php
deleted file mode 100644
index 3c9f5ed1a..000000000
--- a/Zotlabs/Widget/Wiki_page_history.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- *   * Name: Wiki page history
- *   * Description: History of an existing wiki page
- *   * Requires: wiki
- */
-
-namespace Zotlabs\Widget;
-
-class Wiki_page_history {
-
-	function widget($arr) {
-
-		$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-		$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-
-		$pageHistory = \Zotlabs\Lib\NativeWikiPage::page_history([
-			'channel_id'    => \App::$profile_uid,
-			'observer_hash' => get_observer_hash(),
-			'resource_id'   => $resource_id,
-			'pageUrlName'   => $pageUrlName
-		]);
-
-		return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
-			'$pageHistory' => $pageHistory['history'],
-			'$permsWrite'  => $arr['permsWrite'],
-			'$name_lbl'    => t('Name'),
-			'$msg_label'   => t('Message','wiki_history'),
-			'$date_lbl'    => t('Date'),
-			'$revert_btn'  => t('Revert'),
-			'$compare_btn' => t('Compare')
-		));
-
-	}
-}
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
deleted file mode 100644
index ece712334..000000000
--- a/Zotlabs/Widget/Wiki_pages.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- *   * Name: Wiki pages
- *   * Description: A list of existing pages of a wiki
- *   * Requires: wiki
- */
-
-namespace Zotlabs\Widget;
-
-use Zotlabs\Lib\NativeWiki;
-
-class Wiki_pages {
-
-	function create_missing_page($arr) {
-		if(argc() < 4)
-			return;
-
-		$c = channelx_by_nick(argv(1));
-		$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],NativeWiki::name_decode(argv(2)));
-		$arr = array(
-			'resource_id' => $w['resource_id'],
-			'channel_id' => $c['channel_id'],
-			'channel_address' => $c['channel_address'],
-			'refresh' => false
-		);
-
-		$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
-
-		$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
-                $pageName = NativeWiki::name_decode(escape_tags(argv(3)));
-
-		$wikiname = $w['urlName'];
-		return replace_macros(get_markup_template('wiki_page_not_found.tpl'), array(
-				'$resource_id' => $arr['resource_id'],
-				'$channel_address' => $arr['channel_address'],
-				'$wikiname' => $wikiname,
-				'$canadd' => $can_create,
-				'$candel' => $can_delete,
-				'$addnew' => t('Add new page'),
-				'$typelock' => $typelock,
-				'$lockedtype' => $w['mimeType'],
-				'$mimetype' => mimetype_select(0,$w['mimeType'],
-					[ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
-				'$pageName' => array('missingPageName', 'Create Page' , $pageName),
-				'$refresh' => $arr['refresh'],
-				'$options' => t('Options'),
-				'$submit' => t('Submit')
-		));
-	}
-
-	function widget($arr) {
-
-		if(argc() < 3)
-			return;
-
-		if(! $arr['resource_id']) {
-			$c = channelx_by_nick(argv(1));
-			$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],NativeWiki::name_decode(argv(2)));
-			$arr = array(
-				'resource_id' => $w['resource_id'],
-				'channel_id' => $c['channel_id'],
-				'channel_address' => $c['channel_address'],
-				'refresh' => false
-			);
-		}
-
-		$wikiname = '';
-
-		$pages = array();
-
-		$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);
-
-		if($p['pages']) {
-			$pages = $p['pages'];
-			$w = $p['wiki'];
-			// Wiki item record is $w['wiki']
-			$wikiname = $w['urlName'];
-			if (!$wikiname) {
-				$wikiname = '';
-			}
-			$typelock = $w['typelock'];
-		}
-
-		$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
-
-		$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
-
-		return replace_macros(get_markup_template('wiki_page_list.tpl'), array(
-				'$resource_id' => $arr['resource_id'],
-				'$header' => t('Wiki Pages'),
-				'$channel_address' => $arr['channel_address'],
-				'$wikiname' => $wikiname,
-				'$pages' => $pages,
-				'$canadd' => $can_create,
-				'$candel' => $can_delete,
-				'$addnew' => t('Add new page'),
-				'$typelock' => $typelock,
-				'$lockedtype' => $w['mimeType'],
-				'$mimetype' => mimetype_select(0,$w['mimeType'],
-					[ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
-				'$pageName' => array('pageName', t('Page name')),
-				'$refresh' => $arr['refresh'],
-				'$options' => t('Options'),
-				'$submit' => t('Submit')
-		));
-	}
-}
-
-
diff --git a/app/articles.apd b/app/articles.apd
deleted file mode 100644
index 5ef849dfb..000000000
--- a/app/articles.apd
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 3
-url: $baseurl/articles/$nick
-name: Articles
-requires: local_channel
-photo: icon:file-text-o
-categories: nav_featured_app, Productivity
-desc: Create interactive articles
diff --git a/app/cards.apd b/app/cards.apd
deleted file mode 100644
index 00cfa05a8..000000000
--- a/app/cards.apd
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 3
-url: $baseurl/cards/$nick
-name: Cards
-requires: local_channel
-photo: icon:list
-categories: nav_featured_app, Productivity
-desc: Create interactive personal planning cards.
diff --git a/app/wiki.apd b/app/wiki.apd
deleted file mode 100644
index d59bdd8a4..000000000
--- a/app/wiki.apd
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 3
-url: $baseurl/wiki/$nick
-requires: local_channel
-name: Wiki
-photo: icon:pencil-square-o
-categories: nav_featured_app, Productivity
-desc: A simple yet powerful wiki for your channel.
diff --git a/boot.php b/boot.php
index 7d2e2f757..877752ccc 100644
--- a/boot.php
+++ b/boot.php
@@ -60,10 +60,10 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '7.2.2');
+define('STD_VERSION', '7.4');
 define('ZOT_REVISION', '6.0');
 
-define('DB_UPDATE_VERSION', 1252);
+define('DB_UPDATE_VERSION', 1253);
 
 define('PROJECT_BASE', __DIR__);
 
@@ -695,11 +695,7 @@ function sys_boot() {
 
 
 function startup() {
-	error_reporting(E_ALL & ~E_NOTICE);
-
-	if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
-		error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE);
-	}
+	error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE & ~E_DEPRECATED);
 
 	// Some hosting providers block/disable this
 	@set_time_limit(0);
diff --git a/composer.lock b/composer.lock
index 31d6f1403..3a60477f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -133,28 +133,29 @@
         },
         {
             "name": "bshaffer/oauth2-server-php",
-            "version": "v1.11.1",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bshaffer/oauth2-server-php.git",
-                "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa"
+                "reference": "60254fc7fbb08ce56164faae9e075068adf914ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/5a0c8000d4763b276919e2106f54eddda6bc50fa",
-                "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa",
+                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/60254fc7fbb08ce56164faae9e075068adf914ef",
+                "reference": "60254fc7fbb08ce56164faae9e075068adf914ef",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~2.8",
-                "firebase/php-jwt": "~2.2",
+                "aws/aws-sdk-php": "^2.8",
+                "firebase/php-jwt": "^2.2",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^4.0",
-                "predis/predis": "dev-master",
-                "thobbs/phpcassa": "dev-master"
+                "phpunit/phpunit": "^7.5||^8.0",
+                "predis/predis": "^1.1",
+                "thobbs/phpcassa": "dev-master",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
                 "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
@@ -189,9 +190,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bshaffer/oauth2-server-php/issues",
-                "source": "https://github.com/bshaffer/oauth2-server-php/tree/master"
+                "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.0"
             },
-            "time": "2018-12-04T00:29:32+00:00"
+            "time": "2022-04-19T17:09:11+00:00"
         },
         {
             "name": "commerceguys/intl",
@@ -638,16 +639,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.36",
+            "version": "2.0.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "a97547126396548c224703a267a30af1592be146"
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a97547126396548c224703a267a30af1592be146",
-                "reference": "a97547126396548c224703a267a30af1592be146",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
                 "shasum": ""
             },
             "require": {
@@ -727,7 +728,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.36"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.37"
             },
             "funding": [
                 {
@@ -743,7 +744,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-30T08:48:36+00:00"
+            "time": "2022-04-04T04:57:45+00:00"
         },
         {
             "name": "psr/log",
@@ -876,25 +877,24 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.2.3",
+            "version": "4.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"
+                "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/8505afd4fea63b81a85d3b7b53ac3cb8dc347c28",
+                "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.8 || ^0.9",
+                "ext-ctype": "*",
                 "ext-json": "*",
-                "php": "^7.2 || ^8.0",
-                "ramsey/collection": "^1.0",
-                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-php80": "^1.14"
+                "php": "^8.0",
+                "ramsey/collection": "^1.0"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
@@ -931,9 +931,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "4.x-dev"
-                },
                 "captainhook": {
                     "force-install": true
                 }
@@ -958,7 +955,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.2.3"
+                "source": "https://github.com/ramsey/uuid/tree/4.3.1"
             },
             "funding": [
                 {
@@ -970,7 +967,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-25T23:10:38+00:00"
+            "time": "2022-03-27T21:42:02+00:00"
         },
         {
             "name": "sabre/dav",
@@ -1419,16 +1416,16 @@
         },
         {
             "name": "simplepie/simplepie",
-            "version": "1.5.8",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/simplepie/simplepie.git",
-                "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1"
+                "reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/simplepie/simplepie/zipball/d1d80f37264c9f1ed7fa3434eca14d179cb689b1",
-                "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1",
+                "url": "https://api.github.com/repos/simplepie/simplepie/zipball/2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
+                "reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
                 "shasum": ""
             },
             "require": {
@@ -1449,10 +1446,18 @@
             },
             "type": "library",
             "autoload": {
+                "psr-4": {
+                    "SimplePie\\": "src"
+                },
                 "psr-0": {
                     "SimplePie": "library"
                 }
             },
+            "autoload-dev": {
+                "psr-4": {
+                    "SimplePie\\Tests\\Unit\\": "tests/Unit"
+                }
+            },
             "scripts": {
                 "test": [
                     "phpunit"
@@ -1487,23 +1492,23 @@
                 "rss"
             ],
             "support": {
-                "source": "https://github.com/simplepie/simplepie/tree/1.5.8",
+                "source": "https://github.com/simplepie/simplepie/tree/1.6.0",
                 "issues": "https://github.com/simplepie/simplepie/issues"
             },
-            "time": "2021-12-24T02:53:50+00:00"
+            "time": "2022-04-21T11:05:19+00:00"
         },
         {
             "name": "smarty/smarty",
-            "version": "v4.1.0",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1"
+                "reference": "71036be8be02bf93735c47b0b745f722efbc729f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9e0536de18b53ba193364291ef0303b0ab9903e1",
-                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/71036be8be02bf93735c47b0b745f722efbc729f",
+                "reference": "71036be8be02bf93735c47b0b745f722efbc729f",
                 "shasum": ""
             },
             "require": {
@@ -1554,178 +1559,13 @@
             "support": {
                 "forum": "https://github.com/smarty-php/smarty/discussions",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v4.1.0"
+                "source": "https://github.com/smarty-php/smarty/tree/v4.1.1"
             },
-            "time": "2022-02-06T20:34:27+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-10-20T20:35:02+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2022-05-17T12:56:28+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -1784,7 +1624,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -2127,31 +1967,29 @@
         },
         {
             "name": "behat/mink",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996"
+                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996",
-                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5",
+                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4",
-                "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0"
+                "php": ">=7.2",
+                "symfony/css-selector": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5",
-                "symfony/debug": "^2.7|^3.0|^4.0|^5.0",
-                "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5",
-                "yoast/phpunit-polyfills": "^1.0"
+                "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+                "symfony/phpunit-bridge": "^5.4 || ^6.0"
             },
             "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+                "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation",
                 "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
                 "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)",
                 "dmore/chrome-mink-driver": "fast and JS-enabled driver for any app (requires chromium or google chrome)"
@@ -2187,37 +2025,37 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/Mink/issues",
-                "source": "https://github.com/minkphp/Mink/tree/v1.9.0"
+                "source": "https://github.com/minkphp/Mink/tree/v1.10.0"
             },
-            "time": "2021-10-11T11:58:47+00:00"
+            "time": "2022-03-28T14:22:43+00:00"
         },
         {
             "name": "behat/mink-browserkit-driver",
-            "version": "v2.0.0",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
-                "reference": "0d3d9c3b375be6f3d44fd6d1e08ed28c104b3bd4"
+                "reference": "d2768e6c17b293d86d8fcff54cbb9e6ad938fee1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/0d3d9c3b375be6f3d44fd6d1e08ed28c104b3bd4",
-                "reference": "0d3d9c3b375be6f3d44fd6d1e08ed28c104b3bd4",
+                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/d2768e6c17b293d86d8fcff54cbb9e6ad938fee1",
+                "reference": "d2768e6c17b293d86d8fcff54cbb9e6ad938fee1",
                 "shasum": ""
             },
             "require": {
                 "behat/mink": "^1.9.0@dev",
                 "php": ">=7.2",
-                "symfony/browser-kit": "^4.4 || ^5.0",
-                "symfony/dom-crawler": "^4.4 || ^5.0"
+                "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
+                "symfony/dom-crawler": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "mink/driver-testsuite": "dev-master",
                 "phpunit/phpunit": "^8.5 || ^9.5",
-                "symfony/error-handler": "^4.4 || ^5.0",
-                "symfony/http-client": "^4.4 || ^5.0",
-                "symfony/http-kernel": "^4.4 || ^5.0",
-                "symfony/mime": "^4.4 || ^5.0",
+                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+                "symfony/http-client": "^4.4 || ^5.0 || ^6.0",
+                "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
+                "symfony/mime": "^4.4 || ^5.0 || ^6.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
             "type": "mink-driver",
@@ -2252,9 +2090,9 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues",
-                "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v2.0.0"
+                "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v2.1.0"
             },
-            "time": "2021-12-13T10:31:49+00:00"
+            "time": "2022-03-28T14:33:51+00:00"
         },
         {
             "name": "behat/mink-extension",
@@ -2380,30 +2218,30 @@
         },
         {
             "name": "behat/transliterator",
-            "version": "v1.3.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Transliterator.git",
-                "reference": "3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc"
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc",
-                "reference": "3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af",
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.2"
             },
             "require-dev": {
                 "chuyskywalker/rolling-curl": "^3.1",
                 "php-yaoi/php-yaoi": "^1.0",
-                "phpunit/phpunit": "^4.8.36|^6.3"
+                "phpunit/phpunit": "^8.5.25 || ^9.5.19"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -2423,36 +2261,36 @@
             ],
             "support": {
                 "issues": "https://github.com/Behat/Transliterator/issues",
-                "source": "https://github.com/Behat/Transliterator/tree/v1.3.0"
+                "source": "https://github.com/Behat/Transliterator/tree/v1.5.0"
             },
-            "time": "2020-01-14T16:39:13+00:00"
+            "time": "2022-03-30T09:27:43+00:00"
         },
         {
             "name": "composer/pcre",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -2480,7 +2318,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
             },
             "funding": [
                 {
@@ -2496,31 +2334,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T20:24:37+00:00"
+            "time": "2022-02-25T20:21:48+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -2546,7 +2384,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -2562,7 +2400,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T20:20:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "dms/phpunit-arraysubset-asserts",
@@ -2611,29 +2449,30 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -2660,7 +2499,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
             },
             "funding": [
                 {
@@ -2676,7 +2515,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
             "name": "fabpot/goutte",
@@ -2735,16 +2574,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.3",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/c6a951b75d684fd43fbbd69617488e1e2e8924ba",
-                "reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
@@ -2782,7 +2621,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.3"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -2790,7 +2629,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-02T14:16:47+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -3318,16 +3157,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -3362,28 +3201,28 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.11.1",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd"
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
-                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
                 "shasum": ""
             },
             "require": {
-                "composer/xdebug-handler": "^1.0 || ^2.0",
+                "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.2",
+                "pdepend/pdepend": "^2.10.3",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -3439,7 +3278,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.11.1"
+                "source": "https://github.com/phpmd/phpmd/tree/2.12.0"
             },
             "funding": [
                 {
@@ -3447,7 +3286,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-17T11:25:43+00:00"
+            "time": "2022-03-24T13:33:01+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -3518,16 +3357,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.14",
+            "version": "9.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4"
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4",
-                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
                 "shasum": ""
             },
             "require": {
@@ -3583,7 +3422,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
             },
             "funding": [
                 {
@@ -3591,7 +3430,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-28T12:38:02+00:00"
+            "time": "2022-03-07T09:28:20+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3836,16 +3675,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.16",
+            "version": "9.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
-                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
                 "shasum": ""
             },
             "require": {
@@ -3875,7 +3714,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -3923,7 +3762,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
             },
             "funding": [
                 {
@@ -3935,7 +3774,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T17:10:58+00:00"
+            "time": "2022-04-01T12:37:26+00:00"
         },
         {
             "name": "psr/container",
@@ -4401,16 +4240,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -4452,7 +4291,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -4460,7 +4299,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -4892,28 +4731,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4936,7 +4775,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -4944,7 +4783,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",
@@ -5057,28 +4896,27 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v5.4.3",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "18e73179c6a33d520de1b644941eba108dd811ad"
+                "reference": "0ec66df981406fd2c9e41acbb526249bd18a0123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/18e73179c6a33d520de1b644941eba108dd811ad",
-                "reference": "18e73179c6a33d520de1b644941eba108dd811ad",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/0ec66df981406fd2c9e41acbb526249bd18a0123",
+                "reference": "0ec66df981406fd2c9e41acbb526249bd18a0123",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/dom-crawler": "^4.4|^5.0|^6.0",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.0.2",
+                "symfony/dom-crawler": "^5.4|^6.0"
             },
             "require-dev": {
-                "symfony/css-selector": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/mime": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0"
+                "symfony/css-selector": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/process": ""
@@ -5109,7 +4947,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v5.4.3"
+                "source": "https://github.com/symfony/browser-kit/tree/v6.0.3"
             },
             "funding": [
                 {
@@ -5125,20 +4963,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.37",
+            "version": "v4.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e"
+                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
-                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
+                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
                 "shasum": ""
             },
             "require": {
@@ -5187,7 +5025,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.37"
+                "source": "https://github.com/symfony/config/tree/v4.4.41"
             },
             "funding": [
                 {
@@ -5203,20 +5041,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-03T09:46:22+00:00"
+            "time": "2022-04-12T15:19:55+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.5",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad"
+                "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d8111acc99876953f52fe16d4c50eb60940d49ad",
-                "reference": "d8111acc99876953f52fe16d4c50eb60940d49ad",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
+                "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
                 "shasum": ""
             },
             "require": {
@@ -5286,7 +5124,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.5"
+                "source": "https://github.com/symfony/console/tree/v5.4.8"
             },
             "funding": [
                 {
@@ -5302,25 +5140,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T12:45:35+00:00"
+            "time": "2022-04-12T16:02:29+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.3",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e"
+                "reference": "1955d595c12c111629cc814d3f2a2ff13580508a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/1955d595c12c111629cc814d3f2a2ff13580508a",
+                "reference": "1955d595c12c111629cc814d3f2a2ff13580508a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "autoload": {
@@ -5352,7 +5189,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v6.0.3"
             },
             "funding": [
                 {
@@ -5368,20 +5205,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.4.38",
+            "version": "v4.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "f6d1ca0eb363cd8c729e45cff419fb34158afec5"
+                "reference": "74c7f55de0eced4d3c9654809b1871870386a577"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6d1ca0eb363cd8c729e45cff419fb34158afec5",
-                "reference": "f6d1ca0eb363cd8c729e45cff419fb34158afec5",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74c7f55de0eced4d3c9654809b1871870386a577",
+                "reference": "74c7f55de0eced4d3c9654809b1871870386a577",
                 "shasum": ""
             },
             "require": {
@@ -5438,7 +5275,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.38"
+                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.41"
             },
             "funding": [
                 {
@@ -5454,20 +5291,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T08:43:20+00:00"
+            "time": "2022-04-12T15:19:55+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced"
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
                 "shasum": ""
             },
             "require": {
@@ -5505,7 +5342,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5521,35 +5358,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-01T23:48:49+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v5.4.5",
+            "version": "v6.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "50777f44e7dc37e16959ca65041df2acd6a65775"
+                "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/50777f44e7dc37e16959ca65041df2acd6a65775",
-                "reference": "50777f44e7dc37e16959ca65041df2acd6a65775",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9b4126901a6146c151d95af3868b1e0e30519ea6",
+                "reference": "9b4126901a6146c151d95af3868b1e0e30519ea6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
                 "masterminds/html5": "<2.6"
             },
             "require-dev": {
                 "masterminds/html5": "^2.6",
-                "symfony/css-selector": "^4.4|^5.0|^6.0"
+                "symfony/css-selector": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/css-selector": ""
@@ -5580,7 +5415,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v5.4.5"
+                "source": "https://github.com/symfony/dom-crawler/tree/v6.0.6"
             },
             "funding": [
                 {
@@ -5596,7 +5431,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-31T16:08:03+00:00"
+            "time": "2022-03-02T12:58:14+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -5685,16 +5520,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "aa5422287b75594b90ee9cd807caf8f0df491385"
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/aa5422287b75594b90ee9cd807caf8f0df491385",
-                "reference": "aa5422287b75594b90ee9cd807caf8f0df491385",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
                 "shasum": ""
             },
             "require": {
@@ -5744,7 +5579,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5760,20 +5595,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-15T12:33:35+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.5",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "797680071ea8f71b94eb958680c50d0e002638f5"
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/797680071ea8f71b94eb958680c50d0e002638f5",
-                "reference": "797680071ea8f71b94eb958680c50d0e002638f5",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
                 "shasum": ""
             },
             "require": {
@@ -5808,7 +5643,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.5"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.7"
             },
             "funding": [
                 {
@@ -5824,20 +5659,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-27T10:31:47+00:00"
+            "time": "2022-04-01T12:33:59+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.0.5",
+            "version": "v6.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "a8f87328930932c455cffd048f965d1223d91915"
+                "reference": "d347895193283e08b4c3ebf2f2974a1df3e1f670"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/a8f87328930932c455cffd048f965d1223d91915",
-                "reference": "a8f87328930932c455cffd048f965d1223d91915",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/d347895193283e08b4c3ebf2f2974a1df3e1f670",
+                "reference": "d347895193283e08b4c3ebf2f2974a1df3e1f670",
                 "shasum": ""
             },
             "require": {
@@ -5892,7 +5727,7 @@
             "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.0.5"
+                "source": "https://github.com/symfony/http-client/tree/v6.0.8"
             },
             "funding": [
                 {
@@ -5908,20 +5743,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-27T08:47:28+00:00"
+            "time": "2022-04-12T16:11:42+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "265f03fed057044a8e4dc159aa33596d0f48ed3f"
+                "reference": "f7525778c712be78ad5b6ca31f47fdcfd404c280"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/265f03fed057044a8e4dc159aa33596d0f48ed3f",
-                "reference": "265f03fed057044a8e4dc159aa33596d0f48ed3f",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/f7525778c712be78ad5b6ca31f47fdcfd404c280",
+                "reference": "f7525778c712be78ad5b6ca31f47fdcfd404c280",
                 "shasum": ""
             },
             "require": {
@@ -5970,7 +5805,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5986,20 +5821,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-03T13:44:55+00:00"
+            "time": "2022-03-13T20:10:05+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.0.3",
+            "version": "v6.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "2cd9601efd040e56f43360daa68f3c6b0534923a"
+                "reference": "c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/2cd9601efd040e56f43360daa68f3c6b0534923a",
-                "reference": "2cd9601efd040e56f43360daa68f3c6b0534923a",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1",
+                "reference": "c1701e88ad0ca49fc6ad6cdf360bc0e1209fb5e1",
                 "shasum": ""
             },
             "require": {
@@ -6051,7 +5886,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.0.3"
+                "source": "https://github.com/symfony/mime/tree/v6.0.8"
             },
             "funding": [
                 {
@@ -6067,11 +5902,93 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2022-04-12T16:11:42+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -6132,7 +6049,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6152,7 +6069,7 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
@@ -6219,7 +6136,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6239,7 +6156,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -6303,7 +6220,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6323,7 +6240,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -6386,7 +6303,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6406,7 +6323,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -6462,7 +6379,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6482,7 +6399,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -6541,7 +6458,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -6560,22 +6477,106 @@
             "time": "2021-06-05T21:20:04+00:00"
         },
         {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-04T08:16:47+00:00"
+        },
+        {
             "name": "symfony/service-contracts",
-            "version": "v2.4.1",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "d664541b99d6fb0247ec5ff32e87238582236204"
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d664541b99d6fb0247ec5ff32e87238582236204",
-                "reference": "d664541b99d6fb0247ec5ff32e87238582236204",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1"
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -6586,7 +6587,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6623,7 +6624,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -6639,20 +6640,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:37:19+00:00"
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.3",
+            "version": "v6.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2"
+                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2",
-                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
+                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
                 "shasum": ""
             },
             "require": {
@@ -6708,7 +6709,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.3"
+                "source": "https://github.com/symfony/string/tree/v6.0.8"
             },
             "funding": [
                 {
@@ -6724,20 +6725,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2022-04-22T08:18:02+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.4.37",
+            "version": "v4.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4ce00d6875230b839f5feef82e51971f6c886e00"
+                "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4ce00d6875230b839f5feef82e51971f6c886e00",
-                "reference": "4ce00d6875230b839f5feef82e51971f6c886e00",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
+                "reference": "dcb67eae126e74507e0b4f0b9ac6ef35b37c3331",
                 "shasum": ""
             },
             "require": {
@@ -6797,7 +6798,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v4.4.37"
+                "source": "https://github.com/symfony/translation/tree/v4.4.41"
             },
             "funding": [
                 {
@@ -6813,20 +6814,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-04-21T07:22:34+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e"
+                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e",
-                "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07",
+                "reference": "1211df0afa701e45a04253110e959d4af4ef0f07",
                 "shasum": ""
             },
             "require": {
@@ -6875,7 +6876,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1"
             },
             "funding": [
                 {
@@ -6891,7 +6892,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-17T14:20:01+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -7095,5 +7096,5 @@
         "ext-posix": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 1ae8b17c5..182f674ca 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -59,7 +59,6 @@ function fileas_widget($baseurl,$selected = '') {
 	));
 }
 
-
 function categories_widget($baseurl,$selected = '') {
 
 	if(! feature_enabled(App::$profile['profile_uid'],'categories'))
@@ -124,96 +123,6 @@ function categories_widget($baseurl,$selected = '') {
 	return '';
 }
 
-
-function cardcategories_widget($baseurl,$selected = '') {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'categories'))
-		return '';
-
-	$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-	$item_normal = "and item.item_hidden = 0 and item.item_type = 6 and item.item_deleted = 0
-		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-		and item.item_blocked = 0 ";
-
-	$terms = array();
-	$r = q("select distinct(term.term)
-				from term join item on term.oid = item.id
-				where item.uid = %d
-				and term.uid = item.uid
-				and term.ttype = %d
-				and term.otype = %d
-				and item.owner_xchan = '%s'
-				$item_normal
-				$sql_extra
-				order by term.term asc",
-			intval(App::$profile['profile_uid']),
-			intval(TERM_CATEGORY),
-			intval(TERM_OBJ_POST),
-			dbesc(App::$profile['channel_hash'])
-	);
-	if($r && count($r)) {
-		foreach($r as $rr)
-			$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-		return replace_macros(get_markup_template('categories_widget.tpl'),array(
-			'$title' => t('Categories'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => t('Everything'),
-			'$terms' => $terms,
-			'$base' => $baseurl,
-		));
-	}
-
-	return '';
-}
-
-
-function articlecategories_widget($baseurl,$selected = '') {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'categories'))
-		return '';
-
-	$sql_extra = item_permissions_sql(App::$profile['profile_uid']);
-
-	$item_normal = "and item.item_hidden = 0 and item.item_type = 7 and item.item_deleted = 0
-		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
-		and item.item_blocked = 0 ";
-
-	$terms = array();
-	$r = q("select distinct(term.term)
-				from term join item on term.oid = item.id
-				where item.uid = %d
-				and term.uid = item.uid
-				and term.ttype = %d
-				and term.otype = %d
-				and item.owner_xchan = '%s'
-				$item_normal
-				$sql_extra
-				order by term.term asc",
-			intval(App::$profile['profile_uid']),
-			intval(TERM_CATEGORY),
-			intval(TERM_OBJ_POST),
-			dbesc(App::$profile['channel_hash'])
-	);
-	if($r && count($r)) {
-		foreach($r as $rr)
-			$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-		return replace_macros(get_markup_template('categories_widget.tpl'),array(
-			'$title' => t('Categories'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => t('Everything'),
-			'$terms' => $terms,
-			'$base' => $baseurl,
-		));
-	}
-
-	return '';
-}
-
 function filecategories_widget($baseurl,$selected = '') {
 
 	$perms = permissions_sql(App::$profile['profile_uid']);
diff --git a/include/conversation.php b/include/conversation.php
index c0238b8ae..1d6295df7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -773,7 +773,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
 					$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));
+				$conv_link = z_root() . '/' . $conv_link_module . '/' . gen_link_id($conv_link_mid);
 
 				$contact = [];
 
diff --git a/include/event.php b/include/event.php
index 3d3dda035..f62c22792 100644
--- a/include/event.php
+++ b/include/event.php
@@ -85,7 +85,7 @@ function format_event_obj($jobject) {
 			'startTime' => (($arr['adjust']) ? datetime_convert('UTC','UTC',$arr['dtstart'], ATOM_TIME) : datetime_convert('UTC','UTC',$arr['dtstart'],'Y-m-d\\TH:i:s-00:00')),
 			'content'   => bbcode($arr['description']),
 			'location'  => [ 'type' => 'Place', 'content' => $arr['location'] ],
-			'source'    => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/x-multicode' ],
+			'source'    => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/bbcode' ],
 			'url'       => [ [ 'mediaType' => 'text/calendar', 'href' => z_root() . '/events/ical/' . $event['event_hash'] ] ],
 			'actor'     => Activity::encode_person($r[0],false),
 		];
@@ -141,8 +141,15 @@ function format_event_obj($jobject) {
 			'$event_tz'      => ['label' => t('Timezone'), 'value' => (($tz === date_default_timezone_get()) ? '' : $tz)]
 		));
 
+
+		$description = [];
+
+		if (strpos($object['source']['content'], '[/event-description]') !== false) {
+			preg_match("/\[event\-description\](.*?)\[\/event\-description\]/ism", $object['source']['content'], $description);
+		}
+
 		$event['content'] = replace_macros(get_markup_template('event_item_content.tpl'), array(
-			'$description'    => $object['content'],
+			'$description'    => ((isset($description[1]))? zidify_links(smilies(bbcode($description[1]))) : EMPTY_STR),
 			'$location_label' => t('Location:'),
 			'$location'   => ((array_path_exists('location/name', $object)) ? zidify_links(smilies(bbcode($object['location']['name']))) : EMPTY_STR)
 		));
@@ -1215,7 +1222,7 @@ function event_store_item($arr, $event) {
 			'startTime' => (($arr['adjust']) ? datetime_convert('UTC', 'UTC', $arr['dtstart'], ATOM_TIME) : datetime_convert('UTC', 'UTC', $arr['dtstart'], 'Y-m-d\\TH:i:s-00:00')),
 			'content'   => bbcode($arr['description']),
 			'location'  => [ 'type' => 'Place', 'name' => $arr['location'] ],
-			'source'    => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/x-multicode' ],
+			'source'    => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/bbcode' ],
 			'url'       => [ [ 'mediaType' => 'text/calendar', 'href' => z_root() . '/events/ical/' . $event['event_hash'] ] ],
 			'actor'     => Activity::encode_person($r[0], false),
 			'attachment' => Activity::encode_attachment($r[0]),
@@ -1375,7 +1382,7 @@ function event_store_item($arr, $event) {
 				'startTime'  => (($arr['adjust']) ? datetime_convert('UTC', 'UTC', $arr['dtstart'], ATOM_TIME) : datetime_convert('UTC', 'UTC', $arr['dtstart'], 'Y-m-d\\TH:i:s-00:00')),
 				'content'    => bbcode($arr['description']),
 				'location'   => [ 'type' => 'Place', 'name' => bbcode($arr['location']) ],
-				'source'     => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/x-multicode' ],
+				'source'     => [ 'content' => format_event_bbcode($arr), 'mediaType' => 'text/bbcode' ],
 				'url'        => [ [ 'mediaType' => 'text/calendar', 'href' => z_root() . '/events/ical/' . $event['event_hash'] ] ],
 				'actor'      => Activity::encode_person($z, false),
 				'attachment' => Activity::encode_attachment($item_arr),
diff --git a/include/features.php b/include/features.php
index 584d9cdfb..e57859aa8 100644
--- a/include/features.php
+++ b/include/features.php
@@ -373,6 +373,14 @@ function get_features($filtered = true, $level = (-1)) {
 				t('If location data is available on uploaded photos, link this to a map.'),
 				false,
 				get_config('feature_lock','photo_location'),
+			],
+
+			[
+				'adult_photo_flagging',
+				t('Flag Adult Photos'),
+				t('Provide photo edit option to hide inappropriate photos from default album view'),
+				false,
+				get_config('feature_lock','adult_photo_flagging'),
 			]
 
 		],
diff --git a/include/items.php b/include/items.php
index 8a2faa623..d4c27ab28 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3219,6 +3219,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
 
 		}
 
+		$arr['title'] = $item['title'];
 		$arr['tgt_type'] = $item['tgt_type'];
 		$arr['target'] = $item['target'];
 
@@ -4830,7 +4831,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
 	$match = null;
 	// match img and zmg image links
 	if(preg_match_all("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/",$body,$match)) {
-		$images = $match[2];
+
+		// The URI can be in both places
+		$images = array_merge($match[1], $match[2]);
+
 		if($images) {
 			foreach($images as $image) {
 				if(! stristr($image,z_root() . '/photo/'))
@@ -4848,6 +4852,7 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
 					dbesc($image_uri),
 					intval($uid)
 				);
+
 				if($r && $r[0]['folder']) {
 					$f = q("select * from attach where hash = '%s' and is_dir = 1 and uid = %d limit 1",
 						dbesc($r[0]['folder']),
diff --git a/include/nav.php b/include/nav.php
index b9b24e34c..c2c87232b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -83,7 +83,8 @@ function nav($template = 'default') {
 	if ($observer) {
 		$userinfo = [
 			'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']),
-			'name' => $observer['xchan_addr'],
+			'addr' => $observer['xchan_addr'],
+			'name' => $observer['xchan_name'],
 		];
 	}
 
@@ -499,29 +500,6 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Cards')) {
-		$tabs[] = [
-			'label' => t('Cards'),
-			'url'   => z_root() . '/cards/' . $nickname,
-			'sel'   => ((argv(0) == 'cards') ? 'active' : ''),
-			'title' => t('View Cards'),
-			'id'    => 'cards-tab',
-			'icon'  => 'list'
-		];
-	}
-
-	if ($p['view_pages'] && Apps::system_app_installed($uid, 'Articles')) {
-		$tabs[] = [
-			'label' => t('Articles'),
-			'url'   => z_root() . '/articles/' . $nickname,
-			'sel'   => ((argv(0) == 'articles') ? 'active' : ''),
-			'title' => t('View Articles'),
-			'id'    => 'articles-tab',
-			'icon'  => 'file-text-o'
-		];
-	}
-
-
 	if ($has_webpages && Apps::system_app_installed($uid, 'Webpages')) {
 		$tabs[] = [
 			'label' => t('Webpages'),
@@ -533,7 +511,6 @@ function channel_apps($is_owner = false, $nickname = null) {
 		];
 	}
 
-
 	if ($p['view_wiki'] && Apps::system_app_installed($uid, 'Wiki')) {
 		$tabs[] = [
 			'label' => t('Wikis'),
diff --git a/include/photos.php b/include/photos.php
index 5bceb516d..9e4e8923d 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -359,13 +359,13 @@ function photo_upload($channel, $observer, $args) {
 		$scale  = 1;
 		$width  = $url[1]['width'];
 		$height = $url[1]['height'];
-		$tag    = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
+		$tag    = (($r1) ? '[zmg=' . $url[1]['href'] . ']' : '[zmg]');
 	}
 	else {
 		$scale  = 2;
 		$width  = $url[2]['width'];
 		$height = $url[2]['height'];
-		$tag    = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
+		$tag    = (($r2) ? '[zmg=' .$url[2]['href'] . ']' : '[zmg]');
 	}
 
 	$author_link = '[zrl=' . z_root() . '/channel/' . $channel['channel_address'] . ']' . $channel['channel_name'] . '[/zrl]';
@@ -379,7 +379,7 @@ function photo_upload($channel, $observer, $args) {
 	$summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]';
 
 	$obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']'
-		. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]'
+		. $tag . $filename . '[/zmg]'
 		. '[/zrl]';
 
 	$url[] = [
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index b6014c160..47a3004b7 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -1,22 +1,22 @@
 Software Installation
 
 We've tried very hard to ensure that this software will run on commodity
-hosting platforms - such as those used to host Wordpress blogs and Drupal 
+hosting platforms - such as those used to host Wordpress blogs and Drupal
 websites. It will run on most any Linux VPS system. Windows LAMP platforms
-such as XAMPP and WAMP are not officially supported at this time - however 
-we welcome patches if you manage to get it working. 
+such as XAMPP and WAMP are not officially supported at this time - however
+we welcome patches if you manage to get it working.
 
-Be aware that this software is more than a simple web application. It is a 
-complex communications and content management system which more closely 
-resembles an email server than a web server. For reliability and performance, 
-messages are delivered in the background and are queued for later delivery 
+Be aware that this software is more than a simple web application. It is a
+complex communications and content management system which more closely
+resembles an email server than a web server. For reliability and performance,
+messages are delivered in the background and are queued for later delivery
 when sites are down. This kind of functionality requires a bit more of the
 host system than the typical blog. Not every PHP/MySQL hosting provider will
 be able to support Hubzilla. Many will - but please review the requirements
-and confirm these with your hosting provider prior to installation. (And 
+and confirm these with your hosting provider prior to installation. (And
 preferably before entering into a long-term contract.)
 
-If you encounter installation issues, please let us know via the issue 
+If you encounter installation issues, please let us know via the issue
 tracker at https://framagit.org/hubzilla where you downloaded the software.
 Please be as clear as you can about your operating environment and provide as
 much detail as possible about any error messages you may see, so that we can
@@ -27,14 +27,14 @@ our best to solve any general code issues.
 
 
 
-**Before you begin** 
+**Before you begin**
 
 Choose a domain name or subdomain name for your server.
 
 The software can only be installed into the root of a domain or
-sub-domain, and can not be installed using alternate TCP ports. These 
+sub-domain, and can not be installed using alternate TCP ports. These
 restrictions may be relaxed in the future, but will be inconvenient to work
-with, so we still STRONGLY recommend you abide by them. 
+with, so we still STRONGLY recommend you abide by them.
 
 Decide if you will use SSL and obtain an SSL certificate before software
 installation.  You SHOULD use SSL. If you use SSL, you MUST use a
@@ -46,19 +46,19 @@ site for the first time, please use the SSL ("https://") URL if SSL is
 available. This will avoid problems later. The installation routine will not
 allow you to use a non browser-valid certificate.
 
-This restriction is incorporated because public posts from you may contain 
+This restriction is incorporated because public posts from you may contain
 references to images on your own hub. Other members viewing their stream on
 other hubs will get warnings if your certificate is not trusted by their web
 browser. This will confuse many people because this is a decentralised network
 and they will get the warning about your hub while viewing their own hub and
-may think their own hub has an issue. These warnings are very technical and 
+may think their own hub has an issue. These warnings are very technical and
 scary to some folks, many of whom will not know how to proceed except to
 follow the browser advice. This is disruptive to the community. That said, we
 recognise the issues surrounding the current certificate infrastructure and
-agree there are many problems, but that doesn't change the requirement. 
+agree there are many problems, but that doesn't change the requirement.
 
 Free "browser-valid" certificates are available from providers such as StartSSL
-and LetsEncrypt. 
+and LetsEncrypt.
 
 If you do NOT use SSL, there may be a delay of up to a minute for the initial
 install script - while we check the SSL port to see if anything responds there.
@@ -66,10 +66,10 @@ When communicating with new sites, Hubzilla always attempts connection on the
 SSL port first, before falling back to a less secure connection.  If you do not
 use SSL, your webserver MUST NOT listen on port 443 at all.
 
-If you use LetsEncrypt to provide certificates and create a file under 
+If you use LetsEncrypt to provide certificates and create a file under
 .well-known/acme-challenge so that LetsEncrypt can verify your domain
 ownership, please remove or rename the .well-known directory as soon as the
-certificate is generated. The software will provide its own handler for 
+certificate is generated. The software will provide its own handler for
 ".well-known" services when it is installed, and an existing directory in this
 location may prevent some of these services from working correctly. This
 should not be a problem with Apache, but may be an issue with nginx or other
@@ -78,40 +78,40 @@ web server platforms.
 **Installation**
 
 1. Requirements
-    - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
+    - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a
     local .htaccess file. Some folks have successfully used nginx and lighttpd.
-	Example config scripts are available for these platforms in the install 
-	directory. Apache and nginx have the most support. 
+	Example config scripts are available for these platforms in the install
+	directory. Apache and nginx have the most support.
 
-    - PHP 7.1 or later. 
+    - PHP 8.0 or later.
 
-    - PHP *command line* access with register_argc_argv set to true in the 
-    php.ini file - and with no hosting provider restrictions on the use of 
+    - PHP *command line* access with register_argc_argv set to true in the
+    php.ini file - and with no hosting provider restrictions on the use of
     exec() and proc_open().
 
-    - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml, 
-    xmlreader (FreeBSD), zip and openssl extensions. The imagick extension MAY be used 
-    instead of gd, but is not required and MAY also be disabled via 
-    configuration option. 
+    - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml,
+    xmlreader (FreeBSD), zip and openssl extensions. The imagick extension MAY be used
+    instead of gd, but is not required and MAY also be disabled via
+    configuration option.
 
     - some form of email server or email gateway such that PHP mail() works.
 
     - Mysql 5.5.3 or later or MariaDB or postgres database server.
-    
+
     - ability to schedule jobs with cron.
 
-    - Installation into a top-level domain or sub-domain (without a 
+    - Installation into a top-level domain or sub-domain (without a
     directory/path component in the URL) is REQUIRED.
 
 2. Unpack the project files into the root of your web server document area.
-    
-     If you copy the directory tree to your webserver, make sure that you 
-    also copy .htaccess - as "dot" files are often hidden and aren't normally 
+
+     If you copy the directory tree to your webserver, make sure that you
+    also copy .htaccess - as "dot" files are often hidden and aren't normally
     copied.
 
-    - If you are able to do so, we recommend using git to clone the source 
-    repository rather than to use a packaged tar or zip file.  This makes the 
-    software much easier to update. The Linux command to clone the repository 
+    - If you are able to do so, we recommend using git to clone the source
+    repository rather than to use a packaged tar or zip file.  This makes the
+    software much easier to update. The Linux command to clone the repository
     into a directory "mywebsite" would be
 
         git clone https://framagit.org/hubzilla/core.git mywebsite
@@ -120,7 +120,7 @@ web server platforms.
 
         git pull
 
-    - make sure folders *store/[data]/smarty3* and *store* exist and are 
+    - make sure folders *store/[data]/smarty3* and *store* exist and are
     writable by the webserver
 
         mkdir -p "store/[data]/smarty3"
@@ -134,7 +134,7 @@ web server platforms.
         difficult without opening a trouble ticket with your provider. The
         above permissions will allow the software to work, but are not
         optimal.]
- 
+
     - For installing addons
 
         - First you should be **on** your website folder
@@ -142,12 +142,12 @@ web server platforms.
             cd mywebsite
 
     - Then you should clone the addon repository (separately). We'll give this repository
-         a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by 
+         a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by
          giving them different nicknames.
 
             util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons
 
-    - For keeping the addon tree updated, you should be on your top level website 
+    - For keeping the addon tree updated, you should be on your top level website
 		directory and issue an update command for that repository.
 
             cd mywebsite
@@ -163,53 +163,53 @@ web server platforms.
 
 
 
-3. Create an empty database and note the access details (hostname, username, 
-password, database name). The PDO database libraries will fallback to socket 
+3. Create an empty database and note the access details (hostname, username,
+password, database name). The PDO database libraries will fallback to socket
 communication if the hostname is 'localhost' and some people have reported
-issues with the socket implementation. Use it if your requirements mandate. 
+issues with the socket implementation. Use it if your requirements mandate.
 Otherwise if the database is served on the local server, use '127.0.0.1' for
-the hostname. 
+the hostname.
 
-Internally we now use the PDO library for database connections. If you 
+Internally we now use the PDO library for database connections. If you
 encounter a database configuration which cannot be expressed on the setup form
 (for instance using MySQL with an unusual socket location); you can supply
 the PDO connection string as the database hostname. For instance
-	
+
 	:/path/to/socket.file
 
-You should still fill in all other applicable form values as needed.  
+You should still fill in all other applicable form values as needed.
 
 
-4. If you know in advance that it will be impossible for the web server to 
-write or create files in your web directory, create an empty file called 
+4. If you know in advance that it will be impossible for the web server to
+write or create files in your web directory, create an empty file called
 .htconfig.php and make it writable by the web server.
 
-5. Visit your website with a web browser and follow the instructions. Please 
+5. Visit your website with a web browser and follow the instructions. Please
 note any error messages and correct these before continuing. If you are using
 SSL with a known signature authority, use the https: link to your
-website. 
+website.
 
 6. *If* the automated installation fails for any reason, check the following:
 
-    - ".htconfig.php" exists 
-        If not, edit htconfig.php and change system settings. Rename 
+    - ".htconfig.php" exists
+        If not, edit htconfig.php and change system settings. Rename
     to .htconfig.php
 	-  Database is populated.
-        If not, import the contents of "install/schema_xxxxx.sql" with phpmyadmin 
+        If not, import the contents of "install/schema_xxxxx.sql" with phpmyadmin
         or mysql command line (replace 'xxxxx' with your DB type).
 
-7. At this point visit your website again, and register your personal account. 
-Registration errors should all be recoverable automatically. 
+7. At this point visit your website again, and register your personal account.
+Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the
-database was not installed correctly. You might wish to move/rename 
-.htconfig.php to another name and empty (called 'dropping') the database 
+database was not installed correctly. You might wish to move/rename
+.htconfig.php to another name and empty (called 'dropping') the database
 tables, so that you can start fresh.
 
 In order for your account to be given administrator access, it should be the
 first account created, and the email address provided during registration
-must match the "administrator email" address you provided during 
+must match the "administrator email" address you provided during
 installation. Otherwise to give an account administrator access,
-add 4096 to the account_roles for that account in the database. 
+add 4096 to the account_roles for that account in the database.
 
 For your site security there is no way to provide administrator access
 using web forms.
@@ -220,29 +220,29 @@ using web forms.
 ****************************************************************************
 ****************************************************************************
 
-8. Set up a cron job or scheduled task to run the Cron manager once every 10-15 
+8. Set up a cron job or scheduled task to run the Cron manager once every 10-15
 minutes to perform background processing and maintenance. Example:
 
 	cd /base/directory; /path/to/php Zotlabs/Daemon/Master.php Cron
 
 Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 
-If you are using a Linux server, run "crontab -e" and add a line like the 
+If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
 
 */10 * * * *	cd /home/myname/mywebsite; /usr/bin/php Zotlabs/Daemon/Master.php Cron > /dev/null 2>&1
 
-You can generally find the location of PHP by executing "which php". If you 
-have troubles with this section please contact your hosting provider for 
+You can generally find the location of PHP by executing "which php". If you
+have troubles with this section please contact your hosting provider for
 assistance. Hubzilla will not work correctly if you cannot perform this step.
 
-You should also be sure that App::$config['system']['php_path'] is set correctly 
-in your .htconfig.php file, it should look like (changing it to the correct 
+You should also be sure that App::$config['system']['php_path'] is set correctly
+in your .htconfig.php file, it should look like (changing it to the correct
 PHP location):
 
-App::$config['system']['php_path'] = '/usr/local/php56/bin/php';
-  
- 
+App::$config['system']['php_path'] = '/usr/local/php80/bin/php';
+
+
 #####################################################################
 
 		If things don't work...
@@ -251,54 +251,54 @@ App::$config['system']['php_path'] = '/usr/local/php56/bin/php';
 
 
 #####################################################################
-- If you get the message 
+- If you get the message
 	"System is currently unavailable. Please try again later"
 #####################################################################
-	
-Check your database settings. It usually means your database could not be 
+
+Check your database settings. It usually means your database could not be
 opened or accessed. If the database resides on the same machine, check that
-the database server name is "127.0.0.1" or the word "localhost". 
+the database server name is "127.0.0.1" or the word "localhost".
 
 #####################################################################
 - 500 Internal Error
 #####################################################################
 
-This could be the result of one of our Apache directives not being 
+This could be the result of one of our Apache directives not being
 supported by your version of Apache. Examine your apache server logs.
-Also check your file permissions. Your website and all contents must generally 
+Also check your file permissions. Your website and all contents must generally
 be world-readable.
 
 It is likely that your web server reported the source of the problem in
-its error log files. Please review these system error logs to determine what 
+its error log files. Please review these system error logs to determine what
 caused the problem. Often this will need to be resolved with your hosting
-provider or (if self-hosted) your web server configuration. 
+provider or (if self-hosted) your web server configuration.
 
 #####################################################################
 - 400 and 4xx "File not found" errors
 #####################################################################
 
-First check your file permissions. Your website and all contents must 
+First check your file permissions. Your website and all contents must
 generally be world-readable.
 
 Ensure that mod-rewite is installed and working, and that your
 .htaccess file is being used. To verify the latter, create a file test.out
-containing the word "test" in the top directory of the Hubzilla, make it world 
+containing the word "test" in the top directory of the Hubzilla, make it world
 readable and point your web browser to
 
 http://yoursitenamehere.com/test.out
 
 This file should be blocked. You should get a permission denied message.
 
-If you see the word "test" your Apache configuration is not allowing your 
+If you see the word "test" your Apache configuration is not allowing your
 .htaccess file to be used (there are rules in this file to block access
 to any file with .out at the end, as these are typically used for system logs).
 
-Make certain the .htaccess file exists and is readable by everybody, then 
-look for the existence of "AllowOverride None" in the Apache server 
-configuration for your site. This will need to be changed to 
-"AllowOverride All".  
+Make certain the .htaccess file exists and is readable by everybody, then
+look for the existence of "AllowOverride None" in the Apache server
+configuration for your site. This will need to be changed to
+"AllowOverride All".
 
-	If you do not see the word "test", your .htaccess is working, but it is 
+	If you do not see the word "test", your .htaccess is working, but it is
 likely that mod-rewrite is not installed in your web server or is not working.
 
 	On most flavours of Linux,
@@ -306,30 +306,30 @@ likely that mod-rewrite is not installed in your web server or is not working.
 % a2enmod rewrite
 % /etc/init.d/apache2 restart
 
-Consult your hosting provider, experts on your particular Linux 
-distribution or (if Windows) the provider of your Apache server software if 
-you need to change either of these and can not figure out how. There is 
-a lot of help available on the web. Google "mod-rewrite" along with the 
+Consult your hosting provider, experts on your particular Linux
+distribution or (if Windows) the provider of your Apache server software if
+you need to change either of these and can not figure out how. There is
+a lot of help available on the web. Google "mod-rewrite" along with the
 name of your operating system distribution or Apache package.
 
-  
+
 #####################################################################
 - If you see an error during database setup that DNS lookup failed
 #####################################################################
 
-This is a known issue on some versions of FreeBSD, because 
-dns_get_record() fails for some lookups. Create a file in your top webserver 
+This is a known issue on some versions of FreeBSD, because
+dns_get_record() fails for some lookups. Create a file in your top webserver
 folder called '.htpreconfig.php' and inside it put the following:
 
 <?php
 App::$config['system']['do_not_check_dns'] = 1;
 
 This should allow installation to proceed. Once the database has been
-installed, add the same config statement (but not the '<?php' line) to the 
-.htconfig.php file which was created during installation. 
+installed, add the same config statement (but not the '<?php' line) to the
+.htconfig.php file which was created during installation.
 
 #####################################################################
-- If you are unable to write the file .htconfig.php during installation 
+- If you are unable to write the file .htconfig.php during installation
 due to permissions issues:
 #####################################################################
 
@@ -339,7 +339,7 @@ For Linux:
 % touch .htconfig.php
 % chmod 777 .htconfig.php
 
-Retry the installation. As soon as the database has been created, 
+Retry the installation. As soon as the database has been created,
 
 ******* this is important *********
 
@@ -437,5 +437,5 @@ MaxRequestWorkers to 70.
 Here you can read more about Apache performance tuning:
 https://httpd.apache.org/docs/2.4/misc/perf-tuning.html
 
-There are tons of scripts to help you with fine-tuning your Apache installation. 
+There are tons of scripts to help you with fine-tuning your Apache installation.
 Just search with your favorite search engine 'apache fine-tuning script'.
diff --git a/util/hmessages.po b/util/hmessages.po
index f531aafb2..9437f7618 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 7.2RC\n"
+"Project-Id-Version: 7.4RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-23 20:16+0000\n"
+"POT-Creation-Date: 2022-05-25 08:39+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,10 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../store/[data]/smarty3/compiled/2cbde885645602969010e846a38817a1297aafb9_0.file.cover_photo.tpl.php:127
-msgid "Cover Photo"
-msgstr ""
-
 #: ../../view/theme/redbasic/php/config.php:15
 #: ../../addon/cart/submodules/orderoptions.php:335
 #: ../../addon/cart/submodules/orderoptions.php:359
@@ -37,6 +33,8 @@ msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:94
 #: ../../addon/channelreputation/channelreputation.php:143
+#: ../../addon/wiki/Widget/Wiki_pages.php:41
+#: ../../addon/wiki/Widget/Wiki_pages.php:98 ../../addon/wiki/Mod_Wiki.php:218
 #: ../../addon/openclipatar/openclipatar.php:54
 #: ../../addon/photocache/Mod_Photocache.php:63
 #: ../../addon/redred/Mod_Redred.php:88 ../../addon/redphotos/redphotos.php:136
@@ -64,10 +62,10 @@ msgstr ""
 #: ../../addon/smileybutton/Mod_Smileybutton.php:53
 #: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:86
 #: ../../addon/diaspora/Mod_Diaspora.php:100 ../../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/workflow.php:1466
+#: ../../addon/workflow/workflow.php:1525
+#: ../../addon/workflow/workflow.php:1644
+#: ../../addon/workflow/workflow.php:2747
 #: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94
 #: ../../addon/likebanner/likebanner.php:57
 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:54 ../../addon/hubwall/hubwall.php:95
@@ -79,8 +77,7 @@ msgstr ""
 #: ../../addon/ljpost/Mod_Ljpost.php:80 ../../addon/hzfiles/hzfiles.php:86
 #: ../../addon/pageheader/Mod_Pageheader.php:52 ../../addon/irc/irc.php:45
 #: ../../addon/xmpp/Mod_Xmpp.php:70 ../../include/js_strings.php:22
-#: ../../Zotlabs/Widget/Wiki_pages.php:48
-#: ../../Zotlabs/Widget/Wiki_pages.php:105 ../../Zotlabs/Module/Tokens.php:294
+#: ../../Zotlabs/Module/Tokens.php:294
 #: ../../Zotlabs/Module/Import_items.php:125
 #: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Setup.php:316
 #: ../../Zotlabs/Module/Setup.php:356 ../../Zotlabs/Module/Group.php:150
@@ -127,10 +124,9 @@ msgstr ""
 #: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Pconfig.php:116
 #: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328
 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:106
-#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Connedit.php:714
-#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:123
-#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Lib/ThreadItem.php:865
-#: ../../Zotlabs/Storage/Browser.php:382
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Locs.php:125
+#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:160
+#: ../../Zotlabs/Lib/ThreadItem.php:852 ../../Zotlabs/Storage/Browser.php:382
 msgid "Submit"
 msgstr ""
 
@@ -145,6 +141,7 @@ msgstr ""
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
 #: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/wiki/Mod_Wiki.php:230 ../../addon/wiki/Mod_Wiki.php:231
 #: ../../addon/redred/Mod_Redred.php:61
 #: ../../addon/statusnet/Mod_Statusnet.php:258
 #: ../../addon/statusnet/Mod_Statusnet.php:280
@@ -206,20 +203,20 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Privacy.php:121
 #: ../../Zotlabs/Module/Settings/Privacy.php:122
 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
-#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Connedit.php:622
 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
 #: ../../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:1757
+#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1753
 msgid "No"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:99
 #: ../../view/theme/redbasic/php/config.php:116
 #: ../../addon/channelreputation/channelreputation.php:111
+#: ../../addon/wiki/Mod_Wiki.php:230 ../../addon/wiki/Mod_Wiki.php:231
 #: ../../addon/redred/Mod_Redred.php:61
 #: ../../addon/statusnet/Mod_Statusnet.php:258
 #: ../../addon/statusnet/Mod_Statusnet.php:280
@@ -280,14 +277,13 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Privacy.php:121
 #: ../../Zotlabs/Module/Settings/Privacy.php:122
 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
-#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Sources.php:122
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Sources.php:122
 #: ../../Zotlabs/Module/Sources.php:157 ../../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:1757
+#: ../../boot.php:1753
 msgid "Yes"
 msgstr ""
 
@@ -443,7 +439,7 @@ msgstr ""
 
 #: ../../addon/channelreputation/channelreputation.php:233
 #: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:161
-#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:533
+#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:520
 #: ../../Zotlabs/Storage/Browser.php:411
 msgid "Close"
 msgstr ""
@@ -503,6 +499,490 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
+#: ../../addon/wiki/Widget/Wiki_pages.php:33
+#: ../../addon/wiki/Widget/Wiki_pages.php:90
+msgid "Add new page"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:37
+#: ../../addon/wiki/Widget/Wiki_pages.php:94 ../../addon/wiki/Mod_Wiki.php:220
+#: ../../addon/wiki/Mod_Wiki.php:374 ../../addon/mdpost/mdpost.php:41
+#: ../../include/text.php:2192
+msgid "Markdown"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:37
+#: ../../addon/wiki/Widget/Wiki_pages.php:94 ../../addon/wiki/Mod_Wiki.php:220
+#: ../../addon/wiki/Mod_Wiki.php:374 ../../include/text.php:2190
+msgid "BBcode"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:37
+#: ../../addon/wiki/Widget/Wiki_pages.php:94 ../../addon/wiki/Mod_Wiki.php:220
+#: ../../include/text.php:2193
+msgid "Text"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:40
+#: ../../addon/wiki/Widget/Wiki_pages.php:97
+#: ../../Zotlabs/Module/Dreport.php:130
+msgid "Options"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:84
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_pages.php:95
+msgid "Page name"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_list.php:20 ../../addon/wiki/Mod_Wiki.php:209
+#: ../../include/nav.php:516
+msgid "Wikis"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_page_history.php:28
+#: ../../addon/wiki/Lib/NativeWikiPage.php:580
+#: ../../addon/wiki/Mod_Wiki.php:221 ../../addon/rendezvous/rendezvous.php:172
+#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137
+#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372
+#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Module/Connedit.php:732 ../../Zotlabs/Storage/Browser.php:377
+msgid "Name"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_page_history.php:29
+#: ../../addon/wiki/Lib/NativeWikiPage.php:581
+msgctxt "wiki_history"
+msgid "Message"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_page_history.php:30
+#: ../../addon/wiki/Lib/NativeWikiPage.php:582
+msgid "Date"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_page_history.php:31
+#: ../../addon/wiki/Lib/NativeWikiPage.php:583
+#: ../../addon/wiki/Mod_Wiki.php:370
+msgid "Revert"
+msgstr ""
+
+#: ../../addon/wiki/Widget/Wiki_page_history.php:32
+#: ../../addon/wiki/Lib/NativeWikiPage.php:584
+msgid "Compare"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWiki.php:144
+msgid "Wiki updated successfully"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWiki.php:204
+msgid "Wiki files deleted successfully"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:41
+#: ../../addon/wiki/Lib/NativeWikiPage.php:109
+msgid "(No Title)"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:123
+msgid "Wiki page create failed."
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:137
+msgid "Wiki not found."
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:148
+msgid "Destination name already exists"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:181
+#: ../../addon/wiki/Lib/NativeWikiPage.php:376
+msgid "Page not found"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:211
+msgid "Error reading page content"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:367
+#: ../../addon/wiki/Lib/NativeWikiPage.php:417
+#: ../../addon/wiki/Lib/NativeWikiPage.php:485
+#: ../../addon/wiki/Lib/NativeWikiPage.php:526
+msgid "Error reading wiki"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:404
+msgid "Page update failed."
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:439
+msgid "Nothing deleted"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:506
+msgid "Compare: object not found."
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:513
+msgid "Page updated"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:521
+msgid "Wiki resource_id required for git commit"
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:537 ../../addon/cards/cards.php:103
+#: ../../addon/articles/articles.php:103 ../../include/help.php:133
+#: ../../Zotlabs/Module/Display.php:142 ../../Zotlabs/Module/Page.php:136
+#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:186
+msgid "Page not found."
+msgstr ""
+
+#: ../../addon/wiki/Lib/NativeWikiPage.php:622 ../../include/bbcode.php:1050
+#: ../../include/bbcode.php:1235
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:36 ../../addon/cart/cart.php:1410
+#: ../../addon/flashcards/Mod_Flashcards.php:52
+msgid "Profile Unavailable."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:63 ../../addon/wiki/Mod_Wiki.php:288
+#: ../../addon/wiki/Mod_Wiki.php:431 ../../addon/openid/Mod_Id.php:53
+#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36
+#: ../../addon/cards/Mod_Card_edit.php:51 ../../addon/cards/Mod_Cards.php:89
+#: ../../addon/articles/Mod_Article_edit.php:51
+#: ../../addon/articles/Mod_Articles.php:94 ../../include/photos.php:30
+#: ../../include/items.php:3898 ../../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:1096
+#: ../../include/attach.php:1169 ../../include/attach.php:1332
+#: ../../Zotlabs/Module/Attach_edit.php:90
+#: ../../Zotlabs/Module/Attach_edit.php:99
+#: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:18
+#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:218
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Channel.php:220 ../../Zotlabs/Module/Channel.php:376
+#: ../../Zotlabs/Module/Channel.php:415 ../../Zotlabs/Module/Group.php:14
+#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:107
+#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:111
+#: ../../Zotlabs/Module/Chat.php:116
+#: ../../Zotlabs/Module/Channel_calendar.php:232
+#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:157
+#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520
+#: ../../Zotlabs/Module/Item.php:530 ../../Zotlabs/Module/Item.php:1410
+#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99
+#: ../../Zotlabs/Module/Profile.php:114
+#: ../../Zotlabs/Module/Sharedwithme.php:19
+#: ../../Zotlabs/Module/Webpages.php:131
+#: ../../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:384
+#: ../../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:153 ../../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:390
+#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../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:171 ../../Zotlabs/Module/Profiles.php:615
+#: ../../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:181
+#: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302
+#: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:299
+#: ../../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:117
+msgid "Permission denied."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:81 ../../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:1558
+msgid "Invalid channel"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:136
+msgid "Error retrieving wiki"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:143
+msgid "Error creating zip file export folder"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:194
+msgid "Error downloading wiki: "
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:214 ../../addon/wiki/Mod_Wiki.php:387
+#: ../../addon/cards/Mod_Card_edit.php:99 ../../addon/cards/cards.php:73
+#: ../../addon/articles/Mod_Article_edit.php:97
+#: ../../addon/articles/articles.php:73 ../../include/menu.php:120
+#: ../../include/channel.php:1530 ../../include/channel.php:1534
+#: ../../Zotlabs/Widget/Cdav.php:142 ../../Zotlabs/Widget/Cdav.php:179
+#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Oauth.php:171
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Webpages.php:252
+#: ../../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:329
+#: ../../Zotlabs/Module/Connections.php:378
+#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176
+#: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:595
+#: ../../Zotlabs/Lib/ThreadItem.php:166
+msgid "Edit"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:215 ../../Zotlabs/Storage/Browser.php:404
+msgid "Download"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:216 ../../addon/wiki/Mod_Wiki.php:412
+#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:258
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:198
+msgid "View"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:217 ../../Zotlabs/Module/Manage.php:137
+#: ../../Zotlabs/Module/Profiles.php:853
+msgid "Create New"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:219
+msgid "Wiki name"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:220
+msgid "Content type"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:222 ../../Zotlabs/Storage/Browser.php:378
+msgid "Type"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:223
+msgid "Any&nbsp;type"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:230
+msgid "Lock content type"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:231
+msgid "Create a status post for this wiki"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:232
+msgid "Edit Wiki Name"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:277
+msgid "Wiki not found"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:303
+msgid "Rename page"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:304 ../../addon/hsse/hsse.php:186
+#: ../../include/conversation.php:1462 ../../Zotlabs/Widget/Cdav.php:140
+#: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Module/Photos.php:1084 ../../Zotlabs/Module/Layouts.php:194
+msgid "Share"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:324
+msgid "Error retrieving page content"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:332 ../../addon/wiki/Mod_Wiki.php:334
+msgid "New page"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:369
+msgid "Revision Comparison"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:371 ../../addon/wiki/Mod_Wiki.php:404
+#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
+#: ../../addon/cards/Mod_Card_edit.php:132
+#: ../../addon/articles/Mod_Article_edit.php:130
+#: ../../include/conversation.php:1485 ../../include/conversation.php:1540
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Cdav.php:1057
+#: ../../Zotlabs/Module/Cdav.php:1390 ../../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:553
+#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56
+#: ../../Zotlabs/Module/Editlayout.php:140
+#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Oauth2.php:115
+#: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Connedit.php:750
+#: ../../Zotlabs/Storage/Browser.php:383
+msgid "Cancel"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:377
+msgid "Short description of your changes (optional)"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:387 ../../addon/wppost/wppost.php:174
+#: ../../addon/wppost/Mod_Wppost.php:96 ../../addon/dwpost/Mod_Dwpost.php:67
+#: ../../addon/dwpost/dwpost.php:134 ../../addon/ljpost/ljpost.php:134
+msgid "Source"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:397
+msgid "New page name"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:402
+msgid "Embed image from photo albums"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:403 ../../addon/hsse/hsse.php:208
+#: ../../include/conversation.php:1484
+msgid "Embed an image from your albums"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:405 ../../addon/hsse/hsse.php:210
+#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1486
+#: ../../include/conversation.php:1539
+#: ../../Zotlabs/Module/Profile_photo.php:554
+#: ../../Zotlabs/Module/Cover_photo.php:429
+msgid "OK"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:406 ../../addon/hsse/hsse.php:139
+#: ../../include/conversation.php:1411
+#: ../../Zotlabs/Module/Profile_photo.php:555
+#: ../../Zotlabs/Module/Cover_photo.php:430
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:407 ../../addon/hsse/hsse.php:140
+#: ../../include/conversation.php:1412
+#: ../../Zotlabs/Module/Profile_photo.php:556
+#: ../../Zotlabs/Module/Cover_photo.php:431
+msgid "Choose an album"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:557
+#: ../../Zotlabs/Module/Cover_photo.php:432
+msgid "Choose a different album"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:409 ../../addon/hsse/hsse.php:142
+#: ../../include/conversation.php:1414
+#: ../../Zotlabs/Module/Profile_photo.php:558
+#: ../../Zotlabs/Module/Cover_photo.php:433
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:410 ../../addon/hsse/hsse.php:143
+#: ../../include/conversation.php:1415
+#: ../../Zotlabs/Module/Profile_photo.php:559
+#: ../../Zotlabs/Module/Cover_photo.php:434
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:411 ../../addon/hsse/hsse.php:144
+#: ../../include/conversation.php:1416
+#: ../../Zotlabs/Module/Profile_photo.php:560
+#: ../../Zotlabs/Module/Cover_photo.php:435
+msgid "Error getting album"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:413
+msgid "History"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:491
+msgid "Error creating wiki. Invalid name."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:498
+msgid "A wiki with this name already exists."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:511
+msgid "Wiki created, but error creating Home page."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:518
+msgid "Error creating wiki"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:542
+msgid "Error updating wiki. Invalid name."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:561
+msgid "Error updating wiki"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:576
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:586
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:619
+msgid "New page created"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:745
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:821
+msgid "Current Revision"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:821
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../addon/wiki/Mod_Wiki.php:876
+msgid "You must be authenticated."
+msgstr ""
+
 #: ../../addon/openclipatar/openclipatar.php:51
 #: ../../addon/openclipatar/openclipatar.php:129
 msgid "System defaults:"
@@ -532,13 +1012,13 @@ msgstr ""
 msgid "Page to load after image selection."
 msgstr ""
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:110
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:111
 #: ../../include/conversation.php:1093 ../../Zotlabs/Module/Connedit.php:480
 #: ../../Zotlabs/Lib/Apps.php:348
 msgid "View Profile"
 msgstr ""
 
-#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:115
+#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:116
 #: ../../include/channel.php:1534
 msgid "Edit Profile"
 msgstr ""
@@ -625,7 +1105,7 @@ msgid "Profile photo updated successfully."
 msgstr ""
 
 #: ../../addon/bookmarker/bookmarker.php:38
-#: ../../Zotlabs/Lib/ThreadItem.php:510
+#: ../../Zotlabs/Lib/ThreadItem.php:497
 msgid "Save Bookmarks"
 msgstr ""
 
@@ -657,10 +1137,11 @@ msgstr ""
 msgid "Queueworker Settings"
 msgstr ""
 
-#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1168
+#: ../../addon/queueworker/Mod_Queueworker.php:116
+#: ../../addon/cards/Mod_Cards.php:116
+#: ../../addon/articles/Mod_Articles.php:120 ../../include/text.php:1168
 #: ../../include/text.php:1180 ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:111
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:115
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54
 #: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103
 msgid "Save"
 msgstr ""
@@ -707,13 +1188,13 @@ msgstr ""
 msgid "Photo Gallery"
 msgstr ""
 
-#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1427
+#: ../../addon/gallery/Mod_Gallery.php:49 ../../addon/cards/Mod_Cards.php:42
+#: ../../addon/articles/Mod_Articles.php:46 ../../include/channel.php:1427
 #: ../../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/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Editlayout.php:31
 #: ../../Zotlabs/Module/Menu.php:92 ../../Zotlabs/Module/Layouts.php:31
 msgid "Requested profile is not available."
 msgstr ""
@@ -727,78 +1208,6 @@ msgid ""
 "Set a random planet from the Star Wars Empire as your location when posting"
 msgstr ""
 
-#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44
-#: ../../addon/keepout/keepout.php:36 ../../include/photos.php:30
-#: ../../include/items.php:3897 ../../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:1096
-#: ../../include/attach.php:1169 ../../include/attach.php:1332
-#: ../../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:18
-#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:218
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Channel.php:220 ../../Zotlabs/Module/Channel.php:376
-#: ../../Zotlabs/Module/Channel.php:415 ../../Zotlabs/Module/Group.php:14
-#: ../../Zotlabs/Module/Group.php:30 ../../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:111
-#: ../../Zotlabs/Module/Chat.php:116
-#: ../../Zotlabs/Module/Channel_calendar.php:232
-#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:157
-#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520
-#: ../../Zotlabs/Module/Item.php:530 ../../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:131
-#: ../../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:424
-#: ../../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:153 ../../Zotlabs/Module/Cards.php:84
-#: ../../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:390
-#: ../../Zotlabs/Module/Profile_photo.php:417
-#: ../../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:171 ../../Zotlabs/Module/Profiles.php:615
-#: ../../Zotlabs/Module/Articles.php:87 ../../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:181 ../../Zotlabs/Module/Thing.php:282
-#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
-#: ../../Zotlabs/Module/Pdledit.php:35 ../../Zotlabs/Module/Wiki.php:57
-#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:425
-#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:299
-#: ../../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:117
-msgid "Permission denied."
-msgstr ""
-
 #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:64
 #: ../../include/selectors.php:81 ../../include/channel.php:1715
 msgid "Male"
@@ -841,7 +1250,7 @@ msgid "Last Name"
 msgstr ""
 
 #: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:73
-#: ../../boot.php:1746
+#: ../../boot.php:1742
 msgid "Nickname"
 msgstr ""
 
@@ -1169,10 +1578,10 @@ msgid "0 or blank to import all available"
 msgstr ""
 
 #: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1958
-#: ../../addon/diaspora/Receiver.php:1643 ../../include/text.php:2328
+#: ../../addon/diaspora/Receiver.php:1642 ../../include/text.php:2328
 #: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:445
 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115
-#: ../../Zotlabs/Lib/Activity.php:3613
+#: ../../Zotlabs/Lib/Activity.php:3528
 msgid "photo"
 msgstr ""
 
@@ -1354,12 +1763,6 @@ msgstr ""
 msgid "Post to WordPress"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:174 ../../addon/wppost/Mod_Wppost.php:96
-#: ../../addon/dwpost/Mod_Dwpost.php:67 ../../addon/dwpost/dwpost.php:134
-#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:381
-msgid "Source"
-msgstr ""
-
 #: ../../addon/wppost/Mod_Wppost.php:30
 msgid "Wordpress Settings saved."
 msgstr ""
@@ -1471,11 +1874,10 @@ msgstr ""
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1369
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:218
-#: ../../Zotlabs/Module/Editblock.php:116
+#: ../../addon/hsse/hsse.php:95 ../../addon/cards/Mod_Card_edit.php:101
+#: ../../addon/articles/Mod_Article_edit.php:99
+#: ../../include/conversation.php:1369 ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Chat.php:218 ../../Zotlabs/Module/Editblock.php:116
 msgid "Insert web link"
 msgstr ""
 
@@ -1496,40 +1898,10 @@ msgstr ""
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1411
-#: ../../Zotlabs/Module/Profile_photo.php:551
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:400
-msgid "Choose images to embed"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1412
-#: ../../Zotlabs/Module/Profile_photo.php:552
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:401
-msgid "Choose an album"
-msgstr ""
-
 #: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1413
 msgid "Choose a different album..."
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1414
-#: ../../Zotlabs/Module/Profile_photo.php:554
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:403
-msgid "Error getting album list"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1415
-#: ../../Zotlabs/Module/Profile_photo.php:555
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:404
-msgid "Error getting photo link"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1416
-#: ../../Zotlabs/Module/Profile_photo.php:556
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:405
-msgid "Error getting album"
-msgstr ""
-
 #: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1417
 msgid "Comments enabled"
 msgstr ""
@@ -1540,17 +1912,10 @@ msgstr ""
 
 #: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1429
 #: ../../Zotlabs/Module/Webpages.php:259 ../../Zotlabs/Module/Photos.php:1105
-#: ../../Zotlabs/Lib/ThreadItem.php:875
+#: ../../Zotlabs/Lib/ThreadItem.php:862
 msgid "Preview"
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1462
-#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Module/Webpages.php:253
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1084
-#: ../../Zotlabs/Module/Wiki.php:298 ../../Zotlabs/Module/Layouts.php:194
-msgid "Share"
-msgstr ""
-
 #: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1471
 msgid "Page link name"
 msgstr ""
@@ -1560,67 +1925,35 @@ msgid "Post as"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1476
-#: ../../Zotlabs/Lib/ThreadItem.php:866
+#: ../../Zotlabs/Lib/ThreadItem.php:853
 msgid "Bold"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1477
-#: ../../Zotlabs/Lib/ThreadItem.php:867
+#: ../../Zotlabs/Lib/ThreadItem.php:854
 msgid "Italic"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1478
-#: ../../Zotlabs/Lib/ThreadItem.php:868
+#: ../../Zotlabs/Lib/ThreadItem.php:855
 msgid "Underline"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1479
-#: ../../Zotlabs/Lib/ThreadItem.php:869
+#: ../../Zotlabs/Lib/ThreadItem.php:856
 msgid "Quote"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1480
-#: ../../Zotlabs/Lib/ThreadItem.php:870
+#: ../../Zotlabs/Lib/ThreadItem.php:857
 msgid "Code"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1481
-#: ../../Zotlabs/Lib/ThreadItem.php:872
+#: ../../Zotlabs/Lib/ThreadItem.php:859
 msgid "Attach/Upload file"
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1484
-#: ../../Zotlabs/Module/Wiki.php:397
-msgid "Embed an image from your albums"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
-#: ../../include/conversation.php:1485 ../../include/conversation.php:1540
-#: ../../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:110
-#: ../../Zotlabs/Module/Oauth.php:136 ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
-#: ../../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:549
-#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56
-#: ../../Zotlabs/Module/Editlayout.php:140
-#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Oauth2.php:115
-#: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Wiki.php:365
-#: ../../Zotlabs/Module/Wiki.php:398 ../../Zotlabs/Module/Connedit.php:750
-#: ../../Zotlabs/Storage/Browser.php:383
-msgid "Cancel"
-msgstr ""
-
-#: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257
-#: ../../include/conversation.php:1486 ../../include/conversation.php:1539
-#: ../../Zotlabs/Module/Profile_photo.php:550
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:399
-msgid "OK"
-msgstr ""
-
 #: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1488
 msgid "Toggle voting"
 msgstr ""
@@ -1633,11 +1966,10 @@ msgstr ""
 msgid "Toggle comments"
 msgstr ""
 
-#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1502
-#: ../../Zotlabs/Module/Article_edit.php:116
-#: ../../Zotlabs/Module/Card_edit.php:118
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:678
-#: ../../Zotlabs/Module/Photos.php:1050
+#: ../../addon/hsse/hsse.php:221 ../../addon/cards/Mod_Card_edit.php:118
+#: ../../addon/articles/Mod_Article_edit.php:116
+#: ../../include/conversation.php:1502 ../../Zotlabs/Module/Editblock.php:129
+#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1050
 msgid "Title (optional)"
 msgstr ""
 
@@ -1662,7 +1994,7 @@ msgid "Set publish date"
 msgstr ""
 
 #: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1537
-#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:879
+#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:866
 msgid "Encrypt text"
 msgstr ""
 
@@ -1688,8 +2020,8 @@ msgstr ""
 
 #: ../../addon/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 ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:157
@@ -1698,8 +2030,8 @@ msgstr ""
 
 #: ../../addon/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 ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:158
@@ -1782,24 +2114,24 @@ msgid "Enter some text"
 msgstr ""
 
 #: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:2002
-#: ../../include/network.php:1767 ../../Zotlabs/Lib/Activity.php:3655
+#: ../../include/network.php:1767 ../../Zotlabs/Lib/Activity.php:3570
 msgid "ActivityPub"
 msgstr ""
 
-#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1643
+#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1642
 #: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Subthread.php:115
 msgid "status"
 msgstr ""
 
-#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1589
+#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1588
 #: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:477
-#: ../../Zotlabs/Lib/Activity.php:3646
+#: ../../Zotlabs/Lib/Activity.php:3561
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
 #: ../../addon/pubcrawl/as.php:1995 ../../include/conversation.php:177
-#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3648
+#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3563
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
@@ -2114,19 +2446,6 @@ msgstr ""
 msgid "Let's meet here"
 msgstr ""
 
-#: ../../addon/rendezvous/rendezvous.php:172
-#: ../../Zotlabs/Widget/Wiki_page_history.php:28
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137
-#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372
-#: ../../Zotlabs/Module/Sharedwithme.php:106
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
-#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:732
-#: ../../Zotlabs/Lib/NativeWikiPage.php:582
-#: ../../Zotlabs/Storage/Browser.php:377
-msgid "Name"
-msgstr ""
-
 #: ../../addon/rendezvous/rendezvous.php:173
 #: ../../addon/cart/submodules/hzservices.php:657
 #: ../../addon/cart/submodules/manualcat.php:260
@@ -2229,16 +2548,6 @@ msgstr ""
 msgid "Startpage"
 msgstr ""
 
-#: ../../addon/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
-msgstr ""
-
-#: ../../addon/adultphotoflag/adultphotoflag.php:25
-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 ""
@@ -2481,14 +2790,6 @@ msgstr ""
 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:1558
-#: ../../Zotlabs/Module/Wiki.php:75
-msgid "Invalid channel"
-msgstr ""
-
 #: ../../addon/cart/submodules/subscriptions.php:151
 msgid "Enable Subscription Management Module"
 msgstr ""
@@ -2730,11 +3031,6 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:52
-#: ../../Zotlabs/Module/Wiki.php:35
-msgid "Profile Unavailable."
-msgstr ""
-
 #: ../../addon/cart/cart.php:1547
 msgid "You must be logged into the Grid to shop."
 msgstr ""
@@ -2820,7 +3116,7 @@ msgstr ""
 msgid "Diaspora relay could not be imported"
 msgstr ""
 
-#: ../../addon/diaspora/diaspora.php:1027
+#: ../../addon/diaspora/diaspora.php:1030
 msgid "No subject"
 msgstr ""
 
@@ -2878,22 +3174,22 @@ msgstr ""
 msgid "Diaspora Protocol"
 msgstr ""
 
-#: ../../addon/diaspora/Receiver.php:1593
+#: ../../addon/diaspora/Receiver.php:1592
 #, php-format
 msgid "%1$s dislikes %2$s's %3$s"
 msgstr ""
 
-#: ../../addon/diaspora/Receiver.php:2222 ../../Zotlabs/Module/Like.php:487
+#: ../../addon/diaspora/Receiver.php:2221 ../../Zotlabs/Module/Like.php:487
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../addon/diaspora/Receiver.php:2224 ../../Zotlabs/Module/Like.php:489
+#: ../../addon/diaspora/Receiver.php:2223 ../../Zotlabs/Module/Like.php:489
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../addon/diaspora/Receiver.php:2226 ../../Zotlabs/Module/Like.php:491
+#: ../../addon/diaspora/Receiver.php:2225 ../../Zotlabs/Module/Like.php:491
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
@@ -2958,54 +3254,54 @@ msgstr ""
 msgid "Create New Workflow Item"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:541 ../../addon/workflow/workflow.php:1437
-#: ../../addon/workflow/workflow.php:1456
+#: ../../addon/workflow/workflow.php:546 ../../addon/workflow/workflow.php:1442
+#: ../../addon/workflow/workflow.php:1461
 msgid "Workflow"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:1425
+#: ../../addon/workflow/workflow.php:1430
 msgid "No Workflows Available"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:1455
+#: ../../addon/workflow/workflow.php:1460
 msgid "Add item to which workflow"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:1515
-#: ../../addon/workflow/workflow.php:1634
+#: ../../addon/workflow/workflow.php:1520
+#: ../../addon/workflow/workflow.php:1639
 msgid "Create Workflow Item"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2596
+#: ../../addon/workflow/workflow.php:2601
 msgid "Link"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2598
+#: ../../addon/workflow/workflow.php:2603
 msgid "Web link."
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2617
-#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374
+#: ../../addon/workflow/workflow.php:2622
+#: ../../addon/workflow/workflow.php:2683 ../../Zotlabs/Module/Cdav.php:1374
 #: ../../Zotlabs/Module/Connedit.php:734
 msgid "Title"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2619
-#: ../../addon/workflow/workflow.php:2680
+#: ../../addon/workflow/workflow.php:2624
+#: ../../addon/workflow/workflow.php:2685
 msgid "Brief description or title"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:34
+#: ../../addon/workflow/workflow.php:2630 ../../Zotlabs/Widget/Notes.php:38
 #: ../../Zotlabs/Lib/Apps.php:374
 msgid "Notes"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2627
-#: ../../addon/workflow/workflow.php:2688
+#: ../../addon/workflow/workflow.php:2632
+#: ../../addon/workflow/workflow.php:2693
 msgid "Notes and Info"
 msgstr ""
 
-#: ../../addon/workflow/workflow.php:2686
+#: ../../addon/workflow/workflow.php:2691
 msgid "Body"
 msgstr ""
 
@@ -3178,6 +3474,86 @@ msgstr ""
 msgid "Test mode (only send to hub administrator)"
 msgstr ""
 
+#: ../../addon/cards/Widget/Cards_categories.php:72
+#: ../../addon/articles/Widget/Articles_categories.php:72
+#: ../../include/contact_widgets.php:115 ../../include/contact_widgets.php:149
+#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
+#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
+#: ../../Zotlabs/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293
+#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
+msgid "Categories"
+msgstr ""
+
+#: ../../addon/cards/Widget/Cards_categories.php:75
+#: ../../addon/articles/Widget/Articles_categories.php:75
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:118
+#: ../../include/contact_widgets.php:152
+#: ../../Zotlabs/Widget/Appcategories.php:52 ../../Zotlabs/Widget/Filer.php:36
+msgid "Everything"
+msgstr ""
+
+#: ../../addon/cards/Mod_Card_edit.php:17
+#: ../../addon/cards/Mod_Card_edit.php:33
+#: ../../addon/articles/Mod_Article_edit.php:17
+#: ../../addon/articles/Mod_Article_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 ""
+
+#: ../../addon/cards/Mod_Card_edit.php:44
+#: ../../addon/articles/Mod_Article_edit.php:44
+#: ../../Zotlabs/Module/Attach_edit.php:52
+#: ../../Zotlabs/Module/Wall_upload.php:31 ../../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 ""
+
+#: ../../addon/cards/Mod_Card_edit.php:129
+msgid "Edit Card"
+msgstr ""
+
+#: ../../addon/cards/Mod_Card_edit.php:130
+#: ../../addon/articles/Mod_Article_edit.php:128
+#: ../../include/conversation.php:730 ../../include/conversation.php:790
+#: ../../Zotlabs/Module/Tokens.php:295 ../../Zotlabs/Module/Group.php:251
+#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1389
+#: ../../Zotlabs/Module/Webpages.php:254
+#: ../../Zotlabs/Module/Admin/Accounts.php:320
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Admin/Profs.php:176
+#: ../../Zotlabs/Module/Permcats.php:261
+#: ../../Zotlabs/Module/Contactedit.php:667 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1185
+#: ../../Zotlabs/Module/Oauth2.php:193 ../../Zotlabs/Module/Thing.php:269
+#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Lib/Apps.php:596 ../../Zotlabs/Lib/ThreadItem.php:187
+#: ../../Zotlabs/Storage/Browser.php:384
+msgid "Delete"
+msgstr ""
+
+#: ../../addon/cards/cards.php:47 ../../addon/cards/Mod_Cards.php:209
+#: ../../Zotlabs/Lib/Apps.php:330
+msgid "Cards"
+msgstr ""
+
+#: ../../addon/cards/cards.php:50
+msgid "View Cards"
+msgstr ""
+
+#: ../../addon/cards/cards.php:81 ../../addon/articles/articles.php:81
+#: ../../include/conversation.php:842
+msgid "View in context"
+msgstr ""
+
+#: ../../addon/cards/Mod_Cards.php:115
+msgid "Add Card"
+msgstr ""
+
 #: ../../addon/notifyadmin/notifyadmin.php:34
 msgid "New registration"
 msgstr ""
@@ -3211,12 +3587,12 @@ msgid "Set/edit permissions"
 msgstr ""
 
 #: ../../addon/flashcards/Mod_Flashcards.php:291
-#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3820
+#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3821
 #: ../../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:53
-#: ../../Zotlabs/Module/Display.php:428 ../../Zotlabs/Module/Admin.php:61
+#: ../../Zotlabs/Module/Display.php:388 ../../Zotlabs/Module/Admin.php:61
 #: ../../Zotlabs/Module/Thing.php:96
 msgid "Item not found."
 msgstr ""
@@ -3623,17 +3999,27 @@ msgstr ""
 msgid "Posted by"
 msgstr ""
 
-#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2192
-#: ../../Zotlabs/Widget/Wiki_pages.php:44
-#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
-#: ../../Zotlabs/Module/Wiki.php:368
-msgid "Markdown"
-msgstr ""
-
 #: ../../addon/mdpost/mdpost.php:42
 msgid "Use markdown for editing posts"
 msgstr ""
 
+#: ../../addon/articles/Mod_Article_edit.php:127
+msgid "Edit Article"
+msgstr ""
+
+#: ../../addon/articles/articles.php:46
+#: ../../addon/articles/Mod_Articles.php:228 ../../Zotlabs/Lib/Apps.php:329
+msgid "Articles"
+msgstr ""
+
+#: ../../addon/articles/articles.php:49
+msgid "View Articles"
+msgstr ""
+
+#: ../../addon/articles/Mod_Articles.php:119
+msgid "Add Article"
+msgstr ""
+
 #: ../../addon/hzfiles/hzfiles.php:81
 msgid "Hubzilla File Storage Import"
 msgstr ""
@@ -3795,7 +4181,7 @@ msgid "Network: %s"
 msgstr ""
 
 #: ../../include/text.php:1167 ../../include/text.php:1179
-#: ../../include/nav.php:190 ../../include/acl_selectors.php:149
+#: ../../include/nav.php:191 ../../include/acl_selectors.php:149
 #: ../../Zotlabs/Widget/Sitesearch.php:37
 #: ../../Zotlabs/Widget/Activity_filter.php:210
 #: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:394
@@ -4063,7 +4449,7 @@ msgstr ""
 msgid "Poll ends in %s"
 msgstr ""
 
-#: ../../include/text.php:1995 ../../Zotlabs/Lib/ThreadItem.php:482
+#: ../../include/text.php:1995 ../../Zotlabs/Lib/ThreadItem.php:469
 msgid "Vote"
 msgstr ""
 
@@ -4083,21 +4469,10 @@ msgstr ""
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:2190 ../../Zotlabs/Widget/Wiki_pages.php:44
-#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
-#: ../../Zotlabs/Module/Wiki.php:368
-msgid "BBcode"
-msgstr ""
-
 #: ../../include/text.php:2191
 msgid "HTML"
 msgstr ""
 
-#: ../../include/text.php:2193 ../../Zotlabs/Widget/Wiki_pages.php:44
-#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
-msgid "Text"
-msgstr ""
-
 #: ../../include/text.php:2194
 msgid "Comanche Layout"
 msgstr ""
@@ -4110,7 +4485,7 @@ msgstr ""
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:2331 ../../include/event.php:1340
+#: ../../include/text.php:2331 ../../include/event.php:1347
 #: ../../include/conversation.php:132
 #: ../../Zotlabs/Module/Channel_calendar.php:221
 #: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Module/Tagger.php:75
@@ -4119,7 +4494,7 @@ msgstr ""
 
 #: ../../include/text.php:2334 ../../include/conversation.php:158
 #: ../../include/bbcode.php:555 ../../include/markdown.php:205
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3613
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3528
 msgid "post"
 msgstr ""
 
@@ -4241,7 +4616,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:63 ../../include/event.php:146
+#: ../../include/event.php:63 ../../include/event.php:153
 #: ../../include/channel.php:1625 ../../Zotlabs/Module/Directory.php:353
 msgid "Location:"
 msgstr ""
@@ -4258,63 +4633,63 @@ msgstr ""
 msgid "End:"
 msgstr ""
 
-#: ../../include/event.php:1186
+#: ../../include/event.php:1193
 msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/event.php:1419
+#: ../../include/event.php:1426
 msgid "Not specified"
 msgstr ""
 
-#: ../../include/event.php:1420
+#: ../../include/event.php:1427
 msgid "Needs Action"
 msgstr ""
 
-#: ../../include/event.php:1421
+#: ../../include/event.php:1428
 msgid "Completed"
 msgstr ""
 
-#: ../../include/event.php:1422
+#: ../../include/event.php:1429
 msgid "In Process"
 msgstr ""
 
-#: ../../include/event.php:1423
+#: ../../include/event.php:1430
 msgid "Cancelled"
 msgstr ""
 
-#: ../../include/event.php:1504 ../../include/connections.php:752
+#: ../../include/event.php:1511 ../../include/connections.php:752
 #: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Connedit.php:741
 msgid "Mobile"
 msgstr ""
 
-#: ../../include/event.php:1505 ../../include/connections.php:753
+#: ../../include/event.php:1512 ../../include/connections.php:753
 #: ../../Zotlabs/Widget/Notifications.php:42 ../../Zotlabs/Module/Cdav.php:1382
 #: ../../Zotlabs/Module/Connedit.php:742
 msgid "Home"
 msgstr ""
 
-#: ../../include/event.php:1506 ../../include/connections.php:754
+#: ../../include/event.php:1513 ../../include/connections.php:754
 msgid "Home, Voice"
 msgstr ""
 
-#: ../../include/event.php:1507 ../../include/connections.php:755
+#: ../../include/event.php:1514 ../../include/connections.php:755
 msgid "Home, Fax"
 msgstr ""
 
-#: ../../include/event.php:1508 ../../include/connections.php:756
+#: ../../include/event.php:1515 ../../include/connections.php:756
 #: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:743
 msgid "Work"
 msgstr ""
 
-#: ../../include/event.php:1509 ../../include/connections.php:757
+#: ../../include/event.php:1516 ../../include/connections.php:757
 msgid "Work, Voice"
 msgstr ""
 
-#: ../../include/event.php:1510 ../../include/connections.php:758
+#: ../../include/event.php:1517 ../../include/connections.php:758
 msgid "Work, Fax"
 msgstr ""
 
-#: ../../include/event.php:1511 ../../include/event.php:1518
+#: ../../include/event.php:1518 ../../include/event.php:1525
 #: ../../include/selectors.php:64 ../../include/selectors.php:81
 #: ../../include/selectors.php:119 ../../include/selectors.php:155
 #: ../../include/connections.php:759 ../../include/connections.php:766
@@ -4335,8 +4710,8 @@ msgstr ""
 msgid "On"
 msgstr ""
 
-#: ../../include/features.php:82 ../../include/nav.php:466
-#: ../../include/nav.php:469 ../../Zotlabs/Lib/Apps.php:350
+#: ../../include/features.php:82 ../../include/nav.php:467
+#: ../../include/nav.php:470 ../../Zotlabs/Lib/Apps.php:350
 msgid "Calendar"
 msgstr ""
 
@@ -4600,7 +4975,7 @@ msgstr ""
 msgid "Ability to display only posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:368 ../../include/nav.php:447
+#: ../../include/features.php:368 ../../include/nav.php:448
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349
 msgid "Photos"
 msgstr ""
@@ -4613,32 +4988,42 @@ msgstr ""
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/features.php:382 ../../Zotlabs/Module/Contactedit.php:444
+#: ../../include/features.php:380
+msgid "Flag Adult Photos"
+msgstr ""
+
+#: ../../include/features.php:381
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
+msgstr ""
+
+#: ../../include/features.php:390 ../../Zotlabs/Module/Contactedit.php:444
 #: ../../Zotlabs/Lib/Apps.php:367
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/features.php:386
+#: ../../include/features.php:394
 msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/features.php:387
+#: ../../include/features.php:395
 msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/features.php:394
+#: ../../include/features.php:402
 msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/features.php:395
+#: ../../include/features.php:403
 msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/features.php:402
+#: ../../include/features.php:410
 msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/features.php:403
+#: ../../include/features.php:411
 msgid "Ability to create multiple profiles"
 msgstr ""
 
@@ -4653,11 +5038,11 @@ msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1103
-#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:864
+#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:851
 msgid "Comment"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:573
+#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:560
 #, php-format
 msgid "%s show all"
 msgstr ""
@@ -4785,12 +5170,12 @@ msgstr ""
 msgid "Pinned"
 msgstr ""
 
-#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:509
+#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:496
 msgid "Pin to the top"
 msgstr ""
 
 #: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:158
-#: ../../Zotlabs/Lib/ThreadItem.php:509
+#: ../../Zotlabs/Lib/ThreadItem.php:496
 msgid "Unpin from the top"
 msgstr ""
 
@@ -4997,7 +5382,7 @@ msgid "Help:"
 msgstr ""
 
 #: ../../include/help.php:118 ../../include/help.php:126
-#: ../../include/nav.php:176 ../../include/nav.php:315
+#: ../../include/nav.php:177 ../../include/nav.php:316
 #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352
 msgid "Help"
 msgstr ""
@@ -5006,14 +5391,6 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../include/help.php:133 ../../Zotlabs/Module/Display.php:142
-#: ../../Zotlabs/Module/Display.php:159 ../../Zotlabs/Module/Display.php:179
-#: ../../Zotlabs/Module/Display.php:185 ../../Zotlabs/Module/Page.php:136
-#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:539
-#: ../../Zotlabs/Web/Router.php:186
-msgid "Page not found."
-msgstr ""
-
 #: ../../include/photos.php:153
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
@@ -5042,7 +5419,7 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/photos.php:722 ../../include/nav.php:450
+#: ../../include/photos.php:722 ../../include/nav.php:451
 msgid "Photo Albums"
 msgstr ""
 
@@ -5185,27 +5562,11 @@ msgstr ""
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:119
-#: ../../include/contact_widgets.php:163 ../../include/contact_widgets.php:208
-#: ../../include/contact_widgets.php:243
-#: ../../Zotlabs/Widget/Appcategories.php:52 ../../Zotlabs/Widget/Filer.php:36
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:116 ../../include/contact_widgets.php:160
-#: ../../include/contact_widgets.php:205 ../../include/contact_widgets.php:240
-#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
-#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
-#: ../../Zotlabs/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293
-#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
-msgid "Categories"
-msgstr ""
-
-#: ../../include/contact_widgets.php:273
+#: ../../include/contact_widgets.php:182
 msgid "Common Connections"
 msgstr ""
 
-#: ../../include/contact_widgets.php:277
+#: ../../include/contact_widgets.php:186
 #, php-format
 msgid "View all %d common connections"
 msgstr ""
@@ -5227,104 +5588,104 @@ msgstr ""
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:93
 msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/nav.php:92
+#: ../../include/nav.php:93
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:98 ../../Zotlabs/Widget/Admin.php:29
+#: ../../include/nav.php:99 ../../Zotlabs/Widget/Admin.php:29
 #: ../../Zotlabs/Module/Admin/Channels.php:146
 #: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116
 msgid "Channels"
 msgstr ""
 
-#: ../../include/nav.php:98
+#: ../../include/nav.php:99
 msgid "Manage your channels"
 msgstr ""
 
-#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:71
+#: ../../include/nav.php:102 ../../Zotlabs/Widget/Settings_menu.php:71
 #: ../../Zotlabs/Widget/Newmember.php:58
 #: ../../Zotlabs/Module/Admin/Themes.php:125
 #: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343
 msgid "Settings"
 msgstr ""
 
-#: ../../include/nav.php:101
+#: ../../include/nav.php:102
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:107 ../../include/nav.php:137
-#: ../../include/nav.php:158 ../../boot.php:1751
+#: ../../include/nav.php:108 ../../include/nav.php:138
+#: ../../include/nav.php:159 ../../boot.php:1747
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:107 ../../include/nav.php:137
+#: ../../include/nav.php:108 ../../include/nav.php:138
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:110
+#: ../../include/nav.php:111
 msgid "Your profile page"
 msgstr ""
 
-#: ../../include/nav.php:113 ../../include/channel.php:1530
+#: ../../include/nav.php:114 ../../include/channel.php:1530
 #: ../../Zotlabs/Module/Profiles.php:852
 msgid "Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:113
+#: ../../include/nav.php:114
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:40
+#: ../../include/nav.php:116 ../../Zotlabs/Widget/Newmember.php:40
 msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/nav.php:122 ../../include/nav.php:126
-#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1752
+#: ../../include/nav.php:123 ../../include/nav.php:127
+#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1748
 msgid "Login"
 msgstr ""
 
-#: ../../include/nav.php:122 ../../include/nav.php:126
+#: ../../include/nav.php:123 ../../include/nav.php:127
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:156
+#: ../../include/nav.php:157
 msgid "Take me home"
 msgstr ""
 
-#: ../../include/nav.php:158
+#: ../../include/nav.php:159
 msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/nav.php:163 ../../Zotlabs/Module/Register.php:542
-#: ../../boot.php:1729
+#: ../../include/nav.php:164 ../../Zotlabs/Module/Register.php:542
+#: ../../boot.php:1725
 msgid "Register"
 msgstr ""
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:164
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:176
+#: ../../include/nav.php:177
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:190
+#: ../../include/nav.php:191
 msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/nav.php:196 ../../Zotlabs/Widget/Admin.php:60
+#: ../../include/nav.php:197 ../../Zotlabs/Widget/Admin.php:60
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:196
+#: ../../include/nav.php:197
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:319 ../../Zotlabs/Widget/Messages.php:36
+#: ../../include/nav.php:320 ../../Zotlabs/Widget/Messages.php:36
 #: ../../Zotlabs/Widget/Notifications.php:172
 #: ../../Zotlabs/Module/New_channel.php:157
 #: ../../Zotlabs/Module/New_channel.php:164
@@ -5332,108 +5693,85 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-#: ../../include/nav.php:324
+#: ../../include/nav.php:325
 msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/nav.php:325
+#: ../../include/nav.php:326
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/nav.php:331 ../../Zotlabs/Lib/Apps.php:327
+#: ../../include/nav.php:332 ../../Zotlabs/Lib/Apps.php:327
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:332
+#: ../../include/nav.php:333
 msgid "Channel Apps"
 msgstr ""
 
-#: ../../include/nav.php:333
+#: ../../include/nav.php:334
 msgid "System Apps"
 msgstr ""
 
-#: ../../include/nav.php:334
+#: ../../include/nav.php:335
 msgid "Pinned Apps"
 msgstr ""
 
-#: ../../include/nav.php:335
+#: ../../include/nav.php:336
 msgid "Featured Apps"
 msgstr ""
 
-#: ../../include/nav.php:424 ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/nav.php:425 ../../Zotlabs/Module/Admin/Channels.php:154
 #: ../../Zotlabs/Lib/Apps.php:347
 msgid "Channel"
 msgstr ""
 
-#: ../../include/nav.php:427
+#: ../../include/nav.php:428
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/nav.php:437 ../../Zotlabs/Module/Help.php:83
+#: ../../include/nav.php:438 ../../Zotlabs/Module/Help.php:83
 msgid "About"
 msgstr ""
 
-#: ../../include/nav.php:440
+#: ../../include/nav.php:441
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/nav.php:455 ../../Zotlabs/Widget/Notifications.php:107
+#: ../../include/nav.php:456 ../../Zotlabs/Widget/Notifications.php:107
 #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:344
 #: ../../Zotlabs/Storage/Browser.php:351
 msgid "Files"
 msgstr ""
 
-#: ../../include/nav.php:458
+#: ../../include/nav.php:459
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/nav.php:480 ../../include/nav.php:483
+#: ../../include/nav.php:481 ../../include/nav.php:484
 #: ../../Zotlabs/Widget/Chatroom_list.php:22 ../../Zotlabs/Lib/Apps.php:334
 msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:493 ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../include/nav.php:494 ../../Zotlabs/Module/Bookmarks.php:90
 #: ../../Zotlabs/Lib/Apps.php:333
 msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:496
+#: ../../include/nav.php:497
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:504 ../../Zotlabs/Module/Cards.php:205
-#: ../../Zotlabs/Lib/Apps.php:330
-msgid "Cards"
-msgstr ""
-
-#: ../../include/nav.php:507
-msgid "View Cards"
-msgstr ""
-
-#: ../../include/nav.php:515 ../../Zotlabs/Module/Articles.php:223
-#: ../../Zotlabs/Lib/Apps.php:329
-msgid "Articles"
-msgstr ""
-
-#: ../../include/nav.php:518
-msgid "View Articles"
-msgstr ""
-
-#: ../../include/nav.php:527 ../../Zotlabs/Module/Webpages.php:249
+#: ../../include/nav.php:505 ../../Zotlabs/Module/Webpages.php:249
 #: ../../Zotlabs/Lib/Apps.php:345
 msgid "Webpages"
 msgstr ""
 
-#: ../../include/nav.php:530
+#: ../../include/nav.php:508
 msgid "View Webpages"
 msgstr ""
 
-#: ../../include/nav.php:539 ../../Zotlabs/Widget/Wiki_list.php:20
-#: ../../Zotlabs/Module/Wiki.php:203
-msgid "Wikis"
-msgstr ""
-
-#: ../../include/nav.php:542 ../../Zotlabs/Lib/Apps.php:346
+#: ../../include/nav.php:519 ../../Zotlabs/Lib/Apps.php:346
 msgid "Wiki"
 msgstr ""
 
@@ -5470,7 +5808,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:238 ../../boot.php:2768
+#: ../../include/datetime.php:238 ../../boot.php:2764
 msgid "never"
 msgstr ""
 
@@ -5556,7 +5894,7 @@ msgstr ""
 #: ../../Zotlabs/Widget/Album.php:90 ../../Zotlabs/Widget/Pinned.php:271
 #: ../../Zotlabs/Widget/Portfolio.php:99
 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:799
-#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1691
+#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1595
 #: ../../Zotlabs/Lib/Apps.php:1146 ../../Zotlabs/Lib/Apps.php:1230
 msgid "Unknown"
 msgstr ""
@@ -5607,7 +5945,7 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:538
+#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:525
 msgid "This is an unsaved preview"
 msgstr ""
 
@@ -5657,31 +5995,11 @@ msgctxt "title"
 msgid "Might attend"
 msgstr ""
 
-#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:210
+#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:197
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:730 ../../include/conversation.php:790
-#: ../../Zotlabs/Module/Tokens.php:295
-#: ../../Zotlabs/Module/Article_edit.php:128 ../../Zotlabs/Module/Group.php:251
-#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:172
-#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1055
-#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Webpages.php:254
-#: ../../Zotlabs/Module/Admin/Accounts.php:320
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Permcats.php:261
-#: ../../Zotlabs/Module/Contactedit.php:667 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1185
-#: ../../Zotlabs/Module/Oauth2.php:193 ../../Zotlabs/Module/Thing.php:269
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749
-#: ../../Zotlabs/Lib/Apps.php:596 ../../Zotlabs/Lib/ThreadItem.php:200
-#: ../../Zotlabs/Storage/Browser.php:384
-msgid "Delete"
-msgstr ""
-
-#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:303
+#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:290
 msgid "Toggle Star Status"
 msgstr ""
 
@@ -5690,12 +6008,12 @@ msgid "Private Message"
 msgstr ""
 
 #: ../../include/conversation.php:751 ../../Zotlabs/Widget/Pinned.php:91
-#: ../../Zotlabs/Lib/ThreadItem.php:314
+#: ../../Zotlabs/Lib/ThreadItem.php:301
 msgid "Message signature validated"
 msgstr ""
 
 #: ../../include/conversation.php:752 ../../Zotlabs/Widget/Pinned.php:92
-#: ../../Zotlabs/Lib/ThreadItem.php:315
+#: ../../Zotlabs/Lib/ThreadItem.php:302
 msgid "Message signature incorrect"
 msgstr ""
 
@@ -5720,29 +6038,25 @@ msgid "Filed under:"
 msgstr ""
 
 #: ../../include/conversation.php:823 ../../Zotlabs/Widget/Pinned.php:135
-#: ../../Zotlabs/Lib/ThreadItem.php:466
+#: ../../Zotlabs/Lib/ThreadItem.php:453
 #, php-format
 msgid "from %s"
 msgstr ""
 
 #: ../../include/conversation.php:826 ../../Zotlabs/Widget/Pinned.php:138
-#: ../../Zotlabs/Lib/ThreadItem.php:469
+#: ../../Zotlabs/Lib/ThreadItem.php:456
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
 #: ../../include/conversation.php:827 ../../Zotlabs/Widget/Pinned.php:139
-#: ../../Zotlabs/Lib/ThreadItem.php:470
+#: ../../Zotlabs/Lib/ThreadItem.php:457
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/conversation.php:842
-msgid "View in context"
-msgstr ""
-
 #: ../../include/conversation.php:844 ../../Zotlabs/Module/Photos.php:1085
-#: ../../Zotlabs/Lib/ThreadItem.php:539
+#: ../../Zotlabs/Lib/ThreadItem.php:526
 msgid "Please wait"
 msgstr ""
 
@@ -5754,7 +6068,7 @@ msgstr ""
 msgid "Loading..."
 msgstr ""
 
-#: ../../include/conversation.php:950 ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../include/conversation.php:950 ../../Zotlabs/Lib/ThreadItem.php:318
 msgid "Conversation Features"
 msgstr ""
 
@@ -5882,7 +6196,7 @@ msgstr ""
 
 #: ../../include/conversation.php:1775 ../../include/taxonomy.php:670
 #: ../../include/channel.php:1774 ../../Zotlabs/Module/Photos.php:1142
-#: ../../Zotlabs/Lib/ThreadItem.php:272
+#: ../../Zotlabs/Lib/ThreadItem.php:259
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -5890,7 +6204,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/conversation.php:1778 ../../Zotlabs/Module/Photos.php:1147
-#: ../../Zotlabs/Lib/ThreadItem.php:277
+#: ../../Zotlabs/Lib/ThreadItem.php:264
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -6264,7 +6578,7 @@ msgstr ""
 msgid "wants"
 msgstr ""
 
-#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:334
 msgid "like"
 msgstr ""
 
@@ -6272,7 +6586,7 @@ msgstr ""
 msgid "likes"
 msgstr ""
 
-#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:335
 msgid "dislike"
 msgstr ""
 
@@ -6317,72 +6631,72 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:3305 ../../Zotlabs/Module/Share.php:104
+#: ../../include/items.php:3306 ../../Zotlabs/Module/Share.php:104
 #, php-format
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr ""
 
-#: ../../include/items.php:4397 ../../Zotlabs/Module/Group.php:62
+#: ../../include/items.php:4398 ../../Zotlabs/Module/Group.php:62
 #: ../../Zotlabs/Module/Group.php:206
 msgid "Privacy group not found."
 msgstr ""
 
-#: ../../include/items.php:4413
+#: ../../include/items.php:4414
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:4420
+#: ../../include/items.php:4421
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:4430
+#: ../../include/items.php:4431
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4432
+#: ../../include/items.php:4433
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:4778 ../../Zotlabs/Module/Cover_photo.php:297
+#: ../../include/items.php:4779 ../../Zotlabs/Module/Cover_photo.php:297
 msgid "female"
 msgstr ""
 
-#: ../../include/items.php:4779 ../../Zotlabs/Module/Cover_photo.php:298
+#: ../../include/items.php:4780 ../../Zotlabs/Module/Cover_photo.php:298
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../include/items.php:4780 ../../Zotlabs/Module/Cover_photo.php:299
+#: ../../include/items.php:4781 ../../Zotlabs/Module/Cover_photo.php:299
 msgid "male"
 msgstr ""
 
-#: ../../include/items.php:4781 ../../Zotlabs/Module/Cover_photo.php:300
+#: ../../include/items.php:4782 ../../Zotlabs/Module/Cover_photo.php:300
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../include/items.php:4783 ../../Zotlabs/Module/Cover_photo.php:302
+#: ../../include/items.php:4784 ../../Zotlabs/Module/Cover_photo.php:302
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../include/items.php:4785
+#: ../../include/items.php:4786
 msgid "profile photo"
 msgstr ""
 
-#: ../../include/items.php:4978
+#: ../../include/items.php:4983
 #, php-format
 msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/items.php:4978
+#: ../../include/items.php:4983
 msgctxt "edit_activity"
 msgid "Post"
 msgstr ""
 
-#: ../../include/items.php:4978
+#: ../../include/items.php:4983
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""
@@ -6566,25 +6880,6 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/menu.php:120 ../../include/channel.php:1530
-#: ../../include/channel.php:1534 ../../Zotlabs/Widget/Cdav.php:142
-#: ../../Zotlabs/Widget/Cdav.php:179 ../../Zotlabs/Module/Article_edit.php:97
-#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Oauth.php:171 ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:252
-#: ../../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:329
-#: ../../Zotlabs/Module/Connections.php:378
-#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176
-#: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:595
-#: ../../Zotlabs/Lib/ThreadItem.php:178
-msgid "Edit"
-msgstr ""
-
 #: ../../include/bbcode.php:233 ../../include/bbcode.php:928
 #: ../../include/bbcode.php:1549 ../../include/bbcode.php:1557
 msgid "Image/photo"
@@ -6651,11 +6946,6 @@ msgstr ""
 msgid "View summary"
 msgstr ""
 
-#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1235
-#: ../../Zotlabs/Lib/NativeWikiPage.php:624
-msgid "Different viewers will see this text differently"
-msgstr ""
-
 #: ../../include/bbcode.php:1525
 msgid "$1 wrote:"
 msgstr ""
@@ -6872,7 +7162,7 @@ msgid "cover photo"
 msgstr ""
 
 #: ../../include/channel.php:2610 ../../Zotlabs/Module/Rmagic.php:96
-#: ../../boot.php:1753
+#: ../../boot.php:1749
 msgid "Remote Authentication"
 msgstr ""
 
@@ -7009,24 +7299,6 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:40
-#: ../../Zotlabs/Widget/Wiki_pages.php:97
-msgid "Add new page"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:47
-#: ../../Zotlabs/Widget/Wiki_pages.php:104 ../../Zotlabs/Module/Dreport.php:130
-msgid "Options"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
-msgid "Wiki Pages"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_pages.php:102
-msgid "Page name"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:91
 #: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:793
 #: ../../Zotlabs/Module/Photos.php:1337
@@ -7041,13 +7313,13 @@ msgstr ""
 #: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Cdav.php:150
 #: ../../Zotlabs/Widget/Cdav.php:186 ../../Zotlabs/Widget/Portfolio.php:114
 #: ../../Zotlabs/Module/Embedphotos.php:189
-#: ../../Zotlabs/Module/Profile_photo.php:543
+#: ../../Zotlabs/Module/Profile_photo.php:547
 #: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:692
 #: ../../Zotlabs/Storage/Browser.php:540
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Tasklist.php:26
+#: ../../Zotlabs/Widget/Tasklist.php:31
 msgid "Tasks"
 msgstr ""
 
@@ -7055,35 +7327,35 @@ msgstr ""
 msgid "Chat Members"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:222
 msgid "I will attend"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:222
 msgid "I will not attend"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:222
 msgid "I might attend"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:236
 msgid "I agree"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:236
 msgid "I disagree"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:236
 msgid "I abstain"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:359
+#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:346
 msgid "Share This"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:359
+#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:346
 msgid "share"
 msgstr ""
 
@@ -7093,19 +7365,19 @@ msgid "View %s's profile - %s"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Pinned.php:130 ../../Zotlabs/Widget/Messages.php:107
-#: ../../Zotlabs/Lib/ThreadItem.php:450
+#: ../../Zotlabs/Lib/ThreadItem.php:437
 msgid "via"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:481
+#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:468
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:145 ../../Zotlabs/Lib/ThreadItem.php:483
+#: ../../Zotlabs/Widget/Pinned.php:145 ../../Zotlabs/Lib/ThreadItem.php:470
 msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Pinned.php:157 ../../Zotlabs/Lib/ThreadItem.php:507
+#: ../../Zotlabs/Widget/Pinned.php:157 ../../Zotlabs/Lib/ThreadItem.php:494
 msgid "Pinned post"
 msgstr ""
 
@@ -7265,27 +7537,6 @@ msgstr ""
 msgid "App Categories"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:29
-#: ../../Zotlabs/Lib/NativeWikiPage.php:583
-msgctxt "wiki_history"
-msgid "Message"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_page_history.php:30
-#: ../../Zotlabs/Lib/NativeWikiPage.php:584
-msgid "Date"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_page_history.php:31
-#: ../../Zotlabs/Module/Wiki.php:364 ../../Zotlabs/Lib/NativeWikiPage.php:585
-msgid "Revert"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_page_history.php:32
-#: ../../Zotlabs/Lib/NativeWikiPage.php:586
-msgid "Compare"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Hq_controls.php:24
 msgid "Toggle post editor"
 msgstr ""
@@ -7590,23 +7841,23 @@ msgstr ""
 msgid "New Member Links"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:35
+#: ../../Zotlabs/Widget/Notes.php:39
 msgid "Read mode"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:36
+#: ../../Zotlabs/Widget/Notes.php:40
 msgid "Edit mode"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:37
+#: ../../Zotlabs/Widget/Notes.php:41
 msgid "Editing"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:38
+#: ../../Zotlabs/Widget/Notes.php:42
 msgid "Saving"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:39
+#: ../../Zotlabs/Widget/Notes.php:43
 msgid "Saved"
 msgstr ""
 
@@ -7795,28 +8046,6 @@ msgstr ""
 msgid "Expires (yyyy-mm-dd)"
 msgstr ""
 
-#: ../../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:127
-msgid "Edit Article"
-msgstr ""
-
 #: ../../Zotlabs/Module/Attach_edit.php:69
 #: ../../Zotlabs/Module/Filestorage.php:109
 msgid "File not found."
@@ -8164,12 +8393,12 @@ msgstr ""
 msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:256
+#: ../../Zotlabs/Module/Search.php:252
 #, php-format
 msgid "Items tagged with: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:258
+#: ../../Zotlabs/Module/Search.php:254
 #, php-format
 msgid "Search results for: %s"
 msgstr ""
@@ -8301,7 +8530,7 @@ msgid "Site settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:391
-msgid "PHP version 7.1 or greater is required."
+msgid "PHP version 8.0 or greater is required."
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:392
@@ -8668,12 +8897,6 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:258
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:210
-#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Layouts.php:198
-msgid "View"
-msgstr ""
-
 #: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Hcard.php:37
 #: ../../Zotlabs/Module/Profile.php:62
 msgid "Posts and comments"
@@ -8694,7 +8917,7 @@ msgstr ""
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:358
+#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:318
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr ""
@@ -8777,10 +9000,6 @@ msgstr ""
 msgid "Click a channel to toggle membership"
 msgstr ""
 
-#: ../../Zotlabs/Module/Card_edit.php:129
-msgid "Edit Card"
-msgstr ""
-
 #: ../../Zotlabs/Module/Go.php:21
 msgid "This page is available only to site members"
 msgstr ""
@@ -9034,8 +9253,8 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:119
 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 ""
 
 #: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198
@@ -9283,32 +9502,32 @@ msgstr ""
 msgid "Access"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:749
+#: ../../Zotlabs/Module/Item.php:751
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1189
+#: ../../Zotlabs/Module/Item.php:1153
 msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1332
+#: ../../Zotlabs/Module/Item.php:1296
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1366
+#: ../../Zotlabs/Module/Item.php:1330
 msgid "Your comment is awaiting approval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1499
+#: ../../Zotlabs/Module/Item.php:1463
 msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1506
+#: ../../Zotlabs/Module/Item.php:1470
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1513
+#: ../../Zotlabs/Module/Item.php:1477
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -11155,11 +11374,6 @@ msgstr ""
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:137 ../../Zotlabs/Module/Profiles.php:853
-#: ../../Zotlabs/Module/Wiki.php:211
-msgid "Create New"
-msgstr ""
-
 #: ../../Zotlabs/Module/Manage.php:163
 msgid "Current Channel"
 msgstr ""
@@ -11429,11 +11643,11 @@ msgid ""
 "a> on any site containing your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:376
+#: ../../Zotlabs/Module/Display.php:336
 msgid "Article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:421
+#: ../../Zotlabs/Module/Display.php:381
 msgid "Item has been removed."
 msgstr ""
 
@@ -11958,10 +12172,6 @@ msgstr ""
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cards.php:110
-msgid "Add Card"
-msgstr ""
-
 #: ../../Zotlabs/Module/Directory.php:121
 msgid "No default suggestions were found."
 msgstr ""
@@ -12136,64 +12346,59 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:428
-#: ../../Zotlabs/Module/Profile_photo.php:493
+#: ../../Zotlabs/Module/Profile_photo.php:432
+#: ../../Zotlabs/Module/Profile_photo.php:497
 #: ../../Zotlabs/Module/Cover_photo.php:367
 #: ../../Zotlabs/Module/Cover_photo.php:382
 msgid "Photo not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:540
+#: ../../Zotlabs/Module/Profile_photo.php:544
 msgid ""
 "This profile photo will be visible to anybody on the internet and may be "
 "distributed to other websites."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:540
+#: ../../Zotlabs/Module/Profile_photo.php:544
 msgid ""
 "This profile photo will be visible only to channels with permission to view "
 "this profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:542
+#: ../../Zotlabs/Module/Profile_photo.php:546
 msgid "Use Photo for Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:542
+#: ../../Zotlabs/Module/Profile_photo.php:546
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:544
+#: ../../Zotlabs/Module/Profile_photo.php:548
 msgid "Reset to default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:547
-#: ../../Zotlabs/Module/Profile_photo.php:548
+#: ../../Zotlabs/Module/Profile_photo.php:551
+#: ../../Zotlabs/Module/Profile_photo.php:552
 #: ../../Zotlabs/Module/Cover_photo.php:426
 #: ../../Zotlabs/Module/Cover_photo.php:427
 msgid "Use a photo from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:553
-#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:402
-msgid "Choose a different album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:558
+#: ../../Zotlabs/Module/Profile_photo.php:562
 msgid "Select existing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:577
+#: ../../Zotlabs/Module/Profile_photo.php:581
 #: ../../Zotlabs/Module/Cover_photo.php:455
 msgid "Crop Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:578
+#: ../../Zotlabs/Module/Profile_photo.php:582
 #: ../../Zotlabs/Module/Cover_photo.php:456
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:580
+#: ../../Zotlabs/Module/Profile_photo.php:584
 msgid "Done editing"
 msgstr ""
 
@@ -12209,7 +12414,7 @@ msgstr ""
 msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:214
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:201
 msgid "Save to Folder"
 msgstr ""
 
@@ -12514,21 +12719,21 @@ msgstr ""
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:347
+#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:334
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:348
+#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:335
 msgid "I don't like this (toggle)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
-#: ../../Zotlabs/Lib/ThreadItem.php:862
+#: ../../Zotlabs/Lib/ThreadItem.php:849
 msgid "This is you"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150
-#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../Zotlabs/Lib/ThreadItem.php:280
+#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../Zotlabs/Lib/ThreadItem.php:267
 msgid "View all"
 msgstr ""
 
@@ -12544,12 +12749,12 @@ msgstr ""
 msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:527
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:514
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:528
+#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:515
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
@@ -12578,7 +12783,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1761
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1757
 msgid "Password Reset"
 msgstr ""
 
@@ -12912,10 +13117,6 @@ msgstr ""
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Articles.php:114
-msgid "Add Article"
-msgstr ""
-
 #: ../../Zotlabs/Module/Bookmarks.php:62
 msgid "Bookmark added"
 msgstr ""
@@ -13065,11 +13266,11 @@ msgstr ""
 msgid "Here you may enter personal notes to the recipient(s)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:572
+#: ../../Zotlabs/Module/Sse_bs.php:588
 msgid "Private forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sse_bs.php:572
+#: ../../Zotlabs/Module/Sse_bs.php:588
 msgid "Public forum"
 msgstr ""
 
@@ -14050,138 +14251,6 @@ msgstr ""
 msgid "System layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:130
-msgid "Error retrieving wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:137
-msgid "Error creating zip file export folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:188
-msgid "Error downloading wiki: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Storage/Browser.php:404
-msgid "Download"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:213
-msgid "Wiki name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:214
-msgid "Content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Storage/Browser.php:378
-msgid "Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:217
-msgid "Any&nbsp;type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:224
-msgid "Lock content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:225
-msgid "Create a status post for this wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:226
-msgid "Edit Wiki Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:271
-msgid "Wiki not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:297
-msgid "Rename page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:318
-msgid "Error retrieving page content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:326 ../../Zotlabs/Module/Wiki.php:328
-msgid "New page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:363
-msgid "Revision Comparison"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:371
-msgid "Short description of your changes (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:391
-msgid "New page name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:396
-msgid "Embed image from photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:407
-msgid "History"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:485
-msgid "Error creating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:492
-msgid "A wiki with this name already exists."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:505
-msgid "Wiki created, but error creating Home page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:512
-msgid "Error creating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:536
-msgid "Error updating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:555
-msgid "Error updating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:570
-msgid "Wiki delete permission denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:580
-msgid "Error deleting wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:613
-msgid "New page created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:739
-msgid "Cannot delete Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:815
-msgid "Current Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:815
-msgid "Selected Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:870
-msgid "You must be authenticated."
-msgstr ""
-
 #: ../../Zotlabs/Module/Home.php:104
 #, php-format
 msgid "Welcome to %s"
@@ -14290,17 +14359,18 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connedit.php:721
 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."
+"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/Connedit.php:722
 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."
+"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:723
@@ -14322,7 +14392,7 @@ msgid "System Notifications"
 msgstr ""
 
 #: ../../Zotlabs/Module/Notifications.php:111
-#: ../../Zotlabs/Lib/ThreadItem.php:520
+#: ../../Zotlabs/Lib/ThreadItem.php:507
 msgid "Mark all seen"
 msgstr ""
 
@@ -14495,32 +14565,32 @@ msgctxt "permcat"
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2354
+#: ../../Zotlabs/Lib/Activity.php:2258
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2357
+#: ../../Zotlabs/Lib/Activity.php:2261
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2363
+#: ../../Zotlabs/Lib/Activity.php:2267
 #, php-format
 msgid "Will attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2366
+#: ../../Zotlabs/Lib/Activity.php:2270
 #, php-format
 msgid "Will not attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2369
+#: ../../Zotlabs/Lib/Activity.php:2273
 #, php-format
 msgid "May attend %s's event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Activity.php:2372
+#: ../../Zotlabs/Lib/Activity.php:2276
 #, php-format
 msgid "May not attend %s's event"
 msgstr ""
@@ -14583,11 +14653,11 @@ msgstr ""
 msgid "commented on"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:158
+#: ../../Zotlabs/Lib/Enotify.php:158 ../../Zotlabs/Lib/Enotify.php:307
 msgid "liked"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:161
+#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:307
 msgid "disliked"
 msgstr ""
 
@@ -14605,7 +14675,7 @@ msgstr ""
 msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:226
+#: ../../Zotlabs/Lib/Enotify.php:226 ../../Zotlabs/Lib/Enotify.php:311
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
@@ -14625,9 +14695,9 @@ msgstr ""
 msgid "%1$s commented on an item/conversation you have been following"
 msgstr ""
 
-#: ../../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
+#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:331
+#: ../../Zotlabs/Lib/Enotify.php:347 ../../Zotlabs/Lib/Enotify.php:371
+#: ../../Zotlabs/Lib/Enotify.php:388 ../../Zotlabs/Lib/Enotify.php:401
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
@@ -14637,194 +14707,199 @@ msgstr ""
 msgid "Please visit %s to approve or reject this comment."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:306
-#, php-format
-msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:320
+#: ../../Zotlabs/Lib/Enotify.php:327
 #, php-format
 msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:321
+#: ../../Zotlabs/Lib/Enotify.php:328
 #, php-format
 msgid "%1$s liked an item/conversation you created"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:332
+#: ../../Zotlabs/Lib/Enotify.php:339
 #, php-format
 msgid "[$Projectname:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:334
+#: ../../Zotlabs/Lib/Enotify.php:341
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:336
+#: ../../Zotlabs/Lib/Enotify.php:343
 #, php-format
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:358
+#: ../../Zotlabs/Lib/Enotify.php:365
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:359
+#: ../../Zotlabs/Lib/Enotify.php:366
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/Enotify.php:367
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:371
+#: ../../Zotlabs/Lib/Enotify.php:378
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:372
+#: ../../Zotlabs/Lib/Enotify.php:379
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:373
+#: ../../Zotlabs/Lib/Enotify.php:380
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:388
+#: ../../Zotlabs/Lib/Enotify.php:395
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:389
+#: ../../Zotlabs/Lib/Enotify.php:396
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/Enotify.php:397
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:401
+#: ../../Zotlabs/Lib/Enotify.php:408
 msgid "[$Projectname:Notify] Introduction received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Zotlabs/Lib/Enotify.php:409
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:403
+#: ../../Zotlabs/Lib/Enotify.php:410
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424
+#: ../../Zotlabs/Lib/Enotify.php:413 ../../Zotlabs/Lib/Enotify.php:431
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:408
+#: ../../Zotlabs/Lib/Enotify.php:415
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:415
+#: ../../Zotlabs/Lib/Enotify.php:422
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Zotlabs/Lib/Enotify.php:423
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Zotlabs/Lib/Enotify.php:424
 #, php-format
 msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:422
+#: ../../Zotlabs/Lib/Enotify.php:429
 msgid "Name:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:423
+#: ../../Zotlabs/Lib/Enotify.php:430
 msgid "Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:426
+#: ../../Zotlabs/Lib/Enotify.php:433
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:651
+#: ../../Zotlabs/Lib/Enotify.php:658
 msgid "[$Projectname:Notify]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:819
+#: ../../Zotlabs/Lib/Enotify.php:826
 msgid "created a new poll"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:819
+#: ../../Zotlabs/Lib/Enotify.php:826
 msgid "created a new post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Zotlabs/Lib/Enotify.php:827
 #, php-format
 msgid "voted on %s's poll"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Zotlabs/Lib/Enotify.php:827
 #, php-format
 msgid "commented on %s's post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:824
+#: ../../Zotlabs/Lib/Enotify.php:831
 #, php-format
 msgid "repeated %s's post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:931
+#: ../../Zotlabs/Lib/Enotify.php:835
+#, php-format
+msgid "liked %s's post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:839
+#, php-format
+msgid "disliked %s's post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:843 ../../Zotlabs/Lib/Enotify.php:946
 msgid "shared a file with you"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:837
+#: ../../Zotlabs/Lib/Enotify.php:852
 #, php-format
 msgid "edited a post dated %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:840
+#: ../../Zotlabs/Lib/Enotify.php:855
 #, php-format
 msgid "edited a comment dated %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:916
+#: ../../Zotlabs/Lib/Enotify.php:931
 msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:946
+#: ../../Zotlabs/Lib/Enotify.php:961
 msgid "sent you a direct message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:953
+#: ../../Zotlabs/Lib/Enotify.php:968
 msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:956
+#: ../../Zotlabs/Lib/Enotify.php:971
 msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:966
+#: ../../Zotlabs/Lib/Enotify.php:981
 msgid "created an event"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:981
+#: ../../Zotlabs/Lib/Enotify.php:996
 msgid "status verified"
 msgstr ""
 
@@ -14876,14 +14951,6 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:146
-msgid "Wiki updated successfully"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWiki.php:206
-msgid "Wiki files deleted successfully"
-msgstr ""
-
 #: ../../Zotlabs/Lib/Apps.php:328
 msgid "Affinity Tool"
 msgstr ""
@@ -15020,59 +15087,6 @@ msgstr ""
 msgid "5. Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:43
-#: ../../Zotlabs/Lib/NativeWikiPage.php:111
-msgid "(No Title)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:125
-msgid "Wiki page create failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:139
-msgid "Wiki not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:150
-msgid "Destination name already exists"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:183
-#: ../../Zotlabs/Lib/NativeWikiPage.php:378
-msgid "Page not found"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:213
-msgid "Error reading page content"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:369
-#: ../../Zotlabs/Lib/NativeWikiPage.php:419
-#: ../../Zotlabs/Lib/NativeWikiPage.php:487
-#: ../../Zotlabs/Lib/NativeWikiPage.php:528
-msgid "Error reading wiki"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:406
-msgid "Page update failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:441
-msgid "Nothing deleted"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
-msgid "Compare: object not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:515
-msgid "Page updated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:523
-msgid "Wiki resource_id required for git commit"
-msgstr ""
-
 #: ../../Zotlabs/Lib/Libzotdir.php:163
 msgid "Directory Options"
 msgstr ""
@@ -15109,87 +15123,87 @@ msgstr ""
 msgid "Privacy conflict. Discretion advised."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:204 ../../Zotlabs/Storage/Browser.php:369
+#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Storage/Browser.php:369
 msgid "Admin Delete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Zotlabs/Lib/ThreadItem.php:336
 msgid "Reply on this comment"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Zotlabs/Lib/ThreadItem.php:336
 msgid "reply"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:349
+#: ../../Zotlabs/Lib/ThreadItem.php:336
 msgid "Reply to"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:369
+#: ../../Zotlabs/Lib/ThreadItem.php:356
 msgid "Delivery Report"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:388
+#: ../../Zotlabs/Lib/ThreadItem.php:375
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:389
+#: ../../Zotlabs/Lib/ThreadItem.php:376
 #, php-format
 msgid "%d unseen"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:439
+#: ../../Zotlabs/Lib/ThreadItem.php:426
 msgid "Forum"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:449
+#: ../../Zotlabs/Lib/ThreadItem.php:436
 msgid "to"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:451
+#: ../../Zotlabs/Lib/ThreadItem.php:438
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:452
+#: ../../Zotlabs/Lib/ThreadItem.php:439
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:480
+#: ../../Zotlabs/Lib/ThreadItem.php:467
 msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:498
+#: ../../Zotlabs/Lib/ThreadItem.php:485
 msgid "Go to previous comment"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:511
+#: ../../Zotlabs/Lib/ThreadItem.php:498
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:871
+#: ../../Zotlabs/Lib/ThreadItem.php:858
 msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:873
+#: ../../Zotlabs/Lib/ThreadItem.php:860
 msgid "Insert Link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:874
+#: ../../Zotlabs/Lib/ThreadItem.php:861
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:884
+#: ../../Zotlabs/Lib/ThreadItem.php:871
 msgid "Your full name (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:885
+#: ../../Zotlabs/Lib/ThreadItem.php:872
 msgid "Your email address (required)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:886
+#: ../../Zotlabs/Lib/ThreadItem.php:873
 msgid "Your website URL (optional)"
 msgstr ""
 
@@ -15518,40 +15532,40 @@ msgid ""
 "an existing folder."
 msgstr ""
 
-#: ../../boot.php:1728
+#: ../../boot.php:1724
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1746
+#: ../../boot.php:1742
 msgid "Email or nickname"
 msgstr ""
 
-#: ../../boot.php:1756
+#: ../../boot.php:1752
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1757
+#: ../../boot.php:1753
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1760
+#: ../../boot.php:1756
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2641
+#: ../../boot.php:2637
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2646
+#: ../../boot.php:2642
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2762
+#: ../../boot.php:2758
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2767
+#: ../../boot.php:2763
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 8b4926c3d..5f506ac21 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d::getLoader();
diff --git a/vendor/bshaffer/oauth2-server-php/.github/workflows/tests.yml b/vendor/bshaffer/oauth2-server-php/.github/workflows/tests.yml
new file mode 100644
index 000000000..958f65765
--- /dev/null
+++ b/vendor/bshaffer/oauth2-server-php/.github/workflows/tests.yml
@@ -0,0 +1,55 @@
+name: Test Suite
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      mongodb:
+        image: mongo
+        ports:
+          - 27017:27017
+      myriadb:
+        image: mariadb
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3808:3808
+          - 3306:3306
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: oauth2_server_php
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd="pg_isready -h localhost" --health-interval=10s --health-timeout=5s --health-retries=5
+    strategy:
+      matrix:
+        php: [ 7.1, 7.2, 7.3, 7.4, "8.0", 8.1 ]
+    name: "PHP ${{ matrix.php }} Unit Test"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: codecov/codecov-action@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mongodb, mbstring, intl, redis, pdo_mysql
+      - name: Install composer dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 10
+          max_attempts: 3
+          command: composer install
+      - name: Run PHPUnit
+        run: vendor/bin/phpunit -v
diff --git a/vendor/bshaffer/oauth2-server-php/composer.json b/vendor/bshaffer/oauth2-server-php/composer.json
index 272d20027..5b763a6f1 100644
--- a/vendor/bshaffer/oauth2-server-php/composer.json
+++ b/vendor/bshaffer/oauth2-server-php/composer.json
@@ -16,15 +16,16 @@
         "psr-0": { "OAuth2": "src/" }
     },
     "require":{
-        "php":">=5.3.9"
+        "php":">=7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0",
-        "aws/aws-sdk-php": "~2.8",
-        "firebase/php-jwt": "~2.2",
-        "predis/predis": "dev-master",
+        "phpunit/phpunit": "^7.5||^8.0",
+        "aws/aws-sdk-php": "^2.8",
+        "firebase/php-jwt": "^2.2",
+        "predis/predis": "^1.1",
         "thobbs/phpcassa": "dev-master",
-        "mongodb/mongodb": "^1.1"
+        "mongodb/mongodb": "^1.1",
+        "yoast/phpunit-polyfills": "^1.0"
     },
     "suggest": {
         "predis/predis": "Required to use Redis storage",
diff --git a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php
index 9e8148b6b..9e8148b6b 100644..100755
--- a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php
index fe3553b23..88f0d0da0 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php
@@ -133,7 +133,7 @@ class AuthorizeControllerTest extends TestCase
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
 
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertNotContains('error', $response->getHttpHeader('Location'));
+        $this->assertStringNotContainsString('error', $response->getHttpHeader('Location'));
     }
 
     public function testEnforceScope()
@@ -161,7 +161,7 @@ class AuthorizeControllerTest extends TestCase
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
 
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertNotContains('error', $response->getHttpHeader('Location'));
+        $this->assertStringNotContainsString('error', $response->getHttpHeader('Location'));
     }
 
     public function testInvalidRedirectUri()
@@ -227,7 +227,7 @@ class AuthorizeControllerTest extends TestCase
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
 
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertContains('code', $response->getHttpHeader('Location'));
+        $this->assertStringContainsString('code', $response->getHttpHeader('Location'));
     }
 
     public function testRedirectUriWithDifferentQueryAndExactMatchRequired()
@@ -263,7 +263,7 @@ class AuthorizeControllerTest extends TestCase
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
 
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertContains('code', $response->getHttpHeader('Location'));
+        $this->assertStringContainsString('code', $response->getHttpHeader('Location'));
     }
 
     public function testMultipleRedirectUris()
@@ -278,14 +278,14 @@ class AuthorizeControllerTest extends TestCase
 
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertContains('code', $response->getHttpHeader('Location'));
+        $this->assertStringContainsString('code', $response->getHttpHeader('Location'));
 
         // call again with different (but still valid) redirect URI
         $request->query['redirect_uri'] = 'http://morehazards.com';
 
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertContains('code', $response->getHttpHeader('Location'));
+        $this->assertStringContainsString('code', $response->getHttpHeader('Location'));
     }
 
     /**
@@ -303,7 +303,7 @@ class AuthorizeControllerTest extends TestCase
 
         $server->handleAuthorizeRequest($request, $response = new Response(), true);
         $this->assertEquals($response->getStatusCode(), 302);
-        $this->assertContains('state', $response->getHttpHeader('Location'));
+        $this->assertStringContainsString('state', $response->getHttpHeader('Location'));
         $this->assertStringStartsWith('http://brentertainment.com?code=', $response->getHttpHeader('Location'));
 
         $parts = parse_url($response->getHttpHeader('Location'));
@@ -421,7 +421,7 @@ class AuthorizeControllerTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertFalse(isset($parts['fake']));
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php
index c7e92c053..63a5d4036 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php
@@ -9,7 +9,7 @@ class FirebaseJwtTest extends TestCase
 {
     private $privateKey;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->privateKey = <<<EOD
 -----BEGIN RSA PRIVATE KEY-----
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php
index d73b4c923..376a922b1 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php
@@ -9,7 +9,7 @@ class JwtTest extends TestCase
 {
     private $privateKey;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->privateKey = <<<EOD
 -----BEGIN RSA PRIVATE KEY-----
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php
index e60023b3c..4f6d67b2c 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php
@@ -13,7 +13,7 @@ class JwtBearerTest extends TestCase
 {
     private $privateKey;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->privateKey = <<<EOD
 -----BEGIN RSA PRIVATE KEY-----
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
index 7b892c946..f08322bd4 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
@@ -29,7 +29,7 @@ class CodeIdTokenTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('query', $parts);
@@ -87,7 +87,7 @@ class CodeIdTokenTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('query', $parts);
@@ -133,7 +133,7 @@ class CodeIdTokenTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('query', $parts);
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
index a0df3a936..85f8abc86 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
@@ -52,7 +52,7 @@ class IdTokenTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('fragment', $parts);
@@ -110,7 +110,7 @@ class IdTokenTest extends TestCase
     {
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('fragment', $parts);
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
index 0573a9866..6d4cb14c3 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
@@ -31,7 +31,7 @@ class IdTokenTokenTest extends TestCase
 
         $this->assertEquals($response->getStatusCode(), 302);
         $location = $response->getHttpHeader('Location');
-        $this->assertNotContains('error', $location);
+        $this->assertStringNotContainsString('error', $location);
 
         $parts = parse_url($location);
         $this->assertArrayHasKey('fragment', $parts);
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php
index 172bc88fd..338f5cc93 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php
@@ -14,7 +14,7 @@ class ResponseTest extends TestCase
         ));
 
         $string = $response->getResponseBody('xml');
-        $this->assertContains('<response><foo>bar</foo><halland>oates</halland></response>', $string);
+        $this->assertStringContainsString('<response><foo>bar</foo><halland>oates</halland></response>', $string);
     }
 
     public function testSetRedirect()
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php
index 3106961e2..fab526a6f 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php
@@ -6,27 +6,26 @@ use OAuth2\Request\TestRequest;
 use OAuth2\ResponseType\AuthorizationCode;
 use OAuth2\Storage\Bootstrap;
 use PHPUnit\Framework\TestCase;
+use Yoast\PHPUnitPolyfills\Polyfills\ExpectPHPException;
 
 class ServerTest extends TestCase
 {
-    /**
-     * @expectedException LogicException OAuth2\Storage\ClientInterface
-     **/
+    use ExpectPHPException;
+
     public function testGetAuthorizeControllerWithNoClientStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\ClientInterface');
         // must set Client Storage
         $server = new Server();
         $server->getAuthorizeController();
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\AccessTokenInterface
-     **/
     public function testGetAuthorizeControllerWithNoAccessTokenStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\AccessTokenInterface');
         // must set AccessToken or AuthorizationCode
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
         $server->getAuthorizeController();
     }
 
@@ -34,8 +33,8 @@ class ServerTest extends TestCase
     {
         // must set AccessToken or AuthorizationCode
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
-        $server->addResponseType($this->getMock('OAuth2\ResponseType\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
+        $server->addResponseType($this->createMock('OAuth2\ResponseType\AccessTokenInterface'));
 
         $this->assertNotNull($server->getAuthorizeController());
     }
@@ -44,21 +43,19 @@ class ServerTest extends TestCase
     {
         // must set AccessToken or AuthorizationCode
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
-        $server->addResponseType($this->getMock('OAuth2\ResponseType\AuthorizationCodeInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
+        $server->addResponseType($this->createMock('OAuth2\ResponseType\AuthorizationCodeInterface'));
 
         $this->assertNotNull($server->getAuthorizeController());
     }
 
-    /**
-     * @expectedException LogicException allow_implicit
-     **/
     public function testGetAuthorizeControllerWithClientStorageAndAccessTokenStorageThrowsException()
     {
         // must set AuthorizationCode or AccessToken / implicit
+        $this->expectExceptionMessage('allow_implicit');
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'));
 
         $this->assertNotNull($server->getAuthorizeController());
     }
@@ -67,8 +64,8 @@ class ServerTest extends TestCase
     {
         // must set AuthorizationCode or AccessToken / implicit
         $server = new Server(array(), array('allow_implicit' => true));
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'));
 
         $this->assertNotNull($server->getAuthorizeController());
     }
@@ -77,63 +74,55 @@ class ServerTest extends TestCase
     {
         // must set AccessToken or AuthorizationCode
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\AuthorizationCodeInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\AuthorizationCodeInterface'));
 
         $this->assertNotNull($server->getAuthorizeController());
     }
 
-    /**
-     * @expectedException LogicException grant_types
-     **/
     public function testGetTokenControllerWithGrantTypeStorageThrowsException()
     {
+        $this->expectExceptionMessage('grant_types');
         $server = new Server();
         $server->getTokenController();
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\ClientCredentialsInterface
-     **/
     public function testGetTokenControllerWithNoClientCredentialsStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\ClientCredentialsInterface');
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\UserCredentialsInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\UserCredentialsInterface'));
         $server->getTokenController();
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\AccessTokenInterface
-     **/
     public function testGetTokenControllerWithNoAccessTokenStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\AccessTokenInterface');
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientCredentialsInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientCredentialsInterface'));
         $server->getTokenController();
     }
 
     public function testGetTokenControllerWithAccessTokenAndClientCredentialsStorage()
     {
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientCredentialsInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientCredentialsInterface'));
         $server->getTokenController();
     }
 
     public function testGetTokenControllerAccessTokenStorageAndClientCredentialsStorageAndGrantTypes()
     {
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientCredentialsInterface'));
-        $server->addGrantType($this->getMockBuilder('OAuth2\GrantType\AuthorizationCode')->disableOriginalConstructor()->getMock());
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientCredentialsInterface'));
+        $server->addGrantType($this->createMock('OAuth2\GrantType\AuthorizationCode'));
         $server->getTokenController();
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\AccessTokenInterface
-     **/
     public function testGetResourceControllerWithNoAccessTokenStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\AccessTokenInterface');
         $server = new Server();
         $server->getResourceController();
     }
@@ -141,41 +130,35 @@ class ServerTest extends TestCase
     public function testGetResourceControllerWithAccessTokenStorage()
     {
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'));
         $server->getResourceController();
     }
 
-    /**
-     * @expectedException InvalidArgumentException OAuth2\Storage\AccessTokenInterface
-     **/
     public function testAddingStorageWithInvalidClass()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\AccessTokenInterface');
         $server = new Server();
         $server->addStorage(new \StdClass());
     }
 
-    /**
-     * @expectedException InvalidArgumentException access_token
-     **/
     public function testAddingStorageWithInvalidKey()
     {
+        $this->expectExceptionMessage('access_token');
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'), 'nonexistant_storage');
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'), 'nonexistant_storage');
     }
 
-    /**
-     * @expectedException InvalidArgumentException OAuth2\Storage\AuthorizationCodeInterface
-     **/
     public function testAddingStorageWithInvalidKeyStorageCombination()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\AuthorizationCodeInterface');
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\AccessTokenInterface'), 'authorization_code');
+        $server->addStorage($this->createMock('OAuth2\Storage\AccessTokenInterface'), 'authorization_code');
     }
 
     public function testAddingStorageWithValidKeyOnlySetsThatKey()
     {
         $server = new Server();
-        $server->addStorage($this->getMock('OAuth2\Storage\Memory'), 'access_token');
+        $server->addStorage($this->createMock('OAuth2\Storage\Memory'), 'access_token');
 
         $reflection = new \ReflectionClass($server);
         $prop = $reflection->getProperty('storages');
@@ -191,7 +174,7 @@ class ServerTest extends TestCase
     public function testAddingClientStorageSetsClientCredentialsStorageByDefault()
     {
         $server = new Server();
-        $memory = $this->getMock('OAuth2\Storage\Memory');
+        $memory = $this->createMock('OAuth2\Storage\Memory');
         $server->addStorage($memory, 'client');
 
         $client_credentials = $server->getStorage('client_credentials');
@@ -202,7 +185,7 @@ class ServerTest extends TestCase
 
     public function testAddStorageWithNullValue()
     {
-        $memory = $this->getMock('OAuth2\Storage\Memory');
+        $memory = $this->createMock('OAuth2\Storage\Memory');
         $server = new Server($memory);
         $server->addStorage(null, 'refresh_token');
 
@@ -218,7 +201,7 @@ class ServerTest extends TestCase
 
     public function testNewServerWithNullStorageValue()
     {
-        $memory = $this->getMock('OAuth2\Storage\Memory');
+        $memory = $this->createMock('OAuth2\Storage\Memory');
         $server = new Server(array(
             'client_credentials' => $memory,
             'refresh_token'      => null,
@@ -237,7 +220,7 @@ class ServerTest extends TestCase
     public function testAddingClientCredentialsStorageSetsClientStorageByDefault()
     {
         $server = new Server();
-        $memory = $this->getMock('OAuth2\Storage\Memory');
+        $memory = $this->createMock('OAuth2\Storage\Memory');
         $server->addStorage($memory, 'client_credentials');
 
         $client = $server->getStorage('client');
@@ -249,10 +232,9 @@ class ServerTest extends TestCase
     public function testSettingClientStorageByDefaultDoesNotOverrideSetStorage()
     {
         $server = new Server();
-        $pdo = $this->getMockBuilder('OAuth2\Storage\Pdo')
-            ->disableOriginalConstructor()->getMock();
+        $pdo = $this->createMock('OAuth2\Storage\Pdo');
 
-        $memory = $this->getMock('OAuth2\Storage\Memory');
+        $memory = $this->createMock('OAuth2\Storage\Memory');
 
         $server->addStorage($pdo, 'client');
         $server->addStorage($memory, 'client_credentials');
@@ -266,7 +248,7 @@ class ServerTest extends TestCase
 
     public function testAddingResponseType()
     {
-        $storage = $this->getMock('OAuth2\Storage\Memory');
+        $storage = $this->createMock('OAuth2\Storage\Memory');
         $storage
           ->expects($this->any())
           ->method('getClientDetails')
@@ -323,7 +305,7 @@ class ServerTest extends TestCase
             'code' => 'testcode',
         ));
         // verify the mock clientAssertionType was called as expected
-        $clientAssertionType = $this->getMock('OAuth2\ClientAssertionType\ClientAssertionTypeInterface', array('validateRequest', 'getClientId'));
+        $clientAssertionType = $this->createMock('OAuth2\ClientAssertionType\ClientAssertionTypeInterface');
         $clientAssertionType
             ->expects($this->once())
             ->method('validateRequest')
@@ -420,98 +402,84 @@ class ServerTest extends TestCase
         $this->assertFalse($used_token, 'the refresh token used is no longer valid');
     }
 
-    /**
-     * @expectedException InvalidArgumentException OAuth2\ResponseType\AuthorizationCodeInterface
-     **/
     public function testAddingUnknownResponseTypeThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\ResponseType\AuthorizationCodeInterface');
         $server = new Server();
-        $server->addResponseType($this->getMock('OAuth2\ResponseType\ResponseTypeInterface'));
+        $server->addResponseType($this->createMock('OAuth2\ResponseType\ResponseTypeInterface'));
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\PublicKeyInterface
-     **/
     public function testUsingJwtAccessTokensWithoutPublicKeyStorageThrowsException()
     {
+        $this->expectExceptionMessage('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array(), array('use_jwt_access_tokens' => true));
-        $server->addGrantType($this->getMock('OAuth2\GrantType\GrantTypeInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientCredentialsInterface'));
-        $server->addStorage($this->getMock('OAuth2\Storage\ClientCredentialsInterface'));
+        $server->addGrantType($this->createMock('OAuth2\GrantType\GrantTypeInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientCredentialsInterface'));
+        $server->addStorage($this->createMock('OAuth2\Storage\ClientCredentialsInterface'));
 
         $server->getTokenController();
     }
 
     public function testUsingJustJwtAccessTokenStorageWithResourceControllerIsOkay()
     {
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($pubkey), array('use_jwt_access_tokens' => true));
 
         $this->assertNotNull($server->getResourceController());
         $this->assertInstanceOf('OAuth2\Storage\PublicKeyInterface', $server->getStorage('public_key'));
     }
 
-    /**
-     * @expectedException LogicException OAuth2\Storage\ClientInterface
-     **/
     public function testUsingJustJwtAccessTokenStorageWithAuthorizeControllerThrowsException()
     {
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $this->expectExceptionMessage('OAuth2\Storage\ClientInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($pubkey), array('use_jwt_access_tokens' => true));
         $this->assertNotNull($server->getAuthorizeController());
     }
 
-    /**
-     * @expectedException LogicException grant_types
-     **/
     public function testUsingJustJwtAccessTokenStorageWithTokenControllerThrowsException()
     {
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $this->expectExceptionMessage('grant_types');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($pubkey), array('use_jwt_access_tokens' => true));
         $server->getTokenController();
     }
 
     public function testUsingJwtAccessTokenAndClientStorageWithAuthorizeControllerIsOkay()
     {
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
         $server = new Server(array($pubkey, $client), array('use_jwt_access_tokens' => true, 'allow_implicit' => true));
         $this->assertNotNull($server->getAuthorizeController());
 
         $this->assertInstanceOf('OAuth2\ResponseType\JwtAccessToken', $server->getResponseType('token'));
     }
 
-    /**
-     * @expectedException LogicException UserClaims
-     **/
     public function testUsingOpenIDConnectWithoutUserClaimsThrowsException()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
+        $this->expectExceptionMessage('UserClaims');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
         $server = new Server($client, array('use_openid_connect' => true));
 
         $server->getAuthorizeController();
     }
 
-    /**
-     * @expectedException LogicException PublicKeyInterface
-     **/
     public function testUsingOpenIDConnectWithoutPublicKeyThrowsException()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OPenID\Storage\UserClaimsInterface');
+        $this->expectExceptionMessage('PublicKeyInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OPenID\Storage\UserClaimsInterface');
         $server = new Server(array($client, $userclaims), array('use_openid_connect' => true));
 
         $server->getAuthorizeController();
     }
 
-    /**
-     * @expectedException LogicException issuer
-     **/
     public function testUsingOpenIDConnectWithoutIssuerThrowsException()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $this->expectExceptionMessage('issuer');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($client, $userclaims, $pubkey), array('use_openid_connect' => true));
 
         $server->getAuthorizeController();
@@ -519,9 +487,9 @@ class ServerTest extends TestCase
 
     public function testUsingOpenIDConnectWithIssuerPublicKeyAndUserClaimsIsOkay()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($client, $userclaims, $pubkey), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy',
@@ -533,14 +501,12 @@ class ServerTest extends TestCase
         $this->assertNull($server->getResponseType('id_token token'));
     }
 
-    /**
-     * @expectedException LogicException OAuth2\ResponseType\AccessTokenInterface
-     **/
     public function testUsingOpenIDConnectWithAllowImplicitWithoutTokenStorageThrowsException()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $this->expectErrorMessage('OAuth2\ResponseType\AccessTokenInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($client, $userclaims, $pubkey), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy',
@@ -552,9 +518,9 @@ class ServerTest extends TestCase
 
     public function testUsingOpenIDConnectWithAllowImplicitAndUseJwtAccessTokensIsOkay()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
         $server = new Server(array($client, $userclaims, $pubkey), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy',
@@ -570,10 +536,10 @@ class ServerTest extends TestCase
 
     public function testUsingOpenIDConnectWithAllowImplicitAndAccessTokenStorageIsOkay()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
-        $token = $this->getMock('OAuth2\Storage\AccessTokenInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
+        $token = $this->createMock('OAuth2\Storage\AccessTokenInterface');
         $server = new Server(array($client, $userclaims, $pubkey, $token), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy',
@@ -588,17 +554,17 @@ class ServerTest extends TestCase
 
     public function testUsingOpenIDConnectWithAllowImplicitAndAccessTokenResponseTypeIsOkay()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
-        // $token = $this->getMock('OAuth2\Storage\AccessTokenInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
+        // $token = $this->createMock('OAuth2\Storage\AccessTokenInterface');
         $server = new Server(array($client, $userclaims, $pubkey), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy',
             'allow_implicit' => true,
         ));
 
-        $token = $this->getMock('OAuth2\ResponseType\AccessTokenInterface');
+        $token = $this->createMock('OAuth2\ResponseType\AccessTokenInterface');
         $server->addResponseType($token, 'token');
 
         $server->getAuthorizeController();
@@ -607,17 +573,15 @@ class ServerTest extends TestCase
         $this->assertInstanceOf('OAuth2\OpenID\ResponseType\IdTokenTokenInterface', $server->getResponseType('id_token token'));
     }
 
-    /**
-     * @expectedException LogicException OAuth2\OpenID\Storage\AuthorizationCodeInterface
-     **/
     public function testUsingOpenIDConnectWithAuthorizationCodeStorageThrowsException()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientCredentialsInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
-        $token = $this->getMock('OAuth2\Storage\AccessTokenInterface');
-        $authcode = $this->getMock('OAuth2\Storage\AuthorizationCodeInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientCredentialsInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
+        $token = $this->createMock('OAuth2\Storage\AccessTokenInterface');
+        $authcode = $this->createMock('OAuth2\Storage\AuthorizationCodeInterface');
 
+        $this->expectErrorMessage('OAuth2\OpenID\Storage\AuthorizationCodeInterface');
         $server = new Server(array($client, $userclaims, $pubkey, $token, $authcode), array(
             'use_openid_connect' => true,
             'issuer' => 'someguy'
@@ -630,11 +594,11 @@ class ServerTest extends TestCase
 
     public function testUsingOpenIDConnectWithOpenIDAuthorizationCodeStorageCreatesOpenIDAuthorizationCodeGrantType()
     {
-        $client = $this->getMock('OAuth2\Storage\ClientCredentialsInterface');
-        $userclaims = $this->getMock('OAuth2\OpenID\Storage\UserClaimsInterface');
-        $pubkey = $this->getMock('OAuth2\Storage\PublicKeyInterface');
-        $token = $this->getMock('OAuth2\Storage\AccessTokenInterface');
-        $authcode = $this->getMock('OAuth2\OpenID\Storage\AuthorizationCodeInterface');
+        $client = $this->createMock('OAuth2\Storage\ClientCredentialsInterface');
+        $userclaims = $this->createMock('OAuth2\OpenID\Storage\UserClaimsInterface');
+        $pubkey = $this->createMock('OAuth2\Storage\PublicKeyInterface');
+        $token = $this->createMock('OAuth2\Storage\AccessTokenInterface');
+        $authcode = $this->createMock('OAuth2\OpenID\Storage\AuthorizationCodeInterface');
 
         $server = new Server(array($client, $userclaims, $pubkey, $token, $authcode), array(
             'use_openid_connect' => true,
@@ -648,7 +612,7 @@ class ServerTest extends TestCase
 
     public function testMultipleValuedResponseTypeOrderDoesntMatter()
     {
-        $responseType = $this->getMock('OAuth2\OpenID\ResponseType\IdTokenTokenInterface');
+        $responseType = $this->createMock('OAuth2\OpenID\ResponseType\IdTokenTokenInterface');
         $server = new Server(array(), array(), array(), array(
             'token id_token' => $responseType,
         ));
@@ -659,7 +623,7 @@ class ServerTest extends TestCase
     public function testAddGrantTypeWithoutKey()
     {
         $server = new Server();
-        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->getMock('OAuth2\Storage\AuthorizationCodeInterface')));
+        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->createMock('OAuth2\Storage\AuthorizationCodeInterface')));
 
         $grantTypes = $server->getGrantTypes();
         $this->assertEquals('authorization_code', key($grantTypes));
@@ -668,7 +632,7 @@ class ServerTest extends TestCase
     public function testAddGrantTypeWithKey()
     {
         $server = new Server();
-        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->getMock('OAuth2\Storage\AuthorizationCodeInterface')), 'ac');
+        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->createMock('OAuth2\Storage\AuthorizationCodeInterface')), 'ac');
 
         $grantTypes = $server->getGrantTypes();
         $this->assertEquals('ac', key($grantTypes));
@@ -677,7 +641,7 @@ class ServerTest extends TestCase
     public function testAddGrantTypeWithKeyNotString()
     {
         $server = new Server();
-        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->getMock('OAuth2\Storage\AuthorizationCodeInterface')), 42);
+        $server->addGrantType(new \OAuth2\GrantType\AuthorizationCode($this->createMock('OAuth2\Storage\AuthorizationCodeInterface')), 42);
 
         $grantTypes = $server->getGrantTypes();
         $this->assertEquals('authorization_code', key($grantTypes));
diff --git a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php
index 4599f69bf..9a7630423 100644
--- a/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php
@@ -2,8 +2,12 @@
 
 namespace OAuth2\Storage;
 
+use Yoast\PHPUnitPolyfills\Polyfills\ExpectPHPException;
+
 class PdoTest extends BaseTest
 {
+    use ExpectPHPException;
+
     public function testCreatePdoStorageUsingPdoClass()
     {
         $dsn = sprintf('sqlite:%s', Bootstrap::getInstance()->getSqliteDir());
@@ -30,11 +34,9 @@ class PdoTest extends BaseTest
         $this->assertNotNull($storage->getClientDetails('oauth_test_client'));
     }
 
-    /**
-     * @expectedException InvalidArgumentException dsn
-     */
     public function testCreatePdoStorageWithoutDSNThrowsException()
     {
+        $this->expectErrorMessage('dsn');
         $config = array('username' => 'brent', 'password' => 'brentisaballer');
         $storage = new Pdo($config);
     }
diff --git a/vendor/bshaffer/oauth2-server-php/test/cleanup.php b/vendor/bshaffer/oauth2-server-php/test/cleanup.php
deleted file mode 100644
index 8663a901b..000000000
--- a/vendor/bshaffer/oauth2-server-php/test/cleanup.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__).'/../src/OAuth2/Autoloader.php');
-OAuth2\Autoloader::register();
-
-// register test classes
-OAuth2\Autoloader::register(dirname(__FILE__).'/lib');
-
-// register vendors if possible
-if (file_exists(__DIR__.'/../vendor/autoload.php')) {
-    require_once(__DIR__.'/../vendor/autoload.php');
-}
-
-// remove the dynamoDB database that was created for this build
-OAuth2\Storage\Bootstrap::getInstance()->cleanupTravisDynamoDb();
diff --git a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
index e841d3ad2..e841d3ad2 100644..100755
--- a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
diff --git a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
index 8e428f9b5..66c93ae5b 100644..100755
--- a/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
@@ -68,7 +68,7 @@ class Bootstrap
     public function getPostgresDriver()
     {
         try {
-            $pdo = new \PDO('pgsql:host=localhost;dbname=oauth2_server_php', 'postgres');
+            $pdo = new \PDO('pgsql:host=localhost;dbname=oauth2_server_php', 'postgres', 'postgres');
 
             return $pdo;
         } catch (\PDOException $e) {
@@ -118,7 +118,7 @@ class Bootstrap
         if (!$this->mysql) {
             $pdo = null;
             try {
-                $pdo = new \PDO('mysql:host=localhost;', 'root');
+                $pdo = new \PDO('mysql:host=localhost;', 'root', 'root');
             } catch (\PDOException $e) {
                 $this->mysql = new NullStorage('MySQL', 'Unable to connect to MySQL on root@localhost');
             }
@@ -352,11 +352,11 @@ class Bootstrap
 
     private function createPostgresDb()
     {
-        if (!`psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='postgres'"`) {
-            `createuser -s -r postgres`;
+        if (!`PGPASSWORD=postgres psql postgres -tAc "SELECT 1 FROM pg_roles WHERE rolname='postgres'" -h localhost -U postgres`) {
+            `PGPASSWORD=postgres createuser -s -r postgres -h localhost -U postgres`;
         }
 
-        `createdb -O postgres oauth2_server_php`;
+        `PGPASSWORD=postgres createdb -O postgres oauth2_server_php -h localhost -U postgres`;
     }
 
     private function populatePostgresDb(\PDO $pdo)
@@ -366,8 +366,8 @@ class Bootstrap
 
     private function removePostgresDb()
     {
-        if (trim(`psql -l | grep oauth2_server_php | wc -l`)) {
-            `dropdb oauth2_server_php`;
+        if (trim(`PGPASSWORD=postgres psql -l -h localhost -U postgres | grep oauth2_server_php | wc -l`)) {
+            `PGPASSWORD=postgres dropdb oauth2_server_php -h localhost -U postgres`;
         }
     }
 
@@ -945,21 +945,6 @@ class Bootstrap
         ));
     }
 
-    public function cleanupTravisDynamoDb($prefix = null)
-    {
-        if (is_null($prefix)) {
-            // skip this when not applicable
-            if (!$this->getEnvVar('TRAVIS') || self::DYNAMODB_PHP_VERSION != $this->getEnvVar('TRAVIS_PHP_VERSION')) {
-                return;
-            }
-
-            $prefix = sprintf('build_%s_', $this->getEnvVar('TRAVIS_JOB_NUMBER'));
-        }
-
-        $client = $this->getDynamoDbClient();
-        $this->deleteDynamoDb($client, $prefix);
-    }
-
     private function getEnvVar($var, $default = null)
     {
         return isset($_SERVER[$var]) ? $_SERVER[$var] : (getenv($var) ?: $default);
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index d50e0c9fc..41bc143c1 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -21,6 +21,8 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 09137bb42..27745d2c2 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,11 +2,10 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'Brick\\Math\\BigDecimal' => $vendorDir . '/brick/math/src/BigDecimal.php',
     'Brick\\Math\\BigInteger' => $vendorDir . '/brick/math/src/BigInteger.php',
     'Brick\\Math\\BigNumber' => $vendorDir . '/brick/math/src/BigNumber.php',
@@ -873,6 +872,39 @@ return array(
     'Sabre\\Xml\\XmlDeserializable' => $vendorDir . '/sabre/xml/lib/XmlDeserializable.php',
     'Sabre\\Xml\\XmlSerializable' => $vendorDir . '/sabre/xml/lib/XmlSerializable.php',
     'SimplePie' => $vendorDir . '/simplepie/simplepie/library/SimplePie.php',
+    'SimplePie\\Author' => $vendorDir . '/simplepie/simplepie/src/Author.php',
+    'SimplePie\\Cache' => $vendorDir . '/simplepie/simplepie/src/Cache.php',
+    'SimplePie\\Cache\\Base' => $vendorDir . '/simplepie/simplepie/src/Cache/Base.php',
+    'SimplePie\\Cache\\DB' => $vendorDir . '/simplepie/simplepie/src/Cache/DB.php',
+    'SimplePie\\Cache\\File' => $vendorDir . '/simplepie/simplepie/src/Cache/File.php',
+    'SimplePie\\Cache\\Memcache' => $vendorDir . '/simplepie/simplepie/src/Cache/Memcache.php',
+    'SimplePie\\Cache\\Memcached' => $vendorDir . '/simplepie/simplepie/src/Cache/Memcached.php',
+    'SimplePie\\Cache\\MySQL' => $vendorDir . '/simplepie/simplepie/src/Cache/MySQL.php',
+    'SimplePie\\Cache\\Redis' => $vendorDir . '/simplepie/simplepie/src/Cache/Redis.php',
+    'SimplePie\\Caption' => $vendorDir . '/simplepie/simplepie/src/Caption.php',
+    'SimplePie\\Category' => $vendorDir . '/simplepie/simplepie/src/Category.php',
+    'SimplePie\\Content\\Type\\Sniffer' => $vendorDir . '/simplepie/simplepie/src/Content/Type/Sniffer.php',
+    'SimplePie\\Copyright' => $vendorDir . '/simplepie/simplepie/src/Copyright.php',
+    'SimplePie\\Credit' => $vendorDir . '/simplepie/simplepie/src/Credit.php',
+    'SimplePie\\Enclosure' => $vendorDir . '/simplepie/simplepie/src/Enclosure.php',
+    'SimplePie\\Exception' => $vendorDir . '/simplepie/simplepie/src/Exception.php',
+    'SimplePie\\File' => $vendorDir . '/simplepie/simplepie/src/File.php',
+    'SimplePie\\Gzdecode' => $vendorDir . '/simplepie/simplepie/src/Gzdecode.php',
+    'SimplePie\\HTTP\\Parser' => $vendorDir . '/simplepie/simplepie/src/HTTP/Parser.php',
+    'SimplePie\\IRI' => $vendorDir . '/simplepie/simplepie/src/IRI.php',
+    'SimplePie\\Item' => $vendorDir . '/simplepie/simplepie/src/Item.php',
+    'SimplePie\\Locator' => $vendorDir . '/simplepie/simplepie/src/Locator.php',
+    'SimplePie\\Misc' => $vendorDir . '/simplepie/simplepie/src/Misc.php',
+    'SimplePie\\Net\\IPv6' => $vendorDir . '/simplepie/simplepie/src/Net/IPv6.php',
+    'SimplePie\\Parse\\Date' => $vendorDir . '/simplepie/simplepie/src/Parse/Date.php',
+    'SimplePie\\Parser' => $vendorDir . '/simplepie/simplepie/src/Parser.php',
+    'SimplePie\\Rating' => $vendorDir . '/simplepie/simplepie/src/Rating.php',
+    'SimplePie\\Registry' => $vendorDir . '/simplepie/simplepie/src/Registry.php',
+    'SimplePie\\Restriction' => $vendorDir . '/simplepie/simplepie/src/Restriction.php',
+    'SimplePie\\Sanitize' => $vendorDir . '/simplepie/simplepie/src/Sanitize.php',
+    'SimplePie\\SimplePie' => $vendorDir . '/simplepie/simplepie/src/SimplePie.php',
+    'SimplePie\\Source' => $vendorDir . '/simplepie/simplepie/src/Source.php',
+    'SimplePie\\XML\\Declaration\\Parser' => $vendorDir . '/simplepie/simplepie/src/XML/Declaration/Parser.php',
     'SimplePie_Author' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Author.php',
     'SimplePie_Cache' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache.php',
     'SimplePie_Cache_Base' => $vendorDir . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
@@ -1074,9 +1106,6 @@ return array(
     'Smarty_Template_Source' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
     'Smarty_Undefined_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
     'Smarty_Variable' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
-    'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
-    'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
-    'Symfony\\Polyfill\\Php80\\Php80' => $vendorDir . '/symfony/polyfill-php80/Php80.php',
     'Symfony\\Polyfill\\Php81\\Php81' => $vendorDir . '/symfony/polyfill-php81/Php81.php',
     'TPC_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
     'TP_yyStackEntry' => $vendorDir . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
@@ -1085,9 +1114,7 @@ return array(
     'Text_LanguageDetect_ISO639' => $vendorDir . '/pear/text_languagedetect/Text/LanguageDetect/ISO639.php',
     'Text_LanguageDetect_Parser' => $vendorDir . '/pear/text_languagedetect/Text/LanguageDetect/Parser.php',
     'URLify' => $vendorDir . '/jbroadway/urlify/URLify.php',
-    'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
     'UploadHandler' => $vendorDir . '/blueimp/jquery-file-upload/server/php/UploadHandler.php',
-    'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
     'Zotlabs\\Access\\AccessList' => $baseDir . '/Zotlabs/Access/AccessList.php',
     'Zotlabs\\Access\\PermissionLimits' => $baseDir . '/Zotlabs/Access/PermissionLimits.php',
     'Zotlabs\\Access\\PermissionRoles' => $baseDir . '/Zotlabs/Access/PermissionRoles.php',
@@ -1157,8 +1184,6 @@ return array(
     'Zotlabs\\Lib\\Libzotdir' => $baseDir . '/Zotlabs/Lib/Libzotdir.php',
     'Zotlabs\\Lib\\MarkdownSoap' => $baseDir . '/Zotlabs/Lib/MarkdownSoap.php',
     'Zotlabs\\Lib\\MessageFilter' => $baseDir . '/Zotlabs/Lib/MessageFilter.php',
-    'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php',
-    'Zotlabs\\Lib\\NativeWikiPage' => $baseDir . '/Zotlabs/Lib/NativeWikiPage.php',
     'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php',
     'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php',
     'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php',
@@ -1200,8 +1225,6 @@ return array(
     'Zotlabs\\Module\\Apporder' => $baseDir . '/Zotlabs/Module/Apporder.php',
     'Zotlabs\\Module\\Apps' => $baseDir . '/Zotlabs/Module/Apps.php',
     'Zotlabs\\Module\\Apschema' => $baseDir . '/Zotlabs/Module/Apschema.php',
-    'Zotlabs\\Module\\Article_edit' => $baseDir . '/Zotlabs/Module/Article_edit.php',
-    'Zotlabs\\Module\\Articles' => $baseDir . '/Zotlabs/Module/Articles.php',
     'Zotlabs\\Module\\Attach' => $baseDir . '/Zotlabs/Module/Attach.php',
     'Zotlabs\\Module\\Attach_edit' => $baseDir . '/Zotlabs/Module/Attach_edit.php',
     'Zotlabs\\Module\\Authorize' => $baseDir . '/Zotlabs/Module/Authorize.php',
@@ -1211,8 +1234,6 @@ return array(
     'Zotlabs\\Module\\Bookmarks' => $baseDir . '/Zotlabs/Module/Bookmarks.php',
     'Zotlabs\\Module\\Branchtopic' => $baseDir . '/Zotlabs/Module/Branchtopic.php',
     'Zotlabs\\Module\\Cal' => $baseDir . '/Zotlabs/Module/Cal.php',
-    'Zotlabs\\Module\\Card_edit' => $baseDir . '/Zotlabs/Module/Card_edit.php',
-    'Zotlabs\\Module\\Cards' => $baseDir . '/Zotlabs/Module/Cards.php',
     'Zotlabs\\Module\\Cdav' => $baseDir . '/Zotlabs/Module/Cdav.php',
     'Zotlabs\\Module\\Changeaddr' => $baseDir . '/Zotlabs/Module/Changeaddr.php',
     'Zotlabs\\Module\\Channel' => $baseDir . '/Zotlabs/Module/Channel.php',
@@ -1391,7 +1412,6 @@ return array(
     'Zotlabs\\Module\\Webpages' => $baseDir . '/Zotlabs/Module/Webpages.php',
     'Zotlabs\\Module\\Well_known' => $baseDir . '/Zotlabs/Module/Well_known.php',
     'Zotlabs\\Module\\Wfinger' => $baseDir . '/Zotlabs/Module/Wfinger.php',
-    'Zotlabs\\Module\\Wiki' => $baseDir . '/Zotlabs/Module/Wiki.php',
     'Zotlabs\\Module\\Xchan' => $baseDir . '/Zotlabs/Module/Xchan.php',
     'Zotlabs\\Module\\Xpoco' => $baseDir . '/Zotlabs/Module/Xpoco.php',
     'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php',
@@ -1675,6 +1695,7 @@ return array(
     'Zotlabs\\Update\\_1250' => $baseDir . '/Zotlabs/Update/_1250.php',
     'Zotlabs\\Update\\_1251' => $baseDir . '/Zotlabs/Update/_1251.php',
     'Zotlabs\\Update\\_1252' => $baseDir . '/Zotlabs/Update/_1252.php',
+    'Zotlabs\\Update\\_1253' => $baseDir . '/Zotlabs/Update/_1253.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',
@@ -1743,9 +1764,6 @@ return array(
     'Zotlabs\\Widget\\Tokens' => $baseDir . '/Zotlabs/Widget/Tokens.php',
     'Zotlabs\\Widget\\Vcard' => $baseDir . '/Zotlabs/Widget/Vcard.php',
     'Zotlabs\\Widget\\Website_portation_tools' => $baseDir . '/Zotlabs/Widget/Website_portation_tools.php',
-    'Zotlabs\\Widget\\Wiki_list' => $baseDir . '/Zotlabs/Widget/Wiki_list.php',
-    '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\\IHandler' => $baseDir . '/Zotlabs/Zot6/IHandler.php',
     'Zotlabs\\Zot6\\Receiver' => $baseDir . '/Zotlabs/Zot6/Receiver.php',
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 9f126fa7e..65808f1eb 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,7 +2,7 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
@@ -14,8 +14,6 @@ return array(
     '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php',
     '23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php',
     'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php',
-    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
     '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
     'e39a8b23c42d4e1452234d762b03835a' => $vendorDir . '/ramsey/uuid/src/functions.php',
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index d6d43282e..0876acc5f 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index c99f72dbb..03b61bfa7 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
@@ -10,8 +10,7 @@ return array(
     'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
     'Zotlabs\\' => array($baseDir . '/Zotlabs'),
     'Symfony\\Polyfill\\Php81\\' => array($vendorDir . '/symfony/polyfill-php81'),
-    'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
-    'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
+    'SimplePie\\' => array($vendorDir . '/simplepie/simplepie/src'),
     'Sabre\\Xml\\' => array($vendorDir . '/sabre/xml/lib'),
     'Sabre\\VObject\\' => array($vendorDir . '/sabre/vobject/lib'),
     'Sabre\\Uri\\' => array($vendorDir . '/sabre/uri/lib'),
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 602c3d547..1ee0b18ee 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -23,42 +23,19 @@ class ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d
         }
 
         spl_autoload_register(array('ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::getInitializer($loader));
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
+        $includeFiles = \Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire7b34d7e50a62201ec5d5e526a5b8b35d($fileIdentifier, $file);
         }
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 6a5ddf6d4..73eb5014a 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -15,8 +15,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
         '23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php',
         'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
-        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
         '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
         'e39a8b23c42d4e1452234d762b03835a' => __DIR__ . '/..' . '/ramsey/uuid/src/functions.php',
@@ -38,8 +36,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'S' => 
         array (
             'Symfony\\Polyfill\\Php81\\' => 23,
-            'Symfony\\Polyfill\\Php80\\' => 23,
-            'Symfony\\Polyfill\\Ctype\\' => 23,
+            'SimplePie\\' => 10,
             'Sabre\\Xml\\' => 10,
             'Sabre\\VObject\\' => 14,
             'Sabre\\Uri\\' => 10,
@@ -103,13 +100,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-php81',
         ),
-        'Symfony\\Polyfill\\Php80\\' => 
+        'SimplePie\\' => 
         array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-php80',
-        ),
-        'Symfony\\Polyfill\\Ctype\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
+            0 => __DIR__ . '/..' . '/simplepie/simplepie/src',
         ),
         'Sabre\\Xml\\' => 
         array (
@@ -224,7 +217,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
     );
 
     public static $classMap = array (
-        'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'Brick\\Math\\BigDecimal' => __DIR__ . '/..' . '/brick/math/src/BigDecimal.php',
         'Brick\\Math\\BigInteger' => __DIR__ . '/..' . '/brick/math/src/BigInteger.php',
         'Brick\\Math\\BigNumber' => __DIR__ . '/..' . '/brick/math/src/BigNumber.php',
@@ -1091,6 +1083,39 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Sabre\\Xml\\XmlDeserializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlDeserializable.php',
         'Sabre\\Xml\\XmlSerializable' => __DIR__ . '/..' . '/sabre/xml/lib/XmlSerializable.php',
         'SimplePie' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie.php',
+        'SimplePie\\Author' => __DIR__ . '/..' . '/simplepie/simplepie/src/Author.php',
+        'SimplePie\\Cache' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache.php',
+        'SimplePie\\Cache\\Base' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/Base.php',
+        'SimplePie\\Cache\\DB' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/DB.php',
+        'SimplePie\\Cache\\File' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/File.php',
+        'SimplePie\\Cache\\Memcache' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/Memcache.php',
+        'SimplePie\\Cache\\Memcached' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/Memcached.php',
+        'SimplePie\\Cache\\MySQL' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/MySQL.php',
+        'SimplePie\\Cache\\Redis' => __DIR__ . '/..' . '/simplepie/simplepie/src/Cache/Redis.php',
+        'SimplePie\\Caption' => __DIR__ . '/..' . '/simplepie/simplepie/src/Caption.php',
+        'SimplePie\\Category' => __DIR__ . '/..' . '/simplepie/simplepie/src/Category.php',
+        'SimplePie\\Content\\Type\\Sniffer' => __DIR__ . '/..' . '/simplepie/simplepie/src/Content/Type/Sniffer.php',
+        'SimplePie\\Copyright' => __DIR__ . '/..' . '/simplepie/simplepie/src/Copyright.php',
+        'SimplePie\\Credit' => __DIR__ . '/..' . '/simplepie/simplepie/src/Credit.php',
+        'SimplePie\\Enclosure' => __DIR__ . '/..' . '/simplepie/simplepie/src/Enclosure.php',
+        'SimplePie\\Exception' => __DIR__ . '/..' . '/simplepie/simplepie/src/Exception.php',
+        'SimplePie\\File' => __DIR__ . '/..' . '/simplepie/simplepie/src/File.php',
+        'SimplePie\\Gzdecode' => __DIR__ . '/..' . '/simplepie/simplepie/src/Gzdecode.php',
+        'SimplePie\\HTTP\\Parser' => __DIR__ . '/..' . '/simplepie/simplepie/src/HTTP/Parser.php',
+        'SimplePie\\IRI' => __DIR__ . '/..' . '/simplepie/simplepie/src/IRI.php',
+        'SimplePie\\Item' => __DIR__ . '/..' . '/simplepie/simplepie/src/Item.php',
+        'SimplePie\\Locator' => __DIR__ . '/..' . '/simplepie/simplepie/src/Locator.php',
+        'SimplePie\\Misc' => __DIR__ . '/..' . '/simplepie/simplepie/src/Misc.php',
+        'SimplePie\\Net\\IPv6' => __DIR__ . '/..' . '/simplepie/simplepie/src/Net/IPv6.php',
+        'SimplePie\\Parse\\Date' => __DIR__ . '/..' . '/simplepie/simplepie/src/Parse/Date.php',
+        'SimplePie\\Parser' => __DIR__ . '/..' . '/simplepie/simplepie/src/Parser.php',
+        'SimplePie\\Rating' => __DIR__ . '/..' . '/simplepie/simplepie/src/Rating.php',
+        'SimplePie\\Registry' => __DIR__ . '/..' . '/simplepie/simplepie/src/Registry.php',
+        'SimplePie\\Restriction' => __DIR__ . '/..' . '/simplepie/simplepie/src/Restriction.php',
+        'SimplePie\\Sanitize' => __DIR__ . '/..' . '/simplepie/simplepie/src/Sanitize.php',
+        'SimplePie\\SimplePie' => __DIR__ . '/..' . '/simplepie/simplepie/src/SimplePie.php',
+        'SimplePie\\Source' => __DIR__ . '/..' . '/simplepie/simplepie/src/Source.php',
+        'SimplePie\\XML\\Declaration\\Parser' => __DIR__ . '/..' . '/simplepie/simplepie/src/XML/Declaration/Parser.php',
         'SimplePie_Author' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Author.php',
         'SimplePie_Cache' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache.php',
         'SimplePie_Cache_Base' => __DIR__ . '/..' . '/simplepie/simplepie/library/SimplePie/Cache/Base.php',
@@ -1292,9 +1317,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Smarty_Template_Source' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_template_source.php',
         'Smarty_Undefined_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_undefined_variable.php',
         'Smarty_Variable' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_variable.php',
-        'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
-        'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
-        'Symfony\\Polyfill\\Php80\\Php80' => __DIR__ . '/..' . '/symfony/polyfill-php80/Php80.php',
         'Symfony\\Polyfill\\Php81\\Php81' => __DIR__ . '/..' . '/symfony/polyfill-php81/Php81.php',
         'TPC_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_configfileparser.php',
         'TP_yyStackEntry' => __DIR__ . '/..' . '/smarty/smarty/libs/sysplugins/smarty_internal_templateparser.php',
@@ -1303,9 +1325,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Text_LanguageDetect_ISO639' => __DIR__ . '/..' . '/pear/text_languagedetect/Text/LanguageDetect/ISO639.php',
         'Text_LanguageDetect_Parser' => __DIR__ . '/..' . '/pear/text_languagedetect/Text/LanguageDetect/Parser.php',
         'URLify' => __DIR__ . '/..' . '/jbroadway/urlify/URLify.php',
-        'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
         'UploadHandler' => __DIR__ . '/..' . '/blueimp/jquery-file-upload/server/php/UploadHandler.php',
-        'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
         'Zotlabs\\Access\\AccessList' => __DIR__ . '/../..' . '/Zotlabs/Access/AccessList.php',
         'Zotlabs\\Access\\PermissionLimits' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionLimits.php',
         'Zotlabs\\Access\\PermissionRoles' => __DIR__ . '/../..' . '/Zotlabs/Access/PermissionRoles.php',
@@ -1375,8 +1395,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Lib\\Libzotdir' => __DIR__ . '/../..' . '/Zotlabs/Lib/Libzotdir.php',
         'Zotlabs\\Lib\\MarkdownSoap' => __DIR__ . '/../..' . '/Zotlabs/Lib/MarkdownSoap.php',
         'Zotlabs\\Lib\\MessageFilter' => __DIR__ . '/../..' . '/Zotlabs/Lib/MessageFilter.php',
-        'Zotlabs\\Lib\\NativeWiki' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWiki.php',
-        'Zotlabs\\Lib\\NativeWikiPage' => __DIR__ . '/../..' . '/Zotlabs/Lib/NativeWikiPage.php',
         'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php',
         'Zotlabs\\Lib\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Lib/Permcat.php',
         'Zotlabs\\Lib\\PermissionDescription' => __DIR__ . '/../..' . '/Zotlabs/Lib/PermissionDescription.php',
@@ -1418,8 +1436,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Apporder' => __DIR__ . '/../..' . '/Zotlabs/Module/Apporder.php',
         'Zotlabs\\Module\\Apps' => __DIR__ . '/../..' . '/Zotlabs/Module/Apps.php',
         'Zotlabs\\Module\\Apschema' => __DIR__ . '/../..' . '/Zotlabs/Module/Apschema.php',
-        'Zotlabs\\Module\\Article_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Article_edit.php',
-        'Zotlabs\\Module\\Articles' => __DIR__ . '/../..' . '/Zotlabs/Module/Articles.php',
         'Zotlabs\\Module\\Attach' => __DIR__ . '/../..' . '/Zotlabs/Module/Attach.php',
         'Zotlabs\\Module\\Attach_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Attach_edit.php',
         'Zotlabs\\Module\\Authorize' => __DIR__ . '/../..' . '/Zotlabs/Module/Authorize.php',
@@ -1429,8 +1445,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Bookmarks' => __DIR__ . '/../..' . '/Zotlabs/Module/Bookmarks.php',
         'Zotlabs\\Module\\Branchtopic' => __DIR__ . '/../..' . '/Zotlabs/Module/Branchtopic.php',
         'Zotlabs\\Module\\Cal' => __DIR__ . '/../..' . '/Zotlabs/Module/Cal.php',
-        'Zotlabs\\Module\\Card_edit' => __DIR__ . '/../..' . '/Zotlabs/Module/Card_edit.php',
-        'Zotlabs\\Module\\Cards' => __DIR__ . '/../..' . '/Zotlabs/Module/Cards.php',
         'Zotlabs\\Module\\Cdav' => __DIR__ . '/../..' . '/Zotlabs/Module/Cdav.php',
         'Zotlabs\\Module\\Changeaddr' => __DIR__ . '/../..' . '/Zotlabs/Module/Changeaddr.php',
         'Zotlabs\\Module\\Channel' => __DIR__ . '/../..' . '/Zotlabs/Module/Channel.php',
@@ -1609,7 +1623,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Webpages' => __DIR__ . '/../..' . '/Zotlabs/Module/Webpages.php',
         'Zotlabs\\Module\\Well_known' => __DIR__ . '/../..' . '/Zotlabs/Module/Well_known.php',
         'Zotlabs\\Module\\Wfinger' => __DIR__ . '/../..' . '/Zotlabs/Module/Wfinger.php',
-        'Zotlabs\\Module\\Wiki' => __DIR__ . '/../..' . '/Zotlabs/Module/Wiki.php',
         'Zotlabs\\Module\\Xchan' => __DIR__ . '/../..' . '/Zotlabs/Module/Xchan.php',
         'Zotlabs\\Module\\Xpoco' => __DIR__ . '/../..' . '/Zotlabs/Module/Xpoco.php',
         'Zotlabs\\Module\\Xrd' => __DIR__ . '/../..' . '/Zotlabs/Module/Xrd.php',
@@ -1893,6 +1906,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Update\\_1250' => __DIR__ . '/../..' . '/Zotlabs/Update/_1250.php',
         'Zotlabs\\Update\\_1251' => __DIR__ . '/../..' . '/Zotlabs/Update/_1251.php',
         'Zotlabs\\Update\\_1252' => __DIR__ . '/../..' . '/Zotlabs/Update/_1252.php',
+        'Zotlabs\\Update\\_1253' => __DIR__ . '/../..' . '/Zotlabs/Update/_1253.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',
@@ -1961,9 +1975,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Widget\\Tokens' => __DIR__ . '/../..' . '/Zotlabs/Widget/Tokens.php',
         'Zotlabs\\Widget\\Vcard' => __DIR__ . '/../..' . '/Zotlabs/Widget/Vcard.php',
         'Zotlabs\\Widget\\Website_portation_tools' => __DIR__ . '/../..' . '/Zotlabs/Widget/Website_portation_tools.php',
-        'Zotlabs\\Widget\\Wiki_list' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_list.php',
-        '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\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot6/IHandler.php',
         'Zotlabs\\Zot6\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot6/Receiver.php',
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index 4b72402c9..91c7403d0 100644
--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -2,7 +2,7 @@
 
 // include_paths.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f4ab53044..38ca5fe16 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -133,29 +133,30 @@
         },
         {
             "name": "bshaffer/oauth2-server-php",
-            "version": "v1.11.1",
-            "version_normalized": "1.11.1.0",
+            "version": "v1.12.0",
+            "version_normalized": "1.12.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bshaffer/oauth2-server-php.git",
-                "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa"
+                "reference": "60254fc7fbb08ce56164faae9e075068adf914ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/5a0c8000d4763b276919e2106f54eddda6bc50fa",
-                "reference": "5a0c8000d4763b276919e2106f54eddda6bc50fa",
+                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/60254fc7fbb08ce56164faae9e075068adf914ef",
+                "reference": "60254fc7fbb08ce56164faae9e075068adf914ef",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~2.8",
-                "firebase/php-jwt": "~2.2",
+                "aws/aws-sdk-php": "^2.8",
+                "firebase/php-jwt": "^2.2",
                 "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^4.0",
-                "predis/predis": "dev-master",
-                "thobbs/phpcassa": "dev-master"
+                "phpunit/phpunit": "^7.5||^8.0",
+                "predis/predis": "^1.1",
+                "thobbs/phpcassa": "dev-master",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
                 "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
@@ -164,7 +165,7 @@
                 "predis/predis": "Required to use Redis storage",
                 "thobbs/phpcassa": "Required to use Cassandra storage"
             },
-            "time": "2018-12-04T00:29:32+00:00",
+            "time": "2022-04-19T17:09:11+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -190,6 +191,10 @@
                 "oauth",
                 "oauth2"
             ],
+            "support": {
+                "issues": "https://github.com/bshaffer/oauth2-server-php/issues",
+                "source": "https://github.com/bshaffer/oauth2-server-php/tree/v1.12.0"
+            },
             "install-path": "../bshaffer/oauth2-server-php"
         },
         {
@@ -653,17 +658,17 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.36",
-            "version_normalized": "2.0.36.0",
+            "version": "2.0.37",
+            "version_normalized": "2.0.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "a97547126396548c224703a267a30af1592be146"
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a97547126396548c224703a267a30af1592be146",
-                "reference": "a97547126396548c224703a267a30af1592be146",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
                 "shasum": ""
             },
             "require": {
@@ -680,7 +685,7 @@
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
                 "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
             },
-            "time": "2022-01-30T08:48:36+00:00",
+            "time": "2022-04-04T04:57:45+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -745,7 +750,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.36"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.37"
             },
             "funding": [
                 {
@@ -900,26 +905,25 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.2.3",
-            "version_normalized": "4.2.3.0",
+            "version": "4.3.1",
+            "version_normalized": "4.3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"
+                "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/8505afd4fea63b81a85d3b7b53ac3cb8dc347c28",
+                "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.8 || ^0.9",
+                "ext-ctype": "*",
                 "ext-json": "*",
-                "php": "^7.2 || ^8.0",
-                "ramsey/collection": "^1.0",
-                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-php80": "^1.14"
+                "php": "^8.0",
+                "ramsey/collection": "^1.0"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
@@ -954,24 +958,21 @@
                 "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
                 "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
             },
-            "time": "2021-09-25T23:10:38+00:00",
+            "time": "2022-03-27T21:42:02+00:00",
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "4.x-dev"
-                },
                 "captainhook": {
                     "force-install": true
                 }
             },
             "installation-source": "dist",
             "autoload": {
-                "psr-4": {
-                    "Ramsey\\Uuid\\": "src/"
-                },
                 "files": [
                     "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "Ramsey\\Uuid\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -985,7 +986,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.2.3"
+                "source": "https://github.com/ramsey/uuid/tree/4.3.1"
             },
             "funding": [
                 {
@@ -1464,17 +1465,17 @@
         },
         {
             "name": "simplepie/simplepie",
-            "version": "1.5.8",
-            "version_normalized": "1.5.8.0",
+            "version": "1.6.0",
+            "version_normalized": "1.6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/simplepie/simplepie.git",
-                "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1"
+                "reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/simplepie/simplepie/zipball/d1d80f37264c9f1ed7fa3434eca14d179cb689b1",
-                "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1",
+                "url": "https://api.github.com/repos/simplepie/simplepie/zipball/2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
+                "reference": "2bdbc51ed1010941c9c5f2cddca433e79665bfe1",
                 "shasum": ""
             },
             "require": {
@@ -1493,14 +1494,22 @@
                 "ext-mbstring": "",
                 "mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
             },
-            "time": "2021-12-24T02:53:50+00:00",
+            "time": "2022-04-21T11:05:19+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
+                "psr-4": {
+                    "SimplePie\\": "src"
+                },
                 "psr-0": {
                     "SimplePie": "library"
                 }
             },
+            "autoload-dev": {
+                "psr-4": {
+                    "SimplePie\\Tests\\Unit\\": "tests/Unit"
+                }
+            },
             "scripts": {
                 "test": [
                     "phpunit"
@@ -1535,24 +1544,24 @@
                 "rss"
             ],
             "support": {
-                "source": "https://github.com/simplepie/simplepie/tree/1.5.8",
+                "source": "https://github.com/simplepie/simplepie/tree/1.6.0",
                 "issues": "https://github.com/simplepie/simplepie/issues"
             },
             "install-path": "../simplepie/simplepie"
         },
         {
             "name": "smarty/smarty",
-            "version": "v4.1.0",
-            "version_normalized": "4.1.0.0",
+            "version": "v4.1.1",
+            "version_normalized": "4.1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/smarty-php/smarty.git",
-                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1"
+                "reference": "71036be8be02bf93735c47b0b745f722efbc729f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/9e0536de18b53ba193364291ef0303b0ab9903e1",
-                "reference": "9e0536de18b53ba193364291ef0303b0ab9903e1",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/71036be8be02bf93735c47b0b745f722efbc729f",
+                "reference": "71036be8be02bf93735c47b0b745f722efbc729f",
                 "shasum": ""
             },
             "require": {
@@ -1562,7 +1571,7 @@
                 "phpunit/phpunit": "^8.5 || ^7.5",
                 "smarty/smarty-lexer": "^3.1"
             },
-            "time": "2022-02-06T20:34:27+00:00",
+            "time": "2022-05-17T12:56:28+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1605,185 +1614,14 @@
             "support": {
                 "forum": "https://github.com/smarty-php/smarty/discussions",
                 "issues": "https://github.com/smarty-php/smarty/issues",
-                "source": "https://github.com/smarty-php/smarty/tree/v4.1.0"
+                "source": "https://github.com/smarty-php/smarty/tree/v4.1.1"
             },
             "install-path": "../smarty/smarty"
         },
         {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "time": "2021-10-20T20:35:02+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "install-path": "../symfony/polyfill-ctype"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "time": "2021-09-13T13:58:33+00:00",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "installation-source": "dist",
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "install-path": "../symfony/polyfill-php80"
-        },
-        {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
-            "version_normalized": "1.24.0.0",
+            "version": "v1.25.0",
+            "version_normalized": "1.25.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -1844,7 +1682,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
             },
             "funding": [
                 {
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index e0123da64..1b026f54d 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'application',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '6930c4e23b8b24f7436c0e265d751460bed9b1d2',
+        'reference' => '8ba47450970bab036664f03a558917c13d8c1574',
         'name' => 'zotlabs/hubzilla',
         'dev' => false,
     ),
@@ -29,12 +29,12 @@
             'dev_requirement' => false,
         ),
         'bshaffer/oauth2-server-php' => array(
-            'pretty_version' => 'v1.11.1',
-            'version' => '1.11.1.0',
+            'pretty_version' => 'v1.12.0',
+            'version' => '1.12.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../bshaffer/oauth2-server-php',
             'aliases' => array(),
-            'reference' => '5a0c8000d4763b276919e2106f54eddda6bc50fa',
+            'reference' => '60254fc7fbb08ce56164faae9e075068adf914ef',
             'dev_requirement' => false,
         ),
         'commerceguys/intl' => array(
@@ -110,12 +110,12 @@
             'dev_requirement' => false,
         ),
         'phpseclib/phpseclib' => array(
-            'pretty_version' => '2.0.36',
-            'version' => '2.0.36.0',
+            'pretty_version' => '2.0.37',
+            'version' => '2.0.37.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpseclib/phpseclib',
             'aliases' => array(),
-            'reference' => 'a97547126396548c224703a267a30af1592be146',
+            'reference' => 'c812fbb4d6b4d7f30235ab7298a12f09ba13b37c',
             'dev_requirement' => false,
         ),
         'psr/log' => array(
@@ -137,18 +137,18 @@
             'dev_requirement' => false,
         ),
         'ramsey/uuid' => array(
-            'pretty_version' => '4.2.3',
-            'version' => '4.2.3.0',
+            'pretty_version' => '4.3.1',
+            'version' => '4.3.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../ramsey/uuid',
             'aliases' => array(),
-            'reference' => 'fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df',
+            'reference' => '8505afd4fea63b81a85d3b7b53ac3cb8dc347c28',
             'dev_requirement' => false,
         ),
         'rhumsaa/uuid' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => '4.2.3',
+                0 => '4.3.1',
             ),
         ),
         'sabre/dav' => array(
@@ -206,44 +206,26 @@
             'dev_requirement' => false,
         ),
         'simplepie/simplepie' => array(
-            'pretty_version' => '1.5.8',
-            'version' => '1.5.8.0',
+            'pretty_version' => '1.6.0',
+            'version' => '1.6.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../simplepie/simplepie',
             'aliases' => array(),
-            'reference' => 'd1d80f37264c9f1ed7fa3434eca14d179cb689b1',
+            'reference' => '2bdbc51ed1010941c9c5f2cddca433e79665bfe1',
             'dev_requirement' => false,
         ),
         'smarty/smarty' => array(
-            'pretty_version' => 'v4.1.0',
-            'version' => '4.1.0.0',
+            'pretty_version' => 'v4.1.1',
+            'version' => '4.1.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../smarty/smarty',
             'aliases' => array(),
-            'reference' => '9e0536de18b53ba193364291ef0303b0ab9903e1',
-            'dev_requirement' => false,
-        ),
-        'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
-            'aliases' => array(),
-            'reference' => '30885182c981ab175d4d034db0f6f469898070ab',
-            'dev_requirement' => false,
-        ),
-        'symfony/polyfill-php80' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
-            'type' => 'library',
-            'install_path' => __DIR__ . '/../symfony/polyfill-php80',
-            'aliases' => array(),
-            'reference' => '57b712b08eddb97c762a8caa32c84e037892d2e9',
+            'reference' => '71036be8be02bf93735c47b0b745f722efbc729f',
             'dev_requirement' => false,
         ),
         'symfony/polyfill-php81' => array(
-            'pretty_version' => 'v1.24.0',
-            'version' => '1.24.0.0',
+            'pretty_version' => 'v1.25.0',
+            'version' => '1.25.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-php81',
             'aliases' => array(),
@@ -289,7 +271,7 @@
             'type' => 'application',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '6930c4e23b8b24f7436c0e265d751460bed9b1d2',
+            'reference' => '8ba47450970bab036664f03a558917c13d8c1574',
             'dev_requirement' => false,
         ),
     ),
diff --git a/vendor/phpseclib/phpseclib/BACKERS.md b/vendor/phpseclib/phpseclib/BACKERS.md
index 87e3fd2bd..558293b55 100644
--- a/vendor/phpseclib/phpseclib/BACKERS.md
+++ b/vendor/phpseclib/phpseclib/BACKERS.md
@@ -5,6 +5,7 @@ phpseclib ongoing development is made possible by [Tidelift](https://tidelift.co
 ## Backers
 
 - Allan Simon
+- [ChargeOver](https://chargeover.com/)
 - Raghu Veer Dendukuri
 - Zane Hooper
 - [Setasign](https://www.setasign.com/)
diff --git a/vendor/phpseclib/phpseclib/README.md b/vendor/phpseclib/phpseclib/README.md
index 61cc09907..9be5517e6 100644
--- a/vendor/phpseclib/phpseclib/README.md
+++ b/vendor/phpseclib/phpseclib/README.md
@@ -68,9 +68,10 @@ Need Support?
 
 ## Special Thanks
 
-Special Thanks to our Patreon sponsors!:
+Special Thanks to our $50+ sponsors!:
 
 - Allan Simon
+- [ChargeOver](https://chargeover.com/)
 
 ## Contributing
 
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
index 6335a2484..2c143940b 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
@@ -156,7 +156,7 @@ abstract class Base
      * @var string
      * @access private
      */
-    var $iv;
+    var $iv = '';
 
     /**
      * A "sliding" Initialization Vector
@@ -779,6 +779,7 @@ abstract class Base
                     }
                     return $ciphertext;
                 case self::MODE_OFB8:
+                    // OpenSSL has built in support for cfb8 but not ofb8
                     $ciphertext = '';
                     $len = strlen($plaintext);
                     $iv = $this->encryptIV;
@@ -795,8 +796,6 @@ abstract class Base
                     break;
                 case self::MODE_OFB:
                     return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
-                case self::MODE_OFB8:
-                    // OpenSSL has built in support for cfb8 but not ofb8
             }
         }
 
@@ -918,8 +917,8 @@ abstract class Base
                         $block = substr($plaintext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
                             $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $this->_increment_str($xor);
                         }
-                        $this->_increment_str($xor);
                         $key = $this->_string_shift($buffer['ciphertext'], $block_size);
                         $ciphertext.= $block ^ $key;
                     }
@@ -2079,6 +2078,13 @@ abstract class Base
      */
     function _increment_str(&$var)
     {
+        if (function_exists('sodium_increment')) {
+            $var = strrev($var);
+            sodium_increment($var);
+            $var = strrev($var);
+            return;
+        }
+
         for ($i = 4; $i <= strlen($var); $i+= 4) {
             $temp = substr($var, -$i, 4);
             switch ($temp) {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 59999d706..122d281a8 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -1405,11 +1405,18 @@ class RSA
                 unset($xml);
 
                 return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
-            // from PuTTY's SSHPUBK.C
+            // see PuTTY's SSHPUBK.C and https://tartarus.org/~simon/putty-snapshots/htmldoc/AppendixC.html
             case self::PRIVATE_FORMAT_PUTTY:
                 $components = array();
                 $key = preg_split('#\r\n|\r|\n#', $key);
-                $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
+                if ($this->_string_shift($key[0], strlen('PuTTY-User-Key-File-')) != 'PuTTY-User-Key-File-') {
+                    return false;
+                }
+                $version = (int) $this->_string_shift($key[0], 3); // should be either "2: " or "3: 0" prior to int casting
+                if ($version != 2 && $version != 3) {
+                    return false;
+                }
+                $type = rtrim($key[0]);
                 if ($type != 'ssh-rsa') {
                     return false;
                 }
@@ -1424,23 +1431,55 @@ class RSA
                 extract(unpack('Nlength', $this->_string_shift($public, 4)));
                 $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
 
-                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
-                $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
-
+                $offset = $publicLength + 4;
                 switch ($encryption) {
                     case 'aes256-cbc':
-                        $symkey = '';
-                        $sequence = 0;
-                        while (strlen($symkey) < 32) {
-                            $temp = pack('Na*', $sequence++, $this->password);
-                            $symkey.= pack('H*', sha1($temp));
-                        }
-                        $symkey = substr($symkey, 0, 32);
                         $crypto = new AES();
+                        switch ($version) {
+                            case 3:
+                                if (!function_exists('sodium_crypto_pwhash')) {
+                                    return false;
+                                }
+                                $flavour = trim(preg_replace('#Key-Derivation: (.*)#', '$1', $key[$offset++]));
+                                switch ($flavour) {
+                                    case 'Argon2i':
+                                        $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13;
+                                        break;
+                                    case 'Argon2id':
+                                        $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13;
+                                        break;
+                                    default:
+                                        return false;
+                                }
+                                $memory = trim(preg_replace('#Argon2-Memory: (\d+)#', '$1', $key[$offset++]));
+                                $passes = trim(preg_replace('#Argon2-Passes: (\d+)#', '$1', $key[$offset++]));
+                                $parallelism = trim(preg_replace('#Argon2-Parallelism: (\d+)#', '$1', $key[$offset++]));
+                                $salt = pack('H*', trim(preg_replace('#Argon2-Salt: ([0-9a-f]+)#', '$1', $key[$offset++])));
+
+                                $length = 80; // keylen + ivlen + mac_keylen
+                                $temp = sodium_crypto_pwhash($length, $this->password, $salt, $passes, $memory << 10, $flavour);
+
+                                $symkey = substr($temp, 0, 32);
+                                $symiv = substr($temp, 32, 16);
+                                break;
+                            case 2:
+                                $symkey = '';
+                                $sequence = 0;
+                                while (strlen($symkey) < 32) {
+                                    $temp = pack('Na*', $sequence++, $this->password);
+                                    $symkey.= pack('H*', sha1($temp));
+                                }
+                                $symkey = substr($symkey, 0, 32);
+                                $symiv = str_repeat("\0", 16);
+                        }
                 }
 
+                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$offset++]));
+                $private = base64_decode(implode('', array_map('trim', array_slice($key, $offset, $privateLength))));
+
                 if ($encryption != 'none') {
                     $crypto->setKey($symkey);
+                    $crypto->setIV($symiv);
                     $crypto->disablePadding();
                     $private = $crypto->decrypt($private);
                     if ($private === false) {
diff --git a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
index 2b25250bd..f65b587cb 100644
--- a/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
+++ b/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
@@ -234,11 +234,10 @@ class Agent
      * Signal that agent forwarding should
      * be requested when a channel is opened
      *
-     * @param Net_SSH2 $ssh
      * @return bool
      * @access public
      */
-    function startSSHForwarding($ssh)
+    function startSSHForwarding()
     {
         if ($this->forward_status == self::FORWARD_NONE) {
             $this->forward_status = self::FORWARD_REQUEST;
diff --git a/vendor/ramsey/uuid/LICENSE b/vendor/ramsey/uuid/LICENSE
index 5e06cf43b..2e8ef166d 100644
--- a/vendor/ramsey/uuid/LICENSE
+++ b/vendor/ramsey/uuid/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2021 Ben Ramsey <ben@benramsey.com>
+Copyright (c) 2012-2022 Ben Ramsey <ben@benramsey.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json
index 3f3b5ac42..112fabf10 100644
--- a/vendor/ramsey/uuid/composer.json
+++ b/vendor/ramsey/uuid/composer.json
@@ -1,23 +1,19 @@
 {
     "name": "ramsey/uuid",
-    "type": "library",
     "description": "A PHP library for generating and working with universally unique identifiers (UUIDs).",
+    "license": "MIT",
+    "type": "library",
     "keywords": [
         "uuid",
         "identifier",
         "guid"
     ],
-    "license": "MIT",
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.0",
+        "ext-ctype": "*",
         "ext-json": "*",
         "brick/math": "^0.8 || ^0.9",
-        "ramsey/collection": "^1.0",
-        "symfony/polyfill-ctype": "^1.8",
-        "symfony/polyfill-php80": "^1.14"
-    },
-    "replace": {
-        "rhumsaa/uuid": "self.version"
+        "ramsey/collection": "^1.0"
     },
     "require-dev": {
         "captainhook/captainhook": "^5.10",
@@ -41,6 +37,9 @@
         "squizlabs/php_codesniffer": "^3.5",
         "vimeo/psalm": "^4.9"
     },
+    "replace": {
+        "rhumsaa/uuid": "self.version"
+    },
     "suggest": {
         "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
         "ext-ctype": "Enables faster processing of character classification using ctype functions.",
@@ -49,17 +48,8 @@
         "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
         "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
     },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "4.x-dev"
-        },
-        "captainhook": {
-            "force-install": true
-        }
-    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Ramsey\\Uuid\\": "src/"
@@ -75,8 +65,20 @@
             "Ramsey\\Uuid\\Test\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "captainhook/plugin-composer": true,
+            "ergebnis/composer-normalize": true,
+            "phpstan/extension-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        },
+        "sort-packages": true
+    },
+    "extra": {
+        "captainhook": {
+            "force-install": true
+        }
+    },
     "scripts": {
         "analyze": [
             "@phpstan",
diff --git a/vendor/ramsey/uuid/src/Builder/BuilderCollection.php b/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
index 89fa1e3c8..9df3110fd 100644
--- a/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
+++ b/vendor/ramsey/uuid/src/Builder/BuilderCollection.php
@@ -27,6 +27,11 @@ use Traversable;
 /**
  * A collection of UuidBuilderInterface objects
  *
+ * @deprecated this class has been deprecated, and will be removed in 5.0.0. The use-case for this class comes from
+ *             a pre-`phpstan/phpstan` and pre-`vimeo/psalm` ecosystem, in which type safety had to be mostly enforced
+ *             at runtime: that is no longer necessary, now that you can safely verify your code to be correct, and use
+ *             more generic types like `iterable<T>` instead.
+ *
  * @extends AbstractCollection<UuidBuilderInterface>
  */
 class BuilderCollection extends AbstractCollection
diff --git a/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php b/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
index 470d2f755..8ab438a19 100644
--- a/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
+++ b/vendor/ramsey/uuid/src/Builder/FallbackBuilder.php
@@ -28,14 +28,14 @@ use Ramsey\Uuid\UuidInterface;
 class FallbackBuilder implements UuidBuilderInterface
 {
     /**
-     * @var BuilderCollection
+     * @var iterable<UuidBuilderInterface>
      */
     private $builders;
 
     /**
-     * @param BuilderCollection $builders An array of UUID builders
+     * @param iterable<UuidBuilderInterface> $builders An array of UUID builders
      */
-    public function __construct(BuilderCollection $builders)
+    public function __construct(iterable $builders)
     {
         $this->builders = $builders;
     }
diff --git a/vendor/ramsey/uuid/src/FeatureSet.php b/vendor/ramsey/uuid/src/FeatureSet.php
index a8ab2fdbb..668366601 100644
--- a/vendor/ramsey/uuid/src/FeatureSet.php
+++ b/vendor/ramsey/uuid/src/FeatureSet.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Ramsey\Uuid;
 
-use Ramsey\Uuid\Builder\BuilderCollection;
 use Ramsey\Uuid\Builder\FallbackBuilder;
 use Ramsey\Uuid\Builder\UuidBuilderInterface;
 use Ramsey\Uuid\Codec\CodecInterface;
@@ -43,7 +42,6 @@ use Ramsey\Uuid\Nonstandard\UuidBuilder as NonstandardUuidBuilder;
 use Ramsey\Uuid\Provider\Dce\SystemDceSecurityProvider;
 use Ramsey\Uuid\Provider\DceSecurityProviderInterface;
 use Ramsey\Uuid\Provider\Node\FallbackNodeProvider;
-use Ramsey\Uuid\Provider\Node\NodeProviderCollection;
 use Ramsey\Uuid\Provider\Node\RandomNodeProvider;
 use Ramsey\Uuid\Provider\Node\SystemNodeProvider;
 use Ramsey\Uuid\Provider\NodeProviderInterface;
@@ -350,10 +348,10 @@ class FeatureSet
             return new RandomNodeProvider();
         }
 
-        return new FallbackNodeProvider(new NodeProviderCollection([
+        return new FallbackNodeProvider([
             new SystemNodeProvider(),
             new RandomNodeProvider(),
-        ]));
+        ]);
     }
 
     /**
@@ -432,11 +430,10 @@ class FeatureSet
             return new GuidBuilder($this->numberConverter, $this->timeConverter);
         }
 
-        /** @psalm-suppress ImpureArgument */
-        return new FallbackBuilder(new BuilderCollection([
+        return new FallbackBuilder([
             new Rfc4122UuidBuilder($this->numberConverter, $this->timeConverter),
             new NonstandardUuidBuilder($this->numberConverter, $this->timeConverter),
-        ]));
+        ]);
     }
 
     /**
diff --git a/vendor/ramsey/uuid/src/Generator/CombGenerator.php b/vendor/ramsey/uuid/src/Generator/CombGenerator.php
index 49b09381d..25b7988ec 100644
--- a/vendor/ramsey/uuid/src/Generator/CombGenerator.php
+++ b/vendor/ramsey/uuid/src/Generator/CombGenerator.php
@@ -87,7 +87,7 @@ class CombGenerator implements RandomGeneratorInterface
      */
     public function generate(int $length): string
     {
-        if ($length < self::TIMESTAMP_BYTES || $length < 0) {
+        if ($length < self::TIMESTAMP_BYTES) {
             throw new InvalidArgumentException(
                 'Length must be a positive integer greater than or equal to ' . self::TIMESTAMP_BYTES
             );
diff --git a/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php
index 24ed56920..793ccd5a4 100644
--- a/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php
+++ b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php
@@ -21,6 +21,10 @@ use RandomLib\Generator;
  * RandomLibAdapter generates strings of random binary data using the
  * paragonie/random-lib library
  *
+ * @deprecated This class will be removed in 5.0.0. Use the default
+ *     RandomBytesGenerator or implement your own generator that implements
+ *     RandomGeneratorInterface.
+ *
  * @link https://packagist.org/packages/paragonie/random-lib paragonie/random-lib
  */
 class RandomLibAdapter implements RandomGeneratorInterface
diff --git a/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php b/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php
index 6d6240b7a..7ff407648 100644
--- a/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php
+++ b/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php
@@ -229,6 +229,6 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface
             return '';
         }
 
-        return trim((string) substr($sid, $lastHyphen + 1));
+        return trim(substr($sid, $lastHyphen + 1));
     }
 }
diff --git a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
index cad01045c..fe890cc4d 100644
--- a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
+++ b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php
@@ -25,14 +25,14 @@ use Ramsey\Uuid\Type\Hexadecimal;
 class FallbackNodeProvider implements NodeProviderInterface
 {
     /**
-     * @var NodeProviderCollection
+     * @var iterable<NodeProviderInterface>
      */
     private $nodeProviders;
 
     /**
-     * @param NodeProviderCollection $providers Array of node providers
+     * @param iterable<NodeProviderInterface> $providers Array of node providers
      */
-    public function __construct(NodeProviderCollection $providers)
+    public function __construct(iterable $providers)
     {
         $this->nodeProviders = $providers;
     }
diff --git a/vendor/ramsey/uuid/src/Provider/Node/NodeProviderCollection.php b/vendor/ramsey/uuid/src/Provider/Node/NodeProviderCollection.php
index 536cb6034..1b979faee 100644
--- a/vendor/ramsey/uuid/src/Provider/Node/NodeProviderCollection.php
+++ b/vendor/ramsey/uuid/src/Provider/Node/NodeProviderCollection.php
@@ -21,6 +21,11 @@ use Ramsey\Uuid\Type\Hexadecimal;
 /**
  * A collection of NodeProviderInterface objects
  *
+ * @deprecated this class has been deprecated, and will be removed in 5.0.0. The use-case for this class comes from
+ *             a pre-`phpstan/phpstan` and pre-`vimeo/psalm` ecosystem, in which type safety had to be mostly enforced
+ *             at runtime: that is no longer necessary, now that you can safely verify your code to be correct, and use
+ *             more generic types like `iterable<T>` instead.
+ *
  * @extends AbstractCollection<NodeProviderInterface>
  */
 class NodeProviderCollection extends AbstractCollection
diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php
index 945480ba4..5f0922b9c 100644
--- a/vendor/ramsey/uuid/src/Uuid.php
+++ b/vendor/ramsey/uuid/src/Uuid.php
@@ -476,10 +476,11 @@ class Uuid implements UuidInterface
      */
     public static function fromString(string $uuid): UuidInterface
     {
+        $uuid = strtolower($uuid);
         if (! self::$factoryReplaced && preg_match(LazyUuidFromString::VALID_REGEX, $uuid) === 1) {
             assert($uuid !== '');
 
-            return new LazyUuidFromString(strtolower($uuid));
+            return new LazyUuidFromString($uuid);
         }
 
         return self::getFactory()->fromString($uuid);
diff --git a/vendor/simplepie/simplepie/.editorconfig b/vendor/simplepie/simplepie/.editorconfig
new file mode 100644
index 000000000..ba48d7f1d
--- /dev/null
+++ b/vendor/simplepie/simplepie/.editorconfig
@@ -0,0 +1,20 @@
+# https://EditorConfig.org
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{css,html,js,json,php,sql}]
+indent_style = tab
+
+[*.{markdown,md}]
+indent_size = 4
+indent_style = space
+max_line_length = off
+trim_trailing_whitespace = false
+
+[*.{yaml,yml}]
+indent_size = 2
+indent_style = space
diff --git a/vendor/simplepie/simplepie/CHANGELOG.md b/vendor/simplepie/simplepie/CHANGELOG.md
index c9efdb476..800c8b385 100644
--- a/vendor/simplepie/simplepie/CHANGELOG.md
+++ b/vendor/simplepie/simplepie/CHANGELOG.md
@@ -5,7 +5,37 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/simplepie/simplepie/compare/1.5.7...master)
+## [Unreleased](https://github.com/simplepie/simplepie/compare/1.6.0...master)
+
+## [1.6.0](https://github.com/simplepie/simplepie/compare/1.5.8...1.6.0) - 2022-04-21
+
+### Added
+
+- New methods `SimplePie::rename_attributes()` and `SimplePie_Sanitize::rename_attributes()` allow renaming attributes by @math-GH in [#717](https://github.com/simplepie/simplepie/pull/717)
+- Add audio, video @src elements/attribute for URL resolution by @rdalverny in [#716](https://github.com/simplepie/simplepie/pull/716)
+- Added new namespaced aliases and PSR-4 support for every class by @Art4 in [#711](https://github.com/simplepie/simplepie/pull/711)
+- Add .editorconfig by @Alkarex in [#724](https://github.com/simplepie/simplepie/pull/724)
+- Upload compiled file as release asset by @Art4 in [#725](https://github.com/simplepie/simplepie/pull/725)
+
+### Changed
+
+- GH Actions: version update for ramsey/composer-install by @jrfnl in [#713](https://github.com/simplepie/simplepie/pull/713)
+
+### Fixed
+
+- Bugfix in MySQL cache by @Art4 in [#720](https://github.com/simplepie/simplepie/pull/720)
+- Re-enable xml:base for all supported RSS formats by @Alkarex in [#723](https://github.com/simplepie/simplepie/pull/723)
+
+## [1.5.8](https://github.com/simplepie/simplepie/compare/1.5.7...1.5.8) - 2021-12-24
+
+### Changed
+
+- Update CHANGELOG.md, follow keepachangelog format by @Art4 in [#709](https://github.com/simplepie/simplepie/pull/709)
+
+### Fixed
+
+- Fix a small typo in the error() function Docblock by @audrasjb in [#712](https://github.com/simplepie/simplepie/pull/712)
+- Fix/708 version bump for constant `SIMPLEPIE_VERSION` for 1.5.8 release by @faisal-alvi in [#710](https://github.com/simplepie/simplepie/pull/710)
 
 ## [1.5.7](https://github.com/simplepie/simplepie/compare/1.5.6...1.5.7) - 2021-12-19
 
@@ -41,7 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * PHP 7.4/8.0: curly brace array access deprecated & removed [#655](https://github.com/simplepie/simplepie/pull/655)
 * PHP 8.0: required parameters are no longer allowed after optional parameters [#656](https://github.com/simplepie/simplepie/pull/656)
 * Fix permanent_url for HTTP 301 [#660](https://github.com/simplepie/simplepie/pull/660)
-* Fix typo in MIME type in Content_Type_Sniffer [#661](https://github.com/simplepie/simplepie/pull/661) 
+* Fix typo in MIME type in Content_Type_Sniffer [#661](https://github.com/simplepie/simplepie/pull/661)
 
 ## [1.5.5](https://github.com/simplepie/simplepie/compare/1.5.4...1.5.5) - 2020-05-01
 
@@ -118,13 +148,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Use the latest HHVM version in testing (3.15.2). [#480](https://github.com/simplepie/simplepie/pull/480)
 * Added PHPUnit as a `dev-dependency` in Composer. [#463](https://github.com/simplepie/simplepie/pull/463)
 * Added `mf2/mf2` as a suggestion in Composer for use with microformats. [#491](https://github.com/simplepie/simplepie/pull/491)
-* Fixed misspelled occurrences of "separated". [#459](https://github.com/simplepie/simplepie/pull/459) 
+* Fixed misspelled occurrences of "separated". [#459](https://github.com/simplepie/simplepie/pull/459)
 * Improvements to the compatibility test and error messages. [#488](https://github.com/simplepie/simplepie/pull/488)
 
 ## [1.4.2](https://github.com/simplepie/simplepie/compare/1.4.1...1.4.2) - 2016-06-14
 
 * Fixed a bug with IRI parsing.
-* More cleanly separates discovery of microformats and parsing when php-mf2 is not present. 
+* More cleanly separates discovery of microformats and parsing when php-mf2 is not present.
 
 ## [1.4.1](https://github.com/simplepie/simplepie/compare/1.4.0...1.4.1) - 2016-06-02
 
@@ -147,7 +177,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added support for `application/x-rss+xml` in `SimplePie_Locator`. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Added photo de-duping in microformats. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Added decoding for special characters in MAYBE_HTML. [#400](https://github.com/simplepie/simplepie/pull/400)
-* Added `SimplePie_Exception` for internally reporting errors. Also, use this to show an error when trying to load the class instead of causing a failure. [#241](https://github.com/simplepie/simplepie/pull/241) 
+* Added `SimplePie_Exception` for internally reporting errors. Also, use this to show an error when trying to load the class instead of causing a failure. [#241](https://github.com/simplepie/simplepie/pull/241)
 * Added sanitization of the `</html>` and `</body>` tags. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Added support for media thumbnails through `SimplePie_Item->get_thumbnail()`. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Added the `feed_url` to a returned error message. [#348](https://github.com/simplepie/simplepie/pull/348)
@@ -170,7 +200,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed an error caused when trying to instantiate a `SimplePie_File` object with a bad URI. [#272](https://github.com/simplepie/simplepie/pull/272)
 * Fixed a PHP notice that occurs when a date starts with `(`. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Fixed uninitialized string offeset PHP notices. [#353](https://github.com/simplepie/simplepie/pull/353)
-* Fixed call to non-existent property in Memcache. [#311](https://github.com/simplepie/simplepie/pull/311) 
+* Fixed call to non-existent property in Memcache. [#311](https://github.com/simplepie/simplepie/pull/311)
 * Fixed a bug where MySQL statements were not being passed thorugh `prepare()`. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Fixed an instance where an error message in `SimplePie` was not being triggered correctly. [#348](https://github.com/simplepie/simplepie/pull/348)
 * Fixed a bug with Russian feeds. [#348](https://github.com/simplepie/simplepie/pull/348)
diff --git a/vendor/simplepie/simplepie/README.markdown b/vendor/simplepie/simplepie/README.markdown
index 5522b7b72..f54b07736 100644
--- a/vendor/simplepie/simplepie/README.markdown
+++ b/vendor/simplepie/simplepie/README.markdown
@@ -38,8 +38,9 @@ What comes in the package?
 Since SimplePie 1.3, we've split the classes into separate files to make it easier
 to maintain and use.
 
-If you'd like a single monolithic file, you can run `php build/compile.php` to
-generate `SimplePie.compiled.php`.
+If you'd like a single monolithic file, see the assets in the
+[releases](https://github.com/simplepie/simplepie/releases), or you can
+run `php build/compile.php` to generate `SimplePie.compiled.php` yourself.
 
 To start the demo
 -----------------
diff --git a/vendor/simplepie/simplepie/composer.json b/vendor/simplepie/simplepie/composer.json
index 83efa2d82..ca9ec8363 100644
--- a/vendor/simplepie/simplepie/composer.json
+++ b/vendor/simplepie/simplepie/composer.json
@@ -40,10 +40,18 @@
 		"mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
 	},
 	"autoload": {
+		"psr-4": {
+			"SimplePie\\": "src"
+		},
 		"psr-0": {
 			"SimplePie": "library"
 		}
     },
+    "autoload-dev": {
+        "psr-4": {
+            "SimplePie\\Tests\\Unit\\": "tests/Unit"
+        }
+    },
     "config": {
         "bin-dir": "bin"
     },
diff --git a/vendor/simplepie/simplepie/library/SimplePie.php b/vendor/simplepie/simplepie/library/SimplePie.php
index 29c8ece01..2ae78c359 100755
--- a/vendor/simplepie/simplepie/library/SimplePie.php
+++ b/vendor/simplepie/simplepie/library/SimplePie.php
@@ -33,7 +33,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.5.8
+ * @version 1.6.0
  * @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
  * @author Ryan Parman
  * @author Sam Sneddon
@@ -50,7 +50,7 @@ define('SIMPLEPIE_NAME', 'SimplePie');
 /**
  * SimplePie Version
  */
-define('SIMPLEPIE_VERSION', '1.5.8');
+define('SIMPLEPIE_VERSION', '1.6.0');
 
 /**
  * SimplePie Build
@@ -651,6 +651,13 @@ class SimplePie
 	public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
 
 	/**
+	 * @var array Stores the default attributes to be renamed by rename_attributes().
+	 * @see SimplePie::rename_attributes()
+	 * @access private
+	 */
+	public $rename_attributes = array();
+
+	/**
 	 * @var bool Should we throw exceptions, or use the old-style error property?
 	 * @access private
 	 */
@@ -1223,6 +1230,15 @@ class SimplePie
 		$this->sanitize->encode_instead_of_strip($enable);
 	}
 
+	public function rename_attributes($attribs = '')
+	{
+		if ($attribs === '')
+		{
+			$attribs = $this->rename_attributes;
+		}
+		$this->sanitize->rename_attributes($attribs);
+	}
+
 	public function strip_attributes($attribs = '')
 	{
 		if ($attribs === '')
@@ -2199,7 +2215,7 @@ class SimplePie
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if (!empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -3316,3 +3332,5 @@ class SimplePie
 		}
 	}
 }
+
+class_alias('SimplePie', 'SimplePie\SimplePie', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Author.php b/vendor/simplepie/simplepie/library/SimplePie/Author.php
index 563932f4c..3baadee62 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Author.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Author.php
@@ -147,3 +147,5 @@ class SimplePie_Author
 		return null;
 	}
 }
+
+class_alias('SimplePie_Author', 'SimplePie\Author', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache.php b/vendor/simplepie/simplepie/library/SimplePie/Cache.php
index 9c5577d95..88d811660 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache.php
@@ -132,3 +132,5 @@ class SimplePie_Cache
 		return $params;
 	}
 }
+
+class_alias('SimplePie_Cache', 'SimplePie\Cache', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
index 522ff7e10..29eb0594b 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Base.php
@@ -111,3 +111,5 @@ interface SimplePie_Cache_Base
 	 */
 	public function unlink();
 }
+
+class_alias('SimplePie_Cache_Base', 'SimplePie\Cache\Base', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
index 74d57b8da..3dca8e5db 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/DB.php
@@ -134,3 +134,5 @@ abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
 		return array(serialize($data->data), $items_by_id);
 	}
 }
+
+class_alias('SimplePie_Cache_DB', 'SimplePie\Cache\DB', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
index 03758e923..db30e7a0f 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/File.php
@@ -162,3 +162,5 @@ class SimplePie_Cache_File implements SimplePie_Cache_Base
 		return false;
 	}
 }
+
+class_alias('SimplePie_Cache_File', 'SimplePie\Cache\File', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
index caf785275..2cc37f907 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcache.php
@@ -178,3 +178,5 @@ class SimplePie_Cache_Memcache implements SimplePie_Cache_Base
 		return $this->cache->delete($this->name, 0);
 	}
 }
+
+class_alias('SimplePie_Cache_Memcache', 'SimplePie\Cache\Memcache', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php
index 0b40d87c8..32a53eb7b 100755
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php
@@ -164,3 +164,5 @@ class SimplePie_Cache_Memcached implements SimplePie_Cache_Base
         return false;
     }
 }
+
+class_alias('SimplePie_Cache_Memcached', 'SimplePie\Cache\Memcached', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
index a684eb833..d21e2b6e4 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/MySQL.php
@@ -278,7 +278,7 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
 					$query->bindValue(':data', serialize($data));
 					$query->bindValue(':time', time());
 					$query->bindValue(':feed', $this->id);
-					if ($this->execute())
+					if ($query->execute())
 					{
 						return true;
 					}
@@ -438,3 +438,5 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
 		return $query->execute() && $query2->execute();
 	}
 }
+
+class_alias('SimplePie_Cache_MySQL', 'SimplePie\Cache\MySQL', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php
index a5925bec2..82d759b01 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Cache/Redis.php
@@ -170,3 +170,5 @@ class SimplePie_Cache_Redis implements SimplePie_Cache_Base {
     }
 
 }
+
+class_alias('SimplePie_Cache_Redis', 'SimplePie\Cache\Redis', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Caption.php b/vendor/simplepie/simplepie/library/SimplePie/Caption.php
index 3d7bfdd71..355ab52f3 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Caption.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Caption.php
@@ -196,3 +196,5 @@ class SimplePie_Caption
 		return null;
 	}
 }
+
+class_alias('SimplePie_Caption', 'SimplePie\Caption', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Category.php b/vendor/simplepie/simplepie/library/SimplePie/Category.php
index e4dabed8b..02cb76482 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Category.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Category.php
@@ -79,7 +79,7 @@ class SimplePie_Category
 
 	/**
 	 * Category type
-	 * 
+	 *
 	 * category for <category>
 	 * subject for <dc:subject>
 	 *
@@ -161,3 +161,4 @@ class SimplePie_Category
 	}
 }
 
+class_alias('SimplePie_Category', 'SimplePie\Category', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
index 027e131ef..b3a8cf378 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Content/Type/Sniffer.php
@@ -316,3 +316,5 @@ class SimplePie_Content_Type_Sniffer
 		return 'text/html';
 	}
 }
+
+class_alias('SimplePie_Content_Type_Sniffer', 'SimplePie\Content\Type\Sniffer', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
index 92f9b0947..e043ced8b 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Copyright.php
@@ -122,3 +122,5 @@ class SimplePie_Copyright
 		return null;
 	}
 }
+
+class_alias('SimplePie_Copyright', 'SimplePie\Copyright', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Credit.php b/vendor/simplepie/simplepie/library/SimplePie/Credit.php
index d6ff07eba..347902e02 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Credit.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Credit.php
@@ -146,3 +146,5 @@ class SimplePie_Credit
 		return null;
 	}
 }
+
+class_alias('SimplePie_Credit', 'SimplePie\Credit', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
index 8a4cffa30..71cdd7d45 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Enclosure.php
@@ -1307,3 +1307,5 @@ class SimplePie_Enclosure
 		return $type;
 	}
 }
+
+class_alias('SimplePie_Enclosure', 'SimplePie\Enclosure', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Exception.php b/vendor/simplepie/simplepie/library/SimplePie/Exception.php
index 7a04c560c..715cefc72 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Exception.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Exception.php
@@ -48,4 +48,6 @@
  */
 class SimplePie_Exception extends Exception
 {
-}
\ No newline at end of file
+}
+
+class_alias('SimplePie_Exception', 'SimplePie\Exception', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/File.php b/vendor/simplepie/simplepie/library/SimplePie/File.php
index c2d368b3b..7f894fb59 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/File.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/File.php
@@ -299,3 +299,5 @@ class SimplePie_File
 		}
 	}
 }
+
+class_alias('SimplePie_File', 'SimplePie\File', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
index a4c48ddb7..b0f0f4a8b 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/HTTP/Parser.php
@@ -518,3 +518,5 @@ class SimplePie_HTTP_Parser
 		return $data;
 	}
 }
+
+class_alias('SimplePie_HTTP_Parser', 'SimplePie\HTTP\Parser', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/IRI.php b/vendor/simplepie/simplepie/library/SimplePie/IRI.php
index a02de682c..6cd27ddba 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/IRI.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/IRI.php
@@ -1234,3 +1234,5 @@ class SimplePie_IRI
 		return $iauthority;
 	}
 }
+
+class_alias('SimplePie_IRI', 'SimplePie\IRI', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Item.php b/vendor/simplepie/simplepie/library/SimplePie/Item.php
index 3ac4fa882..02f158bfc 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Item.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Item.php
@@ -2965,3 +2965,5 @@ class SimplePie_Item
 		return null;
 	}
 }
+
+class_alias('SimplePie_Item', 'SimplePie\Item', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Locator.php b/vendor/simplepie/simplepie/library/SimplePie/Locator.php
index c5fae0579..12961dd3d 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Locator.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Locator.php
@@ -430,3 +430,5 @@ class SimplePie_Locator
 		return null;
 	}
 }
+
+class_alias('SimplePie_Locator', 'SimplePie\Locator', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Misc.php b/vendor/simplepie/simplepie/library/SimplePie/Misc.php
index ce3cf0f54..4318573ba 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Misc.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Misc.php
@@ -2271,3 +2271,5 @@ function embed_wmedia(width, height, link) {
 		return preg_replace('#^(https?://)[^/:@]+:[^/:@]+@#i', '$1', $url);
 	}
 }
+
+class_alias('SimplePie_Misc', 'SimplePie\Misc', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
index 25c992bd1..c7e466a54 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Net/IPv6.php
@@ -267,3 +267,5 @@ class SimplePie_Net_IPv6
 		return self::check_ipv6($ip);
 	}
 }
+
+class_alias('SimplePie_Net_IPv6', 'SimplePie\Net\IPv6', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
index cf57437d2..fe7e3ea49 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Parse/Date.php
@@ -1023,3 +1023,5 @@ class SimplePie_Parse_Date
 		return $strtotime;
 	}
 }
+
+class_alias('SimplePie_Parse_Date', 'SimplePie\Parse\Date', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/Parser.php
index 3813b74b2..65f32d72a 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Parser.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Parser.php
@@ -677,3 +677,5 @@ class SimplePie_Parser
 		return '<!DOCTYPE html [ <!ENTITY nbsp "&#x00A0;"> <!ENTITY iexcl "&#x00A1;"> <!ENTITY cent "&#x00A2;"> <!ENTITY pound "&#x00A3;"> <!ENTITY curren "&#x00A4;"> <!ENTITY yen "&#x00A5;"> <!ENTITY brvbar "&#x00A6;"> <!ENTITY sect "&#x00A7;"> <!ENTITY uml "&#x00A8;"> <!ENTITY copy "&#x00A9;"> <!ENTITY ordf "&#x00AA;"> <!ENTITY laquo "&#x00AB;"> <!ENTITY not "&#x00AC;"> <!ENTITY shy "&#x00AD;"> <!ENTITY reg "&#x00AE;"> <!ENTITY macr "&#x00AF;"> <!ENTITY deg "&#x00B0;"> <!ENTITY plusmn "&#x00B1;"> <!ENTITY sup2 "&#x00B2;"> <!ENTITY sup3 "&#x00B3;"> <!ENTITY acute "&#x00B4;"> <!ENTITY micro "&#x00B5;"> <!ENTITY para "&#x00B6;"> <!ENTITY middot "&#x00B7;"> <!ENTITY cedil "&#x00B8;"> <!ENTITY sup1 "&#x00B9;"> <!ENTITY ordm "&#x00BA;"> <!ENTITY raquo "&#x00BB;"> <!ENTITY frac14 "&#x00BC;"> <!ENTITY frac12 "&#x00BD;"> <!ENTITY frac34 "&#x00BE;"> <!ENTITY iquest "&#x00BF;"> <!ENTITY Agrave "&#x00C0;"> <!ENTITY Aacute "&#x00C1;"> <!ENTITY Acirc "&#x00C2;"> <!ENTITY Atilde "&#x00C3;"> <!ENTITY Auml "&#x00C4;"> <!ENTITY Aring "&#x00C5;"> <!ENTITY AElig "&#x00C6;"> <!ENTITY Ccedil "&#x00C7;"> <!ENTITY Egrave "&#x00C8;"> <!ENTITY Eacute "&#x00C9;"> <!ENTITY Ecirc "&#x00CA;"> <!ENTITY Euml "&#x00CB;"> <!ENTITY Igrave "&#x00CC;"> <!ENTITY Iacute "&#x00CD;"> <!ENTITY Icirc "&#x00CE;"> <!ENTITY Iuml "&#x00CF;"> <!ENTITY ETH "&#x00D0;"> <!ENTITY Ntilde "&#x00D1;"> <!ENTITY Ograve "&#x00D2;"> <!ENTITY Oacute "&#x00D3;"> <!ENTITY Ocirc "&#x00D4;"> <!ENTITY Otilde "&#x00D5;"> <!ENTITY Ouml "&#x00D6;"> <!ENTITY times "&#x00D7;"> <!ENTITY Oslash "&#x00D8;"> <!ENTITY Ugrave "&#x00D9;"> <!ENTITY Uacute "&#x00DA;"> <!ENTITY Ucirc "&#x00DB;"> <!ENTITY Uuml "&#x00DC;"> <!ENTITY Yacute "&#x00DD;"> <!ENTITY THORN "&#x00DE;"> <!ENTITY szlig "&#x00DF;"> <!ENTITY agrave "&#x00E0;"> <!ENTITY aacute "&#x00E1;"> <!ENTITY acirc "&#x00E2;"> <!ENTITY atilde "&#x00E3;"> <!ENTITY auml "&#x00E4;"> <!ENTITY aring "&#x00E5;"> <!ENTITY aelig "&#x00E6;"> <!ENTITY ccedil "&#x00E7;"> <!ENTITY egrave "&#x00E8;"> <!ENTITY eacute "&#x00E9;"> <!ENTITY ecirc "&#x00EA;"> <!ENTITY euml "&#x00EB;"> <!ENTITY igrave "&#x00EC;"> <!ENTITY iacute "&#x00ED;"> <!ENTITY icirc "&#x00EE;"> <!ENTITY iuml "&#x00EF;"> <!ENTITY eth "&#x00F0;"> <!ENTITY ntilde "&#x00F1;"> <!ENTITY ograve "&#x00F2;"> <!ENTITY oacute "&#x00F3;"> <!ENTITY ocirc "&#x00F4;"> <!ENTITY otilde "&#x00F5;"> <!ENTITY ouml "&#x00F6;"> <!ENTITY divide "&#x00F7;"> <!ENTITY oslash "&#x00F8;"> <!ENTITY ugrave "&#x00F9;"> <!ENTITY uacute "&#x00FA;"> <!ENTITY ucirc "&#x00FB;"> <!ENTITY uuml "&#x00FC;"> <!ENTITY yacute "&#x00FD;"> <!ENTITY thorn "&#x00FE;"> <!ENTITY yuml "&#x00FF;"> <!ENTITY OElig "&#x0152;"> <!ENTITY oelig "&#x0153;"> <!ENTITY Scaron "&#x0160;"> <!ENTITY scaron "&#x0161;"> <!ENTITY Yuml "&#x0178;"> <!ENTITY fnof "&#x0192;"> <!ENTITY circ "&#x02C6;"> <!ENTITY tilde "&#x02DC;"> <!ENTITY Alpha "&#x0391;"> <!ENTITY Beta "&#x0392;"> <!ENTITY Gamma "&#x0393;"> <!ENTITY Epsilon "&#x0395;"> <!ENTITY Zeta "&#x0396;"> <!ENTITY Eta "&#x0397;"> <!ENTITY Theta "&#x0398;"> <!ENTITY Iota "&#x0399;"> <!ENTITY Kappa "&#x039A;"> <!ENTITY Lambda "&#x039B;"> <!ENTITY Mu "&#x039C;"> <!ENTITY Nu "&#x039D;"> <!ENTITY Xi "&#x039E;"> <!ENTITY Omicron "&#x039F;"> <!ENTITY Pi "&#x03A0;"> <!ENTITY Rho "&#x03A1;"> <!ENTITY Sigma "&#x03A3;"> <!ENTITY Tau "&#x03A4;"> <!ENTITY Upsilon "&#x03A5;"> <!ENTITY Phi "&#x03A6;"> <!ENTITY Chi "&#x03A7;"> <!ENTITY Psi "&#x03A8;"> <!ENTITY Omega "&#x03A9;"> <!ENTITY alpha "&#x03B1;"> <!ENTITY beta "&#x03B2;"> <!ENTITY gamma "&#x03B3;"> <!ENTITY delta "&#x03B4;"> <!ENTITY epsilon "&#x03B5;"> <!ENTITY zeta "&#x03B6;"> <!ENTITY eta "&#x03B7;"> <!ENTITY theta "&#x03B8;"> <!ENTITY iota "&#x03B9;"> <!ENTITY kappa "&#x03BA;"> <!ENTITY lambda "&#x03BB;"> <!ENTITY mu "&#x03BC;"> <!ENTITY nu "&#x03BD;"> <!ENTITY xi "&#x03BE;"> <!ENTITY omicron "&#x03BF;"> <!ENTITY pi "&#x03C0;"> <!ENTITY rho "&#x03C1;"> <!ENTITY sigmaf "&#x03C2;"> <!ENTITY sigma "&#x03C3;"> <!ENTITY tau "&#x03C4;"> <!ENTITY upsilon "&#x03C5;"> <!ENTITY phi "&#x03C6;"> <!ENTITY chi "&#x03C7;"> <!ENTITY psi "&#x03C8;"> <!ENTITY omega "&#x03C9;"> <!ENTITY thetasym "&#x03D1;"> <!ENTITY upsih "&#x03D2;"> <!ENTITY piv "&#x03D6;"> <!ENTITY ensp "&#x2002;"> <!ENTITY emsp "&#x2003;"> <!ENTITY thinsp "&#x2009;"> <!ENTITY zwnj "&#x200C;"> <!ENTITY zwj "&#x200D;"> <!ENTITY lrm "&#x200E;"> <!ENTITY rlm "&#x200F;"> <!ENTITY ndash "&#x2013;"> <!ENTITY mdash "&#x2014;"> <!ENTITY lsquo "&#x2018;"> <!ENTITY rsquo "&#x2019;"> <!ENTITY sbquo "&#x201A;"> <!ENTITY ldquo "&#x201C;"> <!ENTITY rdquo "&#x201D;"> <!ENTITY bdquo "&#x201E;"> <!ENTITY dagger "&#x2020;"> <!ENTITY Dagger "&#x2021;"> <!ENTITY bull "&#x2022;"> <!ENTITY hellip "&#x2026;"> <!ENTITY permil "&#x2030;"> <!ENTITY prime "&#x2032;"> <!ENTITY Prime "&#x2033;"> <!ENTITY lsaquo "&#x2039;"> <!ENTITY rsaquo "&#x203A;"> <!ENTITY oline "&#x203E;"> <!ENTITY frasl "&#x2044;"> <!ENTITY euro "&#x20AC;"> <!ENTITY image "&#x2111;"> <!ENTITY weierp "&#x2118;"> <!ENTITY real "&#x211C;"> <!ENTITY trade "&#x2122;"> <!ENTITY alefsym "&#x2135;"> <!ENTITY larr "&#x2190;"> <!ENTITY uarr "&#x2191;"> <!ENTITY rarr "&#x2192;"> <!ENTITY darr "&#x2193;"> <!ENTITY harr "&#x2194;"> <!ENTITY crarr "&#x21B5;"> <!ENTITY lArr "&#x21D0;"> <!ENTITY uArr "&#x21D1;"> <!ENTITY rArr "&#x21D2;"> <!ENTITY dArr "&#x21D3;"> <!ENTITY hArr "&#x21D4;"> <!ENTITY forall "&#x2200;"> <!ENTITY part "&#x2202;"> <!ENTITY exist "&#x2203;"> <!ENTITY empty "&#x2205;"> <!ENTITY nabla "&#x2207;"> <!ENTITY isin "&#x2208;"> <!ENTITY notin "&#x2209;"> <!ENTITY ni "&#x220B;"> <!ENTITY prod "&#x220F;"> <!ENTITY sum "&#x2211;"> <!ENTITY minus "&#x2212;"> <!ENTITY lowast "&#x2217;"> <!ENTITY radic "&#x221A;"> <!ENTITY prop "&#x221D;"> <!ENTITY infin "&#x221E;"> <!ENTITY ang "&#x2220;"> <!ENTITY and "&#x2227;"> <!ENTITY or "&#x2228;"> <!ENTITY cap "&#x2229;"> <!ENTITY cup "&#x222A;"> <!ENTITY int "&#x222B;"> <!ENTITY there4 "&#x2234;"> <!ENTITY sim "&#x223C;"> <!ENTITY cong "&#x2245;"> <!ENTITY asymp "&#x2248;"> <!ENTITY ne "&#x2260;"> <!ENTITY equiv "&#x2261;"> <!ENTITY le "&#x2264;"> <!ENTITY ge "&#x2265;"> <!ENTITY sub "&#x2282;"> <!ENTITY sup "&#x2283;"> <!ENTITY nsub "&#x2284;"> <!ENTITY sube "&#x2286;"> <!ENTITY supe "&#x2287;"> <!ENTITY oplus "&#x2295;"> <!ENTITY otimes "&#x2297;"> <!ENTITY perp "&#x22A5;"> <!ENTITY sdot "&#x22C5;"> <!ENTITY lceil "&#x2308;"> <!ENTITY rceil "&#x2309;"> <!ENTITY lfloor "&#x230A;"> <!ENTITY rfloor "&#x230B;"> <!ENTITY lang "&#x2329;"> <!ENTITY rang "&#x232A;"> <!ENTITY loz "&#x25CA;"> <!ENTITY spades "&#x2660;"> <!ENTITY clubs "&#x2663;"> <!ENTITY hearts "&#x2665;"> <!ENTITY diams "&#x2666;"> ]>';
 	}
 }
+
+class_alias('SimplePie_Parser', 'SimplePie\Parser', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Rating.php b/vendor/simplepie/simplepie/library/SimplePie/Rating.php
index 599f75acb..eae6718a7 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Rating.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Rating.php
@@ -122,3 +122,5 @@ class SimplePie_Rating
 		return null;
 	}
 }
+
+class_alias('SimplePie_Rating', 'SimplePie\Rating', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Registry.php b/vendor/simplepie/simplepie/library/SimplePie/Registry.php
index 1aac51d07..2486f3c69 100755
--- a/vendor/simplepie/simplepie/library/SimplePie/Registry.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Registry.php
@@ -223,3 +223,5 @@ class SimplePie_Registry
 		return $result;
 	}
 }
+
+class_alias('SimplePie_Registry', 'SimplePie\Registry', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
index 950017fae..0a168bbbe 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Restriction.php
@@ -146,3 +146,5 @@ class SimplePie_Restriction
 		return null;
 	}
 }
+
+class_alias('SimplePie_Restriction', 'SimplePie\Restriction', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
index d421c8307..1f202ecc0 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Sanitize.php
@@ -61,6 +61,7 @@ class SimplePie_Sanitize
 	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
 	var $encode_instead_of_strip = false;
 	var $strip_attributes = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+	var $rename_attributes = array();
 	var $add_attributes = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none'));
 	var $strip_comments = false;
 	var $output_encoding = 'UTF-8';
@@ -169,6 +170,25 @@ class SimplePie_Sanitize
 		$this->encode_instead_of_strip = (bool) $encode;
 	}
 
+	public function rename_attributes($attribs = array())
+	{
+		if ($attribs)
+		{
+			if (is_array($attribs))
+			{
+				$this->rename_attributes = $attribs;
+			}
+			else
+			{
+				$this->rename_attributes = explode(',', $attribs);
+			}
+		}
+		else
+		{
+			$this->rename_attributes = false;
+		}
+	}
+
 	public function strip_attributes($attribs = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
 	{
 		if ($attribs)
@@ -221,9 +241,9 @@ class SimplePie_Sanitize
 	 * Set element/attribute key/value pairs of HTML attributes
 	 * containing URLs that need to be resolved relative to the feed
 	 *
-	 * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
-	 * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
-	 * |q|@cite
+	 * Defaults to |a|@href, |area|@href, |audio|@src, |blockquote|@cite,
+	 * |del|@cite, |form|@action, |img|@longdesc, |img|@src, |input|@src,
+	 * |ins|@cite, |q|@cite, |source|@src, |video|@src
 	 *
 	 * @since 1.0
 	 * @param array|null $element_attribute Element/attribute key/value pairs, null for default
@@ -235,6 +255,7 @@ class SimplePie_Sanitize
 			$element_attribute = array(
 				'a' => 'href',
 				'area' => 'href',
+				'audio' => 'src',
 				'blockquote' => 'cite',
 				'del' => 'cite',
 				'form' => 'action',
@@ -244,7 +265,12 @@ class SimplePie_Sanitize
 				),
 				'input' => 'src',
 				'ins' => 'cite',
-				'q' => 'cite'
+				'q' => 'cite',
+				'source' => 'src',
+				'video' => array(
+					'poster',
+					'src'
+				)
 			);
 		}
 		$this->replace_url_attributes = (array) $element_attribute;
@@ -374,6 +400,14 @@ class SimplePie_Sanitize
 					}
 				}
 
+				if ($this->rename_attributes)
+				{
+					foreach ($this->rename_attributes as $attrib)
+					{
+						$this->rename_attr($attrib, $xpath);
+					}
+				}
+
 				if ($this->strip_attributes)
 				{
 					foreach ($this->strip_attributes as $attrib)
@@ -447,6 +481,8 @@ class SimplePie_Sanitize
 				{
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
 				}
+
+				$data = str_replace('</source>', '', $data);
 			}
 
 			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
@@ -642,6 +678,17 @@ class SimplePie_Sanitize
 		}
 	}
 
+	protected function rename_attr($attrib, $xpath)
+	{
+		$elements = $xpath->query('//*[@' . $attrib . ']');
+
+		foreach ($elements as $element)
+		{
+			$element->setAttribute('data-sanitized-' . $attrib, $element->getAttribute($attrib));
+			$element->removeAttribute($attrib);
+		}
+	}
+
 	protected function add_attr($tag, $valuePairs, $document)
 	{
 		$elements = $document->getElementsByTagName($tag);
@@ -654,3 +701,5 @@ class SimplePie_Sanitize
 		}
 	}
 }
+
+class_alias('SimplePie_Sanitize', 'SimplePie\Sanitize', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/Source.php b/vendor/simplepie/simplepie/library/SimplePie/Source.php
index f14e5b220..9e7ddf04d 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/Source.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/Source.php
@@ -575,3 +575,5 @@ class SimplePie_Source
 		return null;
 	}
 }
+
+class_alias('SimplePie_Source', 'SimplePie\Source', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
index 0c857a586..9ac088704 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
@@ -357,3 +357,5 @@ class SimplePie_XML_Declaration_Parser
 		}
 	}
 }
+
+class_alias('SimplePie_XML_Declaration_Parser', 'SimplePie\XML\Declaration\Parser', false);
diff --git a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
index 9c54f8833..030a230d0 100644
--- a/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
+++ b/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
@@ -364,3 +364,5 @@ class SimplePie_gzdecode
 		return false;
 	}
 }
+
+class_alias('SimplePie_gzdecode', 'SimplePie\Gzdecode', false);
diff --git a/vendor/simplepie/simplepie/src/Author.php b/vendor/simplepie/simplepie/src/Author.php
new file mode 100644
index 000000000..19e92498e
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Author.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Author');
+
+if (\false) {
+	class Author extends \SimplePie_Author
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache.php b/vendor/simplepie/simplepie/src/Cache.php
new file mode 100644
index 000000000..b1a38d8b4
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Cache');
+
+if (\false) {
+	class Cache extends \SimplePie_Cache
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/Base.php b/vendor/simplepie/simplepie/src/Cache/Base.php
new file mode 100644
index 000000000..c097906ff
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/Base.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+interface_exists('SimplePie_Cache_Base');
+
+if (\false) {
+	interface Base extends \SimplePie_Cache_Base
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/DB.php b/vendor/simplepie/simplepie/src/Cache/DB.php
new file mode 100644
index 000000000..14bfa41bd
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/DB.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_DB');
+
+if (\false) {
+	class DB extends \SimplePie_Cache_DB
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/File.php b/vendor/simplepie/simplepie/src/Cache/File.php
new file mode 100644
index 000000000..f679190f4
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/File.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_File');
+
+if (\false) {
+	class File extends \SimplePie_Cache_File
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/Memcache.php b/vendor/simplepie/simplepie/src/Cache/Memcache.php
new file mode 100644
index 000000000..c468f2c0f
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/Memcache.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_Memcache');
+
+if (\false) {
+	class Memcache extends \SimplePie_Cache_Memcache
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/Memcached.php b/vendor/simplepie/simplepie/src/Cache/Memcached.php
new file mode 100644
index 000000000..16fd2b177
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/Memcached.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_Memcached');
+
+if (\false) {
+	class Memcached extends \SimplePie_Cache_Memcached
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/MySQL.php b/vendor/simplepie/simplepie/src/Cache/MySQL.php
new file mode 100644
index 000000000..2ffe18a37
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/MySQL.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_MySQL');
+
+if (\false) {
+	class MySQL extends \SimplePie_Cache_MySQL
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Cache/Redis.php b/vendor/simplepie/simplepie/src/Cache/Redis.php
new file mode 100644
index 000000000..e203b6c1b
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Cache/Redis.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Cache;
+
+class_exists('SimplePie_Cache_Redis');
+
+if (\false) {
+	class Redis extends \SimplePie_Cache_Redis
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Caption.php b/vendor/simplepie/simplepie/src/Caption.php
new file mode 100644
index 000000000..f0cf271de
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Caption.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Caption');
+
+if (\false) {
+	class Caption extends \SimplePie_Caption
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Category.php b/vendor/simplepie/simplepie/src/Category.php
new file mode 100644
index 000000000..895b79a0d
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Category.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Category');
+
+if (\false) {
+	class Category extends \SimplePie_Category
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php b/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php
new file mode 100644
index 000000000..574912e8e
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Content\Type;
+
+class_exists('SimplePie_Content_Type_Sniffer');
+
+if (\false) {
+	class Sniffer extends \SimplePie_Content_Type_Sniffer
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Copyright.php b/vendor/simplepie/simplepie/src/Copyright.php
new file mode 100644
index 000000000..ec4933eb4
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Copyright.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Copyright');
+
+if (\false) {
+	class Copyright extends \SimplePie_Copyright
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Credit.php b/vendor/simplepie/simplepie/src/Credit.php
new file mode 100644
index 000000000..9350845c9
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Credit.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Credit');
+
+if (\false) {
+	class Credit extends \SimplePie_Credit
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Enclosure.php b/vendor/simplepie/simplepie/src/Enclosure.php
new file mode 100644
index 000000000..dd41f24d2
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Enclosure.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Enclosure');
+
+if (\false) {
+	class Enclosure extends \SimplePie_Enclosure
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Exception.php b/vendor/simplepie/simplepie/src/Exception.php
new file mode 100644
index 000000000..9068dc036
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Exception.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Exception');
+
+if (\false) {
+	class Exception extends \SimplePie_Exception
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/File.php b/vendor/simplepie/simplepie/src/File.php
new file mode 100644
index 000000000..25d3f7300
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/File.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_File');
+
+if (\false) {
+	class File extends \SimplePie_File
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Gzdecode.php b/vendor/simplepie/simplepie/src/Gzdecode.php
new file mode 100644
index 000000000..503e52126
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Gzdecode.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_gzdecode');
+
+if (\false) {
+	class Gzdecode extends \SimplePie_gzdecode
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/HTTP/Parser.php b/vendor/simplepie/simplepie/src/HTTP/Parser.php
new file mode 100644
index 000000000..dd34bb9de
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/HTTP/Parser.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\HTTP;
+
+class_exists('SimplePie_HTTP_Parser');
+
+if (\false) {
+	class Parser extends \SimplePie_HTTP_Parser
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/IRI.php b/vendor/simplepie/simplepie/src/IRI.php
new file mode 100644
index 000000000..07d783117
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/IRI.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_IRI');
+
+if (\false) {
+	class IRI extends \SimplePie_IRI
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Item.php b/vendor/simplepie/simplepie/src/Item.php
new file mode 100644
index 000000000..d3250d5b5
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Item.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Item');
+
+if (\false) {
+	class Item extends \SimplePie_Item
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Locator.php b/vendor/simplepie/simplepie/src/Locator.php
new file mode 100644
index 000000000..1696937d4
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Locator.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Locator');
+
+if (\false) {
+	class Locator extends \SimplePie_Locator
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Misc.php b/vendor/simplepie/simplepie/src/Misc.php
new file mode 100644
index 000000000..de649fddb
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Misc.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Misc');
+
+if (\false) {
+	class Misc extends \SimplePie_Misc
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Net/IPv6.php b/vendor/simplepie/simplepie/src/Net/IPv6.php
new file mode 100644
index 000000000..6dee821e0
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Net/IPv6.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Net;
+
+class_exists('SimplePie_Net_IPv6');
+
+if (\false) {
+	class IPv6 extends \SimplePie_Net_IPv6
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Parse/Date.php b/vendor/simplepie/simplepie/src/Parse/Date.php
new file mode 100644
index 000000000..978e4f6b1
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Parse/Date.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\Parse;
+
+class_exists('SimplePie_Parse_Date');
+
+if (\false) {
+	class Date extends \SimplePie_Parse_Date
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Parser.php b/vendor/simplepie/simplepie/src/Parser.php
new file mode 100644
index 000000000..2b38fe3a0
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Parser.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Parser');
+
+if (\false) {
+	class Parser extends \SimplePie_Parser
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Rating.php b/vendor/simplepie/simplepie/src/Rating.php
new file mode 100644
index 000000000..10bf261cd
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Rating.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Rating');
+
+if (\false) {
+	class Rating extends \SimplePie_Rating
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Registry.php b/vendor/simplepie/simplepie/src/Registry.php
new file mode 100644
index 000000000..7aba9ca8e
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Registry.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Registry');
+
+if (\false) {
+	class Registry extends \SimplePie_Registry
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Restriction.php b/vendor/simplepie/simplepie/src/Restriction.php
new file mode 100644
index 000000000..2822bc3ec
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Restriction.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Restriction');
+
+if (\false) {
+	class Restriction extends \SimplePie_Restriction
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Sanitize.php b/vendor/simplepie/simplepie/src/Sanitize.php
new file mode 100644
index 000000000..2af0c01d6
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Sanitize.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Sanitize');
+
+if (\false) {
+	class Sanitize extends \SimplePie_Sanitize
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/SimplePie.php b/vendor/simplepie/simplepie/src/SimplePie.php
new file mode 100644
index 000000000..e3a849474
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/SimplePie.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie');
+
+if (\false) {
+	class SimplePie extends \SimplePie
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/Source.php b/vendor/simplepie/simplepie/src/Source.php
new file mode 100644
index 000000000..b66b32c61
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/Source.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie;
+
+class_exists('SimplePie_Source');
+
+if (\false) {
+	class Source extends \SimplePie_Source
+	{
+	}
+}
diff --git a/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php b/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php
new file mode 100644
index 000000000..10e651d0c
--- /dev/null
+++ b/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Please note: This file is automatically generated by a build script. The
+ * full original source is always available from http://simplepie.org/
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Sam Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+namespace SimplePie\XML\Declaration;
+
+class_exists('SimplePie_XML_Declaration_Parser');
+
+if (\false) {
+	class Parser extends \SimplePie_XML_Declaration_Parser
+	{
+	}
+}
diff --git a/vendor/smarty/smarty/.github/workflows/ci.yml b/vendor/smarty/smarty/.github/workflows/ci.yml
deleted file mode 100644
index e27b60bfc..000000000
--- a/vendor/smarty/smarty/.github/workflows/ci.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
-
-on:
-  - pull_request
-  - push
-
-name: CI
-
-jobs:
-  tests:
-    name: Tests
-
-    runs-on: ${{ matrix.os }}
-
-    env:
-      PHP_EXTENSIONS: dom, json, libxml, mbstring, pdo_sqlite, soap, xml, xmlwriter
-      PHP_INI_VALUES: assert.exception=1, zend.assertions=1
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-
-        php-version:
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-
-        compiler:
-          - default
-
-        include:
-          - os: ubuntu-latest
-            php-version: "8.0"
-            compiler: jit
-          - os: ubuntu-latest
-            php-version: "8.1"
-            compiler: jit
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Override PHP ini values for JIT compiler
-      if: matrix.compiler == 'jit'
-      run: echo "PHP_INI_VALUES::assert.exception=1, zend.assertions=1, opcache.enable=1, opcache.enable_cli=1, opcache.optimization_level=-1, opcache.jit=1255, opcache.jit_buffer_size=32M" >> $GITHUB_ENV
-
-    - name: Install PHP with extensions
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-version }}
-        coverage: pcov
-        extensions: ${{ env.PHP_EXTENSIONS }}
-        ini-values: ${{ env.PHP_INI_VALUES }}
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-${{ matrix.php-version }}-
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    - name: Run tests with phpunit
-      run: ./phpunit.sh
diff --git a/vendor/smarty/smarty/CHANGELOG.md b/vendor/smarty/smarty/CHANGELOG.md
index 39e834837..784cc09f5 100644
--- a/vendor/smarty/smarty/CHANGELOG.md
+++ b/vendor/smarty/smarty/CHANGELOG.md
@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.1.1] - 2022-05-17
+
+### Security
+- Prevent PHP injection through malicious block name or include file name. This addresses CVE-2022-
+
+### Fixed
+- Exclude docs and demo from export and composer [#751](https://github.com/smarty-php/smarty/pull/751)
+- PHP 8.1 deprecation notices in demo/plugins/cacheresource.pdo.php [#706](https://github.com/smarty-php/smarty/issues/706)
+- PHP 8.1 deprecation notices in truncate modifier [#699](https://github.com/smarty-php/smarty/issues/699)
+- Math equation `max(x, y)` didn't work anymore [#721](https://github.com/smarty-php/smarty/issues/721)
+- Fix PHP 8.1 deprecated warning when calling rtrim [#743](https://github.com/smarty-php/smarty/pull/743)
+- PHP 8.1: fix deprecation in escape modifier [#727](https://github.com/smarty-php/smarty/pull/727)
+
 ## [4.1.0] - 2022-02-06
 
 ### Added
diff --git a/vendor/smarty/smarty/demo/configs/test.conf b/vendor/smarty/smarty/demo/configs/test.conf
deleted file mode 100644
index 5eac748ec..000000000
--- a/vendor/smarty/smarty/demo/configs/test.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title = Welcome to Smarty!
-cutoff_size = 40
-
-[setup]
-bold = true
diff --git a/vendor/smarty/smarty/demo/index.php b/vendor/smarty/smarty/demo/index.php
deleted file mode 100644
index 3aed37168..000000000
--- a/vendor/smarty/smarty/demo/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Example Application
- *
- * @package Example-application
- */
-require '../libs/Smarty.class.php';
-$smarty = new Smarty;
-//$smarty->force_compile = true;
-$smarty->debugging = true;
-$smarty->caching = true;
-$smarty->cache_lifetime = 120;
-$smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
-$smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
-$smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
-$smarty->assign(
-    "Class",
-    array(
-        array("A", "B", "C", "D"),
-        array("E", "F", "G", "H"),
-        array("I", "J", "K", "L"),
-        array("M", "N", "O", "P")
-    )
-);
-$smarty->assign(
-    "contacts",
-    array(
-        array("phone" => "1", "fax" => "2", "cell" => "3"),
-        array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")
-    )
-);
-$smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
-$smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
-$smarty->assign("option_selected", "NE");
-$smarty->display('index.tpl');
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php b/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
deleted file mode 100644
index 7867cc598..000000000
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * APC CacheResource
- * CacheResource Implementation based on the KeyValueStore API to use
- * memcache as the storage resource for Smarty's output caching.
- * *
- *
- * @package CacheResource-examples
- * @author  Uwe Tews
- */
-class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
-{
-    /**
-     * Smarty_CacheResource_Apc constructor.
-     *
-     * @throws \Exception
-     */
-    public function __construct()
-    {
-        // test if APC is present
-        if (!function_exists('apc_cache_info')) {
-            throw new Exception('APC Template Caching Error: APC is not installed');
-        }
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param array $keys list of keys to fetch
-     *
-     * @return array   list of values with the given keys used as indexes
-     * @return boolean true on success, false on failure
-     */
-    protected function read(array $keys)
-    {
-        $_res = array();
-        $res = apc_fetch($keys);
-        foreach ($res as $k => $v) {
-            $_res[ $k ] = $v;
-        }
-        return $_res;
-    }
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param array $keys   list of values to save
-     * @param int   $expire expiration time
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function write(array $keys, $expire = null)
-    {
-        foreach ($keys as $k => $v) {
-            apc_store($k, $v, $expire);
-        }
-        return true;
-    }
-
-    /**
-     * Remove values from cache
-     *
-     * @param array $keys list of keys to delete
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function delete(array $keys)
-    {
-        foreach ($keys as $k) {
-            apc_delete($k);
-        }
-        return true;
-    }
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        return apc_clear_cache('user');
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php b/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
deleted file mode 100644
index 71fe9d3f1..000000000
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * Memcache CacheResource
- * CacheResource Implementation based on the KeyValueStore API to use
- * memcache as the storage resource for Smarty's output caching.
- * Note that memcache has a limitation of 256 characters per cache-key.
- * To avoid complications all cache-keys are translated to a sha1 hash.
- *
- * @package CacheResource-examples
- * @author  Rodney Rehm
- */
-class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
-{
-    /**
-     * memcache instance
-     *
-     * @var Memcache
-     */
-    protected $memcache = null;
-
-    /**
-     * Smarty_CacheResource_Memcache constructor.
-     */
-    public function __construct()
-    {
-        if (class_exists('Memcached')) {
-            $this->memcache = new Memcached();
-        } else {
-            $this->memcache = new Memcache();
-        }
-        $this->memcache->addServer('127.0.0.1', 11211);
-    }
-
-    /**
-     * Read values for a set of keys from cache
-     *
-     * @param array $keys list of keys to fetch
-     *
-     * @return array   list of values with the given keys used as indexes
-     * @return boolean true on success, false on failure
-     */
-    protected function read(array $keys)
-    {
-        $res = array();
-        foreach ($keys as $key) {
-            $k = sha1($key);
-            $res[$key] = $this->memcache->get($k);
-        }
-        return $res;
-    }
-
-    /**
-     * Save values for a set of keys to cache
-     *
-     * @param array $keys   list of values to save
-     * @param int   $expire expiration time
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function write(array $keys, $expire = null)
-    {
-        foreach ($keys as $k => $v) {
-            $k = sha1($k);
-            if (class_exists('Memcached')) {
-                $this->memcache->set($k, $v, $expire);
-            } else {
-                $this->memcache->set($k, $v, 0, $expire);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove values from cache
-     *
-     * @param array $keys list of keys to delete
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function delete(array $keys)
-    {
-        foreach ($keys as $k) {
-            $k = sha1($k);
-            $this->memcache->delete($k);
-        }
-        return true;
-    }
-
-    /**
-     * Remove *all* values from cache
-     *
-     * @return boolean true on success, false on failure
-     */
-    protected function purge()
-    {
-        return $this->memcache->flush();
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php b/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
deleted file mode 100644
index c5037eb13..000000000
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * MySQL CacheResource
- * CacheResource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's output caching.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
- *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
- *   `name` VARCHAR(250) NOT NULL,
- *   `cache_id` VARCHAR(250) NULL DEFAULT NULL,
- *   `compile_id` VARCHAR(250) NULL DEFAULT NULL,
- *   `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- *   `content` LONGTEXT NOT NULL,
- *   PRIMARY KEY (`id`),
- *   INDEX(`name`),
- *   INDEX(`cache_id`),
- *   INDEX(`compile_id`),
- *   INDEX(`modified`)
- * ) ENGINE = InnoDB;</pre>
- *
- * @package CacheResource-examples
- * @author  Rodney Rehm
- */
-class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
-{
-    /**
-     * @var \PDO
-     */
-    protected $db;
-
-    /**
-     * @var \PDOStatement
-     */
-    protected $fetch;
-
-    /**
-     * @var \PDOStatement
-     */
-    protected $fetchTimestamp;
-
-    /**
-     * @var \PDOStatement
-     */
-    protected $save;
-
-    /**
-     * Smarty_CacheResource_Mysql constructor.
-     *
-     * @throws \SmartyException
-     */
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
-        $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare(
-            'REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-            VALUES  (:id, :name, :cache_id, :compile_id, :content)'
-        );
-    }
-
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param string  $id         unique cache content identifier
-     * @param string  $name       template name
-     * @param string  $cache_id   cache id
-     * @param string  $compile_id compile id
-     * @param string  $content    cached content
-     * @param integer $mtime      cache modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
-    {
-        $this->fetch->execute(array('id' => $id));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $content = $row[ 'content' ];
-            $mtime = strtotime($row[ 'modified' ]);
-        } else {
-            $content = null;
-            $mtime = null;
-        }
-    }
-
-    /**
-     * Fetch cached content's modification timestamp from data source
-     *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
-     *       loading the complete cached content.
-     *
-     * @param string $id         unique cache content identifier
-     * @param string $name       template name
-     * @param string $cache_id   cache id
-     * @param string $compile_id compile id
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     */
-    protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-    {
-        $this->fetchTimestamp->execute(array('id' => $id));
-        $mtime = strtotime($this->fetchTimestamp->fetchColumn());
-        $this->fetchTimestamp->closeCursor();
-        return $mtime;
-    }
-
-    /**
-     * Save content to cache
-     *
-     * @param string       $id         unique cache content identifier
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param string       $content    content to cache
-     *
-     * @return boolean      success
-     */
-    protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
-    {
-        $this->save->execute(
-            array('id' => $id,
-                  'name' => $name,
-                  'cache_id' => $cache_id,
-                  'compile_id' => $compile_id,
-                  'content' => $content,)
-        );
-        return !!$this->save->rowCount();
-    }
-
-    /**
-     * Delete content from cache
-     *
-     * @param string       $name       template name
-     * @param string       $cache_id   cache id
-     * @param string       $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration or null
-     *
-     * @return integer      number of deleted caches
-     */
-    protected function delete($name, $cache_id, $compile_id, $exp_time)
-    {
-        // delete the whole cache
-        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-            // returning the number of deleted caches would require a second query to count them
-            $query = $this->db->query('TRUNCATE TABLE output_cache');
-            return -1;
-        }
-        // build the filter
-        $where = array();
-        // equal test name
-        if ($name !== null) {
-            $where[] = 'name = ' . $this->db->quote($name);
-        }
-        // equal test compile_id
-        if ($compile_id !== null) {
-            $where[] = 'compile_id = ' . $this->db->quote($compile_id);
-        }
-        // range test expiration time
-        if ($exp_time !== null) {
-            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
-        }
-        // equal test cache_id and match sub-groups
-        if ($cache_id !== null) {
-            $where[] =
-                '(cache_id = ' .
-                $this->db->quote($cache_id) .
-                ' OR cache_id LIKE ' .
-                $this->db->quote($cache_id . '|%') .
-                ')';
-        }
-        // run delete query
-        $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
-        return $query->rowCount();
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
deleted file mode 100644
index a80cd698e..000000000
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-
-/**
- * PDO Cache Handler
- * Allows you to store Smarty Cache files into your db.
- * Example table :
- * CREATE TABLE `smarty_cache` (
- * `id` char(40) NOT NULL COMMENT 'sha1 hash',
- * `name` varchar(250) NOT NULL,
- * `cache_id` varchar(250) DEFAULT NULL,
- * `compile_id` varchar(250) DEFAULT NULL,
- * `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
- * `expire` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- * `content` mediumblob NOT NULL,
- * PRIMARY KEY (`id`),
- * KEY `name` (`name`),
- * KEY `cache_id` (`cache_id`),
- * KEY `compile_id` (`compile_id`),
- * KEY `modified` (`modified`),
- * KEY `expire` (`expire`)
- * ) ENGINE=InnoDB
- * Example usage :
- *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
- *      $smarty->setCachingType('pdo');
- *      $smarty->loadPlugin('Smarty_CacheResource_Pdo');
- *      $smarty->registerCacheResource('pdo', new Smarty_CacheResource_Pdo($cnx, 'smarty_cache'));
- *
- * @author Beno!t POLASZEK - 2014
- */
-class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
-{
-    /**
-     * @var string[]
-     */
-    protected $fetchStatements = array('default' => 'SELECT %2$s
-                                                                                    FROM %1$s 
-                                                                                    WHERE 1 
-                                                                                    AND id          = :id 
-                                                                                    AND cache_id    IS NULL 
-                                                                                    AND compile_id  IS NULL',
-                                       'withCacheId' => 'SELECT %2$s
-                                                                                FROM %1$s 
-                                                                                WHERE 1 
-                                                                                AND id          = :id 
-                                                                                AND cache_id    = :cache_id 
-                                                                                AND compile_id  IS NULL',
-                                       'withCompileId' => 'SELECT %2$s
-                                                                                FROM %1$s 
-                                                                                WHERE 1 
-                                                                                AND id          = :id 
-                                                                                AND compile_id  = :compile_id 
-                                                                                AND cache_id    IS NULL',
-                                       'withCacheIdAndCompileId' => 'SELECT %2$s
-                                                                                FROM %1$s 
-                                                                                WHERE 1 
-                                                                                AND id          = :id 
-                                                                                AND cache_id    = :cache_id 
-                                                                                AND compile_id  = :compile_id');
-
-    /**
-     * @var string
-     */
-    protected $insertStatement = 'INSERT INTO %s
-
-                                                SET id          =   :id, 
-                                                    name        =   :name, 
-                                                    cache_id    =   :cache_id, 
-                                                    compile_id  =   :compile_id, 
-                                                    modified    =   CURRENT_TIMESTAMP, 
-                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
-                                                    content     =   :content 
-
-                                                ON DUPLICATE KEY UPDATE 
-                                                    name        =   :name, 
-                                                    cache_id    =   :cache_id, 
-                                                    compile_id  =   :compile_id, 
-                                                    modified    =   CURRENT_TIMESTAMP, 
-                                                    expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
-                                                    content     =   :content';
-
-    /**
-     * @var string
-     */
-    protected $deleteStatement = 'DELETE FROM %1$s WHERE %2$s';
-
-    /**
-     * @var string
-     */
-    protected $truncateStatement = 'TRUNCATE TABLE %s';
-
-    /**
-     * @var string
-     */
-    protected $fetchColumns = 'modified, content';
-
-    /**
-     * @var string
-     */
-    protected $fetchTimestampColumns = 'modified';
-
-    /**
-     * @var \PDO
-     */
-    protected $pdo;
-
-    /**
-     * @var
-     */
-    protected $table;
-
-    /**
-     * @var null
-     */
-    protected $database;
-
-    /**
-     * Constructor
-     *
-     * @param PDO    $pdo      PDO : active connection
-     * @param string $table    : table (or view) name
-     * @param string $database : optional - if table is located in another db
-     *
-     * @throws \SmartyException
-     */
-    public function __construct(PDO $pdo, $table, $database = null)
-    {
-        if (is_null($table)) {
-            throw new SmartyException("Table name for caching can't be null");
-        }
-        $this->pdo = $pdo;
-        $this->table = $table;
-        $this->database = $database;
-        $this->fillStatementsWithTableName();
-    }
-
-    /**
-     * Fills the table name into the statements.
-     *
-     * @return $this Current Instance
-     * @access protected
-     */
-    protected function fillStatementsWithTableName()
-    {
-        foreach ($this->fetchStatements as &$statement) {
-            $statement = sprintf($statement, $this->getTableName(), '%s');
-        }
-        $this->insertStatement = sprintf($this->insertStatement, $this->getTableName());
-        $this->deleteStatement = sprintf($this->deleteStatement, $this->getTableName(), '%s');
-        $this->truncateStatement = sprintf($this->truncateStatement, $this->getTableName());
-        return $this;
-    }
-
-    /**
-     * Gets the fetch statement, depending on what you specify
-     *
-     * @param string      $columns    : the column(s) name(s) you want to retrieve from the database
-     * @param string      $id         unique cache content identifier
-     * @param string|null $cache_id   cache id
-     * @param string|null $compile_id compile id
-     *
-     * @access protected
-     * @return \PDOStatement
-     */
-    protected function getFetchStatement($columns, $id, $cache_id = null, $compile_id = null)
-    {
-        $args = array();
-        if (!is_null($cache_id) && !is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCacheIdAndCompileId' ] and
-            $args = array('id' => $id, 'cache_id' => $cache_id, 'compile_id' => $compile_id);
-        } elseif (is_null($cache_id) && !is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCompileId' ] and
-            $args = array('id' => $id, 'compile_id' => $compile_id);
-        } elseif (!is_null($cache_id) && is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCacheId' ] and $args = array('id' => $id, 'cache_id' => $cache_id);
-        } else {
-            $query = $this->fetchStatements[ 'default' ] and $args = array('id' => $id);
-        }
-        $query = sprintf($query, $columns);
-        $stmt = $this->pdo->prepare($query);
-        foreach ($args as $key => $value) {
-            $stmt->bindValue($key, $value);
-        }
-        return $stmt;
-    }
-
-    /**
-     * fetch cached content and its modification time from data source
-     *
-     * @param string      $id         unique cache content identifier
-     * @param string      $name       template name
-     * @param string|null $cache_id   cache id
-     * @param string|null $compile_id compile id
-     * @param string      $content    cached content
-     * @param integer     $mtime      cache modification timestamp (epoch)
-     *
-     * @return void
-     * @access protected
-     */
-    protected function fetch($id, $name, $cache_id = null, $compile_id = null, &$content, &$mtime)
-    {
-        $stmt = $this->getFetchStatement($this->fetchColumns, $id, $cache_id, $compile_id);
-        $stmt->execute();
-        $row = $stmt->fetch();
-        $stmt->closeCursor();
-        if ($row) {
-            $content = $this->outputContent($row[ 'content' ]);
-            $mtime = strtotime($row[ 'modified' ]);
-        } else {
-            $content = null;
-            $mtime = null;
-        }
-    }
-
-    /**
-     * Fetch cached content's modification timestamp from data source
-     * {@internal implementing this method is optional.
-     *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
-     *
-     * @param string      $id         unique cache content identifier
-     * @param string      $name       template name
-     * @param string|null $cache_id   cache id
-     * @param string|null $compile_id compile id
-     *
-     * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-     * @access protected
-     */
-    //    protected function fetchTimestamp($id, $name, $cache_id = null, $compile_id = null) {
-    //        $stmt       =   $this->getFetchStatement($this->fetchTimestampColumns, $id, $cache_id, $compile_id);
-    //        $stmt       ->  execute();
-    //        $mtime      =   strtotime($stmt->fetchColumn());
-    //        $stmt       ->  closeCursor();
-    //        return $mtime;
-    //    }
-    /**
-     * Save content to cache
-     *
-     * @param string       $id         unique cache content identifier
-     * @param string       $name       template name
-     * @param string|null  $cache_id   cache id
-     * @param string|null  $compile_id compile id
-     * @param integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param string       $content    content to cache
-     *
-     * @return boolean success
-     * @access protected
-     */
-    protected function save($id, $name, $cache_id = null, $compile_id = null, $exp_time, $content)
-    {
-        $stmt = $this->pdo->prepare($this->insertStatement);
-        $stmt->bindValue('id', $id);
-        $stmt->bindValue('name', $name);
-        $stmt->bindValue('cache_id', $cache_id, (is_null($cache_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
-        $stmt->bindValue('compile_id', $compile_id, (is_null($compile_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
-        $stmt->bindValue('expire', (int)$exp_time, PDO::PARAM_INT);
-        $stmt->bindValue('content', $this->inputContent($content));
-        $stmt->execute();
-        return !!$stmt->rowCount();
-    }
-
-    /**
-     * Encodes the content before saving to database
-     *
-     * @param string $content
-     *
-     * @return string $content
-     * @access protected
-     */
-    protected function inputContent($content)
-    {
-        return $content;
-    }
-
-    /**
-     * Decodes the content before saving to database
-     *
-     * @param string $content
-     *
-     * @return string $content
-     * @access protected
-     */
-    protected function outputContent($content)
-    {
-        return $content;
-    }
-
-    /**
-     * Delete content from cache
-     *
-     * @param string|null $name       template name
-     * @param string|null $cache_id   cache id
-     * @param string|null $compile_id compile id
-     * @param              integer|null|-1 $exp_time   seconds till expiration or null
-     *
-     * @return integer number of deleted caches
-     * @access             protected
-     */
-    protected function delete($name = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-        // delete the whole cache
-        if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-            // returning the number of deleted caches would require a second query to count them
-            $this->pdo->query($this->truncateStatement);
-            return -1;
-        }
-        // build the filter
-        $where = array();
-        // equal test name
-        if ($name !== null) {
-            $where[] = 'name = ' . $this->pdo->quote($name);
-        }
-        // equal test cache_id and match sub-groups
-        if ($cache_id !== null) {
-            $where[] =
-                '(cache_id = ' .
-                $this->pdo->quote($cache_id) .
-                ' OR cache_id LIKE ' .
-                $this->pdo->quote($cache_id . '|%') .
-                ')';
-        }
-        // equal test compile_id
-        if ($compile_id !== null) {
-            $where[] = 'compile_id = ' . $this->pdo->quote($compile_id);
-        }
-        // for clearing expired caches
-        if ($exp_time === Smarty::CLEAR_EXPIRED) {
-            $where[] = 'expire < CURRENT_TIMESTAMP';
-        } // range test expiration time
-        elseif ($exp_time !== null) {
-            $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
-        }
-        // run delete query
-        $query = $this->pdo->query(sprintf($this->deleteStatement, join(' AND ', $where)));
-        return $query->rowCount();
-    }
-
-    /**
-     * Gets the formatted table name
-     *
-     * @return string
-     * @access protected
-     */
-    protected function getTableName()
-    {
-        return (is_null($this->database)) ? "`{$this->table}`" : "`{$this->database}`.`{$this->table}`";
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
deleted file mode 100644
index 5560b9e39..000000000
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-require_once 'cacheresource.pdo.php';
-
-/**
- * PDO Cache Handler with GZIP support
- * Example usage :
- *      $cnx    =   new PDO("mysql:host=localhost;dbname=mydb", "username", "password");
- *      $smarty->setCachingType('pdo_gzip');
- *      $smarty->loadPlugin('Smarty_CacheResource_Pdo_Gzip');
- *      $smarty->registerCacheResource('pdo_gzip', new Smarty_CacheResource_Pdo_Gzip($cnx, 'smarty_cache'));
- *
- * @require Smarty_CacheResource_Pdo class
- * @author  Beno!t POLASZEK - 2014
- */
-class Smarty_CacheResource_Pdo_Gzip extends Smarty_CacheResource_Pdo
-{
-    /**
-     * Encodes the content before saving to database
-     *
-     * @param string $content
-     *
-     * @return string $content
-     * @access protected
-     */
-    protected function inputContent($content)
-    {
-        return gzdeflate($content);
-    }
-
-    /**
-     * Decodes the content before saving to database
-     *
-     * @param string $content
-     *
-     * @return string $content
-     * @access protected
-     */
-    protected function outputContent($content)
-    {
-        return gzinflate($content);
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/resource.extendsall.php b/vendor/smarty/smarty/demo/plugins/resource.extendsall.php
deleted file mode 100644
index a547d41db..000000000
--- a/vendor/smarty/smarty/demo/plugins/resource.extendsall.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Extends All Resource
- * Resource Implementation modifying the extends-Resource to walk
- * through the template_dirs and inherit all templates of the same name
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
-{
-    /**
-     * populate Source Object with meta data from Resource
-     *
-     * @param Smarty_Template_Source   $source    source object
-     * @param Smarty_Internal_Template $_template template object
-     *
-     * @return void
-     */
-    public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null)
-    {
-        $uid = '';
-        $sources = array();
-        $timestamp = 0;
-        foreach ($source->smarty->getTemplateDir() as $key => $directory) {
-            try {
-                $s = Smarty_Resource::source(null, $source->smarty, 'file:' . '[' . $key . ']' . $source->name);
-                if (!$s->exists) {
-                    continue;
-                }
-                $sources[ $s->uid ] = $s;
-                $uid .= $s->filepath;
-                $timestamp = $s->timestamp > $timestamp ? $s->timestamp : $timestamp;
-            } catch (SmartyException $e) {
-            }
-        }
-        if (!$sources) {
-            $source->exists = false;
-            return;
-        }
-        $sources = array_reverse($sources, true);
-        reset($sources);
-        $s = current($sources);
-        $source->components = $sources;
-        $source->filepath = $s->filepath;
-        $source->uid = sha1($uid . $source->smarty->_joined_template_dir);
-        $source->exists = true;
-        $source->timestamp = $timestamp;
-    }
-
-    /**
-     * Disable timestamp checks for extendsall resource.
-     * The individual source components will be checked.
-     *
-     * @return bool false
-     */
-    public function checkTimestamps()
-    {
-        return false;
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/resource.mysql.php b/vendor/smarty/smarty/demo/plugins/resource.mysql.php
deleted file mode 100644
index 95a3c2baf..000000000
--- a/vendor/smarty/smarty/demo/plugins/resource.mysql.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * MySQL Resource
- * Resource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's templates and configs.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `templates` (
- *   `name` varchar(100) NOT NULL,
- *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- *   `source` text,
- *   PRIMARY KEY (`name`)
- * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
- * world"}{$x}');</pre>
- *
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Mysql extends Smarty_Resource_Custom
-{
-    /**
-     * PDO instance
-     *
-     * @var \PDO
-     */
-    protected $db;
-
-    /**
-     * prepared fetch() statement
-     *
-     * @var \PDOStatement
-     */
-    protected $fetch;
-
-    /**
-     * prepared fetchTimestamp() statement
-     *
-     * @var \PDOStatement
-     */
-    protected $mtime;
-
-    /**
-     * Smarty_Resource_Mysql constructor.
-     *
-     * @throws \SmartyException
-     */
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-        $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
-    }
-
-    /**
-     * Fetch a template and its modification time from database
-     *
-     * @param string  $name   template name
-     * @param string  $source template source
-     * @param integer $mtime  template modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($name, &$source, &$mtime)
-    {
-        $this->fetch->execute(array('name' => $name));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $source = $row[ 'source' ];
-            $mtime = strtotime($row[ 'modified' ]);
-        } else {
-            $source = null;
-            $mtime = null;
-        }
-    }
-
-    /**
-     * Fetch a template's modification time from database
-     *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
-     *       loading the comple template source.
-     *
-     * @param string $name template name
-     *
-     * @return integer timestamp (epoch) the template was modified
-     */
-    protected function fetchTimestamp($name)
-    {
-        $this->mtime->execute(array('name' => $name));
-        $mtime = $this->mtime->fetchColumn();
-        $this->mtime->closeCursor();
-        return strtotime($mtime);
-    }
-}
diff --git a/vendor/smarty/smarty/demo/plugins/resource.mysqls.php b/vendor/smarty/smarty/demo/plugins/resource.mysqls.php
deleted file mode 100644
index 148a8dd61..000000000
--- a/vendor/smarty/smarty/demo/plugins/resource.mysqls.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * MySQL Resource
- * Resource Implementation based on the Custom API to use
- * MySQL as the storage resource for Smarty's templates and configs.
- * Note that this MySQL implementation fetches the source and timestamps in
- * a single database query, instead of two separate like resource.mysql.php does.
- * Table definition:
- * <pre>CREATE TABLE IF NOT EXISTS `templates` (
- *   `name` varchar(100) NOT NULL,
- *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- *   `source` text,
- *   PRIMARY KEY (`name`)
- * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
- * Demo data:
- * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
- * world"}{$x}');</pre>
- *
- *
- * @package Resource-examples
- * @author  Rodney Rehm
- */
-class Smarty_Resource_Mysqls extends Smarty_Resource_Custom
-{
-    /**
-     * PDO instance
-     *
-     * @var \PDO
-     */
-    protected $db;
-
-    /**
-     * prepared fetch() statement
-     *
-     * @var \PDOStatement
-     */
-    protected $fetch;
-
-    /**
-     * Smarty_Resource_Mysqls constructor.
-     *
-     * @throws \SmartyException
-     */
-    public function __construct()
-    {
-        try {
-            $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        } catch (PDOException $e) {
-            throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-        }
-        $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-    }
-
-    /**
-     * Fetch a template and its modification time from database
-     *
-     * @param string  $name   template name
-     * @param string  $source template source
-     * @param integer $mtime  template modification timestamp (epoch)
-     *
-     * @return void
-     */
-    protected function fetch($name, &$source, &$mtime)
-    {
-        $this->fetch->execute(array('name' => $name));
-        $row = $this->fetch->fetch();
-        $this->fetch->closeCursor();
-        if ($row) {
-            $source = $row[ 'source' ];
-            $mtime = strtotime($row[ 'modified' ]);
-        } else {
-            $source = null;
-            $mtime = null;
-        }
-    }
-}
diff --git a/vendor/smarty/smarty/demo/templates/footer.tpl b/vendor/smarty/smarty/demo/templates/footer.tpl
deleted file mode 100644
index e04310fdd..000000000
--- a/vendor/smarty/smarty/demo/templates/footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-</BODY>
-</HTML>
diff --git a/vendor/smarty/smarty/demo/templates/header.tpl b/vendor/smarty/smarty/demo/templates/header.tpl
deleted file mode 100644
index 783210a18..000000000
--- a/vendor/smarty/smarty/demo/templates/header.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>{$title} - {$Name}</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
diff --git a/vendor/smarty/smarty/demo/templates/index.tpl b/vendor/smarty/smarty/demo/templates/index.tpl
deleted file mode 100644
index 1fbb6d379..000000000
--- a/vendor/smarty/smarty/demo/templates/index.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-{config_load file="test.conf" section="setup"}
-{include file="header.tpl" title=foo}
-
-<PRE>
-
-{* bold and title are read from the config file *}
-    {if #bold#}<b>{/if}
-        {* capitalize the first letters of each word of the title *}
-        Title: {#title#|capitalize}
-        {if #bold#}</b>{/if}
-
-    The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-    The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-    Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-    The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-<b>{$Name|upper}</b>
-
-
-An example of a section loop:
-
-    {section name=outer
-    loop=$FirstName}
-        {if $smarty.section.outer.index is odd by 2}
-            {$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-        {else}
-            {$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-        {/if}
-        {sectionelse}
-        none
-    {/section}
-
-    An example of section looped key values:
-
-    {section name=sec1 loop=$contacts}
-        phone: {$contacts[sec1].phone}
-        <br>
-
-            fax: {$contacts[sec1].fax}
-        <br>
-
-            cell: {$contacts[sec1].cell}
-        <br>
-    {/section}
-    <p>
-
-        testing strip tags
-        {strip}
-<table border=0>
-    <tr>
-        <td>
-            <A HREF="{$SCRIPT_NAME}">
-                <font color="red">This is a test </font>
-            </A>
-        </td>
-    </tr>
-</table>
-    {/strip}
-
-</PRE>
-
-This is an example of the html_select_date function:
-
-<form>
-    {html_select_date start_year=1998 end_year=2010}
-</form>
-
-This is an example of the html_select_time function:
-
-<form>
-    {html_select_time use_24_hours=false}
-</form>
-
-This is an example of the html_options function:
-
-<form>
-    <select name=states>
-        {html_options values=$option_values selected=$option_selected output=$option_output}
-    </select>
-</form>
-
-{include file="footer.tpl"}
diff --git a/vendor/smarty/smarty/docs/_config.yml b/vendor/smarty/smarty/docs/_config.yml
deleted file mode 100644
index 2f7efbeab..000000000
--- a/vendor/smarty/smarty/docs/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-minimal
\ No newline at end of file
diff --git a/vendor/smarty/smarty/docs/appendixes/tips.md b/vendor/smarty/smarty/docs/appendixes/tips.md
deleted file mode 100644
index b0ea40cc7..000000000
--- a/vendor/smarty/smarty/docs/appendixes/tips.md
+++ /dev/null
@@ -1,332 +0,0 @@
-Tips & Tricks {#tips}
-=============
-
-Blank Variable Handling {#tips.blank.var.handling}
-=======================
-
-There may be times when you want to print a default value for an empty
-variable instead of printing nothing, such as printing `&nbsp;` so that
-html table backgrounds work properly. Many would use an
-[`{if}`](#language.function.if) statement to handle this, but there is a
-shorthand way with Smarty, using the
-[`default`](#language.modifier.default) variable modifier.
-
-> **Note**
->
-> "Undefined variable" errors will show an E\_NOTICE if not disabled in
-> PHP\'s [`error_reporting()`](&url.php-manual;error_reporting) level or
-> Smarty\'s [`$error_reporting`](#variable.error.reporting) property and
-> a variable had not been assigned to Smarty.
-
-
-    {* the long way *}
-    {if $title eq ''}
-       &nbsp;
-    {else}
-       {$title}
-    {/if}
-
-    {* the short way *}
-    {$title|default:'&nbsp;'}
-
-        
-
-See also [`default`](#language.modifier.default) modifier and [default
-variable handling](#tips.default.var.handling).
-
-Default Variable Handling {#tips.default.var.handling}
-=========================
-
-If a variable is used frequently throughout your templates, applying the
-[`default`](#language.modifier.default) modifier every time it is
-mentioned can get a bit ugly. You can remedy this by assigning the
-variable its default value with the
-[`{assign}`](#language.function.assign) function.
-
-
-    {* do this somewhere at the top of your template *}
-    {assign var='title' value=$title|default:'no title'}
-
-    {* if $title was empty, it now contains the value "no title" when you use it *}
-    {$title}
-
-        
-
-See also [`default`](#language.modifier.default) modifier and [blank
-variable handling](#tips.blank.var.handling).
-
-Passing variable title to header template {#tips.passing.vars}
-=========================================
-
-When the majority of your templates use the same headers and footers, it
-is common to split those out into their own templates and
-[`{include}`](#language.function.include) them. But what if the header
-needs to have a different title, depending on what page you are coming
-from? You can pass the title to the header as an
-[attribute](#language.syntax.attributes) when it is included.
-
-`mainpage.tpl` - When the main page is drawn, the title of "Main Page"
-is passed to the `header.tpl`, and will subsequently be used as the
-title.
-
-
-    {include file='header.tpl' title='Main Page'}
-    {* template body goes here *}
-    {include file='footer.tpl'}
-
-        
-
-`archives.tpl` - When the archives page is drawn, the title will be
-"Archives". Notice in the archive example, we are using a variable from
-the `archives_page.conf` file instead of a hard coded variable.
-
-
-    {config_load file='archive_page.conf'}
-
-    {include file='header.tpl' title=#archivePageTitle#}
-    {* template body goes here *}
-    {include file='footer.tpl'}
-
-        
-
-`header.tpl` - Notice that "Smarty News" is printed if the `$title`
-variable is not set, using the [`default`](#language.modifier.default)
-variable modifier.
-
-
-    <html>
-    <head>
-    <title>{$title|default:'Smarty News'}</title>
-    </head>
-    <body>
-
-        
-
-`footer.tpl`
-
-
-    </body>
-    </html>
-
-        
-
-Dates {#tips.dates}
-=====
-
-As a rule of thumb, always pass dates to Smarty as
-[timestamps](&url.php-manual;time). This allows template designers to
-use the [`date_format`](#language.modifier.date.format) modifier for
-full control over date formatting, and also makes it easy to compare
-dates if necessary.
-
-
-    {$startDate|date_format}
-
-        
-
-This will output:
-
-
-    Jan 4, 2009
-
-        
-
-
-    {$startDate|date_format:"%Y/%m/%d"}
-
-        
-
-This will output:
-
-
-    2009/01/04
-
-        
-
-Dates can be compared in the template by timestamps with:
-
-
-    {if $order_date < $invoice_date}
-       ...do something..
-    {/if}
-
-        
-
-When using [`{html_select_date}`](#language.function.html.select.date)
-in a template, the programmer will most likely want to convert the
-output from the form back into timestamp format. Here is a function to
-help you with that.
-
-
-    <?php
-
-    // this assumes your form elements are named
-    // startDate_Day, startDate_Month, startDate_Year
-
-    $startDate = makeTimeStamp($startDate_Year, $startDate_Month, $startDate_Day);
-
-    function makeTimeStamp($year='', $month='', $day='')
-    {
-       if(empty($year)) {
-           $year = strftime('%Y');
-       }
-       if(empty($month)) {
-           $month = strftime('%m');
-       }
-       if(empty($day)) {
-           $day = strftime('%d');
-       }
-
-       return mktime(0, 0, 0, $month, $day, $year);
-    }
-    ?>
-
-        
-
-See also [`{html_select_date}`](#language.function.html.select.date),
-[`{html_select_time}`](#language.function.html.select.time),
-[`date_format`](#language.modifier.date.format) and
-[`$smarty.now`](#language.variables.smarty.now),
-
-WAP/WML {#tips.wap}
-=======
-
-WAP/WML templates require a php [Content-Type
-header](&url.php-manual;header) to be passed along with the template.
-The easist way to do this would be to write a custom function that
-prints the header. If you are using [caching](#caching), that won\'t
-work so we\'ll do it using the [`{insert}`](#language.function.insert)
-tag; remember `{insert}` tags are not cached! Be sure that there is
-nothing output to the browser before the template, or else the header
-may fail.
-
-
-    <?php
-
-    // be sure apache is configure for the .wml extensions!
-    // put this function somewhere in your application, or in Smarty.addons.php
-    function insert_header($params)
-    {
-       // this function expects $content argument
-       if (empty($params['content'])) {
-           return;
-       }
-       header($params['content']);
-       return;
-    }
-
-    ?>
-
-        
-
-your Smarty template *must* begin with the insert tag :
-
-
-    {insert name=header content="Content-Type: text/vnd.wap.wml"}
-
-    <?xml version="1.0"?>
-    <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
-
-    <!-- begin new wml deck -->
-    <wml>
-     <!-- begin first card -->
-     <card>
-      <do type="accept">
-       <go href="#two"/>
-      </do>
-      <p>
-       Welcome to WAP with Smarty!
-       Press OK to continue...
-      </p>
-     </card>
-     <!-- begin second card -->
-     <card id="two">
-      <p>
-       Pretty easy isn't it?
-      </p>
-     </card>
-    </wml>
-
-        
-
-Componentized Templates {#tips.componentized.templates}
-=======================
-
-Traditionally, programming templates into your applications goes as
-follows: First, you accumulate your variables within your PHP
-application, (maybe with database queries.) Then, you instantiate your
-Smarty object, [`assign()`](#api.assign) the variables and
-[`display()`](#api.display) the template. So lets say for example we
-have a stock ticker on our template. We would collect the stock data in
-our application, then assign these variables in the template and display
-it. Now wouldn\'t it be nice if you could add this stock ticker to any
-application by merely including the template, and not worry about
-fetching the data up front?
-
-You can do this by writing a custom plugin for fetching the content and
-assigning it to a template variable.
-
-`function.load_ticker.php` - drop file in
-[`$plugins directory`](#variable.plugins.dir)
-
-
-    <?php
-
-    // setup our function for fetching stock data
-    function fetch_ticker($symbol)
-    {
-       // put logic here that fetches $ticker_info
-       // from some ticker resource
-       return $ticker_info;
-    }
-
-    function smarty_function_load_ticker($params, $smarty)
-    {
-       // call the function
-       $ticker_info = fetch_ticker($params['symbol']);
-
-       // assign template variable
-       $smarty->assign($params['assign'], $ticker_info);
-    }
-    ?>
-
-        
-
-`index.tpl`
-
-
-    {load_ticker symbol='SMARTY' assign='ticker'}
-
-    Stock Name: {$ticker.name} Stock Price: {$ticker.price}
-
-        
-
-See also [`{include_php}`](#language.function.include.php),
-[`{include}`](#language.function.include) and
-[`{php}`](#language.function.php).
-
-Obfuscating E-mail Addresses {#tips.obfuscating.email}
-============================
-
-Do you ever wonder how your email address gets on so many spam mailing
-lists? One way spammers collect email addresses is from web pages. To
-help combat this problem, you can make your email address show up in
-scrambled javascript in the HTML source, yet it it will look and work
-correctly in the browser. This is done with the
-[`{mailto}`](#language.function.mailto) plugin.
-
-
-    <div id="contact">Send inquiries to
-    {mailto address=$EmailAddress encode='javascript' subject='Hello'}
-    </div>
-
-        
-
-> **Note**
->
-> This method isn\'t 100% foolproof. A spammer could conceivably program
-> his e-mail collector to decode these values, but not likely\....
-> hopefully..yet \... wheres that quantum computer :-?.
-
-See also [`escape`](#language.modifier.escape) modifier and
-[`{mailto}`](#language.function.mailto).
diff --git a/vendor/smarty/smarty/docs/appendixes/troubleshooting.md b/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
deleted file mode 100644
index fe012c12c..000000000
--- a/vendor/smarty/smarty/docs/appendixes/troubleshooting.md
+++ /dev/null
@@ -1,120 +0,0 @@
-Troubleshooting
-===============
-
-Smarty/PHP errors {#smarty.php.errors}
-=================
-
-Smarty can catch many errors such as missing tag attributes or malformed
-variable names. If this happens, you will see an error similar to the
-following:
-
-
-    Warning: Smarty: [in index.tpl line 4]: syntax error: unknown tag - '%blah'
-           in /path/to/smarty/Smarty.class.php on line 1041
-
-    Fatal error: Smarty: [in index.tpl line 28]: syntax error: missing section name
-           in /path/to/smarty/Smarty.class.php on line 1041
-
-        
-
-Smarty shows you the template name, the line number and the error. After
-that, the error consists of the actual line number in the Smarty class
-that the error occurred.
-
-There are certain errors that Smarty cannot catch, such as missing close
-tags. These types of errors usually end up in PHP compile-time parsing
-errors.
-
-
-    Parse error: parse error in /path/to/smarty/templates_c/index.tpl.php on line 75
-
-        
-
-When you encounter a PHP parsing error, the error line number will
-correspond to the compiled PHP script, NOT the template itself. Usually
-you can look at the template and spot the syntax error. Here are some
-common things to look for: missing close tags for
-[`{if}{/if}`](#language.function.if) or
-[`{section}{/section}`](#language.function.if), or syntax of logic
-within an `{if}` tag. If you can\'t find the error, you might have to
-open the compiled PHP file and go to the line number to figure out where
-the corresponding error is in the template.
-
-
-    Warning: Smarty error: unable to read resource: "index.tpl" in...
-    or
-    Warning: Smarty error: unable to read resource: "site.conf" in...
-
--   The [`$template_dir`](#variable.template.dir) is incorrect, doesn\'t
-    exist or the file `index.tpl` is not in the `templates/` directory
-
--   A [`{config_load}`](#language.function.config.load) function is
-    within a template (or [`configLoad()`](#api.config.load) has been
-    called) and either [`$config_dir`](#variable.config.dir) is
-    incorrect, does not exist or `site.conf` is not in the directory.
-
-<!-- -->
-
-
-    Fatal error: Smarty error: the $compile_dir 'templates_c' does not exist,
-    or is not a directory...
-
-        
-
--   Either the [`$compile_dir`](#variable.compile.dir)is incorrectly
-    set, the directory does not exist, or `templates_c` is a file and
-    not a directory.
-
-<!-- -->
-
-
-    Fatal error: Smarty error: unable to write to $compile_dir '....
-
-        
-
--   The [`$compile_dir`](#variable.compile.dir) is not writable by the
-    web server. See the bottom of the [installing
-    smarty](#installing.smarty.basic) page for more about permissions.
-
-<!-- -->
-
-
-    Fatal error: Smarty error: the $cache_dir 'cache' does not exist,
-    or is not a directory. in /..
-
-        
-
--   This means that [`$caching`](#variable.caching) is enabled and
-    either; the [`$cache_dir`](#variable.cache.dir) is incorrectly set,
-    the directory does not exist, or `cache/` is a file and not a
-    directory.
-
-<!-- -->
-
-
-    Fatal error: Smarty error: unable to write to $cache_dir '/...
-
-        
-
--   This means that [`$caching`](#variable.caching) is enabled and the
-    [`$cache_dir`](#variable.cache.dir) is not writable by the web
-    server. See the bottom of the [installing
-    smarty](#installing.smarty.basic) page for permissions.
-
-<!-- -->
-
-
-    Warning: filemtime(): stat failed for /path/to/smarty/cache/3ab50a623e65185c49bf17c63c90cc56070ea85c.one.tpl.php 
-    in /path/to/smarty/libs/sysplugins/smarty_resource.php
-
-       
-
--   This means that your application registered a custom error hander
-    (using [set\_error\_handler()](&url.php-manual;set_error_handler))
-    which is not respecting the given `$errno` as it should. If, for
-    whatever reason, this is the desired behaviour of your custom error
-    handler, please call
-    [`muteExpectedErrors()`](#api.mute.expected.errors) after you\'ve
-    registered your custom error handler.
-
-See also [debugging](#chapter.debugging.console).
diff --git a/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md b/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
deleted file mode 100644
index 6429b4876..000000000
--- a/vendor/smarty/smarty/docs/designers/chapter-debugging-console.md
+++ /dev/null
@@ -1,41 +0,0 @@
-Debugging Console {#chapter.debugging.console}
-=================
-
-There is a debugging console included with Smarty. The console informs
-you of all the [included](./language-builtin-functions/language-function-include.md) templates,
-[assigned](../programmers/api-functions/api-assign.md) variables and
-[config](./language-variables/language-config-variables.md) file variables for the current
-invocation of the template. A template file named `debug.tpl` is
-included with the distribution of Smarty which controls the formatting
-of the console.
-
-Set [`$debugging`](../programmers/api-variables/variable-debugging.md) to TRUE in Smarty, and if needed
-set [`$debug_tpl`](../programmers/api-variables/variable-debug-template.md) to the template resource
-path to `debug.tpl` (this is in [`SMARTY_DIR`](../programmers/smarty-constants.md) by
-default). When you load the page, a Javascript console window will pop
-up and give you the names of all the included templates and assigned
-variables for the current page.
-
-To see the available variables for a particular template, see the
-[`{debug}`](./language-builtin-functions/language-function-debug.md) template function. To disable the
-debugging console, set [`$debugging`](../programmers/api-variables/variable-debugging.md) to FALSE. You
-can also temporarily turn on the debugging console by putting
-`SMARTY_DEBUG` in the URL if you enable this option with
-[`$debugging_ctrl`](../programmers/api-variables/variable-debugging-ctrl.md).
-
-> **Note**
->
-> The debugging console does not work when you use the
-> [`fetch()`](../programmers/api-functions/api-fetch.md) API, only when using
-> [`display()`](../programmers/api-functions/api-display.md). It is a set of javascript statements
-> added to the very bottom of the generated template. If you do not like
-> javascript, you can edit the `debug.tpl` template to format the output
-> however you like. Debug data is not cached and `debug.tpl` info is not
-> included in the output of the debug console.
-
-> **Note**
->
-> The load times of each template and config file are in seconds, or
-> fractions thereof.
-
-See also [troubleshooting](../appendixes/troubleshooting.md).
diff --git a/vendor/smarty/smarty/docs/designers/config-files.md b/vendor/smarty/smarty/docs/designers/config-files.md
deleted file mode 100644
index c840e3a67..000000000
--- a/vendor/smarty/smarty/docs/designers/config-files.md
+++ /dev/null
@@ -1,77 +0,0 @@
-Config Files {#config.files}
-============
-
-Config files are handy for designers to manage global template variables
-from one file. One example is template colors. Normally if you wanted to
-change the color scheme of an application, you would have to go through
-each and every template file and change the colors. With a config file,
-the colors can be kept in one place, and only one file needs to be
-updated.
-
-
-    # global variables
-    pageTitle = "Main Menu"
-    bodyBgColor = #000000
-    tableBgColor = #000000
-    rowBgColor = #00ff00
-
-    [Customer]
-    pageTitle = "Customer Info"
-
-    [Login]
-    pageTitle = "Login"
-    focus = "username"
-    Intro = """This is a value that spans more
-               than one line. you must enclose
-               it in triple quotes."""
-
-    # hidden section
-    [.Database]
-    host=my.example.com
-    db=ADDRESSBOOK
-    user=php-user
-    pass=foobar
-
-      
-
-Values of [config file variables](./language-variables/language-config-variables.md) can be in
-quotes, but not necessary. You can use either single or double quotes.
-If you have a value that spans more than one line, enclose the entire
-value with triple quotes (\"\"\"). You can put comments into config
-files by any syntax that is not a valid config file syntax. We recommend
-using a `
-  #` (hash) at the beginning of the line.
-
-The example config file above has two sections. Section names are
-enclosed in \[brackets\]. Section names can be arbitrary strings not
-containing `[` or `]` symbols. The four variables at the top are global
-variables, or variables not within a section. These variables are always
-loaded from the config file. If a particular section is loaded, then the
-global variables and the variables from that section are also loaded. If
-a variable exists both as a global and in a section, the section
-variable is used. If you name two variables the same within a section,
-the last one will be used unless
-[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md) is disabled.
-
-Config files are loaded into templates with the built-in template
-function [`
-  {config_load}`](./language-builtin-functions/language-function-config-load.md) or the API
-[`configLoad()`](../programmers/api-functions/api-config-load.md) function.
-
-You can hide variables or entire sections by prepending the variable
-name or section name with a period(.) eg `[.hidden]`. This is useful if
-your application reads the config files and gets sensitive data from
-them that the template engine does not need. If you have third parties
-doing template editing, you can be certain that they cannot read
-sensitive data from the config file by loading it into the template.
-
-Config files (or resources) are loaded by the same resource facilities
-as templates. That means that a config file can also be loaded from a db
-`$smarty->configLoad("db:my.conf")`.
-
-See also [`{config_load}`](./language-builtin-functions/language-function-config-load.md),
-[`$config_overwrite`](../programmers/api-variables/variable-config-overwrite.md),
-[`$default_config_handler_func`](../programmers/api-variables/variable-default-config-handler-func.md),
-[`getConfigVars()`](../programmers/api-functions/api-get-config-vars.md),
-[`clearConfig()`](../programmers/api-functions/api-clear-config.md) and
-[`configLoad()`](../programmers/api-functions/api-config-load.md)
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax.md
deleted file mode 100644
index 2509857c3..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Basic Syntax
-============
-
-A simple Smarty template could look like this:
-```html
-<h1>{$title|escape}</h1>
-<ul>
-    {foreach $cities as $city}
-        <li>{$city.name|escape} ({$city.population})</li>
-    {foreachelse}
-        <li>no cities found</li>        
-    {/foreach}
-</ul>
-```
-
-All Smarty template tags are enclosed within delimiters. By default
-these are `{` and `}`, but they can be
-[changed](../programmers/api-variables/variable-left-delimiter.md).
-
-For the examples in this manual, we will assume that you are using the
-default delimiters. In Smarty, all content outside of delimiters is
-displayed as static content, or unchanged. When Smarty encounters
-template tags, it attempts to interpret them, and displays the
-appropriate output in their place.
-
-The basis components of the Smarty syntax are:
-- [Comments](./language-basic-syntax/language-syntax-comments.md)
-- [Variables](./language-basic-syntax/language-syntax-variables.md)
-- [Functions](./language-basic-syntax/language-syntax-functions.md)
-- [Attributes](./language-basic-syntax/language-syntax-attributes.md)
-- [Quotes](./language-basic-syntax/language-syntax-quotes.md)
-- [Math](./language-basic-syntax/language-math.md)
-- [Escaping](./language-basic-syntax/language-escaping.md)
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
deleted file mode 100644
index a62e7de89..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-escaping.md
+++ /dev/null
@@ -1,84 +0,0 @@
-Escaping Smarty Parsing {#language.escaping}
-=======================
-
-It is sometimes desirable or even necessary to have Smarty ignore
-sections it would otherwise parse. A classic example is embedding
-Javascript or CSS code in a template. The problem arises as those
-languages use the { and } characters which are also the default
-[delimiters](#language.function.ldelim) for Smarty.
-
-> **Note**
->
-> A good practice for avoiding escapement altogether is by separating
-> your Javascript/CSS into their own files and use standard HTML methods
-> to access them. This will also take advantage of browser script
-> caching. When you need to embed Smarty variables/functions into your
-> Javascript/CSS, then the following applies.
-
-In Smarty templates, the { and } braces will be ignored so long as they
-are surrounded by white space. This behavior can be disabled by setting
-the Smarty class variable [`$auto_literal`](#variable.auto.literal) to
-false.
-
-
-    <script>
-       // the following braces are ignored by Smarty
-       // since they are surrounded by whitespace
-       function foobar {
-        alert('foobar!');
-       }
-       // this one will need literal escapement
-       {literal}
-        function bazzy {alert('foobar!');}
-       {/literal}
-    </script>
-      
-     
-
-[`{literal}..{/literal}`](#language.function.literal) blocks are used
-for escaping blocks of template logic. You can also escape the braces
-individually with
-[`{ldelim}`](#language.function.ldelim),[`{rdelim}`](#language.function.ldelim)
-tags or
-[`{$smarty.ldelim}`,`{$smarty.rdelim}`](#language.variables.smarty.ldelim)
-variables.
-
-Smarty\'s default delimiters { and } cleanly represent presentational
-content. However if another set of delimiters suit your needs better,
-you can change them with Smarty\'s
-[`$left_delimiter`](#variable.left.delimiter) and
-[`$right_delimiter`](#variable.right.delimiter) values.
-
-> **Note**
->
-> Changing delimiters affects ALL template syntax and escapement. Be
-> sure to clear out cache and compiled files if you decide to change
-> them.
-
-
-    <?php
-
-    $smarty->left_delimiter = '<!--{';
-    $smarty->right_delimiter = '}-->';
-
-    $smarty->assign('foo', 'bar');
-    $smarty->assign('name', 'Albert');
-    $smarty->display('example.tpl');
-
-    ?>
-
-      
-
-Where the template is:
-
-
-    Welcome <!--{$name}--> to Smarty
-    <script language="javascript">
-      var foo = <!--{$foo}-->;
-      function dosomething() {
-        alert("foo is " + foo);
-      }
-      dosomething();
-    </script>
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md
deleted file mode 100644
index dc78a3512..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-math.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Math {#language.math}
-====
-
-Math can be applied directly to variable values.
-
-
-    {$foo+1}
-
-    {$foo*$bar}
-
-    {* some more complicated examples *}
-
-    {$foo->bar-$bar[1]*$baz->foo->bar()-3*7}
-
-    {if ($foo+$bar.test%$baz*134232+10+$b+10)}
-
-    {$foo|truncate:"`$fooTruncCount/$barTruncFactor-1`"}
-
-    {assign var="foo" value="`$foo+$bar`"}
-
-      
-
-> **Note**
->
-> Although Smarty can handle some very complex expressions and syntax,
-> it is a good rule of thumb to keep the template syntax minimal and
-> focused on presentation. If you find your template syntax getting too
-> complex, it may be a good idea to move the bits that do not deal
-> explicitly with presentation to PHP by way of plugins or modifiers.
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
deleted file mode 100644
index 0fa7c7734..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-attributes.md
+++ /dev/null
@@ -1,50 +0,0 @@
-Attributes {#language.syntax.attributes}
-==========
-
-Most of the [functions](#language.syntax.functions) take attributes that
-specify or modify their behavior. Attributes to Smarty functions are
-much like HTML attributes. Static values don\'t have to be enclosed in
-quotes, but it is required for literal strings. Variables with or
-without modifiers may also be used, and should not be in quotes. You can
-even use PHP function results, plugin results and complex expressions.
-
-Some attributes require boolean values (TRUE or FALSE). These can be
-specified as `true` and `false`. If an attribute has no value assigned
-it gets the default boolean value of true.
-
-
-    {include file="header.tpl"}
-
-    {include file="header.tpl" nocache}  // is equivalent to nocache=true
-
-    {include file="header.tpl" attrib_name="attrib value"}
-
-    {include file=$includeFile}
-
-    {include file=#includeFile# title="My Title"}
-
-    {assign var=foo value={counter}}  // plugin result
-
-    {assign var=foo value=substr($bar,2,5)}  // PHP function result
-
-    {assign var=foo value=$bar|strlen}  // using modifier
-
-    {assign var=foo value=$buh+$bar|strlen}  // more complex expression
-
-    {html_select_date display_days=true}
-
-    {mailto address="smarty@example.com"}
-
-    <select name="company_id">
-      {html_options options=$companies selected=$company_id}
-    </select>
-
-      
-
-> **Note**
->
-> Although Smarty can handle some very complex expressions and syntax,
-> it is a good rule of thumb to keep the template syntax minimal and
-> focused on presentation. If you find your template syntax getting too
-> complex, it may be a good idea to move the bits that do not deal
-> explicitly with presentation to PHP by way of plugins or modifiers.
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
deleted file mode 100644
index 43104dbb6..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-comments.md
+++ /dev/null
@@ -1,71 +0,0 @@
-Comments {#language.syntax.comments}
-========
-
-Template comments are surrounded by asterisks, and that is surrounded by
-the [delimiter](#variable.left.delimiter) tags like so:
-
-::: {.informalexample}
-
-    {* this is a comment *}
-
-       
-:::
-
-Smarty comments are NOT displayed in the final output of the template,
-unlike `<!-- HTML comments -->`. These are useful for making internal
-notes in the templates which no one will see ;-)
-
-
-    {* I am a Smarty comment, I don't exist in the compiled output  *}
-    <html>
-    <head>
-    <title>{$title}</title>
-    </head>
-    <body>
-
-    {* another single line smarty comment  *}
-    <!-- HTML comment that is sent to the browser -->
-
-    {* this multiline smarty
-       comment is
-       not sent to browser
-    *}
-
-    {*********************************************************
-    Multi line comment block with credits block
-      @ author:         bg@example.com
-      @ maintainer:     support@example.com
-      @ para:           var that sets block style
-      @ css:            the style output
-    **********************************************************}
-
-    {* The header file with the main logo and stuff  *}
-    {include file='header.tpl'}
-
-
-    {* Dev note:  the $includeFile var is assigned in foo.php script  *}
-    <!-- Displays main content block -->
-    {include file=$includeFile}
-
-    {* this <select> block is redundant *}
-    {*
-    <select name="company">
-      {html_options options=$vals selected=$selected_id}
-    </select>
-    *}
-
-    <!-- Show header from affiliate is disabled -->
-    {* $affiliate|upper *}
-
-    {* you cannot nest comments *}
-    {*
-    <select name="company">
-      {* <option value="0">-- none -- </option> *}
-      {html_options options=$vals selected=$selected_id}
-    </select>
-    *}
-
-    </body>
-    </html>
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md
deleted file mode 100644
index 9c8c94049..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-functions.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Functions {#language.syntax.functions}
-=========
-
-Every Smarty tag either prints a [variable](#language.variables) or
-invokes some sort of function. These are processed and displayed by
-enclosing the function and its [attributes](#language.syntax.attributes)
-within delimiters like so: `{funcname attr1="val1" attr2="val2"}`.
-
-
-    {config_load file="colors.conf"}
-
-    {include file="header.tpl"}
-    {insert file="banner_ads.tpl" title="My Site"}
-
-    {if $logged_in}
-        Welcome, <span style="color:{#fontColor#}">{$name}!</span>
-    {else}
-        hi, {$name}
-    {/if}
-
-    {include file="footer.tpl"}
-
-      
-
--   Both [built-in functions](#language.builtin.functions) and [custom
-    functions](#language.custom.functions) have the same syntax within
-    templates.
-
--   Built-in functions are the **inner** workings of Smarty, such as
-    [`{if}`](#language.function.if),
-    [`{section}`](#language.function.section) and
-    [`{strip}`](#language.function.strip). There should be no need to
-    change or modify them.
-
--   Custom functions are **additional** functions implemented via
-    [plugins](#plugins). They can be modified to your liking, or you can
-    create new ones. [`{html_options}`](#language.function.html.options)
-    is an example of a custom function.
-
-See also [`registerPlugin()`](#api.register.plugin)
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
deleted file mode 100644
index 6fe185c97..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-quotes.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Embedding Vars in Double Quotes {#language.syntax.quotes}
-===============================
-
--   Smarty will recognize [assigned](#api.assign)
-    [variables](#language.syntax.variables) embedded in \"double
-    quotes\" so long as the variable name contains only numbers, letters
-    and under\_scores. See [naming](&url.php-manual;language.variables)
-    for more detail.
-
--   With any other characters, for example a period(.) or
-    `$object->reference`, then the variable must be surrounded by
-    `` `backticks` ``.
-
--   In addition Smarty3 does allow embedded Smarty tags in double quoted
-    strings. This is useful if you want to include variables with
-    modifiers, plugin or PHP function results.
-
-<!-- -->
-
-
-    {func var="test $foo test"}              // sees $foo
-    {func var="test $foo_bar test"}          // sees $foo_bar
-    {func var="test `$foo[0]` test"}         // sees $foo[0]
-    {func var="test `$foo[bar]` test"}       // sees $foo[bar]
-    {func var="test $foo.bar test"}          // sees $foo (not $foo.bar)
-    {func var="test `$foo.bar` test"}        // sees $foo.bar
-    {func var="test `$foo.bar` test"|escape} // modifiers outside quotes!
-    {func var="test {$foo|escape} test"}     // modifiers inside quotes!
-    {func var="test {time()} test"}          // PHP function result
-    {func var="test {counter} test"}         // plugin result
-    {func var="variable foo is {if !$foo}not {/if} defined"} // Smarty block function
-
-      
-
-
-    {* will replace $tpl_name with value *}
-    {include file="subdir/$tpl_name.tpl"}
-
-    {* does NOT replace $tpl_name *}
-    {include file='subdir/$tpl_name.tpl'} // vars require double quotes!
-
-    {* must have backticks as it contains a dot "." *}
-    {cycle values="one,two,`$smarty.config.myval`"}
-
-    {* must have backticks as it contains a dot "." *}
-    {include file="`$module.contact`.tpl"}
-
-    {* can use variable with dot syntax *}
-    {include file="`$module.$view`.tpl"}
-
-      
-
-> **Note**
->
-> Although Smarty can handle some very complex expressions and syntax,
-> it is a good rule of thumb to keep the template syntax minimal and
-> focused on presentation. If you find your template syntax getting too
-> complex, it may be a good idea to move the bits that do not deal
-> explicitly with presentation to PHP by way of plugins or modifiers.
-
-See also [`escape`](#language.modifier.escape).
diff --git a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md b/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
deleted file mode 100644
index 671ad8bb8..000000000
--- a/vendor/smarty/smarty/docs/designers/language-basic-syntax/language-syntax-variables.md
+++ /dev/null
@@ -1,111 +0,0 @@
-Variables {#language.syntax.variables}
-=========
-
-Template variables start with the \$dollar sign. They can contain
-numbers, letters and underscores, much like a [PHP
-variable](&url.php-manual;language.variables). You can reference arrays
-by index numerically or non-numerically. Also reference object
-properties and methods.
-
-[Config file variables](#language.config.variables) are an exception to
-the \$dollar syntax and are instead referenced with surrounding
-\#hashmarks\#, or via the
-[`$smarty.config`](#language.variables.smarty.config) variable.
-
-
-    {$foo}        <-- displaying a simple variable (non array/object)
-    {$foo[4]}     <-- display the 5th element of a zero-indexed array
-    {$foo.bar}    <-- display the "bar" key value of an array, similar to PHP $foo['bar']
-    {$foo.$bar}   <-- display variable key value of an array, similar to PHP $foo[$bar]
-    {$foo->bar}   <-- display the object property "bar"
-    {$foo->bar()} <-- display the return value of object method "bar"
-    {#foo#}       <-- display the config file variable "foo"
-    {$smarty.config.foo} <-- synonym for {#foo#}
-    {$foo[bar]}   <-- syntax only valid in a section loop, see {section}
-    {assign var=foo value='baa'}{$foo} <--  displays "baa", see {assign}
-
-    Many other combinations are allowed
-
-    {$foo.bar.baz}
-    {$foo.$bar.$baz}
-    {$foo[4].baz}
-    {$foo[4].$baz}
-    {$foo.bar.baz[4]}
-    {$foo->bar($baz,2,$bar)} <-- passing parameters
-    {"foo"}       <-- static values are allowed
-
-    {* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
-    {$smarty.server.SERVER_NAME}
-
-    Math and embedding tags:
-
-    {$x+$y}                             // will output the sum of x and y.
-    {assign var=foo value=$x+$y}        // in attributes 
-    {$foo[$x+3]}                        // as array index
-    {$foo={counter}+3}                  // tags within tags
-    {$foo="this is message {counter}"}  // tags within double quoted strings
-
-    Defining Arrays:
-
-    {assign var=foo value=[1,2,3]}
-    {assign var=foo value=['y'=>'yellow','b'=>'blue']}
-    {assign var=foo value=[1,[9,8],3]}   // can be nested
-
-    Short variable assignment:
-
-    {$foo=$bar+2}
-    {$foo = strlen($bar)}               // function in assignment
-    {$foo = myfunct( ($x+$y)*3 )}       // as function parameter 
-    {$foo.bar=1}                        // assign to specific array element
-    {$foo.bar.baz=1}                    
-    {$foo[]=1}                          // appending to an array
-
-    Smarty "dot" syntax (note: embedded {} are used to address ambiguities):
-
-    {$foo.a.b.c}        =>  $foo['a']['b']['c'] 
-    {$foo.a.$b.c}       =>  $foo['a'][$b]['c']         // with variable index
-    {$foo.a.{$b+4}.c}   =>  $foo['a'][$b+4]['c']       // with expression as index
-    {$foo.a.{$b.c}}     =>  $foo['a'][$b['c']]         // with nested index
-
-    PHP-like syntax, alternative to "dot" syntax:
-
-    {$foo[1]}             // normal access
-    {$foo['bar']}
-    {$foo['bar'][1]}
-    {$foo[$x+$x]}         // index may contain any expression
-    {$foo[$bar[1]]}       // nested index
-    {$foo[section_name]}  // smarty {section} access, not array access!
-
-    Variable variables:
-
-    $foo                     // normal variable
-    $foo_{$bar}              // variable name containing other variable 
-    $foo_{$x+$y}             // variable name containing expressions 
-    $foo_{$bar}_buh_{$blar}  // variable name with multiple segments
-    {$foo_{$x}}              // will output the variable $foo_1 if $x has a value of 1.
-
-    Object chaining:
-
-    {$object->method1($x)->method2($y)}
-
-    Direct PHP function access:
-
-    {time()}
-
-
-      
-
-> **Note**
->
-> Although Smarty can handle some very complex expressions and syntax,
-> it is a good rule of thumb to keep the template syntax minimal and
-> focused on presentation. If you find your template syntax getting too
-> complex, it may be a good idea to move the bits that do not deal
-> explicitly with presentation to PHP by way of plugins or modifiers.
-
-Request variables such as `$_GET`, `$_SESSION`, etc are available via
-the reserved [`$smarty`](#language.variables.smarty) variable.
-
-See also [`$smarty`](#language.variables.smarty), [config
-variables](#language.config.variables)
-[`{assign}`](#language.function.assign) and [`assign()`](#api.assign).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions.md
deleted file mode 100644
index 6c0879d6c..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Built-in Functions {#language.builtin.functions}
-==================
-
-## Table of contents
-- [{$var=...}](./language-builtin-functions/language-function-shortform-assign.md)
-- [{append}](./language-builtin-functions/language-function-append.md)
-- [{assign}](./language-builtin-functions/language-function-assign.md)
-- [{block}](./language-builtin-functions/language-function-block.md)
-- [{call}](./language-builtin-functions/language-function-call.md)
-- [{capture}](./language-builtin-functions/language-function-capture.md)
-- [{config_load}](./language-builtin-functions/language-function-config.load)
-- [{debug}](./language-builtin-functions/language-function-debug.md)
-- [{extends}](./language-builtin-functions/language-function-extends.md)
-- [{for}](./language-builtin-functions/language-function-for.md)
-- [{foreach},{foreachelse}](./language-builtin-functions/language-function-foreach.md)
-- [{function}](./language-builtin-functions/language-function-function.md)
-- [{if},{elseif},{else}](./language-builtin-functions/language-function-if.md)
-- [{include}](./language-builtin-functions/language-function-include.md)
-- [{include_php}](./language-builtin-functions/language-function-include.php)
-- [{insert}](./language-builtin-functions/language-function-insert.md)
-- [{ldelim},{rdelim}](./language-builtin-functions/language-function-ldelim.md)
-- [{literal}](./language-builtin-functions/language-function-literal.md)
-- [{nocache}](./language-builtin-functions/language-function-nocache.md)
-- [{section},{sectionelse}](./language-builtin-functions/language-function-section.md)
-- [{setfilter}](./language-builtin-functions/language-function-setfilter.md)
-- [{strip}](./language-builtin-functions/language-function-strip.md)
-- [{while}](./language-builtin-functions/language-function-while.md)
-
-Smarty comes with several built-in functions. These built-in functions
-are the integral part of the smarty template engine. They are compiled
-into corresponding inline PHP code for maximum performance.
-
-You cannot create your own [custom
-functions](./language-custom-functions.md) with the same name; and you
-should not need to modify the built-in functions.
-
-A few of these functions have an `assign` attribute which collects the
-result the function to a named template variable instead of being
-output; much like the [`{assign}`](./language-builtin-functions/language-function-assign.md) function.
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
deleted file mode 100644
index 62f2c7e19..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-append.md
+++ /dev/null
@@ -1,49 +0,0 @@
-{append} {#language.function.append}
-========
-
-`{append}` is used for creating or appending template variable arrays
-**during the execution of a template**.
-
-> **Note**
->
-> Assignment of variables in-template is essentially placing application
-> logic into the presentation that may be better handled in PHP. Use at
-> your own discretion.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ----------------------------------------------------------------------------------------------------
-        var         string     Yes       *n/a*   The name of the variable being assigned
-       value        string     Yes       *n/a*   The value being assigned
-       index        string      No       *n/a*   The index for the new array element. If not specified the value is append to the end of the array.
-       scope        string      No       *n/a*   The scope of the assigned variable: \'parent\',\'root\' or \'global\'
-
-**Option Flags:**
-
-    Name    Description
-  --------- -----------------------------------------------------
-   nocache  Assigns the variable with the \'nocache\' attribute
-
-
-    {append var='name' value='Bob' index='first'}
-    {append var='name' value='Meyer' index='last'}
-    // or 
-    {append 'name' 'Bob' index='first'} {* short-hand *}
-    {append 'name' 'Meyer' index='last'} {* short-hand *}
-
-    The first name is {$name.first}.<br>
-    The last name is {$name.last}.
-
-      
-
-The above example will output:
-
-
-    The first name is Bob.
-    The last name is Meyer.
-
-      
-
-See also [`append()`](#api.append) and
-[`getTemplateVars()`](#api.get.template.vars).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
deleted file mode 100644
index 3d3615bff..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-assign.md
+++ /dev/null
@@ -1,149 +0,0 @@
-{assign} {#language.function.assign}
-========
-
-`{assign}` is used for assigning template variables **during the
-execution of a template**.
-
-> **Note**
->
-> Assignment of variables in-template is essentially placing application
-> logic into the presentation that may be better handled in PHP. Use at
-> your own discretion.
-
-> **Note**
->
-> See also the [`short-form`](#language.function.shortform.assign)
-> method of assigning template vars.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- -----------------------------------------------------------------------
-        var         string     Yes       *n/a*   The name of the variable being assigned
-       value        string     Yes       *n/a*   The value being assigned
-       scope        string      No       *n/a*   The scope of the assigned variable: \'parent\',\'root\' or \'global\'
-
-**Option Flags:**
-
-    Name    Description
-  --------- -----------------------------------------------------
-   nocache  Assigns the variable with the \'nocache\' attribute
-
-
-    {assign var="name" value="Bob"}
-    {assign "name" "Bob"} {* short-hand *}
-
-    The value of $name is {$name}.
-
-      
-
-The above example will output:
-
-
-    The value of $name is Bob.
-
-      
-
-
-    {assign var="name" value="Bob" nocache}
-    {assign "name" "Bob" nocache} {* short-hand *}
-
-    The value of $name is {$name}.
-
-      
-
-The above example will output:
-
-
-    The value of $name is Bob.
-
-      
-
-
-    {assign var=running_total value=$running_total+$some_array[$row].some_value}
-
-      
-
-Variables assigned in the included template will be seen in the
-including template.
-
-
-    {include file="sub_template.tpl"}
-    ...
-    {* display variable assigned in sub_template *}
-    {$foo}<br>
-    ...
-
-      
-
-The template above includes the example `sub_template.tpl` below
-
-
-    ...
-    {* foo will be known also in the including template *}
-    {assign var="foo" value="something" scope=parent}
-    {* bar is assigned only local in the including template *}
-    {assign var="bar" value="value"}
-    ...
-
-You can assign a variable to root of the current root tree. The variable
-is seen by all templates using the same root tree.
-
-
-    {assign var=foo value="bar" scope="root"}
-
-      
-
-A global variable is seen by all templates.
-
-
-    {assign var=foo value="bar" scope="global"}
-    {assign "foo" "bar" scope="global"} {* short-hand *}
-
-      
-
-To access `{assign}` variables from a php script use
-[`getTemplateVars()`](#api.get.template.vars). Here\'s the template that
-creates the variable `$foo`.
-
-
-    {assign var="foo" value="Smarty"}
-
-The template variables are only available after/during template
-execution as in the following script.
-
-
-    <?php
-
-    // this will output nothing as the template has not been executed
-    echo $smarty->getTemplateVars('foo');
-
-    // fetch the template to a variable
-    $whole_page = $smarty->fetch('index.tpl');
-
-    // this will output 'smarty' as the template has been executed
-    echo $smarty->getTemplateVars('foo');
-
-    $smarty->assign('foo','Even smarter');
-
-    // this will output 'Even smarter'
-    echo $smarty->getTemplateVars('foo');
-
-    ?>
-
-The following functions can also *optionally* assign template variables.
-
-[`{capture}`](#language.function.capture),
-[`{include}`](#language.function.include),
-[`{include_php}`](#language.function.include.php),
-[`{insert}`](#language.function.insert),
-[`{counter}`](#language.function.counter),
-[`{cycle}`](#language.function.cycle),
-[`{eval}`](#language.function.eval),
-[`{fetch}`](#language.function.fetch),
-[`{math}`](#language.function.math),
-[`{textformat}`](#language.function.textformat)
-
-See also [`{$var=...}`](#language.function.shortform.assign),
-[`assign()`](#api.assign) and
-[`getTemplateVars()`](#api.get.template.vars).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
deleted file mode 100644
index 941997a55..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-block.md
+++ /dev/null
@@ -1,191 +0,0 @@
-{block} {#language.function.block}
-=======
-
-`{block}` is used to define a named area of template source for template
-inheritance. For details see section of [Template
-Interitance](#advanced.features.template.inheritance).
-
-The `{block}` template source area of a child template will replace the
-correponding areas in the parent template(s).
-
-Optionally `{block}` areas of child and parent templates can be merged
-into each other. You can append or prepend the parent `{block}` content
-by using the `append` or `prepend` option flag with the childs `{block}`
-definition. With the {\$smarty.block.parent} the `{block}` content of
-the parent template can be inserted at any location of the child
-`{block}` content. {\$smarty.block.child} inserts the `{block}` content
-of the child template at any location of the parent `{block}`.
-
-`{blocks}'s` can be nested.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ---------------------------------------
-        name        string     Yes       *n/a*   The name of the template source block
-
-**Option Flags (in child templates only):**
-
-    Name    Description
-  --------- -------------------------------------------------------------------------------------------
-   append   The `{block}` content will be be appended to the content of the parent template `{block}`
-   prepend  The `{block}` content will be prepended to the content of the parent template `{block}`
-    hide    Ignore the block content if no child block of same name is existing.
-   nocache  Disables caching of the `{block}` content
-
-parent.tpl
-
-
-    <html>
-      <head>
-        <title>{block name="title"}Default Title{/block}</title>
-        <title>{block "title"}Default Title{/block}</title>  {* short-hand  *}
-      </head>
-    </html>
-
-      
-
-child.tpl
-
-
-    {extends file="parent.tpl"} 
-    {block name="title"}
-    Page Title
-    {/block}
-
-      
-
-The result would look like
-
-
-    <html>
-      <head>
-        <title>Page Title</title>
-      </head>
-    </html>
-
-parent.tpl
-
-
-    <html>
-      <head>
-        <title>{block name="title"}Title - {/block}</title>
-      </head>
-    </html>
-
-      
-
-child.tpl
-
-
-    {extends file="parent.tpl"} 
-    {block name="title" prepend}
-    Page Title
-    {/block}
-
-      
-
-The result would look like
-
-
-    <html>
-      <head>
-        <title>Title - Page Title</title>
-      </head>
-    </html>
-
-parent.tpl
-
-
-    <html>
-      <head>
-        <title>{block name="title"} is my title{/block}</title>
-      </head>
-    </html>
-
-      
-
-child.tpl
-
-
-    {extends file="parent.tpl"} 
-    {block name="title" append}
-    Page Title
-    {/block}
-
-      
-
-The result would look like
-
-
-    <html>
-      <head>
-        <title>Page title is my titel</title>
-      </head>
-    </html>
-
-parent.tpl
-
-
-    <html>
-      <head>
-        <title>{block name="title"}The {$smarty.block.child} was inserted here{/block}</title>
-      </head>
-    </html>
-
-      
-
-child.tpl
-
-
-    {extends file="parent.tpl"} 
-    {block name="title"}
-    Child Title
-    {/block}
-
-      
-
-The result would look like
-
-
-    <html>
-      <head>
-        <title>The Child Title was inserted here</title>
-      </head>
-    </html>
-
-parent.tpl
-
-
-    <html>
-      <head>
-        <title>{block name="title"}Parent Title{/block}</title>
-      </head>
-    </html>
-
-      
-
-child.tpl
-
-
-    {extends file="parent.tpl"} 
-    {block name="title"}
-    You will see now - {$smarty.block.parent} - here
-    {/block}
-
-      
-
-The result would look like
-
-
-    <html>
-      <head>
-        <title>You will see now - Parent Title - here</title>
-      </head>
-    </html>
-
-See also [Template
-Inheritance](#advanced.features.template.inheritance),
-[`$smarty.block.parent`](#language.variables.smarty.block.parent),
-[`$smarty.block.child`](#language.variables.smarty.block.child), and
-[`{extends}`](#language.function.extends)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
deleted file mode 100644
index 786f0c10c..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-call.md
+++ /dev/null
@@ -1,76 +0,0 @@
-{call} {#language.function.call}
-======
-
-`{call}` is used to call a template function defined by the
-[`{function}`](#language.function.function) tag just like a plugin
-function.
-
-> **Note**
->
-> Template functions are defined global. Since the Smarty compiler is a
-> single-pass compiler, The [`{call}`](#language.function.call) tag must
-> be used to call a template function defined externally from the given
-> template. Otherwise you can directly use the function as
-> `{funcname ...}` in the template.
-
--   The `{call}` tag must have the `name` attribute which contains the
-    the name of the template function.
-
--   Values for variables can be passed to the template function as
-    [attributes](#language.syntax.attributes).
-
-**Attributes:**
-
-   Attribute Name       Type       Required   Default  Description
-  ---------------- -------------- ---------- --------- ------------------------------------------------------------------------------------------
-        name           string        Yes       *n/a*   The name of the template function
-       assign          string         No       *n/a*   The name of the variable that the output of called template function will be assigned to
-    \[var \...\]    \[var type\]      No       *n/a*   variable to pass local to template function
-
-**Option Flags:**
-
-    Name    Description
-  --------- --------------------------------------------
-   nocache  Call the template function in nocache mode
-
-
-    {* define the function *}
-    {function name=menu level=0}
-      <ul class="level{$level}">
-      {foreach $data as $entry}
-        {if is_array($entry)}
-          <li>{$entry@key}</li>
-          {call name=menu data=$entry level=$level+1}
-        {else}
-          <li>{$entry}</li>
-        {/if}
-      {/foreach}
-      </ul>
-    {/function}
-
-    {* create an array to demonstrate *}
-    {$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
-    ['item3-3-1','item3-3-2']],'item4']}
-
-    {* run the array through the function *}
-    {call name=menu data=$menu}
-    {call menu data=$menu} {* short-hand *}
-
-      
-
-Will generate the following output
-
-
-    * item1
-    * item2
-    * item3
-          o item3-1
-          o item3-2
-          o item3-3
-                + item3-3-1
-                + item3-3-2
-    * item4
-
-      
-
-See also [`{function}`](#language.function.function)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
deleted file mode 100644
index 9121b2874..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-capture.md
+++ /dev/null
@@ -1,82 +0,0 @@
-{capture} {#language.function.capture}
-=========
-
-`{capture}` is used to collect the output of the template between the
-tags into a variable instead of displaying it. Any content between
-`{capture name='foo'}` and `{/capture}` is collected into the variable
-specified in the `name` attribute.
-
-The captured content can be used in the template from the variable
-[`$smarty.capture.foo`](#language.variables.smarty.capture) where "foo"
-is the value passed in the `name` attribute. If you do not supply the
-`name` attribute, then "default" will be used as the name ie
-`$smarty.capture.default`.
-
-`{capture}'s` can be nested.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ----------------------------------------------------------------------
-        name        string     Yes       *n/a*   The name of the captured block
-       assign       string      No       *n/a*   The variable name where to assign the captured output to
-       append       string      No       *n/a*   The name of an array variable where to append the captured output to
-
-**Option Flags:**
-
-    Name    Description
-  --------- -----------------------------------------
-   nocache  Disables caching of this captured block
-
-> **Note**
->
-> Be careful when capturing [`{insert}`](#language.function.insert)
-> output. If you have [`$caching`](#caching) enabled and you have
-> [`{insert}`](#language.function.insert) commands that you expect to
-> run within cached content, do not capture this content.
-
-
-    {* we don't want to print a div tag unless content is displayed *}
-    {capture name="banner"}
-    {capture "banner"} {* short-hand *}
-      {include file="get_banner.tpl"}
-    {/capture}
-
-    {if $smarty.capture.banner ne ""}
-    <div id="banner">{$smarty.capture.banner}</div>
-    {/if}
-
-       
-
-This example demonstrates the capture function.
-
-
-    {capture name=some_content assign=popText}
-    {capture some_content assign=popText} {* short-hand *}
-    The server is {$my_server_name|upper} at {$my_server_addr}<br>
-    Your ip is {$my_ip}.
-    {/capture}
-    <a href="#">{$popText}</a>
-
-         
-
-This example also demonstrates how multiple calls of capture can be used
-to create an array with captured content.
-
-
-    {capture append="foo"}hello{/capture}I say just {capture append="foo"}world{/capture}
-    {foreach $foo as $text}{$text} {/foreach}
-
-         
-
-The above example will output:
-
-
-    I say just hello world
-
-      
-
-See also [`$smarty.capture`](#language.variables.smarty.capture),
-[`{eval}`](#language.function.eval),
-[`{fetch}`](#language.function.fetch), [`fetch()`](#api.fetch) and
-[`{assign}`](#language.function.assign).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
deleted file mode 100644
index 750f337c4..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-config-load.md
+++ /dev/null
@@ -1,91 +0,0 @@
-{config\_load} {#language.function.config.load}
-==============
-
-`{config_load}` is used for loading config
-[`#variables#`](#language.config.variables) from a [configuration
-file](#config.files) into the template.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        file        string     Yes       *n/a*   The name of the config file to include
-      section       string      No       *n/a*   The name of the section to load
-       scope        string      no      *local*  How the scope of the loaded variables are treated, which must be one of local, parent or global. local means variables are loaded into the local template context. parent means variables are loaded into both the local context and the parent template that called it. global means variables are available to all templates.
-
-The `example.conf` file.
-
-
-    #this is config file comment
-
-    # global variables
-    pageTitle = "Main Menu"
-    bodyBgColor = #000000
-    tableBgColor = #000000
-    rowBgColor = #00ff00
-
-    #customer variables section
-    [Customer]
-    pageTitle = "Customer Info"
-
-      
-
-and the template
-
-
-    {config_load file="example.conf"}
-    {config_load "example.conf"}  {* short-hand *}
-
-    <html>
-    <title>{#pageTitle#|default:"No title"}</title>
-    <body bgcolor="{#bodyBgColor#}">
-    <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
-       <tr bgcolor="{#rowBgColor#}">
-          <td>First</td>
-          <td>Last</td>
-          <td>Address</td>
-       </tr>
-    </table>
-    </body>
-    </html>
-
-      
-
-[Config Files](#config.files) may also contain sections. You can load
-variables from within a section with the added attribute `section`. Note
-that global config variables are always loaded along with section
-variables, and same-named section variables overwrite the globals.
-
-> **Note**
->
-> Config file *sections* and the built-in template function called
-> [`{section}`](#language.function.section) have nothing to do with each
-> other, they just happen to share a common naming convention.
-
-
-    {config_load file='example.conf' section='Customer'}
-    {config_load 'example.conf' 'Customer'} {* short-hand *}
-
-    <html>
-    <title>{#pageTitle#}</title>
-    <body bgcolor="{#bodyBgColor#}">
-    <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
-       <tr bgcolor="{#rowBgColor#}">
-          <td>First</td>
-          <td>Last</td>
-          <td>Address</td>
-       </tr>
-    </table>
-    </body>
-    </html>
-
-      
-
-See [`$config_overwrite`](#variable.config.overwrite) to create arrays
-of config file variables.
-
-See also the [config files](#config.files) page, [config
-variables](#language.config.variables) page,
-[`$config_dir`](#variable.config.dir),
-[`getConfigVars()`](#api.get.config.vars) and
-[`configLoad()`](#api.config.load).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
deleted file mode 100644
index fbaae1944..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-debug.md
+++ /dev/null
@@ -1,18 +0,0 @@
-{debug} {#language.function.debug}
-=======
-
-`{debug}` dumps the debug console to the page. This works regardless of
-the [debug](#chapter.debugging.console) settings in the php script.
-Since this gets executed at runtime, this is only able to show the
-[assigned](#api.assign) variables; not the templates that are in use.
-However, you can see all the currently available variables within the
-scope of a template.
-
-If caching is enabled and a page is loaded from cache `{debug}` does
-show only the variables which assigned for the cached page.
-
-In order to see also the variables which have been locally assigned
-within the template it does make sense to place the `{debug}` tag at the
-end of the template.
-
-See also the [debugging console page](#chapter.debugging.console).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
deleted file mode 100644
index 9559e7c5e..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-extends.md
+++ /dev/null
@@ -1,37 +0,0 @@
-{extends} {#language.function.extends}
-=========
-
-`{extends}` tags are used in child templates in template inheritance for
-extending parent templates. For details see section of [Template
-Interitance](#advanced.features.template.inheritance).
-
--   The `{extends}` tag must be on the first line of the template.
-
--   If a child template extends a parent template with the `{extends}`
-    tag it may contain only `{block}` tags. Any other template content
-    is ignored.
-
--   Use the syntax for [template resources](#resources) to extend files
-    outside of the [`$template_dir`](#variable.template.dir) directory.
-
-> **Note**
->
-> When extending a variable parent like `{extends file=$parent_file}`,
-> make sure you include `$parent_file` in the
-> [`$compile_id`](#variable.compile.id). Otherwise Smarty cannot
-> distinguish between different `$parent_file`s.
-
-**Attributes:**
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- -------------------------------------------------
-        file        string     Yes       *n/a*   The name of the template file which is extended
-
-
-    {extends file='parent.tpl'}
-    {extends 'parent.tpl'}  {* short-hand *}
-
-      
-
-See also [Template Interitance](#advanced.features.template.inheritance)
-and [`{block}`](#language.function.block).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
deleted file mode 100644
index 0545c1729..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-for.md
+++ /dev/null
@@ -1,97 +0,0 @@
-{for} {#language.function.for}
-=====
-
-The `{for}{forelse}` tag is used to create simple loops. The following
-different formarts are supported:
-
--   `{for $var=$start to $end}` simple loop with step size of 1.
-
--   `{for $var=$start to $end step $step}` loop with individual step
-    size.
-
-`{forelse}` is executed when the loop is not iterated.
-
-**Attributes:**
-
-   Attribute Name   Shorthand    Type     Required   Default  Description
-  ---------------- ----------- --------- ---------- --------- --------------------------------
-        max            n/a      integer      No       *n/a*   Limit the number of iterations
-
-**Option Flags:**
-
-    Name    Description
-  --------- --------------------------------------
-   nocache  Disables caching of the `{for}` loop
-
-
-    <ul>
-    {for $foo=1 to 3}
-        <li>{$foo}</li>
-    {/for}
-    </ul>
-
-      
-
-The above example will output:
-
-
-    <ul>
-        <li>1</li>
-        <li>2</li>
-        <li>3</li>
-    </ul>
-
-      
-
-
-    $smarty->assign('to',10);
-
-      
-
-
-    <ul>
-    {for $foo=3 to $to max=3}
-        <li>{$foo}</li>
-    {/for}
-    </ul>
-
-      
-
-The above example will output:
-
-
-    <ul>
-        <li>3</li>
-        <li>4</li>
-        <li>5</li>
-    </ul>
-
-      
-
-
-    $smarty->assign('start',10);
-    $smarty->assign('to',5);
-
-      
-
-
-    <ul>
-    {for $foo=$start to $to}
-        <li>{$foo}</li>
-    {forelse}
-      no iteration
-    {/for}
-    </ul>
-
-      
-
-The above example will output:
-
-
-      no iteration
-
-      
-
-See also [`{foreach}`](#language.function.foreach),
-[`{section}`](#language.function.section) and
-[`{while}`](#language.function.while)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
deleted file mode 100644
index fdd740148..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-foreach.md
+++ /dev/null
@@ -1,407 +0,0 @@
-{foreach},{foreachelse} {#language.function.foreach}
-=======================
-
-`{foreach}` is used for looping over arrays of data. `{foreach}` has a
-simpler and cleaner syntax than the
-[`{section}`](#language.function.section) loop, and can also loop over
-associative arrays.
-
-`{foreach $arrayvar as $itemvar}`
-
-`{foreach $arrayvar as $keyvar=>$itemvar}`
-
-> **Note**
->
-> This foreach syntax does not accept any named attributes. This syntax
-> is new to Smarty 3, however the Smarty 2.x syntax
-> `{foreach from=$myarray key="mykey" item="myitem"}` is still
-> supported.
-
--   `{foreach}` loops can be nested.
-
--   The `array` variable, usually an array of values, determines the
-    number of times `{foreach}` will loop. You can also pass an integer
-    for arbitrary loops.
-
--   `{foreachelse}` is executed when there are no values in the `array`
-    variable.
-
--   `{foreach}` properties are [`@index`](#foreach.property.index),
-    [`@iteration`](#foreach.property.iteration),
-    [`@first`](#foreach.property.first),
-    [`@last`](#foreach.property.last),
-    [`@show`](#foreach.property.show),
-    [`@total`](#foreach.property.total).
-
--   `{foreach}` constructs are [`{break}`](#foreach.construct.break),
-    [`{continue}`](#foreach.construct.continue).
-
--   Instead of specifying the `key` variable you can access the current
-    key of the loop item by `{$item@key}` (see examples below).
-
-> **Note**
->
-> The `$var@property` syntax is new to Smarty 3, however when using the
-> Smarty 2 `{foreach from=$myarray key="mykey" item="myitem"}` style
-> syntax, the `$smarty.foreach.name.property` syntax is still supported.
-
-> **Note**
->
-> Although you can retrieve the array key with the syntax
-> `{foreach $myArray as $myKey => $myValue}`, the key is always
-> available as `$myValue@key` within the foreach loop.
-
-**Option Flags:**
-
-    Name    Description
-  --------- ------------------------------------------
-   nocache  Disables caching of the `{foreach}` loop
-
-
-    <?php
-    $arr = array('red', 'green', 'blue');
-    $smarty->assign('myColors', $arr);
-    ?>
-
-      
-
-Template to output `$myColors` in an un-ordered list
-
-
-    <ul>
-    {foreach $myColors as $color}
-        <li>{$color}</li>
-    {/foreach}
-    </ul>
-
-      
-
-The above example will output:
-
-
-    <ul>
-        <li>red</li>
-        <li>green</li>
-        <li>blue</li>
-    </ul>
-
-      
-
-
-    <?php
-    $people = array('fname' => 'John', 'lname' => 'Doe', 'email' => 'j.doe@example.com');
-    $smarty->assign('myPeople', $people);
-    ?>
-
-      
-
-Template to output `$myArray` as key/value pairs.
-
-
-    <ul>
-    {foreach $myPeople as $value}
-       <li>{$value@key}: {$value}</li>
-    {/foreach}
-    </ul>
-
-      
-
-The above example will output:
-
-
-    <ul>
-        <li>fname: John</li>
-        <li>lname: Doe</li>
-        <li>email: j.doe@example.com</li>
-    </ul>
-
-      
-
-Assign an array to Smarty, the key contains the key for each looped
-value.
-
-
-    <?php
-     $smarty->assign('contacts', array(
-                                 array('phone' => '555-555-1234',
-                                       'fax' => '555-555-5678',
-                                       'cell' => '555-555-0357'),
-                                 array('phone' => '800-555-4444',
-                                       'fax' => '800-555-3333',
-                                       'cell' => '800-555-2222')
-                                 ));
-    ?>
-
-      
-
-The template to output `$contact`.
-
-
-    {* key always available as a property *}
-    {foreach $contacts as $contact}
-      {foreach $contact as $value}
-        {$value@key}: {$value}
-      {/foreach}
-    {/foreach}
-
-    {* accessing key the PHP syntax alternate *}
-    {foreach $contacts as $contact}
-      {foreach $contact as $key => $value}
-        {$key}: {$value}
-      {/foreach}
-    {/foreach}
-
-      
-
-Either of the above examples will output:
-
-
-      phone: 555-555-1234
-      fax: 555-555-5678
-      cell: 555-555-0357
-      phone: 800-555-4444
-      fax: 800-555-3333
-      cell: 800-555-2222
-
-      
-
-A database (PDO) example of looping over search results. This example is
-looping over a PHP iterator instead of an array().
-
-
-    <?php 
-      include('Smarty.class.php'); 
-
-      $smarty = new Smarty; 
-
-      $dsn = 'mysql:host=localhost;dbname=test'; 
-      $login = 'test'; 
-      $passwd = 'test'; 
-
-      // setting PDO to use buffered queries in mysql is 
-      // important if you plan on using multiple result cursors 
-      // in the template. 
-
-      $db = new PDO($dsn, $login, $passwd, array( 
-         PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true)); 
-
-      $res = $db->prepare("select * from users"); 
-      $res->execute(); 
-      $res->setFetchMode(PDO::FETCH_LAZY); 
-
-      // assign to smarty 
-      $smarty->assign('res',$res); 
-
-      $smarty->display('index.tpl');?>
-    ?>
-
-      
-
-
-    {foreach $res as $r} 
-      {$r.id} 
-      {$r.name}
-    {foreachelse}
-      .. no results .. 
-    {/foreach}
-
-      
-
-The above is assuming the results contain the columns named `id` and
-`name`.
-
-What is the advantage of an iterator vs. looping over a plain old array?
-With an array, all the results are accumulated into memory before being
-looped. With an iterator, each result is loaded/released within the
-loop. This saves processing time and memory, especially for very large
-result sets.
-
-\@index {#foreach.property.index}
--------
-
-`index` contains the current array index, starting with zero.
-
-
-    {* output empty row on the 4th iteration (when index is 3) *}
-    <table>
-    {foreach $items as $i}
-      {if $i@index eq 3}
-         {* put empty table row *}
-         <tr><td>nbsp;</td></tr>
-      {/if}
-      <tr><td>{$i.label}</td></tr>
-    {/foreach}
-    </table>
-
-      
-
-\@iteration {#foreach.property.iteration}
------------
-
-`iteration` contains the current loop iteration and always starts at
-one, unlike [`index`](#foreach.property.index). It is incremented by one
-on each iteration.
-
-The *\"is div by\"* operator can be used to detect a specific iteration.
-Here we bold-face the name every 4th iteration.
-
-
-    {foreach $myNames as $name}
-      {if $name@iteration is div by 4}
-        <b>{$name}</b>
-      {/if}
-      {$name}
-    {/foreach}
-
-The *\"is even by\"* and *\"is odd by\"* operators can be used to
-alternate something every so many iterations. Choosing between even or
-odd rotates which one starts. Here we switch the font color every 3rd
-iteration.
-
-     
-     {foreach $myNames as $name}
-       {if $name@iteration is even by 3}
-         <span style="color: #000">{$name}</span>
-       {else}
-         <span style="color: #eee">{$name}</span>
-       {/if}
-     {/foreach}
-     
-     
-
-This will output something similar to this:
-
-
-        <span style="color: #000">...</span>
-        <span style="color: #000">...</span>
-        <span style="color: #000">...</span>
-        <span style="color: #eee">...</span>
-        <span style="color: #eee">...</span>
-        <span style="color: #eee">...</span>
-        <span style="color: #000">...</span>
-        <span style="color: #000">...</span>
-        <span style="color: #000">...</span>
-        <span style="color: #eee">...</span>
-        <span style="color: #eee">...</span>
-        <span style="color: #eee">...</span>
-        ...
-
-       
-
-\@first {#foreach.property.first}
--------
-
-`first` is TRUE if the current `{foreach}` iteration is the initial one.
-Here we display a table header row on the first iteration.
-
-
-    {* show table header at first iteration *}
-    <table>
-    {foreach $items as $i}
-      {if $i@first}
-        <tr>
-          <th>key</td>
-          <th>name</td>
-        </tr>
-      {/if}
-      <tr>
-        <td>{$i@key}</td>
-        <td>{$i.name}</td>
-      </tr>
-    {/foreach}
-    </table>
-
-      
-
-\@last {#foreach.property.last}
-------
-
-`last` is set to TRUE if the current `{foreach}` iteration is the final
-one. Here we display a horizontal rule on the last iteration.
-
-
-    {* Add horizontal rule at end of list *}
-    {foreach $items as $item}
-      <a href="#{$item.id}">{$item.name}</a>{if $item@last}<hr>{else},{/if}
-    {foreachelse}
-      ... no items to loop ...
-    {/foreach}
-
-      
-
-\@show {#foreach.property.show}
-------
-
-The show `show` property can be used after the execution of a
-`{foreach}` loop to detect if data has been displayed or not. `show` is
-a boolean value.
-
-
-    <ul>
-    {foreach $myArray as $name}
-        <li>{$name}</li>
-    {/foreach}
-    </ul>
-    {if $name@show} do something here if the array contained data {/if}
-
-\@total {#foreach.property.total}
--------
-
-`total` contains the number of iterations that this `{foreach}` will
-loop. This can be used inside or after the `{foreach}`.
-
-
-    {* show number of rows at end *}
-    {foreach $items as $item}
-      {$item.name}<hr/>
-      {if $item@last}
-        <div id="total">{$item@total} items</div>
-      {/if}
-    {foreachelse}
-     ... no items to loop ...
-    {/foreach}
-
-See also [`{section}`](#language.function.section),
-[`{for}`](#language.function.for) and
-[`{while}`](#language.function.while)
-
-{break} {#foreach.construct.break}
--------
-
-`{break}` aborts the iteration of the array
-
-     
-      {$data = [1,2,3,4,5]}
-      {foreach $data as $value}
-        {if $value == 3}
-          {* abort iterating the array *}
-          {break}
-        {/if}
-        {$value}
-      {/foreach}
-      {*
-        prints: 1 2
-      *}
-     
-       
-
-{continue} {#foreach.construct.continue}
-----------
-
-`{continue}` leaves the current iteration and begins with the next
-iteration.
-
-     
-      {$data = [1,2,3,4,5]}
-      {foreach $data as $value}
-        {if $value == 3}
-          {* skip this iteration *}
-          {continue}
-        {/if}
-        {$value}
-      {/foreach}
-      {*
-        prints: 1 2 4 5
-      *}
-     
-       
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
deleted file mode 100644
index 647e4bfc8..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-function.md
+++ /dev/null
@@ -1,88 +0,0 @@
-{function} {#language.function.function}
-==========
-
-`{function}` is used to create functions within a template and call them
-just like a plugin function. Instead of writing a plugin that generates
-presentational content, keeping it in the template is often a more
-manageable choice. It also simplifies data traversal, such as deeply
-nested menus.
-
-> **Note**
->
-> Template functions are defined global. Since the Smarty compiler is a
-> single-pass compiler, The [`{call}`](#language.function.call) tag must
-> be used to call a template function defined externally from the given
-> template. Otherwise you can directly use the function as
-> `{funcname ...}` in the template.
-
--   The `{function}` tag must have the `name` attribute which contains
-    the the name of the template function. A tag with this name can be
-    used to call the template function.
-
--   Default values for variables can be passed to the template function
-    as [attributes](#language.syntax.attributes). Like in PHP function
-    declarations you can only use scalar values as default. The default
-    values can be overwritten when the template function is being
-    called.
-
--   You can use all variables from the calling template inside the
-    template function. Changes to variables or new created variables
-    inside the template function have local scope and are not visible
-    inside the calling template after the template function is executed.
-
-**Attributes:**
-
-   Attribute Name       Type       Required   Default  Description
-  ---------------- -------------- ---------- --------- ---------------------------------------------------------------
-        name           string        Yes       *n/a*   The name of the template function
-    \[var \...\]    \[var type\]      No       *n/a*   default variable value to pass local to the template function
-
-> **Note**
->
-> You can pass any number of parameter to the template function when it
-> is called. The parameter variables must not be declared in the
-> `{funcname ...}` tag unless you what to use default values. Default
-> values must be scalar and can not be variable. Variables must be
-> passed when the template is called.
-
-
-    {* define the function *}
-    {function name=menu level=0}
-    {function menu level=0}          {* short-hand *}
-      <ul class="level{$level}">
-      {foreach $data as $entry}
-        {if is_array($entry)}
-          <li>{$entry@key}</li>
-          {menu data=$entry level=$level+1}
-        {else}
-          <li>{$entry}</li>
-        {/if}
-      {/foreach}
-      </ul>
-    {/function}
-
-    {* create an array to demonstrate *}
-    {$menu = ['item1','item2','item3' => ['item3-1','item3-2','item3-3' =>
-    ['item3-3-1','item3-3-2']],'item4']}
-
-    {* run the array through the function *}
-    {menu data=$menu}
-
-      
-
-Will generate the following output
-
-
-    * item1
-    * item2
-    * item3
-          o item3-1
-          o item3-2
-          o item3-3
-                + item3-3-1
-                + item3-3-2
-    * item4
-
-      
-
-See also [`{call}`](#language.function.call)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
deleted file mode 100644
index 2c1d68eea..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-if.md
+++ /dev/null
@@ -1,121 +0,0 @@
-{if},{elseif},{else} {#language.function.if}
-====================
-
-`{if}` statements in Smarty have much the same flexibility as PHP
-[if](&url.php-manual;if) statements, with a few added features for the
-template engine. Every `{if}` must be paired with a matching `{/if}`.
-`{else}` and `{elseif}` are also permitted. All PHP conditionals and
-functions are recognized, such as *\|\|*, *or*, *&&*, *and*,
-*is\_array()*, etc.
-
-If securty is enabled, only PHP functions from `$php_functions` property
-of the securty policy are allowed. See the
-[Security](#advanced.features.security) section for details.
-
-The following is a list of recognized qualifiers, which must be
-separated from surrounding elements by spaces. Note that items listed in
-\[brackets\] are optional. PHP equivalents are shown where applicable.
-
-       Qualifier        Alternates  Syntax Example           Meaning                          PHP Equivalent
-  -------------------- ------------ ------------------------ -------------------------------- ----------------------
-           ==               eq      \$a eq \$b               equals                           ==
-           !=            ne, neq    \$a neq \$b              not equals                       !=
-           \>               gt      \$a gt \$b               greater than                     \>
-           \<               lt      \$a lt \$b               less than                        \<
-          \>=            gte, ge    \$a ge \$b               greater than or equal            \>=
-          \<=            lte, le    \$a le \$b               less than or equal               \<=
-          ===                       \$a === 0                check for identity               ===
-           !               not      not \$a                  negation (unary)                 !
-           \%              mod      \$a mod \$b              modulous                         \%
-   is \[not\] div by                \$a is not div by 4      divisible by                     \$a % \$b == 0
-    is \[not\] even                 \$a is not even          \[not\] an even number (unary)   \$a % 2 == 0
-   is \[not\] even by               \$a is not even by \$b   grouping level \[not\] even      (\$a / \$b) % 2 == 0
-     is \[not\] odd                 \$a is not odd           \[not\] an odd number (unary)    \$a % 2 != 0
-   is \[not\] odd by                \$a is not odd by \$b    \[not\] an odd grouping          (\$a / \$b) % 2 != 0
-
-
-    {if $name eq 'Fred'}
-        Welcome Sir.
-    {elseif $name eq 'Wilma'}
-        Welcome Ma'am.
-    {else}
-        Welcome, whatever you are.
-    {/if}
-
-    {* an example with "or" logic *}
-    {if $name eq 'Fred' or $name eq 'Wilma'}
-       ...
-    {/if}
-
-    {* same as above *}
-    {if $name == 'Fred' || $name == 'Wilma'}
-       ...
-    {/if}
-
-
-    {* parenthesis are allowed *}
-    {if ( $amount < 0 or $amount > 1000 ) and $volume >= #minVolAmt#}
-       ...
-    {/if}
-
-
-    {* you can also embed php function calls *}
-    {if count($var) gt 0}
-       ...
-    {/if}
-
-    {* check for array. *}
-    {if is_array($foo) }
-       .....
-    {/if}
-
-    {* check for not null. *}
-    {if isset($foo) }
-       .....
-    {/if}
-
-
-    {* test if values are even or odd *}
-    {if $var is even}
-       ...
-    {/if}
-    {if $var is odd}
-       ...
-    {/if}
-    {if $var is not odd}
-       ...
-    {/if}
-
-
-    {* test if var is divisible by 4 *}
-    {if $var is div by 4}
-       ...
-    {/if}
-
-
-    {*
-      test if var is even, grouped by two. i.e.,
-      0=even, 1=even, 2=odd, 3=odd, 4=even, 5=even, etc.
-    *}
-    {if $var is even by 2}
-       ...
-    {/if}
-
-    {* 0=even, 1=even, 2=even, 3=odd, 4=odd, 5=odd, etc. *}
-    {if $var is even by 3}
-       ...
-    {/if}
-
-      
-
-     
-    {if isset($name) && $name == 'Blog'}
-         {* do something *}
-    {elseif $name == $foo}
-        {* do something *}
-    {/if}
-
-    {if is_array($foo) && count($foo) > 0}
-        {* do a foreach loop *}
-    {/if}
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include-php.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include-php.md
deleted file mode 100644
index 8fc074a2b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include-php.md
+++ /dev/null
@@ -1,74 +0,0 @@
-{include\_php} {#language.function.include.php}
-==============
-
-> **Note**
->
-> `{include_php}` is deprecated from Smarty, use registered plugins to
-> properly insulate presentation from the application code. As of Smarty
-> 3.1 the `{include_php}` tags are only available from [SmartyBC](#bc).
-
-   Attribute Name    Type     Required   Default  Description
-  ---------------- --------- ---------- --------- ----------------------------------------------------------------------------------
-        file        string      Yes       *n/a*   The name of the php file to include as absolute path
-        once        boolean      No      *TRUE*   whether or not to include the php file more than once if included multiple times
-       assign       string       No       *n/a*   The name of the variable that the output of include\_php will be assigned to
-
-**Option Flags:**
-
-    Name    Description
-  --------- ----------------------------------------
-   nocache  Disables caching of inluded PHP script
-
-`{include_php}` tags are used to include a php script in your template.
-The path of the attribute `file` can be either absolute, or relative to
-[`$trusted_dir`](#variable.trusted.dir). If security is enabled, then
-the script must be located in the `$trusted_dir` path of the securty
-policy. See the [Security](#advanced.features.security) section for
-details.
-
-By default, php files are only included once even if called multiple
-times in the template. You can specify that it should be included every
-time with the `once` attribute. Setting once to FALSE will include the
-php script each time it is included in the template.
-
-You can optionally pass the `assign` attribute, which will specify a
-template variable name that the output of `{include_php}` will be
-assigned to instead of displayed.
-
-The smarty object is available as `$_smarty_tpl->smarty` within the PHP
-script that you include.
-
-The `load_nav.php` file:
-
-
-    <?php
-
-    // load in variables from a mysql db and assign them to the template
-    require_once('database.class.php');
-    $db = new Db();
-    $db->query('select url, name from navigation order by name');
-    $this->assign('navigation', $db->getRows());
-
-    ?>
-
-      
-
-where the template is:
-
-
-    {* absolute path, or relative to $trusted_dir *}
-    {include_php file='/path/to/load_nav.php'}
-    {include_php '/path/to/load_nav.php'}             {* short-hand *}
-
-    {foreach item='nav' from=$navigation}
-      <a href="{$nav.url}">{$nav.name}</a><br />
-    {/foreach}
-
-      
-
-See also [`{include}`](#language.function.include),
-[`$trusted_dir`](#variable.trusted.dir),
-[`{php}`](#language.function.php),
-[`{capture}`](#language.function.capture), [template
-resources](#resources) and [componentized
-templates](#tips.componentized.templates)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
deleted file mode 100644
index 956d893e6..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-include.md
+++ /dev/null
@@ -1,194 +0,0 @@
-{include} {#language.function.include}
-=========
-
-`{include}` tags are used for including other templates in the current
-template. Any variables available in the current template are also
-available within the included template.
-
--   The `{include}` tag must have the `file` attribute which contains
-    the template resource path.
-
--   Setting the optional `assign` attribute specifies the template
-    variable that the output of `{include}` is assigned to, instead of
-    being displayed. Similar to [`{assign}`](#language.function.assign).
-
--   Variables can be passed to included templates as
-    [attributes](#language.syntax.attributes). Any variables explicitly
-    passed to an included template are only available within the scope
-    of the included file. Attribute variables override current template
-    variables, in the case when they are named the same.
-
--   You can use all variables from the including template inside the
-    included template. But changes to variables or new created variables
-    inside the included template have local scope and are not visible
-    inside the including template after the `{include}` statement. This
-    default behaviour can be changed for all variables assigned in the
-    included template by using the scope attribute at the `{include}`
-    statement or for individual variables by using the scope attribute
-    at the [`{assign}`](#language.function.assign) statement. The later
-    is useful to return values from the included template to the
-    including template.
-
--   Use the syntax for [template resources](#resources) to `{include}`
-    files outside of the [`$template_dir`](#variable.template.dir)
-    directory.
-
-**Attributes:**
-
-   Attribute Name         Type        Required   Default  Description
-  ----------------- ---------------- ---------- --------- --------------------------------------------------------------------------------------------------
-        file             string         Yes       *n/a*   The name of the template file to include
-       assign            string          No       *n/a*   The name of the variable that the output of include will be assigned to
-   cache\_lifetime      integer          No       *n/a*   Enable caching of this subtemplate with an individual cache lifetime
-     compile\_id     string/integer      No       *n/a*   Compile this subtemplate with an individual compile\_id
-      cache\_id      string/integer      No       *n/a*   Enable caching of this subtemplate with an individual cache\_id
-        scope            string          No       *n/a*   Define the scope of all in the subtemplate assigned variables: \'parent\',\'root\' or \'global\'
-    \[var \...\]      \[var type\]       No       *n/a*   variable to pass local to template
-
-**Option Flags:**
-
-    Name    Description
-  --------- -------------------------------------------------------------------------------------
-   nocache  Disables caching of this subtemplate
-   caching  Enable caching of this subtemplate
-   inline   If set merge the compile code of the subtemplate into the compiled calling template
-
-
-    <html>
-    <head>
-      <title>{$title}</title>
-    </head>
-    <body>
-    {include file='page_header.tpl'}
-
-    {* body of template goes here, the $tpl_name variable
-       is replaced with a value eg 'contact.tpl'
-    *}
-    {include file="$tpl_name.tpl"}
-
-    {* using shortform file attribute *}
-    {include 'page_footer.tpl'}
-    </body>
-    </html>
-
-      
-
-
-    {include 'links.tpl' title='Newest links' links=$link_array}
-    {* body of template goes here *}
-    {include 'footer.tpl' foo='bar'}
-
-      
-
-The template above includes the example `links.tpl` below
-
-
-    <div id="box">
-    <h3>{$title}{/h3>
-    <ul>
-    {foreach from=$links item=l}
-    .. do stuff  ...
-    </foreach}
-    </ul>
-    </div>
-
-Variables assigned in the included template will be seen in the
-including template.
-
-
-    {include 'sub_template.tpl' scope=parent}
-    ...
-    {* display variables assigned in sub_template *}
-    {$foo}<br>
-    {$bar}<br>
-    ...
-
-      
-
-The template above includes the example `sub_template.tpl` below
-
-
-    ...
-    {assign var=foo value='something'}
-    {assign var=bar value='value'}
-    ...
-
-The included template will not be cached.
-
-
-    {include 'sub_template.tpl' nocache}
-    ...
-
-      
-
-In this example included template will be cached with an individual
-cache lifetime of 500 seconds.
-
-
-    {include 'sub_template.tpl' cache_lifetime=500}
-    ...
-
-      
-
-In this example included template will be cached independent of the
-global cahing setting.
-
-
-    {include 'sub_template.tpl' caching}
-    ...
-
-      
-
-This example assigns the contents of `nav.tpl` to the `$navbar`
-variable, which is then output at both the top and bottom of the page.
-
-     
-    <body>
-      {include 'nav.tpl' assign=navbar}
-      {include 'header.tpl' title='Smarty is cool'}
-        {$navbar}
-        {* body of template goes here *}
-        {$navbar}
-      {include 'footer.tpl'}
-    </body>
-
-       
-
-This example includes another template relative to the directory of the
-current template.
-
-
-       {include 'template-in-a-template_dir-directory.tpl'}
-       {include './template-in-same-directory.tpl'}
-       {include '../template-in-parent-directory.tpl'}
-
-        
-
-
-    {* absolute filepath *}
-    {include file='/usr/local/include/templates/header.tpl'}
-
-    {* absolute filepath (same thing) *}
-    {include file='file:/usr/local/include/templates/header.tpl'}
-
-    {* windows absolute filepath (MUST use "file:" prefix) *}
-    {include file='file:C:/www/pub/templates/header.tpl'}
-
-    {* include from template resource named "db" *}
-    {include file='db:header.tpl'}
-
-    {* include a $variable template - eg $module = 'contacts' *}
-    {include file="$module.tpl"}
-
-    {* wont work as its single quotes ie no variable substitution *}
-    {include file='$module.tpl'}
-
-    {* include a multi $variable template - eg amber/links.view.tpl *}
-    {include file="$style_dir/$module.$view.tpl"}
-
-      
-
-See also [`{include_php}`](#language.function.include.php),
-[`{insert}`](#language.function.insert),
-[`{php}`](#language.function.php), [template resources](#resources) and
-[componentized templates](#tips.componentized.templates).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md
deleted file mode 100644
index e37c73890..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-insert.md
+++ /dev/null
@@ -1,86 +0,0 @@
-{insert} {#language.function.insert}
-========
-
-> **Note**
->
-> `{insert}` tags are deprecated from Smarty, and should not be used.
-> Put your PHP logic in PHP scripts or plugin functions instead.
-
-> **Note**
->
-> As of Smarty 3.1 the `{insert}` tags are only available from
-> [SmartyBC](#bc).
-
-`{insert}` tags work much like [`{include}`](#language.function.include)
-tags, except that `{insert}` tags are NOT cached when template
-[caching](#caching) is enabled. They will be executed on every
-invocation of the template.
-
-   Attribute Name       Type       Required   Default  Description
-  ---------------- -------------- ---------- --------- ----------------------------------------------------------------------------------
-        name           string        Yes       *n/a*   The name of the insert function (insert\_`name`) or insert plugin
-       assign          string         No       *n/a*   The name of the template variable the output will be assigned to
-       script          string         No       *n/a*   The name of the php script that is included before the insert function is called
-    \[var \...\]    \[var type\]      No       *n/a*   variable to pass to insert function
-
-Let\'s say you have a template with a banner slot at the top of the
-page. The banner can contain any mixture of HTML, images, flash, etc. so
-we can\'t just use a static link here, and we don\'t want this contents
-cached with the page. In comes the {insert} tag: the template knows
-\#banner\_location\_id\# and \#site\_id\# values (gathered from a
-[config file](#config.files)), and needs to call a function to get the
-banner contents.
-
-    {* example of fetching a banner *}
-    {insert name="getBanner" lid=#banner_location_id# sid=#site_id#}
-    {insert "getBanner" lid=#banner_location_id# sid=#site_id#} {* short-hand *}
-
-In this example, we are using the name "getBanner" and passing the
-parameters \#banner\_location\_id\# and \#site\_id\#. Smarty will look
-for a function named insert\_getBanner() in your PHP application,
-passing the values of \#banner\_location\_id\# and \#site\_id\# as the
-first argument in an associative array. All {insert} function names in
-your application must be prepended with \"insert\_\" to remedy possible
-function name-space conflicts. Your insert\_getBanner() function should
-do something with the passed values and return the results. These
-results are then displayed in the template in place of the {insert} tag.
-In this example, Smarty would call this function:
-insert\_getBanner(array(\"lid\" =\> \"12345\",\"sid\" =\> \"67890\"));
-and display the returned results in place of the {insert} tag.
-
--   If you supply the `assign` attribute, the output of the `{insert}`
-    tag will be assigned to this template variable instead of being
-    output to the template.
-
-    > **Note**
-    >
-    > Assigning the output to a template variable isn\'t too useful with
-    > [caching](#variable.caching) enabled.
-
--   If you supply the `script` attribute, this php script will be
-    included (only once) before the `{insert}` function is executed.
-    This is the case where the insert function may not exist yet, and a
-    php script must be included first to make it work.
-
-    The path can be either absolute, or relative to
-    [`$trusted_dir`](#variable.trusted.dir). If security is enabled,
-    then the script must be located in the `$trusted_dir` path of the
-    securty policy. See the [Security](#advanced.features.security)
-    section for details.
-
-The Smarty object is passed as the second argument. This way you can
-reference and modify information in the Smarty object from within the
-`{insert}` function.
-
-If no PHP script can be found Smarty is looking for a corresponding
-insert plugin.
-
-> **Note**
->
-> It is possible to have portions of the template not cached. If you
-> have [caching](#caching) turned on, `{insert}` tags will not be
-> cached. They will run dynamically every time the page is created, even
-> within cached pages. This works good for things like banners, polls,
-> live weather, search results, user feedback areas, etc.
-
-See also [`{include}`](#language.function.include)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
deleted file mode 100644
index 2afda031a..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-ldelim.md
+++ /dev/null
@@ -1,55 +0,0 @@
-{ldelim},{rdelim} {#language.function.ldelim}
-=================
-
-`{ldelim}` and `{rdelim}` are used for [escaping](#language.escaping)
-template delimiters, by default **{** and **}**. You can also use
-[`{literal}{/literal}`](#language.function.literal) to escape blocks of
-text eg Javascript or CSS. See also the complementary
-[`{$smarty.ldelim}`](#language.variables.smarty.ldelim).
-
-
-    {* this will print literal delimiters out of the template *}
-
-    {ldelim}funcname{rdelim} is how functions look in Smarty!
-
-       
-
-The above example will output:
-
-
-    {funcname} is how functions look in Smarty!
-
-       
-
-Another example with some Javascript
-
-
-    <script language="JavaScript">
-    function foo() {ldelim}
-        ... code ...
-    {rdelim}
-    </script>
-
-       
-
-will output
-
-
-    <script language="JavaScript">
-    function foo() {
-        .... code ...
-    }
-    </script>
-
-       
-
-
-    <script language="JavaScript" type="text/javascript">
-        function myJsFunction(){ldelim}
-            alert("The server name\n{$smarty.server.SERVER_NAME}\n{$smarty.server.SERVER_ADDR}");
-        {rdelim}
-    </script>
-    <a href="javascript:myJsFunction()">Click here for Server Info</a>
-
-See also [`{literal}`](#language.function.literal) and [escaping Smarty
-parsing](#language.escaping).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
deleted file mode 100644
index 27ebb3ff4..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-literal.md
+++ /dev/null
@@ -1,36 +0,0 @@
-{literal} {#language.function.literal}
-=========
-
-`{literal}` tags allow a block of data to be taken literally. This is
-typically used around Javascript or stylesheet blocks where {curly
-braces} would interfere with the template
-[delimiter](#variable.left.delimiter) syntax. Anything within
-`{literal}{/literal}` tags is not interpreted, but displayed as-is. If
-you need template tags embedded in a `{literal}` block, consider using
-[`{ldelim}{rdelim}`](#language.function.ldelim) to escape the individual
-delimiters instead.
-
-> **Note**
->
-> `{literal}{/literal}` tags are normally not necessary, as Smarty
-> ignores delimiters that are surrounded by whitespace. Be sure your
-> javascript and CSS curly braces are surrounded by whitespace. This is
-> new behavior to Smarty 3.
-
-
-    <script>
-       // the following braces are ignored by Smarty
-       // since they are surrounded by whitespace
-       function myFoo {
-         alert('Foo!');
-       }
-       // this one will need literal escapement
-       {literal}
-         function myBar {alert('Bar!');}
-       {/literal}
-    </script>
-
-      
-
-See also [`{ldelim} {rdelim}`](#language.function.ldelim) and the
-[escaping Smarty parsing](#language.escaping) page.
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
deleted file mode 100644
index a5922f838..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-nocache.md
+++ /dev/null
@@ -1,23 +0,0 @@
-{nocache} {#language.function.nocache}
-=========
-
-`{nocache}` is used to disable caching of a template section. Every
-`{nocache}` must be paired with a matching `{/nocache}`.
-
-> **Note**
->
-> Be sure any variables used within a non-cached section are also
-> assigned from PHP when the page is loaded from the cache.
-
-
-
-    Today's date is
-    {nocache}
-    {$smarty.now|date_format}
-    {/nocache}
-
-       
-
-The above code will output the current date on a cached page.
-
-See also the [caching section](#caching).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
deleted file mode 100644
index 0bab5c715..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-section.md
+++ /dev/null
@@ -1,644 +0,0 @@
-{section},{sectionelse} {#language.function.section}
-=======================
-
-A `{section}` is for looping over **sequentially indexed arrays of
-data**, unlike [`{foreach}`](#language.function.foreach) which is used
-to loop over a **single associative array**. Every `{section}` tag must
-be paired with a closing `{/section}` tag.
-
-> **Note**
->
-> The [`{foreach}`](#language.function.foreach) loop can do everything a
-> {section} loop can do, and has a simpler and easier syntax. It is
-> usually preferred over the {section} loop.
-
-> **Note**
->
-> {section} loops cannot loop over associative arrays, they must be
-> numerically indexed, and sequential (0,1,2,\...). For associative
-> arrays, use the [`{foreach}`](#language.function.foreach) loop.
-
-   Attribute Name    Type     Required   Default  Description
-  ---------------- --------- ---------- --------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        name        string      Yes       *n/a*   The name of the section
-        loop         mixed      Yes       *n/a*   Value to determine the number of loop iterations
-       start        integer      No        *0*    The index position that the section will begin looping. If the value is negative, the start position is calculated from the end of the array. For example, if there are seven values in the loop array and start is -2, the start index is 5. Invalid values (values outside of the length of the loop array) are automatically truncated to the closest valid value.
-        step        integer      No        *1*    The step value that will be used to traverse the loop array. For example, step=2 will loop on index 0,2,4, etc. If step is negative, it will step through the array backwards.
-        max         integer      No       *n/a*   Sets the maximum number of times the section will loop.
-        show        boolean      No      *TRUE*   Determines whether or not to show this section
-
-**Option Flags:**
-
-    Name    Description
-  --------- ------------------------------------------
-   nocache  Disables caching of the `{section}` loop
-
--   Required attributes are `name` and `loop`.
-
--   The `name` of the `{section}` can be anything you like, made up of
-    letters, numbers and underscores, like [PHP
-    variables](&url.php-manual;language.variables).
-
--   {section}\'s can be nested, and the nested `{section}` names must be
-    unique from each other.
-
--   The `loop` attribute, usually an array of values, determines the
-    number of times the `{section}` will loop. You can also pass an
-    integer as the loop value.
-
--   When printing a variable within a `{section}`, the `{section}`
-    `name` must be given next to variable name within \[brackets\].
-
--   `{sectionelse}` is executed when there are no values in the loop
-    variable.
-
--   A `{section}` also has its own variables that handle `{section}`
-    properties. These properties are accessible as:
-    [`{$smarty.section.name.property}`](#language.variables.smarty.loops)
-    where "name" is the attribute `name`.
-
--   `{section}` properties are [`index`](#section.property.index),
-    [`index_prev`](#section.property.index.prev),
-    [`index_next`](#section.property.index.next),
-    [`iteration`](#section.property.iteration),
-    [`first`](#section.property.first),
-    [`last`](#section.property.last),
-    [`rownum`](#section.property.rownum),
-    [`loop`](#section.property.loop), [`show`](#section.property.show),
-    [`total`](#section.property.total).
-
-[`assign()`](#api.assign) an array to Smarty
-
-
-    <?php
-    $data = array(1000,1001,1002);
-    $smarty->assign('custid',$data);
-    ?>
-
-The template that outputs the array
-
-
-    {* this example will print out all the values of the $custid array *}
-    {section name=customer loop=$custid}
-    {section customer $custid} {* short-hand *}
-      id: {$custid[customer]}<br />
-    {/section}
-    <hr />
-    {*  print out all the values of the $custid array reversed *}
-    {section name=foo loop=$custid step=-1}
-    {section foo $custid step=-1} {* short-hand *}
-      {$custid[foo]}<br />
-    {/section}
-
-      
-
-The above example will output:
-
-
-    id: 1000<br />
-    id: 1001<br />
-    id: 1002<br />
-    <hr />
-    id: 1002<br />
-    id: 1001<br />
-    id: 1000<br />
-
-      
-
-
-    {section name=foo start=10 loop=20 step=2}
-      {$smarty.section.foo.index}
-    {/section}
-    <hr />
-    {section name=bar loop=21 max=6 step=-2}
-      {$smarty.section.bar.index}
-    {/section}
-
-The above example will output:
-
-      
-    10 12 14 16 18
-    <hr />
-    20 18 16 14 12 10
-
-      
-
-The `name` of the `{section}` can be anything you like, see [PHP
-variables](&url.php-manual;language.variables). It is used to reference
-the data within the `{section}`.
-
-
-    {section name=anything loop=$myArray}
-      {$myArray[anything].foo}
-      {$name[anything]}
-      {$address[anything].bar}
-    {/section}
-
-      
-
-This is an example of printing an associative array of data with a
-`{section}`. Following is the php script to assign the `$contacts` array
-to Smarty.
-
-      
-    <?php
-    $data = array(
-              array('name' => 'John Smith', 'home' => '555-555-5555',
-                    'cell' => '666-555-5555', 'email' => 'john@myexample.com'),
-              array('name' => 'Jack Jones', 'home' => '777-555-5555',
-                    'cell' => '888-555-5555', 'email' => 'jack@myexample.com'),
-              array('name' => 'Jane Munson', 'home' => '000-555-5555',
-                    'cell' => '123456', 'email' => 'jane@myexample.com')
-            );
-    $smarty->assign('contacts',$data);
-    ?>
-
-      
-
-The template to output `$contacts`
-
-
-    {section name=customer loop=$contacts}
-    <p>
-      name: {$contacts[customer].name}<br />
-      home: {$contacts[customer].home}<br />
-      cell: {$contacts[customer].cell}<br />
-      e-mail: {$contacts[customer].email}
-    </p>
-    {/section}
-
-      
-
-The above example will output:
-
-
-    <p>
-      name: John Smith<br />
-      home: 555-555-5555<br />
-      cell: 666-555-5555<br />
-      e-mail: john@myexample.com
-    </p>
-    <p>
-      name: Jack Jones<br />
-      home phone: 777-555-5555<br />
-      cell phone: 888-555-5555<br />
-      e-mail: jack@myexample.com
-    </p>
-    <p>
-      name: Jane Munson<br />
-      home phone: 000-555-5555<br />
-      cell phone: 123456<br />
-      e-mail: jane@myexample.com
-    </p>
-
-      
-
-This example assumes that `$custid`, `$name` and `$address` are all
-arrays containing the same number of values. First the php script that
-assign\'s the arrays to Smarty.
-
-
-    <?php
-
-    $id = array(1001,1002,1003);
-    $smarty->assign('custid',$id);
-
-    $fullnames = array('John Smith','Jack Jones','Jane Munson');
-    $smarty->assign('name',$fullnames);
-
-    $addr = array('253 Abbey road', '417 Mulberry ln', '5605 apple st');
-    $smarty->assign('address',$addr);
-
-    ?>
-
-The `loop` variable only determines the number of times to loop. You can
-access ANY variable from the template within the `{section}`. This is
-useful for looping multiple arrays. You can pass an array which will
-determine the loop count by the array size, or you can pass an integer
-to specify the number of loops.
-
-
-    {section name=customer loop=$custid}
-    <p>
-      id: {$custid[customer]}<br />
-      name: {$name[customer]}<br />
-      address: {$address[customer]}
-    </p>
-    {/section}
-
-      
-
-The above example will output:
-
-
-    <p>
-      id: 1000<br />
-      name: John Smith<br />
-      address: 253 Abbey road
-    </p>
-    <p>
-      id: 1001<br />
-      name: Jack Jones<br />
-      address: 417 Mulberry ln
-    </p>
-    <p>
-      id: 1002<br />
-      name: Jane Munson<br />
-      address: 5605 apple st
-    </p>
-
-      
-
-{section}\'s can be nested as deep as you like. With nested
-{section}\'s, you can access complex data structures, such as
-multi-dimensional arrays. This is an example `.php` script thats
-assign\'s the arrays.
-
-
-    <?php
-
-    $id = array(1001,1002,1003);
-    $smarty->assign('custid',$id);
-
-    $fullnames = array('John Smith','Jack Jones','Jane Munson');
-    $smarty->assign('name',$fullnames);
-
-    $addr = array('253 N 45th', '417 Mulberry ln', '5605 apple st');
-    $smarty->assign('address',$addr);
-
-    $types = array(
-               array( 'home phone', 'cell phone', 'e-mail'),
-               array( 'home phone', 'web'),
-               array( 'cell phone')
-             );
-    $smarty->assign('contact_type', $types);
-
-    $info = array(
-               array('555-555-5555', '666-555-5555', 'john@myexample.com'),
-               array( '123-456-4', 'www.example.com'),
-               array( '0457878')
-            );
-    $smarty->assign('contact_info', $info);
-
-    ?>
-      
-
-In this template, *\$contact\_type\[customer\]* is an array of contact
-types for the current customer.
-
-
-    {section name=customer loop=$custid}
-    <hr>
-      id: {$custid[customer]}<br />
-      name: {$name[customer]}<br />
-      address: {$address[customer]}<br />
-      {section name=contact loop=$contact_type[customer]}
-        {$contact_type[customer][contact]}: {$contact_info[customer][contact]}<br />
-      {/section}
-    {/section}
-
-      
-
-The above example will output:
-
-
-    <hr>
-      id: 1000<br />
-      name: John Smith<br />
-      address: 253 N 45th<br />
-        home phone: 555-555-5555<br />
-        cell phone: 666-555-5555<br />
-        e-mail: john@myexample.com<br />
-    <hr>
-      id: 1001<br />
-      name: Jack Jones<br />
-      address: 417 Mulberry ln<br />
-        home phone: 123-456-4<br />
-        web: www.example.com<br />
-    <hr>
-      id: 1002<br />
-      name: Jane Munson<br />
-      address: 5605 apple st<br />
-        cell phone: 0457878<br />
-
-      
-
-Results of a database search (eg ADODB or PEAR) are assigned to Smarty
-
-      
-    <?php
-    $sql = 'select id, name, home, cell, email from contacts '
-          ."where name like '$foo%' ";
-    $smarty->assign('contacts', $db->getAll($sql));
-    ?>
-
-The template to output the database result in a HTML table
-
-
-    <table>
-    <tr><th>&nbsp;</th><th>Name></th><th>Home</th><th>Cell</th><th>Email</th></tr>
-    {section name=co loop=$contacts}
-      <tr>
-        <td><a href="view.php?id={$contacts[co].id}">view<a></td>
-        <td>{$contacts[co].name}</td>
-        <td>{$contacts[co].home}</td>
-        <td>{$contacts[co].cell}</td>
-        <td>{$contacts[co].email}</td>
-      <tr>
-    {sectionelse}
-      <tr><td colspan="5">No items found</td></tr>
-    {/section}
-    </table>
-
-.index {#section.property.index}
-------
-
-`index` contains the current array index, starting with zero or the
-`start` attribute if given. It increments by one or by the `step`
-attribute if given.
-
-> **Note**
->
-> If the `step` and `start` properties are not modified, then this works
-> the same as the [`iteration`](#section.property.iteration) property,
-> except it starts at zero instead of one.
-
-> **Note**
->
-> `$custid[customer.index]` and `$custid[customer]` are identical.
-
-
-    {section name=customer loop=$custid}
-      {$smarty.section.customer.index} id: {$custid[customer]}<br />
-    {/section}
-
-      
-
-The above example will output:
-
-
-    0 id: 1000<br />
-    1 id: 1001<br />
-    2 id: 1002<br />
-
-       
-
-.index\_prev {#section.property.index.prev}
-------------
-
-`index_prev` is the previous loop index. On the first loop, this is set
-to -1.
-
-.index\_next {#section.property.index.next}
-------------
-
-`index_next` is the next loop index. On the last loop, this is still one
-more than the current index, respecting the setting of the `step`
-attribute, if given.
-
-
-    <?php
-    $data = array(1001,1002,1003,1004,1005);
-    $smarty->assign('rows',$data);
-    ?>
-
-Template to output the above array in a table
-
-
-    {* $rows[row.index] and $rows[row] are identical in meaning *}
-    <table>
-      <tr>
-        <th>index</th><th>id</th>
-        <th>index_prev</th><th>prev_id</th>
-        <th>index_next</th><th>next_id</th>
-      </tr>
-    {section name=row loop=$rows}
-      <tr>
-        <td>{$smarty.section.row.index}</td><td>{$rows[row]}</td>
-        <td>{$smarty.section.row.index_prev}</td><td>{$rows[row.index_prev]}</td>
-        <td>{$smarty.section.row.index_next}</td><td>{$rows[row.index_next]}</td>
-      </tr>
-    {/section}
-    </table>
-
-      
-
-The above example will output a table containing the following:
-
-
-    index  id    index_prev prev_id index_next next_id
-    0      1001  -1                 1          1002
-    1      1002  0          1001    2          1003
-    2      1003  1          1002    3          1004
-    3      1004  2          1003    4          1005
-    4      1005  3          1004    5
-
-       
-
-.iteration {#section.property.iteration}
-----------
-
-`iteration` contains the current loop iteration and starts at one.
-
-> **Note**
->
-> This is not affected by the `{section}` properties `start`, `step` and
-> `max`, unlike the [`index`](#section.property.index) property.
-> `iteration` also starts with one instead of zero unlike `index`.
-> [`rownum`](#section.property.rownum) is an alias to `iteration`, they
-> are identical.
-
-
-    <?php
-    // array of 3000 to 3015
-    $id = range(3000,3015);
-    $smarty->assign('arr',$id);
-    ?>
-
-Template to output every other element of the `$arr` array as `step=2`
-
-
-    {section name=cu loop=$arr start=5 step=2}
-      iteration={$smarty.section.cu.iteration}
-      index={$smarty.section.cu.index}
-      id={$custid[cu]}<br />
-    {/section}
-
-      
-
-The above example will output:
-
-
-    iteration=1 index=5 id=3005<br />
-    iteration=2 index=7 id=3007<br />
-    iteration=3 index=9 id=3009<br />
-    iteration=4 index=11 id=3011<br />
-    iteration=5 index=13 id=3013<br />
-    iteration=6 index=15 id=3015<br />
-
-       
-
-Another example that uses the `iteration` property to output a table
-header block every five rows.
-
-
-    <table>
-    {section name=co loop=$contacts}
-      {if $smarty.section.co.iteration is div by 5}
-        <tr><th>&nbsp;</th><th>Name></th><th>Home</th><th>Cell</th><th>Email</th></tr>
-      {/if}
-      <tr>
-        <td><a href="view.php?id={$contacts[co].id}">view<a></td>
-        <td>{$contacts[co].name}</td>
-        <td>{$contacts[co].home}</td>
-        <td>{$contacts[co].cell}</td>
-        <td>{$contacts[co].email}</td>
-      <tr>
-    {/section}
-    </table>
-
-      
-
-An that uses the `iteration` property to alternate a text color every
-third row.
-
-      
-      <table>
-      {section name=co loop=$contacts}
-        {if $smarty.section.co.iteration is even by 3}
-          <span style="color: #ffffff">{$contacts[co].name}</span>
-        {else}
-          <span style="color: #dddddd">{$contacts[co].name}</span>
-        {/if}
-      {/section}
-      </table>
-      
-        
-
-> **Note**
->
-> The *\"is div by\"* syntax is a simpler alternative to the PHP mod
-> operator syntax. The mod operator is allowed:
-> `{if $smarty.section.co.iteration % 5 == 1}` will work just the same.
-
-> **Note**
->
-> You can also use *\"is odd by\"* to reverse the alternating.
-
-.first {#section.property.first}
-------
-
-`first` is set to TRUE if the current `{section}` iteration is the
-initial one.
-
-.last {#section.property.last}
------
-
-`last` is set to TRUE if the current section iteration is the final one.
-
-This example loops the `$customers` array, outputs a header block on the
-first iteration and on the last outputs the footer block. Also uses the
-[`total`](#section.property.total) property.
-
-
-    {section name=customer loop=$customers}
-      {if $smarty.section.customer.first}
-        <table>
-        <tr><th>id</th><th>customer</th></tr>
-      {/if}
-
-      <tr>
-        <td>{$customers[customer].id}}</td>
-        <td>{$customers[customer].name}</td>
-      </tr>
-
-      {if $smarty.section.customer.last}
-        <tr><td></td><td>{$smarty.section.customer.total} customers</td></tr>
-        </table>
-      {/if}
-    {/section}
-
-      
-
-.rownum {#section.property.rownum}
--------
-
-`rownum` contains the current loop iteration, starting with one. It is
-an alias to [`iteration`](#section.property.iteration), they work
-identically.
-
-.loop {#section.property.loop}
------
-
-`loop` contains the last index number that this {section} looped. This
-can be used inside or after the `{section}`.
-
-
-    {section name=customer loop=$custid}
-      {$smarty.section.customer.index} id: {$custid[customer]}<br />
-    {/section}
-    There are {$smarty.section.customer.loop} customers shown above.
-
-      
-
-The above example will output:
-
-
-    0 id: 1000<br />
-    1 id: 1001<br />
-    2 id: 1002<br />
-    There are 3 customers shown above.
-
-       
-
-.show {#section.property.show}
------
-
-`show` is used as a parameter to section and is a boolean value. If
-FALSE, the section will not be displayed. If there is a `{sectionelse}`
-present, that will be alternately displayed.
-
-Boolean `$show_customer_info` has been passed from the PHP application,
-to regulate whether or not this section shows.
-
-
-    {section name=customer loop=$customers show=$show_customer_info}
-      {$smarty.section.customer.rownum} id: {$customers[customer]}<br />
-    {/section}
-
-    {if $smarty.section.customer.show}
-      the section was shown.
-    {else}
-      the section was not shown.
-    {/if}
-
-      
-
-The above example will output:
-
-
-    1 id: 1000<br />
-    2 id: 1001<br />
-    3 id: 1002<br />
-
-    the section was shown.
-
-       
-
-.total {#section.property.total}
-------
-
-`total` contains the number of iterations that this `{section}` will
-loop. This can be used inside or after a `{section}`.
-
-
-    {section name=customer loop=$custid step=2}
-      {$smarty.section.customer.index} id: {$custid[customer]}<br />
-    {/section}
-       There are {$smarty.section.customer.total} customers shown above.
-
-      
-
-See also [`{foreach}`](#language.function.foreach),
-[`{for}`](#language.function.for), [`{while}`](#language.function.while)
-and [`$smarty.section`](#language.variables.smarty.loops).
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
deleted file mode 100644
index 381c191a2..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-setfilter.md
+++ /dev/null
@@ -1,42 +0,0 @@
-{setfilter} {#language.function.setfilter}
-===========
-
-The `{setfilter}...{/setfilter}` block tag allows the definition of
-template instance\'s variable filters.
-
-SYNTAX: {setfilter filter1\|filter2\|filter3\....}\...{/setfilter}
-
-The filter can be:
-
--   A variable filter plugin specified by it\'s name.
-
--   A modidier specified by it\'s name and optional additional
-    parameter.
-
-`{setfilter}...{/setfilter}` blocks can be nested. The filter definition
-of inner blocks does replace the definition of the outer block.
-
-Template instance filters run in addition to other modifiers and
-filters. They run in the following order: modifier, default\_modifier,
-\$escape\_html, registered variable filters, autoloaded variable
-filters, template instance\'s variable filters. Everything after
-default\_modifier can be disabled with the `nofilter` flag.
-
-
-    <script>
-    {setfilter filter1}
-      {$foo} {* filter1 runs on output of $foo *}
-      {setfilter filter2|mod:true}
-        {$bar} {* filter2 and modifier mod runs on output of $bar *}
-      {/setfilter}
-      {$buh} {* filter1 runs on output of $buh *}
-    {/setfilter}
-    {$blar} {* no template instance filter runs on output of $blar}
-    </script>
-
-      
-
-> **Note**
->
-> The setting of template instance filters does not effect the output of
-> included subtemplates.
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-shortform-assign.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-shortform-assign.md
deleted file mode 100644
index d6a9e9798..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-shortform-assign.md
+++ /dev/null
@@ -1,84 +0,0 @@
-{\$var=\...} {#language.function.shortform.assign}
-============
-
-This is a short-hand version of the {assign} function. You can assign
-values directly to the template, or assign values to array elements too.
-
-> **Note**
->
-> Assignment of variables in-template is essentially placing application
-> logic into the presentation that may be better handled in PHP. Use at
-> your own discretion.
-
-The following attributes can be added to the tag:
-
-**Attributes:**
-
-   Attribute Name   Shorthand    Type    Required   Default  Description
-  ---------------- ----------- -------- ---------- --------- -----------------------------------------------------------------------
-       scope           n/a      string      No       *n/a*   The scope of the assigned variable: \'parent\',\'root\' or \'global\'
-
-**Option Flags:**
-
-    Name    Description
-  --------- -----------------------------------------------------
-   nocache  Assigns the variable with the \'nocache\' attribute
-
-
-    {$name='Bob'}
-
-    The value of $name is {$name}.
-
-      
-
-The above example will output:
-
-
-    The value of $name is Bob.
-
-      
-
-
-    {$running_total=$running_total+$some_array[row].some_value}
-
-      
-
-
-    {$user.name="Bob"}
-
-      
-
-
-    {$user.name.first="Bob"}
-
-      
-
-
-    {$users[]="Bob"}
-
-      
-
-Variables assigned in the included template will be seen in the
-including template.
-
-
-    {include file="sub_template.tpl"}
-    ...
-    {* display variable assigned in sub_template *}
-    {$foo}<br>
-    ...
-
-      
-
-The template above includes the example `sub_template.tpl` below
-
-
-    ...
-    {* foo will be known also in the including template *}
-    {$foo="something" scope=parent}
-    {* bar is assigned only local in the including template *}
-    {$bar="value"}
-    ...
-
-See also [`{assign}`](#language.function.assign) and
-[`{append}`](#language.function.append)
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
deleted file mode 100644
index d40646e5f..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-strip.md
+++ /dev/null
@@ -1,48 +0,0 @@
-{strip} {#language.function.strip}
-=======
-
-Many times web designers run into the issue where white space and
-carriage returns affect the output of the rendered HTML (browser
-\"features\"), so you must run all your tags together in the template to
-get the desired results. This usually ends up in unreadable or
-unmanageable templates.
-
-Anything within `{strip}{/strip}` tags are stripped of the extra spaces
-or carriage returns at the beginnings and ends of the lines before they
-are displayed. This way you can keep your templates readable, and not
-worry about extra white space causing problems.
-
-> **Note**
->
-> `{strip}{/strip}` does not affect the contents of template variables,
-> see the [strip modifier](#language.modifier.strip) instead.
-
-
-    {* the following will be all run into one line upon output *}
-    {strip}
-    <table border='0'>
-     <tr>
-      <td>
-       <a href="{$url}">
-        <font color="red">This is a test</font>
-       </a>
-      </td>
-     </tr>
-    </table>
-    {/strip}
-
-      
-
-The above example will output:
-
-
-    <table border='0'><tr><td><a href="http://. snipped...</a></td></tr></table>
-
-      
-
-Notice that in the above example, all the lines begin and end with HTML
-tags. Be aware that all the lines are run together. If you have plain
-text at the beginning or end of any line, they will be run together, and
-may not be desired results.
-
-See also the [`strip`](#language.modifier.strip) modifier.
diff --git a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md b/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
deleted file mode 100644
index 755c091f6..000000000
--- a/vendor/smarty/smarty/docs/designers/language-builtin-functions/language-function-while.md
+++ /dev/null
@@ -1,43 +0,0 @@
-{while} {#language.function.while}
-=======
-
-`{while}` loops in Smarty have much the same flexibility as PHP
-[while](&url.php-manual;while) statements, with a few added features for
-the template engine. Every `{while}` must be paired with a matching
-`{/while}`. All PHP conditionals and functions are recognized, such as
-*\|\|*, *or*, *&&*, *and*, *is\_array()*, etc.
-
-The following is a list of recognized qualifiers, which must be
-separated from surrounding elements by spaces. Note that items listed in
-\[brackets\] are optional. PHP equivalents are shown where applicable.
-
-       Qualifier        Alternates  Syntax Example           Meaning                          PHP Equivalent
-  -------------------- ------------ ------------------------ -------------------------------- ----------------------
-           ==               eq      \$a eq \$b               equals                           ==
-           !=            ne, neq    \$a neq \$b              not equals                       !=
-           \>               gt      \$a gt \$b               greater than                     \>
-           \<               lt      \$a lt \$b               less than                        \<
-          \>=            gte, ge    \$a ge \$b               greater than or equal            \>=
-          \<=            lte, le    \$a le \$b               less than or equal               \<=
-          ===                       \$a === 0                check for identity               ===
-           !               not      not \$a                  negation (unary)                 !
-           \%              mod      \$a mod \$b              modulous                         \%
-   is \[not\] div by                \$a is not div by 4      divisible by                     \$a % \$b == 0
-    is \[not\] even                 \$a is not even          \[not\] an even number (unary)   \$a % 2 == 0
-   is \[not\] even by               \$a is not even by \$b   grouping level \[not\] even      (\$a / \$b) % 2 == 0
-     is \[not\] odd                 \$a is not odd           \[not\] an odd number (unary)    \$a % 2 != 0
-   is \[not\] odd by                \$a is not odd by \$b    \[not\] an odd grouping          (\$a / \$b) % 2 != 0
-
-
-
-    {while $foo > 0}
-      {$foo--}
-    {/while}
-
-      
-
-The above example will count down the value of \$foo until 1 is reached.
-
-See also [`{foreach}`](#language.function.foreach),
-[`{for}`](#language.function.for) and
-[`{section}`](#language.function.section).
diff --git a/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md b/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
deleted file mode 100644
index edf1a83ea..000000000
--- a/vendor/smarty/smarty/docs/designers/language-combining-modifiers.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Combining Modifiers {#language.combining.modifiers}
-===================
-
-You can apply any number of modifiers to a variable. They will be
-applied in the order they are combined, from left to right. They must be
-separated with a `|` (pipe) character.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Smokers are Productive, but Death Cuts Efficiency.');
-
-    ?>
-
-where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|upper|spacify}
-    {$articleTitle|lower|spacify|truncate}
-    {$articleTitle|lower|truncate:30|spacify}
-    {$articleTitle|lower|spacify|truncate:30:". . ."}
-
-      
-
-The above example will output:
-
-
-    Smokers are Productive, but Death Cuts Efficiency.
-    S M O K E R S   A R ....snip....  H   C U T S   E F F I C I E N C Y .
-    s m o k e r s   a r ....snip....  b u t   d e a t h   c u t s...
-    s m o k e r s   a r e   p r o d u c t i v e ,   b u t . . .
-    s m o k e r s   a r e   p. . .
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions.md b/vendor/smarty/smarty/docs/designers/language-custom-functions.md
deleted file mode 100644
index 20ad54e99..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Custom Functions {#language.custom.functions}
-================
-
-Smarty comes with several custom plugin functions that you can use in
-the templates.
-
-## Table of contents
-- [{counter}](./language-custom-functions/language-function-counter.md)
-- [{cycle}](./language-custom-functions/language-function-cycle.md)
-- [{eval}](./language-custom-functions/language-function-eval.md)
-- [{fetch}](./language-custom-functions/language-function-fetch.md)
-- [{html_checkboxes}](./language-custom-functions/language-function-html-checkboxes.md)
-- [{html_image}](./language-custom-functions/language-function-html-image.md)
-- [{html_options}](./language-custom-functions/language-function-html-options.md)
-- [{html_radios}](./language-custom-functions/language-function-html-radios.md)
-- [{html_select_date}](./language-custom-functions/language-function-html-select-date.md)
-- [{html_select_time}](./language-custom-functions/language-function-html-select-time.md)
-- [{html_table}](./language-custom-functions/language-function-html-table.md)
-- [{mailto}](./language-custom-functions/language-function-mailto.md)
-- [{math}](./language-custom-functions/language-function-math.md)
-- [{textformat}](./language-custom-functions/language-function-textformat.md)
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
deleted file mode 100644
index cc1ac08f2..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-counter.md
+++ /dev/null
@@ -1,41 +0,0 @@
-{counter} {#language.function.counter}
-=========
-
-`{counter}` is used to print out a count. `{counter}` will remember the
-count on each iteration. You can adjust the number, the interval and the
-direction of the count, as well as determine whether or not to print the
-value. You can run multiple counters concurrently by supplying a unique
-name for each one. If you do not supply a name, the name "default" will
-be used.
-
-If you supply the `assign` attribute, the output of the `{counter}`
-function will be assigned to this template variable instead of being
-output to the template.
-
-   Attribute Name    Type     Required    Default   Description
-  ---------------- --------- ---------- ----------- ------------------------------------------------------
-        name        string       No      *default*  The name of the counter
-       start        number       No         *1*     The initial number to start counting from
-        skip        number       No         *1*     The interval to count by
-     direction      string       No        *up*     The direction to count (up/down)
-       print        boolean      No       *TRUE*    Whether or not to print the value
-       assign       string       No        *n/a*    the template variable the output will be assigned to
-
-
-    {* initialize the count *}
-    {counter start=0 skip=2}<br />
-    {counter}<br />
-    {counter}<br />
-    {counter}<br />
-
-      
-
-this will output:
-
-
-    0<br />
-    2<br />
-    4<br />
-    6<br />
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
deleted file mode 100644
index 5986e6322..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-cycle.md
+++ /dev/null
@@ -1,57 +0,0 @@
-{cycle} {#language.function.cycle}
-=======
-
-`{cycle}` is used to alternate a set of values. This makes it easy to
-for example, alternate between two or more colors in a table, or cycle
-through an array of values.
-
-   Attribute Name    Type     Required    Default   Description
-  ---------------- --------- ---------- ----------- -------------------------------------------------------------------------------------------------------------
-        name        string       No      *default*  The name of the cycle
-       values        mixed      Yes        *N/A*    The values to cycle through, either a comma delimited list (see delimiter attribute), or an array of values
-       print        boolean      No       *TRUE*    Whether to print the value or not
-      advance       boolean      No       *TRUE*    Whether or not to advance to the next value
-     delimiter      string       No         *,*     The delimiter to use in the values attribute
-       assign       string       No        *n/a*    The template variable the output will be assigned to
-       reset        boolean      No       *FALSE*   The cycle will be set to the first value and not advanced
-
--   You can `{cycle}` through more than one set of values in a template
-    by supplying a `name` attribute. Give each `{cycle}` an unique
-    `name`.
-
--   You can force the current value not to print with the `print`
-    attribute set to FALSE. This would be useful for silently skipping a
-    value.
-
--   The `advance` attribute is used to repeat a value. When set to
-    FALSE, the next call to `{cycle}` will print the same value.
-
--   If you supply the `assign` attribute, the output of the `{cycle}`
-    function will be assigned to a template variable instead of being
-    output to the template.
-
-<!-- -->
-
-
-    {section name=rows loop=$data}
-    <tr class="{cycle values="odd,even"}">
-       <td>{$data[rows]}</td>
-    </tr>
-    {/section}
-
-      
-
-The above template would output:
-
-
-    <tr class="odd">
-       <td>1</td>
-    </tr>
-    <tr class="even">
-       <td>2</td>
-    </tr>
-    <tr class="odd">
-       <td>3</td>
-    </tr>
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
deleted file mode 100644
index 79b3477c1..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-debug.md
+++ /dev/null
@@ -1,15 +0,0 @@
-{debug} {#language.function.debug}
-=======
-
-`{debug}` dumps the debug console to the page. This works regardless of
-the [debug](#chapter.debugging.console) settings in the php script.
-Since this gets executed at runtime, this is only able to show the
-[assigned](#api.assign) variables; not the templates that are in use.
-However, you can see all the currently available variables within the
-scope of a template.
-
-   Attribute Name    Type    Required     Default     Description
-  ---------------- -------- ---------- -------------- ---------------------------------
-       output       string      No      *javascript*  output type, html or javascript
-
-See also the [debugging console page](#chapter.debugging.console).
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
deleted file mode 100644
index e11f57e3e..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-eval.md
+++ /dev/null
@@ -1,84 +0,0 @@
-{eval} {#language.function.eval}
-======
-
-`{eval}` is used to evaluate a variable as a template. This can be used
-for things like embedding template tags/variables into variables or
-tags/variables into config file variables.
-
-If you supply the `assign` attribute, the output of the `{eval}`
-function will be assigned to this template variable instead of being
-output to the template.
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ------------------------------------------------------
-        var         mixed      Yes       *n/a*   Variable (or string) to evaluate
-       assign       string      No       *n/a*   The template variable the output will be assigned to
-
-> **Note**
->
-> -   Evaluated variables are treated the same as templates. They follow
->     the same escapement and security features just as if they were
->     templates.
->
-> -   Evaluated variables are compiled on every invocation, the compiled
->     versions are not saved! However if you have [caching](#caching)
->     enabled, the output will be cached with the rest of the template.
->
-> -   If the content to evaluate doesn\'t change often, or is used
->     repeatedly, consider using
->     `{include file="string:{$template_code}"}` instead. This may cache
->     the compiled state and thus doesn\'t have to run the (comparably
->     slow) compiler on every invocation.
->
-The contents of the config file, `setup.conf`.
-
-
-    emphstart = <strong>
-    emphend = </strong>
-    title = Welcome to {$company}'s home page!
-    ErrorCity = You must supply a {#emphstart#}city{#emphend#}.
-    ErrorState = You must supply a {#emphstart#}state{#emphend#}.
-
-      
-
-Where the template is:
-
-
-    {config_load file='setup.conf'}
-
-    {eval var=$foo}
-    {eval var=#title#}
-    {eval var=#ErrorCity#}
-    {eval var=#ErrorState# assign='state_error'}
-    {$state_error}
-
-      
-
-The above template will output:
-
-
-    This is the contents of foo.
-    Welcome to Foobar Pub & Grill's home page!
-    You must supply a <strong>city</strong>.
-    You must supply a <strong>state</strong>.
-
-      
-
-This outputs the server name (in uppercase) and IP. The assigned
-variable `$str` could be from a database query.
-
-     
-    <?php
-    $str = 'The server name is {$smarty.server.SERVER_NAME|upper} '
-           .'at {$smarty.server.SERVER_ADDR}';
-    $smarty->assign('foo',$str);
-    ?>
-     
-       
-
-Where the template is:
-
-     
-        {eval var=$foo}
-     
-       
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
deleted file mode 100644
index 2277f5056..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-fetch.md
+++ /dev/null
@@ -1,59 +0,0 @@
-{fetch} {#language.function.fetch}
-=======
-
-`{fetch}` is used to retrieve files from the local file system, http, or
-ftp and display the contents.
-
--   If the file name begins with `http://`, the web site page will be
-    fetched and displayed.
-
-    > **Note**
-    >
-    > This will not support http redirects, be sure to include a
-    > trailing slash on your web page fetches where necessary.
-
--   If the file name begins with `ftp://`, the file will be downloaded
-    from the ftp server and displayed.
-
--   For local files, either a full system file path must be given, or a
-    path relative to the executed php script.
-
-    > **Note**
-    >
-    > If security is enabled and you are fetching a file from the local
-    > file system, `{fetch}` will only allow files from within the
-    > `$secure_dir` path of the securty policy. See the
-    > [Security](#advanced.features.security) section for details.
-
--   If the `assign` attribute is set, the output of the `{fetch}`
-    function will be assigned to this template variable instead of being
-    output to the template.
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- ------------------------------------------------------
-        file        string     Yes       *n/a*   The file, http or ftp site to fetch
-       assign       string      No       *n/a*   The template variable the output will be assigned to
-
-
-    {* include some javascript in your template *}
-    {fetch file='/export/httpd/www.example.com/docs/navbar.js'}
-
-    {* embed some weather text in your template from another web site *}
-    {fetch file='http://www.myweather.com/68502/'}
-
-    {* fetch a news headline file via ftp *}
-    {fetch file='ftp://user:password@ftp.example.com/path/to/currentheadlines.txt'}
-    {* as above but with variables *}
-    {fetch file="ftp://`$user`:`$password`@`$server`/`$path`"}
-
-    {* assign the fetched contents to a template variable *}
-    {fetch file='http://www.myweather.com/68502/' assign='weather'}
-    {if $weather ne ''}
-      <div id="weather">{$weather}</div>
-    {/if}
-
-      
-
-See also [`{capture}`](#language.function.capture),
-[`{eval}`](#language.function.eval),
-[`{assign}`](#language.function.assign) and [`fetch()`](#api.fetch).
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
deleted file mode 100644
index 23af713b7..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-checkboxes.md
+++ /dev/null
@@ -1,113 +0,0 @@
-{html\_checkboxes} {#language.function.html.checkboxes}
-==================
-
-`{html_checkboxes}` is a [custom function](#language.custom.functions)
-that creates an html checkbox group with provided data. It takes care of
-which item(s) are selected by default as well.
-
-   Attribute Name         Type                       Required                  Default    Description
-  ---------------- ------------------- ------------------------------------- ------------ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        name             string                         No                    *checkbox*  Name of checkbox list
-       values             array         Yes, unless using options attribute     *n/a*     An array of values for checkbox buttons
-       output             array         Yes, unless using options attribute     *n/a*     An array of output for checkbox buttons
-      selected        string/array                      No                     *empty*    The selected checkbox element(s)
-      options       associative array   Yes, unless using values and output     *n/a*     An associative array of values and output
-     separator           string                         No                     *empty*    String of text to separate each checkbox item
-       assign            string                         No                     *empty*    Assign checkbox tags to an array instead of output
-       labels            boolean                        No                      *TRUE*    Add \<label\>-tags to the output
-     label\_ids          boolean                        No                     *FALSE*    Add id-attributes to \<label\> and \<input\> to the output
-       escape            boolean                        No                      *TRUE*    Escape the output / content (values are always escaped)
-       strict            boolean                        No                     *FALSE*    Will make the \"extra\" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *\"disabled\"* and *\"readonly\"* respectively
-
--   Required attributes are `values` and `output`, unless you use
-    `options` instead.
-
--   All output is XHTML compliant.
-
--   All parameters that are not in the list above are printed as
-    name/value-pairs inside each of the created \<input\>-tags.
-
-<!-- -->
-
-
-    <?php
-
-    $smarty->assign('cust_ids', array(1000,1001,1002,1003));
-    $smarty->assign('cust_names', array(
-                                    'Joe Schmoe',
-                                    'Jack Smith',
-                                    'Jane Johnson',
-                                    'Charlie Brown')
-                                  );
-    $smarty->assign('customer_id', 1001);
-
-    ?>
-
-      
-
-where template is
-
-
-    {html_checkboxes name='id' values=$cust_ids output=$cust_names
-       selected=$customer_id  separator='<br />'}
-
-      
-
-or where PHP code is:
-
-
-    <?php
-
-    $smarty->assign('cust_checkboxes', array(
-                                         1000 => 'Joe Schmoe',
-                                         1001 => 'Jack Smith',
-                                         1002 => 'Jane Johnson',
-                                         1003 => 'Charlie Brown')
-                                       );
-    $smarty->assign('customer_id', 1001);
-
-    ?>
-
-      
-
-and the template is
-
-
-    {html_checkboxes name='id' options=$cust_checkboxes
-       selected=$customer_id separator='<br />'}
-
-      
-
-both examples will output:
-
-
-    <label><input type="checkbox" name="id[]" value="1000" />Joe Schmoe</label><br />
-    <label><input type="checkbox" name="id[]" value="1001" checked="checked" />Jack Smith</label>
-    <br />
-    <label><input type="checkbox" name="id[]" value="1002" />Jane Johnson</label><br />
-    <label><input type="checkbox" name="id[]" value="1003" />Charlie Brown</label><br />
-
-      
-
-
-    <?php
-
-    $sql = 'select type_id, types from contact_types order by type';
-    $smarty->assign('contact_types',$db->getAssoc($sql));
-
-    $sql = 'select contact_id, contact_type_id, contact '
-           .'from contacts where contact_id=12';
-    $smarty->assign('contact',$db->getRow($sql));
-
-    ?>
-
-      
-
-The results of the database queries above would be output with.
-
-
-    {html_checkboxes name='contact_type_id' options=$contact_types
-            selected=$contact.contact_type_id separator='<br />'}
-
-See also [`{html_radios}`](#language.function.html.radios) and
-[`{html_options}`](#language.function.html.options)
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
deleted file mode 100644
index 76740a1fe..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-image.md
+++ /dev/null
@@ -1,56 +0,0 @@
-{html\_image} {#language.function.html.image}
-=============
-
-`{html_image}` is a [custom function](#language.custom.functions) that
-generates an HTML `<img>` tag. The `height` and `width` are
-automatically calculated from the image file if they are not supplied.
-
-   Attribute Name    Type    Required          Default         Description
-  ---------------- -------- ---------- ----------------------- ---------------------------------------
-        file        string     Yes              *n/a*          name/path to image
-       height       string      No      *actual image height*  Height to display image
-       width        string      No      *actual image width*   Width to display image
-      basedir       string      no      *web server doc root*  Directory to base relative paths from
-        alt         string      no              *""*           Alternative description of the image
-        href        string      no              *n/a*          href value to link the image to
-    path\_prefix    string      no              *n/a*          Prefix for output path
-
--   `basedir` is the base directory that relative image paths are based
-    from. If not given, the web server\'s document root
-    `$_ENV['DOCUMENT_ROOT']` is used as the base. If security is
-    enabled, then the image must be located in the `$secure_dir` path of
-    the securty policy. See the [Security](#advanced.features.security)
-    section for details.
-
--   `href` is the href value to link the image to. If link is supplied,
-    an `<a href="LINKVALUE"><a>` tag is placed around the image tag.
-
--   `path_prefix` is an optional prefix string you can give the output
-    path. This is useful if you want to supply a different server name
-    for the image.
-
--   All parameters that are not in the list above are printed as
-    name/value-pairs inside the created `<img>` tag.
-
-> **Note**
->
-> `{html_image}` requires a hit to the disk to read the image and
-> calculate the height and width. If you don\'t use template
-> [caching](#caching), it is generally better to avoid `{html_image}`
-> and leave image tags static for optimal performance.
-
-
-    {html_image file='pumpkin.jpg'}
-    {html_image file='/path/from/docroot/pumpkin.jpg'}
-    {html_image file='../path/relative/to/currdir/pumpkin.jpg'}
-
-      
-
-Example output of the above template would be:
-
-
-    <img src="pumpkin.jpg" alt="" width="44" height="68" />
-    <img src="/path/from/docroot/pumpkin.jpg" alt="" width="44" height="68" />
-    <img src="../path/relative/to/currdir/pumpkin.jpg" alt="" width="44" height="68" />
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
deleted file mode 100644
index b7c04e940..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-options.md
+++ /dev/null
@@ -1,155 +0,0 @@
-{html\_options} {#language.function.html.options}
-===============
-
-`{html_options}` is a [custom function](#language.custom.functions) that
-creates the html `<select><option>` group with the assigned data. It
-takes care of which item(s) are selected by default as well.
-
-   Attribute Name         Type                       Required                 Default  Description
-  ---------------- ------------------- ------------------------------------- --------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-       values             array         Yes, unless using options attribute    *n/a*   An array of values for dropdown
-       output             array         Yes, unless using options attribute    *n/a*   An array of output for dropdown
-      selected        string/array                      No                    *empty*  The selected option element(s)
-      options       associative array   Yes, unless using values and output    *n/a*   An associative array of values and output
-        name             string                         No                    *empty*  Name of select group
-       strict            boolean                        No                    *FALSE*  Will make the \"extra\" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *\"disabled\"* and *\"readonly\"* respectively
-
--   Required attributes are `values` and `output`, unless you use the
-    combined `options` instead.
-
--   If the optional `name` attribute is given, the `<select></select>`
-    tags are created, otherwise ONLY the `<option>` list is generated.
-
--   If a given value is an array, it will treat it as an html
-    `<optgroup>`, and display the groups. Recursion is supported with
-    `<optgroup>`.
-
--   All parameters that are not in the list above are printed as
-    name/value-pairs inside the `<select>` tag. They are ignored if the
-    optional `name` is not given.
-
--   All output is XHTML compliant.
-
-<!-- -->
-
-
-    <?php
-    $smarty->assign('myOptions', array(
-                                    1800 => 'Joe Schmoe',
-                                    9904 => 'Jack Smith',
-                                    2003 => 'Charlie Brown')
-                                    );
-    $smarty->assign('mySelect', 9904);
-    ?>
-
-      
-
-The following template will generate a drop-down list. Note the presence
-of the `name` attribute which creates the `<select>` tags.
-
-
-    {html_options name=foo options=$myOptions selected=$mySelect}
-
-      
-
-Output of the above example would be:
-
-
-    <select name="foo">
-    <option value="1800">Joe Schmoe</option>
-    <option value="9904" selected="selected">Jack Smith</option>
-    <option value="2003">Charlie Brown</option>
-    </select>
-
-
-    <?php
-    $smarty->assign('cust_ids', array(56,92,13));
-    $smarty->assign('cust_names', array(
-                                  'Joe Schmoe',
-                                  'Jane Johnson',
-                                  'Charlie Brown'));
-    $smarty->assign('customer_id', 92);
-    ?>
-
-      
-
-The above arrays would be output with the following template (note the
-use of the php [`count()`](&url.php-manual;function.count) function as a
-modifier to set the select size).
-
-
-    <select name="customer_id" size="{$cust_names|@count}">
-       {html_options values=$cust_ids output=$cust_names selected=$customer_id}
-    </select>
-
-      
-
-The above example would output:
-
-
-    <select name="customer_id" size="3">
-        <option value="56">Joe Schmoe</option>
-        <option value="92" selected="selected">Jane Johnson</option>
-        <option value="13">Charlie Brown</option>
-    </select>
-
-
-      
-
-
-    <?php
-
-    $sql = 'select type_id, types from contact_types order by type';
-    $smarty->assign('contact_types',$db->getAssoc($sql));
-
-    $sql = 'select contact_id, name, email, contact_type_id
-            from contacts where contact_id='.$contact_id;
-    $smarty->assign('contact',$db->getRow($sql));
-
-    ?>
-
-Where a template could be as follows. Note the use of the
-[`truncate`](#language.modifier.truncate) modifier.
-
-
-    <select name="type_id">
-        <option value='null'>-- none --</option>
-        {html_options options=$contact_types|truncate:20 selected=$contact.type_id}
-    </select>
-
-      
-
-
-    <?php
-    $arr['Sport'] = array(6 => 'Golf', 9 => 'Cricket',7 => 'Swim');
-    $arr['Rest']  = array(3 => 'Sauna',1 => 'Massage');
-    $smarty->assign('lookups', $arr);
-    $smarty->assign('fav', 7);
-    ?>
-
-      
-
-The script above and the following template
-
-
-    {html_options name=foo options=$lookups selected=$fav}
-
-      
-
-would output:
-
-
-    <select name="foo">
-    <optgroup label="Sport">
-    <option value="6">Golf</option>
-    <option value="9">Cricket</option>
-    <option value="7" selected="selected">Swim</option>
-    </optgroup>
-    <optgroup label="Rest">
-    <option value="3">Sauna</option>
-    <option value="1">Massage</option>
-    </optgroup>
-    </select>
-
-See also [`{html_checkboxes}`](#language.function.html.checkboxes) and
-[`{html_radios}`](#language.function.html.radios)
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
deleted file mode 100644
index 992adaeaf..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-radios.md
+++ /dev/null
@@ -1,112 +0,0 @@
-{html\_radios} {#language.function.html.radios}
-==============
-
-`{html_radios}` is a [custom function](#language.custom.functions) that
-creates a HTML radio button group. It also takes care of which item is
-selected by default as well.
-
-   Attribute Name         Type                       Required                 Default  Description
-  ---------------- ------------------- ------------------------------------- --------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        name             string                         No                    *radio*  Name of radio list
-       values             array         Yes, unless using options attribute    *n/a*   An array of values for radio buttons
-       output             array         Yes, unless using options attribute    *n/a*   An array of output for radio buttons
-      selected           string                         No                    *empty*  The selected radio element
-      options       associative array   Yes, unless using values and output    *n/a*   An associative array of values and output
-     separator           string                         No                    *empty*  String of text to separate each radio item
-       assign            string                         No                    *empty*  Assign radio tags to an array instead of output
-       labels            boolean                        No                    *TRUE*   Add \<label\>-tags to the output
-     label\_ids          boolean                        No                    *FALSE*  Add id-attributes to \<label\> and \<input\> to the output
-       escape            boolean                        No                    *TRUE*   Escape the output / content (values are always escaped)
-       strict            boolean                        No                    *FALSE*  Will make the \"extra\" attributes *disabled* and *readonly* only be set, if they were supplied with either boolean *TRUE* or string *\"disabled\"* and *\"readonly\"* respectively
-
--   Required attributes are `values` and `output`, unless you use
-    `options` instead.
-
--   All output is XHTML compliant.
-
--   All parameters that are not in the list above are output as
-    name/value-pairs inside each of the created `<input>`-tags.
-
-<!-- -->
-
-
-    <?php
-
-    $smarty->assign('cust_ids', array(1000,1001,1002,1003));
-    $smarty->assign('cust_names', array(
-                                  'Joe Schmoe',
-                                  'Jack Smith',
-                                  'Jane Johnson',
-                                  'Charlie Brown')
-                                  );
-    $smarty->assign('customer_id', 1001);
-
-    ?>
-
-      
-
-Where template is:
-
-
-    {html_radios name='id' values=$cust_ids output=$cust_names
-           selected=$customer_id separator='<br />'}
-       
-      
-
-
-    <?php
-
-    $smarty->assign('cust_radios', array(
-                                   1000 => 'Joe Schmoe',
-                                   1001 => 'Jack Smith',
-                                   1002 => 'Jane Johnson',
-                                   1003 => 'Charlie Brown'));
-    $smarty->assign('customer_id', 1001);
-
-    ?>
-
-      
-
-Where template is:
-
-
-    {html_radios name='id' options=$cust_radios
-         selected=$customer_id separator='<br />'}
-
-      
-
-Both examples will output:
-
-
-    <label><input type="radio" name="id" value="1000" />Joe Schmoe</label><br />
-    <label><input type="radio" name="id" value="1001" checked="checked" />Jack Smith</label><br />
-    <label><input type="radio" name="id" value="1002" />Jane Johnson</label><br />
-    <label><input type="radio" name="id" value="1003" />Charlie Brown</label><br />
-
-      
-
-
-    <?php
-
-    $sql = 'select type_id, types from contact_types order by type';
-    $smarty->assign('contact_types',$db->getAssoc($sql));
-
-    $sql = 'select contact_id, name, email, contact_type_id '
-            .'from contacts where contact_id='.$contact_id;
-    $smarty->assign('contact',$db->getRow($sql));
-
-    ?>
-
-      
-
-The variable assigned from the database above would be output with the
-template:
-
-
-    {html_radios name='contact_type_id' options=$contact_types
-         selected=$contact.contact_type_id separator='<br />'}
-
-      
-
-See also [`{html_checkboxes}`](#language.function.html.checkboxes) and
-[`{html_options}`](#language.function.html.options)
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
deleted file mode 100644
index b46eb0419..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-date.md
+++ /dev/null
@@ -1,119 +0,0 @@
-{html\_select\_date} {#language.function.html.select.date}
-====================
-
-`{html_select_date}` is a [custom function](#language.custom.functions)
-that creates date dropdowns. It can display any or all of year, month,
-and day. All parameters that are not in the list below are printed as
-name/value-pairs inside the `<select>` tags of day, month and year.
-
-      Attribute Name                                                                                                                        Type                                                                                                                      Required                        Default                        Description
-  ---------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------- ---------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          prefix                                                                                                                           string                                                                                                                        No                            Date\_                        What to prefix the var name with
-           time           [timestamp](&url.php-manual;function.time), [DateTime](&url.php-manual;class.DateTime), mysql timestamp or any string parsable by [`strtotime()`](&url.php-manual;strtotime), arrays as produced by this function if field\_array is set.      No      current [timestamp](&url.php-manual;function.time)  What date/time to pre-select. If an array is given, the attributes field\_array and prefix are used to identify the array elements to extract year, month and day from. Omitting this parameter or supplying a falsy value will select the current date. To prevent date selection, pass in NULL
-       start\_year                                                                                                                         string                                                                                                                        No                         current year                     The first year in the dropdown, either year number, or relative to current year (+/- N)
-        end\_year                                                                                                                          string                                                                                                                        No                     same as start\_year                  The last year in the dropdown, either year number, or relative to current year (+/- N)
-      display\_days                                                                                                                        boolean                                                                                                                       No                             TRUE                         Whether to display days or not
-     display\_months                                                                                                                       boolean                                                                                                                       No                             TRUE                         Whether to display months or not
-      display\_years                                                                                                                       boolean                                                                                                                       No                             TRUE                         Whether to display years or not
-       month\_names                                                                                                                         array                                                                                                                        No                             null                         List of strings to display for months. array(1 =\> \'Jan\', ..., 12 =\> \'Dec\')
-      month\_format                                                                                                                        string                                                                                                                        No                             \%B                          What format the month should be in (strftime)
-       day\_format                                                                                                                         string                                                                                                                        No                            \%02d                         What format the day output should be in (sprintf)
-    day\_value\_format                                                                                                                     string                                                                                                                        No                             \%d                          What format the day value should be in (sprintf)
-      year\_as\_text                                                                                                                       boolean                                                                                                                       No                            FALSE                         Whether or not to display the year as text
-      reverse\_years                                                                                                                       boolean                                                                                                                       No                            FALSE                         Display years in reverse order
-       field\_array                                                                                                                        string                                                                                                                        No                             null                         If a name is given, the select boxes will be drawn such that the results will be returned to PHP in the form of name\[Day\], name\[Year\], name\[Month\].
-        day\_size                                                                                                                          string                                                                                                                        No                             null                         Adds size attribute to select tag if given
-       month\_size                                                                                                                         string                                                                                                                        No                             null                         Adds size attribute to select tag if given
-        year\_size                                                                                                                         string                                                                                                                        No                             null                         Adds size attribute to select tag if given
-        all\_extra                                                                                                                         string                                                                                                                        No                             null                         Adds extra attributes to all select/input tags if given
-        day\_extra                                                                                                                         string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-       month\_extra                                                                                                                        string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-       year\_extra                                                                                                                         string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-         all\_id                                                                                                                           string                                                                                                                        No                             null                         Adds id-attribute to all select/input tags if given
-         day\_id                                                                                                                           string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-        month\_id                                                                                                                          string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-         year\_id                                                                                                                          string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-       field\_order                                                                                                                        string                                                                                                                        No                             MDY                          The order in which to display the fields
-     field\_separator                                                                                                                      string                                                                                                                        No                             \\n                          String printed between different fields
-   month\_value\_format                                                                                                                    string                                                                                                                        No                             \%m                          strftime() format of the month values, default is %m for month numbers.
-        all\_empty                                                                                                                         string                                                                                                                        No                             null                         If supplied then the first element of any select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-boxes read "Please select" for example.
-       year\_empty                                                                                                                         string                                                                                                                        No                             null                         If supplied then the first element of the year\'s select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-box read "Please select a year" for example. Note that you can use values like "-MM-DD" as time-attribute to indicate an unselected year.
-       month\_empty                                                                                                                        string                                                                                                                        No                             null                         If supplied then the first element of the month\'s select-box has this value as it\'s label and "" as it\'s value. . Note that you can use values like "YYYY\--DD" as time-attribute to indicate an unselected month.
-        day\_empty                                                                                                                         string                                                                                                                        No                             null                         If supplied then the first element of the day\'s select-box has this value as it\'s label and "" as it\'s value. Note that you can use values like "YYYY-MM-" as time-attribute to indicate an unselected day.
-
-> **Note**
->
-> There is an useful php function on the [date tips page](#tips.dates)
-> for converting `{html_select_date}` form values to a timestamp.
-
-Template code
-
-
-    {html_select_date}
-
-      
-
-This will output:
-
-
-    <select name="Date_Month">
-    <option value="1">January</option>
-    <option value="2">February</option>
-    <option value="3">March</option>
-      ..... snipped .....
-    <option value="10">October</option>
-    <option value="11">November</option>
-    <option value="12" selected="selected">December</option>
-    </select>
-    <select name="Date_Day">
-    <option value="1">01</option>
-    <option value="2">02</option>
-    <option value="3">03</option>
-      ..... snipped .....
-    <option value="11">11</option>
-    <option value="12">12</option>
-    <option value="13" selected="selected">13</option>
-    <option value="14">14</option>
-    <option value="15">15</option>
-      ..... snipped .....
-    <option value="29">29</option>
-    <option value="30">30</option>
-    <option value="31">31</option>
-    </select>
-    <select name="Date_Year">
-    <option value="2006" selected="selected">2006</option>
-    </select>
-
-      
-
-
-    {* start and end year can be relative to current year *}
-    {html_select_date prefix='StartDate' time=$time start_year='-5'
-       end_year='+1' display_days=false}
-
-      
-
-With 2000 as the current year the output:
-
-
-    <select name="StartDateMonth">
-    <option value="1">January</option>
-    <option value="2">February</option>
-    .... snipped ....
-    <option value="11">November</option>
-    <option value="12" selected="selected">December</option>
-    </select>
-    <select name="StartDateYear">
-    <option value="1995">1995</option>
-    .... snipped ....
-    <option value="1999">1999</option>
-    <option value="2000" selected="selected">2000</option>
-    <option value="2001">2001</option>
-    </select>
-
-      
-
-See also [`{html_select_time}`](#language.function.html.select.time),
-[`date_format`](#language.modifier.date.format),
-[`$smarty.now`](#language.variables.smarty.now) and the [date tips
-page](#tips.dates).
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
deleted file mode 100644
index 6ccc59907..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-select-time.md
+++ /dev/null
@@ -1,98 +0,0 @@
-{html\_select\_time} {#language.function.html.select.time}
-====================
-
-`{html_select_time}` is a [custom function](#language.custom.functions)
-that creates time dropdowns for you. It can display any or all of hour,
-minute, second and meridian.
-
-The `time` attribute can have different formats. It can be a unique
-timestamp, a string of the format `YYYYMMDDHHMMSS` or a string that is
-parseable by PHP\'s [`strtotime()`](&url.php-manual;strtotime).
-
-      Attribute Name                                                                                                                         Type                                                                                                                      Required                        Default                        Description
-  ----------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------- ---------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          prefix                                                                                                                            string                                                                                                                        No                            Time\_                        What to prefix the var name with
-           time            [timestamp](&url.php-manual;function.time), [DateTime](&url.php-manual;class.DateTime), mysql timestamp or any string parsable by [`strtotime()`](&url.php-manual;strtotime), arrays as produced by this function if field\_array is set.      No      current [timestamp](&url.php-manual;function.time)  What date/time to pre-select. If an array is given, the attributes field\_array and prefix are used to identify the array elements to extract hour, minute, second and meridian from.
-      display\_hours                                                                                                                        boolean                                                                                                                       No                             TRUE                         Whether or not to display hours
-     display\_minutes                                                                                                                       boolean                                                                                                                       No                             TRUE                         Whether or not to display minutes
-     display\_seconds                                                                                                                       boolean                                                                                                                       No                             TRUE                         Whether or not to display seconds
-     display\_meridian                                                                                                                      boolean                                                                                                                       No                             TRUE                         Whether or not to display meridian (am/pm)
-      use\_24\_hours                                                                                                                        boolean                                                                                                                       No                             TRUE                         Whether or not to use 24 hour clock
-     minute\_interval                                                                                                                       integer                                                                                                                       No                              1                           Number interval in minute dropdown
-     second\_interval                                                                                                                       integer                                                                                                                       No                              1                           Number interval in second dropdown
-       hour\_format                                                                                                                         string                                                                                                                        No                            \%02d                         What format the hour label should be in (sprintf)
-    hour\_value\_format                                                                                                                     string                                                                                                                        No                            \%20d                         What format the hour value should be in (sprintf)
-      minute\_format                                                                                                                        string                                                                                                                        No                            \%02d                         What format the minute label should be in (sprintf)
-   minute\_value\_format                                                                                                                    string                                                                                                                        No                            \%20d                         What format the minute value should be in (sprintf)
-      second\_format                                                                                                                        string                                                                                                                        No                            \%02d                         What format the second label should be in (sprintf)
-   second\_value\_format                                                                                                                    string                                                                                                                        No                            \%20d                         What format the second value should be in (sprintf)
-       field\_array                                                                                                                         string                                                                                                                        No                             n/a                          Outputs values to array of this name
-        all\_extra                                                                                                                          string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-        hour\_extra                                                                                                                         string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-       minute\_extra                                                                                                                        string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-       second\_extra                                                                                                                        string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-      meridian\_extra                                                                                                                       string                                                                                                                        No                             null                         Adds extra attributes to select/input tags if given
-     field\_separator                                                                                                                       string                                                                                                                        No                             \\n                          String printed between different fields
-     option\_separator                                                                                                                      string                                                                                                                        No                             \\n                          String printed between different options of a field
-          all\_id                                                                                                                           string                                                                                                                        No                             null                         Adds id-attribute to all select/input tags if given
-         hour\_id                                                                                                                           string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-        minute\_id                                                                                                                          string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-        second\_id                                                                                                                          string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-       meridian\_id                                                                                                                         string                                                                                                                        No                             null                         Adds id-attribute to select/input tags if given
-        all\_empty                                                                                                                          string                                                                                                                        No                             null                         If supplied then the first element of any select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-boxes read "Please select" for example.
-        hour\_empty                                                                                                                         string                                                                                                                        No                             null                         If supplied then the first element of the hour\'s select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-box read "Please select an hour" for example.
-       minute\_empty                                                                                                                        string                                                                                                                        No                             null                         If supplied then the first element of the minute\'s select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-box read "Please select an minute" for example.
-       second\_empty                                                                                                                        string                                                                                                                        No                             null                         If supplied then the first element of the second\'s select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-box read "Please select an second" for example.
-      meridian\_empty                                                                                                                       string                                                                                                                        No                             null                         If supplied then the first element of the meridian\'s select-box has this value as it\'s label and "" as it\'s value. This is useful to make the select-box read "Please select an meridian" for example.
-
-
-    {html_select_time use_24_hours=true}
-
-      
-
-At 9:20 and 23 seconds in the morning the template above would output:
-
-
-    <select name="Time_Hour">
-    <option value="00">00</option>
-    <option value="01">01</option>
-    ... snipped ....
-    <option value="08">08</option>
-    <option value="09" selected>09</option>
-    <option value="10">10</option>
-    ... snipped ....
-    <option value="22">22</option>
-    <option value="23">23</option>
-    </select>
-    <select name="Time_Minute">
-    <option value="00">00</option>
-    <option value="01">01</option>
-    ... snipped ....
-    <option value="19">19</option>
-    <option value="20" selected>20</option>
-    <option value="21">21</option>
-    ... snipped ....
-    <option value="58">58</option>
-    <option value="59">59</option>
-    </select>
-    <select name="Time_Second">
-    <option value="00">00</option>
-    <option value="01">01</option>
-    ... snipped ....
-    <option value="22">22</option>
-    <option value="23" selected>23</option>
-    <option value="24">24</option>
-    ... snipped ....
-    <option value="58">58</option>
-    <option value="59">59</option>
-    </select>
-    <select name="Time_Meridian">
-    <option value="am" selected>AM</option>
-    <option value="pm">PM</option>
-    </select>
-
-      
-
-See also [`$smarty.now`](#language.variables.smarty.now),
-[`{html_select_date}`](#language.function.html.select.date) and the
-[date tips page](#tips.dates).
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
deleted file mode 100644
index fed4ae4d7..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-html-table.md
+++ /dev/null
@@ -1,89 +0,0 @@
-{html\_table} {#language.function.html.table}
-=============
-
-`{html_table}` is a [custom function](#language.custom.functions) that
-dumps an array of data into an HTML `<table>`.
-
-   Attribute Name    Type     Required      Default      Description
-  ---------------- --------- ---------- ---------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-        loop         array      Yes          *n/a*       Array of data to loop through
-        cols         mixed       No           *3*        Number of columns in the table or a comma-separated list of column heading names or an array of column heading names.if the cols-attribute is empty, but rows are given, then the number of cols is computed by the number of rows and the number of elements to display to be just enough cols to display all elements. If both, rows and cols, are omitted cols defaults to 3. if given as a list or array, the number of columns is computed from the number of elements in the list or array.
-        rows        integer      No         *empty*      Number of rows in the table. if the rows-attribute is empty, but cols are given, then the number of rows is computed by the number of cols and the number of elements to display to be just enough rows to display all elements.
-       inner        string       No          *cols*      Direction of consecutive elements in the loop-array to be rendered. *cols* means elements are displayed col-by-col. *rows* means elements are displayed row-by-row.
-      caption       string       No         *empty*      Text to be used for the `<caption>` element of the table
-    table\_attr     string       No      *border=\"1\"*  Attributes for `<table>` tag
-      th\_attr      string       No         *empty*      Attributes for `<th>` tag (arrays are cycled)
-      tr\_attr      string       No         *empty*      attributes for `<tr>` tag (arrays are cycled)
-      td\_attr      string       No         *empty*      Attributes for `<td>` tag (arrays are cycled)
-      trailpad      string       No         *&nbsp;*     Value to pad the trailing cells on last row with (if any)
-        hdir        string       No         *right*      Direction of each row to be rendered. possible values: *right* (left-to-right), and *left* (right-to-left)
-        vdir        string       No          *down*      Direction of each column to be rendered. possible values: *down* (top-to-bottom), *up* (bottom-to-top)
-
--   The `cols` attribute determines how many columns will be in the
-    table.
-
--   The `table_attr`, `tr_attr` and `td_attr` values determine the
-    attributes given to the `<table>`, `<tr>` and `<td>` tags.
-
--   If `tr_attr` or `td_attr` are arrays, they will be cycled through.
-
--   `trailpad` is the value put into the trailing cells on the last
-    table row if there are any present.
-
-<!-- -->
-
-
-    <?php
-    $smarty->assign( 'data', array(1,2,3,4,5,6,7,8,9) );
-    $smarty->assign( 'tr', array('bgcolor="#eeeeee"','bgcolor="#dddddd"') );
-    $smarty->display('index.tpl');
-    ?>
-
-      
-
-The variables assigned from php could be displayed as these three
-examples demonstrate. Each example shows the template followed by
-output.
-
-
-    {**** Example One ****}
-    {html_table loop=$data}
-
-    <table border="1">
-    <tbody>
-    <tr><td>1</td><td>2</td><td>3</td></tr>
-    <tr><td>4</td><td>5</td><td>6</td></tr>
-    <tr><td>7</td><td>8</td><td>9</td></tr>
-    </tbody>
-    </table>
-
-
-    {**** Example Two ****}
-    {html_table loop=$data cols=4 table_attr='border="0"'}
-
-    <table border="0">
-    <tbody>
-    <tr><td>1</td><td>2</td><td>3</td><td>4</td></tr>
-    <tr><td>5</td><td>6</td><td>7</td><td>8</td></tr>
-    <tr><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-    </tbody>
-    </table>
-
-
-    {**** Example Three ****}
-    {html_table loop=$data cols="first,second,third,fourth" tr_attr=$tr}
-
-    <table border="1">
-    <thead>
-    <tr>
-    <th>first</th><th>second</th><th>third</th><th>fourth</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr bgcolor="#eeeeee"><td>1</td><td>2</td><td>3</td><td>4</td></tr>
-    <tr bgcolor="#dddddd"><td>5</td><td>6</td><td>7</td><td>8</td></tr>
-    <tr bgcolor="#eeeeee"><td>9</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-    </tbody>
-    </table>
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
deleted file mode 100644
index cc5bf6968..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-mailto.md
+++ /dev/null
@@ -1,56 +0,0 @@
-{mailto} {#language.function.mailto}
-========
-
-`{mailto}` automates the creation of a `mailto:` anchor links and
-optionally encodes them. Encoding emails makes it more difficult for web
-spiders to lift email addresses off of a site.
-
-> **Note**
->
-> Javascript is probably the most thorough form of encoding, although
-> you can use hex encoding too.
-
-   Attribute Name    Type    Required   Default  Description
-  ---------------- -------- ---------- --------- -----------------------------------------------------------------------------------------------
-      address       string     Yes       *n/a*   The e-mail address
-        text        string      No       *n/a*   The text to display, default is the e-mail address
-       encode       string      No      *none*   How to encode the e-mail. Can be one of `none`, `hex`, `javascript` or `javascript_charcode`.
-         cc         string      No       *n/a*   Email addresses to carbon copy, separate entries by a comma.
-        bcc         string      No       *n/a*   Email addresses to blind carbon copy, separate entries by a comma
-      subject       string      No       *n/a*   Email subject
-     newsgroups     string      No       *n/a*   Newsgroups to post to, separate entries by a comma.
-     followupto     string      No       *n/a*   Addresses to follow up to, separate entries by a comma.
-       extra        string      No       *n/a*   Any extra information you want passed to the link, such as style sheet classes
-
-
-    {mailto address="me@example.com"}
-    <a href="mailto:me@example.com" >me@example.com</a>
-
-    {mailto address="me@example.com" text="send me some mail"}
-    <a href="mailto:me@example.com" >send me some mail</a>
-
-    {mailto address="me@example.com" encode="javascript"}
-    <script type="text/javascript" language="javascript">
-       eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
-    </script>
-
-    {mailto address="me@example.com" encode="hex"}
-    <a href="mailto:%6d%65.. snipped..3%6f%6d">&#x6d;&..snipped...#x6f;&#x6d;</a>
-
-    {mailto address="me@example.com" subject="Hello to you!"}
-    <a href="mailto:me@example.com?subject=Hello%20to%20you%21" >me@example.com</a>
-
-    {mailto address="me@example.com" cc="you@example.com,they@example.com"}
-    <a href="mailto:me@example.com?cc=you@example.com,they@example.com" >me@example.com</a>
-
-    {mailto address="me@example.com" extra='class="email"'}
-    <a href="mailto:me@example.com" class="email">me@example.com</a>
-
-    {mailto address="me@example.com" encode="javascript_charcode"}
-    <script type="text/javascript" language="javascript">
-        {document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
-    </script>
-
-See also [`escape`](#language.modifier.escape),
-[`{textformat}`](#language.function.textformat) and [obfuscating email
-addresses](#tips.obfuscating.email).
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
deleted file mode 100644
index 9adfd1c5a..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-math.md
+++ /dev/null
@@ -1,104 +0,0 @@
-{math} {#language.function.math}
-======
-
-`{math}` allows the template designer to do math equations in the
-template.
-
--   Any numeric template variables may be used in the equations, and the
-    result is printed in place of the tag.
-
--   The variables used in the equation are passed as parameters, which
-    can be template variables or static values.
-
--   +, -, /, \*, abs, ceil, cos, exp, floor, log, log10, max, min, pi,
-    pow, rand, round, sin, sqrt, srans and tan are all valid operators.
-    Check the PHP documentation for further information on these
-    [math](&url.php-manual;eval) functions.
-
--   If you supply the `assign` attribute, the output of the `{math}`
-    function will be assigned to this template variable instead of being
-    output to the template.
-
-> **Note**
->
-> `{math}` is an expensive function in performance due to its use of the
-> php [`eval()`](&url.php-manual;eval) function. Doing the math in PHP
-> is much more efficient, so whenever possible do the math calculations
-> in the script and [`assign()`](#api.assign) the results to the
-> template. Definitely avoid repetitive `{math}` function calls, eg
-> within [`{section}`](#language.function.section) loops.
-
-   Attribute Name    Type     Required   Default  Description
-  ---------------- --------- ---------- --------- --------------------------------------------------
-      equation      string      Yes       *n/a*   The equation to execute
-       format       string       No       *n/a*   The format of the result (sprintf)
-        var         numeric     Yes       *n/a*   Equation variable value
-       assign       string       No       *n/a*   Template variable the output will be assigned to
-    \[var \...\]    numeric     Yes       *n/a*   Equation variable value
-
-**Example a:**
-
-
-       {* $height=4, $width=5 *}
-
-       {math equation="x + y" x=$height y=$width}
-
-      
-
-The above example will output:
-
-
-       9
-
-      
-
-**Example b:**
-
-
-       {* $row_height = 10, $row_width = 20, #col_div# = 2, assigned in template *}
-
-       {math equation="height * width / division"
-       height=$row_height
-       width=$row_width
-       division=#col_div#}
-
-      
-
-The above example will output:
-
-
-       100
-
-      
-
-**Example c:**
-
-
-       {* you can use parenthesis *}
-
-       {math equation="(( x + y ) / z )" x=2 y=10 z=2}
-
-      
-
-The above example will output:
-
-
-       6
-
-      
-
-**Example d:**
-
-
-       {* you can supply a format parameter in sprintf format *}
-
-       {math equation="x + y" x=4.4444 y=5.0000 format="%.2f"}
-       
-      
-
-The above example will output:
-
-
-       9.44
-
-      
diff --git a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md b/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
deleted file mode 100644
index d0cd4cfc8..000000000
--- a/vendor/smarty/smarty/docs/designers/language-custom-functions/language-function-textformat.md
+++ /dev/null
@@ -1,190 +0,0 @@
-{textformat} {#language.function.textformat}
-============
-
-`{textformat}` is a [block function](#plugins.block.functions) used to
-format text. It basically cleans up spaces and special characters, and
-formats paragraphs by wrapping at a boundary and indenting lines.
-
-You can set the parameters explicitly, or use a preset style. Currently
-"email" is the only available style.
-
-   Attribute Name    Type     Required       Default       Description
-  ---------------- --------- ---------- ------------------ ----------------------------------------------------------------------------------------
-       style        string       No           *n/a*        Preset style
-       indent       number       No            *0*         The number of chars to indent every line
-   indent\_first    number       No            *0*         The number of chars to indent the first line
-    indent\_char    string       No      *(single space)*  The character (or string of chars) to indent with
-        wrap        number       No            *80*        How many characters to wrap each line to
-     wrap\_char     string       No           *\\n*        The character (or string of chars) to break each line with
-     wrap\_cut      boolean      No          *FALSE*       If TRUE, wrap will break the line at the exact character instead of at a word boundary
-       assign       string       No           *n/a*        The template variable the output will be assigned to
-
-
-       {textformat wrap=40}
-
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-
-       This is bar.
-
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-
-       {/textformat}
-
-
-      
-
-The above example will output:
-
-
-
-       This is foo. This is foo. This is foo.
-       This is foo. This is foo. This is foo.
-
-       This is bar.
-
-       bar foo bar foo foo. bar foo bar foo
-       foo. bar foo bar foo foo. bar foo bar
-       foo foo. bar foo bar foo foo. bar foo
-       bar foo foo. bar foo bar foo foo.
-
-      
-
-
-       {textformat wrap=40 indent=4}
-
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-
-       This is bar.
-
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-
-       {/textformat}
-
-
-      
-
-The above example will output:
-
-
-
-       This is foo. This is foo. This is
-       foo. This is foo. This is foo. This
-       is foo.
-
-       This is bar.
-
-       bar foo bar foo foo. bar foo bar foo
-       foo. bar foo bar foo foo. bar foo
-       bar foo foo. bar foo bar foo foo.
-       bar foo bar foo foo. bar foo bar
-       foo foo.
-
-      
-
-
-       {textformat wrap=40 indent=4 indent_first=4}
-
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-
-       This is bar.
-
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-
-       {/textformat}
-
-      
-
-The above example will output:
-
-
-
-       This is foo. This is foo. This
-       is foo. This is foo. This is foo.
-       This is foo.
-
-       This is bar.
-
-       bar foo bar foo foo. bar foo bar
-       foo foo. bar foo bar foo foo. bar
-       foo bar foo foo. bar foo bar foo
-       foo. bar foo bar foo foo. bar foo
-       bar foo foo.
-
-      
-
-
-       {textformat style="email"}
-
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-       This is foo.
-
-       This is bar.
-
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-       bar foo bar foo     foo.
-
-       {/textformat}
-
-
-      
-
-The above example will output:
-
-
-
-       This is foo. This is foo. This is foo. This is foo. This is foo. This is
-       foo.
-
-       This is bar.
-
-       bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo
-       bar foo foo. bar foo bar foo foo. bar foo bar foo foo. bar foo bar foo
-       foo.
-
-
-      
-
-See also [`{strip}`](#language.function.strip) and
-[`wordwrap`](#language.modifier.wordwrap).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers.md b/vendor/smarty/smarty/docs/designers/language-modifiers.md
deleted file mode 100644
index 4cb69cd1e..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers.md
+++ /dev/null
@@ -1,123 +0,0 @@
-Variable Modifiers {#language.modifiers}
-==================
-
-## Table of contents
-- [capitalize](./language-modifiers/language-modifier-capitalize.md)
-- [cat](./language-modifiers/language-modifier-cat.md)
-- [count_characters](./language-modifiers/language-modifier-count-characters.md)
-- [count_paragraphs](./language-modifiers/language-modifier-count-paragraphs.md)
-- [count_sentences](./language-modifiers/language-modifier-count-sentences.md)
-- [count_words](./language-modifiers/language-modifier-count-words.md)
-- [date_format](./language-modifiers/language-modifier-date-format.md)
-- [default](./language-modifiers/language-modifier-default.md)
-- [escape](./language-modifiers/language-modifier-escape.md)
-- [from_charset](./language-modifiers/language-modifier-from-charset.md)
-- [indent](./language-modifiers/language-modifier-indent.md)
-- [lower](./language-modifiers/language-modifier-lower.md)
-- [nl2br](./language-modifiers/language-modifier-nl2br.md)
-- [regex_replace](./language-modifiers/language-modifier-regex-replace.md)
-- [replace](./language-modifiers/language-modifier-replace.md)
-- [spacify](./language-modifiers/language-modifier-spacify.md)
-- [string_format](./language-modifiers/language-modifier-string-format.md)
-- [strip](./language-modifiers/language-modifier-strip.md)
-- [strip_tags](./language-modifiers/language-modifier-strip-tags.md)
-- [to_charset](./language-modifiers/language-modifier-to-charset.md)
-- [truncate](./language-modifiers/language-modifier-truncate.md)
-- [unescape](./language-modifiers/language-modifier-unescape.md)
-- [upper](./language-modifiers/language-modifier-upper.md)
-- [wordwrap](./language-modifiers/language-modifier-wordwrap.md)
-
-Variable modifiers can be applied to
-[variables](./language-variables.md), [custom
-functions](./language-custom-functions.md) or strings. To apply a modifier,
-specify the value followed by a `|` (pipe) and the modifier name. A
-modifier may accept additional parameters that affect its behavior.
-These parameters follow the modifier name and are separated by a `:`
-(colon). Also, *all php-functions can be used as modifiers implicitly*
-(more below) and modifiers can be
-[combined](./language-combining-modifiers.md).
-
-
-    {* apply modifier to a variable *}
-    {$title|upper}
-
-    {* modifier with parameters *}
-    {$title|truncate:40:"..."}
-
-    {* apply modifier to a function parameter *}
-    {html_table loop=$myvar|upper}
-
-    {* with parameters *}
-    {html_table loop=$myvar|truncate:40:"..."}
-
-    {* apply modifier to literal string *}
-    {"foobar"|upper}
-
-    {* using date_format to format the current date *}
-    {$smarty.now|date_format:"%Y/%m/%d"}
-
-    {* apply modifier to a custom function *}
-    {mailto|upper address="smarty@example.com"}
-
-    {* using  php's str_repeat *}
-    {"="|str_repeat:80}
-
-    {* php's count *}
-    {$myArray|@count}
-
-    {* this will uppercase and truncate the whole array *}
-    <select name="name_id">
-    {html_options output=$my_array|upper|truncate:20}
-    </select>
-
-      
-
-- Modifiers can be applied to any type of variables, including arrays
-    and objects.
-
-    > **Note**
-    >
-    > The default behavior was changed with Smarty 3. In Smarty 2.x, you
-    > had to use an \"`@`\" symbol to apply a modifier to an array, such
-    > as `{$articleTitle|@count}`. With Smarty 3, the \"`@`\" is no
-    > longer necessary, and is ignored.
-    >
-    > If you want a modifier to apply to each individual item of an
-    > array, you will either need to loop the array in the template, or
-    > provide for this functionality inside your modifier function.
-
-    > **Note**
-    >
-    > Second, in Smarty 2.x, modifiers were applied to the result of
-    > math expressions like `{8+2}`, meaning that
-    > `{8+2|count_characters}` would give `2`, as 8+2=10 and 10 is two
-    > characters long. With Smarty 3, modifiers are applied to the
-    > variables or atomic expressions before executing the calculations,
-    > so since 2 is one character long, `{8+2|count_characters}`
-    > gives 9. To get the old result use parentheses like
-    > `{(8+2)|count_characters}`.
-
-- Modifiers are autoloaded from the
-    [`$plugins_dir`](../programmers/api-variables/variable-plugins-dir.md) or can be registered
-    explicitly with the [`registerPlugin()`](../programmers/api-functions/api-register-plugin.md)
-    function. The later is useful for sharing a function between php
-    scripts and smarty templates.
-
-- All php-functions can be used as modifiers implicitly, as
-    demonstrated in the example above. However, using php-functions as
-    modifiers has two little pitfalls:
-
-    -   First - sometimes the order of the function-parameters is not
-        the desirable one. Formatting `$foo` with
-        `{"%2.f"|sprintf:$foo}` actually works, but asks for the more
-        intuitive, like `{$foo|string_format:"%2.f"}` that is provided
-        by the Smarty distribution.
-
-    -   Secondly - if security is enabled, all php-functions that are to
-        be used as modifiers have to be declared trusted in the
-        `$modifiers` property of the securty policy. See the
-        [Security](../programmers/advanced-features/advanced-features-security.md) section for details.
-
-See also [`registerPlugin()`](../programmers/api-functions/api-register-plugin.md), [combining
-modifiers](./language-combining-modifiers.md). and [extending smarty with
-plugins](../programmers/plugins.md)
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
deleted file mode 100644
index 015bb3bc0..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-capitalize.md
+++ /dev/null
@@ -1,41 +0,0 @@
-capitalize {#language.modifier.capitalize}
-==========
-
-This is used to capitalize the first letter of all words in a variable.
-This is similar to the PHP [`ucwords()`](&url.php-manual;ucwords)
-function.
-
-   Parameter Position    Type     Required   Default  Description
-  -------------------- --------- ---------- --------- -----------------------------------------------------------------------------------------------------------
-           1            boolean      No       FALSE   This determines whether or not words with digits will be uppercased
-           2            boolean      No       FALSE   This determines whether or not Capital letters within words should be lowercased, e.g. \"aAa\" to \"Aaa\"
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'next x-men film, x3, delayed.');
-
-    ?>
-
-       
-
-Where the template is:
-
-
-    {$articleTitle}
-    {$articleTitle|capitalize}
-    {$articleTitle|capitalize:true}
-
-       
-
-Will output:
-
-
-    next x-men film, x3, delayed.
-    Next X-Men Film, x3, Delayed.
-    Next X-Men Film, X3, Delayed.
-
-       
-
-See also [`lower`](#language.modifier.lower) and
-[`upper`](#language.modifier.upper)
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
deleted file mode 100644
index 1f43ae177..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-cat.md
+++ /dev/null
@@ -1,31 +0,0 @@
-cat {#language.modifier.cat}
-===
-
-This value is concatenated to the given variable.
-
-   Parameter Position    Type    Required   Default  Description
-  -------------------- -------- ---------- --------- -----------------------------------------------
-           1            string      No      *empty*  This value to catenate to the given variable.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', "Psychics predict world didn't end");
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle|cat:' yesterday.'}
-
-       
-
-Will output:
-
-
-    Psychics predict world didn't end yesterday.
-
-       
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
deleted file mode 100644
index 23bc00d51..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-characters.md
+++ /dev/null
@@ -1,39 +0,0 @@
-count\_characters {#language.modifier.count.characters}
-=================
-
-This is used to count the number of characters in a variable.
-
-   Parameter Position    Type     Required   Default  Description
-  -------------------- --------- ---------- --------- -------------------------------------------------------------------------------
-           1            boolean      No       FALSE   This determines whether or not to include whitespace characters in the count.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Cold Wave Linked to Temperatures.');
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|count_characters}
-    {$articleTitle|count_characters:true}
-
-       
-
-Will output:
-
-
-    Cold Wave Linked to Temperatures.
-    29
-    33
-
-       
-
-See also [`count_words`](#language.modifier.count.words),
-[`count_sentences`](#language.modifier.count.sentences) and
-[`count_paragraphs`](#language.modifier.count.paragraphs).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
deleted file mode 100644
index 02c474e6b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-paragraphs.md
+++ /dev/null
@@ -1,38 +0,0 @@
-count\_paragraphs {#language.modifier.count.paragraphs}
-=================
-
-This is used to count the number of paragraphs in a variable.
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                     "War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.\n\n
-                     Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation."
-                    );
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|count_paragraphs}
-
-       
-
-Will output:
-
-
-    War Dims Hope for Peace. Child's Death Ruins Couple's Holiday.
-
-    Man is Fatally Slain. Death Causes Loneliness, Feeling of Isolation.
-    2
-
-       
-
-See also [`count_characters`](#language.modifier.count.characters),
-[`count_sentences`](#language.modifier.count.sentences) and
-[`count_words`](#language.modifier.count.words).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
deleted file mode 100644
index 0a77ab82a..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-sentences.md
+++ /dev/null
@@ -1,37 +0,0 @@
-count\_sentences {#language.modifier.count.sentences}
-================
-
-This is used to count the number of sentences in a variable. A sentence
-being delimited by a dot, question- or exclamation-mark (.?!).
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                     'Two Soviet Ships Collide - One Dies.
-                     Enraged Cow Injures Farmer with Axe.'
-                     );
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|count_sentences}
-
-       
-
-Will output:
-
-
-    Two Soviet Ships Collide - One Dies. Enraged Cow Injures Farmer with Axe.
-    2
-
-       
-
-See also [`count_characters`](#language.modifier.count.characters),
-[`count_paragraphs`](#language.modifier.count.paragraphs) and
-[`count_words`](#language.modifier.count.words).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
deleted file mode 100644
index d25fbd5b8..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-count-words.md
+++ /dev/null
@@ -1,33 +0,0 @@
-count\_words {#language.modifier.count.words}
-============
-
-This is used to count the number of words in a variable.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|count_words}
-
-       
-
-This will output:
-
-
-    Dealers Will Hear Car Talk at Noon.
-    7
-
-       
-
-See also [`count_characters`](#language.modifier.count.characters),
-[`count_paragraphs`](#language.modifier.count.paragraphs) and
-[`count_sentences`](#language.modifier.count.sentences).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
deleted file mode 100644
index edd81937b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-date-format.md
+++ /dev/null
@@ -1,175 +0,0 @@
-date\_format {#language.modifier.date.format}
-============
-
-This formats a date and time into the given
-[`strftime()`](&url.php-manual;strftime) format. Dates can be passed to
-Smarty as unix [timestamps](&url.php-manual;function.time), [DateTime
-objects](&url.php-manual;class.DateTime), mysql timestamps or any string
-made up of month day year, parsable by php\'s
-[`strtotime()`](&url.php-manual;strtotime). Designers can then use
-`date_format` to have complete control of the formatting of the date. If
-the date passed to `date_format` is empty and a second parameter is
-passed, that will be used as the date to format.
-
-   Parameter Position    Type    Required    Default    Description
-  -------------------- -------- ---------- ------------ -------------------------------------------------
-           1            string      No      \%b %e, %Y  This is the format for the outputted date.
-           2            string      No         n/a      This is the default date if the input is empty.
-
-> **Note**
->
-> Since Smarty-2.6.10 numeric values passed to `date_format` are
-> *always* (except for mysql timestamps, see below) interpreted as a
-> unix timestamp.
->
-> Before Smarty-2.6.10 numeric strings that where also parsable by
-> `strtotime()` in php (like `YYYYMMDD`) where sometimes (depending on
-> the underlying implementation of `strtotime()`) interpreted as date
-> strings and NOT as timestamps.
->
-> The only exception are mysql timestamps: They are also numeric only
-> and 14 characters long (`YYYYMMDDHHMMSS`), mysql timestamps have
-> precedence over unix timestamps.
-
-> **Note**
->
-> `date_format` is essentially a wrapper to PHP\'s
-> [`strftime()`](&url.php-manual;strftime) function. You may have more
-> or less conversion specifiers available depending on your system\'s
-> [`strftime()`](&url.php-manual;strftime) function where PHP was
-> compiled. Check your system\'s manpage for a full list of valid
-> specifiers. However, a few of the specifiers are emulated on Windows.
-> These are: %D, %e, %h, %l, %n, %r, %R, %t, %T.
-
-
-    <?php
-
-    $config['date'] = '%I:%M %p';
-    $config['time'] = '%H:%M:%S';
-    $smarty->assign('config', $config);
-    $smarty->assign('yesterday', strtotime('-1 day'));
-
-    ?>
-
-       
-
-This template uses [`$smarty.now`](#language.variables.smarty.now) to
-get the current time:
-
-
-    {$smarty.now|date_format}
-    {$smarty.now|date_format:"%D"}
-    {$smarty.now|date_format:$config.date}
-    {$yesterday|date_format}
-    {$yesterday|date_format:"%A, %B %e, %Y"}
-    {$yesterday|date_format:$config.time}
-
-       
-
-This above will output:
-
-
-    Jan 1, 2022
-    01/01/22
-    02:33 pm
-    Dec 31, 2021
-    Monday, December 1, 2021
-    14:33:00
-
-       
-
-`date_format` conversion specifiers:
-
--   \%a - abbreviated weekday name according to the current locale
-
--   \%A - full weekday name according to the current locale
-
--   \%b - abbreviated month name according to the current locale
-
--   \%B - full month name according to the current locale
-
--   \%c - preferred date and time representation for the current locale
-
--   \%C - century number (the year divided by 100 and truncated to an
-    integer, range 00 to 99)
-
--   \%d - day of the month as a decimal number (range 01 to 31)
-
--   \%D - same as %m/%d/%y
-
--   \%e - day of the month as a decimal number, a single digit is
-    preceded by a space (range 1 to 31)
-
--   \%g - Week-based year within century \[00,99\]
-
--   \%G - Week-based year, including the century \[0000,9999\]
-
--   \%h - same as %b
-
--   \%H - hour as a decimal number using a 24-hour clock (range 00
-    to 23)
-
--   \%I - hour as a decimal number using a 12-hour clock (range 01
-    to 12)
-
--   \%j - day of the year as a decimal number (range 001 to 366)
-
--   \%k - Hour (24-hour clock) single digits are preceded by a blank.
-    (range 0 to 23)
-
--   \%l - hour as a decimal number using a 12-hour clock, single digits
-    preceded by a space (range 1 to 12)
-
--   \%m - month as a decimal number (range 01 to 12)
-
--   \%M - minute as a decimal number
-
--   \%n - newline character
-
--   \%p - either \`am\' or \`pm\' according to the given time value, or
-    the corresponding strings for the current locale
-
--   \%r - time in a.m. and p.m. notation
-
--   \%R - time in 24 hour notation
-
--   \%S - second as a decimal number
-
--   \%t - tab character
-
--   \%T - current time, equal to %H:%M:%S
-
--   \%u - weekday as a decimal number \[1,7\], with 1 representing
-    Monday
-
--   \%U - week number of the current year as a decimal number, starting
-    with the first Sunday as the first day of the first week
-
--   \%V - The ISO 8601:1988 week number of the current year as a decimal
-    number, range 01 to 53, where week 1 is the first week that has at
-    least 4 days in the current year, and with Monday as the first day
-    of the week.
-
--   \%w - day of the week as a decimal, Sunday being 0
-
--   \%W - week number of the current year as a decimal number, starting
-    with the first Monday as the first day of the first week
-
--   \%x - preferred date representation for the current locale without
-    the time
-
--   \%X - preferred time representation for the current locale without
-    the date
-
--   \%y - year as a decimal number without a century (range 00 to 99)
-
--   \%Y - year as a decimal number including the century
-
--   \%Z - time zone or name or abbreviation
-
--   \%% - a literal \`%\' character
-
-See also [`$smarty.now`](#language.variables.smarty.now),
-[`strftime()`](&url.php-manual;strftime),
-[`{html_select_date}`](#language.function.html.select.date) and the
-[date tips](#tips.dates) page.
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
deleted file mode 100644
index ce08e96ef..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-default.md
+++ /dev/null
@@ -1,41 +0,0 @@
-default {#language.modifier.default}
-=======
-
-This is used to set a default value for a variable. If the variable is
-unset or an empty string, the given default value is printed instead.
-Default takes the one argument.
-
-   Parameter Position    Type    Required   Default  Description
-  -------------------- -------- ---------- --------- ---------------------------------------------------------------
-           1            string      No      *empty*  This is the default value to output if the variable is empty.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Dealers Will Hear Car Talk at Noon.');
-    $smarty->assign('email', '');
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle|default:'no title'}
-    {$myTitle|default:'no title'}
-    {$email|default:'No email address available'}
-
-       
-
-Will output:
-
-
-    Dealers Will Hear Car Talk at Noon.
-    no title
-    No email address available
-
-       
-
-See also the [default variable handling](#tips.default.var.handling) and
-the [blank variable handling](#tips.blank.var.handling) pages.
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
deleted file mode 100644
index 37c71dde9..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-escape.md
+++ /dev/null
@@ -1,74 +0,0 @@
-escape {#language.modifier.escape}
-======
-
-`escape` is used to encode or escape a variable to `html`, `url`,
-`single quotes`, `hex`, `hexentity`, `javascript` and `mail`. By default
-its `html`.
-
-   Parameter Position    Type     Required                                                Possible Values                                                 Default  Description
-  -------------------- --------- ---------- ------------------------------------------------------------------------------------------------------------ --------- -------------------------------------------------------------------------------------
-           1            string       No             `html`, `htmlall`, `url`, `urlpathinfo`, `quotes`, `hex`, `hexentity`, `javascript`, `mail`           `html`   This is the escape format to use.
-           2            string       No      `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](&url.php-manual;htmlentities)   `UTF-8`  The character set encoding passed to htmlentities() et. al.
-           3            boolean      No                                                        FALSE                                                       TRUE    Double encode entites from &amp; to &amp;amp; (applys to `html` and `htmlall` only)
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    "'Stiff Opposition Expected to Casketless Funeral Plan'"
-                    );
-    $smarty->assign('EmailAddress','smarty@example.com');
-
-    ?>
-
-       
-
-These are example `escape` template lines followed by the output
-
-
-    {$articleTitle}
-    'Stiff Opposition Expected to Casketless Funeral Plan'
-
-    {$articleTitle|escape}
-    &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
-
-    {$articleTitle|escape:'html'}    {* escapes  & " ' < > *}
-    &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
-
-    {$articleTitle|escape:'htmlall'} {* escapes ALL html entities *}
-    &#039;Stiff Opposition Expected to Casketless Funeral Plan&#039;
-
-    <a href="?title={$articleTitle|escape:'url'}">click here</a>
-    <a
-    href="?title=%27Stiff%20Opposition%20Expected%20to%20Casketless%20Funeral%20Plan%27">click here</a>
-
-    {$articleTitle|escape:'quotes'}
-    \'Stiff Opposition Expected to Casketless Funeral Plan\'
-
-    <a href="mailto:{$EmailAddress|escape:"hex"}">{$EmailAddress|escape:"hexentity"}</a>
-    {$EmailAddress|escape:'mail'}    {* this converts to email to text *}
-    <a href="mailto:%62%6f%..snip..%65%74">&#x62;&#x6f;&#x62..snip..&#x65;&#x74;</a>
-
-    {'mail@example.com'|escape:'mail'}
-    smarty [AT] example [DOT] com
-
-       
-
-
-    {* the "rewind" parameter registers the current location *}
-    <a href="$my_path?page=foo&rewind=$my_uri|urlencode}">click here</a>
-
-       
-
-This snippet is useful for emails, but see also
-[`{mailto}`](#language.function.mailto)
-
-
-    {* email address mangled *}
-    <a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
-
-       
-
-See also [escaping smarty parsing](#language.escaping),
-[`{mailto}`](#language.function.mailto) and the [obfuscating email
-addresses](#tips.obfuscating.email) page.
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
deleted file mode 100644
index 8b7fdd50f..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-from-charset.md
+++ /dev/null
@@ -1,19 +0,0 @@
-from\_charset {#language.modifier.from_charset}
-=============
-
-`from_charset` is used to transcode a string from a given charset to the
-internal charset. This is the exact opposite of the [to\_charset
-modifier](#language.modifier.to_charset).
-
-   Parameter Position    Type    Required                                                       Possible Values                                                          Default     Description
-  -------------------- -------- ---------- -------------------------------------------------------------------------------------------------------------------------- -------------- ---------------------------------------------------------------
-           1            string      No      `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](&url.php-manual;mb_convert_encoding)   `ISO-8859-1`  The charset encoding the value is supposed to be decoded from
-
-> **Note**
->
-> Charset encoding should be handled by the application itself. This
-> modifier should only be used in cases where the application cannot
-> anticipate that a certain string is required in another encoding.
-
-See also [Charset Enconding](#charset), [from\_charset
-modifier](#language.modifier.from_charset).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
deleted file mode 100644
index d0264dca3..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-indent.md
+++ /dev/null
@@ -1,62 +0,0 @@
-indent {#language.modifier.indent}
-======
-
-This indents a string on each line, default is 4. As an optional
-parameter, you can specify the number of characters to indent. As an
-optional second parameter, you can specify the character to use to
-indent with eg use `"\t"` for a tab.
-
-   Parameter Position    Type     Required     Default    Description
-  -------------------- --------- ---------- ------------- ---------------------------------------------------
-           1            integer      No           4       This determines how many characters to indent to.
-           2            string       No      (one space)  This is the character used to indent with.
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    'NJ judge to rule on nude beach.
-    Sun or rain expected today, dark tonight.
-    Statistics show that teen pregnancy drops off significantly after 25.'
-                    );
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-
-    {$articleTitle|indent}
-
-    {$articleTitle|indent:10}
-
-    {$articleTitle|indent:1:"\t"}
-
-       
-
-Will output:
-
-
-    NJ judge to rule on nude beach.
-    Sun or rain expected today, dark tonight.
-    Statistics show that teen pregnancy drops off significantly after 25.
-
-        NJ judge to rule on nude beach.
-        Sun or rain expected today, dark tonight.
-        Statistics show that teen pregnancy drops off significantly after 25.
-
-              NJ judge to rule on nude beach.
-              Sun or rain expected today, dark tonight.
-              Statistics show that teen pregnancy drops off significantly after 25.
-
-            NJ judge to rule on nude beach.
-            Sun or rain expected today, dark tonight.
-            Statistics show that teen pregnancy drops off significantly after 25.
-
-       
-
-See also [`strip`](#language.modifier.strip),
-[`wordwrap`](#language.modifier.wordwrap) and
-[`spacify`](#language.modifier.spacify).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
deleted file mode 100644
index 90122e9e4..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-lower.md
+++ /dev/null
@@ -1,33 +0,0 @@
-lower {#language.modifier.lower}
-=====
-
-This is used to lowercase a variable. This is equivalent to the PHP
-[`strtolower()`](&url.php-manual;strtolower) function.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Two Convicts Evade Noose, Jury Hung.');
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|lower}
-
-       
-
-This will output:
-
-
-    Two Convicts Evade Noose, Jury Hung.
-    two convicts evade noose, jury hung.
-
-       
-
-See also [`upper`](#language.modifier.upper) and
-[`capitalize`](#language.modifier.capitalize).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
deleted file mode 100644
index 541233c8b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-nl2br.md
+++ /dev/null
@@ -1,35 +0,0 @@
-nl2br {#language.modifier.nl2br}
-=====
-
-All `"\n"` line breaks will be converted to html `<br />` tags in the
-given variable. This is equivalent to the PHP\'s
-[`nl2br()`](&url.php-manual;nl2br) function.
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    "Sun or rain expected\ntoday, dark tonight"
-                    );
-
-    ?>
-
-       
-
-Where the template is:
-
-
-    {$articleTitle|nl2br}
-
-       
-
-Will output:
-
-
-    Sun or rain expected<br />today, dark tonight
-
-       
-
-See also [`word_wrap`](#language.modifier.wordwrap),
-[`count_paragraphs`](#language.modifier.count.paragraphs) and
-[`count_sentences`](#language.modifier.count.sentences).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
deleted file mode 100644
index 6fcb33fad..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-regex-replace.md
+++ /dev/null
@@ -1,51 +0,0 @@
-regex\_replace {#language.modifier.regex.replace}
-==============
-
-A regular expression search and replace on a variable. Use the
-[`preg_replace()`](&url.php-manual;preg_replace) syntax from the PHP
-manual.
-
-> **Note**
->
-> Although Smarty supplies this regex convenience modifier, it is
-> usually better to apply regular expressions in PHP, either via custom
-> functions or modifiers. Regular expressions are considered application
-> code and are not part of presentation logic.
-
-Parameters
-
-   Parameter Position    Type    Required   Default  Description
-  -------------------- -------- ---------- --------- ------------------------------------------------
-           1            string     Yes       *n/a*   This is the regular expression to be replaced.
-           2            string     Yes       *n/a*   This is the string of text to replace with.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', "Infertility unlikely to\nbe passed on, experts say.");
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {* replace each carriage return, tab and new line with a space *}
-
-    {$articleTitle}
-    {$articleTitle|regex_replace:"/[\r\t\n]/":" "}
-
-       
-
-Will output:
-
-
-    Infertility unlikely to
-    be passed on, experts say.
-    Infertility unlikely to be passed on, experts say.
-
-       
-
-See also [`replace`](#language.modifier.replace) and
-[`escape`](#language.modifier.escape).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
deleted file mode 100644
index c7c2903ea..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-replace.md
+++ /dev/null
@@ -1,40 +0,0 @@
-replace {#language.modifier.replace}
-=======
-
-A simple search and replace on a variable. This is equivalent to the
-PHP\'s [`str_replace()`](&url.php-manual;str_replace) function.
-
-   Parameter Position    Type    Required   Default  Description
-  -------------------- -------- ---------- --------- ---------------------------------------------
-           1            string     Yes       *n/a*   This is the string of text to be replaced.
-           2            string     Yes       *n/a*   This is the string of text to replace with.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', "Child's Stool Great for Use in Garden.");
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|replace:'Garden':'Vineyard'}
-    {$articleTitle|replace:' ':'   '}
-
-       
-
-Will output:
-
-
-    Child's Stool Great for Use in Garden.
-    Child's Stool Great for Use in Vineyard.
-    Child's   Stool   Great   for   Use   in   Garden.
-
-       
-
-See also [`regex_replace`](#language.modifier.regex.replace) and
-[`escape`](#language.modifier.escape).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
deleted file mode 100644
index 8856dab43..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-spacify.md
+++ /dev/null
@@ -1,40 +0,0 @@
-spacify {#language.modifier.spacify}
-=======
-
-`spacify` is a way to insert a space between every character of a
-variable. You can optionally pass a different character or string to
-insert.
-
-   Parameter Position    Type    Required     Default    Description
-  -------------------- -------- ---------- ------------- -----------------------------------------------------------------
-           1            string      No      *one space*  This what gets inserted between each character of the variable.
-
-
-    <?php
-
-    $smarty->assign('articleTitle', 'Something Went Wrong in Jet Crash, Experts Say.');
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|spacify}
-    {$articleTitle|spacify:"^^"}
-
-       
-
-Will output:
-
-
-    Something Went Wrong in Jet Crash, Experts Say.
-    S o m e t h i n g   W .... snip ....  s h ,   E x p e r t s   S a y .
-    S^^o^^m^^e^^t^^h^^i^^n^^g^^ .... snip .... ^^e^^r^^t^^s^^ ^^S^^a^^y^^.
-
-       
-
-See also [`wordwrap`](#language.modifier.wordwrap) and
-[`nl2br`](#language.modifier.nl2br).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
deleted file mode 100644
index 754014e2d..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-string-format.md
+++ /dev/null
@@ -1,39 +0,0 @@
-string\_format {#language.modifier.string.format}
-==============
-
-This is a way to format strings, such as decimal numbers and such. Use
-the syntax for [`sprintf()`](&url.php-manual;sprintf) for the
-formatting.
-
-   Parameter Position    Type    Required   Default  Description
-  -------------------- -------- ---------- --------- ---------------------------------------
-           1            string     Yes       *n/a*   This is what format to use. (sprintf)
-
-
-    <?php
-
-    $smarty->assign('number', 23.5787446);
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$number}
-    {$number|string_format:"%.2f"}
-    {$number|string_format:"%d"}
-
-       
-
-Will output:
-
-
-    23.5787446
-    23.58
-    23
-
-       
-
-See also [`date_format`](#language.modifier.date.format).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
deleted file mode 100644
index 4a019767b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip-tags.md
+++ /dev/null
@@ -1,41 +0,0 @@
-strip\_tags {#language.modifier.strip.tags}
-===========
-
-This strips out markup tags, basically anything between `<` and `>`.
-
-   Parameter Position   Type   Required   Default  Description
-  -------------------- ------ ---------- --------- ----------------------------------------------------------------
-           1            bool      No       TRUE    This determines whether the tags are replaced by \' \' or \'\'
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    "Blind Woman Gets <font face=\"helvetica\">New
-    Kidney</font> from Dad she Hasn't Seen in <b>years</b>."
-                   );
-
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|strip_tags} {* same as {$articleTitle|strip_tags:true} *}
-    {$articleTitle|strip_tags:false}
-
-       
-
-Will output:
-
-
-    Blind Woman Gets <font face="helvetica">New Kidney</font> from Dad she Hasn't Seen in <b>years</b>.
-    Blind Woman Gets  New Kidney  from Dad she Hasn't Seen in  years .
-    Blind Woman Gets New Kidney from Dad she Hasn't Seen in years.
-
-       
-
-See also [`replace`](#language.modifier.replace) and
-[`regex_replace`](#language.modifier.regex.replace).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
deleted file mode 100644
index 7027e0313..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-strip.md
+++ /dev/null
@@ -1,40 +0,0 @@
-strip {#language.modifier.strip}
-=====
-
-This replaces all spaces, newlines and tabs with a single space, or with
-the supplied string.
-
-> **Note**
->
-> If you want to strip blocks of template text, use the built-in
-> [`{strip}`](#language.function.strip) function.
-
-
-    <?php
-    $smarty->assign('articleTitle', "Grandmother of\neight makes\t    hole in one.");
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|strip}
-    {$articleTitle|strip:'&nbsp;'}
-
-       
-
-Will output:
-
-
-    Grandmother of
-    eight makes        hole in one.
-    Grandmother of eight makes hole in one.
-    Grandmother&nbsp;of&nbsp;eight&nbsp;makes&nbsp;hole&nbsp;in&nbsp;one.
-
-       
-
-See also [`{strip}`](#language.function.strip) and
-[`truncate`](#language.modifier.truncate).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
deleted file mode 100644
index 6c53232c2..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-to-charset.md
+++ /dev/null
@@ -1,19 +0,0 @@
-to\_charset {#language.modifier.to_charset}
-===========
-
-`to_charset` is used to transcode a string from the internal charset to
-a given charset. This is the exact opposite of the [from\_charset
-modifier](#language.modifier.from_charset).
-
-   Parameter Position    Type    Required                                                       Possible Values                                                          Default     Description
-  -------------------- -------- ---------- -------------------------------------------------------------------------------------------------------------------------- -------------- -------------------------------------------------------------
-           1            string      No      `ISO-8859-1`, `UTF-8`, and any character set supported by [`mb_convert_encoding()`](&url.php-manual;mb_convert_encoding)   `ISO-8859-1`  The charset encoding the value is supposed to be encoded to
-
-> **Note**
->
-> Charset encoding should be handled by the application itself. This
-> modifier should only be used in cases where the application cannot
-> anticipate that a certain string is required in another encoding.
-
-See also [Charset Enconding](#charset), [from\_charset
-modifier](#language.modifier.from_charset).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
deleted file mode 100644
index 2303a5432..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-truncate.md
+++ /dev/null
@@ -1,52 +0,0 @@
-truncate {#language.modifier.truncate}
-========
-
-This truncates a variable to a character length, the default is 80. As
-an optional second parameter, you can specify a string of text to
-display at the end if the variable was truncated. The characters in the
-string are included with the original truncation length. By default,
-`truncate` will attempt to cut off at a word boundary. If you want to
-cut off at the exact character length, pass the optional third parameter
-of TRUE.
-
-   Parameter Position    Type     Required   Default  Description
-  -------------------- --------- ---------- --------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-           1            integer      No        80     This determines how many characters to truncate to.
-           2            string       No       \...    This is a text string that replaces the truncated text. Its length is included in the truncation length setting.
-           3            boolean      No       FALSE   This determines whether or not to truncate at a word boundary with FALSE, or at the exact character with TRUE.
-           4            boolean      No       FALSE   This determines whether the truncation happens at the end of the string with FALSE, or in the middle of the string with TRUE. Note that if this setting is TRUE, then word boundaries are ignored.
-
-
-    <?php
-    $smarty->assign('articleTitle', 'Two Sisters Reunite after Eighteen Years at Checkout Counter.');
-    ?>
-
-       
-
-where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|truncate}
-    {$articleTitle|truncate:30}
-    {$articleTitle|truncate:30:""}
-    {$articleTitle|truncate:30:"---"}
-    {$articleTitle|truncate:30:"":true}
-    {$articleTitle|truncate:30:"...":true}
-    {$articleTitle|truncate:30:'..':true:true}
-
-       
-
-This will output:
-
-
-    Two Sisters Reunite after Eighteen Years at Checkout Counter.
-    Two Sisters Reunite after Eighteen Years at Checkout Counter.
-    Two Sisters Reunite after...
-    Two Sisters Reunite after
-    Two Sisters Reunite after---
-    Two Sisters Reunite after Eigh
-    Two Sisters Reunite after E...
-    Two Sisters Re..ckout Counter.
-
-       
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
deleted file mode 100644
index 58d0b3f75..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-unescape.md
+++ /dev/null
@@ -1,39 +0,0 @@
-unescape {#language.modifier.unescape}
-========
-
-`unescape` is used to decode `entity`, `html` and `htmlall`. It counters
-the effects of the [escape modifier](#language.modifier.escape) for the
-given types.
-
-   Parameter Position    Type    Required                                                Possible Values                                                 Default  Description
-  -------------------- -------- ---------- ------------------------------------------------------------------------------------------------------------ --------- ------------------------------------------------------------------------------------------------------------------------------
-           1            string      No                                             `html`, `htmlall`, `entity`,                                          `html`   This is the escape format to use.
-           2            string      No      `ISO-8859-1`, `UTF-8`, and any character set supported by [`htmlentities()`](&url.php-manual;htmlentities)   `UTF-8`  The character set encoding passed to html\_entity\_decode() or htmlspecialchars\_decode() or mb\_convert\_encoding() et. al.
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    "Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro"
-                    );
-
-    ?>
-
-       
-
-These are example `unescape` template lines followed by the output
-
-
-    {$articleTitle}
-    Germans use &quot;&Uuml;mlauts&quot; and pay in &euro;uro
-
-    {$articleTitle|unescape:"html"}
-    Germans use "&Uuml;mlauts" and pay in &euro;uro
-
-    {$articleTitle|unescape:"htmlall"}
-    Germans use "Ümlauts" and pay in €uro
-
-       
-
-See also [escaping smarty parsing](#language.escaping), [escape
-modifier](#language.modifier.escape).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
deleted file mode 100644
index 9240f42d6..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-upper.md
+++ /dev/null
@@ -1,31 +0,0 @@
-upper {#language.modifier.upper}
-=====
-
-This is used to uppercase a variable. This is equivalent to the PHP
-[`strtoupper()`](&url.php-manual;strtoupper) function.
-
-
-    <?php
-    $smarty->assign('articleTitle', "If Strike isn't Settled Quickly it may Last a While.");
-    ?>
-
-       
-
-Where template is:
-
-
-    {$articleTitle}
-    {$articleTitle|upper}
-
-       
-
-Will output:
-
-
-    If Strike isn't Settled Quickly it may Last a While.
-    IF STRIKE ISN'T SETTLED QUICKLY IT MAY LAST A WHILE.
-
-       
-
-See also [`lower`](#language.modifier.lower) and
-[`capitalize`](#language.modifier.capitalize).
diff --git a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md b/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
deleted file mode 100644
index 97cd774f7..000000000
--- a/vendor/smarty/smarty/docs/designers/language-modifiers/language-modifier-wordwrap.md
+++ /dev/null
@@ -1,69 +0,0 @@
-wordwrap {#language.modifier.wordwrap}
-========
-
-Wraps a string to a column width, the default is 80. As an optional
-second parameter, you can specify a string of text to wrap the text to
-the next line, the default is a carriage return `"\n"`. By default,
-`wordwrap` will attempt to wrap at a word boundary. If you want to cut
-off at the exact character length, pass the optional third parameter as
-TRUE. This is equivalent to the PHP
-[`wordwrap()`](&url.php-manual;wordwrap) function.
-
-   Parameter Position    Type     Required   Default  Description
-  -------------------- --------- ---------- --------- ------------------------------------------------------------------------------------------------------
-           1            integer      No        80     This determines how many columns to wrap to.
-           2            string       No        \\n    This is the string used to wrap words with.
-           3            boolean      No       FALSE   This determines whether or not to wrap at a word boundary (FALSE), or at the exact character (TRUE).
-
-
-    <?php
-
-    $smarty->assign('articleTitle',
-                    "Blind woman gets new kidney from dad she hasn't seen in years."
-                   );
-
-    ?>
-
-       
-
-Where template is
-
-
-    {$articleTitle}
-
-    {$articleTitle|wordwrap:30}
-
-    {$articleTitle|wordwrap:20}
-
-    {$articleTitle|wordwrap:30:"<br />\n"}
-
-    {$articleTitle|wordwrap:26:"\n":true}
-
-       
-
-Will output:
-
-
-    Blind woman gets new kidney from dad she hasn't seen in years.
-
-    Blind woman gets new kidney
-    from dad she hasn't seen in
-    years.
-
-    Blind woman gets new
-    kidney from dad she
-    hasn't seen in
-    years.
-
-    Blind woman gets new kidney<br />
-    from dad she hasn't seen in<br />
-    years.
-
-    Blind woman gets new kidn
-    ey from dad she hasn't se
-    en in years.
-
-       
-
-See also [`nl2br`](#language.modifier.nl2br) and
-[`{textformat}`](#language.function.textformat).
diff --git a/vendor/smarty/smarty/docs/designers/language-variables.md b/vendor/smarty/smarty/docs/designers/language-variables.md
deleted file mode 100644
index 3950d0baf..000000000
--- a/vendor/smarty/smarty/docs/designers/language-variables.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Variables
-=========
-
-## Table of contents
-- [Variables assigned from PHP](./language-variables/language-assigned-variables.md)
-- [Variable scopes](./language-variables/language-variable-scopes.md)
-- [Variables loaded from config files](./language-variables/language-config-variables.md)
-- [{$smarty} reserved variable](./language-variables/language-variables-smarty.md)
-
-
-Smarty has several different types of variables. The type of the
-variable depends on what symbol it is prefixed or enclosed within.
-
-Variables in Smarty can be either displayed directly or used as
-arguments for [functions](./language-basic-syntax/language-syntax-functions.md),
-[attributes](./language-basic-syntax/language-syntax-attributes.md) and
-[modifiers](./language-modifiers.md), inside conditional expressions, etc.
-To print a variable, simply enclose it in the
-[delimiters](../programmers/api-variables/variable-left-delimiter.md) so that it is the only thing
-contained between them.
-
-
-    {$Name}
-
-    {$product.part_no} <b>{$product.description}</b>
-
-    {$Contacts[row].Phone}
-
-    <body bgcolor="{#bgcolor#}">
-
-      
-
-> **Note**
->
-> An easy way to examine assigned Smarty variables is with the
-> [debugging console](./chapter-debugging-console.md).
-
diff --git a/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md b/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
deleted file mode 100644
index 005dea4a9..000000000
--- a/vendor/smarty/smarty/docs/designers/language-variables/language-assigned-variables.md
+++ /dev/null
@@ -1,142 +0,0 @@
-Variables assigned from PHP {#language.assigned.variables}
-===========================
-
-Assigned variables that are referenced by preceding them with a dollar
-(`$`) sign.
-
-PHP code
-
-
-    <?php
-
-    $smarty = new Smarty();
-
-    $smarty->assign('firstname', 'Doug');
-    $smarty->assign('lastname', 'Evans');
-    $smarty->assign('meetingPlace', 'New York');
-
-    $smarty->display('index.tpl');
-
-    ?>
-
-`index.tpl` source:
-
-
-    Hello {$firstname} {$lastname}, glad to see you can make it.
-    <br />
-    {* this will not work as $variables are case sensitive *}
-    This weeks meeting is in {$meetingplace}.
-    {* this will work *}
-    This weeks meeting is in {$meetingPlace}.
-
-       
-
-This above would output:
-
-
-    Hello Doug Evans, glad to see you can make it.
-    <br />
-    This weeks meeting is in .
-    This weeks meeting is in New York.
-
-      
-
-Associative arrays {#language.variables.assoc.arrays}
-------------------
-
-You can also reference associative array variables by specifying the key
-after a dot \".\" symbol.
-
-
-    <?php
-    $smarty->assign('Contacts',
-        array('fax' => '555-222-9876',
-              'email' => 'zaphod@slartibartfast.example.com',
-              'phone' => array('home' => '555-444-3333',
-                               'cell' => '555-111-1234')
-                               )
-             );
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-`index.tpl` source:
-
-
-    {$Contacts.fax}<br />
-    {$Contacts.email}<br />
-    {* you can print arrays of arrays as well *}
-    {$Contacts.phone.home}<br />
-    {$Contacts.phone.cell}<br />
-
-       
-
-this will output:
-
-
-    555-222-9876<br />
-    zaphod@slartibartfast.example.com<br />
-    555-444-3333<br />
-    555-111-1234<br />
-
-       
-
-Array indexes {#language.variables.array.indexes}
--------------
-
-You can reference arrays by their index, much like native PHP syntax.
-
-
-    <?php
-    $smarty->assign('Contacts', array(
-                               '555-222-9876',
-                               'zaphod@slartibartfast.example.com',
-                                array('555-444-3333',
-                                      '555-111-1234')
-                                ));
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-`index.tpl` source:
-
-
-    {$Contacts[0]}<br />
-    {$Contacts[1]}<br />
-    {* you can print arrays of arrays as well *}
-    {$Contacts[2][0]}<br />
-    {$Contacts[2][1]}<br />
-
-       
-
-This will output:
-
-
-    555-222-9876<br />
-    zaphod@slartibartfast.example.com<br />
-    555-444-3333<br />
-    555-111-1234<br />
-
-       
-
-Objects {#language.variables.objects}
--------
-
-Properties of [objects](#advanced.features.objects) assigned from PHP
-can be referenced by specifying the property name after the `->` symbol.
-
-
-    name:  {$person->name}<br />
-    email: {$person->email}<br />
-
-       
-
-this will output:
-
-
-    name:  Zaphod Beeblebrox<br />
-    email: zaphod@slartibartfast.example.com<br />
-
-       
diff --git a/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md b/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
deleted file mode 100644
index a3683d99b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-variables/language-config-variables.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Variables loaded from config files {#language.config.variables}
-==================================
-
-Variables that are loaded from the [config files](#config.files) are
-referenced by enclosing them within `#hash_marks#`, or with the smarty
-variable [`$smarty.config`](#language.variables.smarty.config). The
-later syntax is useful for embedding into quoted attribute values, or
-accessing variable values such as \$smarty.config.\$foo.
-
-Example config file - `foo.conf`:
-
-
-    pageTitle = "This is mine"
-    bodyBgColor = '#eeeeee'
-    tableBorderSize = 3
-    tableBgColor = "#bbbbbb"
-    rowBgColor = "#cccccc"
-
-        
-
-A template demonstrating the `#hash#` method:
-
-
-    {config_load file='foo.conf'}
-    <html>
-    <title>{#pageTitle#}</title>
-    <body bgcolor="{#bodyBgColor#}">
-    <table border="{#tableBorderSize#}" bgcolor="{#tableBgColor#}">
-    <tr bgcolor="{#rowBgColor#}">
-        <td>First</td>
-        <td>Last</td>
-        <td>Address</td>
-    </tr>
-    </table>
-    </body>
-    </html>
-
-        
-
-A template demonstrating the
-[`$smarty.config`](#language.variables.smarty.config) method:
-
-
-    {config_load file='foo.conf'}
-    <html>
-    <title>{$smarty.config.pageTitle}</title>
-    <body bgcolor="{$smarty.config.bodyBgColor}">
-    <table border="{$smarty.config.tableBorderSize}" bgcolor="{$smarty.config.tableBgColor}">
-    <tr bgcolor="{$smarty.config.rowBgColor}">
-        <td>First</td>
-        <td>Last</td>
-        <td>Address</td>
-    </tr>
-    </table>
-    </body>
-    </html>
-
-        
-
-Both examples would output:
-
-
-    <html>
-    <title>This is mine</title>
-    <body bgcolor="#eeeeee">
-    <table border="3" bgcolor="#bbbbbb">
-    <tr bgcolor="#cccccc">
-        <td>First</td>
-        <td>Last</td>
-        <td>Address</td>
-    </tr>
-    </table>
-    </body>
-    </html>
-
-        
-
-Config file variables cannot be used until after they are loaded in from
-a config file. This procedure is explained later in this document under
-[`{config_load}`](#language.function.config.load).
-
-See also [variables](#language.syntax.variables) and [\$smarty reserved
-variables](#language.variables.smarty)
diff --git a/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md b/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
deleted file mode 100644
index 2ba3f026b..000000000
--- a/vendor/smarty/smarty/docs/designers/language-variables/language-variable-scopes.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Variable scopes {#language.variable.scopes}
-===============
-
-You have the choice to assign variables to the scope of the main Smarty
-object, data objects created with [`createData()`](#api.create.data),
-and template objects created with
-[`createTemplate()`](#api.create.template). These objects can be
-chained. A template sees all the variables of its own object and all
-variables assigned to the objects in its chain of parent objects.
-
-By default templates which are rendered by
-[`$smarty->display(...)`](#api.display) or
-[`$smarty->fetch(...)`](#api.fetch) calls are automatically linked to
-the Smarty object variable scope.
-
-By assigning variables to individual data or template objects you have
-full control which variables can be seen by a template.
-
-
-
-    // assign variable to Smarty object scope
-    $smarty->assign('foo','smarty');
-
-    // assign variables to data object scope
-    $data = $smarty->createData();
-    $data->assign('foo','data');
-    $data->assign('bar','bar-data');
-
-    // assign variables to other data object scope
-    $data2 = $smarty->createData($data);
-    $data2->assign('bar','bar-data2');
-
-    // assign variable to template object scope
-    $tpl = $smarty->createTemplate('index.tpl');
-    $tpl->assign('bar','bar-template');
-
-    // assign variable to template object scope with link to Smarty object
-    $tpl2 = $smarty->createTemplate('index.tpl',$smarty);
-    $tpl2->assign('bar','bar-template2');
-
-    // This display() does see $foo='smarty' from the $smarty object
-    $smarty->display('index.tpl');
-
-    // This display() does see $foo='data' and $bar='bar-data' from the data object $data
-    $smarty->display('index.tpl',$data);
-
-    // This display() does see $foo='data' from the data object $data 
-    // and $bar='bar-data2' from the data object $data2
-    $smarty->display('index.tpl',$data2);
-
-    // This display() does see $bar='bar-template' from the template object $tpl
-    $tpl->display();  // or $smarty->display($tpl);
-
-    // This display() does see $bar='bar-template2' from the template object $tpl2
-    // and $foo='smarty' form the Smarty object $foo
-    $tpl2->display();  // or $smarty->display($tpl2);
-
-        
-
-See also [`assign()`](#api.assign), [`createData()`](#api.create.data)
-and [`createTemplate()`](#api.create.template).
diff --git a/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md b/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
deleted file mode 100644
index f9aa2330a..000000000
--- a/vendor/smarty/smarty/docs/designers/language-variables/language-variables-smarty.md
+++ /dev/null
@@ -1,176 +0,0 @@
-{\$smarty} reserved variable {#language.variables.smarty}
-============================
-
-The PHP reserved `{$smarty}` variable can be used to access several
-environment and request variables. The full list of them follows.
-
-Request variables {#language.variables.smarty.request}
------------------
-
-The [request variables](&url.php-manual;reserved.variables) such as
-`$_GET`, `$_POST`, `$_COOKIE`, `$_SERVER`, `$_ENV` and `$_SESSION` can
-be accessed as demonstrated in the examples below:
-
-
-    {* display value of page from URL ($_GET) http://www.example.com/index.php?page=foo *}
-    {$smarty.get.page}
-
-    {* display the variable "page" from a form ($_POST['page']) *}
-    {$smarty.post.page}
-
-    {* display the value of the cookie "username" ($_COOKIE['username']) *}
-    {$smarty.cookies.username}
-
-    {* display the server variable "SERVER_NAME" ($_SERVER['SERVER_NAME'])*}
-    {$smarty.server.SERVER_NAME}
-
-    {* display the system environment variable "PATH" *}
-    {$smarty.env.PATH}
-
-    {* display the php session variable "id" ($_SESSION['id']) *}
-    {$smarty.session.id}
-
-    {* display the variable "username" from merged get/post/cookies/server/env *}
-    {$smarty.request.username}
-
-       
-
-> **Note**
->
-> For historical reasons `{$SCRIPT_NAME}` is short-hand for
-> `{$smarty.server.SCRIPT_NAME}`.
->
->
->     <a href="{$SCRIPT_NAME}?page=smarty">click me</a>
->     <a href="{$smarty.server.SCRIPT_NAME}?page=smarty">click me</a>
-
-> **Note**
->
-> Although Smarty provides direct access to PHP super globals for
-> convenience, it should be used with caution. Directly accessing super
-> globals mixes underlying application code structure with templates. A
-> good practice is to assign specific needed values to template vars.
-
-{\$smarty.now} {#language.variables.smarty.now}
---------------
-
-The current [timestamp](&url.php-manual;function.time) can be accessed
-with `{$smarty.now}`. The value reflects the number of seconds passed
-since the so-called Epoch on January 1, 1970, and can be passed directly
-to the [`date_format`](#language.modifier.date.format) modifier for
-display. Note that [`time()`](&url.php-manual;function.time) is called
-on each invocation; eg a script that takes three seconds to execute with
-a call to `$smarty.now` at start and end will show the three second
-difference.
-
-::: {.informalexample}
-
-    {* use the date_format modifier to show current date and time *}
-    {$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}
-
-       
-:::
-
-{\$smarty.const} {#language.variables.smarty.const}
-----------------
-
-You can access PHP constant values directly. See also [smarty
-constants](#smarty.constants).
-
-::: {.informalexample}
-
-    <?php
-    // the constant defined in php
-    define('MY_CONST_VAL','CHERRIES');
-    ?>
-:::
-
-Output the constant in a template with
-
-::: {.informalexample}
-
-    {$smarty.const.MY_CONST_VAL}
-:::
-
-> **Note**
->
-> Although Smarty provides direct access to PHP constants for
-> convenience, it is typically avoided as this is mixing underlying
-> application code structure into the templates. A good practice is to
-> assign specific needed values to template vars.
-
-{\$smarty.capture} {#language.variables.smarty.capture}
-------------------
-
-Template output captured via the built-in
-[`{capture}..{/capture}`](#language.function.capture) function can be
-accessed using the `{$smarty.capture}` variable. See the
-[`{capture}`](#language.function.capture) page for more information.
-
-{\$smarty.config} {#language.variables.smarty.config}
------------------
-
-`{$smarty.config}` variable can be used to refer to loaded [config
-variables](#language.config.variables). `{$smarty.config.foo}` is a
-synonym for `{#foo#}`. See the
-[{config\_load}](#language.function.config.load) page for more info.
-
-{\$smarty.section} {#language.variables.smarty.loops}
-------------------
-
-The `{$smarty.section}` variables can be used to refer to
-[`{section}`](#language.function.section) loop properties. These have
-some very useful values such as `.first`, `.index`, etc.
-
-> **Note**
->
-> The `{$smarty.foreach}` variable is no longer used with the new
-> [`{foreach}`](#language.function.foreach) syntax, but is still
-> supported with Smarty 2.x style foreach syntax.
-
-{\$smarty.template} {#language.variables.smarty.template}
--------------------
-
-Returns the name of the current template being processed (without the
-directory).
-
-{\$smarty.template\_object} {#language.variables.smarty.template_object}
----------------------------
-
-Returns the template object of the current template being processed.
-
-{\$smarty.current\_dir} {#language.variables.smarty.current_dir}
------------------------
-
-Returns the name of the directory for the current template being
-processed.
-
-{\$smarty.version} {#language.variables.smarty.version}
-------------------
-
-Returns the version of Smarty the template was compiled with.
-
-
-    <div id="footer">Powered by Smarty {$smarty.version}</div>
-
-{\$smarty.block.child} {#language.variables.smarty.block.child}
-----------------------
-
-Returns block text from child template. See [Template
-interitance](#advanced.features.template.inheritance).
-
-{\$smarty.block.parent} {#language.variables.smarty.block.parent}
------------------------
-
-Returns block text from parent template. See [Template
-interitance](#advanced.features.template.inheritance)
-
-{\$smarty.ldelim}, {\$smarty.rdelim} {#language.variables.smarty.ldelim}
-------------------------------------
-
-These variables are used for printing the left-delimiter and
-right-delimiter value literally, the same as
-[`{ldelim},{rdelim}`](#language.function.ldelim).
-
-See also [assigned variables](#language.assigned.variables) and [config
-variables](#language.config.variables)
diff --git a/vendor/smarty/smarty/docs/features.md b/vendor/smarty/smarty/docs/features.md
deleted file mode 100644
index 8405b46eb..000000000
--- a/vendor/smarty/smarty/docs/features.md
+++ /dev/null
@@ -1,152 +0,0 @@
-Features
-=======
-
-Some of Smarty's features:
--   It is extremely fast.
--   It is efficient since the PHP parser does the dirty work.
--   No template parsing overhead, only compiles once.
--   It is smart about [recompiling](#variable.compile.check) only the
-    template files that have changed.
--   You can easily create your own custom
-    [functions](#language.custom.functions) and [variable
-    modifiers](#language.modifiers), so the template language is
-    extremely extensible.
--   Configurable template [{delimiter}](#variable.left.delimiter) tag
-    syntax, so you can use `{$foo}`, `{{$foo}}`, `<!--{$foo}-->`, etc.
--   The [`{if}..{elseif}..{else}..{/if}`](#language.function.if)
-    constructs are passed to the PHP parser, so the `{if...}` expression
-    syntax can be as simple or as complex an evaluation as you like.
--   Allows unlimited nesting of
-    [`sections`](#language.function.section), `if's` etc.
--   Built-in [caching](#caching) support
--   Arbitrary [template](#resources) sources
--   [Template Inheritance](#advanced.features.template.inheritance) for
-    easy management of template content.
--   [Plugin](#plugins) architecture
-
-## Separation of presentation from application code
--   This means templates can certainly contain logic under the condition
-    that it is for presentation only. Things such as
-    [including](./designers/language-builtin-functions/language-function-include.md) other templates,
-    [alternating](./designers/language-custom-functions/language-function-cycle.md) table row colors,
-    [upper-casing](./designers/language-modifiers/language-modifier-upper.md) a variable,
-    [looping](./designers/language-builtin-functions/language-function-foreach.md) over an array of data and
-    rendering it are examples of presentation logic.
--   This does not mean however that Smarty forces a separation of
-    business and presentation logic. Smarty has no knowledge of which is
-    which, so placing business logic in the template is your own doing.
--   Also, if you desire *no* logic in your templates you certainly can
-    do so by boiling the content down to text and variables only.
-
-## How does it work?
-
-Under the hood, Smarty "compiles" (basically copies and converts) the
-templates into PHP scripts. This happens once when each template is
-first invoked, and then the compiled versions are used from that point
-forward. Smarty takes care of this for you, so the template designer
-just edits the Smarty templates and never has to manage the compiled
-versions. This approach keeps the templates easy to maintain, and yet
-keeps execution times extremely fast since the compiled code is just
-PHP. And of course, all PHP scripts take advantage of PHP op-code caches
-such as APC.
-
-## Template Inheritance
-
-Template inheritance was introduced in Smarty 3. Before template
-inheritance, we managed our templates in
-pieces such as header and footer templates. This organization lends
-itself to many problems that require some hoop-jumping, such as managing
-content within the header/footer on a per-page basis. With template
-inheritance, instead of including other templates we maintain our
-templates as single pages. We can then manipulate blocks of content
-within by inheriting them. This makes templates intuitive, efficient and
-easy to manage. See
-[Template Inheritance](./programmers/advanced-features/advanced-features-template-inheritance.md)
-for more info.
-
-## Why not use XML/XSLT syntax?
-There are a couple of good reasons. First, Smarty can be used for more
-than just XML/HTML based templates, such as generating emails,
-javascript, CSV, and PDF documents. Second, XML/XSLT syntax is even more
-verbose and fragile than PHP code! It is perfect for computers, but
-horrible for humans. Smarty is about being easy to read, understand and
-maintain.
-
-## Template Security
-Although Smarty insulates you from PHP, you still have the option to use
-it in certain ways if you wish. Template security forces the restriction
-of PHP (and select Smarty functions.) This is useful if you have third
-parties editing templates, and you don't want to unleash the full power
-of PHP or Smarty to them.
-
-## Integration
-Sometimes Smarty gets compared to Model-View-Controller (MVC)
-frameworks. Smarty is not an MVC, it is just the presentation layer,
-much like the View (V) part of an MVC. As a matter of fact, Smarty can
-easily be integrated as the view layer of an MVC. Many of the more
-popular ones have integration instructions for Smarty, or you may find
-some help here in the forums and documentation.
-
-## Other Template Engines
-Smarty is not the only engine following the *"Separate Programming Code
-from Presentation"* philosophy. For instance, Python has template
-engines built around the same principles such as Django Templates and
-CheetahTemplate. *Note: Languages such as Python do not mix with HTML
-natively, which give them the advantage of proper programming code
-separation from the outset. There are libraries available to mix Python
-with HTML, but they are typically avoided.*
-
-## What Smarty is Not
-
-Smarty is not an application development framework. Smarty is not an
-MVC. Smarty is not an alternative to Laravel, Symfony, CodeIgniter,
-or any of the other application development frameworks for PHP.
-
-Smarty is a template engine, and works as the (V)iew component of your
-application. Smarty can easily be coupled to any of the engines listed
-above as the view component. No different than any other software,
-Smarty has a learning curve. Smarty does not guarantee good application
-design or proper separation of presentation, this still needs to be
-addressed by a competent developer and web designer.
-
-## Is Smarty Right for Me?
-
-Smarty is not meant to be a tool for every job. The important thing is
-to identify if Smarty fits your needs. There are some important
-questions to ask yourself:
-
-### Template Syntax
-Are you content with PHP tags mixed with HTML? Are your
-web designers comfortable with PHP? Would your web designers prefer a
-tag-based syntax designed for presentation? Some experience working with
-both Smarty and PHP helps answer these questions.
-
-### The Business Case
-Is there a requirement to insulate the templates from
-PHP? Do you have untrusted parties editing templates that you do not
-wish to unleash the power of PHP to? Do you need to programmatically
-control what is and is not available within the templates? Smarty
-supplies these capabilities by design.
-
-## Feature set
-Does Smarty's features such as caching, template
-inheritance and plugin architecture save development cycles writing code
-that would be needed otherwise? Does the codebase or framework you plan
-on using have the features you need for the presentation component?
-
-## Sites using Smarty
-Many well-known PHP projects make use of Smarty such as XOOPS CMS, CMS Made Simple, Tiki
-CMS/Groupware and X-Cart to name a few.
-
-## Summary
-Whether you are using Smarty for a small website or massive enterprise
-solution, it can accommodate your needs. There are numerous features
-that make Smarty a great choice:
-
--   separation of PHP from HTML/CSS just makes sense
--   readability for organization and management
--   security for 3rd party template access
--   feature completeness, and easily extendable to your own needs
--   massive user base, Smarty is here to stay
--   LGPL license for commercial use
--   100% free to use, open source project
diff --git a/vendor/smarty/smarty/docs/getting-started.md b/vendor/smarty/smarty/docs/getting-started.md
deleted file mode 100644
index de55ffe8e..000000000
--- a/vendor/smarty/smarty/docs/getting-started.md
+++ /dev/null
@@ -1,169 +0,0 @@
-What is Smarty?
-==============
-
-## Requirements
-Smarty can be run with PHP 7.1 to PHP 8.1.
-
-## Installation
-Smarty versions 3.1.11 or later can be installed with [Composer](https://getcomposer.org/).
-
-To get the latest stable version of Smarty use:
-```bash
-composer require smarty/smarty
-````
-
-To get the latest, unreleased version, use:
-```bash
-composer require smarty/smarty:dev-master
-````
-
-To get the previous stable version of Smarty, Smarty 3, use:
-```bash
-composer require smarty/smarty:^3
-````
-
-Here's how you create an instance of Smarty in your PHP scripts:
-```php
-<?php
-
-require 'vendor/autoload.php';
-$smarty = new Smarty();
-```
-
-Now that the library files are in place, it's time to setup the Smarty
-directories for your application.
-
-Smarty requires four directories which are by default named
-    [`templates`](./programmers/api-variables/variable-template-dir.md),
-    [`configs`](./programmers/api-variables/variable-config-dir.md),
-    [`templates_c`](./programmers/api-variables/variable-compile-dir.md)
-     and 
-    [`cache`](./programmers/api-variables/variable-cache-dir.md) 
-    relative to the current working directory.
-
-The defaults can be changed as follows:
-```php
-$smarty = new Smarty();
-$smarty->setTemplateDir('/some/template/dir');
-$smarty->setConfigDir('/some/config/dir');
-$smarty->setCompileDir('/some/compile/dir');
-$smarty->setCacheDir('/some/cache/dir');
-```
-
-The compile dir and cache dir need to be writable for the user running the PHP script.
-
-> **Note**
->
-> This is usually user "nobody" and group "nobody". For OS X users, the
-> default is user "www" and group "www". If you are using Apache, you
-> can look in your `httpd.conf` file to see what user and group are
-> being used.
-
-```bash
-chown nobody:nobody /web/www.example.com/guestbook/templates_c/
-chmod 770 /web/www.example.com/guestbook/templates_c/
-
-chown nobody:nobody /web/www.example.com/guestbook/cache/
-chmod 770 /web/www.example.com/guestbook/cache/
-```
-
-You can verify if your system has the correct access rights for
-    these directories with [`testInstall()`](./programmers/api-functions/api-test-install.md):
-
-```php
-$smarty = new Smarty();
-$smarty->setTemplateDir('/some/template/dir');
-$smarty->setConfigDir('/some/config/dir');
-$smarty->setCompileDir('/some/compile/dir');
-$smarty->setCacheDir('/some/cache/dir');
-$smarty->testInstall();
-```
-
-Now, let's create the `index.tpl` file that Smarty will display. This
-needs to be located in the [`$template_dir`](./programmers/api-variables/variable-template-dir.md).
-
-```html
-{* Smarty *}
-Hello {$name}, welcome to Smarty!
-```
-
-> **Note**
->
-> `{* Smarty *}` is a template [comment](./designers/language-basic-syntax/language-syntax-comments.md). It
-> is not required, but it is good practice to start all your template
-> files with this comment. It makes the file easy to recognize
-> regardless of the file extension. For example, text editors could
-> recognize the file and turn on special syntax highlighting.
-
-Now lets edit our php file. We'll create an instance of Smarty,
-[`assign()`](./programmers/api-functions/api-assign.md) a template variable and
-[`display()`](./programmers/api-functions/api-display.md) the `index.tpl` file.
-
-```php
-<?php
-
-require 'vendor/autoload.php';
-
-$smarty = new Smarty();
-
-$smarty->setTemplateDir('/web/www.example.com/guestbook/templates/');
-$smarty->setCompileDir('/web/www.example.com/guestbook/templates_c/');
-$smarty->setConfigDir('/web/www.example.com/guestbook/configs/');
-$smarty->setCacheDir('/web/www.example.com/guestbook/cache/');
-
-$smarty->assign('name', 'Ned');
-$smarty->display('index.tpl');
-
-```
-
-> **Note**
->
-> In our example, we are setting absolute paths to all of the Smarty
-> directories. If `/web/www.example.com/guestbook/` is within your PHP
-> include\_path, then these settings are not necessary. However, it is
-> more efficient and (from experience) less error-prone to set them to
-> absolute paths. This ensures that Smarty is getting files from the
-> directories you intended.
-
-Now, run your PHP file. You should see *\"Hello Ned, welcome to Smarty!\"*
-
-You have completed the basic setup for Smarty!
-
-## Extended Setup {#installing.smarty.extended}
-==============
-
-This is a continuation of the [basic
-installation](#installing.smarty.basic), please read that first!
-
-A slightly more flexible way to setup Smarty is to extend the Smarty
-class and initialize your Smarty
-environment. So instead of repeatedly setting directory paths, assigning
-the same vars, etc., we can do that in one place.
-
-```php
-<?php
-
-class Smarty_GuestBook extends Smarty {
-
-   public function __construct()
-   {
-        parent::__construct();
-
-        $this->setTemplateDir('/web/www.example.com/guestbook/templates/');
-        $this->setCompileDir('/web/www.example.com/guestbook/templates_c/');
-        $this->setConfigDir('/web/www.example.com/guestbook/configs/');
-        $this->setCacheDir('/web/www.example.com/guestbook/cache/');
-
-        $this->caching = Smarty::CACHING_LIFETIME_CURRENT;
-        $this->assign('app_name', 'Guest Book');
-   }
-
-}
-```
-
-Now, we can use `Smarty_GuestBook` instead of `Smarty` in our scripts:
-```php
-$smarty = new Smarty_GuestBook();
-$smarty->assign('name','Ned');
-$smarty->display('index.tpl');
-```
diff --git a/vendor/smarty/smarty/docs/index.md b/vendor/smarty/smarty/docs/index.md
deleted file mode 100644
index cf2b2ddcd..000000000
--- a/vendor/smarty/smarty/docs/index.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Smarty 4 Documentation
-Smarty is a template engine for PHP, facilitating the separation of presentation (HTML/CSS) from application logic. 
-
-It allows you to write **templates**, using **variables**, **modifiers**, **functions** and **comments**, like this:
-```html
-<h1>{$title|escape}</h1>
-
-<p>
-    The number of pixels is: {math equation="x * y" x=$height y=$width}.
-</p>
-```
-
-When this template is rendered, with the value "Hello world" for the variable $title, 640 for $width, 
-and 480 for $height, the result is:
-```html
-<h1>Hello world</h1>
-
-<p>
-    The number of pixels is: 307200.
-</p>
-```
-
-## Introduction
-- [Philosophy](./philosophy.md) - or "Why do I need a template engine?"
-- [Features](./features.md) - or "Why do I want Smarty?"
-- [Getting Started](./getting-started.md)
-
-## Smarty for template designers
-- [Basic Syntax](./designers/language-basic-syntax.md)
-- [Variables](./designers/language-variables.md)
-- [Variable Modifiers](./designers/language-modifiers.md)
-- [Combining Modifiers](./designers/language-combining-modifiers.md)
-- [Built-in Functions](./designers/language-builtin-functions.md)
-- [Custom Functions](./designers/language-custom-functions.md)
-- [Config Files](./designers/config-files.md)
-- [Debugging Console](./designers/chapter-debugging-console.md)
-
-## Smarty for php developers
-- [Charset Encoding](./programmers/charset.md)
-- [Constants](./programmers/smarty-constants.md)
-- [Smarty Class Variables](./programmers/api-variables.md)
-- [Smarty Class Methods](./programmers/api-functions.md)
-- [Caching](./programmers/caching.md)
-- [Resources](./programmers/resources.md)
-- [Advanced Features](./programmers/advanced-features.md)
-- [Extending Smarty With Plugins](./programmers/plugins.md)
-
-## Other
-- [Some random tips & tricks](./appendixes/tips.md)
-- [Troubleshooting](./appendixes/troubleshooting.md)
diff --git a/vendor/smarty/smarty/docs/philosophy.md b/vendor/smarty/smarty/docs/philosophy.md
deleted file mode 100644
index 86f6c46ed..000000000
--- a/vendor/smarty/smarty/docs/philosophy.md
+++ /dev/null
@@ -1,108 +0,0 @@
-Philosophy
-=======
-
-## What is Smarty?
-
-Smarty is a template engine for PHP. More specifically, it facilitates a
-manageable way to separate application logic and content from its
-presentation. This is best described in a situation where the
-application programmer and the template designer play different roles,
-or in most cases are not the same person.
-
-For example, let\'s say you are creating a web page that is displaying a
-newspaper article.
-
--   The article `$headline`, `$tagline`, `$author` and `$body` are
-    content elements, they contain no information about how they will be
-    presented. They are [passed](#api.assign) into Smarty by the
-    application.
-
--   Then the template designer edits the templates and uses a
-    combination of HTML tags and [template tags](#language.basic.syntax)
-    to format the presentation of these
-    [variables](#language.syntax.variables) with elements such as
-    tables, div\'s, background colors, font sizes, style sheets, svg
-    etc.
-
--   One day the programmer needs to change the way the article content
-    is retrieved, ie a change in application logic. This change does not
-    affect the template designer, the content will still arrive in the
-    template exactly the same.
-
--   Likewise, if the template designer wants to completely redesign the
-    templates, this would require no change to the application logic.
-
--   Therefore, the programmer can make changes to the application logic
-    without the need to restructure templates, and the template designer
-    can make changes to templates without breaking application logic.
-
-## Goals
-
-The Smarty design was largely driven by these goals:
--   clean separation of presentation from application code
--   PHP backend, Smarty template frontend
--   complement PHP, not replace it
--   fast development/deployment for programmers and designers
--   quick and easy to maintain
--   syntax easy to understand, no PHP knowledge necessary
--   flexibility for custom development
--   security: insulation from PHP
--   free, open source
-
-
-
-## Two camps of thought
-
-When it comes to templating in PHP, there are basically two camps of
-thought. The first camp exclaims that \"PHP is a template engine\". This
-approach simply mixes PHP code with HTML. Although this approach is
-fastest from a pure script-execution point of view, many would argue
-that the PHP syntax is messy and complicated when mixed with tagged
-markup such as HTML.
-
-The second camp exclaims that presentation should be void of all
-programming code, and instead use simple tags to indicate where
-application content is revealed. This approach is common with other
-template engines (even in other programming languages), and is also the
-approach that Smarty takes. The idea is to keep the templates focused
-squarely on presentation, void of application code, and with as little
-overhead as possible.
-
-## Why is separating PHP from templates important?
-
-Two major benefits:
-
--   SYNTAX: Templates typically consist of semantic markup such as HTML.
-    PHP syntax works well for application code, but quickly degenerates
-    when mixed with HTML. Smarty\'s simple {tag} syntax is designed
-    specifically to express presentation. Smarty focuses your templates
-    on presentation and less on \"code\". This lends to quicker template
-    deployment and easier maintenance. Smarty syntax requires no working
-    knowledge of PHP, and is intuitive for programmers and
-    non-programmers alike.
-
--   INSULATION: When PHP is mixed with templates, there are no
-    restrictions on what type of logic can be injected into a template.
-    Smarty insulates the templates from PHP, creating a controlled
-    separation of presentation from business logic. Smarty also has
-    security features that can further enforce restrictions on
-    templates.
-
-## Web designers and PHP
-
-A common question: "Web designers have to learn a syntax anyway, why
-not PHP?" Of course web designers can learn PHP, and they may already
-be familiar with it. The issue isn't their ability to learn PHP, it is
-about the consequences of mixing PHP with HTML. If designers use PHP, it
-is too easy to add code into templates that doesn't belong there (you
-just handed them a swiss-army knife when they just needed a knife.) You
-can teach them the rules of application design, but this is probably
-something they don't really need to learn (now they are developers!)
-The PHP manual is also an overwhelming pile of information to sift
-through. It is like handing the owner of a car the factory assembly
-manual when all they need is the owners manual. Smarty gives web
-designers exactly the tools they need, and gives developers fine-grained
-control over those tools. The simplicity of the tag-based syntax is also
-a huge welcome for designers, it helps them streamline the organization
-and management of templates.
-
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features.md b/vendor/smarty/smarty/docs/programmers/advanced-features.md
deleted file mode 100644
index 60d4416b5..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Advanced Features {#advanced.features}
-=================
-
-## Table of contents
-
-- [Security](./advanced-features/advanced-features-security.md)
-- [Changing settings by template](./advanced-features/advanced-features-template-settings.md)
-- [Template Inheritance](./advanced-features/advanced-features-template-inheritance.md)
-- [Streams](./advanced-features/advanced-features-streams.md)
-- [Objects](./advanced-features/advanced-features-objects.md)
-- [Static Classes](./advanced-features/advanced-features-static-classes.md)
-- [Prefilters](./advanced-features/advanced-features-prefilters.md)
-- [Postfilters](./advanced-features/advanced-features-postfilters.md)
-- [Output Filters](./advanced-features/advanced-features-outputfilters.md)
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md
deleted file mode 100644
index 6b4870b51..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-objects.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Objects {#advanced.features.objects}
-=======
-
-Smarty allows access to PHP [objects](&url.php-manual;object) through
-the templates.
-
-> **Note**
->
-> When you assign/register objects to templates, be sure that all
-> properties and methods accessed from the template are for presentation
-> purposes only. It is very easy to inject application logic through
-> objects, and this leads to poor designs that are difficult to manage.
-> See the Best Practices section of the Smarty website.
-
-There are two ways to access them.
-
--   One way is to [register objects](#api.register.object) to the
-    template, then use access them via syntax similar to [custom
-    functions](#language.custom.functions).
-
--   The other way is to [`assign()`](#api.assign) objects to the
-    templates and access them much like any other assigned variable.
-
-The first method has a much nicer template syntax. It is also more
-secure, as a registered object can be restricted to certain methods or
-properties. However, **a registered object cannot be looped over or
-assigned in arrays of objects**, etc. The method you choose will be
-determined by your needs, but use the first method whenever possible to
-keep template syntax to a minimum.
-
-If security is enabled, no private methods or functions can be accessed
-(beginningwith \'\_\'). If a method and property of the same name exist,
-the method will be used.
-
-You can restrict the methods and properties that can be accessed by
-listing them in an array as the third registration parameter.
-
-By default, parameters passed to objects through the templates are
-passed the same way [custom functions](#language.custom.functions) get
-them. An associative array is passed as the first parameter, and the
-smarty object as the second. If you want the parameters passed one at a
-time for each argument like traditional object parameter passing, set
-the fourth registration parameter to FALSE.
-
-The optional fifth parameter has only effect with `format` being TRUE
-and contains a list of methods that should be treated as blocks. That
-means these methods have a closing tag in the template
-(`{foobar->meth2}...{/foobar->meth2}`) and the parameters to the methods
-have the same synopsis as the parameters for
-[`block-function-plugins`](#plugins.block.functions): They get the four
-parameters `$params`, `$content`, `$smarty` and `&$repeat` and they also
-behave like block-function-plugins.
-
-
-    <?php
-    // the object
-
-    class My_Object {
-        function meth1($params, $smarty_obj) {
-            return 'this is my meth1';
-        }
-    }
-
-    $myobj = new My_Object;
-
-    // registering the object (will be by reference)
-    $smarty->registerObject('foobar',$myobj);
-
-    // if we want to restrict access to certain methods or properties, list them
-    $smarty->registerObject('foobar',$myobj,array('meth1','meth2','prop1'));
-
-    // if you want to use the traditional object parameter format, pass a boolean of false
-    $smarty->registerObject('foobar',$myobj,null,false);
-
-    // We can also assign objects. assign_by_ref when possible.
-    $smarty->assign_by_ref('myobj', $myobj);
-
-    $smarty->display('index.tpl');
-    ?>
-
-      
-
-And here\'s how to access your objects in `index.tpl`:
-
-
-    {* access our registered object *}
-    {foobar->meth1 p1='foo' p2=$bar}
-
-    {* you can also assign the output *}
-    {foobar->meth1 p1='foo' p2=$bar assign='output'}
-    the output was {$output}
-
-    {* access our assigned object *}
-    {$myobj->meth1('foo',$bar)}
-
-      
-
-See also [`registerObject()`](#api.register.object) and
-[`assign()`](#api.assign).
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md
deleted file mode 100644
index 393d7da23..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-outputfilters.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Output Filters {#advanced.features.outputfilters}
-==============
-
-When the template is invoked via [`display()`](#api.display) or
-[`fetch()`](#api.fetch), its output can be sent through one or more
-output filters. This differs from
-[`postfilters`](#advanced.features.postfilters) because postfilters
-operate on compiled templates before they are saved to the disk, whereas
-output filters operate on the template output when it is executed.
-
-Output filters can be either [registered](#api.register.filter) or
-loaded from the [plugins directory](#variable.plugins.dir) by using the
-[`loadFilter()`](#api.load.filter) method or by setting the
-[`$autoload_filters`](#variable.autoload.filters) variable. Smarty will
-pass the template output as the first argument, and expect the function
-to return the result of the processing.
-
-
-    <?php
-    // put this in your application
-    function protect_email($tpl_output, Smarty_Internal_Template $template)
-    {
-        $tpl_output =
-           preg_replace('!(\S+)@([a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,3}|[0-9]{1,3}))!',
-                        '$1%40$2', $tpl_output);
-        return $tpl_output;
-    }
-
-    // register the outputfilter
-    $smarty->registerFilter("output","protect_email");
-    $smarty->display("index.tpl');
-
-    // now any occurrence of an email address in the template output will have
-    // a simple protection against spambots
-    ?>
-
-        
-
-See also [`registerFilter()`](#api.register.filter),
-[`loadFilter()`](#api.load.filter),
-[`$autoload_filters`](#variable.autoload.filters),
-[postfilters](#advanced.features.postfilters) and
-[`$plugins_dir`](#variable.plugins.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md
deleted file mode 100644
index d3bad546a..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-postfilters.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Postfilters {#advanced.features.postfilters}
-===========
-
-Template postfilters are PHP functions that your templates are ran
-through *after they are compiled*. Postfilters can be either
-[registered](#api.register.filter) or loaded from the [plugins
-directory](#variable.plugins.dir) by using the
-[`loadFilter()`](#api.load.filter) function or by setting the
-[`$autoload_filters`](#variable.autoload.filters) variable. Smarty will
-pass the compiled template code as the first argument, and expect the
-function to return the result of the processing.
-
-
-    <?php
-    // put this in your application
-    function add_header_comment($tpl_source, Smarty_Internal_Template $template)
-    {
-        return "<?php echo \"<!-- Created by Smarty! -->\n\"; ?>\n".$tpl_source;
-    }
-
-    // register the postfilter
-    $smarty->registerFilter('post','add_header_comment');
-    $smarty->display('index.tpl');
-    ?>
-
-      
-
-The postfilter above will make the compiled Smarty template `index.tpl`
-look like:
-
-
-    <!-- Created by Smarty! -->
-    {* rest of template content... *}
-
-      
-
-See also [`registerFilter()`](#api.register.filter),
-[prefilters](#advanced.features.prefilters),
-[outputfilters](#advanced.features.outputfilters), and
-[`loadFilter()`](#api.load.filter).
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md
deleted file mode 100644
index 76229e633..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-prefilters.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Prefilters {#advanced.features.prefilters}
-==========
-
-Template prefilters are PHP functions that your templates are ran
-through *before they are compiled*. This is good for preprocessing your
-templates to remove unwanted comments, keeping an eye on what people are
-putting in their templates, etc.
-
-Prefilters can be either [registered](#api.register.filter) or loaded
-from the [plugins directory](#variable.plugins.dir) by using
-[`loadFilter()`](#api.load.filter) function or by setting the
-[`$autoload_filters`](#variable.autoload.filters) variable.
-
-Smarty will pass the template source code as the first argument, and
-expect the function to return the resulting template source code.
-
-This will remove all the html comments in the template source.
-
-
-    <?php
-    // put this in your application
-    function remove_dw_comments($tpl_source, Smarty_Internal_Template $template)
-    {
-        return preg_replace("/<!--#.*-->/U",'',$tpl_source);
-    }
-
-    // register the prefilter
-    $smarty->registerFilter('pre','remove_dw_comments');
-    $smarty->display('index.tpl');
-    ?>
-
-      
-
-See also [`registerFilter()`](#api.register.filter),
-[postfilters](#advanced.features.postfilters) and
-[`loadFilter()`](#api.load.filter).
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md
deleted file mode 100644
index 98817a433..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-security.md
+++ /dev/null
@@ -1,168 +0,0 @@
-Security {#advanced.features.security}
-========
-
-Security is good for situations when you have untrusted parties editing
-the templates eg via ftp, and you want to reduce the risk of system
-security compromises through the template language.
-
-The settings of the security policy are defined by properties of an
-instance of the Smarty\_Security class. These are the possible settings:
-
--   `$php_handling` determines how Smarty to handle PHP code embedded in
-    templates. Possible values are:
-
-    -   Smarty::PHP\_PASSTHRU -\> echo PHP tags as they are
-
-    -   Smarty::PHP\_QUOTE -\> escape tags as entities
-
-    -   Smarty::PHP\_REMOVE -\> remove php tags
-
-    -   Smarty::PHP\_ALLOW -\> execute php tags
-
-    The default value is Smarty::PHP\_PASSTHRU.
-
-    If security is enabled the [`$php_handling`](#variable.php.handling)
-    setting of the Smarty object is not checked for security.
-
--   `$secure_dir` is an array of template directories that are
-    considered secure. [`$template_dir`](#variable.template.dir)
-    concidered secure implicitly. The default is an empty array.
-
--   `$trusted_dir` is an array of all directories that are considered
-    trusted. Trusted directories are where you keep php scripts that are
-    executed directly from the templates with
-    [`{include_php}`](#language.function.include.php). The default is an
-    empty array.
-
--   `$trusted_uri` is an array of regular expressions matching URIs that
-    are considered trusted. This security directive used by
-    [`{fetch}`](#language.function.fetch) and
-    [`{html_image}`](#language.function.html.image). URIs passed to
-    these functions are reduced to `{$PROTOCOL}://{$HOSTNAME}` to allow
-    simple regular expressions (without having to deal with edge cases
-    like authentication-tokens).
-
-    The expression `'#https?://.*smarty.net$#i'` would allow accessing
-    the follwing URIs:
-
-    -   `http://smarty.net/foo`
-
-    -   `http://smarty.net/foo`
-
-    -   `http://www.smarty.net/foo`
-
-    -   `http://smarty.net/foo`
-
-    -   `https://foo.bar.www.smarty.net/foo/bla?blubb=1`
-
-    but deny access to these URIs:
-
-    -   `http://smarty.com/foo` (not matching top-level domain \"com\")
-
-    -   `ftp://www.smarty.net/foo` (not matching protocol \"ftp\")
-
-    -   `http://www.smarty.net.otherdomain.com/foo` (not matching end of
-        domain \"smarty.net\")
-
--   `$static_classes` is an array of classes that are considered
-    trusted. The default is an empty array which allows access to all
-    static classes. To disable access to all static classes set
-    \$static\_classes = null.
-
--   `$php_functions` is an array of PHP functions that are considered
-    trusted and can be used from within template. To disable access to
-    all PHP functions set \$php\_functions = null. An empty array (
-    \$php\_functions = array() ) will allow all PHP functions. The
-    default is array(\'isset\', \'empty\', \'count\', \'sizeof\',
-    \'in\_array\', \'is\_array\',\'time\',\'nl2br\').
-
--   `$php_modifiers` is an array of PHP functions that are considered
-    trusted and can be used from within template as modifier. To disable
-    access to all PHP modifier set \$php\_modifier = null. An empty
-    array ( \$php\_modifier = array() ) will allow all PHP functions.
-    The default is array(\'escape\',\'count\').
-
--   `$streams` is an array of streams that are considered trusted and
-    can be used from within template. To disable access to all streams
-    set \$streams = null. An empty array ( \$streams = array() ) will
-    allow all streams. The default is array(\'file\').
-
--   `$allowed_modifiers` is an array of (registered / autoloaded)
-    modifiers that should be accessible to the template. If this array
-    is non-empty, only the herein listed modifiers may be used. This is
-    a whitelist.
-
--   `$disabled_modifiers` is an array of (registered / autoloaded)
-    modifiers that may not be accessible to the template.
-
--   `$allowed_tags` is a boolean flag which controls if constants can
-    function-, block and filter plugins that should be accessible to the
-    template. If this array is non-empty, only the herein listed
-    modifiers may be used. This is a whitelist.
-
--   `$disabled_tags` is an array of (registered / autoloaded) function-,
-    block and filter plugins that may not be accessible to the template.
-
--   `$allow_constants` is a boolean flag which controls if constants can
-    be accessed by the template. The default is \"true\".
-
--   `$allow_super_globals` is a boolean flag which controls if the PHP
-    super globals can be accessed by the template. The default is
-    \"true\".
-
--   `$allow_php_tag` is a boolean flag which controls if {php} and
-    {include\_php} tags can be used by the template. The default is
-    \"false\".
-
-If security is enabled, no private methods, functions or properties of
-static classes or assigned objects can be accessed (beginningwith
-\'\_\') by the template.
-
-To customize the security policy settings you can extend the
-Smarty\_Security class or create an instance of it.
-
-
-    <?php
-    require 'Smarty.class.php';
-
-    class My_Security_Policy extends Smarty_Security {
-      // disable all PHP functions
-      public $php_functions = null;
-      // remove PHP tags
-      public $php_handling = Smarty::PHP_REMOVE;
-      // allow everthing as modifier
-      public $php_modifiers = array();
-    }
-    $smarty = new Smarty();
-    // enable security
-    $smarty->enableSecurity('My_Security_Policy');
-    ?>
-
-
-    <?php
-    require 'Smarty.class.php';
-    $smarty = new Smarty();
-    $my_security_policy = new Smarty_Security($smarty);
-    // disable all PHP functions
-    $my_security_policy->php_functions = null;
-    // remove PHP tags
-    $my_security_policy->php_handling = Smarty::PHP_REMOVE;
-    // allow everthing as modifier
-    $my_security_policy->php_modifiers = array();
-    // enable security
-    $smarty->enableSecurity($my_security_policy);
-    ?>
-
-
-    <?php
-    require 'Smarty.class.php';
-    $smarty = new Smarty();
-    // enable default security
-    $smarty->enableSecurity();
-    ?>
-
-> **Note**
->
-> Most security policy settings are only checked when the template gets
-> compiled. For that reasion you should delete all cached and compiled
-> template files when you change your security settings.
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md
deleted file mode 100644
index 8ef79113c..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-static-classes.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Static Classes {#advanced.features.static.classes}
-==============
-
-You can directly access static classes. The syntax is the same as in
-PHP.
-
-> **Note**
->
-> Direct access to PHP classes is not recommended. This ties the
-> underlying application code structure directly to the presentation,
-> and also complicates template syntax. It is recommended to register
-> plugins which insulate templates from PHP classes/objects. Use at your
-> own discretion. See the Best Practices section of the Smarty website.
-
-
-    {assign var=foo value=myclass::BAR}  <--- class constant BAR
-
-    {assign var=foo value=myclass::method()}  <--- method result
-
-    {assign var=foo value=myclass::method1()->method2}  <--- method chaining
-
-    {assign var=foo value=myclass::$bar}  <--- property bar of class myclass
-
-    {assign var=foo value=$bar::method}  <--- using Smarty variable bar as class name
-
-
-      
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md
deleted file mode 100644
index d6f7a0de5..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-streams.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Streams {#advanced.features.streams}
-=======
-
-You can also use streams to call variables. *{\$foo:bar}* will use the
-*foo://bar* stream to get the template variable.
-
-Using a PHP stream for a template variable resource from within a
-template.
-
-
-    {$foo:bar}
-
-      
-
-See also [`Template Resources`](#resources)
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md
deleted file mode 100644
index 25295c38d..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-inheritance.md
+++ /dev/null
@@ -1,128 +0,0 @@
-Template Inheritance {#advanced.features.template.inheritance}
-====================
-
-Inheritance brings the concept of Object Oriented Programming to
-templates, allowing you to define one (or more) base templates that can
-be extended by child templates. Extending means that the child template
-can override all or some of the parent named block areas.
-
--   The inheritance tree can be as deep as you want, meaning you can
-    extend a file that extends another one that extends another one and
-    so on.
-
--   The child templates can not define any content besides what\'s
-    inside [`{block}`](#language.function.block) tags they override.
-    Anything outside of [`{block}`](#language.function.block) tags will
-    be removed.
-
--   The content of [`{block}`](#language.function.block) tags from child
-    and parent templates can be merged by the `append` or `prepend`
-    [`{block}`](#language.function.block) tag option flags and
-    `{$smarty.block.parent}` or `{$smarty.block.child}` placeholders.
-
--   Template inheritance is a compile time process which creates a
-    single compiled template file. Compared to corresponding solutions
-    based on subtemplates included with the
-    [`{include}`](#language.function.include) tag it does have much
-    better performance when rendering.
-
--   The child template extends its parent defined with the
-    [`{extends}`](#language.function.extends) tag, which must be the
-    first line in the child template. Instead of using the
-    [`{extends}`](#language.function.extends) tags in the template files
-    you can define the whole template inheritance tree in the PHP script
-    when you are calling [`fetch()`](#api.fetch) or
-    [`display()`](#api.display) with the `extends:` template resource
-    type. The later provides even more flexibillity.
-
-> **Note**
->
-> When `$compile_check` is enabled, all files in the inheritance tree
-> are checked for modifications upon each invocation. You may want to
-> disable `$compile_check` on production servers for this reason.
-
-> **Note**
->
-> If you have a subtemplate which is included with
-> [`{include}`](#language.function.include) and it contains
-> [`{block}`](#language.function.block) areas it works only if the
-> [`{include}`](#language.function.include) itself is called from within
-> a surrounding [`{block}`](#language.function.block). In the final
-> parent template you may need a dummy
-> [`{block}`](#language.function.block) for it.
-
-layout.tpl (parent)
-
-
-    <html>
-    <head>
-      <title>{block name=title}Default Page Title{/block}</title>
-      {block name=head}{/block}
-    </head>
-    <body>
-    {block name=body}{/block}
-    </body>
-    </html>
-
-      
-
-myproject.tpl (child)
-
-
-    {extends file='layout.tpl'}
-    {block name=head}
-      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
-      <script src="/js/mypage.js"></script>
-    {/block}
-
-
-      
-
-mypage.tpl (grandchild)
-
-
-    {extends file='myproject.tpl'}
-    {block name=title}My Page Title{/block}
-    {block name=head}
-      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
-      <script src="/js/mypage.js"></script>
-    {/block}
-    {block name=body}My HTML Page Body goes here{/block}
-
-      
-
-To render the above use
-
-
-     $smarty->display('mypage.tpl');
-
-The resulting output is
-
-
-    <html>
-    <head>
-      <title>My Page Title</title>
-      <link href="/css/mypage.css" rel="stylesheet" type="text/css"/>
-      <script src="/js/mypage.js"></script>
-    </head>
-    <body>
-    My HTML Page Body goes here
-    </body>
-    </html>
-
-Instead of using [`{extends}`](#language.function.extends) tags in the
-template files you can define the inheritance tree in your PHP script by
-using the [`extends:` resource](#resources.extends) type.
-
-The code below will return same result as the example above.
-
-
-    <?php
-    $smarty->display('extends:layout.tpl|myproject.tpl|mypage.tpl'); 
-    ?>
-
-       
-
-See also [`{block}`](#language.function.block),
-[`{extends}`](#language.function.extends) and [`extends:`
-resource](#resources.extends)
diff --git a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md b/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md
deleted file mode 100644
index df1f86a8c..000000000
--- a/vendor/smarty/smarty/docs/programmers/advanced-features/advanced-features-template-settings.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Changing settings by template {#advanced.features.template.settings}
-=============================
-
-Normally you configure the Smarty settings by modifying the
-[`Smarty class variables`](#api.variables). Furthermore you can register
-plugins, filters etc. with [`Smarty functions`](#api.functions).
-Modifications done to the Smarty object will be global for all
-templates.
-
-However the Smarty class variables and functions can be accessed or
-called by induvidual template objects. Modification done to a template
-object will apply only for that template and its included subtemplates.
-
-
-    <?php
-    $tpl = $smarty->createTemplate('index.tpl);
-    $tpl->cache_lifetime = 600;
-    //or
-    $tpl->setCacheLifetime(600);
-    $smarty->display($tpl);
-    ?>
-
-        
-
-
-    <?php
-    $tpl = $smarty->createTemplate('index.tpl);
-    $tpl->registerPlugin('modifier','mymodifier');
-    $smarty->display($tpl);
-    ?>
-
-        
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions.md b/vendor/smarty/smarty/docs/programmers/api-functions.md
deleted file mode 100644
index 6f120fa9a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions.md
+++ /dev/null
@@ -1,64 +0,0 @@
-Smarty Class Methods {#api.functions}
-====================
-
-## Table of contents
-
-- [addConfigDir()](./api-functions/api-add-config-dir.md) — add a directory to the list of directories where config files are stored
-- [addPluginsDir()](./api-functions/api-add-plugins-dir.md) — add a directory to the list of directories where plugins are stored
-- [addTemplateDir()](./api-functions/api-add-template-dir.md) — add a directory to the list of directories where templates are stored
-- [append()](./api-functions/api-append.md) — append an element to an assigned array
-- [appendByRef()](./api-functions/api-append-by-ref.md) — append values  by reference
-- [assign()](./api-functions/api-assign.md) — assign variables/objects to the templates
-- [assignByRef()](./api-functions/api-assign-by-ref.md) — assign values by reference
-- [clearAllAssign()](./api-functions/api-clear-all-assign.md) — clears the values of all assigned variables
-- [clearAllCache()](./api-functions/api-clear-all-cache.md) — clears the entire template cache
-- [clearAssign()](./api-functions/api-clear-assign.md) — clears the value of an assigned variable
-- [clearCache()](./api-functions/api-clear-cache.md) — clears the cache for a specific template
-- [clearCompiledTemplate()](./api-functions/api-clear-compiled-tpl.md) — clears the compiled version of the specified template resource
-- [clearConfig()](./api-functions/api-clear-config.md) — clears assigned config variables
-- [compileAllConfig()](./api-functions/api-compile-all-config.md) — compiles all known config files
-- [compileAllTemplates()](./api-functions/api-compile-all-templates.md) — compiles all known templates
-- [configLoad()](./api-functions/api-config-load.md) —  loads config file  data and assigns it to the template
-- [createData()](./api-functions/api-create-data.md) — creates a data object
-- [createTemplate()](./api-functions/api-create-template.md) — returns a template object
-- [disableSecurity()](./api-functions/api-disable-security.md) — disables template security
-- [display()](./api-functions/api-display.md) — displays the template
-- [enableSecurity()](./api-functions/api-enable-security.md) — enables template security
-- [fetch()](./api-functions/api-fetch.md) — returns the template output
-- [getCacheDir()](./api-functions/api-get-cache-dir.md) — return the directory where the rendered template's output is stored
-- [getCompileDir()](./api-functions/api-get-compile-dir.md) — returns the directory where compiled templates are stored
-- [getConfigDir()](./api-functions/api-get-config-dir.md) — return the directory where config files are stored
-- [getConfigVars()](./api-functions/api-get-config-vars.md) — returns the given loaded config variable value
-- [getPluginsDir()](./api-functions/api-get-plugins-dir.md) — return the directory where plugins are stored
-- [getRegisteredObject()](./api-functions/api-get-registered-object.md) — returns a reference to a registered object
-- [getTags()](./api-functions/api-get-tags.md) — return tags used by template
-- [getTemplateDir()](./api-functions/api-get-template-dir.md) — return the directory where templates are stored
-- [getTemplateVars()](./api-functions/api-get-template-vars.md) — returns  assigned variable value(s)
-- [isCached()](./api-functions/api-is-cached.md) — returns true if there is a valid cache for this template
-- [loadFilter()](./api-functions/api-load-filter.md) — load a filter plugin
-- [muteExpectedErrors()](./api-functions/api-mute-expected-errors.md) — mutes expected warnings and notices deliberately generated by Smarty
-- [registerCacheResource()](./api-functions/api-register-cacheresource.md) — dynamically register CacheResources
-- [registerClass()](./api-functions/api-register-class.md) — register a class for use in the templates
-- [registerDefaultPluginHandler()](./api-functions/api-register-default-plugin-handler.md) — register a function which gets called on undefined tags
-- [registerFilter()](./api-functions/api-register-filter.md) — dynamically register filters
-- [registerPlugin()](./api-functions/api-register-plugin.md) — dynamically register plugins
-- [registerObject()](./api-functions/api-register-object.md) — register an object for use in the templates
-- [registerResource()](./api-functions/api-register-resource.md) — dynamically register resources
-- [setCacheDir()](./api-functions/api-set-cache-dir.md) — set the directory where the rendered template's output is stored
-- [setCompileDir()](./api-functions/api-set-compile-dir.md) — set the directory where compiled templates are stored
-- [setConfigDir()](./api-functions/api-set-config-dir.md) — set the directories where config files are stored
-- [setPluginsDir()](./api-functions/api-set-plugins-dir.md) — set the directories where plugins are stored
-- [setTemplateDir()](./api-functions/api-set-template-dir.md) — set the directories where templates are stored
-- [templateExists()](./api-functions/api-template-exists.md) — checks whether the specified template exists
-- [unregisterCacheResource()](./api-functions/api-unregister-cacheresource.md) — dynamically unregister a CacheResource plugin
-- [unregisterFilter()](./api-functions/api-unregister-filter.md) — dynamically unregister a filter
-- [unregisterPlugin()](./api-functions/api-unregister-plugin.md) — dynamically unregister plugins
-- [unregisterObject()](./api-functions/api-unregister-object.md) — dynamically unregister an object
-- [unregisterResource()](./api-functions/api-unregister-resource.md) — dynamically unregister a resource plugin
-- [testInstall()](./api-functions/api-test-install.md) — checks Smarty installation
-
-> **Note**
->
-> See
-> [`Changing settings by template`](./advanced-features/advanced-features-template-settings.md)
-> section for how to use the functions for individual templates.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md
deleted file mode 100644
index 6c8b54e41..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-config-dir.md
+++ /dev/null
@@ -1,49 +0,0 @@
-addConfigDir()
-
-add a directory to the list of directories where config files are stored
-
-Description
-===========
-
-Smarty
-
-addConfigDir
-
-string\|array
-
-config\_dir
-
-string
-
-key
-
-
-    <?php
-
-    // add directory where config files are stored
-    $smarty->addConigDir('./config_1');
-
-    // add directory where config files are stored and specify array-key
-    $smarty->addConfigDir('./config_1', 'one');
-
-    // add multiple directories where config files are stored and specify array-keys
-    $smarty->addTemplateDir(array(
-        'two' => './config_2',
-        'three' => './config_3',
-    ));
-
-    // view the template dir chain
-    var_dump($smarty->getConfigDir());
-
-    // chaining of method calls
-    $smarty->setConfigDir('./config')
-           ->addConfigDir('./config_1', 'one')
-           ->addConfigDir('./config_2', 'two');
-
-    ?>
-
-       
-
-See also [`getConfigDir()`](#api.get.config.dir),
-[`setConfigDir()`](#api.set.config.dir) and
-[`$config_dir`](#variable.config.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
deleted file mode 100644
index ec9741b6e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-plugins-dir.md
+++ /dev/null
@@ -1,42 +0,0 @@
-addPluginsDir()
-
-add a directory to the list of directories where plugins are stored
-
-Description
-===========
-
-Smarty
-
-addPluginsDir
-
-string\|array
-
-plugins\_dir
-
-
-    <?php
-
-    // add directory where plugins are stored
-    $smarty->addPluginsDir('./plugins_1');
-
-    // add multiple directories where plugins are stored
-    $smarty->setPluginsDir(array(
-        './plugins_2',
-        './plugins_3',
-    ));
-
-    // view the plugins dir chain
-    var_dump($smarty->getPluginsDir());
-
-    // chaining of method calls
-    $smarty->setPluginsDir('./plugins')
-           ->addPluginsDir('./plugins_1')
-           ->addPluginsDir('./plugins_2');
-
-    ?>
-
-       
-
-See also [`getPluginsDir()`](#api.get.plugins.dir),
-[`setPluginsDir()`](#api.set.plugins.dir) and
-[`$plugins_dir`](#variable.plugins.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md
deleted file mode 100644
index e0d24564c..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-add-template-dir.md
+++ /dev/null
@@ -1,49 +0,0 @@
-addTemplateDir()
-
-add a directory to the list of directories where templates are stored
-
-Description
-===========
-
-Smarty
-
-addTemplateDir
-
-string\|array
-
-template\_dir
-
-string
-
-key
-
-
-    <?php
-
-    // add directory where templates are stored
-    $smarty->addTemplateDir('./templates_1');
-
-    // add directory where templates are stored and specify array-key
-    $smarty->addTemplateDir('./templates_1', 'one');
-
-    // add multiple directories where templates are stored and specify array-keys
-    $smarty->addTemplateDir(array(
-        'two' => './templates_2',
-        'three' => './templates_3',
-    ));
-
-    // view the template dir chain
-    var_dump($smarty->getTemplateDir());
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->addTemplateDir('./templates_1', 'one')
-           ->addTemplateDir('./templates_2', 'two');
-
-    ?>
-
-       
-
-See also [`getTemplateDir()`](#api.get.template.dir),
-[`setTemplateDir()`](#api.set.template.dir) and
-[`$template_dir`](#variable.template.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md
deleted file mode 100644
index cd396d9cc..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-append-by-ref.md
+++ /dev/null
@@ -1,46 +0,0 @@
-appendByRef()
-
-append values by reference
-
-Description
-===========
-
-void
-
-appendByRef
-
-string
-
-varname
-
-mixed
-
-var
-
-bool
-
-merge
-
-This is used to [`append()`](#api.append) values to the templates by
-reference.
-
-> **Note**
->
-> With the introduction of PHP5, `appendByRef()` is not necessary for
-> most intents and purposes. `appendByRef()` is useful if you want a PHP
-> array index value to be affected by its reassignment from a template.
-> Assigned object properties behave this way by default.
-
-NOTE.PARAMETER.MERGE
-
-
-    <?php
-    // appending name/value pairs
-    $smarty->appendByRef('Name', $myname);
-    $smarty->appendByRef('Address', $address);
-    ?>
-
-       
-
-See also [`append()`](#api.append), [`assign()`](#api.assign) and
-[`getTemplateVars()`](#api.get.template.vars).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
deleted file mode 100644
index b94586417..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-append.md
+++ /dev/null
@@ -1,61 +0,0 @@
-append()
-
-append an element to an assigned array
-
-Description
-===========
-
-void
-
-append
-
-mixed
-
-var
-
-void
-
-append
-
-string
-
-varname
-
-mixed
-
-var
-
-bool
-
-merge
-
-If you append to a string value, it is converted to an array value and
-then appended to. You can explicitly pass name/value pairs, or
-associative arrays containing the name/value pairs. If you pass the
-optional third parameter of TRUE, the value will be merged with the
-current array instead of appended.
-
-NOTE.PARAMETER.MERGE
-
-
-    <?php
-    // This is effectively the same as assign()
-    $smarty->append('foo', 'Fred');
-    // After this line, foo will now be seen as an array in the template
-    $smarty->append('foo', 'Albert');
-
-    $array = array(1 => 'one', 2 => 'two');
-    $smarty->append('X', $array);
-    $array2 = array(3 => 'three', 4 => 'four');
-    // The following line will add a second element to the X array
-    $smarty->append('X', $array2);
-
-    // passing an associative array
-    $smarty->append(array('city' => 'Lincoln', 'state' => 'Nebraska'));
-    ?>
-
-       
-
-See also [`appendByRef()`](#api.append.by.ref),
-[`assign()`](#api.assign) and
-[`getTemplateVars()`](#api.get.template.vars)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md
deleted file mode 100644
index 7c42b4836..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-assign-by-ref.md
+++ /dev/null
@@ -1,42 +0,0 @@
-assignByRef()
-
-assign values by reference
-
-Description
-===========
-
-void
-
-assignByRef
-
-string
-
-varname
-
-mixed
-
-var
-
-This is used to [`assign()`](#api.assign) values to the templates by
-reference.
-
-> **Note**
->
-> With the introduction of PHP5, `assignByRef()` is not necessary for
-> most intents and purposes. `assignByRef()` is useful if you want a PHP
-> array index value to be affected by its reassignment from a template.
-> Assigned object properties behave this way by default.
-
-
-    <?php
-    // passing name/value pairs
-    $smarty->assignByRef('Name', $myname);
-    $smarty->assignByRef('Address', $address);
-    ?>
-
-       
-
-See also [`assign()`](#api.assign),
-[`clearAllAssign()`](#api.clear.all.assign), [`append()`](#api.append),
-[`{assign}`](#language.function.assign) and
-[`getTemplateVars()`](#api.get.template.vars).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
deleted file mode 100644
index c3b9985d4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-assign.md
+++ /dev/null
@@ -1,84 +0,0 @@
-assign()
-
-assign variables/objects to the templates
-
-Description
-===========
-
-void
-
-assign
-
-mixed
-
-var
-
-void
-
-assign
-
-string
-
-varname
-
-mixed
-
-var
-
-bool
-
-nocache
-
-You can explicitly pass name/value pairs, or associative arrays
-containing the name/value pairs.
-
-If you pass the optional third `nocache` parameter of TRUE, the variable
-is assigned as nocache variable. See
-[`Cacheability of Variables`](#cacheability.variables) for details.
-
-> **Note**
->
-> When you assign/register objects to templates, be sure that all
-> properties and methods accessed from the template are for presentation
-> purposes only. It is very easy to inject application logic through
-> objects, and this leads to poor designs that are difficult to manage.
-> See the Best Practices section of the Smarty website.
-
-
-    <?php
-    // passing name/value pairs
-    $smarty->assign('Name', 'Fred');
-    $smarty->assign('Address', $address);
-
-    // passing an associative array
-    $smarty->assign(array('city' => 'Lincoln', 'state' => 'Nebraska'));
-
-    // passing an array
-    $myArray = array('no' => 10, 'label' => 'Peanuts');
-    $smarty->assign('foo',$myArray);
-
-    // passing a row from a database (eg adodb)
-    $sql = 'select id, name, email from contacts where contact ='.$id;
-    $smarty->assign('contact', $db->getRow($sql));
-    ?>
-
-These are accessed in the template with
-
-
-    {* note the vars are case sensitive like php *}
-    {$Name}
-    {$Address}
-    {$city}
-    {$state}
-
-    {$foo.no}, {$foo.label}
-    {$contact.id}, {$contact.name},{$contact.email}
-
-To access more complex array assignments see
-[`{foreach}`](#language.function.foreach) and
-[`{section}`](#language.function.section)
-
-See also [`assignByRef()`](#api.assign.by.ref),
-[`getTemplateVars()`](#api.get.template.vars),
-[`clearAssign()`](#api.clear.assign), [`append()`](#api.append) and
-[`{assign}`](#language.function.assign)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
deleted file mode 100644
index cc75fad0f..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-assign.md
+++ /dev/null
@@ -1,34 +0,0 @@
-clearAllAssign()
-
-clears the values of all assigned variables
-
-Description
-===========
-
-void
-
-clearAllAssign
-
-
-    <?php
-    // passing name/value pairs
-    $smarty->assign('Name', 'Fred');
-    $smarty->assign('Address', $address);
-
-    // will output above
-    print_r( $smarty->getTemplateVars() );
-
-    // clear all assigned variables
-    $smarty->clearAllAssign();
-
-    // will output nothing
-    print_r( $smarty->getTemplateVars() );
-
-    ?>
-
-       
-
-See also [`clearAssign()`](#api.clear.assign),
-[`clearConfig()`](#api.clear.config),
-[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
-and [`append()`](#api.append)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
deleted file mode 100644
index 55cbe5795..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-all-cache.md
+++ /dev/null
@@ -1,37 +0,0 @@
-clearAllCache()
-
-clears the entire template cache
-
-Description
-===========
-
-void
-
-clearAllCache
-
-int
-
-expire\_time
-
-As an optional parameter, you can supply a minimum age in seconds the
-cache files must be before they will get cleared.
-
-> **Note**
->
-> Since Smarty version 3.1.14 it is possible to delete cache files by
-> their individual expiration time at creation by passing constant
-> SMARTY::CLEAR\_EXPIRED as `expire_time` parameter.
-
-
-    <?php
-    // clear the entire cache
-    $smarty->clearAllCache();
-
-    // clears all files over one hour old
-    $smarty->clearAllCache(3600);
-    ?>
-
-       
-
-See also [`clearCache()`](#api.clear.cache),
-[`isCached()`](#api.is.cached) and the [caching](#caching) page.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
deleted file mode 100644
index ac0731e86..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-assign.md
+++ /dev/null
@@ -1,32 +0,0 @@
-clearAssign()
-
-clears the value of an assigned variable
-
-Description
-===========
-
-void
-
-clearAssign
-
-mixed
-
-var
-
-This can be a single value, or an array of values.
-
-
-    <?php
-    // clear a single variable
-    $smarty->clearAssign('Name');
-
-    // clears multiple variables
-    $smarty->clearAssign(array('Name', 'Address', 'Zip'));
-    ?>
-
-       
-
-See also [`clearAllAssign()`](#api.clear.all.assign),
-[`clearConfig()`](#api.clear.config),
-[`getTemplateVars()`](#api.get.template.vars), [`assign()`](#api.assign)
-and [`append()`](#api.append)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
deleted file mode 100644
index 3e17d80c8..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-cache.md
+++ /dev/null
@@ -1,60 +0,0 @@
-clearCache()
-
-clears the cache for a specific template
-
-Description
-===========
-
-void
-
-clearCache
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
-int
-
-expire\_time
-
--   If you have [multiple caches](#caching.multiple.caches) for a
-    template, you can clear a specific cache by supplying the `cache_id`
-    as the second parameter.
-
--   You can also pass a [`$compile_id`](#variable.compile.id) as a third
-    parameter. You can [group templates together](#caching.groups) so
-    they can be removed as a group, see the [caching section](#caching)
-    for more information.
-
--   As an optional fourth parameter, you can supply a minimum age in
-    seconds the cache file must be before it will get cleared.
-
-    > **Note**
-    >
-    > Since Smarty version 3.1.14 it is possible to delete cache files
-    > by their individual expiration time at creation by passing
-    > constant SMARTY::CLEAR\_EXPIRED as fourth parameter.
-
-<!-- -->
-
-
-    <?php
-    // clear the cache for a template
-    $smarty->clearCache('index.tpl');
-
-    // clear the cache for a particular cache id in an multiple-cache template
-    $smarty->clearCache('index.tpl', 'MY_CACHE_ID');
-    ?>
-
-       
-
-See also [`clearAllCache()`](#api.clear.all.cache) and
-[`caching`](#caching) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
deleted file mode 100644
index dfa688eb6..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-compiled-tpl.md
+++ /dev/null
@@ -1,44 +0,0 @@
-clearCompiledTemplate()
-
-clears the compiled version of the specified template resource
-
-Description
-===========
-
-void
-
-clearCompiledTemplate
-
-string
-
-tpl\_file
-
-string
-
-compile\_id
-
-int
-
-exp\_time
-
-This clears the compiled version of the specified template resource, or
-all compiled template files if one is not specified. If you pass a
-[`$compile_id`](#variable.compile.id) only the compiled template for
-this specific [`$compile_id`](#variable.compile.id) is cleared. If you
-pass an exp\_time, then only compiled templates older than `exp_time`
-seconds are cleared, by default all compiled templates are cleared
-regardless of their age. This function is for advanced use only, not
-normally needed.
-
-
-    <?php
-    // clear a specific template resource
-    $smarty->clearCompiledTemplate('index.tpl');
-
-    // clear entire compile directory
-    $smarty->clearCompiledTemplate();
-    ?>
-
-       
-
-See also [`clearCache()`](#api.clear.cache).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
deleted file mode 100644
index 43e86be17..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-clear-config.md
+++ /dev/null
@@ -1,35 +0,0 @@
-clearConfig()
-
-clears assigned config variables
-
-Description
-===========
-
-void
-
-clearConfig
-
-string
-
-var
-
-This clears all assigned [config variables](#language.config.variables).
-If a variable name is supplied, only that variable is cleared.
-
-
-    <?php
-    // clear all assigned config variables.
-    $smarty->clearConfig();
-
-    // clear one variable
-    $smarty->clearConfig('foobar');
-    ?>
-
-       
-
-See also [`getConfigVars()`](#api.get.config.vars),
-[`config variables`](#language.config.variables),
-[`config files`](#config.files),
-[`{config_load}`](#language.function.config.load),
-[`configLoad()`](#api.config.load) and
-[`clearAssign()`](#api.clear.assign).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
deleted file mode 100644
index a102fc97e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-config.md
+++ /dev/null
@@ -1,61 +0,0 @@
-compileAllConfig()
-
-compiles all known config files
-
-Description
-===========
-
-string
-
-compileAllConfig
-
-string
-
-extension
-
-boolean
-
-force
-
-integer
-
-timelimit
-
-integer
-
-maxerror
-
-This function compiles config files found in the
-[`$config_dir`](#variable.config.dir) folder. It uses the following
-parameters:
-
--   `extension` is an optional string which defines the file extension
-    for the config files. The default is \".conf\".
-
--   `force` is an optional boolean which controls if only modified
-    (false) or all (true) config files shall be compiled. The default is
-    \"false\".
-
--   `timelimit` is an optional integer to set a runtime limit in seconds
-    for the compilation process. The default is no limit.
-
--   `maxerror` is an optional integer to set an error limit. If more
-    config files failed to compile the function will be aborted. The
-    default is no limit.
-
-> **Note**
->
-> This function may not create desired results in all configurations.
-> Use is on own risk.
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // force compilation of all config files
-    $smarty->compileAllConfig('.config',true);
-
-    ?>
-
-        
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
deleted file mode 100644
index 53a021da8..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-compile-all-templates.md
+++ /dev/null
@@ -1,71 +0,0 @@
-compileAllTemplates()
-
-compiles all known templates
-
-Description
-===========
-
-string
-
-compileAllTemplates
-
-string
-
-extension
-
-boolean
-
-force
-
-integer
-
-timelimit
-
-integer
-
-maxerror
-
-This function compiles template files found in the
-[`$template_dir`](#variable.template.dir) folder. It uses the following
-parameters:
-
--   `extension` is an optional string which defines the file extension
-    for the template files. The default is \".tpl\".
-
--   `force` is an optional boolean which controls if only modified
-    (false) or all (true) templates shall be compiled. The default is
-    \"false\".
-
--   `timelimit` is an optional integer to set a runtime limit in seconds
-    for the compilation process. The default is no limit.
-
--   `maxerror` is an optional integer to set an error limit. If more
-    templates failed to compile the function will be aborted. The
-    default is no limit.
-
-> **Note**
->
-> This function may not create desired results in all configurations.
-> Use is on own risk.
-
-> **Note**
->
-> If any template requires registered plugins, filters or objects you
-> must register all of them before running this function.
-
-> **Note**
->
-> If you are using template inheritance this function will create
-> compiled files of parent templates which will never be used.
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // force compilation of all template files
-    $smarty->compileAllTemplates('.tpl',true);
-
-    ?>
-
-        
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
deleted file mode 100644
index bf6001fa4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-config-load.md
+++ /dev/null
@@ -1,47 +0,0 @@
-configLoad()
-
-loads config file data and assigns it to the template
-
-Description
-===========
-
-void
-
-configLoad
-
-string
-
-file
-
-string
-
-section
-
-This loads [config file](#config.files) data and assigns it to the
-template. This works identically to the template
-[`{config_load}`](#language.function.config.load) function.
-
-> **Note**
->
-> As of Smarty 2.4.0, assigned template variables are kept across
-> invocations of [`fetch()`](#api.fetch) and
-> [`display()`](#api.display). Config vars loaded from `configLoad()`
-> are always global in scope. Config files are also compiled for faster
-> execution, and respect the [`$force_compile`](#variable.force.compile)
-> and [`$compile_check`](#variable.compile.check) settings.
-
-
-    <?php
-    // load config variables and assign them
-    $smarty->configLoad('my.conf');
-
-    // load a section
-    $smarty->configLoad('my.conf', 'foobar');
-    ?>
-
-       
-
-See also [`{config_load}`](#language.function.config.load),
-[`getConfigVars()`](#api.get.config.vars),
-[`clearConfig()`](#api.clear.config), and
-[`config variables`](#language.config.variables)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
deleted file mode 100644
index 2d9f281b3..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-create-data.md
+++ /dev/null
@@ -1,52 +0,0 @@
-createData()
-
-creates a data object
-
-Description
-===========
-
-string
-
-createData
-
-object
-
-parent
-
-string
-
-createData
-
-This creates a data object which will hold assigned variables. It uses
-the following parameters:
-
--   `parent` is an optional parameter. It is an uplink to the main
-    Smarty object, a another user-created data object or to user-created
-    template object. These objects can be chained. Templates can access
-    variables assigned to any of the objects in it\'s parent chain.
-
-Data objects are used to create scopes for assigned variables. They can
-be used to have controll which variables are seen by which templates.
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // create data object with its private variable scope
-    $data = $smarty->createData();
-
-    // assign variable to data scope
-    $data->assign('foo','bar');
-
-    // create template object which will use variables from data object
-    $tpl = $smarty->createTemplate('index.tpl',$data);
-
-    // display the template
-    $tpl->display();
-    ?>
-
-        
-
-See also [`display()`](#api.display), and
-[`createTemplate()`](#api.create.template),
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
deleted file mode 100644
index 5129406d4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-create-template.md
+++ /dev/null
@@ -1,99 +0,0 @@
-createTemplate()
-
-returns a template object
-
-Description
-===========
-
-Smarty\_Internal\_Template
-
-createTemplate
-
-string
-
-template
-
-object
-
-parent
-
-Smarty\_Internal\_Template
-
-createTemplate
-
-string
-
-template
-
-array
-
-data
-
-Smarty\_Internal\_Template
-
-createTemplate
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
-object
-
-parent
-
-Smarty\_Internal\_Template
-
-createTemplate
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
-array
-
-data
-
-This creates a template object which later can be rendered by the
-[display](#api.display) or [fetch](#api.fetch) method. It uses the
-following parameters:
-
--   `template` must be a valid [template resource](#resources) type and
-    path.
-
-<!-- -->
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // create template object with its private variable scope
-    $tpl = $smarty->createTemplate('index.tpl');
-
-    // assign variable to template scope
-    $tpl->assign('foo','bar');
-
-    // display the template
-    $tpl->display();
-    ?>
-
-        
-
-See also [`display()`](#api.display), and
-[`templateExists()`](#api.template.exists).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
deleted file mode 100644
index efbaa3559..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-disable-security.md
+++ /dev/null
@@ -1,15 +0,0 @@
-disableSecurity()
-
-disables template security
-
-Description
-===========
-
-string
-
-disableSecurity
-
-This disables securty checking on templates.
-
-See also [`enableSecurity()`](#api.enable.security), and
-[Security](#advanced.features.security).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
deleted file mode 100644
index 59726195e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-display.md
+++ /dev/null
@@ -1,82 +0,0 @@
-display()
-
-displays the template
-
-Description
-===========
-
-void
-
-display
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
-This displays the contents of a template. To return the contents of a
-template into a variable, use [`fetch()`](#api.fetch). Supply a valid
-[template resource](#resources) type and path. As an optional second
-parameter, you can pass a `$cache_id`, see the [caching
-section](#caching) for more information.
-
-PARAMETER.COMPILEID
-
-
-    <?php
-    include(SMARTY_DIR.'Smarty.class.php');
-    $smarty = new Smarty();
-    $smarty->setCaching(true);
-
-    // only do db calls if cache doesn't exist
-    if(!$smarty->isCached('index.tpl')) {
-
-      // dummy up some data
-      $address = '245 N 50th';
-      $db_data = array(
-                   'City' => 'Lincoln',
-                   'State' => 'Nebraska',
-                   'Zip' => '68502'
-                 );
-
-      $smarty->assign('Name', 'Fred');
-      $smarty->assign('Address', $address);
-      $smarty->assign('data', $db_data);
-
-    }
-
-    // display the output
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-Use the syntax for [template resources](#resources) to display files
-outside of the [`$template_dir`](#variable.template.dir) directory.
-
-
-    <?php
-    // absolute filepath
-    $smarty->display('/usr/local/include/templates/header.tpl');
-
-    // absolute filepath (same thing)
-    $smarty->display('file:/usr/local/include/templates/header.tpl');
-
-    // windows absolute filepath (MUST use "file:" prefix)
-    $smarty->display('file:C:/www/pub/templates/header.tpl');
-
-    // include from template resource named "db"
-    $smarty->display('db:header.tpl');
-    ?>
-
-       
-
-See also [`fetch()`](#api.fetch) and
-[`templateExists()`](#api.template.exists).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
deleted file mode 100644
index 3326900d5..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-enable-security.md
+++ /dev/null
@@ -1,41 +0,0 @@
-enableSecurity()
-
-enables template security
-
-Description
-===========
-
-string
-
-enableSecurity
-
-string
-
-securityclass
-
-string
-
-enableSecurity
-
-object
-
-securityobject
-
-string
-
-enableSecurity
-
-This enables securty checking on templates. It uses the following
-parameters:
-
--   `securityclass` is an optional parameter. It\'s the name of the
-    class with defines the security policy parameters.
-
--   `securityobject` is an optional parameter. It\'s the object with
-    defines the security policy parameters.
-
-For the details how to setup a security policy see the
-[Security](#advanced.features.security) section.
-
-See also [`disableSecurity()`](#api.disable.security), and
-[Security](#advanced.features.security).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
deleted file mode 100644
index a0c1676aa..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-fetch.md
+++ /dev/null
@@ -1,91 +0,0 @@
-fetch()
-
-returns the template output
-
-Description
-===========
-
-string
-
-fetch
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
-This returns the template output instead of [displaying](#api.display)
-it. Supply a valid [template resource](#resources) type and path. As an
-optional second parameter, you can pass a `$cache id`, see the [caching
-section](#caching) for more information.
-
-PARAMETER.COMPILEID
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(true);
-
-    // set a separate cache_id for each unique URL
-    $cache_id = md5($_SERVER['REQUEST_URI']);
-
-    // capture the output
-    $output = $smarty->fetch('index.tpl', $cache_id);
-
-    // do something with $output here
-    echo $output;
-    ?>
-
-        
-
-The `email_body.tpl` template
-
-
-    Dear {$contact_info.name},
-
-    Welcome and thank you for signing up as a member of our user group.
-
-    Click on the link below to login with your user name
-    of '{$contact_info.username}' so you can post in our forums.
-
-    {$login_url}
-
-    List master
-
-    {textformat wrap=40}
-    This is some long-winded disclaimer text that would automatically get wrapped
-    at 40 characters. This helps make the text easier to read in mail programs that
-    do not wrap sentences for you.
-    {/textformat}
-
-        
-
-The php script using the PHP [`mail()`](&url.php-manual;function.mail)
-function
-
-
-    <?php
-
-    // get $contact_info from db or other resource here
-
-    $smarty->assign('contact_info',$contact_info);
-    $smarty->assign('login_url',"http://{$_SERVER['SERVER_NAME']}/login");
-
-    mail($contact_info['email'], 'Thank You', $smarty->fetch('email_body.tpl'));
-
-    ?>
-
-        
-
-See also [`{fetch}`](#language.function.fetch)
-[`display()`](#api.display), [`{eval}`](#language.function.eval), and
-[`templateExists()`](#api.template.exists).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md
deleted file mode 100644
index 9e55d8d0b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-cache-dir.md
+++ /dev/null
@@ -1,23 +0,0 @@
-getCacheDir()
-
-return the directory where the rendered template\'s output is stored
-
-Description
-===========
-
-string
-
-getCacheDir
-
-
-    <?php
-
-    // get directory where compiled templates are stored
-    $cacheDir = $smarty->getCacheDir();
-
-    ?>
-
-       
-
-See also [`setCacheDir()`](#api.set.cache.dir) and
-[`$cache_dir`](#variable.cache.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md
deleted file mode 100644
index 3bfae7306..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-compile-dir.md
+++ /dev/null
@@ -1,23 +0,0 @@
-getCompileDir()
-
-returns the directory where compiled templates are stored
-
-Description
-===========
-
-string
-
-getCompileDir
-
-
-    <?php
-
-    // get directory where compiled templates are stored
-    $compileDir = $smarty->getCompileDir();
-
-    ?>
-
-       
-
-See also [`setCompileDir()`](#api.set.compile.dir) and
-[`$compile_dir`](#variable.compile.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
deleted file mode 100644
index f41472ca4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-dir.md
+++ /dev/null
@@ -1,40 +0,0 @@
-getConfigDir()
-
-return the directory where config files are stored
-
-Description
-===========
-
-string\|array
-
-getConfigDir
-
-string
-
-key
-
-
-    <?php
-
-    // set some config directories
-    $smarty->setConfigDir(array(
-        'one' => './config',
-        'two' => './config_2',
-        'three' => './config_3',
-    ));
-
-    // get all directories where config files are stored
-    $config_dir = $smarty->getConfigDir();
-    var_dump($config_dir); // array
-
-    // get directory identified by key
-    $config_dir = $smarty->getConfigDir('one');
-    var_dump($config_dir); // string
-
-    ?>
-
-       
-
-See also [`setConfigDir()`](#api.set.config.dir),
-[`addConfigDir()`](#api.add.config.dir) and
-[`$config_dir`](#variable.config.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
deleted file mode 100644
index f252e8674..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-config-vars.md
+++ /dev/null
@@ -1,37 +0,0 @@
-getConfigVars()
-
-returns the given loaded config variable value
-
-Description
-===========
-
-array
-
-getConfigVars
-
-string
-
-varname
-
-If no parameter is given, an array of all loaded [config
-variables](#language.config.variables) is returned.
-
-
-    <?php
-
-    // get loaded config template var #foo#
-    $myVar = $smarty->getConfigVars('foo');
-
-    // get all loaded config template vars
-    $all_config_vars = $smarty->getConfigVars();
-
-    // take a look at them
-    print_r($all_config_vars);
-    ?>
-
-       
-
-See also [`clearConfig()`](#api.clear.config),
-[`{config_load}`](#language.function.config.load),
-[`configLoad()`](#api.config.load) and
-[`getTemplateVars()`](#api.get.template.vars).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
deleted file mode 100644
index aa6035549..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-plugins-dir.md
+++ /dev/null
@@ -1,31 +0,0 @@
-getPluginsDir()
-
-return the directory where plugins are stored
-
-Description
-===========
-
-array
-
-getPluginsDir
-
-
-    <?php
-
-    // set some plugins directories
-    $smarty->setPluginsDir(array(
-        './plugins',
-        './plugins_2',
-    ));
-
-    // get all directories where plugins are stored
-    $config_dir = $smarty->getPluginsDir();
-    var_dump($config_dir); // array
-
-    ?>
-
-       
-
-See also [`setPluginsDir()`](#api.set.plugins.dir),
-[`addPluginsDir()`](#api.add.plugins.dir) and
-[`$plugins_dir`](#variable.plugins.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
deleted file mode 100644
index a7c920e14..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-registered-object.md
+++ /dev/null
@@ -1,36 +0,0 @@
-getRegisteredObject()
-
-returns a reference to a registered object
-
-Description
-===========
-
-array
-
-getRegisteredObject
-
-string
-
-object\_name
-
-This is useful from within a custom function when you need direct access
-to a [registered object](#api.register.object). See the
-[objects](#advanced.features.objects) page for more info.
-
-
-    <?php
-    function smarty_block_foo($params, $smarty)
-    {
-      if (isset($params['object'])) {
-        // get reference to registered object
-        $obj_ref = $smarty->getRegisteredObject($params['object']);
-        // use $obj_ref is now a reference to the object
-      }
-    }
-    ?>
-
-       
-
-See also [`registerObject()`](#api.register.object),
-[`unregisterObject()`](#api.unregister.object) and [objects
-page](#advanced.features.objects)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md
deleted file mode 100644
index 7729b468b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-tags.md
+++ /dev/null
@@ -1,40 +0,0 @@
-getTags()
-
-return tags used by template
-
-Description
-===========
-
-string
-
-getTags
-
-object
-
-template
-
-This function returns an array of tagname/attribute pairs for all tags
-used by the template. It uses the following parameters:
-
--   `template` is the template object.
-
-> **Note**
->
-> This function is experimental.
-
-
-    <?php
-    include('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // create template object
-    $tpl = $smarty->createTemplate('index.tpl');
-
-    // get tags
-    $tags = $smarty->getTags($tpl);
-
-    print_r($tags);
-
-    ?>
-
-        
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md
deleted file mode 100644
index 42c75908b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-dir.md
+++ /dev/null
@@ -1,40 +0,0 @@
-getTemplateDir()
-
-return the directory where templates are stored
-
-Description
-===========
-
-string\|array
-
-getTemplateDir
-
-string
-
-key
-
-
-    <?php
-
-    // set some template directories
-    $smarty->setTemplateDir(array(
-        'one' => './templates',
-        'two' => './templates_2',
-        'three' => './templates_3',
-    ));
-
-    // get all directories where templates are stored
-    $template_dir = $smarty->getTemplateDir();
-    var_dump($template_dir); // array
-
-    // get directory identified by key
-    $template_dir = $smarty->getTemplateDir('one');
-    var_dump($template_dir); // string
-
-    ?>
-
-       
-
-See also [`setTemplateDir()`](#api.set.template.dir),
-[`addTemplateDir()`](#api.add.template.dir) and
-[`$template_dir`](#variable.template.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
deleted file mode 100644
index 27882eef4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-get-template-vars.md
+++ /dev/null
@@ -1,37 +0,0 @@
-getTemplateVars()
-
-returns assigned variable value(s)
-
-Description
-===========
-
-array
-
-getTemplateVars
-
-string
-
-varname
-
-If no parameter is given, an array of all [assigned](#api.assign)
-variables are returned.
-
-
-    <?php
-    // get assigned template var 'foo'
-    $myVar = $smarty->getTemplateVars('foo');
-
-    // get all assigned template vars
-    $all_tpl_vars = $smarty->getTemplateVars();
-
-    // take a look at them
-    print_r($all_tpl_vars);
-    ?>
-
-       
-
-See also [`assign()`](#api.assign),
-[`{assign}`](#language.function.assign), [`append()`](#api.append),
-[`clearAssign()`](#api.clear.assign),
-[`clearAllAssign()`](#api.clear.all.assign) and
-[`getConfigVars()`](#api.get.config.vars)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
deleted file mode 100644
index 0c41bf04a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-is-cached.md
+++ /dev/null
@@ -1,81 +0,0 @@
-isCached()
-
-returns true if there is a valid cache for this template
-
-Description
-===========
-
-bool
-
-isCached
-
-string
-
-template
-
-string
-
-cache\_id
-
-string
-
-compile\_id
-
--   This only works if [`$caching`](#variable.caching) is set to one of
-    `Smarty::CACHING_LIFETIME_CURRENT` or
-    `Smarty::CACHING_LIFETIME_SAVED` to enable caching. See the [caching
-    section](#caching) for more info.
-
--   You can also pass a `$cache_id` as an optional second parameter in
-    case you want [multiple caches](#caching.multiple.caches) for the
-    given template.
-
--   You can supply a [`$compile id`](#variable.compile.id) as an
-    optional third parameter. If you omit that parameter the persistent
-    [`$compile_id`](#variable.compile.id) is used if its set.
-
--   If you do not want to pass a `$cache_id` but want to pass a
-    [`$compile_id`](#variable.compile.id) you have to pass NULL as a
-    `$cache_id`.
-
-> **Note**
->
-> If `isCached()` returns TRUE it actually loads the cached output and
-> stores it internally. Any subsequent call to
-> [`display()`](#api.display) or [`fetch()`](#api.fetch) will return
-> this internally stored output and does not try to reload the cache
-> file. This prevents a race condition that may occur when a second
-> process clears the cache between the calls to `isCached()` and to
-> [`display()`](#api.display) in the example above. This also means
-> calls to [`clearCache()`](#api.clear.cache) and other changes of the
-> cache-settings may have no effect after `isCached()` returned TRUE.
-
-
-    <?php
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    if(!$smarty->isCached('index.tpl')) {
-    // do database calls, assign vars here
-    }
-
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-
-    <?php
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    if(!$smarty->isCached('index.tpl', 'FrontPage')) {
-      // do database calls, assign vars here
-    }
-
-    $smarty->display('index.tpl', 'FrontPage');
-    ?>
-
-       
-
-See also [`clearCache()`](#api.clear.cache),
-[`clearAllCache()`](#api.clear.all.cache), and [caching
-section](#caching).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
deleted file mode 100644
index 19286ee33..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-load-filter.md
+++ /dev/null
@@ -1,42 +0,0 @@
-loadFilter()
-
-load a filter plugin
-
-Description
-===========
-
-void
-
-loadFilter
-
-string
-
-type
-
-string
-
-name
-
-The first argument specifies the type of the filter to load and can be
-one of the following: `pre`, `post` or `output`. The second argument
-specifies the `name` of the filter plugin.
-
-
-    <?php
-
-    // load prefilter named 'trim'
-    $smarty->loadFilter('pre', 'trim');
-
-    // load another prefilter named 'datefooter'
-    $smarty->loadFilter('pre', 'datefooter');
-
-    // load output filter named 'compress'
-    $smarty->loadFilter('output', 'compress');
-
-    ?>
-
-       
-
-See also [`registerFilter()`](#api.register.filter),
-[`$autoload_filters`](#variable.autoload.filters) and [advanced
-features](#advanced.features).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
deleted file mode 100644
index 1ce45d493..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-mute-expected-errors.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Smarty::muteExpectedErrors()
-
-mutes expected warnings and notices deliberately generated by Smarty
-
-Description
-===========
-
-string
-
-muteExpectedErrors
-
-muteExpectedErrors() registers a custom error handler using
-[set\_error\_handler()](&url.php-manual;set_error_handler). The error
-handler merely inspects `$errno` and `$errfile` to determine if the
-given error was produced deliberately and must be ignored, or should be
-passed on to the next error handler.
-
-`Smarty::unmuteExpectedErrors()` removes the current error handler.
-Please note, that if you\'ve registerd any custom error handlers after
-the muteExpectedErrors() call, the unmute will not remove Smarty\'s
-muting error handler, but the one registered last.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
deleted file mode 100644
index 60ae60308..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-cacheresource.md
+++ /dev/null
@@ -1,40 +0,0 @@
-registerCacheResource()
-
-dynamically register CacheResources
-
-Description
-===========
-
-void
-
-registerCacheResource
-
-string
-
-name
-
-Smarty\_CacheResource
-
-resource\_handler
-
-Use this to dynamically register a [CacheResource
-plugin](#caching.custom) with Smarty. Pass in the `name` of the
-CacheResource and the object extending Smarty\_CacheResource. See
-[Custom Cache Implementation](#caching.custom) for more information on
-how to create custom CacheResources.
-
-> **Note**
->
-> In Smarty2 this used to be a callback function called
-> `$cache_handler_func`. Smarty3 replaced this callback by the
-> `Smarty_CacheResource` module.
-
-
-    <?php
-    $smarty->registerCacheResource('mysql', new Smarty_CacheResource_Mysql());
-    ?>
-
-       
-
-See also [`unregisterCacheResource()`](#api.unregister.cacheresource)
-and the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
deleted file mode 100644
index ee339cadb..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-class.md
+++ /dev/null
@@ -1,65 +0,0 @@
-registerClass()
-
-register a class for use in the templates
-
-Description
-===========
-
-void
-
-registerClass
-
-string
-
-class\_name
-
-string
-
-class\_impl
-
-Smarty allows you to access static classes from templates as long as the
-[Security Policy](#advanced.features.security) does not tell it
-otherwise. If security is enabled, classes registered with
-`registerClass()` are accessible to templates.
-
-
-    <?php
-
-    class Bar {
-      $property = "hello world";
-    }
-
-    $smarty = new Smarty();
-    $smarty->registerClass("Foo", "Bar");
-
-       
-
-
-    {* Smarty will access this class as long as it's not prohibited by security *}
-    {Bar::$property}
-    {* Foo translates to the real class Bar *}
-    {Foo::$property}
-
-       
-
-
-    <?php
-    namespace my\php\application {
-      class Bar {
-        $property = "hello world";
-      }
-    }
-
-    $smarty = new Smarty();
-    $smarty->registerClass("Foo", "\my\php\application\Bar");
-
-       
-
-
-    {* Foo translates to the real class \my\php\application\Bar *}
-    {Foo::$property}
-
-       
-
-See also [`registerObject()`](#api.register.object), and
-[Security](#advanced.features.security).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
deleted file mode 100644
index 9447d9620..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-default-plugin-handler.md
+++ /dev/null
@@ -1,93 +0,0 @@
-registerDefaultPluginHandler()
-
-register a function which gets called on undefined tags
-
-Description
-===========
-
-void
-
-registerDefaultPluginHandler
-
-mixed
-
-callback
-
-Register a default plugin handler which gets called if the compiler can
-not find a definition for a tag otherwise. It uses the following
-parameters:
-
-If during compilation Smarty encounters tag which is not defined
-internal, registered or loacted in the plugins folder it tries to
-resolve it by calling the registered default plugin handler. The handler
-may be called several times for same undefined tag looping over valid
-plugin types.
-
-
-    <?php
-
-    $smarty = new Smarty();
-    $smarty->registerDefaultPluginHandler('my_plugin_handler');
-
-    /**
-     * Default Plugin Handler
-     *
-     * called when Smarty encounters an undefined tag during compilation
-     * 
-     * @param string                     $name      name of the undefined tag
-     * @param string                     $type     tag type (e.g. Smarty::PLUGIN_FUNCTION, Smarty::PLUGIN_BLOCK, 
-                                                   Smarty::PLUGIN_COMPILER, Smarty::PLUGIN_MODIFIER, Smarty::PLUGIN_MODIFIERCOMPILER)
-     * @param Smarty_Internal_Template   $template     template object
-     * @param string                     &$callback    returned function name 
-     * @param string                     &$script      optional returned script filepath if function is external
-     * @param bool                       &$cacheable    true by default, set to false if plugin is not cachable (Smarty >= 3.1.8)
-     * @return bool                      true if successfull
-     */
-    function my_plugin_handler ($name, $type, $template, &$callback, &$script, &$cacheable)
-    {
-        switch ($type) {
-            case Smarty::PLUGIN_FUNCTION:
-                switch ($name) {
-                    case 'scriptfunction':
-                        $script = './scripts/script_function_tag.php';
-                        $callback = 'default_script_function_tag';
-                        return true;
-                    case 'localfunction':
-                        $callback = 'default_local_function_tag';
-                        return true;
-                    default:
-                    return false;
-                }
-            case Smarty::PLUGIN_COMPILER:
-                switch ($name) {
-                    case 'scriptcompilerfunction':
-                        $script = './scripts/script_compiler_function_tag.php';
-                        $callback = 'default_script_compiler_function_tag';
-                        return true;
-                    default:
-                    return false;
-                }
-            case Smarty::PLUGIN_BLOCK:
-                switch ($name) {
-                    case 'scriptblock':
-                        $script = './scripts/script_block_tag.php';
-                        $callback = 'default_script_block_tag';
-                        return true;
-                    default:
-                    return false;
-                }
-            default:
-            return false;
-        }
-     }
-
-    ?>
-
-      
-
-> **Note**
->
-> The return callback must be static; a function name or an array of
-> class and method name.
->
-> Dynamic callbacks like objects methods are not supported.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
deleted file mode 100644
index fd91d2661..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-filter.md
+++ /dev/null
@@ -1,45 +0,0 @@
-registerFilter()
-
-dynamically register filters
-
-Description
-===========
-
-void
-
-registerFilter
-
-string
-
-type
-
-mixed
-
-callback
-
-Use this to dynamically register filters to operate on a templates. It
-uses the following parameters:
-
-NOTE.PARAMETER.FUNCTION
-
-A [prefilter](#plugins.prefilters.postfilters) runs through the template
-source before it gets compiled. See [template
-prefilters](#advanced.features.prefilters) for more information on how
-to setup a prefiltering function.
-
-A [postfilter](#plugins.prefilters.postfilters) runs through the
-template code after it was compiled to PHP. See [template
-postfilters](#advanced.features.postfilters) for more information on how
-to setup a postfiltering function.
-
-A [outputfilter](#plugins.outputfilters) operates on a template\'s
-output before it is [displayed](#api.display). See [template output
-filters](#advanced.features.outputfilters) for more information on how
-to set up an output filter function.
-
-See also [`unregisterFilter()`](#api.unregister.filter),
-[`loadFilter()`](#api.load.filter),
-[`$autoload_filters`](#variable.autoload.filters), [template pre
-filters](#advanced.features.prefilters) [template post
-filters](#advanced.features.postfilters) [template output
-filters](#advanced.features.outputfilters) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
deleted file mode 100644
index c310e8c2a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-object.md
+++ /dev/null
@@ -1,44 +0,0 @@
-registerObject()
-
-register an object for use in the templates
-
-Description
-===========
-
-void
-
-registerObject
-
-string
-
-object\_name
-
-object
-
-object
-
-array
-
-allowed\_methods\_properties
-
-boolean
-
-format
-
-array
-
-block\_methods
-
-> **Note**
->
-> When you register/assign objects to templates, be sure that all
-> properties and methods accessed from the template are for presentation
-> purposes only. It is very easy to inject application logic through
-> objects, and this leads to poor designs that are difficult to manage.
-> See the Best Practices section of the Smarty website.
-
-See the [objects section](#advanced.features.objects) for more
-information.
-
-See also [`getRegisteredObject()`](#api.get.registered.object), and
-[`unregisterObject()`](#api.unregister.object).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
deleted file mode 100644
index 6eb433810..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-plugin.md
+++ /dev/null
@@ -1,110 +0,0 @@
-registerPlugin()
-
-dynamically register plugins
-
-Description
-===========
-
-void
-
-registerPlugin
-
-string
-
-type
-
-string
-
-name
-
-mixed
-
-callback
-
-bool
-
-cacheable
-
-mixed
-
-cache\_attrs
-
-This method registers functions or methods defined in your script as
-plugin. It uses the following parameters:
-
--   `cacheable` and `cache_attrs` can be omitted in most cases. See
-    [controlling cacheability of plugins output](#caching.cacheable) on
-    how to use them properly.
-
-<!-- -->
-
-
-    <?php
-    $smarty->registerPlugin("function","date_now", "print_current_date");
-
-    function print_current_date($params, $smarty)
-    {
-      if(empty($params["format"])) {
-        $format = "%b %e, %Y";
-      } else {
-        $format = $params["format"];
-      }
-      return strftime($format,time());
-    }
-    ?>
-
-       
-
-And in the template
-
-
-    {date_now}
-
-    {* or to format differently *}
-    {date_now format="%Y/%m/%d"}
-
-
-    <?php
-    // function declaration
-    function do_translation ($params, $content, $smarty, &$repeat, $template)
-    {
-      if (isset($content)) {
-        $lang = $params["lang"];
-        // do some translation with $content
-        return $translation;
-      }
-    }
-
-    // register with smarty
-    $smarty->registerPlugin("block","translate", "do_translation");
-    ?>
-
-       
-
-Where the template is:
-
-
-    {translate lang="br"}Hello, world!{/translate}
-
-       
-
-
-    <?php
-
-    // let's map PHP's stripslashes function to a Smarty modifier.
-    $smarty->registerPlugin("modifier","ss", "stripslashes");
-
-    ?>
-
-In the template, use `ss` to strip slashes.
-
-
-    <?php
-    {$var|ss}
-    ?>
-
-See also [`unregisterPlugin()`](#api.unregister.plugin), [plugin
-functions](#plugins.functions), [plugin block
-functions](#plugins.block.functions), [plugin compiler
-functions](#plugins.compiler.functions), and the [creating plugin
-modifiers](#plugins.modifiers) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
deleted file mode 100644
index ca4005460..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-register-resource.md
+++ /dev/null
@@ -1,46 +0,0 @@
-registerResource()
-
-dynamically register resources
-
-Description
-===========
-
-void
-
-registerResource
-
-string
-
-name
-
-Smarty\_resource
-
-resource\_handler
-
-Use this to dynamically register a [Resource plugin](#resources) with
-Smarty. Pass in the `name` of the Resource and the object extending
-Smarty\_Resource. See [template resources](#resources) for more
-information on how to setup a function for fetching templates.
-
-> **Note**
->
-> A resource name must be at least two characters in length. One
-> character resource names will be ignored and used as part of the file
-> path, such as `$smarty->display('c:/path/to/index.tpl');`
-
-> **Note**
->
-> Prior to Smarty 3.1 `registerResource()` accepted an array of callback
-> functions. While this is still possible for backward compatibility
-> reasons, it is strongly discouraged as callback functions have been
-> deprecated as of Smarty 3.1.
-
-
-    <?php
-    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
-    ?>
-
-       
-
-See also [`unregisterResource()`](#api.unregister.resource) and the
-[template resources](#resources) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md
deleted file mode 100644
index 7f7c4b60d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-cache-dir.md
+++ /dev/null
@@ -1,32 +0,0 @@
-setCacheDir()
-
-set the directory where the rendered template\'s output is stored
-
-Description
-===========
-
-Smarty
-
-setCacheDir
-
-string
-
-cache\_dir
-
-
-    <?php
-
-    // set directory where rendered template's output is stored
-    $smarty->setCacheDir('./cache');
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->setCompileDir('./templates_c')
-           ->setCacheDir('./cache');
-
-    ?>
-
-       
-
-See also [`getCacheDir()`](#api.get.cache.dir) and
-[`$cache_dir`](#variable.cache.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md
deleted file mode 100644
index bfeb55a53..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-compile-dir.md
+++ /dev/null
@@ -1,32 +0,0 @@
-setCompileDir()
-
-set the directory where compiled templates are stored
-
-Description
-===========
-
-Smarty
-
-setCompileDir
-
-string
-
-compile\_dir
-
-
-    <?php
-
-    // set directory where compiled templates are stored
-    $smarty->setCompileDir('./templates_c');
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->setCompileDir('./templates_c')
-           ->setCacheDir('./cache');
-
-    ?>
-
-       
-
-See also [`getCompileDir()`](#api.get.compile.dir) and
-[`$compile_dir`](#variable.compile.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md
deleted file mode 100644
index 97a6ae977..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-config-dir.md
+++ /dev/null
@@ -1,47 +0,0 @@
-setConfigDir()
-
-set the directories where config files are stored
-
-Description
-===========
-
-Smarty
-
-setConfigDir
-
-string\|array
-
-config\_dir
-
-
-    <?php
-
-    // set a single directory where the config files are stored
-    $smarty->setConfigDir('./config');
-
-    // view the config dir chain
-    var_dump($smarty->getConfigDir());
-
-    // set multiple directoríes where config files are stored
-    $smarty->setConfigDir(array(
-        'one' => './config',
-        'two' => './config_2',
-        'three' => './config_3',
-    ));
-
-    // view the config dir chain
-    var_dump($smarty->getConfigDir());
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->setConfigDir('./config')
-           ->setCompileDir('./templates_c')
-           ->setCacheDir('./cache');
-
-    ?>
-
-       
-
-See also [`getConfigDir()`](#api.get.config.dir),
-[`addConfigDir()`](#api.add.config.dir) and
-[`$config_dir`](#variable.config.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
deleted file mode 100644
index 25b0567b1..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-plugins-dir.md
+++ /dev/null
@@ -1,46 +0,0 @@
-setPluginsDir()
-
-set the directories where plugins are stored
-
-Description
-===========
-
-Smarty
-
-setPluginsDir
-
-string\|array
-
-plugins\_dir
-
-
-    <?php
-
-    // set a single directory where the plugins are stored
-    $smarty->setPluginsDir('./plugins');
-
-    // view the plugins dir chain
-    var_dump($smarty->getPluginsDir());
-
-    // set multiple directoríes where plugins are stored
-    $smarty->setPluginsDir(array(
-        './plugins',
-        './plugins_2',
-    ));
-
-    // view the plugins dir chain
-    var_dump($smarty->getPluginsDir());
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->setPluginsDir('./plugins')
-           ->setCompileDir('./templates_c')
-           ->setCacheDir('./cache');
-
-    ?>
-
-       
-
-See also [`getPluginsDir()`](#api.get.plugins.dir),
-[`addPluginsDir()`](#api.add.plugins.dir) and
-[`$plugins_dir`](#variable.plugins.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md
deleted file mode 100644
index 2de23309b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-set-template-dir.md
+++ /dev/null
@@ -1,46 +0,0 @@
-setTemplateDir()
-
-set the directories where templates are stored
-
-Description
-===========
-
-Smarty
-
-setTemplateDir
-
-string\|array
-
-template\_dir
-
-
-    <?php
-
-    // set a single directory where the templates are stored
-    $smarty->setTemplateDir('./cache');
-
-    // view the template dir chain
-    var_dump($smarty->getTemplateDir());
-
-    // set multiple directoríes where templates are stored
-    $smarty->setTemplateDir(array(
-        'one' => './templates',
-        'two' => './templates_2',
-        'three' => './templates_3',
-    ));
-
-    // view the template dir chain
-    var_dump($smarty->getTemplateDir());
-
-    // chaining of method calls
-    $smarty->setTemplateDir('./templates')
-           ->setCompileDir('./templates_c')
-           ->setCacheDir('./cache');
-
-    ?>
-
-       
-
-See also [`getTemplateDir()`](#api.get.template.dir),
-[`addTemplateDir()`](#api.add.template.dir) and
-[`$template_dir`](#variable.template.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md
deleted file mode 100644
index 07f61b12e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-template-exists.md
+++ /dev/null
@@ -1,59 +0,0 @@
-templateExists()
-
-checks whether the specified template exists
-
-Description
-===========
-
-bool
-
-templateExists
-
-string
-
-template
-
-It can accept either a path to the template on the filesystem or a
-resource string specifying the template.
-
-This example uses `$_GET['page']` to
-[`{include}`](#language.function.include) a content template. If the
-template does not exist then an error page is displayed instead. First
-the `page_container.tpl`
-
-
-    <html>
-    <head><title>{$title}</title></head>
-    <body>
-    {include file='page_top.tpl'}
-
-    {* include middle content page *}
-    {include file=$content_template}
-
-    {include file='page_footer.tpl'}
-    </body>
-
-      
-
-And the php script
-
-
-    <?php
-
-    // set the filename eg index.inc.tpl
-    $mid_template = $_GET['page'].'.inc.tpl';
-
-    if( !$smarty->templateExists($mid_template) ){
-        $mid_template = 'page_not_found.tpl';
-    }
-    $smarty->assign('content_template', $mid_template);
-
-    $smarty->display('page_container.tpl');
-
-    ?>
-
-      
-
-See also [`display()`](#api.display), [`fetch()`](#api.fetch),
-[`{include}`](#language.function.include) and
-[`{insert}`](#language.function.insert)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
deleted file mode 100644
index 3afe5ec1d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-test-install.md
+++ /dev/null
@@ -1,22 +0,0 @@
-testInstall()
-
-checks Smarty installation
-
-Description
-===========
-
-void
-
-testInstall
-
-This function verifies that all required working folders of the Smarty
-installation can be accessed. It does output a corresponding protocoll.
-
-
-    <?php
-    require_once('Smarty.class.php');
-    $smarty  = new Smarty();
-    $smarty->testInstall();
-    ?>
-
-       
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
deleted file mode 100644
index d097519db..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-cacheresource.md
+++ /dev/null
@@ -1,28 +0,0 @@
-unregisterCacheResource()
-
-dynamically unregister a CacheResource plugin
-
-Description
-===========
-
-void
-
-unregisterCacheResource
-
-string
-
-name
-
-Pass in the `name` of the CacheResource.
-
-
-    <?php
-
-    $smarty->unregisterCacheResource('mysql');
-
-    ?>
-
-       
-
-See also [`registerCacheResource()`](#api.register.cacheresource) and
-the [Custom CacheResource Implementation](#caching.custom) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
deleted file mode 100644
index 44020eb40..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-filter.md
+++ /dev/null
@@ -1,23 +0,0 @@
-unregisterFilter()
-
-dynamically unregister a filter
-
-Description
-===========
-
-void
-
-unregisterFilter
-
-string
-
-type
-
-string\|array
-
-callback
-
-Use this to dynamically unregister filters. It uses the following
-parameters:
-
-See also [`registerFilter()`](#api.register.filter).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
deleted file mode 100644
index c012581f9..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-object.md
+++ /dev/null
@@ -1,17 +0,0 @@
-unregisterObject()
-
-dynamically unregister an object
-
-Description
-===========
-
-void
-
-unregisterObject
-
-string
-
-object\_name
-
-See also [`registerObject()`](#api.register.object) and [objects
-section](#advanced.features.objects)
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
deleted file mode 100644
index c692ac60f..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-plugin.md
+++ /dev/null
@@ -1,36 +0,0 @@
-unregisterPlugin
-
-dynamically unregister plugins
-
-Description
-===========
-
-void
-
-unregisterPlugin
-
-string
-
-type
-
-string
-
-name
-
-This method unregisters plugins which previously have been registered by
-[registerPlugin()](#api.register.plugin), It uses the following
-parameters:
-
-<!-- -->
-
-
-    <?php
-
-    // we don't want template designers to have access to function plugin "date_now" 
-    $smarty->unregisterPlugin("function","date_now");
-
-    ?>
-
-       
-
-See also [`registerPlugin()`](#api.register.plugin).
diff --git a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md b/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
deleted file mode 100644
index 1a6067bd2..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-functions/api-unregister-resource.md
+++ /dev/null
@@ -1,28 +0,0 @@
-unregisterResource()
-
-dynamically unregister a resource plugin
-
-Description
-===========
-
-void
-
-unregisterResource
-
-string
-
-name
-
-Pass in the `name` of the resource.
-
-
-    <?php
-
-    $smarty->unregisterResource('db');
-
-    ?>
-
-       
-
-See also [`registerResource()`](#api.register.resource) and [template
-resources](#resources)
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables.md b/vendor/smarty/smarty/docs/programmers/api-variables.md
deleted file mode 100644
index 2fcf6e217..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables.md
+++ /dev/null
@@ -1,64 +0,0 @@
-Smarty Class Variables {#api.variables}
-======================
-
-These are all of the available Smarty class variables. You can access
-them directly, or use the corresponding setter/getter methods.
-
-- [$allow_php_templates](./api-variables/variable-allow-php-templates.md)
-- [$auto_literal](./api-variables/variable-auto-literal.md)
-- [$autoload_filters](./api-variables/variable-autoload-filters.md)
-- [$cache_dir](./api-variables/variable-cache-dir.md)
-- [$cache_id](./api-variables/variable-cache-id.md)
-- [$cache_lifetime](./api-variables/variable-cache-lifetime.md)
-- [$cache_locking](./api-variables/variable-cache-locking.md)
-- [$cache_modified_check](./api-variables/variable-cache-modified-check.md)
-- [$caching](./api-variables/variable-caching.md)
-- [$caching_type](./api-variables/variable-caching-type.md)
-- [$compile_check](./api-variables/variable-compile-check.md)
-- [$compile_dir](./api-variables/variable-compile-dir.md)
-- [$compile_id](./api-variables/variable-compile-id.md)
-- [$compile_locking](./api-variables/variable-compile-locking.md)
-- [$compiler_class](./api-variables/variable-compiler-class.md)
-- [$config_booleanize](./api-variables/variable-config-booleanize.md)
-- [$config_dir](./api-variables/variable-config-dir.md)
-- [$config_overwrite](./api-variables/variable-config-overwrite.md)
-- [$config_read_hidden](./api-variables/variable-config-read-hidden.md)
-- [$debug_tpl](./api-variables/variable-debug-template.md)
-- [$debugging](./api-variables/variable-debugging.md)
-- [$debugging_ctrl](./api-variables/variable-debugging-ctrl.md)
-- [$default_config_type](./api-variables/variable-default-config-type.md)
-- [$default_modifiers](./api-variables/variable-default-modifiers.md)
-- [$default_resource_type](./api-variables/variable-default-resource-type.md)
-- [$default_config_handler_func](./api-variables/variable-default-config-handler-func.md)
-- [$default_template_handler_func](./api-variables/variable-default-template-handler-func.md)
-- [$direct_access_security](./api-variables/variable-direct-access-security.md)
-- [$error_reporting](./api-variables/variable-error-reporting.md)
-- [$escape_html](./api-variables/variable-escape-html.md)
-- [$force_cache](./api-variables/variable-force-cache.md)
-- [$force_compile](./api-variables/variable-force-compile.md)
-- [$left_delimiter](./api-variables/variable-left-delimiter.md)
-- [$locking_timeout](./api-variables/variable-locking-timeout.md)
-- [$merge_compiled_includes](./api-variables/variable-merge-compiled-includes.md)
-- [$php_handling](./api-variables/variable-php-handling.md)
-- [$plugins_dir](./api-variables/variable-plugins-dir.md)
-- [$right_delimiter](./api-variables/variable-right-delimiter.md)
-- [$smarty_debug_id](./api-variables/variable-smarty-debug-id.md)
-- [$template_dir](./api-variables/variable-template-dir.md)
-- [$trusted_dir](./api-variables/variable-trusted-dir.md)
-- [$use_include_path](./api-variables/variable-use-include-path.md)
-- [$use_sub_dirs](./api-variables/variable-use-sub-dirs.md)
-
-> **Note**
->
-> All class variables have magic setter/getter methods available.
-> setter/getter methods are camelCaseFormat, unlike the variable itself.
-> So for example, you can set and get the \$smarty-\>template\_dir
-> variable with \$smarty-\>setTemplateDir(\$dir) and \$dir =
-> \$smarty-\>getTemplateDir() respectively.
-
-> **Note**
->
-> See
-> [`Changing settings by template`](./advanced-features/advanced-features-template-settings.md)
-> section for how to change Smarty class variables for individual
-> templates.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md
deleted file mode 100644
index e15520e2d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-allow-php-templates.md
+++ /dev/null
@@ -1,18 +0,0 @@
-\$allow\_php\_templates {#variable.allow.php.templates}
-=======================
-
-By default the PHP template file resource is disabled. Setting
-`$allow_php_templates` to TRUE will enable PHP template files.
-
-::: {.informalexample}
-
-    <?php
-    $smarty->allow_php_templates = true;
-    ?>
-
-            
-:::
-
-> **Note**
->
-> The PHP template file resource is an undocumented deprecated feature.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
deleted file mode 100644
index e5ddb34fc..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-auto-literal.md
+++ /dev/null
@@ -1,17 +0,0 @@
-\$auto\_literal {#variable.auto.literal}
-===============
-
-The Smarty delimiter tags { and } will be ignored so long as they are
-surrounded by white space. This behavior can be disabled by setting
-auto\_literal to false.
-
-::: {.informalexample}
-
-    <?php
-    $smarty->auto_literal = false;
-    ?>
-
-            
-:::
-
-See also [Escaping Smarty Parsing](#language.escaping),
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md
deleted file mode 100644
index 8a300b065..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-autoload-filters.md
+++ /dev/null
@@ -1,21 +0,0 @@
-\$autoload\_filters {#variable.autoload.filters}
-===================
-
-If there are some filters that you wish to load on every template
-invocation, you can specify them using this variable and Smarty will
-automatically load them for you. The variable is an associative array
-where keys are filter types and values are arrays of the filter names.
-For example:
-
-::: {.informalexample}
-
-    <?php
-    $smarty->autoload_filters = array('pre' => array('trim', 'stamp'),
-                                      'output' => array('convert'));
-    ?>
-
-            
-:::
-
-See also [`registerFilter()`](#api.register.filter) and
-[`loadFilter()`](#api.load.filter)
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
deleted file mode 100644
index 6cb2b5559..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-dir.md
+++ /dev/null
@@ -1,35 +0,0 @@
-\$cache\_dir {#variable.cache.dir}
-============
-
-This is the name of the directory where template caches are stored. By
-default this is `./cache`, meaning that Smarty will look for the
-`cache/` directory in the same directory as the executing php script.
-**This directory must be writeable by the web server**, [see
-install](#installing.smarty.basic) for more info.
-
-You can also use your own [custom cache implementation](#caching.custom)
-to control cache files, which will ignore this setting. See also
-[`$use_sub_dirs`](#variable.use.sub.dirs).
-
-> **Note**
->
-> This setting must be either a relative or absolute path. include\_path
-> is not used for writing files.
-
-> **Note**
->
-> It is not recommended to put this directory under the web server
-> document root.
-
-> **Note**
->
-> As of Smarty 3.1 the attribute \$cache\_dir is no longer accessible
-> directly. Use [`getCacheDir()`](#api.get.cache.dir) and
-> [`setCacheDir()`](#api.set.cache.dir) instead.
-
-See also [`getCacheDir()`](#api.get.cache.dir),
-[`setCacheDir()`](#api.set.cache.dir), [`$caching`](#variable.caching),
-[`$use_sub_dirs`](#variable.use.sub.dirs),
-[`$cache_lifetime`](#variable.cache.lifetime),
-[`$cache_modified_check`](#variable.cache.modified.check) and the
-[caching section](#caching).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
deleted file mode 100644
index c27fae921..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-id.md
+++ /dev/null
@@ -1,11 +0,0 @@
-\$cache\_id {#variable.cache.id}
-===========
-
-Persistent cache\_id identifier. As an alternative to passing the same
-`$cache_id` to each and every function call, you can set this
-`$cache_id` and it will be used implicitly thereafter.
-
-With a `$cache_id` you can have multiple cache files for a single call
-to [`display()`](#api.display) or [`fetch()`](#api.fetch) depending for
-example from different content of the same template. See the [caching
-section](#caching) for more information.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
deleted file mode 100644
index c9624b556..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-lifetime.md
+++ /dev/null
@@ -1,30 +0,0 @@
-\$cache\_lifetime {#variable.cache.lifetime}
-=================
-
-This is the length of time in seconds that a template cache is valid.
-Once this time has expired, the cache will be regenerated.
-
--   `$caching` must be turned on (either
-    Smarty::CACHING\_LIFETIME\_CURRENT or
-    Smarty::CACHING\_LIFETIME\_SAVED) for `$cache_lifetime` to have any
-    purpose.
-
--   A `$cache_lifetime` value of -1 will force the cache to never
-    expire.
-
--   A value of 0 will cause the cache to always regenerate (good for
-    testing only, to disable caching a more efficient method is to set
-    [`$caching`](#variable.caching) = Smarty::CACHING\_OFF).
-
--   If you want to give certain templates their own cache lifetime, you
-    could do this by setting [`$caching`](#variable.caching) =
-    Smarty::CACHING\_LIFETIME\_SAVED, then set `$cache_lifetime` to a
-    unique value just before calling [`display()`](#api.display) or
-    [`fetch()`](#api.fetch).
-
-If [`$force_compile`](#variable.force.compile) is enabled, the cache
-files will be regenerated every time, effectively disabling caching. You
-can clear all the cache files with the
-[`clear_all_cache()`](#api.clear.all.cache) function, or individual
-cache files (or groups) with the [`clear_cache()`](#api.clear.cache)
-function.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
deleted file mode 100644
index 6dca30c7b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-locking.md
+++ /dev/null
@@ -1,11 +0,0 @@
-\$cache\_locking {#variable.cache.locking}
-================
-
-Cache locking avoids concurrent cache generation. This means resource
-intensive pages can be generated only once, even if they\'ve been
-requested multiple times in the same moment.
-
-Cache locking is disabled by default. To enable it set `$cache_locking`
-to TRUE.
-
-See also [`$locking_timeout`](#variable.locking.timeout)
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
deleted file mode 100644
index 05e00bb91..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-cache-modified-check.md
+++ /dev/null
@@ -1,12 +0,0 @@
-\$cache\_modified\_check {#variable.cache.modified.check}
-========================
-
-If set to TRUE, Smarty will respect the If-Modified-Since header sent
-from the client. If the cached file timestamp has not changed since the
-last visit, then a `'304: Not Modified'` header will be sent instead of
-the content. This works only on cached content without
-[`{insert}`](#language.function.insert) tags.
-
-See also [`$caching`](#variable.caching),
-[`$cache_lifetime`](#variable.cache.lifetime), and the [caching
-section](#caching).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
deleted file mode 100644
index 22b88cf6a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching-type.md
+++ /dev/null
@@ -1,9 +0,0 @@
-\$caching\_type {#variable.caching.type}
-===============
-
-This property specifies the name of the caching handler to use. It
-defaults to `file`, enabling the internal filesystem based cache
-handler.
-
-See [Custom Cache Implementation](#caching.custom) for pointers on
-setting up your own cache handler.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
deleted file mode 100644
index 9377e3b6d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-caching.md
+++ /dev/null
@@ -1,38 +0,0 @@
-\$caching {#variable.caching}
-=========
-
-This tells Smarty whether or not to cache the output of the templates to
-the [`$cache_dir`](#variable.cache.dir). By default this is set to the
-constant Smarty::CACHING\_OFF. If your templates consistently generate
-the same content, it is advisable to turn on `$caching`, as this may
-result in significant performance gains.
-
-You can also have [multiple](#caching.multiple.caches) caches for the
-same template.
-
--   A constant value of Smarty::CACHING\_LIFETIME\_CURRENT or
-    Smarty::CACHING\_LIFETIME\_SAVED enables caching.
-
--   A value of Smarty::CACHING\_LIFETIME\_CURRENT tells Smarty to use
-    the current [`$cache_lifetime`](#variable.cache.lifetime) variable
-    to determine if the cache has expired.
-
--   A value of Smarty::CACHING\_LIFETIME\_SAVED tells Smarty to use the
-    [`$cache_lifetime`](#variable.cache.lifetime) value at the time the
-    cache was generated. This way you can set the
-    [`$cache_lifetime`](#variable.cache.lifetime) just before
-    [fetching](#api.fetch) the template to have granular control over
-    when that particular cache expires. See also
-    [`isCached()`](#api.is.cached).
-
--   If [`$compile_check`](#variable.compile.check) is enabled, the
-    cached content will be regenerated if any of the templates or config
-    files that are part of this cache are changed.
-
--   If [`$force_compile`](#variable.force.compile) is enabled, the
-    cached content will always be regenerated.
-
-See also [`$cache_dir`](#variable.cache.dir),
-[`$cache_lifetime`](#variable.cache.lifetime),
-[`$cache_modified_check`](#variable.cache.modified.check),
-[`is_cached()`](#api.is.cached) and the [caching section](#caching).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md
deleted file mode 100644
index c0582d4d4..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-check.md
+++ /dev/null
@@ -1,27 +0,0 @@
-\$compile\_check {#variable.compile.check}
-================
-
-Upon each invocation of the PHP application, Smarty tests to see if the
-current template has changed (different timestamp) since the last time
-it was compiled. If it has changed, it recompiles that template. If the
-template has yet not been compiled at all, it will compile regardless of
-this setting. By default this variable is set to TRUE.
-
-Once an application is put into production (ie the templates won\'t be
-changing), the compile check step is no longer needed. Be sure to set
-`$compile_check` to FALSE for maximum performance. Note that if you
-change this to FALSE and a template file is changed, you will \*not\*
-see the change since the template will not get recompiled.
-
-If [`$caching`](#variable.caching) is enabled and `$compile_check` is
-enabled, then the cache files will get regenerated if an involved
-template file or config file was updated.
-
-As of Smarty 3.1 `$compile_check` can be set to the value
-`Smarty::COMPILECHECK_CACHEMISS`. This enables Smarty to revalidate the
-compiled template, once a cache file is regenerated. So if there was a
-cached template, but it\'s expired, Smarty will run a single
-compile\_check before regenerating the cache.
-
-See [`$force_compile`](#variable.force.compile) and
-[`clearCompiledTemplate()`](#api.clear.compiled.tpl).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
deleted file mode 100644
index c18c9acba..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-dir.md
+++ /dev/null
@@ -1,29 +0,0 @@
-\$compile\_dir {#variable.compile.dir}
-==============
-
-This is the name of the directory where compiled templates are located.
-By default this is `./templates_c`, meaning that Smarty will look for
-the `templates_c/` directory in the same directory as the executing php
-script. **This directory must be writeable by the web server**, [see
-install](#installing.smarty.basic) for more info.
-
-> **Note**
->
-> This setting must be either a relative or absolute path. include\_path
-> is not used for writing files.
-
-> **Note**
->
-> It is not recommended to put this directory under the web server
-> document root.
-
-> **Note**
->
-> As of Smarty 3.1 the attribute \$compile\_dir is no longer accessible
-> directly. Use [`getCompileDir()`](#api.get.compile.dir) and
-> [`setCompileDir()`](#api.set.compile.dir) instead.
-
-See also [`getCompileDir()`](#api.get.compile.dir),
-[`setCompileDir()`](#api.set.compile.dir),
-[`$compile_id`](#variable.compile.id) and
-[`$use_sub_dirs`](#variable.use.sub.dirs).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
deleted file mode 100644
index c63f75ab9..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-id.md
+++ /dev/null
@@ -1,44 +0,0 @@
-\$compile\_id {#variable.compile.id}
-=============
-
-Persistant compile identifier. As an alternative to passing the same
-`$compile_id` to each and every function call, you can set this
-`$compile_id` and it will be used implicitly thereafter.
-
-If you use the same template with different [pre- and/or
-post-filters](#plugins.prefilters.postfilters) you must use a unique
-`$compile_id` to keep the compiled template files separated.
-
-For example a [prefilter](#plugins.prefilters.postfilters) that
-localizes your templates (that is: translates language dependend parts)
-at compile time, then you could use the current language as
-`$compile_id` and you will get a set of compiled templates for each
-language you use.
-
-
-    <?php
-    $smarty->compile_id = 'en';
-    ?>
-
-      
-
-Another application would be to use the same compile directory across
-multiple domains / multiple virtual hosts.
-
-
-    <?php
-
-    $smarty->compile_id = $_SERVER['SERVER_NAME'];
-    $smarty->compile_dir = '/path/to/shared_compile_dir';
-
-    ?>
-
-      
-
-> **Note**
->
-> In Smarty 3 a `$compile_id` is no longer required to keep templates
-> with same name in different [`$template_dir`
-> folders](#variable.template.dir) separated. The [`$template_dir` file
-> path](#variable.template.dir) is encoded in the file name of compiled
-> and cached template files.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
deleted file mode 100644
index ff7a66f3a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compile-locking.md
+++ /dev/null
@@ -1,7 +0,0 @@
-\$compile\_locking {#variable.compile.locking}
-==================
-
-Compile locking avoids concurrent compilation of the same template.
-
-Compile locking is enabled by default. To disable it set
-`$compile_locking` to FALSE.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
deleted file mode 100644
index 32ea982d6..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-compiler-class.md
+++ /dev/null
@@ -1,6 +0,0 @@
-\$compiler\_class {#variable.compiler.class}
-=================
-
-Specifies the name of the compiler class that Smarty will use to compile
-the templates. The default is \'Smarty\_Compiler\'. For advanced users
-only.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
deleted file mode 100644
index 4ba555f84..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-booleanize.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$config\_booleanize {#variable.config.booleanize}
-====================
-
-If set to TRUE, [config files](#config.files) values of `on/true/yes`
-and `off/false/no` get converted to boolean values automatically. This
-way you can use the values in the template like so:
-`{if #foobar#}...{/if}`. If foobar was `on`, `true` or `yes`, the `{if}`
-statement will execute. Defaults to TRUE.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
deleted file mode 100644
index d73f3274f..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-dir.md
+++ /dev/null
@@ -1,23 +0,0 @@
-\$config\_dir {#variable.config.dir}
-=============
-
-This is the directory used to store [config files](#config.files) used
-in the templates. Default is `./configs`, meaning that Smarty will look
-for the `configs/` directory in the same directory as the executing php
-script.
-
-> **Note**
->
-> It is not recommended to put this directory under the web server
-> document root.
-
-> **Note**
->
-> As of Smarty 3.1 the attribute \$config\_dir is no longer accessible
-> directly. Use [`getConfigDir()`](#api.get.config.dir),
-> [`setConfigDir()`](#api.set.config.dir) and
-> [`addConfigDir()`](#api.add.config.dir) instead.
-
-See also [`getConfigDir()`](#api.get.config.dir),
-[`setConfigDir()`](#api.set.config.dir) and
-[`addConfigDir()`](#api.add.config.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
deleted file mode 100644
index 0b8968374..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-overwrite.md
+++ /dev/null
@@ -1,40 +0,0 @@
-\$config\_overwrite {#variable.config.overwrite}
-===================
-
-If set to TRUE, the default then variables read in from [config
-files](#config.files) will overwrite each other. Otherwise, the
-variables will be pushed onto an array. This is helpful if you want to
-store arrays of data in config files, just list each element multiple
-times.
-
-This examples uses [`{cycle}`](#language.function.cycle) to output a
-table with alternating red/green/blue row colors with
-`$config_overwrite` = FALSE.
-
-The config file.
-
-
-    # row colors
-    rowColors = #FF0000
-    rowColors = #00FF00
-    rowColors = #0000FF
-
-        
-
-The template with a [`{section}`](#language.function.section) loop.
-
-
-    <table>
-      {section name=r loop=$rows}
-      <tr bgcolor="{cycle values=#rowColors#}">
-        <td> ....etc.... </td>
-      </tr>
-      {/section}
-    </table>
-
-        
-
-See also [`{config_load}`](#language.function.config.load),
-[`getConfigVars()`](#api.get.config.vars),
-[`clearConfig()`](#api.clear.config), [`configLoad()`](#api.config.load)
-and the [config files section](#config.files).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
deleted file mode 100644
index 19cde68bd..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-config-read-hidden.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$config\_read\_hidden {#variable.config.read.hidden}
-======================
-
-If set to TRUE, hidden sections ie section names beginning with a
-period(.) in [config files](#config.files) can be read from templates.
-Typically you would leave this FALSE, that way you can store sensitive
-data in the config files such as database parameters and not worry about
-the template loading them. FALSE by default.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
deleted file mode 100644
index faec0e171..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debug-template.md
+++ /dev/null
@@ -1,9 +0,0 @@
-\$debug\_tpl {#variable.debug_template}
-============
-
-This is the name of the template file used for the debugging console. By
-default, it is named `debug.tpl` and is located in the
-[`SMARTY_DIR`](#constant.smarty.dir).
-
-See also [`$debugging`](#variable.debugging) and the [debugging
-console](#chapter.debugging.console) section.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
deleted file mode 100644
index a9355c0a2..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging-ctrl.md
+++ /dev/null
@@ -1,20 +0,0 @@
-\$debugging\_ctrl {#variable.debugging.ctrl}
-=================
-
-This allows alternate ways to enable debugging. `NONE` means no
-alternate methods are allowed. `URL` means when the keyword
-`SMARTY_DEBUG` is found in the `QUERY_STRING`, debugging is enabled for
-that invocation of the script. If [`$debugging`](#variable.debugging) is
-TRUE, this value is ignored.
-
-
-    <?php
-    // shows debug console only on localhost ie
-    // http://localhost/script.php?foo=bar&SMARTY_DEBUG
-    $smarty->debugging = false; // the default
-    $smarty->debugging_ctrl = ($_SERVER['SERVER_NAME'] == 'localhost') ? 'URL' : 'NONE';
-    ?>
-
-See also [debugging console](#chapter.debugging.console) section,
-[`$debugging`](#variable.debugging) and
-[`$smarty_debug_id`](#variable.smarty.debug.id).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
deleted file mode 100644
index 4473e0c8d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-debugging.md
+++ /dev/null
@@ -1,17 +0,0 @@
-\$debugging {#variable.debugging}
-===========
-
-This enables the [debugging console](#chapter.debugging.console). The
-console is a javascript popup window that informs you of the
-[included](#language.function.include) templates, variables
-[assigned](#api.assign) from php and [config file
-variables](#language.config.variables) for the current script. It does
-not show variables assigned within a template with the
-[`{assign}`](#language.function.assign) function.
-
-The console can also be enabled from the url with
-[`$debugging_ctrl`](#variable.debugging.ctrl).
-
-See also [`{debug}`](#language.function.debug),
-[`$debug_tpl`](#variable.debug_template), and
-[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
deleted file mode 100644
index 0d6ec5e0d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-handler-func.md
+++ /dev/null
@@ -1,50 +0,0 @@
-\$default\_config\_handler\_func {#variable.default.config.handler.func}
-================================
-
-This function is called when a config file cannot be obtained from its
-resource.
-
-> **Note**
->
-> The default handler is currently only invoked for file resources. It
-> is not triggered when the resource itself cannot be found, in which
-> case a SmartyException is thrown.
-
-
-    <?php
-
-    $smarty = new Smarty();
-    $smarty->default_config_handler_func = 'my_default_config_handler_func';
-
-    /**
-     * Default Config Handler
-     *
-     * called when Smarty's file: resource is unable to load a requested file
-     * 
-     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
-     * @param string   $name     resource name (e.g. "foo/bar.tpl")
-     * @param string  &$content  config's content
-     * @param integer &$modified config's modification time
-     * @param Smarty   $smarty   Smarty instance
-     * @return string|boolean   path to file or boolean true if $content and $modified 
-     *                          have been filled, boolean false if no default config 
-     *                          could be loaded
-     */
-    function my_default_config_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
-        if (false) {
-            // return corrected filepath
-            return "/tmp/some/foobar.tpl";
-        } elseif (false) {
-            // return a config directly
-            $content = 'someVar = "the config source"';
-            $modified = time();
-            return true;
-        } else {
-            // tell smarty that we failed
-            return false;
-        }
-    }
-
-    ?>
-
-      
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
deleted file mode 100644
index 60bf9f1ea..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-config-type.md
+++ /dev/null
@@ -1,7 +0,0 @@
-\$default\_config\_type {#variable.default.config.type}
-=======================
-
-This tells smarty what resource type to use for config files. The
-default value is `file`, meaning that `$smarty->configLoad('test.conf')`
-and `$smarty->configLoad('file:test.conf')` are identical in meaning.
-See the [resource](#resources) chapter for more details.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
deleted file mode 100644
index c6b73eb12..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-modifiers.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$default\_modifiers {#variable.default.modifiers}
-====================
-
-This is an array of modifiers to implicitly apply to every variable in a
-template. For example, to HTML-escape every variable by default, use
-`array('escape:"htmlall"')`. To make a variable exempt from default
-modifiers, add the \'nofilter\' attribute to the output tag such as
-`{$var nofilter}`.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
deleted file mode 100644
index e8a803178..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-resource-type.md
+++ /dev/null
@@ -1,7 +0,0 @@
-\$default\_resource\_type {#variable.default.resource.type}
-=========================
-
-This tells smarty what resource type to use implicitly. The default
-value is `file`, meaning that `$smarty->display('index.tpl')` and
-`$smarty->display('file:index.tpl')` are identical in meaning. See the
-[resource](#resources) chapter for more details.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
deleted file mode 100644
index d8fcbb1ad..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-default-template-handler-func.md
+++ /dev/null
@@ -1,50 +0,0 @@
-\$default\_template\_handler\_func {#variable.default.template.handler.func}
-==================================
-
-This function is called when a template cannot be obtained from its
-resource.
-
-> **Note**
->
-> The default handler is currently only invoked for file resources. It
-> is not triggered when the resource itself cannot be found, in which
-> case a SmartyException is thrown.
-
-
-    <?php
-
-    $smarty = new Smarty();
-    $smarty->default_template_handler_func = 'my_default_template_handler_func';
-
-    /**
-     * Default Template Handler
-     *
-     * called when Smarty's file: resource is unable to load a requested file
-     * 
-     * @param string   $type     resource type (e.g. "file", "string", "eval", "resource")
-     * @param string   $name     resource name (e.g. "foo/bar.tpl")
-     * @param string  &$content  template's content
-     * @param integer &$modified template's modification time
-     * @param Smarty   $smarty   Smarty instance
-     * @return string|boolean   path to file or boolean true if $content and $modified 
-     *                          have been filled, boolean false if no default template 
-     *                          could be loaded
-     */
-    function my_default_template_handler_func($type, $name, &$content, &$modified, Smarty $smarty) {
-        if (false) {
-            // return corrected filepath
-            return "/tmp/some/foobar.tpl";
-        } elseif (false) {
-            // return a template directly
-            $content = "the template source";
-            $modified = time();
-            return true;
-        } else {
-            // tell smarty that we failed
-            return false;
-        }
-    }
-
-    ?>
-
-      
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md
deleted file mode 100644
index f471f5de0..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-direct-access-security.md
+++ /dev/null
@@ -1,13 +0,0 @@
-\$direct\_access\_security {#variable.direct.access.security}
-==========================
-
-Direct access security inhibits direct browser access to compiled or
-cached template files.
-
-Direct access security is enabled by default. To disable it set
-`$direct_access_security` to FALSE.
-
-> **Note**
->
-> This is a compile time option. If you change the setting you must make
-> sure that the templates get recompiled.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
deleted file mode 100644
index eec7894da..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-error-reporting.md
+++ /dev/null
@@ -1,17 +0,0 @@
-\$error\_reporting {#variable.error.reporting}
-==================
-
-When this value is set to a non-null-value it\'s value is used as php\'s
-[`error_reporting`](&url.php-manual;error_reporting) level inside of
-[`display()`](#api.display) and [`fetch()`](#api.fetch).
-
-Smarty 3.1.2 introduced the
-[`muteExpectedErrors()`](#api.mute.expected.errors) function. Calling
-`Smarty::muteExpectedErrors();` after setting up custom error handling
-will ensure that warnings and notices (deliberately) produced by Smarty
-will not be passed to other custom error handlers. If your error logs
-are filling up with warnings regarding `filemtime()` or `unlink()`
-calls, please enable Smarty\'s error muting.
-
-See also [debugging](#chapter.debugging.console) and
-[troubleshooting](#troubleshooting).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
deleted file mode 100644
index 39ff28027..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-escape-html.md
+++ /dev/null
@@ -1,21 +0,0 @@
-\$escape\_html {#variable.escape.html}
-==============
-
-Setting `$escape_html` to TRUE will escape all template variable output
-by wrapping it in
-`htmlspecialchars({$output}, ENT_QUOTES, SMARTY_RESOURCE_CHAR_SET);`,
-which is the same as `{$variable|escape:"html"}`.
-
-Template designers can choose to selectively disable this feature by
-adding the `nofilter` flag: `{$variable nofilter}`.
-
-Modifiers and Filters are run in the following order: modifier,
-default\_modifier, \$escape\_html, registered variable filters,
-autoloaded variable filters, template instance\'s variable filters.
-Everything except the individual modifier can be disabled with the
-`nofilter` flag.
-
-> **Note**
->
-> This is a compile time option. If you change the setting you must make
-> sure that the templates get recompiled.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
deleted file mode 100644
index de0c0c15a..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-cache.md
+++ /dev/null
@@ -1,6 +0,0 @@
-\$force\_cache {#variable.force.cache}
-==============
-
-This forces Smarty to (re)cache templates on every invocation. It does
-not override the [`$caching`](#variable.caching) level, but merely
-pretends the template has never been cached before.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
deleted file mode 100644
index 73f1e792d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-force-compile.md
+++ /dev/null
@@ -1,9 +0,0 @@
-\$force\_compile {#variable.force.compile}
-================
-
-This forces Smarty to (re)compile templates on every invocation. This
-setting overrides [`$compile_check`](#variable.compile.check). By
-default this is FALSE. This is handy for development and
-[debugging](#chapter.debugging.console). It should never be used in a
-production environment. If [`$caching`](#variable.caching) is enabled,
-the cache file(s) will be regenerated every time.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md
deleted file mode 100644
index bcc13f0e5..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-left-delimiter.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$left\_delimiter {#variable.left.delimiter}
-=================
-
-This is the left delimiter used by the template language. Default is
-`{`.
-
-See also [`$right_delimiter`](#variable.right.delimiter) and [escaping
-smarty parsing](#language.escaping) .
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
deleted file mode 100644
index fdfdc087e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-locking-timeout.md
+++ /dev/null
@@ -1,7 +0,0 @@
-\$locking\_timeout {#variable.locking.timeout}
-==================
-
-This is maximum time in seconds a cache lock is valid to avoid dead
-locks. The deafult value is 10 seconds.
-
-See also [`$cache_locking`](#variable.cache.locking)
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
deleted file mode 100644
index 8220c442b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-merge-compiled-includes.md
+++ /dev/null
@@ -1,27 +0,0 @@
-\$merge\_compiled\_includes {#variable.merge.compiled.includes}
-===========================
-
-By setting `$merge_compiled_includes` to TRUE Smarty will merge the
-compiled template code of subtemplates into the compiled code of the
-main template. This increases rendering speed of templates using a many
-different sub-templates.
-
-Individual sub-templates can be merged by setting the `inline` option
-flag within the `{include}` tag. `$merge_compiled_includes` does not
-have to be enabled for the `inline` merge.
-
-::: {.informalexample}
-
-    <?php
-    $smarty->merge_compiled_includes = true;
-    ?>
-
-            
-:::
-
-> **Note**
->
-> This is a compile time option. If you change the setting you must make
-> sure that the templates get recompiled.
-
-See also [`{include}`](#language.function.include) tag
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-php-handling.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-php-handling.md
deleted file mode 100644
index 574ea6d55..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-php-handling.md
+++ /dev/null
@@ -1,21 +0,0 @@
-\$php\_handling {#variable.php.handling}
-===============
-
-This tells Smarty how to handle PHP code embedded in the templates.
-There are four possible settings, the default being
-`Smarty::PHP_PASSTHRU`. Note that this does NOT affect php code within
-[`{php}{/php}`](#language.function.php) tags in the template.
-
--   `Smarty::PHP_PASSTHRU` - Smarty echos tags as-is.
-
--   `Smarty::PHP_QUOTE` - Smarty quotes the tags as html entities.
-
--   `Smarty::PHP_REMOVE` - Smarty removes the tags from the templates.
-
--   `Smarty::PHP_ALLOW` - Smarty will execute the tags as PHP code.
-
-> **Note**
->
-> Embedding PHP code into templates is highly discouraged. Use [custom
-> functions](#plugins.functions) or [modifiers](#plugins.modifiers)
-> instead.
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md
deleted file mode 100644
index 8a7cfcdb2..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-plugins-dir.md
+++ /dev/null
@@ -1,28 +0,0 @@
-\$plugins\_dir {#variable.plugins.dir}
-==============
-
-This is the directory or directories where Smarty will look for the
-plugins that it needs. Default is `plugins/` under the
-[`SMARTY_DIR`](#constant.smarty.dir). If you supply a relative path,
-Smarty will first look under the [`SMARTY_DIR`](#constant.smarty.dir),
-then relative to the current working directory, then relative to the PHP
-include\_path. If `$plugins_dir` is an array of directories, Smarty will
-search for your plugin in each plugin directory **in the order they are
-given**.
-
-> **Note**
->
-> For best performance, do not setup your `$plugins_dir` to have to use
-> the PHP include path. Use an absolute pathname, or a path relative to
-> `SMARTY_DIR` or the current working directory.
-
-> **Note**
->
-> As of Smarty 3.1 the attribute \$plugins\_dir is no longer accessible
-> directly. Use [`getPluginsDir()`](#api.get.plugins.dir),
-> [`setPluginsDir()`](#api.set.plugins.dir) and
-> [`addPluginsDir()`](#api.add.plugins.dir) instead.
-
-See also [`getPluginsDir()`](#api.get.plugins.dir),
-[`setPluginsDir()`](#api.set.plugins.dir) and
-[`addPluginsDir()`](#api.add.plugins.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md
deleted file mode 100644
index 14a9b568e..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-right-delimiter.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$right\_delimiter {#variable.right.delimiter}
-==================
-
-This is the right delimiter used by the template language. Default is
-`}`.
-
-See also [`$left_delimiter`](#variable.left.delimiter) and [escaping
-smarty parsing](#language.escaping).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
deleted file mode 100644
index 0733ed518..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-smarty-debug-id.md
+++ /dev/null
@@ -1,9 +0,0 @@
-\$smarty\_debug\_id {#variable.smarty.debug.id}
-===================
-
-The value of `$smarty_debug_id` defines the URL keyword to enable
-debugging at browser level. The default value is `SMARTY_DEBUG`.
-
-See also [debugging console](#chapter.debugging.console) section,
-[`$debugging`](#variable.debugging) and
-[`$debugging_ctrl`](#variable.debugging.ctrl).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
deleted file mode 100644
index e49578b1b..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-template-dir.md
+++ /dev/null
@@ -1,36 +0,0 @@
-\$template\_dir {#variable.template.dir}
-===============
-
-This is the name of the default template directory. If you do not supply
-a resource type when including files, they will be found here. By
-default this is `./templates`, meaning that Smarty will look for the
-`templates/` directory in the same directory as the executing php
-script. \$template\_dir can also be an array of directory paths: Smarty
-will traverse the directories and stop on the first matching template
-found.
-
-> **Note**
->
-> It is not recommended to put this directory under the web server
-> document root.
-
-> **Note**
->
-> If the directories known to `$template_dir` are relative to
-> directories known to the
-> [include\_path](&url.php-manual;ini.core.php#ini.include-path) you
-> need to activate the [`$use_include_path`](#variable.use.include.path)
-> option.
-
-> **Note**
->
-> As of Smarty 3.1 the attribute \$template\_dir is no longer accessible
-> directly. Use [`getTemplateDir()`](#api.get.template.dir),
-> [`setTemplateDir()`](#api.set.template.dir) and
-> [`addTemplateDir()`](#api.add.template.dir) instead.
-
-See also [`Template Resources`](#resources),
-[`$use_include_path`](#variable.use.include.path),
-[`getTemplateDir()`](#api.get.template.dir),
-[`setTemplateDir()`](#api.set.template.dir) and
-[`addTemplateDir()`](#api.add.template.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md
deleted file mode 100644
index 3d1a308fa..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-trusted-dir.md
+++ /dev/null
@@ -1,8 +0,0 @@
-\$trusted\_dir {#variable.trusted.dir}
-==============
-
-`$trusted_dir` is only for use when security is enabled. This is an
-array of all directories that are considered trusted. Trusted
-directories are where you keep php scripts that are executed directly
-from the templates with
-[`{include_php}`](#language.function.include.php).
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md
deleted file mode 100644
index 103a9767d..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-include-path.md
+++ /dev/null
@@ -1,49 +0,0 @@
-\$use\_include\_path {#variable.use.include.path}
-====================
-
-This tells smarty to respect the
-[include\_path](&url.php-manual;ini.core.php#ini.include-path) within
-the [`File Template Resource`](#resources.file) handler and the plugin
-loader to resolve the directories known to
-[`$template_dir`](#variable.template.dir). The flag also makes the
-plugin loader check the include\_path for
-[`$plugins_dir`](#variable.plugins.dir).
-
-> **Note**
->
-> You should not design your applications to rely on the include\_path,
-> as this may - depending on your implementation - slow down your system
-> (and Smarty) considerably.
-
-If use\_include\_path is enabled, file discovery for
-[`$template_dir`](#variable.template.dir) and
-[`$plugins_dir`](#variable.plugins.dir) work as follows.
-
--   For each element `$directory` in array (\$template\_dir or
-    \$plugins\_dir) do
-
--   Test if requested file is in `$directory` relative to the [current
-    working directory](&url.php-manual;function.getcwd.php). If file
-    found, return it.
-
--   For each `$path` in include\_path do
-
--   Test if requested file is in `$directory` relative to the `$path`
-    (possibly relative to the [current working
-    directory](&url.php-manual;function.getcwd.php)). If file found,
-    return it.
-
--   Try default\_handler or fail.
-
-This means that whenever a directory/file relative to the current
-working directory is encountered, it is preferred over anything
-potentially accessible through the include\_path.
-
-> **Note**
->
-> Smarty does not filter elements of the include\_path. That means a
-> \".:\" within your include path will trigger the current working
-> directory lookup twice.
-
-See also [`Template Resources`](#resources) and
-[`$template_dir`](#variable.template.dir)
diff --git a/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md b/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
deleted file mode 100644
index a95ac4159..000000000
--- a/vendor/smarty/smarty/docs/programmers/api-variables/variable-use-sub-dirs.md
+++ /dev/null
@@ -1,31 +0,0 @@
-\$use\_sub\_dirs {#variable.use.sub.dirs}
-================
-
-Smarty will create subdirectories under the [compiled
-templates](#variable.compile.dir) and [cache](#variable.cache.dir)
-directories if `$use_sub_dirs` is set to TRUE, default is FALSE. In an
-environment where there are potentially tens of thousands of files
-created, this may help the filesystem speed. On the other hand, some
-environments do not allow PHP processes to create directories, so this
-must be disabled which is the default.
-
-Sub directories are more efficient, so use them if you can.
-Theoretically you get much better perfomance on a filesystem with 10
-directories each having 100 files, than with 1 directory having 1000
-files. This was certainly the case with Solaris 7 (UFS)\... with newer
-filesystems such as ext3 and especially reiserfs, the difference is
-almost nothing.
-
-> **Note**
->
-> -   `$use_sub_dirs=true` doesn\'t work with
->     [safe\_mode=On](&url.php-manual;features.safe-mode), that\'s why
->     it\'s switchable and why it\'s off by default.
->
-> -   `$use_sub_dirs=true` on Windows can cause problems.
->
-> -   Safe\_mode is being deprecated in PHP6.
->
-See also [`$compile_id`](#variable.compile.id),
-[`$cache_dir`](#variable.cache.dir), and
-[`$compile_dir`](#variable.compile.dir).
diff --git a/vendor/smarty/smarty/docs/programmers/caching.md b/vendor/smarty/smarty/docs/programmers/caching.md
deleted file mode 100644
index 5656b71b5..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Caching
-=======
-
-Caching is used to speed up a call to [`display()`](./api-functions/api-display.md) or
-[`fetch()`](./api-functions/api-fetch.md) by saving its output to a file. If a cached
-version of the call is available, that is displayed instead of
-regenerating the output. Caching can speed things up tremendously,
-especially templates with longer computation times. Since the output of
-[`display()`](./api-functions/api-display.md) or [`fetch()`](./api-functions/api-fetch.md) is cached, one
-cache file could conceivably be made up of several template files,
-config files, etc.
-
-Since templates are dynamic, it is important to be careful what you are
-caching and for how long. For instance, if you are displaying the front
-page of your website that does not change its content very often, it
-might work well to cache this page for an hour or more. On the other
-hand, if you are displaying a page with a timetable containing new
-information by the minute, it would not make sense to cache this page.
-
-## Table of contents
-- [Setting Up Caching](./caching/caching-setting-up.md)
-- [Multiple Caches Per Page](./caching/caching-multiple-caches.md)
-- [Controlling Cacheability of Output](./caching/caching-groups.md)
-- [Custom Cache Implementation](./caching/caching-custom.md)
diff --git a/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md b/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md
deleted file mode 100644
index ee9b60090..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching/caching-cacheable.md
+++ /dev/null
@@ -1,176 +0,0 @@
-Controlling Cacheability of Output {#caching.cacheable}
-==================================
-
-If caching is enabled normally the whole final output of the page gets
-cached. However Smarty3 offers several options how to exclude sections
-of your output from caching.
-
-> **Note**
->
-> Be sure any variables used within a non-cached section are also
-> assigned from PHP when the page is loaded from the cache.
-
-Cacheability of Template Section {#cacheability.sections}
---------------------------------
-
-A larger section of your template can easily excluded from caching by
-using the [`{nocache}`](#language.function.nocache) and
-[`{/nocache}`](#language.function.nocache) tags.
-
-
-
-    Today's date is
-    {nocache}
-    {$smarty.now|date_format}
-    {/nocache}
-
-       
-
-The above code will output the current date on a cached page.
-
-Cacheability of Tags {#cacheability.tags}
---------------------
-
-Caching for an individual tag can be disabled by adding the \"nocache\"
-option flag to the tag.
-
-
-    Today's date is
-    {$smarty.now|date_format nocache}
-
-        
-
-Cacheability of Variables {#cacheability.variables}
--------------------------
-
-You can [`assign()`](#api.assign) variables as not cachable. Any tag
-which uses such variable will be automatically executed in nocache mode.
-
-> **Note**
->
-> If a tag is executed in nocache mode you must make sure that all other
-> variables used by that tag are also assigned from PHP when the page is
-> loaded from the cache.
-
-> **Note**
->
-> The nocache status of an assigned variable will effect the compiled
-> template code. If you change the status you must manually delete
-> existing compiled and cached template files to force a recompile.
-
-
-    // assign $foo as nocahe variable
-    $smarty->assign('foo',time(),true);
-
-
-    Dynamic time value is {$foo}
-
-        
-
-Cacheability of Plugins {#cacheability.plugins}
------------------------
-
-The cacheability of plugins can be declared when registering them. The
-third parameter to [`registerPlugin()`](#api.register.plugin) is called
-`$cacheable` and defaults to TRUE.
-
-When registering a plugin with `$cacheable=false` the plugin is called
-everytime the page is displayed, even if the page comes from the cache.
-The plugin function behaves a little like an
-[`{insert}`](#plugins.inserts) function.
-
-> **Note**
->
-> The `$cacheable` status will effect the compiled template code. If you
-> change the status you must manually delete existing compiled and
-> cached template files to force a recompile.
-
-In contrast to [`{insert}`](#plugins.inserts) the attributes to the
-plugins are not cached by default. They can be declared to be cached
-with the fourth parameter `$cache_attrs`. `$cache_attrs` is an array of
-attribute-names that should be cached, so the plugin-function get value
-as it was the time the page was written to cache everytime it is fetched
-from the cache.
-
-
-    <?php
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    function remaining_seconds($params, $smarty) {
-        $remain = $params['endtime'] - time();
-        if($remain >= 0){
-            return $remain . ' second(s)';
-        }else{
-            return 'done';
-        }
-    }
-
-    $smarty->registerPlugin('function','remaining', 'remaining_seconds', false, array('endtime'));
-
-    if (!$smarty->isCached('index.tpl')) {
-        // fetch $obj from db and assign...
-        $smarty->assignByRef('obj', $obj);
-    }
-
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-where `index.tpl` is:
-
-
-    Time Remaining: {remaining endtime=$obj->endtime}
-
-       
-
-The number of seconds till the endtime of `$obj` is reached changes on
-each display of the page, even if the page is cached. Since the endtime
-attribute is cached the object only has to be pulled from the database
-when page is written to the cache but not on subsequent requests of the
-page.
-
-
-    index.php:
-
-    <?php
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    function smarty_block_dynamic($param, $content, $smarty) {
-        return $content;
-    }
-    $smarty->registerPlugin('block','dynamic', 'smarty_block_dynamic', false);
-
-    $smarty->display('index.tpl');
-    ?>
-
-       
-
-where `index.tpl` is:
-
-
-    Page created: {'0'|date_format:'%D %H:%M:%S'}
-
-    {dynamic}
-
-    Now is: {'0'|date_format:'%D %H:%M:%S'}
-
-    ... do other stuff ...
-
-    {/dynamic}
-
-       
-
-When reloading the page you will notice that both dates differ. One is
-"dynamic" one is "static". You can do everything between
-`{dynamic}...{/dynamic}` and be sure it will not be cached like the rest
-of the page.
-
-> **Note**
->
-> The above example shall just demonstrate how a dynamic block plugins
-> works. See
-> [`Cacheability of Template Section`](#cacheability.sections) on how to
-> disable caching of a template section by the built-in
-> [`{nocache}`](#language.function.nocache) and
-> [`{/nocache}`](#language.function.nocache) tags.
diff --git a/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md b/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md
deleted file mode 100644
index 77d2ce7b3..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching/caching-custom.md
+++ /dev/null
@@ -1,296 +0,0 @@
-Custom Cache Implementation {#caching.custom}
-===========================
-
-As an alternative to using the default file-based caching mechanism, you
-can specify a custom cache implementation that will be used to read,
-write and clear cached files.
-
-> **Note**
->
-> In Smarty2 this used to be a callback function called
-> `$cache_handler_func`. Smarty3 replaced this callback by the
-> `Smarty_CacheResource` module.
-
-With a custom cache implementation you\'re likely trying to achieve at
-least one of the following goals: replace the slow filesystem by a
-faster storage engine, centralize the cache to be accessible to multiple
-servers.
-
-Smarty allows CacheResource implementations to use one of the APIs
-`Smarty_CacheResource_Custom` or `Smarty_CacheResource_KeyValueStore`.
-`Smarty_CacheResource_Custom` is a simple API directing all read, write,
-clear calls to your implementation. This API allows you to store
-wherever and however you deem fit. The
-`Smarty_CacheResource_KeyValueStore` API allows you to turn any \"dumb\"
-KeyValue-Store (like APC, Memcache, ...) into a full-featured
-CacheResource implementation. That is, everything around deep
-cache-groups like \"a\|b\|c\" is being handled for you in way that
-allows clearing the cache-group \"a\" and all nested groups are cleared
-as well - even though KeyValue-Stores don\'t allow this kind of
-hierarchy by nature.
-
-Custom CacheResources may be put in a file `cacheresource.foobarxyz.php`
-within your [`$plugins_dir`](#variable.plugins.dir), or registered on
-runtime with [`registerCacheResource()`](#api.register.cacheresource).
-In either case you need to set [`$caching_type`](#variable.caching.type)
-to invoke your custom CacheResource implementation.
-
-
-    <?php
-
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-    $smarty->caching_type = 'mysql';
-
-    /**
-     * MySQL CacheResource
-     *
-     * CacheResource Implementation based on the Custom API to use
-     * MySQL as the storage resource for Smarty's output caching.
-     *
-     * Table definition:
-     * <pre>CREATE TABLE IF NOT EXISTS `output_cache` (
-     *   `id` CHAR(40) NOT NULL COMMENT 'sha1 hash',
-     *   `name` VARCHAR(250) NOT NULL,
-     *   `cache_id` VARCHAR(250) NULL DEFAULT NULL,
-     *   `compile_id` VARCHAR(250) NULL DEFAULT NULL,
-     *   `modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-     *   `content` LONGTEXT NOT NULL,
-     *   PRIMARY KEY (`id`),
-     *   INDEX(`name`),
-     *   INDEX(`cache_id`),
-     *   INDEX(`compile_id`),
-     *   INDEX(`modified`)
-     * ) ENGINE = InnoDB;</pre>
-     *
-     * @package CacheResource-examples
-     * @author Rodney Rehm
-     */
-    class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom {
-        // PDO instance
-        protected $db;
-        protected $fetch;
-        protected $fetchTimestamp;
-        protected $save;
-        
-        public function __construct() {
-            try {
-                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
-            } catch (PDOException $e) {
-                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-            }
-            $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
-            $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-            $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-                VALUES  (:id, :name, :cache_id, :compile_id, :content)');
-        }
-
-        /**
-         * fetch cached content and its modification time from data source
-         *
-         * @param string $id unique cache content identifier
-         * @param string $name template name
-         * @param string $cache_id cache id
-         * @param string $compile_id compile id
-         * @param string $content cached content
-         * @param integer $mtime cache modification timestamp (epoch)
-         * @return void
-         */
-        protected function fetch($id, $name, $cache_id, $compile_id, &$content, &$mtime)
-        {
-            $this->fetch->execute(array('id' => $id));
-            $row = $this->fetch->fetch();
-            $this->fetch->closeCursor();        
-            if ($row) {
-                $content = $row['content'];
-                $mtime = strtotime($row['modified']);
-            } else {
-                $content = null;
-                $mtime = null;
-            }
-        }
-        
-        /**
-         * Fetch cached content's modification timestamp from data source
-         *
-         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
-         * @param string $id unique cache content identifier
-         * @param string $name template name
-         * @param string $cache_id cache id
-         * @param string $compile_id compile id
-         * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
-         */
-        protected function fetchTimestamp($id, $name, $cache_id, $compile_id)
-        {
-            $this->fetchTimestamp->execute(array('id' => $id));
-            $mtime = strtotime($this->fetchTimestamp->fetchColumn());
-            $this->fetchTimestamp->closeCursor();
-            return $mtime;
-        }
-        
-        /**
-         * Save content to cache
-         *
-         * @param string $id unique cache content identifier
-         * @param string $name template name
-         * @param string $cache_id cache id
-         * @param string $compile_id compile id
-         * @param integer|null $exp_time seconds till expiration time in seconds or null
-         * @param string $content content to cache
-         * @return boolean success
-         */
-        protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
-        {
-            $this->save->execute(array(
-                'id' => $id,
-                'name' => $name,
-                'cache_id' => $cache_id,
-                'compile_id' => $compile_id,
-                'content' => $content,
-            ));
-            return !!$this->save->rowCount();
-        }
-        
-        /**
-         * Delete content from cache
-         *
-         * @param string $name template name
-         * @param string $cache_id cache id
-         * @param string $compile_id compile id
-         * @param integer|null $exp_time seconds till expiration or null
-         * @return integer number of deleted caches
-         */
-        protected function delete($name, $cache_id, $compile_id, $exp_time)
-        {
-            // delete the whole cache
-            if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-                // returning the number of deleted caches would require a second query to count them
-                $query = $this->db->query('TRUNCATE TABLE output_cache');
-                return -1;
-            }
-            // build the filter
-            $where = array();
-            // equal test name
-            if ($name !== null) {
-                $where[] = 'name = ' . $this->db->quote($name);
-            }
-            // equal test compile_id
-            if ($compile_id !== null) {
-                $where[] = 'compile_id = ' . $this->db->quote($compile_id);
-            }
-            // range test expiration time
-            if ($exp_time !== null) {
-                $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
-            }
-            // equal test cache_id and match sub-groups
-            if ($cache_id !== null) {
-                $where[] = '(cache_id = '. $this->db->quote($cache_id)
-                    . ' OR cache_id LIKE '. $this->db->quote($cache_id .'|%') .')';
-            }
-            // run delete query
-            $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
-            return $query->rowCount();
-        }
-    }
-
-       
-
-
-    <?php
-
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-    $smarty->caching_type = 'memcache';
-
-    /**
-     * Memcache CacheResource
-     *
-     * CacheResource Implementation based on the KeyValueStore API to use
-     * memcache as the storage resource for Smarty's output caching.
-     *
-     * Note that memcache has a limitation of 256 characters per cache-key.
-     * To avoid complications all cache-keys are translated to a sha1 hash.
-     *
-     * @package CacheResource-examples
-     * @author Rodney Rehm
-     */
-    class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore {
-        /**
-         * memcache instance
-         * @var Memcache
-         */
-        protected $memcache = null;
-        
-        public function __construct()
-        {
-            $this->memcache = new Memcache();
-            $this->memcache->addServer( '127.0.0.1', 11211 );
-        }
-        
-        /**
-         * Read values for a set of keys from cache
-         *
-         * @param array $keys list of keys to fetch
-         * @return array list of values with the given keys used as indexes
-         * @return boolean true on success, false on failure
-         */
-        protected function read(array $keys)
-        {
-            $_keys = $lookup = array();
-            foreach ($keys as $k) {
-                $_k = sha1($k);
-                $_keys[] = $_k;
-                $lookup[$_k] = $k;
-            }
-            $_res = array();
-            $res = $this->memcache->get($_keys);
-            foreach ($res as $k => $v) {
-                $_res[$lookup[$k]] = $v;
-            }
-            return $_res;
-        }
-        
-        /**
-         * Save values for a set of keys to cache
-         *
-         * @param array $keys list of values to save
-         * @param int $expire expiration time
-         * @return boolean true on success, false on failure
-         */
-        protected function write(array $keys, $expire=null)
-        {
-            foreach ($keys as $k => $v) {
-                $k = sha1($k);
-                $this->memcache->set($k, $v, 0, $expire);
-            }
-            return true;
-        }
-
-        /**
-         * Remove values from cache
-         *
-         * @param array $keys list of keys to delete
-         * @return boolean true on success, false on failure
-         */
-        protected function delete(array $keys)
-        {
-            foreach ($keys as $k) {
-                $k = sha1($k);
-                $this->memcache->delete($k);
-            }
-            return true;
-        }
-
-        /**
-         * Remove *all* values from cache
-         *
-         * @return boolean true on success, false on failure
-         */
-        protected function purge()
-        {
-            return $this->memcache->flush();
-        }
-    }
-
-
-       
diff --git a/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md b/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md
deleted file mode 100644
index 98e5d45c1..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching/caching-groups.md
+++ /dev/null
@@ -1,60 +0,0 @@
-Cache Groups {#caching.groups}
-============
-
-You can do more elaborate grouping by setting up `$cache_id` groups.
-This is accomplished by separating each sub-group with a vertical bar
-`|` in the `$cache_id` value. You can have as many sub-groups as you
-like.
-
--   You can think of cache groups like a directory hierarchy. For
-    instance, a cache group of `'a|b|c'` could be thought of as the
-    directory structure `'/a/b/c/'`.
-
--   `clearCache(null,'a|b|c')` would be like removing the files
-    `'/a/b/c/*'`. `clearCache(null,'a|b')` would be like removing the
-    files `'/a/b/*'`.
-
--   If you specify a [`$compile_id`](#variable.compile.id) such as
-    `clearCache(null,'a|b','foo')` it is treated as an appended cache
-    group `'/a/b/c/foo/'`.
-
--   If you specify a template name such as
-    `clearCache('foo.tpl','a|b|c')` then Smarty will attempt to remove
-    `'/a/b/c/foo.tpl'`.
-
--   You CANNOT remove a specified template name under multiple cache
-    groups such as `'/a/b/*/foo.tpl'`, the cache grouping works
-    left-to-right ONLY. You will need to group your templates under a
-    single cache group heirarchy to be able to clear them as a group.
-
-Cache grouping should not be confused with your template directory
-heirarchy, the cache grouping has no knowledge of how your templates are
-structured. So for example, if you have a template structure like
-`themes/blue/index.tpl` and you want to be able to clear all the cache
-files for the "blue" theme, you will need to create a cache group
-structure that mimics your template file structure, such as
-`display('themes/blue/index.tpl','themes|blue')`, then clear them with
-`clearCache(null,'themes|blue')`.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    // clear all caches with 'sports|basketball' as the first two cache_id groups
-    $smarty->clearCache(null,'sports|basketball');
-
-    // clear all caches with "sports" as the first cache_id group. This would
-    // include "sports|basketball", or "sports|(anything)|(anything)|(anything)|..."
-    $smarty->clearCache(null,'sports');
-
-    // clear the foo.tpl cache file with "sports|basketball" as the cache_id
-    $smarty->clearCache('foo.tpl','sports|basketball');
-
-
-    $smarty->display('index.tpl','sports|basketball');
-    ?>
-
-          
diff --git a/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md b/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md
deleted file mode 100644
index 40fffc3d7..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching/caching-multiple-caches.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Multiple Caches Per Page {#caching.multiple.caches}
-========================
-
-You can have multiple cache files for a single call to
-[`display()`](#api.display) or [`fetch()`](#api.fetch). Let\'s say that
-a call to `display('index.tpl')` may have several different output
-contents depending on some condition, and you want separate caches for
-each one. You can do this by passing a `$cache_id` as the second
-parameter to the function call.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    $my_cache_id = $_GET['article_id'];
-
-    $smarty->display('index.tpl', $my_cache_id);
-    ?>
-
-         
-
-Above, we are passing the variable `$my_cache_id` to
-[`display()`](#api.display) as the `$cache_id`. For each unique value of
-`$my_cache_id`, a separate cache will be generated for `index.tpl`. In
-this example, `article_id` was passed in the URL and is used as the
-`$cache_id`.
-
-> **Note**
->
-> Be very cautious when passing values from a client (web browser) into
-> Smarty or any PHP application. Although the above example of using the
-> article\_id from the URL looks handy, it could have bad consequences.
-> The `$cache_id` is used to create a directory on the file system, so
-> if the user decided to pass an extremely large value for article\_id,
-> or write a script that sends random article\_id\'s at a rapid pace,
-> this could possibly cause problems at the server level. Be sure to
-> sanitize any data passed in before using it. In this instance, maybe
-> you know the article\_id has a length of ten characters and is made up
-> of alpha-numerics only, and must be a valid article\_id in the
-> database. Check for this!
-
-Be sure to pass the same `$cache_id` as the second parameter to
-[`isCached()`](#api.is.cached) and [`clearCache()`](#api.clear.cache).
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    $my_cache_id = $_GET['article_id'];
-
-    if(!$smarty->isCached('index.tpl',$my_cache_id)) {
-        // No cache available, do variable assignments here.
-        $contents = get_database_contents();
-        $smarty->assign($contents);
-    }
-
-    $smarty->display('index.tpl',$my_cache_id);
-    ?>
-
-         
-
-You can clear all caches for a particular `$cache_id` by passing NULL as
-the first parameter to [`clearCache()`](#api.clear.cache).
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    // clear all caches with "sports" as the $cache_id
-    $smarty->clearCache(null,'sports');
-
-    $smarty->display('index.tpl','sports');
-    ?>
-
-         
-
-In this manner, you can "group" your caches together by giving them the
-same `$cache_id`.
diff --git a/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md b/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md
deleted file mode 100644
index bc9d2ad9e..000000000
--- a/vendor/smarty/smarty/docs/programmers/caching/caching-setting-up.md
+++ /dev/null
@@ -1,153 +0,0 @@
-Setting Up Caching {#caching.setting.up}
-==================
-
-The first thing to do is enable caching by setting
-[`$caching`](#variable.caching) to one of
-`Smarty::CACHING_LIFETIME_CURRENT` or `Smarty::CACHING_LIFETIME_SAVED`.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // uses the value of $smarty->cacheLifetime() to determine
-    // the number of seconds a cache is good for
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    $smarty->display('index.tpl');
-    ?>
-
-        
-
-With caching enabled, the function call to `display('index.tpl')` will
-render the template as usual, but also saves a copy of its output to a
-file (a cached copy) in the [`$cache_dir`](#variable.cache.dir). On the
-next call to `display('index.tpl')`, the cached copy will be used
-instead of rendering the template again.
-
-> **Note**
->
-> The files in the [`$cache_dir`](#variable.cache.dir) are named similar
-> to the template name. Although they end in the `.php` extension, they
-> are not intended to be directly executable. Do not edit these files!
-
-Each cached page has a limited lifetime determined by
-[`$cache_lifetime`](#variable.cache.lifetime). The default value is 3600
-seconds, or one hour. After that time expires, the cache is regenerated.
-It is possible to give individual caches their own expiration time by
-setting [`$caching`](#variable.caching) to
-`Smarty::CACHING_LIFETIME_SAVED`. See
-[`$cache_lifetime`](#variable.cache.lifetime) for more details.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    // retain current cache lifetime for each specific display call
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_SAVED);
-
-    // set the cache_lifetime for index.tpl to 5 minutes
-    $smarty->setCacheLifetime(300);
-    $smarty->display('index.tpl');
-
-    // set the cache_lifetime for home.tpl to 1 hour
-    $smarty->setCacheLifetime(3600);
-    $smarty->display('home.tpl');
-
-    // NOTE: the following $cache_lifetime setting will not work when $caching
-    // is set to Smarty::CACHING_LIFETIME_SAVED.
-    // The cache lifetime for home.tpl has already been set
-    // to 1 hour, and will no longer respect the value of $cache_lifetime.
-    // The home.tpl cache will still expire after 1 hour.
-    $smarty->setCacheLifetime(30); // 30 seconds
-    $smarty->display('home.tpl');
-    ?>
-
-        
-
-If [`$compile_check`](#variable.compile.check) is enabled (default),
-every template file and config file that is involved with the cache file
-is checked for modification. If any of the files have been modified
-since the cache was generated, the cache is immediately regenerated.
-This is a computational overhead, so for optimum performance set
-[`$compile_check`](#variable.compile.check) to FALSE.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-    $smarty->setCompileCheck(false);
-
-    $smarty->display('index.tpl');
-    ?>
-
-        
-
-If [`$force_compile`](#variable.force.compile) is enabled, the cache
-files will always be regenerated. This effectively disables caching,
-however this also seriously degrades performance.
-[`$force_compile`](#variable.force.compile) is meant to be used for
-[debugging](#chapter.debugging.console) purposes. The appropriate way to
-disable caching is to set [`$caching`](#variable.caching) to
-Smarty::CACHING\_OFF.
-
-The [`isCached()`](#api.is.cached) function can be used to test if a
-template has a valid cache or not. If you have a cached template that
-requires something like a database fetch, you can use this to skip that
-process.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    if(!$smarty->isCached('index.tpl')) {
-        // No cache available, do variable assignments here.
-        $contents = get_database_contents();
-        $smarty->assign($contents);
-    }
-
-    $smarty->display('index.tpl');
-    ?>
-
-        
-
-You can keep parts of a page dynamic (disable caching) with the
-[`{nocache}{/nocache}`](#language.function.nocache) block function, the
-[`{insert}`](#language.function.insert) function, or by using the
-`nocache` parameter for most template functions.
-
-Let\'s say the whole page can be cached except for a banner that is
-displayed down the side of the page. By using the
-[`{insert}`](#language.function.insert) function for the banner, you can
-keep this element dynamic within the cached content. See the
-documentation on [`{insert}`](#language.function.insert) for more
-details and examples.
-
-You can clear all the cache files with the
-[`clearAllCache()`](#api.clear.all.cache) function, or individual cache
-files [and groups](#caching.groups) with the
-[`clearCache()`](#api.clear.cache) function.
-
-
-    <?php
-    require('Smarty.class.php');
-    $smarty = new Smarty;
-
-    $smarty->setCaching(Smarty::CACHING_LIFETIME_CURRENT);
-
-    // clear only cache for index.tpl
-    $smarty->clearCache('index.tpl');
-
-    // clear out all cache files
-    $smarty->clearAllCache();
-
-    $smarty->display('index.tpl');
-    ?>
-
-        
diff --git a/vendor/smarty/smarty/docs/programmers/charset.md b/vendor/smarty/smarty/docs/programmers/charset.md
deleted file mode 100644
index 72842b3f7..000000000
--- a/vendor/smarty/smarty/docs/programmers/charset.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Charset Encoding {#charset}
-================
-
-Charset Encoding {#charset.encoding}
-================
-
-There are a variety of encodings for textual data, ISO-8859-1 (Latin1)
-and UTF-8 being the most popular. Unless specified otherwise with the
-`SMARTY_RESOURCE_CHAR_SET` constant, Smarty recognizes `UTF-8` as the
-internal charset if [Multibyte String](https://www.php.net/mbstring) is
-available, `ISO-8859-1` if not.
-
-> **Note**
->
-> `ISO-8859-1` has been PHP\'s default internal charset since the
-> beginning. Unicode has been evolving since 1991. Since then it has
-> become the one charset to conquer them all, as it is capable of
-> encoding most of the known characters even accross different character
-> systems (latin, cyrillic, japanese, ...). `UTF-8` is unicode\'s most
-> used encoding, as it allows referencing the thousands of character
-> with the smallest size overhead possible.
->
-> Since unicode and UTF-8 are very wide spread nowadays, their use is
-> strongly encouraged.
-
-> **Note**
->
-> Smarty\'s internals and core plugins are truly UTF-8 compatible since
-> Smarty 3.1. To achieve unicode compatibility, the [Multibyte
-> String](https://www.php.net/mbstring) PECL is required. Unless your PHP
-> environment offers this package, Smarty will not be able to offer
-> full-scale UTF-8 compatibility.
-
-
-    // use japanese character encoding
-    if (function_exists('mb_internal_charset')) {
-      mb_internal_charset('EUC-JP');
-    }
-    define('SMARTY_RESOURCE_CHAR_SET', 'EUC-JP');
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-      
-     
diff --git a/vendor/smarty/smarty/docs/programmers/plugins.md b/vendor/smarty/smarty/docs/programmers/plugins.md
deleted file mode 100644
index 41a7ea0c4..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Extending Smarty With Plugins {#plugins}
-=============================
-
-## Table of contents
-
-- [How Plugins Work](./plugins/plugins-howto.md)
-- [Naming Conventions](./plugins/plugins-naming-conventions.md) 
-- [Writing Plugins](./plugins/plugins-writing.md) 
-- [Template Functions](./plugins/plugins-functions.md) 
-- [Modifiers](./plugins/plugins-modifiers.md)
-- [Block Functions](./plugins/plugins-block-functions.md) 
-- [Compiler Functions](./plugins/plugins-compiler-functions.md) 
-- [Prefilters/Postfilters](./plugins/plugins-prefilters-postfilters.md)
-- [Output Filters](./plugins/plugins-outputfilters.md) 
-- [Resources](./plugins/plugins-resources.md)
-- [Inserts](./plugins/plugins-inserts.md)
-
-Version 2.0 introduced the plugin architecture that is used for almost
-all the customizable functionality of Smarty. This includes:
-
--   functions
-
--   modifiers
-
--   block functions
-
--   compiler functions
-
--   prefilters
-
--   postfilters
-
--   outputfilters
-
--   resources
-
--   inserts
-
-With the exception of resources, backwards compatibility with the old
-way of registering handler functions via register\_\* API is preserved.
-If you did not use the API but instead modified the class variables
-`$custom_funcs`, `$custom_mods`, and other ones directly, then you will
-need to adjust your scripts to either use the API or convert your custom
-functionality into plugins.
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md
deleted file mode 100644
index 47281fef5..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-block-functions.md
+++ /dev/null
@@ -1,95 +0,0 @@
-Block Functions {#plugins.block.functions}
-===============
-
-void
-
-smarty\_block\_
-
-name
-
-array
-
-\$params
-
-mixed
-
-\$content
-
-object
-
-\$template
-
-boolean
-
-&\$repeat
-
-Block functions are functions of the form: `{func} .. {/func}`. In other
-words, they enclose a template block and operate on the contents of this
-block. Block functions take precedence over [custom
-functions](#language.custom.functions) of the same name, that is, you
-cannot have both custom function `{func}` and block function
-`{func}..{/func}`.
-
--   By default your function implementation is called twice by Smarty:
-    once for the opening tag, and once for the closing tag. (See
-    `$repeat` below on how to change this.)
-
--   Starting with Smarty 3.1 the returned value of the opening tag call
-    is displayed as well.
-
--   Only the opening tag of the block function may have
-    [attributes](#language.syntax.attributes). All attributes passed to
-    template functions from the template are contained in the `$params`
-    variable as an associative array. The opening tag attributes are
-    also accessible to your function when processing the closing tag.
-
--   The value of the `$content` variable depends on whether your
-    function is called for the opening or closing tag. In case of the
-    opening tag, it will be NULL, and in case of the closing tag it will
-    be the contents of the template block. Note that the template block
-    will have already been processed by Smarty, so all you will receive
-    is the template output, not the template source.
-
--   The parameter `$repeat` is passed by reference to the function
-    implementation and provides a possibility for it to control how many
-    times the block is displayed. By default `$repeat` is TRUE at the
-    first call of the block-function (the opening tag) and FALSE on all
-    subsequent calls to the block function (the block\'s closing tag).
-    Each time the function implementation returns with `$repeat` being
-    TRUE, the contents between `{func}...{/func}` are evaluated and the
-    function implementation is called again with the new block contents
-    in the parameter `$content`.
-
-If you have nested block functions, it\'s possible to find out what the
-parent block function is by accessing `$smarty->_tag_stack` variable.
-Just do a [`var_dump()`](&url.php-manual;var_dump) on it and the
-structure should be apparent.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     block.translate.php
-     * Type:     block
-     * Name:     translate
-     * Purpose:  translate a block of text
-     * -------------------------------------------------------------
-     */
-    function smarty_block_translate($params, $content, Smarty_Internal_Template $template, &$repeat)
-    {
-        // only output on the closing tag
-        if(!$repeat){
-            if (isset($content)) {
-                $lang = $params['lang'];
-                // do some intelligent translation thing here with $content
-                return $translation;
-            }
-        }
-    }
-    ?>
-
-         
-
-See also: [`registerPlugin()`](#api.register.plugin),
-[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md
deleted file mode 100644
index ef2454e8a..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-compiler-functions.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Compiler Functions {#plugins.compiler.functions}
-==================
-
-Compiler functions are called only during compilation of the template.
-They are useful for injecting PHP code or time-sensitive static content
-into the template. If there is both a compiler function and a [custom
-function](#language.custom.functions) registered under the same name,
-the compiler function has precedence.
-
-mixed
-
-smarty\_compiler\_
-
-name
-
-array
-
-\$params
-
-object
-
-\$smarty
-
-The compiler function is passed two parameters: the params array which
-contains precompiled strings for the attribute values and the Smarty
-object. It\'s supposed to return the code to be injected into the
-compiled template including the surrounding PHP tags.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     compiler.tplheader.php
-     * Type:     compiler
-     * Name:     tplheader
-     * Purpose:  Output header containing the source file name and
-     *           the time it was compiled.
-     * -------------------------------------------------------------
-     */
-    function smarty_compiler_tplheader($params, Smarty $smarty)
-    {
-        return "<?php\necho '" . $smarty->_current_file . " compiled at " . date('Y-m-d H:M'). "';\n?>";
-    }
-    ?>
-
-This function can be called from the template as:
-
-
-    {* this function gets executed at compile time only *}
-    {tplheader}
-
-         
-
-The resulting PHP code in the compiled template would be something like
-this:
-
-
-    <?php
-    echo 'index.tpl compiled at 2002-02-20 20:02';
-    ?>
-
-         
-
-See also [`registerPlugin()`](#api.register.plugin),
-[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md
deleted file mode 100644
index 067b93826..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-functions.md
+++ /dev/null
@@ -1,94 +0,0 @@
-Template Functions {#plugins.functions}
-==================
-
-void
-
-smarty\_function\_
-
-name
-
-array
-
-\$params
-
-object
-
-\$template
-
-All [attributes](#language.syntax.attributes) passed to template
-functions from the template are contained in the `$params` as an
-associative array.
-
-The output (return value) of the function will be substituted in place
-of the function tag in the template, eg the
-[`{fetch}`](#language.function.fetch) function. Alternatively, the
-function can simply perform some other task without any output, eg the
-[`{assign}`](#language.function.assign) function.
-
-If the function needs to assign some variables to the template or use
-some other Smarty-provided functionality, it can use the supplied
-`$template` object to do so eg `$template->foo()`.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     function.eightball.php
-     * Type:     function
-     * Name:     eightball
-     * Purpose:  outputs a random magic answer
-     * -------------------------------------------------------------
-     */
-    function smarty_function_eightball($params, Smarty_Internal_Template $template)
-    {
-        $answers = array('Yes',
-                         'No',
-                         'No way',
-                         'Outlook not so good',
-                         'Ask again soon',
-                         'Maybe in your reality');
-
-        $result = array_rand($answers);
-        return $answers[$result];
-    }
-    ?>
-
-which can be used in the template as:
-
-    Question: Will we ever have time travel?
-    Answer: {eightball}.
-        
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     function.assign.php
-     * Type:     function
-     * Name:     assign
-     * Purpose:  assign a value to a template variable
-     * -------------------------------------------------------------
-     */
-    function smarty_function_assign($params, Smarty_Internal_Template $template)
-    {
-        if (empty($params['var'])) {
-            trigger_error("assign: missing 'var' parameter");
-            return;
-        }
-
-        if (!in_array('value', array_keys($params))) {
-            trigger_error("assign: missing 'value' parameter");
-            return;
-        }
-
-        $template->assign($params['var'], $params['value']);     
-        
-    }
-    ?>
-
-          
-
-See also: [`registerPlugin()`](#api.register.plugin),
-[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md
deleted file mode 100644
index 5738c3fcb..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-howto.md
+++ /dev/null
@@ -1,18 +0,0 @@
-How Plugins Work {#plugins.howto}
-================
-
-Plugins are always loaded on demand. Only the specific modifiers,
-functions, resources, etc invoked in the templates scripts will be
-loaded. Moreover, each plugin is loaded only once, even if you have
-several different instances of Smarty running within the same request.
-
-Pre/postfilters and output filters are a bit of a special case. Since
-they are not mentioned in the templates, they must be registered or
-loaded explicitly via API functions before the template is processed.
-The order in which multiple filters of the same type are executed
-depends on the order in which they are registered or loaded.
-
-The [plugins directory](#variable.plugins.dir) can be a string
-containing a path or an array containing multiple paths. To install a
-plugin, simply place it in one of the directories and Smarty will use it
-automatically.
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md
deleted file mode 100644
index 370a97bd0..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-inserts.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Inserts {#plugins.inserts}
-=======
-
-Insert plugins are used to implement functions that are invoked by
-[`{insert}`](#language.function.insert) tags in the template.
-
-string
-
-smarty\_insert\_
-
-name
-
-array
-
-\$params
-
-object
-
-\$template
-
-The first parameter to the function is an associative array of
-attributes passed to the insert.
-
-The insert function is supposed to return the result which will be
-substituted in place of the `{insert}` tag in the template.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     insert.time.php
-     * Type:     time
-     * Name:     time
-     * Purpose:  Inserts current date/time according to format
-     * -------------------------------------------------------------
-     */
-    function smarty_insert_time($params, Smarty_Internal_Template $template)
-    {
-        if (empty($params['format'])) {
-            trigger_error("insert time: missing 'format' parameter");
-            return;
-        }
-        return strftime($params['format']);
-    }
-    ?>
-
-         
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md
deleted file mode 100644
index b089821a6..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-modifiers.md
+++ /dev/null
@@ -1,86 +0,0 @@
-Modifiers {#plugins.modifiers}
-=========
-
-[Modifiers](#language.modifiers) are little functions that are applied
-to a variable in the template before it is displayed or used in some
-other context. Modifiers can be chained together.
-
-mixed
-
-smarty\_modifier\_
-
-name
-
-mixed
-
-\$value
-
-\[mixed
-
-\$param1
-
-, \...\]
-
-The first parameter to the modifier plugin is the value on which the
-modifier is to operate. The rest of the parameters are optional,
-depending on what kind of operation is to be performed.
-
-The modifier has to [return](&url.php-manual;return) the result of its
-processing.
-
-This plugin basically aliases one of the built-in PHP functions. It does
-not have any additional parameters.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     modifier.capitalize.php
-     * Type:     modifier
-     * Name:     capitalize
-     * Purpose:  capitalize words in the string
-     * -------------------------------------------------------------
-     */
-    function smarty_modifier_capitalize($string)
-    {
-        return ucwords($string);
-    }
-    ?>
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     modifier.truncate.php
-     * Type:     modifier
-     * Name:     truncate
-     * Purpose:  Truncate a string to a certain length if necessary,
-     *           optionally splitting in the middle of a word, and
-     *           appending the $etc string.
-     * -------------------------------------------------------------
-     */
-    function smarty_modifier_truncate($string, $length = 80, $etc = '...',
-                                      $break_words = false)
-    {
-        if ($length == 0)
-            return '';
-
-        if (strlen($string) > $length) {
-            $length -= strlen($etc);
-            $fragment = substr($string, 0, $length+1);
-            if ($break_words)
-                $fragment = substr($fragment, 0, -1);
-            else
-                $fragment = preg_replace('/\s+(\S+)?$/', '', $fragment);
-            return $fragment.$etc;
-        } else
-            return $string;
-    }
-    ?>
-
-         
-
-See also [`registerPlugin()`](#api.register.plugin),
-[`unregisterPlugin()`](#api.unregister.plugin).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md
deleted file mode 100644
index 28bbcfde8..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-naming-conventions.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Naming Conventions {#plugins.naming.conventions}
-==================
-
-Plugin files and functions must follow a very specific naming convention
-in order to be located by Smarty.
-
-**plugin files** must be named as follows:
-
-> `
->         type.name.php
->        `
-
--   Where `type` is one of these plugin types:
-
-    -   function
-
-    -   modifier
-
-    -   block
-
-    -   compiler
-
-    -   prefilter
-
-    -   postfilter
-
-    -   outputfilter
-
-    -   resource
-
-    -   insert
-
--   And `name` should be a valid identifier; letters, numbers, and
-    underscores only, see [php
-    variables](&url.php-manual;language.variables).
-
--   Some examples: `function.html_select_date.php`, `resource.db.php`,
-    `modifier.spacify.php`.
-
-**plugin functions** inside the PHP files must be named as follows:
-
-> `smarty_type_name`
-
--   The meanings of `type` and `name` are the same as above.
-
--   An example modifier name `foo` would be
-    `function smarty_modifier_foo()`.
-
-Smarty will output appropriate error messages if the plugin file it
-needs is not found, or if the file or the plugin function are named
-improperly.
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md
deleted file mode 100644
index 4e34ab7eb..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-outputfilters.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Output Filters {#plugins.outputfilters}
-==============
-
-Output filter plugins operate on a template\'s output, after the
-template is loaded and executed, but before the output is displayed.
-
-string
-
-smarty\_outputfilter\_
-
-name
-
-string
-
-\$template\_output
-
-object
-
-\$template
-
-The first parameter to the output filter function is the template output
-that needs to be processed, and the second parameter is the instance of
-Smarty invoking the plugin. The plugin is supposed to do the processing
-and return the results.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     outputfilter.protect_email.php
-     * Type:     outputfilter
-     * Name:     protect_email
-     * Purpose:  Converts @ sign in email addresses to %40 as
-     *           a simple protection against spambots
-     * -------------------------------------------------------------
-     */
-     function smarty_outputfilter_protect_email($output, Smarty_Internal_Template $template)
-     {
-         return preg_replace('!(\S+)@([a-zA-Z0-9\.\-]+\.([a-zA-Z]{2,3}|[0-9]{1,3}))!',
-                             '$1%40$2', $output);
-     }
-    ?>
-
-         
-
-See also [`registerFilter()`](#api.register.filter),
-[`unregisterFilter()`](#api.unregister.filter).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md
deleted file mode 100644
index 39467cbcb..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-prefilters-postfilters.md
+++ /dev/null
@@ -1,89 +0,0 @@
-Prefilters/Postfilters {#plugins.prefilters.postfilters}
-======================
-
-Prefilter and postfilter plugins are very similar in concept; where they
-differ is in the execution \-- more precisely the time of their
-execution.
-
-string
-
-smarty\_prefilter\_
-
-name
-
-string
-
-\$source
-
-object
-
-\$template
-
-Prefilters are used to process the source of the template immediately
-before compilation. The first parameter to the prefilter function is the
-template source, possibly modified by some other prefilters. The plugin
-is supposed to return the modified source. Note that this source is not
-saved anywhere, it is only used for compilation.
-
-string
-
-smarty\_postfilter\_
-
-name
-
-string
-
-\$compiled
-
-object
-
-\$template
-
-Postfilters are used to process the compiled output of the template (the
-PHP code) immediately after the compilation is done but before the
-compiled template is saved to the filesystem. The first parameter to the
-postfilter function is the compiled template code, possibly modified by
-other postfilters. The plugin is supposed to return the modified version
-of this code.
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     prefilter.pre01.php
-     * Type:     prefilter
-     * Name:     pre01
-     * Purpose:  Convert html tags to be lowercase.
-     * -------------------------------------------------------------
-     */
-     function smarty_prefilter_pre01($source, Smarty_Internal_Template $template)
-     {
-         return preg_replace('!<(\w+)[^>]+>!e', 'strtolower("$1")', $source);
-     }
-    ?>
-
-         
-
-
-    <?php
-    /*
-     * Smarty plugin
-     * -------------------------------------------------------------
-     * File:     postfilter.post01.php
-     * Type:     postfilter
-     * Name:     post01
-     * Purpose:  Output code that lists all current template vars.
-     * -------------------------------------------------------------
-     */
-     function smarty_postfilter_post01($compiled, Smarty_Internal_Template $template)
-     {
-         $compiled = "<pre>\n<?php print_r(\$template->getTemplateVars()); ?>\n</pre>" . $compiled;
-         return $compiled;
-     }
-    ?>
-
-         
-
-See also [`registerFilter()`](#api.register.filter) and
-[`unregisterFilter()`](#api.unregister.filter).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md
deleted file mode 100644
index 1b1fdf0ab..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-resources.md
+++ /dev/null
@@ -1,128 +0,0 @@
-Resources {#plugins.resources}
-=========
-
-Resource plugins are meant as a generic way of providing template
-sources or PHP script components to Smarty. Some examples of resources:
-databases, LDAP, shared memory, sockets, and so on.
-
-Custom Resources may be put in a file `resource.foobarxyz.php` within
-your [`$plugins_dir`](#variable.plugins.dir), or registered on runtime
-with [`registerResource()`](#api.register.resource). In either case you
-will be able to access that resource by prepending its name to the
-template you\'re addressing: `foobarxyz:yourtemplate.tpl`.
-
-If a Resource\'s templates should not be run through the Smarty
-compiler, the Custom Resource may extend `Smarty_Resource_Uncompiled`.
-The Resource Handler must then implement the function
-`renderUncompiled(Smarty_Internal_Template $_template)`. `$_template` is
-a reference to the current template and contains all assigned variables
-which the implementor can access via
-`$_template->smarty->getTemplateVars()`. These Resources simply echo
-their rendered content to the output stream. The rendered output will be
-output-cached if the Smarty instance was configured accordingly. See
-`libs/sysplugins/smarty_internal_resource_php.php` for an example.
-
-If the Resource\'s compiled templates should not be cached on disk, the
-Custom Resource may extend `Smarty_Resource_Recompiled`. These Resources
-are compiled every time they are accessed. This may be an expensive
-overhead. See `libs/sysplugins/smarty_internal_resource_eval.php` for an
-example.
-
-
-    <?php
-
-    /**
-     * MySQL Resource
-     *
-     * Resource Implementation based on the Custom API to use
-     * MySQL as the storage resource for Smarty's templates and configs.
-     *
-     * Table definition:
-     * <pre>CREATE TABLE IF NOT EXISTS `templates` (
-     *   `name` varchar(100) NOT NULL,
-     *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-     *   `source` text,
-     *   PRIMARY KEY (`name`)
-     * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
-     *
-     * Demo data:
-     * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
-     *
-     * @package Resource-examples
-     * @author Rodney Rehm
-     */
-    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
-        // PDO instance
-        protected $db;
-        // prepared fetch() statement
-        protected $fetch;
-        // prepared fetchTimestamp() statement
-        protected $mtime;
-
-        public function __construct() {
-            try {
-                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
-            } catch (PDOException $e) {
-                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-            }
-            $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-            $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
-        }
-        
-        /**
-         * Fetch a template and its modification time from database
-         *
-         * @param string $name template name
-         * @param string $source template source
-         * @param integer $mtime template modification timestamp (epoch)
-         * @return void
-         */
-        protected function fetch($name, &$source, &$mtime)
-        {
-            $this->fetch->execute(array('name' => $name));
-            $row = $this->fetch->fetch();
-            $this->fetch->closeCursor();
-            if ($row) {
-                $source = $row['source'];
-                $mtime = strtotime($row['modified']);
-            } else {
-                $source = null;
-                $mtime = null;
-            }
-        }
-        
-        /**
-         * Fetch a template's modification time from database
-         *
-         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
-         * @param string $name template name
-         * @return integer timestamp (epoch) the template was modified
-         */
-        protected function fetchTimestamp($name) {
-            $this->mtime->execute(array('name' => $name));
-            $mtime = $this->mtime->fetchColumn();
-            $this->mtime->closeCursor();
-            return strtotime($mtime);
-        }
-    }
-
-
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
-
-    // using resource from php script
-    $smarty->display("mysql:index.tpl");
-    ?>
-
-         
-
-And from within Smarty template:
-
-
-    {include file='mysql:extras/navigation.tpl'}
-
-         
-
-See also [`registerResource()`](#api.register.resource),
-[`unregisterResource()`](#api.unregister.resource).
diff --git a/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md b/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md
deleted file mode 100644
index 972911d97..000000000
--- a/vendor/smarty/smarty/docs/programmers/plugins/plugins-writing.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Writing Plugins {#plugins.writing}
-===============
-
-Plugins can be either loaded by Smarty automatically from the filesystem
-or they can be registered at runtime via one of the register\_\* API
-functions. They can also be unregistered by using unregister\_\* API
-functions.
-
-For the plugins that are registered at runtime, the name of the plugin
-function(s) does not have to follow the naming convention.
-
-If a plugin depends on some functionality provided by another plugin (as
-is the case with some plugins bundled with Smarty), then the proper way
-to load the needed plugin is this:
-
-
-    <?php
-    function smarty_function_yourPlugin(array $params, Smarty_Internal_Template $template)
-    {
-      // load plugin depended upon
-      $template->smarty->loadPlugin('smarty_shared_make_timestamp');
-      // plugin code
-    }
-    ?>
-
-        
-
-As a general rule, the currently evaluated template\'s
-Smarty\_Internal\_Template object is always passed to the plugins as the
-last parameter with two exceptions:
-
--   modifiers do not get passed the Smarty\_Internal\_Template object at
-    all
-
--   blocks get passed `$repeat` after the Smarty\_Internal\_Template
-    object to keep backwards compatibility to older versions of Smarty.
diff --git a/vendor/smarty/smarty/docs/programmers/resources.md b/vendor/smarty/smarty/docs/programmers/resources.md
deleted file mode 100644
index 239690061..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Resources
-=========
-
-The templates may come from a variety of sources. When you
-[`display()`](./api-functions/api-display.md) or [`fetch()`](./api-functions/api-fetch.md) a template, or
-when you include a template from within another template, you supply a
-resource type, followed by the appropriate path and template name. If a
-resource is not explicitly given, the value of
-[`$default_resource_type`](./api-variables/variable-default-resource-type.md) (default:
-\"file\") is assumed.
-
-## Table of contents
-
-- [File Template Resources](./resources/resources-file.md)
-- [String Template Resources](./resources/resources-string.md)
-- [Stream Template Resources](./resources/resources-streams.md)
-- [Extends Template Resources](./resources/resources-extends.md)
-- [Custom Template Resources](./resources/resources-custom.md)
-
diff --git a/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md b/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md
deleted file mode 100644
index d679afcb1..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/resources-custom.md
+++ /dev/null
@@ -1,111 +0,0 @@
-Custom Template Resources {#resources.custom}
-=========================
-
-You can retrieve templates using whatever possible source you can access
-with PHP: databases, sockets, files, etc. You do this by writing
-resource plugin functions and registering them with Smarty.
-
-See [resource plugins](#plugins.resources) section for more information
-on the functions you are supposed to provide.
-
-> **Note**
->
-> Note that you cannot override the built-in `file:` resource, but you
-> can provide a resource that fetches templates from the file system in
-> some other way by registering under another resource name.
-
-
-    <?php
-
-    /**
-    * MySQL Resource
-    *
-    * Resource Implementation based on the Custom API to use
-    * MySQL as the storage resource for Smarty's templates and configs.
-    *
-    * Table definition:
-    * <pre>CREATE TABLE IF NOT EXISTS `templates` (
-    *   `name` varchar(100) NOT NULL,
-    *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    *   `source` text,
-    *   PRIMARY KEY (`name`)
-    * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
-    *
-    * Demo data:
-    * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
-    *
-    * @package Resource-examples
-    * @author Rodney Rehm
-    */
-    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
-     // PDO instance
-     protected $db;
-     // prepared fetch() statement
-     protected $fetch;
-     // prepared fetchTimestamp() statement
-     protected $mtime;
-
-     public function __construct() {
-         try {
-             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
-         } catch (PDOException $e) {
-             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-         }
-         $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-         $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
-     }
-     
-     /**
-      * Fetch a template and its modification time from database
-      *
-      * @param string $name template name
-      * @param string $source template source
-      * @param integer $mtime template modification timestamp (epoch)
-      * @return void
-      */
-     protected function fetch($name, &$source, &$mtime)
-     {
-         $this->fetch->execute(array('name' => $name));
-         $row = $this->fetch->fetch();
-         $this->fetch->closeCursor();
-         if ($row) {
-             $source = $row['source'];
-             $mtime = strtotime($row['modified']);
-         } else {
-             $source = null;
-             $mtime = null;
-         }
-     }
-     
-     /**
-      * Fetch a template's modification time from database
-      *
-      * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
-      * @param string $name template name
-      * @return integer timestamp (epoch) the template was modified
-      */
-     protected function fetchTimestamp($name) {
-         $this->mtime->execute(array('name' => $name));
-         $mtime = $this->mtime->fetchColumn();
-         $this->mtime->closeCursor();
-         return strtotime($mtime);
-     }
-    }
-
-
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
-
-    // using resource from php script
-    $smarty->display("mysql:index.tpl");
-    ?>
-
-      
-
-And from within Smarty template:
-
-
-    {include file='mysql:extras/navigation.tpl'}
-
-      
diff --git a/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md b/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md
deleted file mode 100644
index ad2e8f5d8..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/resources-extends.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Extends Template Resources {#resources.extends}
-==========================
-
-The `extends:` resource is used to define child/parent relationships for
-template inheritance from the PHP script. For details see section of
-[Template Interitance](#advanced.features.template.inheritance).
-
-As of Smarty 3.1 the `extends:` resource may use any available [template
-resource](#resources), including `string:` and `eval:`. When [templates
-from strings](#resources.string) are used, make sure they are properly
-(url or base64) encoded. Is an `eval:` resource found within an
-inheritance chain, its \"don\'t save a compile file\" property is
-superseeded by the `extends:` resource. The templates within an
-inheritance chain are not compiled separately, though. Only a single
-compiled template will be generated.
-
-> **Note**
->
-> Use this when inheritance is required programatically. When inheriting
-> within PHP, it is not obvious from the child template what inheritance
-> took place. If you have a choice, it is normally more flexible and
-> intuitive to handle inheritance chains from within the templates.
-
-
-    <?php
-    $smarty->display('extends:parent.tpl|child.tpl|grandchild.tpl'); 
-
-    // inheritance from multiple template sources
-    $smarty->display('extends:db:parent.tpl|file:child.tpl|grandchild.tpl|eval:{block name="fooBazVar_"}hello world{/block}'); 
-    ?>
-
-      
-
-See also [Template Inheritance](#advanced.features.template.inheritance)
-[`{block}`](#language.function.block) and
-[`{extends}`](#language.function.extends).
diff --git a/vendor/smarty/smarty/docs/programmers/resources/resources-file.md b/vendor/smarty/smarty/docs/programmers/resources/resources-file.md
deleted file mode 100644
index 986cfffca..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/resources-file.md
+++ /dev/null
@@ -1,160 +0,0 @@
-File Template Resources {#resources.file}
-=======================
-
-Smarty ships with a built-in template resource for the filesystem. The
-`file:` is the default resource. The resource key `file:` must only be
-specified, if the
-[`$default_resource_type`](#variable.default.resource.type) has been
-changed.
-
-If the file resource cannot find the requested template, the
-[`$default_template_handler_func`](#variable.default.template.handler.func)
-is invoked.
-
-> **Note**
->
-> As of Smarty 3.1 the file resource no longer walks through the
-> [include\_path](&url.php-manual;ini.core.php#ini.include-path) unless
-> [`$use_include_path` is activated](#variable.use.include.path)
-
-Templates from \$template\_dir {#templates.from.template.dir}
-------------------------------
-
-The file resource pulls templates source files from the directories
-specified in [`$template_dir`](#variable.template.dir). The list of
-directories is traversed in the order they appear in the array. The
-first template found is the one to process.
-
-
-    <?php
-    $smarty->display('index.tpl');
-    $smarty->display('file:index.tpl'); // same as above
-    ?>
-
-       
-
-From within a Smarty template
-
-
-    {include file='index.tpl'}
-    {include file='file:index.tpl'} {* same as above *}
-
-       
-
-Templates from a specific \$template\_dir {#templates.from.specified.template.dir}
------------------------------------------
-
-Smarty 3.1 introduced the bracket-syntax for specifying an element from
-[`$template_dir`](#variable.template.dir). This allows websites
-employing multiple sets of templates better control over which template
-to acces.
-
-The bracket-syntax can be used from anywhere you can specify the `file:`
-resource type.
-
-
-    <?php
-
-    // setup template directories
-    $smarty->setTemplateDir(array(
-        './templates',            // element: 0, index: 0
-        './templates_2',          // element: 1, index: 1
-        '10' => 'templates_10',   // element: 2, index: '10'
-        'foo' => 'templates_foo', // element: 3, index: 'foo'
-    ));
-
-    /*
-      assume the template structure
-      ./templates/foo.tpl
-      ./templates_2/foo.tpl
-      ./templates_2/bar.tpl
-      ./templates_10/foo.tpl
-      ./templates_10/bar.tpl
-      ./templates_foo/foo.tpl
-    */
-
-    // regular access
-    $smarty->display('file:foo.tpl'); 
-    // will load ./templates/foo.tpl
-
-    // using numeric index
-    $smarty->display('file:[1]foo.tpl'); 
-    // will load ./templates_2/foo.tpl
-
-    // using numeric string index
-    $smarty->display('file:[10]foo.tpl'); 
-    // will load ./templates_10/foo.tpl
-
-    // using string index
-    $smarty->display('file:[foo]foo.tpl'); 
-    // will load ./templates_foo/foo.tpl
-
-    // using "unknown" numeric index (using element number)
-    $smarty->display('file:[2]foo.tpl'); 
-    // will load ./templates_10/foo.tpl
-
-    ?>
-
-       
-
-From within a Smarty template
-
-
-    {include file="file:foo.tpl"}
-    {* will load ./templates/foo.tpl *}
-
-    {include file="file:[1]foo.tpl"}
-    {* will load ./templates_2/foo.tpl *}
-
-    {include file="file:[foo]foo.tpl"}
-    {* will load ./templates_foo/foo.tpl *}
-
-       
-
-Templates from any directory {#templates.from.any.dir}
-----------------------------
-
-Templates outside of the [`$template_dir`](#variable.template.dir)
-require the `file:` template resource type, followed by the absolute
-path to the template (with leading slash.)
-
-> **Note**
->
-> With [`Security`](#advanced.features.security) enabled, access to
-> templates outside of the [`$template_dir`](#variable.template.dir) is
-> not allowed unless you list those directories in `$secure_dir`.
-
-
-    <?php
-    $smarty->display('file:/export/templates/index.tpl');
-    $smarty->display('file:/path/to/my/templates/menu.tpl');
-    ?>
-
-       
-
-And from within a Smarty template:
-
-
-    {include file='file:/usr/local/share/templates/navigation.tpl'}
-
-       
-
-Windows Filepaths {#templates.windows.filepath}
------------------
-
-If you are using a Windows machine, filepaths usually include a drive
-letter (C:) at the beginning of the pathname. Be sure to use `file:` in
-the path to avoid namespace conflicts and get the desired results.
-
-
-    <?php
-    $smarty->display('file:C:/export/templates/index.tpl');
-    $smarty->display('file:F:/path/to/my/templates/menu.tpl');
-    ?>
-
-      
-
-And from within Smarty template:
-
-
-    {include file='file:D:/usr/local/share/templates/navigation.tpl'}
diff --git a/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md b/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md
deleted file mode 100644
index e0596f591..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/resources-streams.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Stream Template Resources {#resources.streams}
-=========================
-
-Streams allow you to use PHP streams as a template resource. The syntax
-is much the same a traditional template resource names.
-
-Smarty will first look for a registered template resource. If nothing is
-found, it will check if a PHP stream is available. If a stream is
-available, Smarty will use it to fetch the template.
-
-> **Note**
->
-> You can further define allowed streams with security enabled.
-
-Using a PHP stream for a template resource from the display() function.
-
-     
-     $smarty->display('foo:bar.tpl');
-     
-       
-
-Using a PHP stream for a template resource from within a template.
-
-     
-     {include file="foo:bar.tpl"}
-     
-       
diff --git a/vendor/smarty/smarty/docs/programmers/resources/resources-string.md b/vendor/smarty/smarty/docs/programmers/resources/resources-string.md
deleted file mode 100644
index 4b19d8e32..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/resources-string.md
+++ /dev/null
@@ -1,73 +0,0 @@
-String Template Resources {#resources.string}
-=========================
-
-Smarty can render templates from a string by using the `string:` or
-`eval:` resource.
-
--   The `string:` resource behaves much the same as a template file. The
-    template source is compiled from a string and stores the compiled
-    template code for later reuse. Each unique template string will
-    create a new compiled template file. If your template strings are
-    accessed frequently, this is a good choice. If you have frequently
-    changing template strings (or strings with low reuse value), the
-    `eval:` resource may be a better choice, as it doesn\'t save
-    compiled templates to disk.
-
--   The `eval:` resource evaluates the template source every time a page
-    is rendered. This is a good choice for strings with low reuse value.
-    If the same string is accessed frequently, the `string:` resource
-    may be a better choice.
-
-> **Note**
->
-> With a `string:` resource type, each unique string generates a
-> compiled file. Smarty cannot detect a string that has changed, and
-> therefore will generate a new compiled file for each unique string. It
-> is important to choose the correct resource so that you do not fill
-> your disk space with wasted compiled strings.
-
-
-    <?php
-    $smarty->assign('foo','value');
-    $template_string = 'display {$foo} here';
-    $smarty->display('string:'.$template_string); // compiles for later reuse
-    $smarty->display('eval:'.$template_string); // compiles every time
-    ?>
-
-      
-
-From within a Smarty template
-
-
-    {include file="string:$template_string"} {* compiles for later reuse *}
-    {include file="eval:$template_string"} {* compiles every time *}
-
-
-      
-
-Both `string:` and `eval:` resources may be encoded with
-[`urlencode()`](&url.php-manual;urlencode) or
-[`base64_encode()`](&url.php-manual;urlencode). This is not necessary
-for the usual use of `string:` and `eval:`, but is required when using
-either of them in conjunction with
-[`Extends Template Resource`](#resources.extends)
-
-     
-     <?php
-     $smarty->assign('foo','value');
-     $template_string_urlencode = urlencode('display {$foo} here');
-     $template_string_base64 = base64_encode('display {$foo} here');
-     $smarty->display('eval:urlencode:'.$template_string_urlencode); // will decode string using urldecode()
-     $smarty->display('eval:base64:'.$template_string_base64); // will decode string using base64_decode()
-     ?>
-     
-       
-
-From within a Smarty template
-
-     
-     {include file="string:urlencode:$template_string_urlencode"} {* will decode string using urldecode() *}
-     {include file="eval:base64:$template_string_base64"} {* will decode string using base64_decode() *}
-
-     
-       
diff --git a/vendor/smarty/smarty/docs/programmers/resources/template-resources.md b/vendor/smarty/smarty/docs/programmers/resources/template-resources.md
deleted file mode 100644
index 7bb5d752e..000000000
--- a/vendor/smarty/smarty/docs/programmers/resources/template-resources.md
+++ /dev/null
@@ -1,130 +0,0 @@
-Resources {#resasdources}
-=========
-
-The templates may come from a variety of sources. When you
-[`display()`](#api.display) or [`fetch()`](#api.fetch) a template, or
-when you include a template from within another template, you supply a
-resource type, followed by the appropriate path and template name. If a
-resource is not explicitly given, the value of
-[`$default_resource_type`](#variable.default.resource.type) is assumed.
-
-Templates from other sources {#templates.from.elsewhere}
-----------------------------
-
-You can retrieve templates using whatever possible source you can access
-with PHP: databases, sockets, files, etc. You do this by writing
-resource plugin functions and registering them with Smarty.
-
-See [resource plugins](#plugins.resources) section for more information
-on the functions you are supposed to provide.
-
-> **Note**
->
-> Note that you cannot override the built-in `file:` resource, but you
-> can provide a resource that fetches templates from the file system in
-> some other way by registering under another resource name.
-
-
-    <?php
-
-    /**
-     * MySQL Resource
-     *
-     * Resource Implementation based on the Custom API to use
-     * MySQL as the storage resource for Smarty's templates and configs.
-     *
-     * Table definition:
-     * <pre>CREATE TABLE IF NOT EXISTS `templates` (
-     *   `name` varchar(100) NOT NULL,
-     *   `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-     *   `source` text,
-     *   PRIMARY KEY (`name`)
-     * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;</pre>
-     *
-     * Demo data:
-     * <pre>INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');</pre>
-     *
-     * @package Resource-examples
-     * @author Rodney Rehm
-     */
-    class Smarty_Resource_Mysql extends Smarty_Resource_Custom {
-        // PDO instance
-        protected $db;
-        // prepared fetch() statement
-        protected $fetch;
-        // prepared fetchTimestamp() statement
-        protected $mtime;
-
-        public function __construct() {
-            try {
-                $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty", "smarty");
-            } catch (PDOException $e) {
-                throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
-            }
-            $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name');
-            $this->mtime = $this->db->prepare('SELECT modified FROM templates WHERE name = :name');
-        }
-        
-        /**
-         * Fetch a template and its modification time from database
-         *
-         * @param string $name template name
-         * @param string $source template source
-         * @param integer $mtime template modification timestamp (epoch)
-         * @return void
-         */
-        protected function fetch($name, &$source, &$mtime)
-        {
-            $this->fetch->execute(array('name' => $name));
-            $row = $this->fetch->fetch();
-            $this->fetch->closeCursor();
-            if ($row) {
-                $source = $row['source'];
-                $mtime = strtotime($row['modified']);
-            } else {
-                $source = null;
-                $mtime = null;
-            }
-        }
-        
-        /**
-         * Fetch a template's modification time from database
-         *
-         * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source.
-         * @param string $name template name
-         * @return integer timestamp (epoch) the template was modified
-         */
-        protected function fetchTimestamp($name) {
-            $this->mtime->execute(array('name' => $name));
-            $mtime = $this->mtime->fetchColumn();
-            $this->mtime->closeCursor();
-            return strtotime($mtime);
-        }
-    }
-
-
-    require_once 'libs/Smarty.class.php';
-    $smarty = new Smarty();
-    $smarty->registerResource('mysql', new Smarty_Resource_Mysql());
-
-    // using resource from php script
-    $smarty->display("mysql:index.tpl");
-    ?>
-
-         
-
-And from within Smarty template:
-
-
-    {include file='mysql:extras/navigation.tpl'}
-
-         
-
-Default template handler function {#default.template.handler.function}
----------------------------------
-
-You can specify a function that is used to retrieve template contents in
-the event the template cannot be retrieved from its resource. One use of
-this is to create templates that do not exist on-the-fly.
-
-See also [`Streams`](#advanced.features.streams)
diff --git a/vendor/smarty/smarty/docs/programmers/smarty-constants.md b/vendor/smarty/smarty/docs/programmers/smarty-constants.md
deleted file mode 100644
index 042ea5e38..000000000
--- a/vendor/smarty/smarty/docs/programmers/smarty-constants.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Constants {#smarty.constants}
-=========
-
-SMARTY\_DIR {#constant.smarty.dir}
-===========
-
-This is the **full system path** to the location of the Smarty class
-files. If this is not defined in your script, then Smarty will attempt
-to determine the appropriate value automatically. If defined, the path
-**must end with a trailing slash/**.
-
-
-    <?php
-    // set path to Smarty directory *nix style
-    define('SMARTY_DIR', '/usr/local/lib/php/Smarty-v.e.r/libs/');
-
-    // path to Smarty windows style
-    define('SMARTY_DIR', 'c:/webroot/libs/Smarty-v.e.r/libs/');
-
-    // include the smarty class, note 'S' is upper case
-    require_once(SMARTY_DIR . 'Smarty.class.php');
-    ?>
-
-         
-
-See also [`$smarty.const`](../designers/language-variables/language-variables-smarty.md) and
-[`$php_handling constants`](./api-variables/variable-php-handling.md)
diff --git a/vendor/smarty/smarty/libs/Smarty.class.php b/vendor/smarty/smarty/libs/Smarty.class.php
index 0abbe6a7d..820a1ebde 100644
--- a/vendor/smarty/smarty/libs/Smarty.class.php
+++ b/vendor/smarty/smarty/libs/Smarty.class.php
@@ -98,7 +98,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.1.0';
+    const SMARTY_VERSION = '4.1.1';
     /**
      * define variable scopes
      */
@@ -867,7 +867,7 @@ class Smarty extends Smarty_Internal_TemplateBase
                 $this->plugins_dir = (array)$this->plugins_dir;
             }
             foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true);
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v ?? '', '/\\') . DIRECTORY_SEPARATOR, true);
             }
             $this->_cache[ 'plugin_files' ] = array();
             $this->_pluginsDirNormalized = true;
@@ -1345,7 +1345,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      */
     private function _normalizeDir($dirName, $dir)
     {
-        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        $this->{$dirName} = $this->_realpath(rtrim($dir ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
     }
 
     /**
@@ -1367,7 +1367,7 @@ class Smarty extends Smarty_Internal_TemplateBase
         }
         foreach ($dir as $k => $v) {
             if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v ?? '', "/\\") . DIRECTORY_SEPARATOR, true);
                 $processed[ $k ] = true;
             }
         }
diff --git a/vendor/smarty/smarty/libs/plugins/function.math.php b/vendor/smarty/smarty/libs/plugins/function.math.php
index fd5b3d166..8560e9441 100644
--- a/vendor/smarty/smarty/libs/plugins/function.math.php
+++ b/vendor/smarty/smarty/libs/plugins/function.math.php
@@ -69,7 +69,7 @@ function smarty_function_math($params, $template)
     // Adapted from https://www.php.net/manual/en/function.eval.php#107377
     $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number
     $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))';
-    $operators = '[+\/*\^%-]'; // Allowed math operators
+    $operators = '[,+\/*\^%-]'; // Allowed math operators
     $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)+\)|\((?1)+\)))(?:'.$operators.'(?1))?)+$/';
 
     if (!preg_match($regexp, $equation)) {
diff --git a/vendor/smarty/smarty/libs/plugins/modifier.escape.php b/vendor/smarty/smarty/libs/plugins/modifier.escape.php
index 47489aa98..3ce483827 100644
--- a/vendor/smarty/smarty/libs/plugins/modifier.escape.php
+++ b/vendor/smarty/smarty/libs/plugins/modifier.escape.php
@@ -29,6 +29,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $
     if (!$char_set) {
         $char_set = Smarty::$_CHARSET;
     }
+
+    $string = (string)$string;
+
     switch ($esc_type) {
         case 'html':
             if ($_double_encode) {
diff --git a/vendor/smarty/smarty/libs/plugins/modifier.truncate.php b/vendor/smarty/smarty/libs/plugins/modifier.truncate.php
index 33e7e53aa..80dcdb531 100644
--- a/vendor/smarty/smarty/libs/plugins/modifier.truncate.php
+++ b/vendor/smarty/smarty/libs/plugins/modifier.truncate.php
@@ -42,8 +42,8 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
             if (!$middle) {
                 return mb_substr($string, 0, $length, Smarty::$_CHARSET) . $etc;
             }
-            return mb_substr($string, 0, $length / 2, Smarty::$_CHARSET) . $etc .
-                   mb_substr($string, -$length / 2, $length, Smarty::$_CHARSET);
+            return mb_substr($string, 0, intval($length / 2), Smarty::$_CHARSET) . $etc .
+                   mb_substr($string, -intval($length / 2), $length, Smarty::$_CHARSET);
         }
         return $string;
     }
@@ -56,7 +56,7 @@ function smarty_modifier_truncate($string, $length = 80, $etc = '...', $break_wo
         if (!$middle) {
             return substr($string, 0, $length) . $etc;
         }
-        return substr($string, 0, $length / 2) . $etc . substr($string, -$length / 2);
+        return substr($string, 0, intval($length / 2)) . $etc . substr($string, -intval($length / 2));
     }
     return $string;
 }
diff --git a/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php b/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php
index 70b95cc9d..1fc5e7817 100644
--- a/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php
+++ b/vendor/smarty/smarty/libs/plugins/modifiercompiler.escape.php
@@ -42,10 +42,10 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
         switch ($esc_type) {
             case 'html':
                 if ($_double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
                            var_export($double_encode, true) . ')';
                 } elseif ($double_encode) {
-                    return 'htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+                    return 'htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
@@ -54,12 +54,12 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
                 if (Smarty::$_MBSTRING) {
                     if ($_double_encode) {
                         // php >=5.2.3 - go native
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                        return 'mb_convert_encoding(htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' .
                                var_export($char_set, true) . ', ' . var_export($double_encode, true) .
                                '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
                     } elseif ($double_encode) {
                         // php <5.2.3 - only handle double encoding
-                        return 'mb_convert_encoding(htmlspecialchars(' . $params[ 0 ] . ', ENT_QUOTES, ' .
+                        return 'mb_convert_encoding(htmlspecialchars((string)' . $params[ 0 ] . ', ENT_QUOTES, ' .
                                var_export($char_set, true) . '), "HTML-ENTITIES", ' . var_export($char_set, true) . ')';
                     } else {
                         // fall back to modifier.escape.php
@@ -68,26 +68,26 @@ function smarty_modifiercompiler_escape($params, Smarty_Internal_TemplateCompile
                 // no MBString fallback
                 if ($_double_encode) {
                     // php >=5.2.3 - go native
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
+                    return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ', ' .
                            var_export($double_encode, true) . ')';
                 } elseif ($double_encode) {
                     // php <5.2.3 - only handle double encoding
-                    return 'htmlentities(' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
+                    return 'htmlentities((string)' . $params[ 0 ] . ', ENT_QUOTES, ' . var_export($char_set, true) . ')';
                 } else {
                     // fall back to modifier.escape.php
                 }
             // no break
             case 'url':
-                return 'rawurlencode(' . $params[ 0 ] . ')';
+                return 'rawurlencode((string)' . $params[ 0 ] . ')';
             case 'urlpathinfo':
-                return 'str_replace("%2F", "/", rawurlencode(' . $params[ 0 ] . '))';
+                return 'str_replace("%2F", "/", rawurlencode((string)' . $params[ 0 ] . '))';
             case 'quotes':
                 // escape unescaped single quotes
-                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'",' . $params[ 0 ] . ')';
+                return 'preg_replace("%(?<!\\\\\\\\)\'%", "\\\'", (string)' . $params[ 0 ] . ')';
             case 'javascript':
                 // escape quotes and backslashes, newlines, etc.
                 // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements
-                return 'strtr(' .
+                return 'strtr((string)' .
                        $params[ 0 ] .
                        ', array("\\\\" => "\\\\\\\\", "\'" => "\\\\\'", "\"" => "\\\\\"", "\\r" => "\\\\r", "\\n" => "\\\n", "</" => "<\/", "<!--" => "<\!--", "<s" => "<\s", "<S" => "<\S" ))';
         }
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php
index 8ff15d8e5..cbaccd2b3 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_block.php
@@ -125,7 +125,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
         // setup buffer for template function code
         $compiler->parser->current_buffer = new Smarty_Internal_ParseTree_Template();
         $output = "<?php\n";
-        $output .= "/* {block {$_name}} */\n";
+        $output .= $compiler->cStyleComment(" {block {$_name}} ") . "\n";
         $output .= "class {$_className} extends Smarty_Internal_Block\n";
         $output .= "{\n";
         foreach ($_block as $property => $value) {
@@ -155,7 +155,7 @@ class Smarty_Internal_Compile_Blockclose extends Smarty_Internal_Compile_Shared_
         }
         $output .= "}\n";
         $output .= "}\n";
-        $output .= "/* {/block {$_name}} */\n\n";
+        $output .= $compiler->cStyleComment(" {/block {$_name}} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
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 84e9584d9..b05a82b74 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_function.php
@@ -134,7 +134,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
         if ($compiler->template->compiled->has_nocache_code) {
             $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name_caching' ] = $_funcNameCaching;
             $output = "<?php\n";
-            $output .= "/* {$_funcNameCaching} */\n";
+            $output .= $compiler->cStyleComment(" {$_funcNameCaching} ") . "\n";
             $output .= "if (!function_exists('{$_funcNameCaching}')) {\n";
             $output .= "function {$_funcNameCaching} (Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
             $output .= "ob_start();\n";
@@ -159,7 +159,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
             $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
             $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
             $output .= "}\n}\n";
-            $output .= "/*/ {$_funcName}_nocache */\n\n";
+            $output .= $compiler->cStyleComment("/ {$_funcName}_nocache ") . "\n\n";
             $output .= "?>\n";
             $compiler->parser->current_buffer->append_subtree(
                 $compiler->parser,
@@ -179,7 +179,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
         }
         $compiler->parent_compiler->tpl_function[ $_name ][ 'call_name' ] = $_funcName;
         $output = "<?php\n";
-        $output .= "/* {$_funcName} */\n";
+        $output .= $compiler->cStyleComment(" {$_funcName} ") . "\n";
         $output .= "if (!function_exists('{$_funcName}')) {\n";
         $output .= "function {$_funcName}(Smarty_Internal_Template \$_smarty_tpl,\$params) {\n";
         $output .= $_paramsCode;
@@ -196,7 +196,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
         );
         $compiler->parser->current_buffer->append_subtree($compiler->parser, $_functionCode);
         $output = "<?php\n}}\n";
-        $output .= "/*/ {$_funcName} */\n\n";
+        $output .= $compiler->cStyleComment("/ {$_funcName} ") . "\n\n";
         $output .= "?>\n";
         $compiler->parser->current_buffer->append_subtree(
             $compiler->parser,
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php
index 716c91d49..bf62461bc 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_include.php
@@ -318,14 +318,14 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
             }
             // get compiled code
             $compiled_code = "<?php\n\n";
-            $compiled_code .= "/* Start inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" Start inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= "function {$tpl->compiled->unifunc} (Smarty_Internal_Template \$_smarty_tpl) {\n";
             $compiled_code .= "?>\n" . $tpl->compiler->compileTemplateSource($tpl, null, $compiler->parent_compiler);
             $compiled_code .= "<?php\n";
             $compiled_code .= "}\n?>\n";
             $compiled_code .= $tpl->compiler->postFilter($tpl->compiler->blockOrFunctionCode);
             $compiled_code .= "<?php\n\n";
-            $compiled_code .= "/* End inline template \"{$sourceInfo}\" =============================*/\n";
+            $compiled_code .= $compiler->cStyleComment(" End inline template \"{$sourceInfo}\" =============================") . "\n";
             $compiled_code .= '?>';
             unset($tpl->compiler);
             if ($tpl->compiled->has_nocache_code) {
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php
index c91ff62cb..29031d910 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_compile_insert.php
@@ -93,7 +93,7 @@ class Smarty_Internal_Compile_Insert extends Smarty_Internal_CompileBase
                 }
                 if (!empty($_dir)) {
                     foreach ((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
+                        $_script_dir = rtrim($_script_dir ?? '', '/\\') . DIRECTORY_SEPARATOR;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
index a9b940e5a..469b9667a 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_config_file_compiler.php
@@ -157,10 +157,12 @@ class Smarty_Internal_Config_File_Compiler
             $this->smarty->_debug->end_compile($this->template);
         }
         // template header code
-        $template_header =
-            "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . date("Y-m-d H:i:s") .
-            "\n";
-        $template_header .= "         compiled from '{$this->template->source->filepath}' */ ?>\n";
+        $template_header = sprintf(
+            "<?php /* Smarty version %s, created on %s\n         compiled from '%s' */ ?>\n",
+            Smarty::SMARTY_VERSION,
+            date("Y-m-d H:i:s"),
+            str_replace('*/', '* /' , $this->template->source->filepath)
+        );
         $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .
                 var_export($this->config_data, true) . '); ?>';
         return $template_header . $this->template->smarty->ext->_codeFrame->create($this->template, $code);
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
index b5361c9bb..d0ca751e2 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_runtime_codeframe.php
@@ -44,9 +44,12 @@ class Smarty_Internal_Runtime_CodeFrame
             $properties[ 'file_dependency' ] = $_template->cached->file_dependency;
             $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
         }
-        $output = "<?php\n";
-        $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . date("Y-m-d H:i:s") .
-                   "\n  from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
+        $output = sprintf(
+			"<?php\n/* Smarty version %s, created on %s\n  from '%s' */\n\n",
+            $properties[ 'version' ],
+	        date("Y-m-d H:i:s"),
+	        str_replace('*/', '* /', $_template->source->filepath)
+        );
         $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
         $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .
                ($cache ? 'true' : 'false') . ')';
diff --git a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
index 272616148..bd500abe4 100644
--- a/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
+++ b/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatecompilerbase.php
@@ -1439,6 +1439,10 @@ abstract class Smarty_Internal_TemplateCompilerBase
      */
     abstract protected function doCompile($_content, $isTemplateSource = false);
 
+    public function cStyleComment($string) {
+        return '/*' . str_replace('*/', '* /' , $string) . '*/';
+    }
+
     /**
      * Compile Tag
      *
diff --git a/vendor/symfony/polyfill-ctype/Ctype.php b/vendor/symfony/polyfill-ctype/Ctype.php
deleted file mode 100644
index ba75a2c95..000000000
--- a/vendor/symfony/polyfill-ctype/Ctype.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Ctype;
-
-/**
- * Ctype implementation through regex.
- *
- * @internal
- *
- * @author Gert de Pagter <BackEndTea@gmail.com>
- */
-final class Ctype
-{
-    /**
-     * Returns TRUE if every character in text is either a letter or a digit, FALSE otherwise.
-     *
-     * @see https://php.net/ctype-alnum
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_alnum($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z0-9]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is a letter, FALSE otherwise.
-     *
-     * @see https://php.net/ctype-alpha
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_alpha($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^A-Za-z]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is a control character from the current locale, FALSE otherwise.
-     *
-     * @see https://php.net/ctype-cntrl
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_cntrl($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^\x00-\x1f\x7f]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in the string text is a decimal digit, FALSE otherwise.
-     *
-     * @see https://php.net/ctype-digit
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_digit($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^0-9]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is printable and actually creates visible output (no white space), FALSE otherwise.
-     *
-     * @see https://php.net/ctype-graph
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_graph($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^!-~]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is a lowercase letter.
-     *
-     * @see https://php.net/ctype-lower
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_lower($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^a-z]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text will actually create output (including blanks). Returns FALSE if text contains control characters or characters that do not have any output or control function at all.
-     *
-     * @see https://php.net/ctype-print
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_print($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^ -~]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is printable, but neither letter, digit or blank, FALSE otherwise.
-     *
-     * @see https://php.net/ctype-punct
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_punct($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^!-\/\:-@\[-`\{-~]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text creates some sort of white space, FALSE otherwise. Besides the blank character this also includes tab, vertical tab, line feed, carriage return and form feed characters.
-     *
-     * @see https://php.net/ctype-space
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_space($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^\s]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is an uppercase letter.
-     *
-     * @see https://php.net/ctype-upper
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_upper($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^A-Z]/', $text);
-    }
-
-    /**
-     * Returns TRUE if every character in text is a hexadecimal 'digit', that is a decimal digit or a character from [A-Fa-f] , FALSE otherwise.
-     *
-     * @see https://php.net/ctype-xdigit
-     *
-     * @param mixed $text
-     *
-     * @return bool
-     */
-    public static function ctype_xdigit($text)
-    {
-        $text = self::convert_int_to_char_for_ctype($text, __FUNCTION__);
-
-        return \is_string($text) && '' !== $text && !preg_match('/[^A-Fa-f0-9]/', $text);
-    }
-
-    /**
-     * Converts integers to their char versions according to normal ctype behaviour, if needed.
-     *
-     * If an integer between -128 and 255 inclusive is provided,
-     * it is interpreted as the ASCII value of a single character
-     * (negative values have 256 added in order to allow characters in the Extended ASCII range).
-     * Any other integer is interpreted as a string containing the decimal digits of the integer.
-     *
-     * @param mixed  $int
-     * @param string $function
-     *
-     * @return mixed
-     */
-    private static function convert_int_to_char_for_ctype($int, $function)
-    {
-        if (!\is_int($int)) {
-            return $int;
-        }
-
-        if ($int < -128 || $int > 255) {
-            return (string) $int;
-        }
-
-        if (\PHP_VERSION_ID >= 80100) {
-            @trigger_error($function.'(): Argument of type int will be interpreted as string in the future', \E_USER_DEPRECATED);
-        }
-
-        if ($int < 0) {
-            $int += 256;
-        }
-
-        return \chr($int);
-    }
-}
diff --git a/vendor/symfony/polyfill-ctype/LICENSE b/vendor/symfony/polyfill-ctype/LICENSE
deleted file mode 100644
index 3f853aaf3..000000000
--- a/vendor/symfony/polyfill-ctype/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2018-2019 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/symfony/polyfill-ctype/README.md b/vendor/symfony/polyfill-ctype/README.md
deleted file mode 100644
index 8add1ab00..000000000
--- a/vendor/symfony/polyfill-ctype/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Symfony Polyfill / Ctype
-========================
-
-This component provides `ctype_*` functions to users who run php versions without the ctype extension.
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-ctype/bootstrap.php b/vendor/symfony/polyfill-ctype/bootstrap.php
deleted file mode 100644
index d54524b31..000000000
--- a/vendor/symfony/polyfill-ctype/bootstrap.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Ctype as p;
-
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
-if (!function_exists('ctype_alnum')) {
-    function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
-}
-if (!function_exists('ctype_alpha')) {
-    function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); }
-}
-if (!function_exists('ctype_cntrl')) {
-    function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); }
-}
-if (!function_exists('ctype_digit')) {
-    function ctype_digit($text) { return p\Ctype::ctype_digit($text); }
-}
-if (!function_exists('ctype_graph')) {
-    function ctype_graph($text) { return p\Ctype::ctype_graph($text); }
-}
-if (!function_exists('ctype_lower')) {
-    function ctype_lower($text) { return p\Ctype::ctype_lower($text); }
-}
-if (!function_exists('ctype_print')) {
-    function ctype_print($text) { return p\Ctype::ctype_print($text); }
-}
-if (!function_exists('ctype_punct')) {
-    function ctype_punct($text) { return p\Ctype::ctype_punct($text); }
-}
-if (!function_exists('ctype_space')) {
-    function ctype_space($text) { return p\Ctype::ctype_space($text); }
-}
-if (!function_exists('ctype_upper')) {
-    function ctype_upper($text) { return p\Ctype::ctype_upper($text); }
-}
-if (!function_exists('ctype_xdigit')) {
-    function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); }
-}
diff --git a/vendor/symfony/polyfill-ctype/bootstrap80.php b/vendor/symfony/polyfill-ctype/bootstrap80.php
deleted file mode 100644
index ab2f8611d..000000000
--- a/vendor/symfony/polyfill-ctype/bootstrap80.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Ctype as p;
-
-if (!function_exists('ctype_alnum')) {
-    function ctype_alnum(mixed $text): bool { return p\Ctype::ctype_alnum($text); }
-}
-if (!function_exists('ctype_alpha')) {
-    function ctype_alpha(mixed $text): bool { return p\Ctype::ctype_alpha($text); }
-}
-if (!function_exists('ctype_cntrl')) {
-    function ctype_cntrl(mixed $text): bool { return p\Ctype::ctype_cntrl($text); }
-}
-if (!function_exists('ctype_digit')) {
-    function ctype_digit(mixed $text): bool { return p\Ctype::ctype_digit($text); }
-}
-if (!function_exists('ctype_graph')) {
-    function ctype_graph(mixed $text): bool { return p\Ctype::ctype_graph($text); }
-}
-if (!function_exists('ctype_lower')) {
-    function ctype_lower(mixed $text): bool { return p\Ctype::ctype_lower($text); }
-}
-if (!function_exists('ctype_print')) {
-    function ctype_print(mixed $text): bool { return p\Ctype::ctype_print($text); }
-}
-if (!function_exists('ctype_punct')) {
-    function ctype_punct(mixed $text): bool { return p\Ctype::ctype_punct($text); }
-}
-if (!function_exists('ctype_space')) {
-    function ctype_space(mixed $text): bool { return p\Ctype::ctype_space($text); }
-}
-if (!function_exists('ctype_upper')) {
-    function ctype_upper(mixed $text): bool { return p\Ctype::ctype_upper($text); }
-}
-if (!function_exists('ctype_xdigit')) {
-    function ctype_xdigit(mixed $text): bool { return p\Ctype::ctype_xdigit($text); }
-}
diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json
deleted file mode 100644
index ccb8e5703..000000000
--- a/vendor/symfony/polyfill-ctype/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "symfony/polyfill-ctype",
-    "type": "library",
-    "description": "Symfony polyfill for ctype functions",
-    "keywords": ["polyfill", "compatibility", "portable", "ctype"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Gert de Pagter",
-            "email": "BackEndTea@gmail.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "provide": {
-        "ext-ctype": "*"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Ctype\\": "" },
-        "files": [ "bootstrap.php" ]
-    },
-    "suggest": {
-        "ext-ctype": "For best performance"
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.23-dev"
-        },
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/LICENSE b/vendor/symfony/polyfill-php80/LICENSE
deleted file mode 100644
index 5593b1d84..000000000
--- a/vendor/symfony/polyfill-php80/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2020 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/symfony/polyfill-php80/Php80.php b/vendor/symfony/polyfill-php80/Php80.php
deleted file mode 100644
index 5fef51184..000000000
--- a/vendor/symfony/polyfill-php80/Php80.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php80;
-
-/**
- * @author Ion Bazan <ion.bazan@gmail.com>
- * @author Nico Oelgart <nicoswd@gmail.com>
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-final class Php80
-{
-    public static function fdiv(float $dividend, float $divisor): float
-    {
-        return @($dividend / $divisor);
-    }
-
-    public static function get_debug_type($value): string
-    {
-        switch (true) {
-            case null === $value: return 'null';
-            case \is_bool($value): return 'bool';
-            case \is_string($value): return 'string';
-            case \is_array($value): return 'array';
-            case \is_int($value): return 'int';
-            case \is_float($value): return 'float';
-            case \is_object($value): break;
-            case $value instanceof \__PHP_Incomplete_Class: return '__PHP_Incomplete_Class';
-            default:
-                if (null === $type = @get_resource_type($value)) {
-                    return 'unknown';
-                }
-
-                if ('Unknown' === $type) {
-                    $type = 'closed';
-                }
-
-                return "resource ($type)";
-        }
-
-        $class = \get_class($value);
-
-        if (false === strpos($class, '@')) {
-            return $class;
-        }
-
-        return (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous';
-    }
-
-    public static function get_resource_id($res): int
-    {
-        if (!\is_resource($res) && null === @get_resource_type($res)) {
-            throw new \TypeError(sprintf('Argument 1 passed to get_resource_id() must be of the type resource, %s given', get_debug_type($res)));
-        }
-
-        return (int) $res;
-    }
-
-    public static function preg_last_error_msg(): string
-    {
-        switch (preg_last_error()) {
-            case \PREG_INTERNAL_ERROR:
-                return 'Internal error';
-            case \PREG_BAD_UTF8_ERROR:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            case \PREG_BAD_UTF8_OFFSET_ERROR:
-                return 'The offset did not correspond to the beginning of a valid UTF-8 code point';
-            case \PREG_BACKTRACK_LIMIT_ERROR:
-                return 'Backtrack limit exhausted';
-            case \PREG_RECURSION_LIMIT_ERROR:
-                return 'Recursion limit exhausted';
-            case \PREG_JIT_STACKLIMIT_ERROR:
-                return 'JIT stack limit exhausted';
-            case \PREG_NO_ERROR:
-                return 'No error';
-            default:
-                return 'Unknown error';
-        }
-    }
-
-    public static function str_contains(string $haystack, string $needle): bool
-    {
-        return '' === $needle || false !== strpos($haystack, $needle);
-    }
-
-    public static function str_starts_with(string $haystack, string $needle): bool
-    {
-        return 0 === strncmp($haystack, $needle, \strlen($needle));
-    }
-
-    public static function str_ends_with(string $haystack, string $needle): bool
-    {
-        return '' === $needle || ('' !== $haystack && 0 === substr_compare($haystack, $needle, -\strlen($needle)));
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/README.md b/vendor/symfony/polyfill-php80/README.md
deleted file mode 100644
index 10b8ee49a..000000000
--- a/vendor/symfony/polyfill-php80/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Symfony Polyfill / Php80
-========================
-
-This component provides features added to PHP 8.0 core:
-
-- `Stringable` interface
-- [`fdiv`](https://php.net/fdiv)
-- `ValueError` class
-- `UnhandledMatchError` class
-- `FILTER_VALIDATE_BOOL` constant
-- [`get_debug_type`](https://php.net/get_debug_type)
-- [`preg_last_error_msg`](https://php.net/preg_last_error_msg)
-- [`str_contains`](https://php.net/str_contains)
-- [`str_starts_with`](https://php.net/str_starts_with)
-- [`str_ends_with`](https://php.net/str_ends_with)
-- [`get_resource_id`](https://php.net/get_resource_id)
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php b/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
deleted file mode 100644
index 7ea6d2772..000000000
--- a/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-#[Attribute(Attribute::TARGET_CLASS)]
-final class Attribute
-{
-    public const TARGET_CLASS = 1;
-    public const TARGET_FUNCTION = 2;
-    public const TARGET_METHOD = 4;
-    public const TARGET_PROPERTY = 8;
-    public const TARGET_CLASS_CONSTANT = 16;
-    public const TARGET_PARAMETER = 32;
-    public const TARGET_ALL = 63;
-    public const IS_REPEATABLE = 64;
-
-    /** @var int */
-    public $flags;
-
-    public function __construct(int $flags = self::TARGET_ALL)
-    {
-        $this->flags = $flags;
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php b/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
deleted file mode 100644
index 77e037cb5..000000000
--- a/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (\PHP_VERSION_ID < 80000) {
-    interface Stringable
-    {
-        /**
-         * @return string
-         */
-        public function __toString();
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
deleted file mode 100644
index 37937cbfa..000000000
--- a/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (\PHP_VERSION_ID < 80000) {
-    class UnhandledMatchError extends Error
-    {
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php b/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
deleted file mode 100644
index a3a9b88b0..000000000
--- a/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (\PHP_VERSION_ID < 80000) {
-    class ValueError extends Error
-    {
-    }
-}
diff --git a/vendor/symfony/polyfill-php80/bootstrap.php b/vendor/symfony/polyfill-php80/bootstrap.php
deleted file mode 100644
index e5f7dbc1a..000000000
--- a/vendor/symfony/polyfill-php80/bootstrap.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php80 as p;
-
-if (\PHP_VERSION_ID >= 80000) {
-    return;
-}
-
-if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) {
-    define('FILTER_VALIDATE_BOOL', \FILTER_VALIDATE_BOOLEAN);
-}
-
-if (!function_exists('fdiv')) {
-    function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $num2); }
-}
-if (!function_exists('preg_last_error_msg')) {
-    function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
-}
-if (!function_exists('str_contains')) {
-    function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_starts_with')) {
-    function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_ends_with')) {
-    function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('get_debug_type')) {
-    function get_debug_type($value): string { return p\Php80::get_debug_type($value); }
-}
-if (!function_exists('get_resource_id')) {
-    function get_resource_id($resource): int { return p\Php80::get_resource_id($resource); }
-}
diff --git a/vendor/symfony/polyfill-php80/composer.json b/vendor/symfony/polyfill-php80/composer.json
deleted file mode 100644
index 5fe679db3..000000000
--- a/vendor/symfony/polyfill-php80/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "symfony/polyfill-php80",
-    "type": "library",
-    "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-    "keywords": ["polyfill", "shim", "compatibility", "portable"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Ion Bazan",
-            "email": "ion.bazan@gmail.com"
-        },
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Php80\\": "" },
-        "files": [ "bootstrap.php" ],
-        "classmap": [ "Resources/stubs" ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.23-dev"
-        },
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9ea668963..b6d47e3c3 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -104,11 +104,11 @@
 .wall-item-info {
 	display: block;
 	float: left;
-	margin-right: 10px;
+	margin-right: .75rem;
 }
 
 .wall-item-wrapper {
-	margin-left:10px;
+	margin-left: .75rem;
 }
 
 .wall-item-photo-wrapper {
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index a9d2fdd48..ce0a26aaa 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -5,8 +5,8 @@
 # Translators:
 # Alfonso Martínez, 2015
 # inboxwall <axetransit@gmail.com>, 2015
-# jeroenpraat, 2015
-# Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2017-2021
+# 0019cac9045ba5ad44f6e8f0d6edc0ee_372278a, 2015
+# Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2017-2022
 # Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2015-2017
 # Rafael, 2015
 # tony baldwin <tonybaldwin@gmx.com>, 2014
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hubzilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 08:26+0000\n"
-"PO-Revision-Date: 2021-05-14 18:05+0000\n"
-"Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n"
+"POT-Creation-Date: 2022-03-23 20:16+0000\n"
+"PO-Revision-Date: 2015-09-27 06:48+0000\n"
+"Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2017-2022\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,16 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
+#: ../../store/[data]/smarty3/compiled/2cbde885645602969010e846a38817a1297aafb9_0.file.cover_photo.tpl.php:127
+msgid "Cover Photo"
+msgstr "Imagen de portada del perfil"
+
 #: ../../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
+#: ../../include/text.php:3451 ../../Zotlabs/Module/Admin/Site.php:251
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -40,99 +44,100 @@ msgstr "Focus (predefinido)"
 
 #: ../../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/openclipatar/openclipatar.php:54
+#: ../../addon/photocache/Mod_Photocache.php:63
+#: ../../addon/redred/Mod_Redred.php:88
 #: ../../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/statusnet/Mod_Statusnet.php:191
+#: ../../addon/statusnet/Mod_Statusnet.php:249
+#: ../../addon/statusnet/Mod_Statusnet.php:304
+#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:70
+#: ../../addon/wppost/Mod_Wppost.php:107
+#: ../../addon/content_import/Mod_content_import.php:141
 #: ../../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/pubcrawl/Mod_Pubcrawl.php:62
+#: ../../addon/dwpost/Mod_Dwpost.php:78
+#: ../../addon/startpage/Mod_Startpage.php:71
+#: ../../addon/twitter/Mod_Twitter.php:182
+#: ../../addon/pumpio/Mod_Pumpio.php:113
 #: ../../addon/cart/submodules/subscriptions.php:410
-#: ../../addon/cart/submodules/hzservices.php:643
+#: ../../addon/cart/submodules/hzservices.php:645
 #: ../../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/nofed/Mod_Nofed.php:51
+#: ../../addon/smileybutton/Mod_Smileybutton.php:53
+#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:86
+#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../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/fuzzloc/Mod_Fuzzloc.php:54 ../../addon/hubwall/hubwall.php:95
+#: ../../addon/flashcards/Mod_Flashcards.php:269
+#: ../../addon/libertree/Mod_Libertree.php:68 ../../addon/logrot/logrot.php:35
+#: ../../addon/skeleton/Mod_Skeleton.php:49
+#: ../../addon/socialauth/Mod_SocialAuth.php:341
+#: ../../addon/nsfw/Mod_Nsfw.php:59 ../../addon/mailtest/mailtest.php:100
+#: ../../addon/ljpost/Mod_Ljpost.php:80 ../../addon/hzfiles/hzfiles.php:86
+#: ../../addon/pageheader/Mod_Pageheader.php:52 ../../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/Widget/Wiki_pages.php:48
+#: ../../Zotlabs/Widget/Wiki_pages.php:105 ../../Zotlabs/Module/Tokens.php:294
+#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:356 ../../Zotlabs/Module/Group.php:150
+#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Oauth.php:109
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246
+#: ../../Zotlabs/Module/Poke.php:215 ../../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/Site.php:415
 #: ../../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/Regate.php:407 ../../Zotlabs/Module/Permcats.php:257
+#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Appman.php:221
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Contactedit.php:462
 #: ../../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/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104
+#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Profiles.php:740
 #: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:168
+#: ../../Zotlabs/Module/Affinity.php:84
 #: ../../Zotlabs/Module/Settings/Network.php:62
 #: ../../Zotlabs/Module/Settings/Features.php:48
-#: ../../Zotlabs/Module/Settings/Channel.php:495
+#: ../../Zotlabs/Module/Settings/Channel.php:228
 #: ../../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/Display.php:186
 #: ../../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/Privacy.php:110
 #: ../../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/Module/Defperms.php:263 ../../Zotlabs/Module/Pconfig.php:116
+#: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328
+#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:106
+#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Connedit.php:714
+#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:123
+#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Lib/ThreadItem.php:865
 #: ../../Zotlabs/Storage/Browser.php:382
 msgid "Submit"
 msgstr "Enviar"
@@ -148,26 +153,26 @@ msgstr "Estrechar la barra de navegación"
 #: ../../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/redred/Mod_Redred.php:61
+#: ../../addon/statusnet/Mod_Statusnet.php:258
+#: ../../addon/statusnet/Mod_Statusnet.php:280
+#: ../../addon/statusnet/Mod_Statusnet.php:289
+#: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/wppost/Mod_Wppost.php:84
+#: ../../addon/wppost/Mod_Wppost.php:88 ../../addon/wppost/Mod_Wppost.php:92
+#: ../../addon/content_import/Mod_content_import.php:136
 #: ../../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/pubcrawl/Mod_Pubcrawl.php:42
+#: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63
+#: ../../addon/twitter/Mod_Twitter.php:160
+#: ../../addon/twitter/Mod_Twitter.php:169
+#: ../../addon/pumpio/Mod_Pumpio.php:92 ../../addon/pumpio/Mod_Pumpio.php:96
+#: ../../addon/pumpio/Mod_Pumpio.php:100
 #: ../../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/hzservices.php:67
+#: ../../addon/cart/submodules/hzservices.php:651
+#: ../../addon/cart/submodules/hzservices.php:655
 #: ../../addon/cart/submodules/orderoptions.php:72
 #: ../../addon/cart/submodules/orderoptions.php:338
 #: ../../addon/cart/submodules/orderoptions.php:362
@@ -181,61 +186,69 @@ msgstr "Estrechar la barra de navegación"
 #: ../../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
+#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:40
+#: ../../addon/smileybutton/Mod_Smileybutton.php:42
+#: ../../addon/diaspora/Mod_Diaspora.php:70
+#: ../../addon/libertree/Mod_Libertree.php:57
+#: ../../addon/socialauth/Mod_SocialAuth.php:218
+#: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65
+#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1493
+#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604
+#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
+#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
+#: ../../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/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/Admin/Site.php:319
+#: ../../Zotlabs/Module/Permcats.php:247
+#: ../../Zotlabs/Module/Contactedit.php:284
+#: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Api.php:99
+#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:676
+#: ../../Zotlabs/Module/Profiles.php:686 ../../Zotlabs/Module/Profiles.php:694
+#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Settings/Channel.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
 #: ../../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/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/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
+#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+#: ../../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:1757
 msgid "No"
 msgstr "No"
 
 #: ../../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/redred/Mod_Redred.php:61
+#: ../../addon/statusnet/Mod_Statusnet.php:258
+#: ../../addon/statusnet/Mod_Statusnet.php:280
+#: ../../addon/statusnet/Mod_Statusnet.php:289
+#: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/wppost/Mod_Wppost.php:84
+#: ../../addon/wppost/Mod_Wppost.php:88 ../../addon/wppost/Mod_Wppost.php:92
+#: ../../addon/content_import/Mod_content_import.php:136
 #: ../../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/pubcrawl/Mod_Pubcrawl.php:42
+#: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63
+#: ../../addon/twitter/Mod_Twitter.php:160
+#: ../../addon/twitter/Mod_Twitter.php:169
+#: ../../addon/pumpio/Mod_Pumpio.php:92 ../../addon/pumpio/Mod_Pumpio.php:96
+#: ../../addon/pumpio/Mod_Pumpio.php:100
 #: ../../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/hzservices.php:67
+#: ../../addon/cart/submodules/hzservices.php:651
+#: ../../addon/cart/submodules/hzservices.php:655
 #: ../../addon/cart/submodules/orderoptions.php:72
 #: ../../addon/cart/submodules/orderoptions.php:337
 #: ../../addon/cart/submodules/orderoptions.php:361
@@ -249,34 +262,42 @@ msgstr "No"
 #: ../../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
+#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:40
+#: ../../addon/smileybutton/Mod_Smileybutton.php:42
+#: ../../addon/diaspora/Mod_Diaspora.php:70
+#: ../../addon/libertree/Mod_Libertree.php:57
+#: ../../addon/socialauth/Mod_SocialAuth.php:218
+#: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65
+#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1493
+#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604
+#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
+#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
+#: ../../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/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/Admin/Site.php:321
+#: ../../Zotlabs/Module/Permcats.php:247
+#: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Api.php:98
+#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:676
+#: ../../Zotlabs/Module/Profiles.php:686 ../../Zotlabs/Module/Profiles.php:694
+#: ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Settings/Channel.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
 #: ../../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/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/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
+#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Sources.php:122
+#: ../../Zotlabs/Module/Sources.php:157 ../../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:1757
 msgid "Yes"
 msgstr "Sí"
 
@@ -341,8 +362,8 @@ msgid "Set shadow depth of photos"
 msgstr "Ajustar la profundidad de sombras de las fotos"
 
 #: ../../view/theme/redbasic/php/config.php:113
-msgid "Set maximum width of content region in pixel"
-msgstr "Ajustar la anchura máxima de la región de contenido, en pixels"
+msgid "Set maximum width of content region in rem"
+msgstr "Ajustar la anchura máxima de la región de contenido, en rem"
 
 #: ../../view/theme/redbasic/php/config.php:113
 msgid "Leave empty for default width"
@@ -431,8 +452,8 @@ msgid "Channel Reputation"
 msgstr "Reputación del canal"
 
 #: ../../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
+#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:161
+#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:533
 #: ../../Zotlabs/Storage/Browser.php:411
 msgid "Close"
 msgstr "Cerrar"
@@ -457,227 +478,165 @@ msgstr "Se puede moderar la reputación en mi canal."
 msgid "Block Completely"
 msgstr "Bloquear completamente"
 
-#: ../../addon/superblock/Mod_Superblock.php:21
-msgid "Superblock App"
-msgstr "App Superblock"
-
-#: ../../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 "No instalado/a"
-
-#: ../../addon/superblock/Mod_Superblock.php:22
-msgid "Block channels"
-msgstr "Bloquear canales"
-
-#: ../../addon/superblock/Mod_Superblock.php:64
+#: ../../addon/superblock/Mod_Superblock.php:62
 msgid "superblock settings updated"
 msgstr "se han actualizado los ajustes de superblock"
 
-#: ../../addon/superblock/Mod_Superblock.php:88
+#: ../../addon/superblock/Mod_Superblock.php:86
 msgid "Currently blocked"
 msgstr "Actualmente bloqueado"
 
-#: ../../addon/superblock/Mod_Superblock.php:90
+#: ../../addon/superblock/Mod_Superblock.php:88
 msgid "No channels currently blocked"
 msgstr "No hay canales bloqueados actualmente"
 
-#: ../../addon/superblock/Mod_Superblock.php:92
+#: ../../addon/superblock/Mod_Superblock.php:90
 #: ../../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
+#: ../../Zotlabs/Module/Photos.php:1002
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../../addon/nsabait/Mod_Nsabait.php:20
-#: ../../addon/nsabait/Mod_Nsabait.php:24
+#: ../../addon/nsabait/Mod_Nsabait.php:23
 msgid "NSA Bait App"
 msgstr "App NSA Bait "
 
-#: ../../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 "Instalado"
+#: ../../addon/nsabait/Mod_Nsabait.php:25
+msgid "Make yourself a political target."
+msgstr "Hazte un objetivo político."
 
-#: ../../addon/nsabait/Mod_Nsabait.php:26
-msgid "Make yourself a political target"
-msgstr "Conviértase en un objetivo político"
-
-#: ../../addon/visage/Mod_Visage.php:21
-msgid "Who viewed my channel/profile"
-msgstr "Quién ha visto mi canal/perfi"
-
-#: ../../addon/visage/Mod_Visage.php:25
+#: ../../addon/visage/Mod_Visage.php:23
 msgid "Recent Channel/Profile Viewers"
 msgstr "Visitantes recientes del canal o perfil"
 
-#: ../../addon/visage/Mod_Visage.php:36
+#: ../../addon/visage/Mod_Visage.php:34
 msgid "No entries."
 msgstr "No hay entradas."
 
-#: ../../addon/openclipatar/openclipatar.php:50
-#: ../../addon/openclipatar/openclipatar.php:128
+#: ../../addon/openclipatar/openclipatar.php:51
+#: ../../addon/openclipatar/openclipatar.php:129
 msgid "System defaults:"
 msgstr "Valores predeterminados del sistema: "
 
-#: ../../addon/openclipatar/openclipatar.php:54
+#: ../../addon/openclipatar/openclipatar.php:55
 msgid "Preferred Clipart IDs"
 msgstr "IDs de las imágenes clipart preferidas"
 
-#: ../../addon/openclipatar/openclipatar.php:54
+#: ../../addon/openclipatar/openclipatar.php:55
 msgid "List of preferred clipart ids. These will be shown first."
 msgstr "Lista de ids de imágenes de clipart preferidas. Se verán en primer lugar."
 
-#: ../../addon/openclipatar/openclipatar.php:55
+#: ../../addon/openclipatar/openclipatar.php:56
 msgid "Default Search Term"
 msgstr "Términos de búsqueda predeterminados"
 
-#: ../../addon/openclipatar/openclipatar.php:55
+#: ../../addon/openclipatar/openclipatar.php:56
 msgid "The default search term. These will be shown second."
 msgstr "Los términos de búsqueda predeterminados. Estos se mostrarán en segundo lugar."
 
-#: ../../addon/openclipatar/openclipatar.php:56
+#: ../../addon/openclipatar/openclipatar.php:57
 msgid "Return After"
 msgstr "Regresar después"
 
-#: ../../addon/openclipatar/openclipatar.php:56
+#: ../../addon/openclipatar/openclipatar.php:57
 msgid "Page to load after image selection."
 msgstr "Página para cargar después de la selección de imágenes."
 
-#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:115
-#: ../../include/conversation.php:1083 ../../Zotlabs/Module/Connedit.php:601
-#: ../../Zotlabs/Lib/Apps.php:344
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:110
+#: ../../include/conversation.php:1093 ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Lib/Apps.php:348
 msgid "View Profile"
 msgstr "Ver el perfil"
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:120
-#: ../../include/channel.php:1567
+#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:115
+#: ../../include/channel.php:1534
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
-#: ../../addon/openclipatar/openclipatar.php:59
+#: ../../addon/openclipatar/openclipatar.php:60
 msgid "Profile List"
 msgstr "Lista de perfiles"
 
-#: ../../addon/openclipatar/openclipatar.php:61
+#: ../../addon/openclipatar/openclipatar.php:62
 msgid "Order of Preferred"
 msgstr "Orden de preferencia"
 
-#: ../../addon/openclipatar/openclipatar.php:61
+#: ../../addon/openclipatar/openclipatar.php:62
 msgid "Sort order of preferred clipart ids."
 msgstr "Orden de clasificación de los identificadores de imágenes clipart preferidas."
 
-#: ../../addon/openclipatar/openclipatar.php:62
-#: ../../addon/openclipatar/openclipatar.php:68
+#: ../../addon/openclipatar/openclipatar.php:63
+#: ../../addon/openclipatar/openclipatar.php:69
 msgid "Newest first"
 msgstr "Las más nuevas en primer lugar"
 
-#: ../../addon/openclipatar/openclipatar.php:65
+#: ../../addon/openclipatar/openclipatar.php:66
 msgid "As entered"
 msgstr "Tal como se ingresaron"
 
-#: ../../addon/openclipatar/openclipatar.php:67
+#: ../../addon/openclipatar/openclipatar.php:68
 msgid "Order of other"
 msgstr "Orden de los demás"
 
-#: ../../addon/openclipatar/openclipatar.php:67
+#: ../../addon/openclipatar/openclipatar.php:68
 msgid "Sort order of other clipart ids."
 msgstr "Orden de clasificación de otros ids de imágenes clipart."
 
-#: ../../addon/openclipatar/openclipatar.php:69
+#: ../../addon/openclipatar/openclipatar.php:70
 msgid "Most downloaded first"
 msgstr "Las más descargadas en primer lugar"
 
-#: ../../addon/openclipatar/openclipatar.php:70
+#: ../../addon/openclipatar/openclipatar.php:71
 msgid "Most liked first"
 msgstr "Las más apreciadas en primer lugar"
 
-#: ../../addon/openclipatar/openclipatar.php:72
+#: ../../addon/openclipatar/openclipatar.php:73
 msgid "Preferred IDs Message"
 msgstr "Mensaje de IDs preferido"
 
-#: ../../addon/openclipatar/openclipatar.php:72
+#: ../../addon/openclipatar/openclipatar.php:73
 msgid "Message to display above preferred results."
 msgstr "Mensaje para mostrar sobre los resultados preferidos."
 
-#: ../../addon/openclipatar/openclipatar.php:78
+#: ../../addon/openclipatar/openclipatar.php:79
 msgid "Uploaded by: "
 msgstr "Subida por: "
 
-#: ../../addon/openclipatar/openclipatar.php:78
+#: ../../addon/openclipatar/openclipatar.php:79
 msgid "Drawn by: "
 msgstr "Creada por: "
 
-#: ../../addon/openclipatar/openclipatar.php:182
-#: ../../addon/openclipatar/openclipatar.php:194
+#: ../../addon/openclipatar/openclipatar.php:183
+#: ../../addon/openclipatar/openclipatar.php:195
 msgid "Use this image"
 msgstr "Usar esta imagen"
 
-#: ../../addon/openclipatar/openclipatar.php:192
+#: ../../addon/openclipatar/openclipatar.php:193
 msgid "Or select from a free OpenClipart.org image:"
 msgstr "O seleccionar una imagen gratuita de OpenClipart.org: "
 
-#: ../../addon/openclipatar/openclipatar.php:195
+#: ../../addon/openclipatar/openclipatar.php:196
 msgid "Search Term"
 msgstr "Término de búsqueda"
 
-#: ../../addon/openclipatar/openclipatar.php:232
+#: ../../addon/openclipatar/openclipatar.php:233
 msgid "Unknown error. Please try again later."
 msgstr "Error desconocido. Por favor, inténtelo otra vez."
 
-#: ../../addon/openclipatar/openclipatar.php:298
-#: ../../Zotlabs/Module/Profile_photo.php:254
+#: ../../addon/openclipatar/openclipatar.php:299
+#: ../../Zotlabs/Module/Profile_photo.php:268
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
 
-#: ../../addon/openclipatar/openclipatar.php:308
+#: ../../addon/openclipatar/openclipatar.php:309
 msgid "Profile photo updated successfully."
 msgstr "Se ha actualizado con éxito la foto de perfil."
 
 #: ../../addon/bookmarker/bookmarker.php:38
-#: ../../Zotlabs/Lib/ThreadItem.php:474
+#: ../../Zotlabs/Lib/ThreadItem.php:510
 msgid "Save Bookmarks"
 msgstr "Guardar en Marcadores"
 
@@ -709,25 +668,23 @@ msgstr "Mínimo 100, por defecto 100 microsegundos"
 msgid "Queueworker Settings"
 msgstr "Configuración del gestor de procesos de trabajo en cola"
 
-#: ../../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
+#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1168
+#: ../../include/text.php:1180 ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:111
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:115
+#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103
 msgid "Save"
 msgstr "Guardar"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:15
-msgid "Add some colour to tag clouds"
-msgstr "Añadir color a las nubes de etiquetas"
-
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:21
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:26
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:22
 msgid "Rainbow Tag App"
 msgstr "App Etiqueta Arcoiris"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:34
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:23
+msgid "Add some colour to tag clouds"
+msgstr "Añadir color a las nubes de etiquetas"
+
+#: ../../addon/rainbowtag/Mod_Rainbowtag.php:30
 msgid "Rainbow Tag"
 msgstr "Etiqueta Arcoiris"
 
@@ -735,29 +692,25 @@ msgstr "Etiqueta Arcoiris"
 msgid "Photo Cache settings saved."
 msgstr "Se ha guardado la configuración de la caché de fotos."
 
-#: ../../addon/photocache/Mod_Photocache.php:36
+#: ../../addon/photocache/Mod_Photocache.php:43
 msgid ""
-"Photo Cache addon saves a copy of images from external sites locally to "
-"increase your anonymity in the web."
-msgstr "El complemento Photo Cache guarda localmente una copia de las imágenes de sitios externos para aumentar su anonimato en la Web."
-
-#: ../../addon/photocache/Mod_Photocache.php:42
-msgid "Photo Cache App"
-msgstr "App Photo Cache"
+"Saves a copy of images from external sites locally to increase your "
+"anonymity in the web."
+msgstr "Guarde una copia de las imágenes de sitios externos localmente para aumentar su anonimato en la web."
 
-#: ../../addon/photocache/Mod_Photocache.php:53
+#: ../../addon/photocache/Mod_Photocache.php:49
 msgid "Minimal photo size for caching"
 msgstr "Tamaño mínimo de la foto para el almacenamiento en caché"
 
-#: ../../addon/photocache/Mod_Photocache.php:55
+#: ../../addon/photocache/Mod_Photocache.php:51
 msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
 msgstr "En píxeles. Desde 1 hasta 1024, 0 será reemplazado por el predeterminado del sistema."
 
-#: ../../addon/photocache/Mod_Photocache.php:64
+#: ../../addon/photocache/Mod_Photocache.php:60
 msgid "Photo Cache"
 msgstr "Photo Cache"
 
-#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:136
+#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:134
 msgid "Gallery"
 msgstr "Galería"
 
@@ -765,7 +718,7 @@ msgstr "Galería"
 msgid "Photo Gallery"
 msgstr "Galería de fotos"
 
-#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1464
+#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1427
 #: ../../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
@@ -776,15 +729,6 @@ msgstr "Galería de fotos"
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
-#: ../../addon/gallery/Mod_Gallery.php:58
-msgid "Gallery App"
-msgstr "App Gallery"
-
-#: ../../addon/gallery/Mod_Gallery.php:59
-msgid "A simple gallery for your photo albums"
-msgstr "Una galería sencilla para sus álbumes de fotos"
-
-#: ../../addon/planets/Mod_Planets.php:20
 #: ../../addon/planets/Mod_Planets.php:23
 msgid "Random Planet App"
 msgstr "App Random Planet"
@@ -794,104 +738,100 @@ msgid ""
 "Set a random planet from the Star Wars Empire as your location when posting"
 msgstr "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias como su ubicación cuando publique."
 
-#: ../../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
+#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44
+#: ../../addon/keepout/keepout.php:36 ../../include/photos.php:30
+#: ../../include/items.php:3897 ../../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:1096
+#: ../../include/attach.php:1169 ../../include/attach.php:1332
+#: ../../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/Network.php:18 ../../Zotlabs/Module/Register.php:200
+#: ../../Zotlabs/Module/Setup.php:218
 #: ../../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/Channel.php:220 ../../Zotlabs/Module/Channel.php:376
+#: ../../Zotlabs/Module/Channel.php:415 ../../Zotlabs/Module/Group.php:14
+#: ../../Zotlabs/Module/Group.php:30 ../../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/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:111
+#: ../../Zotlabs/Module/Chat.php:116
 #: ../../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/Like.php:248 ../../Zotlabs/Module/Poke.php:157
+#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520
+#: ../../Zotlabs/Module/Item.php:530 ../../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/Webpages.php:131
 #: ../../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/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:424
 #: ../../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/Mood.php:126 ../../Zotlabs/Module/Appman.php:153
+#: ../../Zotlabs/Module/Cards.php:84 ../../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/Blocks.php:80 ../../Zotlabs/Module/Vote.php:19
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:417
+#: ../../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:637
-#: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70
+#: ../../Zotlabs/Module/Profiles.php:171 ../../Zotlabs/Module/Profiles.php:615
+#: ../../Zotlabs/Module/Articles.php:87 ../../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/Menu.php:130 ../../Zotlabs/Module/Menu.php:141
+#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Thing.php:282
+#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
+#: ../../Zotlabs/Module/Pdledit.php:35 ../../Zotlabs/Module/Wiki.php:57
+#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:425
+#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:299
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:100
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:98
 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135
-#: ../../Zotlabs/Web/WebServer.php:116
+#: ../../Zotlabs/Web/WebServer.php:117
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
-#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1747
+#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:64
+#: ../../include/selectors.php:81 ../../include/channel.php:1715
 msgid "Male"
 msgstr "Hombre"
 
-#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60
-#: ../../include/selectors.php:77 ../../include/channel.php:1745
+#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:64
+#: ../../include/selectors.php:81 ../../include/channel.php:1713
 msgid "Female"
 msgstr "Mujer"
 
-#: ../../addon/openid/Mod_Openid.php:30
+#: ../../addon/openid/Mod_Openid.php:32
 msgid "OpenID protocol error. No ID returned."
 msgstr "Error de protocolo OpenID. No se recuperó ninguna ID."
 
-#: ../../addon/openid/Mod_Openid.php:76 ../../addon/openid/Mod_Openid.php:178
-#: ../../Zotlabs/Zot/Auth.php:266
+#: ../../addon/openid/Mod_Openid.php:78 ../../addon/openid/Mod_Openid.php:179
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:320
+#: ../../addon/openid/Mod_Openid.php:189 ../../include/auth.php:323
 msgid "Login failed."
 msgstr "El acceso ha fallado."
 
@@ -914,7 +854,7 @@ msgid "Last Name"
 msgstr "Apellido"
 
 #: ../../addon/openid/MysqlProvider.php:54
-#: ../../addon/redred/Mod_Redred.php:75
+#: ../../addon/redred/Mod_Redred.php:73 ../../boot.php:1746
 msgid "Nickname"
 msgstr "Alias"
 
@@ -924,17 +864,17 @@ msgstr "Nombre completo"
 
 #: ../../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
+#: ../../addon/redred/Mod_Redred.php:69 ../../addon/rtof/Mod_Rtof.php:55
+#: ../../include/network.php:1768 ../../Zotlabs/Module/Cdav.php:1376
 #: ../../Zotlabs/Module/Admin/Accounts.php:316
 #: ../../Zotlabs/Module/Admin/Accounts.php:330
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Connedit.php:736
 msgid "Email"
 msgstr "Correo electrónico"
 
 #: ../../addon/openid/MysqlProvider.php:58
 #: ../../addon/openid/MysqlProvider.php:59
-#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:361
+#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:365
 msgid "Profile Photo"
 msgstr "Foto del perfil"
 
@@ -962,16 +902,16 @@ msgstr "Foto del perfil 80px"
 msgid "Profile Photo 128px"
 msgstr "Foto del perfil 128px"
 
-#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123
+#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:141
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #: ../../addon/openid/MysqlProvider.php:68
-#: ../../Zotlabs/Module/Profiles.php:769
+#: ../../Zotlabs/Module/Profiles.php:784
 msgid "Homepage URL"
 msgstr "Dirección de la página personal"
 
-#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:359
+#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:363
 msgid "Language"
 msgstr "Idioma"
 
@@ -992,7 +932,7 @@ msgid "Birthdate"
 msgstr "Fecha de nacimiento"
 
 #: ../../addon/openid/MysqlProvider.php:74
-#: ../../Zotlabs/Module/Profiles.php:488
+#: ../../Zotlabs/Module/Profiles.php:457
 msgid "Gender"
 msgstr "Género"
 
@@ -1147,7 +1087,7 @@ msgstr "Tenga en cuenta que las estadísticas de Diaspora y Friendica se refiere
 msgid "Channel is required."
 msgstr "Se requiere un canal."
 
-#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326
+#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:327
 msgid "Invalid channel."
 msgstr "El canal no es válido."
 
@@ -1155,40 +1095,31 @@ msgstr "El canal no es válido."
 msgid "Hubzilla Crosspost Connector Settings saved."
 msgstr "Se han guardado los ajustes de Hubzilla Crosspost Connector"
 
-#: ../../addon/redred/Mod_Redred.php:50
-#: ../../addon/statusnet/Mod_Statusnet.php:146
-msgid "Hubzilla Crosspost Connector App"
-msgstr "App Hubzilla Crosspost Connector"
-
-#: ../../addon/redred/Mod_Redred.php:51
-msgid "Relay public postings to another Hubzilla channel"
-msgstr "Retransmisión de entradas a otro canal de Hubzilla"
-
-#: ../../addon/redred/Mod_Redred.php:63
+#: ../../addon/redred/Mod_Redred.php:61
 msgid "Send public postings to Hubzilla channel by default"
 msgstr "Enviar entradas públicas al canal Hubzilla por defecto"
 
-#: ../../addon/redred/Mod_Redred.php:67
+#: ../../addon/redred/Mod_Redred.php:65
 msgid "Hubzilla API Path"
 msgstr "Ruta de la API de Hubzilla"
 
-#: ../../addon/redred/Mod_Redred.php:67 ../../addon/rtof/Mod_Rtof.php:53
+#: ../../addon/redred/Mod_Redred.php:65 ../../addon/rtof/Mod_Rtof.php:51
 msgid "https://{sitename}/api"
 msgstr "https://{sitename}/api"
 
-#: ../../addon/redred/Mod_Redred.php:71
+#: ../../addon/redred/Mod_Redred.php:69
 msgid "Hubzilla login name"
 msgstr "Nombre de inicio de sesión en Hubzilla"
 
-#: ../../addon/redred/Mod_Redred.php:75
+#: ../../addon/redred/Mod_Redred.php:73
 msgid "Hubzilla channel name"
 msgstr "Nombre del canal de Hubzilla"
 
-#: ../../addon/redred/Mod_Redred.php:79
+#: ../../addon/redred/Mod_Redred.php:77
 msgid "Hubzilla password"
 msgstr "Contraseña de Hubzilla"
 
-#: ../../addon/redred/Mod_Redred.php:87
+#: ../../addon/redred/Mod_Redred.php:85
 msgid "Hubzilla Crosspost Connector"
 msgstr "Hubzilla Crosspost Connector"
 
@@ -1202,12 +1133,12 @@ msgstr "Se han importado las fotos"
 
 #: ../../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
+#: ../../include/items.php:441 ../../Zotlabs/Module/Import_items.php:116
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:108
+#: ../../Zotlabs/Module/Like.php:348 ../../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
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55
+#: ../../Zotlabs/Web/WebServer.php:116
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -1251,10 +1182,10 @@ msgid "0 or blank to import all available"
 msgstr "0 o en blanco para importar todos los disponibles"
 
 #: ../../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
+#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1643
+#: ../../include/text.php:2328 ../../include/conversation.php:128
+#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Tagger.php:71
+#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3613
 msgid "photo"
 msgstr "foto"
 
@@ -1272,27 +1203,22 @@ msgstr "No podemos conectar con la API de GNU social con la ruta que ha proporci
 msgid "GNU social settings updated."
 msgstr "Se han guardado los ajustes de GNU social."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:147
-msgid ""
-"Relay public postings to a connected GNU social account (formerly StatusNet)"
-msgstr "Retransmisión de entradas públicas a una cuenta conectada de GNU social (antiguo StarusNet)"
-
-#: ../../addon/statusnet/Mod_Statusnet.php:181
+#: ../../addon/statusnet/Mod_Statusnet.php:179
 msgid "Globally Available GNU social OAuthKeys"
 msgstr "OAuthKeys globales de GNU social disponibles"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:183
+#: ../../addon/statusnet/Mod_Statusnet.php:181
 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 "Existen pares de claves OAuth preconfiguradas disponibles para algunos servidores libres de GNU social. Si está usando uno de ellos, utilice estas credenciales.<br />Si no se siente libre de conectarse a cualquier otra instancia de GNU social (vea a continuación)."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:198
+#: ../../addon/statusnet/Mod_Statusnet.php:196
 msgid "Provide your own OAuth Credentials"
 msgstr "Proporcione sus propias credenciales de OAuth"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:200
+#: ../../addon/statusnet/Mod_Statusnet.php:198
 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 "
@@ -1301,27 +1227,27 @@ msgid ""
 "Hubzilla installation at your favourite GNU social installation."
 msgstr "No se ha encontrado un par de claves de consumidor para GNU social. Registre su cuenta de Hubzilla como un cliente de escritorio en su cuenta social GNU, copie el par de claves de consumidor aquí y escriba la dirección raíz de la API.<br />Antes de registrar su propio par de claves OAuth, pregunte al administrador si ya hay un par de claves para esta instalación de Hubzilla en su instalación GNU social favorita."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:204
+#: ../../addon/statusnet/Mod_Statusnet.php:202
 msgid "OAuth Consumer Key"
 msgstr "OAuth Consumer Key"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:208
+#: ../../addon/statusnet/Mod_Statusnet.php:206
 msgid "OAuth Consumer Secret"
 msgstr "OAuth Consumer Secret"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:212
+#: ../../addon/statusnet/Mod_Statusnet.php:210
 msgid "Base API Path"
 msgstr "Ruta base de la API"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:212
+#: ../../addon/statusnet/Mod_Statusnet.php:210
 msgid "Remember the trailing /"
 msgstr "Recuerde la barra /"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:216
+#: ../../addon/statusnet/Mod_Statusnet.php:214
 msgid "GNU social application name"
 msgstr "Nombre de la aplicación de GNU social"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:239
+#: ../../addon/statusnet/Mod_Statusnet.php:237
 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 "
@@ -1329,32 +1255,32 @@ msgid ""
 "posted to GNU social."
 msgstr "Para conectarse a su cuenta de GNU social, haga clic en el botón de abajo para obtener un código de seguridad de GNU social que tiene que copiar en el cuadro de entrada a continuación y envíe el formulario. Solo sus <strong>entradas</strong> públicas aparecerán en GNU social."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:241
+#: ../../addon/statusnet/Mod_Statusnet.php:239
 msgid "Log in with GNU social"
 msgstr "Inicio de sesión en GNU social"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:244
+#: ../../addon/statusnet/Mod_Statusnet.php:242
 msgid "Copy the security code from GNU social here"
 msgstr "Copiar aquí el código de seguridad de GNU social"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:254
+#: ../../addon/statusnet/Mod_Statusnet.php:252
 msgid "Cancel Connection Process"
 msgstr "Cancelar el proceso de conexión"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:256
+#: ../../addon/statusnet/Mod_Statusnet.php:254
 msgid "Current GNU social API is"
 msgstr "La API actual de GNU social es "
 
-#: ../../addon/statusnet/Mod_Statusnet.php:260
+#: ../../addon/statusnet/Mod_Statusnet.php:258
 msgid "Cancel GNU social Connection"
 msgstr "Cancelar la conexión de GNU social"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:272
-#: ../../addon/twitter/Mod_Twitter.php:147
+#: ../../addon/statusnet/Mod_Statusnet.php:270
+#: ../../addon/twitter/Mod_Twitter.php:145
 msgid "Currently connected to: "
 msgstr "Actualmente está conectado a: "
 
-#: ../../addon/statusnet/Mod_Statusnet.php:277
+#: ../../addon/statusnet/Mod_Statusnet.php:275
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -1362,22 +1288,22 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr "<strong>Aviso</strong>: Debido a su configuración de privacidad (<em>Ocultar los detalles de su perfil a los visitantes desconocidos?</em>) el vínculo potencialmente incluido en las entradas públicas retransmitidas a GNU social llevará al visitante a una página en blanco que le informará de que el acceso a su perfil ha sido restringido."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:282
+#: ../../addon/statusnet/Mod_Statusnet.php:280
 msgid "Post to GNU social by default"
 msgstr "Publicar en GNU social por defecto"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:282
+#: ../../addon/statusnet/Mod_Statusnet.php:280
 msgid ""
 "If enabled your public postings will be posted to the associated GNU-social "
 "account by default"
 msgstr "Si está activado, sus entradas públicas se publicarán en la cuenta GNU-social asociada de forma predeterminada"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:291
-#: ../../addon/twitter/Mod_Twitter.php:171
+#: ../../addon/statusnet/Mod_Statusnet.php:289
+#: ../../addon/twitter/Mod_Twitter.php:169
 msgid "Clear OAuth configuration"
 msgstr "Limpiar la configuración de  OAuth"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:303
+#: ../../addon/statusnet/Mod_Statusnet.php:301
 msgid "GNU-Social Crosspost Connector"
 msgstr "GNU-Social Crosspost Connector"
 
@@ -1386,7 +1312,7 @@ msgid "Post to GNU social"
 msgstr "Publicar en GNU social"
 
 #: ../../addon/statusnet/statusnet.php:593
-#: ../../Zotlabs/Module/Admin/Site.php:420
+#: ../../Zotlabs/Module/Admin/Site.php:423
 msgid "Site name"
 msgstr "Nombre del sitio"
 
@@ -1394,14 +1320,14 @@ msgstr "Nombre del sitio"
 msgid "API URL"
 msgstr "URL de la API"
 
-#: ../../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
+#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:505
+#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:505
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:504
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
@@ -1413,31 +1339,23 @@ msgstr "Nombre de la aplicación"
 msgid "Friendica Crosspost Connector Settings saved."
 msgstr "Se han guardado los ajustes del conector de publicación cruzada con Friendica."
 
-#: ../../addon/rtof/Mod_Rtof.php:36
-msgid "Friendica Crosspost Connector App"
-msgstr "App Friendica Crosspost Connector"
-
-#: ../../addon/rtof/Mod_Rtof.php:37
-msgid "Relay public postings to a connected Friendica account"
-msgstr "Retransmisión de entradas públicas a una cuenta Friendica conectada"
-
-#: ../../addon/rtof/Mod_Rtof.php:49
+#: ../../addon/rtof/Mod_Rtof.php:47
 msgid "Send public postings to Friendica by default"
 msgstr "Enviar entradas públicas a Friendica por defecto"
 
-#: ../../addon/rtof/Mod_Rtof.php:53
+#: ../../addon/rtof/Mod_Rtof.php:51
 msgid "Friendica API Path"
 msgstr "Ruta a la API de Friendica"
 
-#: ../../addon/rtof/Mod_Rtof.php:57
+#: ../../addon/rtof/Mod_Rtof.php:55
 msgid "Friendica login name"
 msgstr "Nombre de inicio de sesión en Friendica"
 
-#: ../../addon/rtof/Mod_Rtof.php:61
+#: ../../addon/rtof/Mod_Rtof.php:59
 msgid "Friendica password"
 msgstr "Contraseña de Friendica"
 
-#: ../../addon/rtof/Mod_Rtof.php:69
+#: ../../addon/rtof/Mod_Rtof.php:67
 msgid "Friendica Crosspost Connector"
 msgstr "Friendica Crosspost Connector"
 
@@ -1445,13 +1363,13 @@ msgstr "Friendica Crosspost Connector"
 msgid "Post to Friendica"
 msgstr "Publicar en Friendica"
 
-#: ../../addon/wppost/wppost.php:46
+#: ../../addon/wppost/wppost.php:47
 msgid "Post to WordPress"
 msgstr "Publicar en WordPress"
 
-#: ../../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
+#: ../../addon/wppost/wppost.php:174 ../../addon/wppost/Mod_Wppost.php:96
+#: ../../addon/dwpost/Mod_Dwpost.php:67 ../../addon/dwpost/dwpost.php:134
+#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:381
 msgid "Source"
 msgstr "Fuente"
 
@@ -1459,56 +1377,48 @@ msgstr "Fuente"
 msgid "Wordpress Settings saved."
 msgstr "Se han guardado los ajustes de WordPress."
 
-#: ../../addon/wppost/Mod_Wppost.php:43
-msgid "Wordpress Post App"
-msgstr "App Publicar en Wordpress"
-
-#: ../../addon/wppost/Mod_Wppost.php:44
-msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API"
-msgstr "Publicar en WordPress o cualquier otra cosa que utilice la API XMLRPC de wordpress"
-
-#: ../../addon/wppost/Mod_Wppost.php:69
+#: ../../addon/wppost/Mod_Wppost.php:67
 msgid "WordPress username"
 msgstr "Nombre de usuario de WordPress"
 
-#: ../../addon/wppost/Mod_Wppost.php:73
+#: ../../addon/wppost/Mod_Wppost.php:71
 msgid "WordPress password"
 msgstr "Contraseña de WordPress"
 
-#: ../../addon/wppost/Mod_Wppost.php:77
+#: ../../addon/wppost/Mod_Wppost.php:75
 msgid "WordPress API URL"
 msgstr "URL de la API de WordPress"
 
-#: ../../addon/wppost/Mod_Wppost.php:78
+#: ../../addon/wppost/Mod_Wppost.php:76
 msgid "Typically https://your-blog.tld/xmlrpc.php"
 msgstr "Habitualmente https://your-blog.tld/xmlrpc.php"
 
-#: ../../addon/wppost/Mod_Wppost.php:81
+#: ../../addon/wppost/Mod_Wppost.php:79
 msgid "WordPress blogid"
 msgstr "Blog de WordPress"
 
-#: ../../addon/wppost/Mod_Wppost.php:82
+#: ../../addon/wppost/Mod_Wppost.php:80
 msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
 msgstr "Para sitios multiusuario como wordpress.com, de lo contrario, dejar en blanco"
 
-#: ../../addon/wppost/Mod_Wppost.php:86
+#: ../../addon/wppost/Mod_Wppost.php:84
 msgid "Post to WordPress by default"
 msgstr "Publicar en WordPress por defecto"
 
-#: ../../addon/wppost/Mod_Wppost.php:90
+#: ../../addon/wppost/Mod_Wppost.php:88
 msgid "Forward comments (requires hubzilla_wp plugin)"
 msgstr "Reenviar comentarios (requerido por el plugin hubzilla_wp)"
 
-#: ../../addon/wppost/Mod_Wppost.php:94 ../../addon/dwpost/Mod_Dwpost.php:65
-#: ../../addon/ljpost/Mod_Ljpost.php:71
+#: ../../addon/wppost/Mod_Wppost.php:92 ../../addon/dwpost/Mod_Dwpost.php:63
+#: ../../addon/ljpost/Mod_Ljpost.php:69
 msgid "Add link to original post"
 msgstr "Añadir enlace a la entrada original"
 
-#: ../../addon/wppost/Mod_Wppost.php:98 ../../addon/dwpost/Mod_Dwpost.php:69
+#: ../../addon/wppost/Mod_Wppost.php:96 ../../addon/dwpost/Mod_Dwpost.php:67
 msgid "Link description (default:"
 msgstr "Descripción del enlace (por defecto: "
 
-#: ../../addon/wppost/Mod_Wppost.php:106
+#: ../../addon/wppost/Mod_Wppost.php:104
 msgid "Wordpress Post"
 msgstr "Publicar en Wordpress"
 
@@ -1524,262 +1434,248 @@ msgstr "Entradas importadas"
 msgid "Files imported"
 msgstr "Ficheros importados"
 
-#: ../../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 "Este complemento copia el contenido existente y el almacenamiento de ficheros en un canal clonado/copiado. Una vez instalada la aplicación, visite la aplicación recién instalada. Esto le permitirá establecer la ubicación de su canal original y un rango de fechas opcional de ficheros/conversaciones para copiar."
-
-#: ../../addon/content_import/Mod_content_import.php:135
-#: ../../Zotlabs/Lib/Apps.php:332
+#: ../../addon/content_import/Mod_content_import.php:134
+#: ../../Zotlabs/Lib/Apps.php:336
 msgid "Content Import"
 msgstr "Importación de contenidos"
 
-#: ../../addon/content_import/Mod_content_import.php:136
+#: ../../addon/content_import/Mod_content_import.php:135
 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 "Esto importará todas sus conversaciones y archivos de nube de un canal clonado en otro servidor. El proceso puede tardar un poco si tiene muchos mensajes y/o ficheros."
 
-#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:136
 msgid "Include posts"
 msgstr "Incluir entradas"
 
-#: ../../addon/content_import/Mod_content_import.php:137
+#: ../../addon/content_import/Mod_content_import.php:136
 msgid "Conversations, Articles, Cards, and other posted content"
 msgstr "Conversaciones, artículos, fichas y otros contenidos publicados"
 
-#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/content_import/Mod_content_import.php:137
 msgid "Include files"
 msgstr "Incluir ficheros"
 
-#: ../../addon/content_import/Mod_content_import.php:138
+#: ../../addon/content_import/Mod_content_import.php:137
 msgid "Files, Photos and other cloud storage"
 msgstr "Archivos, fotos y otro tipo de almacenamiento en la nube"
 
-#: ../../addon/content_import/Mod_content_import.php:139
+#: ../../addon/content_import/Mod_content_import.php:138
 msgid "Original Server base URL"
 msgstr "URL base del servidor original"
 
-#: ../../addon/content_import/Mod_content_import.php:140
+#: ../../addon/content_import/Mod_content_import.php:139
 #: ../../addon/hzfiles/hzfiles.php:84
 msgid "Since modified date yyyy-mm-dd"
 msgstr "Modificado desde la fecha yyyy-mm-dd"
 
-#: ../../addon/content_import/Mod_content_import.php:141
+#: ../../addon/content_import/Mod_content_import.php:140
 #: ../../addon/hzfiles/hzfiles.php:85
 msgid "Until modified date yyyy-mm-dd"
 msgstr "Modificado hasta la fecha yyyy-mm-dd"
 
-#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1332
+#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1356
 msgid "Set your location"
 msgstr "Establecer su ubicación"
 
-#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1333
+#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1357
 msgid "Clear browser location"
 msgstr "Eliminar los datos de localización geográfica del navegador"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1369
+#: ../../Zotlabs/Module/Article_edit.php:99
 #: ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:218
 #: ../../Zotlabs/Module/Editblock.php:116
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1349
+#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1373
 msgid "Embed (existing) photo from your photo albums"
 msgstr "Insertar una foto de sus álbumes"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1406
+#: ../../Zotlabs/Module/Chat.php:216
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1383
+#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1407
 msgid "Tag term:"
 msgstr "Término de la etiqueta:"
 
-#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1384
+#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1408
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1411
+#: ../../Zotlabs/Module/Profile_photo.php:551
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:400
 msgid "Choose images to embed"
 msgstr "Elegir imágenes para incluir"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1412
+#: ../../Zotlabs/Module/Profile_photo.php:552
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:401
 msgid "Choose an album"
 msgstr "Elegir un álbum"
 
-#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1389
+#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1413
 msgid "Choose a different album..."
 msgstr "Elegir un álbum diferente..."
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1414
+#: ../../Zotlabs/Module/Profile_photo.php:554
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:403
 msgid "Error getting album list"
 msgstr "Error al obtener la lista de álbumes"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1415
+#: ../../Zotlabs/Module/Profile_photo.php:555
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:404
 msgid "Error getting photo link"
 msgstr "Error al obtener el enlace de la foto"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1416
+#: ../../Zotlabs/Module/Profile_photo.php:556
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:405
 msgid "Error getting album"
 msgstr "Error al obtener el álbum"
 
-#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1393
+#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1417
 msgid "Comments enabled"
 msgstr "Comentarios habilitados"
 
-#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1394
+#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1418
 msgid "Comments disabled"
 msgstr "Comentarios deshabilitados"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1429
+#: ../../Zotlabs/Module/Webpages.php:259 ../../Zotlabs/Module/Photos.php:1105
+#: ../../Zotlabs/Lib/ThreadItem.php:875
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1462
+#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Module/Webpages.php:253
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1084
+#: ../../Zotlabs/Module/Wiki.php:298 ../../Zotlabs/Module/Layouts.php:194
 msgid "Share"
 msgstr "Compartir"
 
-#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1446
+#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1471
 msgid "Page link name"
 msgstr "Nombre del enlace de la página"
 
-#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1449
+#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1474
 msgid "Post as"
 msgstr "Publicar como"
 
-#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1451
-#: ../../Zotlabs/Lib/ThreadItem.php:828
+#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1476
+#: ../../Zotlabs/Lib/ThreadItem.php:866
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1452
-#: ../../Zotlabs/Lib/ThreadItem.php:829
+#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1477
+#: ../../Zotlabs/Lib/ThreadItem.php:867
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1453
-#: ../../Zotlabs/Lib/ThreadItem.php:830
+#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1478
+#: ../../Zotlabs/Lib/ThreadItem.php:868
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1454
-#: ../../Zotlabs/Lib/ThreadItem.php:831
+#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1479
+#: ../../Zotlabs/Lib/ThreadItem.php:869
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1455
-#: ../../Zotlabs/Lib/ThreadItem.php:832
+#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1480
+#: ../../Zotlabs/Lib/ThreadItem.php:870
 msgid "Code"
 msgstr "Código"
 
-#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1456
-#: ../../Zotlabs/Lib/ThreadItem.php:834
+#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1481
+#: ../../Zotlabs/Lib/ThreadItem.php:872
 msgid "Attach/Upload file"
 msgstr "Adjuntar/cargar fichero"
 
-#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1459
-#: ../../Zotlabs/Module/Wiki.php:399
+#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1484
+#: ../../Zotlabs/Module/Wiki.php:397
 msgid "Embed an image from your albums"
 msgstr "Incluir una imagen de sus álbumes"
 
 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
-#: ../../include/conversation.php:1460 ../../include/conversation.php:1515
-#: ../../Zotlabs/Module/Article_edit.php:131
+#: ../../include/conversation.php:1485 ../../include/conversation.php:1540
+#: ../../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:1391
+#: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth.php:110
+#: ../../Zotlabs/Module/Oauth.php:136 ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
 #: ../../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/Profile_photo.php:549
 #: ../../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: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/Oauth2.php:115 ../../Zotlabs/Module/Oauth2.php:143
+#: ../../Zotlabs/Module/Wiki.php:365 ../../Zotlabs/Module/Wiki.php:398
+#: ../../Zotlabs/Module/Connedit.php:750 ../../Zotlabs/Storage/Browser.php:383
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../../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
+#: ../../include/conversation.php:1486 ../../include/conversation.php:1539
+#: ../../Zotlabs/Module/Profile_photo.php:550
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:399
 msgid "OK"
 msgstr "OK"
 
-#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1463
+#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1488
 msgid "Toggle voting"
 msgstr "Cambiar votación"
 
-#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1470
+#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1495
 msgid "Disable comments"
 msgstr "Dehabilitar los comentarios"
 
-#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1471
+#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1496
 msgid "Toggle comments"
 msgstr "Activar o desactivar los comentarios"
 
-#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1477
-#: ../../Zotlabs/Module/Article_edit.php:117
+#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1502
+#: ../../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
+#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:678
+#: ../../Zotlabs/Module/Photos.php:1050
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
-#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1481
+#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1506
 msgid "Categories (optional, comma-separated list)"
 msgstr "Temas (opcional, lista separada por comas)"
 
-#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1482
-#: ../../Zotlabs/Module/Events.php:487
+#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1507
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1504
+#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1529
 msgid "Other networks and post services"
 msgstr "Otras redes y servicios de publicación"
 
-#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:171
-#: ../../addon/mail/Mod_Mail.php:314 ../../include/conversation.php:1507
+#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1532
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1510
+#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1535
 msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
-#: ../../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
+#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1537
+#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:879
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
@@ -1787,11 +1683,11 @@ msgstr "Cifrar texto"
 msgid "WYSIWYG status editor"
 msgstr "Editor de estado de WYSIWYG"
 
-#: ../../addon/hsse/Mod_Hsse.php:21 ../../addon/hsse/Mod_Hsse.php:26
+#: ../../addon/hsse/Mod_Hsse.php:24
 msgid "WYSIWYG Status App"
 msgstr "App WYSIWYG Status"
 
-#: ../../addon/hsse/Mod_Hsse.php:34
+#: ../../addon/hsse/Mod_Hsse.php:32
 msgid "WYSIWYG Status"
 msgstr "Estado de WYSIWYG"
 
@@ -1838,11 +1734,11 @@ msgstr "Incluir un marcador en el mapa."
 
 #: ../../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/twitter/twitter.php:493 ../../addon/msgfooter/msgfooter.php:54
+#: ../../addon/diaspora/diaspora.php:104 ../../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:150
+#: ../../Zotlabs/Module/Defperms.php:111
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
@@ -1854,6 +1750,11 @@ msgstr "Se han guardado los ajustes del Conector de publicación cruzada de Insa
 msgid "Insane Journal Crosspost Connector App"
 msgstr "App Ajustes del Conector de publicación cruzada de InsaneJournal"
 
+#: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/xmpp/Mod_Xmpp.php:35
+#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Invite.php:56
+msgid "Not Installed"
+msgstr "No instalado/a"
+
 #: ../../addon/ijpost/Mod_Ijpost.php:36
 msgid "Relay public postings to Insane Journal"
 msgstr "Retransmisión de entradas públicas a Insane Journal"
@@ -1894,37 +1795,25 @@ msgstr "Generador QR"
 msgid "Enter some text"
 msgstr "Escribir algún texto"
 
-#: ../../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 "Desconocido"
-
-#: ../../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
+#: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:2002
+#: ../../include/network.php:1767 ../../Zotlabs/Lib/Activity.php:3655
 msgid "ActivityPub"
 msgstr "ActivityPub"
 
-#: ../../addon/pubcrawl/as.php:2101 ../../addon/diaspora/Receiver.php:1649
-#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115
+#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1643
+#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Subthread.php:115
 msgid "status"
 msgstr "el mensaje de estado "
 
-#: ../../addon/pubcrawl/as.php:2138 ../../addon/diaspora/Receiver.php:1595
-#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:471
-#: ../../Zotlabs/Lib/Activity.php:3297
+#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1589
+#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:477
+#: ../../Zotlabs/Lib/Activity.php:3646
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../addon/pubcrawl/as.php:2140 ../../include/conversation.php:177
-#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299
+#: ../../addon/pubcrawl/as.php:1995 ../../include/conversation.php:177
+#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3648
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
@@ -1933,44 +1822,79 @@ msgstr "A %1$s no le gusta %3$s de %2$s"
 msgid "ActivityPub Protocol Settings updated."
 msgstr "Se han actualizado los ajustes del protocolo ActivityPub."
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:34
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:41
 msgid ""
 "The activitypub protocol does not support location independence. Connections"
 " you make within that network may be unreachable from alternate channel "
 "locations."
 msgstr "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos."
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:40
-msgid "Activitypub Protocol App"
-msgstr "App Protocolo Activitypub"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:47
 msgid "Deliver to ActivityPub recipients in privacy groups"
 msgstr "Entregar a los destinatarios de ActivityPub en grupos de canales"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:50
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:47
 msgid ""
 "May result in a large number of mentions and expose all the members of your "
 "privacy group"
 msgstr "Puede resultar en un gran número de menciones y exponer a todos los miembros de su grupo de canales"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51
 msgid "Send multi-media HTML articles"
 msgstr "Enviar artículos multimedia en HTML"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:54
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51
 msgid "Not supported by some microblog services such as Mastodon"
 msgstr "No soportado por algunos servicios de microblog como Mastodon"
 
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62
+#: ../../addon/pubcrawl/Mod_Pubcrawl.php:59
 msgid "Activitypub Protocol"
 msgstr "Protocolo Activitypub"
 
-#: ../../addon/ldapauth/ldapauth.php:70
+#: ../../addon/fediwordle/fediwordle.php:211
+msgid "ERROR: word length is not correct!"
+msgstr "ERROR: ¡la longitud de la palabra no es correcta!"
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:22
+msgid "Fediwordle App"
+msgstr "App Fediwordle"
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:23
+msgid "A distributed word game inspired by wordle."
+msgstr "Un juego de palabras distribuido inspirado en el wordle."
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:24
+msgid ""
+"To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel "
+"post."
+msgstr "Para empezar una partida, introduzca [wordle]mi_palabra[/wordle] en algún lugar de un post de nivel superior."
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:25
+msgid "Your contacts can post their guess in the comments."
+msgstr "Sus contactos pueden publicar sus conjeturas en los comentarios."
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:26
+msgid ""
+"Your channel will evaluate the guess and automatically post the response."
+msgstr "Su canal evaluará la conjetura y publicará automáticamente la respuesta."
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:28
+msgid "Correct letters"
+msgstr "Letras correctas"
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:29
+msgid "Letters contained in the word but at the wrong spot"
+msgstr "Letras contenidas en la palabra pero en el lugar equivocado"
+
+#: ../../addon/fediwordle/Mod_Fediwordle.php:30
+msgid "Letters not contained in the word"
+msgstr "Letras no contenidas en la palabra"
+
+#: ../../addon/ldapauth/ldapauth.php:101
 msgid "An account has been created for you."
 msgstr "Se ha creado una cuenta para usted."
 
-#: ../../addon/ldapauth/ldapauth.php:77
+#: ../../addon/ldapauth/ldapauth.php:108
 msgid "Authentication successful but rejected: account creation is disabled."
 msgstr "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada."
 
@@ -1978,27 +1902,19 @@ msgstr "Autenticación correcta pero rechazada: la creación de cuentas está de
 msgid "Dreamwidth Crosspost Connector Settings saved."
 msgstr "Se han guardado los ajustes del conector de publicación cruzada Dreamwidth."
 
-#: ../../addon/dwpost/Mod_Dwpost.php:39
-msgid "Dreamwidth Crosspost Connector App"
-msgstr "App Dreamwidth Crosspost Connector"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:40
-msgid "Relay public posts to Dreamwidth"
-msgstr "Reenviar las entradas públicas a Dreamwidth"
-
-#: ../../addon/dwpost/Mod_Dwpost.php:53
+#: ../../addon/dwpost/Mod_Dwpost.php:51
 msgid "Dreamwidth username"
 msgstr "Nombre de usuario en Dreamwidth"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:57
+#: ../../addon/dwpost/Mod_Dwpost.php:55
 msgid "Dreamwidth password"
 msgstr "Contraseña en Dreamwidth"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:61
+#: ../../addon/dwpost/Mod_Dwpost.php:59
 msgid "Post to Dreamwidth by default"
 msgstr "Publicar en Dreamwidth de forma predeterminada"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:77
+#: ../../addon/dwpost/Mod_Dwpost.php:75
 msgid "Dreamwidth Crosspost Connector"
 msgstr "Dreamwidth Crosspost Connector"
 
@@ -2163,7 +2079,7 @@ msgid "Errors encountered deleting database table "
 msgstr "Errores encontrados al eliminar la tabla de la base de datos"
 
 #: ../../addon/rendezvous/rendezvous.php:95
-#: ../../addon/twitter/twitter.php:503
+#: ../../addon/twitter/twitter.php:502
 msgid "Submit Settings"
 msgstr "Enviar los ajustes"
 
@@ -2214,24 +2130,23 @@ msgid "Let's meet here"
 msgstr "Reunámonos aquí"
 
 #: ../../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/Widget/Wiki_page_history.php:28
+#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137
+#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372
 #: ../../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/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Lib/NativeWikiPage.php:582
 #: ../../Zotlabs/Storage/Browser.php:377
 msgid "Name"
 msgstr "Nombre"
 
 #: ../../addon/rendezvous/rendezvous.php:173
-#: ../../addon/cart/submodules/hzservices.php:655
+#: ../../addon/cart/submodules/hzservices.php:657
 #: ../../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
+#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Appman.php:211
+#: ../../Zotlabs/Module/Rbmark.php:100
 msgid "Description"
 msgstr "Descripción"
 
@@ -2311,133 +2226,25 @@ msgid "You have no rendezvous. Press the button above to create a rendezvous!"
 msgstr "No tiene ninguna cita. ¡Presione el botón de arriba para crear una!"
 
 #: ../../addon/rendezvous/rendezvous.php:401
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:730
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../addon/startpage/Mod_Startpage.php:50
-msgid "Startpage App"
-msgstr "App Startpage"
-
-#: ../../addon/startpage/Mod_Startpage.php:51
-msgid "Set a preferred page to load on login from home page"
-msgstr "Establecer una página preferida para cargar al iniciar sesión desde la página de inicio"
-
-#: ../../addon/startpage/Mod_Startpage.php:62
+#: ../../addon/startpage/Mod_Startpage.php:60
 msgid "Page to load after login"
 msgstr "Página para cargar tras el inicio de sesión"
 
-#: ../../addon/startpage/Mod_Startpage.php:62
+#: ../../addon/startpage/Mod_Startpage.php:60
 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 "Ejemplos: &quot;aplicaciones&quot;, &quot;mi red?f=&gid=37&quot; (grupo de canales), &quot;mi canal&quot; or &quot;notificaciones del sistema&quot; (dejar en blanco para la página de mi red por defecto (grid)."
 
-#: ../../addon/startpage/Mod_Startpage.php:70
+#: ../../addon/startpage/Mod_Startpage.php:68
 msgid "Startpage"
 msgstr "Startpage"
 
-#: ../../addon/mail/Mod_Mail.php:40
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../addon/mail/Mod_Mail.php:53
-msgid "message"
-msgstr "mensaje"
-
-#: ../../addon/mail/Mod_Mail.php:93
-msgid "Message recalled."
-msgstr "Mensaje revocado."
-
-#: ../../addon/mail/Mod_Mail.php:106
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../addon/mail/Mod_Mail.php:121 ../../addon/mail/Mod_Mail.php:242
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Caduca YYYY-MM-DD HH:MM"
-
-#: ../../addon/mail/Mod_Mail.php:149
-msgid "Requested channel is not in this network"
-msgstr "El canal solicitado no existe en esta red"
-
-#: ../../addon/mail/Mod_Mail.php:157
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
-
-#: ../../addon/mail/Mod_Mail.php:158 ../../addon/mail/Mod_Mail.php:301
-msgid "To:"
-msgstr "Para:"
-
-#: ../../addon/mail/Mod_Mail.php:161 ../../addon/mail/Mod_Mail.php:303
-#: ../../Zotlabs/Module/Invite.php:542
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../addon/mail/Mod_Mail.php:164 ../../Zotlabs/Module/Invite.php:539
-msgid "Your message:"
-msgstr "Su mensaje:"
-
-#: ../../addon/mail/Mod_Mail.php:166 ../../addon/mail/Mod_Mail.php:309
-msgid "Attach file"
-msgstr "Adjuntar fichero"
-
-#: ../../addon/mail/Mod_Mail.php:168
-msgid "Send"
-msgstr "Enviar"
-
-#: ../../addon/mail/Mod_Mail.php:272
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../addon/mail/Mod_Mail.php:273
-msgid "Delivery report"
-msgstr "Informe de transmisión"
-
-#: ../../addon/mail/Mod_Mail.php:274
-msgid "Recall message"
-msgstr "Revocar el mensaje"
-
-#: ../../addon/mail/Mod_Mail.php:276
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido revocado."
-
-#: ../../addon/mail/Mod_Mail.php:294
-msgid "Delete Conversation"
-msgstr "Eliminar conversación"
-
-#: ../../addon/mail/Mod_Mail.php:296
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
-
-#: ../../addon/mail/Mod_Mail.php:300
-msgid "Send Reply"
-msgstr "Responder"
-
-#: ../../addon/mail/Mod_Mail.php:305
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Su mensaje para %s (%s):"
-
-#: ../../addon/mail/Mod_Mail.php:385
-msgid "Unable to lookup recipient."
-msgstr "No se puede asociar a un destinatario."
-
-#: ../../addon/mail/Mod_Mail.php:392
-msgid "Unable to communicate with requested channel."
-msgstr "No se puede establecer la comunicación con el canal solicitado."
-
-#: ../../addon/mail/Mod_Mail.php:399
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
-
-#: ../../addon/mail/Mod_Mail.php:417
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
-
 #: ../../addon/adultphotoflag/adultphotoflag.php:24
 msgid "Flag Adult Photos"
 msgstr "Indicador (\"flag\") de fotos de adultos"
@@ -2480,21 +2287,13 @@ msgstr "No mostrar esto de nuevo"
 msgid "Twitter settings updated."
 msgstr "Se han actualizado los ajustes de Twitter."
 
-#: ../../addon/twitter/Mod_Twitter.php:78
-msgid "Twitter Crosspost Connector App"
-msgstr "App Twitter Crosspost Connector"
-
-#: ../../addon/twitter/Mod_Twitter.php:79
-msgid "Relay public posts to Twitter"
-msgstr "Retransmisión de entradas públicas a Twitter"
-
-#: ../../addon/twitter/Mod_Twitter.php:103
+#: ../../addon/twitter/Mod_Twitter.php:101
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "No se encontró ningún par de \"consumer key\" para Twitter. Póngase en contacto con el administrador del sitio."
 
-#: ../../addon/twitter/Mod_Twitter.php:125
+#: ../../addon/twitter/Mod_Twitter.php:123
 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 "
@@ -2503,15 +2302,15 @@ msgid ""
 " be posted to Twitter."
 msgstr "En esta instancia de Hubzilla, el complemento de Twitter estaba habilitado pero aún no ha conectado su cuenta a la cuenta de Twitter. Para ello, haga clic en el botón de abajo, para obtener un PIN de Twitter que debe copiar en el cuadro de entrada a continuación y enviar el formulario. Solo sus entradas <strong>públicas</ strong> se publicarán en Twitter."
 
-#: ../../addon/twitter/Mod_Twitter.php:127
+#: ../../addon/twitter/Mod_Twitter.php:125
 msgid "Log in with Twitter"
 msgstr "Iniciar sesión en Twitter"
 
-#: ../../addon/twitter/Mod_Twitter.php:130
+#: ../../addon/twitter/Mod_Twitter.php:128
 msgid "Copy the PIN from Twitter here"
 msgstr "Copiar aquí el PIN de Twitter"
 
-#: ../../addon/twitter/Mod_Twitter.php:152
+#: ../../addon/twitter/Mod_Twitter.php:150
 msgid ""
 "<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -2519,25 +2318,25 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr "<strong>Aviso:</strong> Debido a su configuración de privacidad (<em>Ocultar los detalles de su perfil a los visitantes desconocidos?</em>), el enlace potencialmente incluido en las entradas públicas retransmitidas a Twitter llevará al visitante a una página en blanco informándolo de que el acceso a su perfil ha sido restringido."
 
-#: ../../addon/twitter/Mod_Twitter.php:157
+#: ../../addon/twitter/Mod_Twitter.php:155
 msgid "Twitter post length"
 msgstr "Longitud del mensaje en Twitter"
 
-#: ../../addon/twitter/Mod_Twitter.php:157
+#: ../../addon/twitter/Mod_Twitter.php:155
 msgid "Maximum tweet length"
 msgstr "Longitud máxima del tweet"
 
-#: ../../addon/twitter/Mod_Twitter.php:162
+#: ../../addon/twitter/Mod_Twitter.php:160
 msgid "Send public postings to Twitter by default"
 msgstr "Enviar mensajes públicos a Twitter de forma predeterminada"
 
-#: ../../addon/twitter/Mod_Twitter.php:162
+#: ../../addon/twitter/Mod_Twitter.php:160
 msgid ""
 "If enabled your public postings will be posted to the associated Twitter "
 "account by default"
 msgstr "Si está activado, sus entradas públicas se publicarán en la cuenta de Twitter asociada de forma predeterminada."
 
-#: ../../addon/twitter/Mod_Twitter.php:181
+#: ../../addon/twitter/Mod_Twitter.php:179
 msgid "Twitter Crosspost Connector"
 msgstr "Twitter Crosspost Connector"
 
@@ -2561,51 +2360,43 @@ msgstr "Publicar en Pump.io"
 msgid "Pump.io Settings saved."
 msgstr "Se han guardado los ajustes de Pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:53
-msgid "Pump.io Crosspost Connector App"
-msgstr "App Pump.io Crosspost Connector"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:54
-msgid "Relay public posts to pump.io"
-msgstr "Retransmisión de entradas públicas a pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:73
+#: ../../addon/pumpio/Mod_Pumpio.php:71
 msgid "Pump.io servername"
 msgstr "Nombre del servidor de Pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:73
+#: ../../addon/pumpio/Mod_Pumpio.php:71
 msgid "Without \"http://\" or \"https://\""
 msgstr "Sin \"http://\" or \"https://\""
 
-#: ../../addon/pumpio/Mod_Pumpio.php:77
+#: ../../addon/pumpio/Mod_Pumpio.php:75
 msgid "Pump.io username"
 msgstr "Nombre de usuario en Pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:77
+#: ../../addon/pumpio/Mod_Pumpio.php:75
 msgid "Without the servername"
 msgstr "Sin el nombre del servidor"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:88
+#: ../../addon/pumpio/Mod_Pumpio.php:86
 msgid "You are not authenticated to pumpio"
 msgstr "No está autenticado en pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:90
+#: ../../addon/pumpio/Mod_Pumpio.php:88
 msgid "(Re-)Authenticate your pump.io connection"
 msgstr "(Re-)Autenticar su conexión en pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:94
+#: ../../addon/pumpio/Mod_Pumpio.php:92
 msgid "Post to pump.io by default"
 msgstr "Publicar por defecto en pump.io"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:98
+#: ../../addon/pumpio/Mod_Pumpio.php:96
 msgid "Should posts be public"
 msgstr "¿Las entradas deben ser públicas?"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:102
+#: ../../addon/pumpio/Mod_Pumpio.php:100
 msgid "Mirror all public posts"
 msgstr "Reflejar todos los mensajes públicos"
 
-#: ../../addon/pumpio/Mod_Pumpio.php:112
+#: ../../addon/pumpio/Mod_Pumpio.php:110
 msgid "Pump.io Crosspost Connector"
 msgstr "Pump.io Crosspost Connector"
 
@@ -2673,20 +2464,16 @@ msgstr "Se han actualizado los ajustes de Gravatar."
 msgid "text to include in all outgoing posts from this site"
 msgstr "texto a incluir en todos los mensajes salientes de este sitio"
 
-#: ../../addon/sendzid/Mod_Sendzid.php:14
+#: ../../addon/sendzid/Mod_Sendzid.php:21
 msgid "Send your identity to all websites"
 msgstr "Enviar su identidad a todos los sitios web"
 
-#: ../../addon/sendzid/Mod_Sendzid.php:20
-msgid "Sendzid App"
-msgstr "App Sendzid"
-
-#: ../../addon/sendzid/Mod_Sendzid.php:32
+#: ../../addon/sendzid/Mod_Sendzid.php:29
 msgid "Send ZID"
 msgstr "Enviar ZID"
 
 #: ../../addon/cart/widgets/catalogitem.php:57
-#: ../../addon/cart/submodules/hzservices.php:658
+#: ../../addon/cart/submodules/hzservices.php:660
 #: ../../addon/cart/submodules/manualcat.php:263
 msgid "Price"
 msgstr "Precio"
@@ -2702,7 +2489,7 @@ msgstr "Los pagos manuales no están habilitados."
 #: ../../addon/cart/manual_payments.php:68
 #: ../../addon/cart/submodules/paypalbutton.php:392
 #: ../../addon/cart/submodules/paypalbuttonV2.php:409
-#: ../../addon/cart/cart.php:1578
+#: ../../addon/cart/cart.php:1580
 msgid "Order not found."
 msgstr "El pedido no se ha encontrado."
 
@@ -2713,8 +2500,8 @@ msgstr "Terminado"
 #: ../../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
+#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1558
+#: ../../Zotlabs/Module/Wiki.php:75
 msgid "Invalid channel"
 msgstr "Canal no válido"
 
@@ -2763,72 +2550,72 @@ msgstr "Cuantía"
 msgid "Term"
 msgstr "Condición"
 
-#: ../../addon/cart/submodules/hzservices.php:63
+#: ../../addon/cart/submodules/hzservices.php:65
 msgid "Enable Hubzilla Services Module"
 msgstr "Habilitar el Módulo de Servicios de Hubzilla"
 
-#: ../../addon/cart/submodules/hzservices.php:162
+#: ../../addon/cart/submodules/hzservices.php:164
 #: ../../addon/cart/submodules/manualcat.php:172
 msgid "New Sku"
 msgstr "Nuevo SKU (número de referencia)"
 
-#: ../../addon/cart/submodules/hzservices.php:197
+#: ../../addon/cart/submodules/hzservices.php:199
 #: ../../addon/cart/submodules/manualcat.php:208
 msgid "Cannot save edits to locked item."
 msgstr "No se pueden guardar las ediciones en el elemento bloqueado."
 
-#: ../../addon/cart/submodules/hzservices.php:246
-#: ../../addon/cart/submodules/hzservices.php:333
+#: ../../addon/cart/submodules/hzservices.php:248
+#: ../../addon/cart/submodules/hzservices.php:335
 msgid "SKU not found."
 msgstr "No se ha encontrado el SKU"
 
-#: ../../addon/cart/submodules/hzservices.php:299
-#: ../../addon/cart/submodules/hzservices.php:303
+#: ../../addon/cart/submodules/hzservices.php:301
+#: ../../addon/cart/submodules/hzservices.php:305
 msgid "Invalid Activation Directive."
 msgstr "Directiva de activación no válida."
 
-#: ../../addon/cart/submodules/hzservices.php:374
-#: ../../addon/cart/submodules/hzservices.php:378
+#: ../../addon/cart/submodules/hzservices.php:376
+#: ../../addon/cart/submodules/hzservices.php:380
 msgid "Invalid Deactivation Directive."
 msgstr "Directiva de desactivación no válida"
 
-#: ../../addon/cart/submodules/hzservices.php:564
+#: ../../addon/cart/submodules/hzservices.php:566
 msgid "Add to this privacy group"
 msgstr "Añadir a este grupo de canales"
 
-#: ../../addon/cart/submodules/hzservices.php:580
+#: ../../addon/cart/submodules/hzservices.php:582
 msgid "Set user service class"
 msgstr "Configurar la clase de servicio al usuario"
 
-#: ../../addon/cart/submodules/hzservices.php:607
+#: ../../addon/cart/submodules/hzservices.php:609
 msgid "You must be using a local account to purchase this service."
 msgstr "Usted debe estar usando una cuenta local para comprar este servicio."
 
-#: ../../addon/cart/submodules/hzservices.php:647
+#: ../../addon/cart/submodules/hzservices.php:649
 #: ../../addon/cart/submodules/manualcat.php:252
 msgid "Changes Locked"
 msgstr "Cambios bloqueados"
 
-#: ../../addon/cart/submodules/hzservices.php:651
+#: ../../addon/cart/submodules/hzservices.php:653
 #: ../../addon/cart/submodules/manualcat.php:256
 msgid "Item available for purchase."
 msgstr "Artículo disponible para la compra."
 
-#: ../../addon/cart/submodules/hzservices.php:661
+#: ../../addon/cart/submodules/hzservices.php:663
 #: ../../addon/cart/submodules/manualcat.php:266
 msgid "Photo URL"
 msgstr "URL de la foto"
 
-#: ../../addon/cart/submodules/hzservices.php:665
+#: ../../addon/cart/submodules/hzservices.php:667
 msgid "Add buyer to privacy group"
 msgstr "Agregar comprador al grupo de canales"
 
-#: ../../addon/cart/submodules/hzservices.php:670
+#: ../../addon/cart/submodules/hzservices.php:672
 msgid "Add buyer as connection"
 msgstr "Añadir comprador como conexión"
 
-#: ../../addon/cart/submodules/hzservices.php:678
-#: ../../addon/cart/submodules/hzservices.php:720
+#: ../../addon/cart/submodules/hzservices.php:680
+#: ../../addon/cart/submodules/hzservices.php:722
 msgid "Set Service Class"
 msgstr "Establecer clase de servicio"
 
@@ -2848,10 +2635,9 @@ msgstr "Etiqueta"
 #: ../../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
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:209
+#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:762
+#: ../../Zotlabs/Module/Profiles.php:766
 msgid "Required"
 msgstr "Obligatorio"
 
@@ -2960,44 +2746,40 @@ msgstr "Eliminar tablas de la base de datos al desinstalar."
 msgid "Shop"
 msgstr "Comprar"
 
-#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:51
+#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:52
 #: ../../Zotlabs/Module/Wiki.php:35
 msgid "Profile Unavailable."
 msgstr "Perfil no disponible"
 
-#: ../../addon/cart/cart.php:1507
-msgid "Cart utilities for orders and payments"
-msgstr "Utilidades del carro para pedidos y pagos"
-
-#: ../../addon/cart/cart.php:1545
+#: ../../addon/cart/cart.php:1547
 msgid "You must be logged into the Grid to shop."
 msgstr "Debe iniciar sesión en la red para comprar."
 
-#: ../../addon/cart/cart.php:1592
+#: ../../addon/cart/cart.php:1594
 msgid "Access denied."
 msgstr "Acceso denegado"
 
-#: ../../addon/cart/cart.php:1644 ../../addon/cart/cart.php:1787
+#: ../../addon/cart/cart.php:1646 ../../addon/cart/cart.php:1789
 msgid "No Order Found"
 msgstr "No se ha encontrado ningún pedido"
 
-#: ../../addon/cart/cart.php:1653
+#: ../../addon/cart/cart.php:1655
 msgid "An unknown error has occurred Please start again."
 msgstr "Se ha producido un error desconocido Vuelva a empezar."
 
-#: ../../addon/cart/cart.php:1796
+#: ../../addon/cart/cart.php:1798
 msgid "Requirements not met."
 msgstr "No se cumplen los requisitos."
 
-#: ../../addon/cart/cart.php:1796
+#: ../../addon/cart/cart.php:1798
 msgid "Review your order and complete any needed requirements."
 msgstr "Revise su pedido y complete los requisitos necesarios."
 
-#: ../../addon/cart/cart.php:1822
+#: ../../addon/cart/cart.php:1824
 msgid "Invalid Payment Type.  Please start again."
 msgstr "Tipo de pago no válido. Por favor, empiece de nuevo."
 
-#: ../../addon/cart/cart.php:1829
+#: ../../addon/cart/cart.php:1831
 msgid "Order not found"
 msgstr "El pedido no se ha encontrado"
 
@@ -3005,21 +2787,11 @@ msgstr "El pedido no se ha encontrado"
 msgid "nofed Settings saved."
 msgstr "Se han guardado los ajustes de nofed."
 
-#: ../../addon/nofed/Mod_Nofed.php:33
-msgid "No Federation App"
-msgstr "App No Federation"
-
-#: ../../addon/nofed/Mod_Nofed.php:34
-msgid ""
-"Prevent posting from being federated to anybody. It will exist only on your "
-"channel page."
-msgstr "Evitar que la entrada sea federada con nadie. Sólo existirá en la página de su canal."
-
-#: ../../addon/nofed/Mod_Nofed.php:42
+#: ../../addon/nofed/Mod_Nofed.php:40
 msgid "Federate posts by default"
 msgstr "Federar las publicaciones por defecto"
 
-#: ../../addon/nofed/Mod_Nofed.php:50
+#: ../../addon/nofed/Mod_Nofed.php:48
 msgid "No Federation"
 msgstr "No Federation"
 
@@ -3027,23 +2799,15 @@ msgstr "No Federation"
 msgid "Federate"
 msgstr "Federar"
 
-#: ../../addon/smileybutton/Mod_Smileybutton.php:35
-msgid "Smileybutton App"
-msgstr "App Smileybutton"
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:36
-msgid "Adds a smileybutton to the jot editor"
-msgstr "Añade un botón de emoticonos al editor jot"
-
-#: ../../addon/smileybutton/Mod_Smileybutton.php:44
+#: ../../addon/smileybutton/Mod_Smileybutton.php:42
 msgid "Hide the button and show the smilies directly."
 msgstr "Ocultar el botón y mostrar los smilies directamente."
 
-#: ../../addon/smileybutton/Mod_Smileybutton.php:52
+#: ../../addon/smileybutton/Mod_Smileybutton.php:50
 msgid "Smileybutton Settings"
 msgstr "Ajustes de Smileybutton"
 
-#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2099
+#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2104
 msgid "file"
 msgstr "fichero"
 
@@ -3055,38 +2819,41 @@ msgstr "Importar repositorio de ficheros de Redmatrix"
 msgid "This will import all your Redmatrix cloud files to this channel."
 msgstr "Esto importará todos sus ficheros de la nube de Redmatrix a este canal."
 
-#: ../../addon/diaspora/diaspora.php:70
+#: ../../addon/diaspora/diaspora.php:77
 msgid ""
 "Please install the statistics addon to be able to configure a diaspora relay"
 msgstr "Por favor, instale el complemento de estadísticas para poder configurar el reenvío de diaspora"
 
-#: ../../addon/diaspora/diaspora.php:80
+#: ../../addon/diaspora/diaspora.php:87
 msgid "Diaspora Relay Handle"
 msgstr "Gestionar el reenvío de Diaspora"
 
-#: ../../addon/diaspora/diaspora.php:80
+#: ../../addon/diaspora/diaspora.php:87
 msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
 msgstr "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporarelay.tld"
 
-#: ../../addon/diaspora/diaspora.php:100
+#: ../../addon/diaspora/diaspora.php:107
 msgid "Diaspora relay could not be imported"
 msgstr "El reenvío de Diaspora no ha podido ser importado"
 
-#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:336
-#: ../../addon/diaspora/util.php:349 ../../Zotlabs/Lib/Enotify.php:61
+#: ../../addon/diaspora/diaspora.php:1027
+msgid "No subject"
+msgstr "Sin tema"
+
+#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:337
+#: ../../addon/diaspora/util.php:350 ../../Zotlabs/Lib/Enotify.php:61
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../addon/diaspora/import_diaspora.php:19
+#: ../../addon/diaspora/import_diaspora.php:18
 msgid "No username found in import file."
 msgstr "No se ha encontrado el nombre de usuario en el fichero de importación."
 
-#: ../../addon/diaspora/import_diaspora.php:44 ../../include/import.php:76
+#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:77
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
 
-#: ../../addon/diaspora/import_diaspora.php:142
-#: ../../Zotlabs/Module/Import.php:595
+#: ../../addon/diaspora/import_diaspora.php:140
 msgid "Import completed."
 msgstr "Importación completada."
 
@@ -3101,53 +2868,49 @@ msgid ""
 "locations."
 msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."
 
-#: ../../addon/diaspora/Mod_Diaspora.php:58
-msgid "Diaspora Protocol App"
-msgstr "App Protocolo Diaspora"
-
-#: ../../addon/diaspora/Mod_Diaspora.php:77
+#: ../../addon/diaspora/Mod_Diaspora.php:75
 msgid "Allow any Diaspora member to comment or like your public posts"
 msgstr "Permitir que cualquier miembro de Diaspora comente o ponga un like en sus entradas públicas"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:77
+#: ../../addon/diaspora/Mod_Diaspora.php:75
 msgid ""
 "If this setting is disabled only your contacts will be able to comment or "
 "like your public posts"
 msgstr "Si esta configuración está desactivada, sólo sus contactos podrán comentar o dar a \"me gusta\" en sus publicaciones públicas"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:81
+#: ../../addon/diaspora/Mod_Diaspora.php:79
 msgid "Prevent your hashtags from being redirected to other sites"
 msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "
 
-#: ../../addon/diaspora/Mod_Diaspora.php:85
+#: ../../addon/diaspora/Mod_Diaspora.php:83
 msgid ""
 "Sign and forward posts and comments with no existing Diaspora signature"
 msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:90
+#: ../../addon/diaspora/Mod_Diaspora.php:88
 msgid "Followed hashtags (comma separated, do not include the #)"
 msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)"
 
-#: ../../addon/diaspora/Mod_Diaspora.php:99
+#: ../../addon/diaspora/Mod_Diaspora.php:97
 msgid "Diaspora Protocol"
 msgstr "Protocolo Diaspora"
 
-#: ../../addon/diaspora/Receiver.php:1599
+#: ../../addon/diaspora/Receiver.php:1593
 #, php-format
 msgid "%1$s dislikes %2$s's %3$s"
 msgstr "a %1$s no le gusta el %3$s de %2$s"
 
-#: ../../addon/diaspora/Receiver.php:2226 ../../Zotlabs/Module/Like.php:481
+#: ../../addon/diaspora/Receiver.php:2222 ../../Zotlabs/Module/Like.php:487
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../addon/diaspora/Receiver.php:2228 ../../Zotlabs/Module/Like.php:483
+#: ../../addon/diaspora/Receiver.php:2224 ../../Zotlabs/Module/Like.php:489
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../addon/diaspora/Receiver.php:2230 ../../Zotlabs/Module/Like.php:485
+#: ../../addon/diaspora/Receiver.php:2226 ../../Zotlabs/Module/Like.php:491
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
@@ -3204,10 +2967,14 @@ msgstr "Usuario de Workflow."
 msgid "This channel"
 msgstr "Este canal"
 
-#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:130
+#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123
 msgid "Primary"
 msgstr "Primario"
 
+#: ../../addon/workflow/workflow.php:327
+msgid "Create New Workflow Item"
+msgstr "Crear un nuevo elemento de flujo de trabajo"
+
 #: ../../addon/workflow/workflow.php:541
 #: ../../addon/workflow/workflow.php:1437
 #: ../../addon/workflow/workflow.php:1456
@@ -3236,8 +3003,8 @@ msgid "Web link."
 msgstr "Enlace Web."
 
 #: ../../addon/workflow/workflow.php:2617
-#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1375
-#: ../../Zotlabs/Module/Connedit.php:918
+#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374
+#: ../../Zotlabs/Module/Connedit.php:734
 msgid "Title"
 msgstr "Título"
 
@@ -3246,8 +3013,8 @@ msgstr "Título"
 msgid "Brief description or title"
 msgstr "Breve descripción o título"
 
-#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:21
-#: ../../Zotlabs/Lib/Apps.php:370
+#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:34
+#: ../../Zotlabs/Lib/Apps.php:374
 msgid "Notes"
 msgstr "Notas"
 
@@ -3384,24 +3151,15 @@ msgstr "Buscar $Projectname"
 msgid "Fuzzloc Settings updated."
 msgstr "Los ajustes de Fuzzloc se han actualizado."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:34
-msgid "Fuzzy Location App"
-msgstr "App Fuzzy Location"
-
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:35
-msgid ""
-"Blur your precise location if your channel uses browser location mapping"
-msgstr "Desdibujar su ubicación precisa si su canal utiliza el mapeo de ubicación del navegador"
-
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:40
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:38
 msgid "Minimum offset in meters"
 msgstr "Offset mínimo en metros"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:44
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:42
 msgid "Maximum offset in meters"
 msgstr "Offset máximo en metros"
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:53
+#: ../../addon/fuzzloc/Mod_Fuzzloc.php:51
 msgid "Fuzzy Location"
 msgstr "Fuzzy Location"
 
@@ -3454,31 +3212,30 @@ msgstr "%s : Falló el envío del mensaje."
 msgid "Message sent to %s. New account registration: %s"
 msgstr "Mensaje enviado a %s. Registro de una nueva cuenta: %s"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:218
+#: ../../addon/flashcards/Mod_Flashcards.php:225
 msgid "Not allowed."
 msgstr "No permitido/a."
 
-#: ../../addon/flashcards/Mod_Flashcards.php:254
-#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:241
+#: ../../addon/flashcards/Mod_Flashcards.php:261
+#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:239
 #: ../../Zotlabs/Module/Filestorage.php:195
-#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Photos.php:682 ../../Zotlabs/Module/Photos.php:1053
 #: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
-#: ../../Zotlabs/Module/Connedit.php:683
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:261
+#: ../../addon/flashcards/Mod_Flashcards.php:268
 #: ../../Zotlabs/Module/Filestorage.php:202
 msgid "Set/edit permissions"
 msgstr "Establecer/editar los permisos"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:284
-#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:4010
+#: ../../addon/flashcards/Mod_Flashcards.php:291
+#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3820
 #: ../../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/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:53
+#: ../../Zotlabs/Module/Display.php:428 ../../Zotlabs/Module/Admin.php:61
 #: ../../Zotlabs/Module/Thing.php:96
 msgid "Item not found."
 msgstr "Elemento no encontrado."
@@ -3491,27 +3248,19 @@ msgstr "Publicar en Libertree"
 msgid "Libertree Crosspost Connector Settings saved."
 msgstr "Se han guardado los ajustes del conector de publicación cruzada con Libertree."
 
-#: ../../addon/libertree/Mod_Libertree.php:35
-msgid "Libertree Crosspost Connector App"
-msgstr "App Libertree Crosspost Connector"
-
-#: ../../addon/libertree/Mod_Libertree.php:36
-msgid "Relay public posts to Libertree"
-msgstr "Retransmisión de entradas públicas a Libertree"
-
-#: ../../addon/libertree/Mod_Libertree.php:51
+#: ../../addon/libertree/Mod_Libertree.php:49
 msgid "Libertree API token"
 msgstr "Token de la API de Libertree"
 
-#: ../../addon/libertree/Mod_Libertree.php:55
+#: ../../addon/libertree/Mod_Libertree.php:53
 msgid "Libertree site URL"
 msgstr "URL del servidor de Libertree"
 
-#: ../../addon/libertree/Mod_Libertree.php:59
+#: ../../addon/libertree/Mod_Libertree.php:57
 msgid "Post to Libertree by default"
 msgstr "Publicar en Libertree por defecto"
 
-#: ../../addon/libertree/Mod_Libertree.php:67
+#: ../../addon/libertree/Mod_Libertree.php:65
 msgid "Libertree Crosspost Connector"
 msgstr "Libertree Crosspost Connector"
 
@@ -3531,89 +3280,89 @@ msgstr "No lo menciones."
 msgid "&lt;blush&gt;"
 msgstr "&lt;sonrojo&gt;"
 
-#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:328
+#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:332
 msgid "Report Bug"
 msgstr "Informe de errores"
 
-#: ../../addon/totp/Mod_Totp.php:23
+#: ../../addon/totp/Mod_Totp.php:32
 msgid "TOTP Two-Step Verification"
 msgstr "Verificación en dos pasos de TOTP"
 
-#: ../../addon/totp/Mod_Totp.php:24
+#: ../../addon/totp/Mod_Totp.php:33
 msgid "Enter the 2-step verification generated by your authenticator app:"
 msgstr "Introduzca la verificación en 2 pasos generada por su app de autenticación: "
 
-#: ../../addon/totp/Mod_Totp.php:25
+#: ../../addon/totp/Mod_Totp.php:34
 msgid "Success!"
 msgstr "¡Éxito!"
 
-#: ../../addon/totp/Mod_Totp.php:26
+#: ../../addon/totp/Mod_Totp.php:35
 msgid "Invalid code, please try again."
 msgstr "Código inválido, por favor inténtelo de nuevo."
 
-#: ../../addon/totp/Mod_Totp.php:27
+#: ../../addon/totp/Mod_Totp.php:36
 msgid "Too many invalid codes..."
 msgstr "Demasiados códigos no válidos..."
 
-#: ../../addon/totp/Mod_Totp.php:28
+#: ../../addon/totp/Mod_Totp.php:37
 msgid "Verify"
 msgstr "Verficar"
 
-#: ../../addon/totp/Settings/Totp.php:90
+#: ../../addon/totp/Settings/Totp.php:92
 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 "Aún no ha establecido un TOTP secret.\nPor favor, haga clic en el botón de abajo para generar uno y registrar este sitio\ncon su aplicación de autenticación preferida."
 
-#: ../../addon/totp/Settings/Totp.php:93
+#: ../../addon/totp/Settings/Totp.php:95
 msgid "Your TOTP secret is"
 msgstr "Su TOTP secret es "
 
-#: ../../addon/totp/Settings/Totp.php:94
+#: ../../addon/totp/Settings/Totp.php:96
 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 "Asegúrese de guardarlo en algún lugar en caso de que pierda o reemplace su dispositivo móvil.\nUtilice su dispositivo móvil para escanear el código QR a continuación para registrar este sitio\ncon su aplicación de autenticación preferida."
 
-#: ../../addon/totp/Settings/Totp.php:99
+#: ../../addon/totp/Settings/Totp.php:101
 msgid "Test"
 msgstr "Test"
 
-#: ../../addon/totp/Settings/Totp.php:100
+#: ../../addon/totp/Settings/Totp.php:102
 msgid "Generate New Secret"
 msgstr "Generar un nuevo Secret"
 
-#: ../../addon/totp/Settings/Totp.php:101
+#: ../../addon/totp/Settings/Totp.php:103
 msgid "Go"
 msgstr "Ir"
 
-#: ../../addon/totp/Settings/Totp.php:102
+#: ../../addon/totp/Settings/Totp.php:104
 msgid "Enter your password"
 msgstr "Introduzca su contraseña"
 
-#: ../../addon/totp/Settings/Totp.php:103
+#: ../../addon/totp/Settings/Totp.php:105
 msgid "enter TOTP code from your device"
 msgstr "introduzca el código TOTP desde su dispositivo"
 
-#: ../../addon/totp/Settings/Totp.php:104
+#: ../../addon/totp/Settings/Totp.php:106
 msgid "Pass!"
 msgstr "¡Pase!"
 
-#: ../../addon/totp/Settings/Totp.php:105
+#: ../../addon/totp/Settings/Totp.php:107
 msgid "Fail"
 msgstr "Fallo"
 
-#: ../../addon/totp/Settings/Totp.php:106
+#: ../../addon/totp/Settings/Totp.php:108
 msgid "Incorrect password, try again."
 msgstr "Contraseña incorrecta, inténtelo de nuevo."
 
-#: ../../addon/totp/Settings/Totp.php:107
+#: ../../addon/totp/Settings/Totp.php:109
 msgid "Record your new TOTP secret and rescan the QR code above."
 msgstr "Registre su nuevo TOTP secret y vuelva a escanear el código QR de arriba"
 
-#: ../../addon/totp/Settings/Totp.php:115
+#: ../../addon/totp/Settings/Totp.php:117
 msgid "TOTP Settings"
 msgstr "Ajustes de TOTP"
 
@@ -3642,113 +3391,104 @@ msgstr "Su cuenta en %s caducará en unos pocos días."
 msgid "Your $Productname test account is about to expire."
 msgstr "Su cuenta de prueba de $Productname está a punto de caducar."
 
-#: ../../addon/hideaside/Mod_Hideaside.php:23
-#: ../../addon/hideaside/Mod_Hideaside.php:27
+#: ../../addon/hideaside/Mod_Hideaside.php:28
 msgid "Hide Aside App"
 msgstr "App de ocultamiento del panel lateral"
 
-#: ../../addon/hideaside/Mod_Hideaside.php:24
-#: ../../addon/hideaside/Mod_Hideaside.php:28
+#: ../../addon/hideaside/Mod_Hideaside.php:29
 msgid "Fade out aside areas after a while when using endless scroll"
 msgstr "Se desvanecen las áreas laterales cuando se usa un scroll sin fin"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:32
-msgid "Skeleton App"
-msgstr "App Skeleton"
-
-#: ../../addon/skeleton/Mod_Skeleton.php:33
-msgid "A skeleton for addons, you can copy/paste"
-msgstr "Skeleton para los addons, puede copiar/pegar"
-
-#: ../../addon/skeleton/Mod_Skeleton.php:40
+#: ../../addon/skeleton/Mod_Skeleton.php:38
 msgid "Some setting"
 msgstr "Algunos ajustes"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:40
+#: ../../addon/skeleton/Mod_Skeleton.php:38
 msgid "A setting"
 msgstr "Un ajuste"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:48
+#: ../../addon/skeleton/Mod_Skeleton.php:46
 msgid "Skeleton Settings"
 msgstr "Ajustes de Skeleton"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:104
-#: ../../addon/socialauth/Mod_SocialAuth.php:176
+#: ../../addon/socialauth/Mod_SocialAuth.php:106
+#: ../../addon/socialauth/Mod_SocialAuth.php:179
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:108
-#: ../../addon/socialauth/Mod_SocialAuth.php:180
+#: ../../addon/socialauth/Mod_SocialAuth.php:110
+#: ../../addon/socialauth/Mod_SocialAuth.php:183
 msgid "API error"
 msgstr "Error de API"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:112
-#: ../../addon/socialauth/Mod_SocialAuth.php:184
+#: ../../addon/socialauth/Mod_SocialAuth.php:114
+#: ../../addon/socialauth/Mod_SocialAuth.php:187
 msgid "Unknown issue"
 msgstr "Problema desconocido"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:168
+#: ../../addon/socialauth/Mod_SocialAuth.php:152
+msgid "Unable to retrieve email address from remote identity provider"
+msgstr "No se puede recuperar la dirección de correo electrónico del proveedor de identidad remota"
+
+#: ../../addon/socialauth/Mod_SocialAuth.php:171
 msgid "Unable to login using email address "
 msgstr "Imposible iniciar sesión usando la dirección de correo electrónico"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:202
-msgid "Sign in to Hubzilla using a social account"
-msgstr "Iniciar sesión en Hubzilla usando una cuenta social"
-
-#: ../../addon/socialauth/Mod_SocialAuth.php:207
+#: ../../addon/socialauth/Mod_SocialAuth.php:211
 msgid "Social Authentication using your social media account"
 msgstr "Autenticación usando su cuenta de medios sociales"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:211
+#: ../../addon/socialauth/Mod_SocialAuth.php:215
 msgid ""
 "This app enables one or more social provider sign-in buttons on the login "
 "page."
 msgstr "Esta aplicación habilita uno o más botones de inicio de sesión de proveedores sociales en la página de inicio de sesión."
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:229
+#: ../../addon/socialauth/Mod_SocialAuth.php:233
 msgid "Add an identity provider"
 msgstr "Añadir un proveedor de identidad"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:256
+#: ../../addon/socialauth/Mod_SocialAuth.php:260
 msgid "Enable "
 msgstr "Habilitar"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:263
+#: ../../addon/socialauth/Mod_SocialAuth.php:267
 msgid "Key"
 msgstr "Clave"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:263
-#: ../../addon/socialauth/Mod_SocialAuth.php:268
-#: ../../addon/socialauth/Mod_SocialAuth.php:284
-#: ../../addon/socialauth/Mod_SocialAuth.php:297
+#: ../../addon/socialauth/Mod_SocialAuth.php:267
+#: ../../addon/socialauth/Mod_SocialAuth.php:272
+#: ../../addon/socialauth/Mod_SocialAuth.php:288
+#: ../../addon/socialauth/Mod_SocialAuth.php:299
+#: ../../addon/socialauth/Mod_SocialAuth.php:308
 msgid "Word"
 msgstr "Palabra"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:268
+#: ../../addon/socialauth/Mod_SocialAuth.php:272
 msgid "Secret"
 msgstr "Secret"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:297
+#: ../../addon/socialauth/Mod_SocialAuth.php:308
 msgid "Add a custom provider"
 msgstr "Añadir un proveedor personalizado"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:317
+#: ../../addon/socialauth/Mod_SocialAuth.php:328
 msgid "Remove an identity provider"
 msgstr "Eliminar un proveedor de identidad"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:327
+#: ../../addon/socialauth/Mod_SocialAuth.php:338
 msgid "Social authentication"
 msgstr "Autenticación social"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:366
+#: ../../addon/socialauth/Mod_SocialAuth.php:380
 msgid "Error while saving provider settings"
 msgstr "Se ha producido un error mientras se guardaban los ajustes"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:382
+#: ../../addon/socialauth/Mod_SocialAuth.php:403
 msgid "Custom provider already exists"
 msgstr "Ya existe un proveedor personalizado"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:399
+#: ../../addon/socialauth/Mod_SocialAuth.php:420
 msgid "Social authentication settings saved."
 msgstr "Se han guardado los ajustes de la autenticación social."
 
@@ -3765,15 +3505,7 @@ msgstr "ver - %s"
 msgid "NSFW Settings saved."
 msgstr "Se han guardado los ajustes de NSFW."
 
-#: ../../addon/nsfw/Mod_Nsfw.php:33
-msgid "NSFW App"
-msgstr "App NSFW"
-
-#: ../../addon/nsfw/Mod_Nsfw.php:34
-msgid "Collapse content that contains predefined words"
-msgstr "Ocultar el contenido que contiene palabras predefinidas"
-
-#: ../../addon/nsfw/Mod_Nsfw.php:44
+#: ../../addon/nsfw/Mod_Nsfw.php:42
 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 "
@@ -3783,15 +3515,15 @@ msgid ""
 " can thereby be used as a general purpose content filter."
 msgstr "Esta aplicación busca en los mensajes las palabras o texto que especifique a continuación, y oculta cualquier contenido que contenga esas palabras clave, para que no se muestren en momentos inapropiados, como insinuaciones sexuales que puedan ser inapropiadas en un entorno laboral. Es cortés y recomendable etiquetar cualquier contenido que contenga desnudos con #NSFW. Este filtro también puede coincidir con cualquier otra palabra o texto que especifique y, por lo tanto, puede utilizarse como filtro de contenido de propósito general."
 
-#: ../../addon/nsfw/Mod_Nsfw.php:49
+#: ../../addon/nsfw/Mod_Nsfw.php:47
 msgid "Comma separated list of keywords to hide"
 msgstr "Lista separada por comas de palabras clave para ocultar"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:49
+#: ../../addon/nsfw/Mod_Nsfw.php:47
 msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr "Palabra, /expresión regular/, lang=xx, lang!=xx"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:58
+#: ../../addon/nsfw/Mod_Nsfw.php:56
 msgid "NSFW"
 msgstr "NSFW"
 
@@ -3865,30 +3597,6 @@ msgstr "¡El juego del \"gato\"!"
 msgid "I won!"
 msgstr "¡He ganado yo!"
 
-#: ../../addon/gnusoc/gnusoc.php:453
-msgid "Follow"
-msgstr "Seguir"
-
-#: ../../addon/gnusoc/gnusoc.php:456
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr "%1$s está siguiendo ahora a %2$s"
-
-#: ../../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 "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos."
-
-#: ../../addon/gnusoc/Mod_Gnusoc.php:22
-msgid "GNU-Social Protocol App"
-msgstr "App Protocolo GNU-Social"
-
-#: ../../addon/gnusoc/Mod_Gnusoc.php:34
-msgid "GNU-Social Protocol"
-msgstr "Protocolo GNU-Social"
-
 #: ../../addon/mailtest/mailtest.php:19
 msgid "Send test email"
 msgstr "Enviar un correo electrónico de prueba"
@@ -3905,31 +3613,23 @@ msgstr "No se pudo enviar el correo."
 msgid "Mail Test"
 msgstr "Prueba de correo"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:38
-msgid "Livejournal Crosspost Connector App"
-msgstr "App Livejournal Crosspost Connector"
-
-#: ../../addon/ljpost/Mod_Ljpost.php:39
-msgid "Relay public posts to Livejournal"
-msgstr "Retransmisión de entradas públicas a Livejournal"
-
-#: ../../addon/ljpost/Mod_Ljpost.php:55
+#: ../../addon/ljpost/Mod_Ljpost.php:53
 msgid "Livejournal username"
 msgstr "Nombre de usuario en Livejournal"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:59
+#: ../../addon/ljpost/Mod_Ljpost.php:57
 msgid "Livejournal password"
 msgstr "Contraseña en Livejournal"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:63
+#: ../../addon/ljpost/Mod_Ljpost.php:61
 msgid "Post to Livejournal by default"
 msgstr "Publicar en Livejournal por defecto"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:67
+#: ../../addon/ljpost/Mod_Ljpost.php:65
 msgid "Send wall-to-wall posts to Livejournal"
 msgstr "Enviar entradas de Muro-Muro a Livejournal"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:79
+#: ../../addon/ljpost/Mod_Ljpost.php:77
 msgid "Livejournal Crosspost Connector"
 msgstr "Livejournal Crosspost Connector"
 
@@ -3941,10 +3641,10 @@ msgstr "Publicar en Livejournal"
 msgid "Posted by"
 msgstr "Publicado por "
 
-#: ../../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
+#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2192
+#: ../../Zotlabs/Widget/Wiki_pages.php:44
+#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:368
 msgid "Markdown"
 msgstr "Markdown"
 
@@ -3964,17 +3664,12 @@ msgstr "Esto importará todos sus ficheros en la nube desde otro servidor."
 msgid "Hubzilla Server base URL"
 msgstr "URL base del servidor Hubzilla"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:22
+#: ../../addon/authchoose/Mod_Authchoose.php:30
 msgid ""
 "Allow magic authentication only to websites of your immediate connections"
 msgstr "Permitir la autenticación mágica sólo a los sitios web de sus conexiones próximas"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:28
-#: ../../addon/authchoose/Mod_Authchoose.php:33
-msgid "Authchoose App"
-msgstr "App Authchoose"
-
-#: ../../addon/authchoose/Mod_Authchoose.php:39
+#: ../../addon/authchoose/Mod_Authchoose.php:36
 msgid "Authchoose"
 msgstr "Autoseleccionar"
 
@@ -3982,19 +3677,11 @@ msgstr "Autoseleccionar"
 msgid "pageheader Settings saved."
 msgstr "Se han guardado los ajustes del encabezado de página."
 
-#: ../../addon/pageheader/Mod_Pageheader.php:34
-msgid "Page Header App"
-msgstr "App Page Header"
-
-#: ../../addon/pageheader/Mod_Pageheader.php:35
-msgid "Inserts a page header"
-msgstr "Inserta un encabezado de página"
-
-#: ../../addon/pageheader/Mod_Pageheader.php:43
+#: ../../addon/pageheader/Mod_Pageheader.php:41
 msgid "Message to display on every page on this server"
 msgstr "Mensaje para mostrar en todas las páginas de este servidor"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:51
+#: ../../addon/pageheader/Mod_Pageheader.php:49
 msgid "Page Header"
 msgstr "Page Header"
 
@@ -4061,502 +3748,497 @@ msgstr "Servidor BOSH de Jabber"
 msgid "XMPP Settings"
 msgstr "Ajustes de XMPP"
 
-#: ../../include/zot.php:778
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:805 ../../Zotlabs/Lib/Libzot.php:655
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2663 ../../Zotlabs/Lib/Libsync.php:740
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
-
-#: ../../include/zot.php:4378
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
-
-#: ../../include/text.php:523
+#: ../../include/text.php:546
 msgid "prev"
 msgstr "anterior"
 
-#: ../../include/text.php:525
+#: ../../include/text.php:548
 msgid "first"
 msgstr "primera"
 
-#: ../../include/text.php:554
+#: ../../include/text.php:577
 msgid "last"
 msgstr "última"
 
-#: ../../include/text.php:557
+#: ../../include/text.php:580
 msgid "next"
 msgstr "próxima"
 
-#: ../../include/text.php:575
+#: ../../include/text.php:598
 msgid "older"
 msgstr "más antiguas"
 
-#: ../../include/text.php:577
+#: ../../include/text.php:600
 msgid "newer"
 msgstr "más recientes"
 
-#: ../../include/text.php:1018
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:1030 ../../include/features.php:133
-#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333
+#: ../../include/text.php:1055 ../../include/features.php:133
+#: ../../Zotlabs/Module/Connections.php:390 ../../Zotlabs/Lib/Apps.php:337
 msgid "Connections"
 msgstr "Conexiones"
 
-#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:80
-#: ../../Zotlabs/Module/Connections.php:289
+#: ../../include/text.php:1063 ../../Zotlabs/Module/Viewconnections.php:80
+#: ../../Zotlabs/Module/Connections.php:297
 msgid "Accepts"
 msgstr "Se acepta"
 
-#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:83
-#: ../../Zotlabs/Module/Connections.php:292
+#: ../../include/text.php:1066 ../../Zotlabs/Module/Viewconnections.php:83
+#: ../../Zotlabs/Module/Connections.php:300
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../../include/text.php:1046 ../../Zotlabs/Module/Viewconnections.php:88
-#: ../../Zotlabs/Module/Connections.php:297
+#: ../../include/text.php:1071 ../../Zotlabs/Module/Viewconnections.php:88
+#: ../../Zotlabs/Module/Connections.php:305
 msgid "Stream items"
 msgstr "Elementos del stream"
 
-#: ../../include/text.php:1051 ../../Zotlabs/Module/Viewconnections.php:93
-#: ../../Zotlabs/Module/Connections.php:302
+#: ../../include/text.php:1076 ../../Zotlabs/Module/Viewconnections.php:93
+#: ../../Zotlabs/Module/Connections.php:310
 msgid "Wall posts"
 msgstr "Entradas del Muro"
 
-#: ../../include/text.php:1055 ../../Zotlabs/Module/Viewconnections.php:97
-#: ../../Zotlabs/Module/Connections.php:306
+#: ../../include/text.php:1080 ../../Zotlabs/Module/Viewconnections.php:97
+#: ../../Zotlabs/Module/Connections.php:314
 msgid "Nothing"
 msgstr "Nada"
 
-#: ../../include/text.php:1070
+#: ../../include/text.php:1093
 #, php-format
 msgid "View all %s connections"
 msgstr "Ver todas las %s conexiones"
 
-#: ../../include/text.php:1133
+#: ../../include/text.php:1156
 #, php-format
 msgid "Network: %s"
 msgstr "Red %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
+#: ../../include/text.php:1167 ../../include/text.php:1179
+#: ../../include/nav.php:190 ../../include/acl_selectors.php:149
+#: ../../Zotlabs/Widget/Sitesearch.php:37
+#: ../../Zotlabs/Widget/Activity_filter.php:210
+#: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:394
+#: ../../Zotlabs/Lib/Apps.php:357
 msgid "Search"
 msgstr "Buscar"
 
-#: ../../include/text.php:1236 ../../include/text.php:1240
+#: ../../include/text.php:1259 ../../include/text.php:1263
 msgid "poke"
 msgstr "un toque"
 
-#: ../../include/text.php:1236 ../../include/text.php:1240
+#: ../../include/text.php:1259 ../../include/text.php:1263
 #: ../../include/conversation.php:267
 msgid "poked"
 msgstr "ha dado un toque a"
 
-#: ../../include/text.php:1241
+#: ../../include/text.php:1264
 msgid "ping"
 msgstr "un \"ping\""
 
-#: ../../include/text.php:1241
+#: ../../include/text.php:1264
 msgid "pinged"
 msgstr "ha enviado un \"ping\" a"
 
-#: ../../include/text.php:1242
+#: ../../include/text.php:1265
 msgid "prod"
 msgstr "una incitación "
 
-#: ../../include/text.php:1242
+#: ../../include/text.php:1265
 msgid "prodded"
 msgstr "ha incitado a "
 
-#: ../../include/text.php:1243
+#: ../../include/text.php:1266
 msgid "slap"
 msgstr "una bofetada "
 
-#: ../../include/text.php:1243
+#: ../../include/text.php:1266
 msgid "slapped"
 msgstr "ha abofeteado a "
 
-#: ../../include/text.php:1244
+#: ../../include/text.php:1267
 msgid "finger"
 msgstr "un \"finger\" "
 
-#: ../../include/text.php:1244
+#: ../../include/text.php:1267
 msgid "fingered"
 msgstr "envió un \"finger\" a"
 
-#: ../../include/text.php:1245
+#: ../../include/text.php:1268
 msgid "rebuff"
 msgstr "un reproche"
 
-#: ../../include/text.php:1245
+#: ../../include/text.php:1268
 msgid "rebuffed"
 msgstr "ha hecho un reproche a "
 
-#: ../../include/text.php:1268
+#: ../../include/text.php:1291
 msgid "happy"
 msgstr "feliz "
 
-#: ../../include/text.php:1269
+#: ../../include/text.php:1292
 msgid "sad"
 msgstr "triste "
 
-#: ../../include/text.php:1270
+#: ../../include/text.php:1293
 msgid "mellow"
 msgstr "tranquilo/a"
 
-#: ../../include/text.php:1271
+#: ../../include/text.php:1294
 msgid "tired"
 msgstr "cansado/a "
 
-#: ../../include/text.php:1272
+#: ../../include/text.php:1295
 msgid "perky"
 msgstr "vivaz"
 
-#: ../../include/text.php:1273
+#: ../../include/text.php:1296
 msgid "angry"
 msgstr "enfadado/a"
 
-#: ../../include/text.php:1274
+#: ../../include/text.php:1297
 msgid "stupefied"
 msgstr "asombrado/a"
 
-#: ../../include/text.php:1275
+#: ../../include/text.php:1298
 msgid "puzzled"
 msgstr "perplejo/a"
 
-#: ../../include/text.php:1276
+#: ../../include/text.php:1299
 msgid "interested"
 msgstr "interesado/a"
 
-#: ../../include/text.php:1277
+#: ../../include/text.php:1300
 msgid "bitter"
 msgstr "amargado/a"
 
-#: ../../include/text.php:1278
+#: ../../include/text.php:1301
 msgid "cheerful"
 msgstr "alegre"
 
-#: ../../include/text.php:1279
+#: ../../include/text.php:1302
 msgid "alive"
 msgstr "animado/a"
 
-#: ../../include/text.php:1280
+#: ../../include/text.php:1303
 msgid "annoyed"
 msgstr "molesto/a"
 
-#: ../../include/text.php:1281
+#: ../../include/text.php:1304
 msgid "anxious"
 msgstr "ansioso/a"
 
-#: ../../include/text.php:1282
+#: ../../include/text.php:1305
 msgid "cranky"
 msgstr "de mal humor"
 
-#: ../../include/text.php:1283
+#: ../../include/text.php:1306
 msgid "disturbed"
 msgstr "perturbado/a"
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1307
 msgid "frustrated"
 msgstr "frustrado/a"
 
-#: ../../include/text.php:1285
+#: ../../include/text.php:1308
 msgid "depressed"
 msgstr "deprimido/a"
 
-#: ../../include/text.php:1286
+#: ../../include/text.php:1309
 msgid "motivated"
 msgstr "motivado/a"
 
-#: ../../include/text.php:1287
+#: ../../include/text.php:1310
 msgid "relaxed"
 msgstr "relajado/a"
 
-#: ../../include/text.php:1288
+#: ../../include/text.php:1311
 msgid "surprised"
 msgstr "sorprendido/a"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:99
+#: ../../include/text.php:1499 ../../include/js_strings.php:99
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:100
+#: ../../include/text.php:1499 ../../include/js_strings.php:100
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:101
+#: ../../include/text.php:1499 ../../include/js_strings.php:101
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:102
+#: ../../include/text.php:1499 ../../include/js_strings.php:102
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:103
+#: ../../include/text.php:1499 ../../include/js_strings.php:103
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:104
+#: ../../include/text.php:1499 ../../include/js_strings.php:104
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1476 ../../include/js_strings.php:98
+#: ../../include/text.php:1499 ../../include/js_strings.php:98
 msgid "Sunday"
 msgstr "domingo"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:74
+#: ../../include/text.php:1503 ../../include/js_strings.php:74
 msgid "January"
 msgstr "enero"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:75
+#: ../../include/text.php:1503 ../../include/js_strings.php:75
 msgid "February"
 msgstr "febrero"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:76
+#: ../../include/text.php:1503 ../../include/js_strings.php:76
 msgid "March"
 msgstr "marzo"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:77
+#: ../../include/text.php:1503 ../../include/js_strings.php:77
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1480
+#: ../../include/text.php:1503
 msgid "May"
 msgstr "mayo"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:79
+#: ../../include/text.php:1503 ../../include/js_strings.php:79
 msgid "June"
 msgstr "junio"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:80
+#: ../../include/text.php:1503 ../../include/js_strings.php:80
 msgid "July"
 msgstr "julio"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:81
+#: ../../include/text.php:1503 ../../include/js_strings.php:81
 msgid "August"
 msgstr "agosto"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:82
+#: ../../include/text.php:1503 ../../include/js_strings.php:82
 msgid "September"
 msgstr "septiembre"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:83
+#: ../../include/text.php:1503 ../../include/js_strings.php:83
 msgid "October"
 msgstr "octubre"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:84
+#: ../../include/text.php:1503 ../../include/js_strings.php:84
 msgid "November"
 msgstr "noviembre"
 
-#: ../../include/text.php:1480 ../../include/js_strings.php:85
+#: ../../include/text.php:1503 ../../include/js_strings.php:85
 msgid "December"
 msgstr "diciembre"
 
-#: ../../include/text.php:1556
+#: ../../include/text.php:1565
 msgid "Unknown Attachment"
 msgstr "Adjunto no reconocido"
 
-#: ../../include/text.php:1558 ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../include/text.php:1567 ../../Zotlabs/Module/Sharedwithme.php:108
 #: ../../Zotlabs/Storage/Browser.php:379
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../../include/text.php:1558 ../../include/feedutils.php:872
+#: ../../include/text.php:1567 ../../include/feedutils.php:874
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../include/text.php:1599
+#: ../../include/text.php:1608
 msgid "remove category"
 msgstr "eliminar el tema"
 
-#: ../../include/text.php:1676
+#: ../../include/text.php:1685
 msgid "remove from file"
 msgstr "eliminar del fichero"
 
-#: ../../include/text.php:1845 ../../include/message.php:13
+#: ../../include/text.php:1869
 msgid "Download binary/encrypted content"
 msgstr "Descargar contenido binario o cifrado"
 
-#: ../../include/text.php:1916
-msgid "Poll has ended."
+#: ../../include/text.php:1927 ../../include/text.php:1936
+#: ../../include/text.php:1963 ../../include/text.php:1972
+#, php-format
+msgctxt "noun"
+msgid "%d Vote"
+msgid_plural "%d Votes"
+msgstr[0] "%dVoto"
+msgstr[1] "%dVotos"
+
+#: ../../include/text.php:1979
+#, php-format
+msgctxt "noun"
+msgid "%d Vote in total"
+msgid_plural "%d Votes in total"
+msgstr[0] "%dVoto en total"
+msgstr[1] "%dVotos en total"
+
+#: ../../include/text.php:1985
+msgid "Poll has ended"
 msgstr "La encuesta ha terminado"
 
-#: ../../include/text.php:1919
+#: ../../include/text.php:1988
 #, php-format
-msgid "Poll ends: %s"
-msgstr "Finales de la encuesta: %s"
+msgid "Poll ends in %s"
+msgstr "La encuesta termina en %s"
 
-#: ../../include/text.php:1924 ../../Zotlabs/Lib/ThreadItem.php:446
+#: ../../include/text.php:1995 ../../Zotlabs/Lib/ThreadItem.php:482
 msgid "Vote"
 msgstr "Votar"
 
-#: ../../include/text.php:2076 ../../Zotlabs/Module/Events.php:669
+#: ../../include/text.php:2150
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../include/text.php:2098 ../../include/language.php:428
+#: ../../include/text.php:2172 ../../include/language.php:433
 msgid "default"
 msgstr "por defecto"
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2180
 msgid "Page layout"
 msgstr "Plantilla de la página"
 
-#: ../../include/text.php:2106
+#: ../../include/text.php:2180
 msgid "You can create your own with the layouts tool"
 msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas"
 
-#: ../../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
+#: ../../include/text.php:2190 ../../Zotlabs/Widget/Wiki_pages.php:44
+#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:368
 msgid "BBcode"
 msgstr "BBcode"
 
-#: ../../include/text.php:2117
+#: ../../include/text.php:2191
 msgid "HTML"
 msgstr "HTML"
 
-#: ../../include/text.php:2119 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216
+#: ../../include/text.php:2193 ../../Zotlabs/Widget/Wiki_pages.php:44
+#: ../../Zotlabs/Widget/Wiki_pages.php:101 ../../Zotlabs/Module/Wiki.php:214
 msgid "Text"
 msgstr "Texto"
 
-#: ../../include/text.php:2120
+#: ../../include/text.php:2194
 msgid "Comanche Layout"
 msgstr "Plantilla de Comanche"
 
-#: ../../include/text.php:2125
+#: ../../include/text.php:2199
 msgid "PHP"
 msgstr "PHP"
 
-#: ../../include/text.php:2134
+#: ../../include/text.php:2208
 msgid "Page content type"
 msgstr "Tipo de contenido de la página"
 
-#: ../../include/text.php:2257 ../../include/event.php:1259
+#: ../../include/text.php:2331 ../../include/event.php:1340
 #: ../../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
+#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Module/Tagger.php:75
 msgid "event"
 msgstr "el/su evento"
 
-#: ../../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
+#: ../../include/text.php:2334 ../../include/conversation.php:158
+#: ../../include/bbcode.php:555 ../../include/markdown.php:205
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3613
 msgid "post"
 msgstr "la entrada"
 
-#: ../../include/text.php:2262 ../../include/conversation.php:160
+#: ../../include/text.php:2336 ../../include/conversation.php:160
 #: ../../Zotlabs/Module/Tagger.php:81
 msgid "comment"
 msgstr "el comentario"
 
-#: ../../include/text.php:2267
+#: ../../include/text.php:2341
 msgid "activity"
 msgstr "la/su actividad"
 
-#: ../../include/text.php:2270
+#: ../../include/text.php:2344
 msgid "poll"
 msgstr "encuesta"
 
-#: ../../include/text.php:2383
+#: ../../include/text.php:2457
 msgid "a-z, 0-9, -, and _ only"
 msgstr "a-z, 0-9, -, and _ only"
 
-#: ../../include/text.php:2709
+#: ../../include/text.php:2762
 msgid "Design Tools"
 msgstr "Herramientas de diseño web"
 
-#: ../../include/text.php:2712 ../../Zotlabs/Module/Blocks.php:154
+#: ../../include/text.php:2765 ../../Zotlabs/Module/Blocks.php:154
 msgid "Blocks"
 msgstr "Bloques"
 
-#: ../../include/text.php:2713 ../../Zotlabs/Module/Menu.php:171
+#: ../../include/text.php:2766 ../../Zotlabs/Module/Menu.php:171
 msgid "Menus"
 msgstr "Menús"
 
-#: ../../include/text.php:2714 ../../Zotlabs/Module/Layouts.php:184
+#: ../../include/text.php:2767 ../../Zotlabs/Module/Layouts.php:184
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: ../../include/text.php:2715
+#: ../../include/text.php:2768
 msgid "Pages"
 msgstr "Páginas"
 
-#: ../../include/text.php:2727
+#: ../../include/text.php:2780
 msgid "Import"
 msgstr "Importar"
 
-#: ../../include/text.php:2728
+#: ../../include/text.php:2781
 msgid "Import website..."
 msgstr "Importar un sitio web..."
 
-#: ../../include/text.php:2729
+#: ../../include/text.php:2782
 msgid "Select folder to import"
 msgstr "Seleccionar la carpeta que se va a importar"
 
-#: ../../include/text.php:2730
+#: ../../include/text.php:2783
 msgid "Import from a zipped folder:"
 msgstr "Importar desde una carpeta comprimida: "
 
-#: ../../include/text.php:2731
+#: ../../include/text.php:2784
 msgid "Import from cloud files:"
 msgstr "Importar desde los ficheros en la nube: "
 
-#: ../../include/text.php:2732
+#: ../../include/text.php:2785
 msgid "/cloud/channel/path/to/folder"
 msgstr "/cloud/canal/ruta/a la/carpeta"
 
-#: ../../include/text.php:2733
+#: ../../include/text.php:2786
 msgid "Enter path to website files"
 msgstr "Ruta a los ficheros del sitio web"
 
-#: ../../include/text.php:2734
+#: ../../include/text.php:2787
 msgid "Select folder"
 msgstr "Seleccionar la carpeta"
 
-#: ../../include/text.php:2735
+#: ../../include/text.php:2788
 msgid "Export website..."
 msgstr "Exportar un sitio web..."
 
-#: ../../include/text.php:2736
+#: ../../include/text.php:2789
 msgid "Export to a zip file"
 msgstr "Exportar a un fichero comprimido .zip"
 
-#: ../../include/text.php:2737
+#: ../../include/text.php:2790
 msgid "website.zip"
 msgstr "sitio_web.zip"
 
-#: ../../include/text.php:2738
+#: ../../include/text.php:2791
 msgid "Enter a name for the zip file."
 msgstr "Escriba un nombre para el fichero zip."
 
-#: ../../include/text.php:2739
+#: ../../include/text.php:2792
 msgid "Export to cloud files"
 msgstr "Exportar a la nube de ficheros"
 
-#: ../../include/text.php:2740
+#: ../../include/text.php:2793
 msgid "/path/to/export/folder"
 msgstr "/ruta/para/exportar/carpeta"
 
-#: ../../include/text.php:2741
+#: ../../include/text.php:2794
 msgid "Enter a path to a cloud files destination."
 msgstr "Escriba una ruta de destino a la nube de ficheros."
 
-#: ../../include/text.php:2742
+#: ../../include/text.php:2795
 msgid "Specify folder"
 msgstr "Especificar una carpeta"
 
@@ -4565,7 +4247,7 @@ msgstr "Especificar una carpeta"
 msgid "This is the home page of %s."
 msgstr "Esta es la página personal de %s."
 
-#: ../../include/event.php:33 ../../include/event.php:110
+#: ../../include/event.php:33 ../../include/event.php:128
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d de F, Y \\@ G:i"
 
@@ -4577,88 +4259,85 @@ msgstr "Comienza:"
 msgid "Finishes:"
 msgstr "Finaliza:"
 
-#: ../../include/event.php:63 ../../include/event.php:134
-#: ../../include/channel.php:1658 ../../Zotlabs/Module/Directory.php:354
+#: ../../include/event.php:63 ../../include/event.php:146
+#: ../../include/channel.php:1625 ../../Zotlabs/Module/Directory.php:353
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: ../../include/event.php:110
+#: ../../include/event.php:128
 msgid "l F d, Y"
 msgstr "l F d, Y"
 
-#: ../../include/event.php:114
+#: ../../include/event.php:132
 msgid "Start:"
 msgstr "Iniciar: "
 
-#: ../../include/event.php:118
+#: ../../include/event.php:136
 msgid "End:"
 msgstr "Finalizar: "
 
-#: ../../include/event.php:1106
+#: ../../include/event.php:1186
 msgid "This event has been added to your calendar."
 msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/event.php:1337
+#: ../../include/event.php:1419
 msgid "Not specified"
 msgstr "Sin especificar"
 
-#: ../../include/event.php:1338
+#: ../../include/event.php:1420
 msgid "Needs Action"
 msgstr "Necesita de una intervención"
 
-#: ../../include/event.php:1339
+#: ../../include/event.php:1421
 msgid "Completed"
 msgstr "Completado/a"
 
-#: ../../include/event.php:1340
+#: ../../include/event.php:1422
 msgid "In Process"
 msgstr "En proceso"
 
-#: ../../include/event.php:1341
+#: ../../include/event.php:1423
 msgid "Cancelled"
 msgstr "Cancelado/a"
 
-#: ../../include/event.php:1422 ../../include/connections.php:734
-#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794
-#: ../../Zotlabs/Module/Connedit.php:925
+#: ../../include/event.php:1504 ../../include/connections.php:752
+#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Connedit.php:741
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../../include/event.php:1423 ../../include/connections.php:735
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795
-#: ../../Zotlabs/Module/Connedit.php:926
+#: ../../include/event.php:1505 ../../include/connections.php:753
+#: ../../Zotlabs/Widget/Notifications.php:42
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Connedit.php:742
 msgid "Home"
 msgstr "Inicio"
 
-#: ../../include/event.php:1424 ../../include/connections.php:736
+#: ../../include/event.php:1506 ../../include/connections.php:754
 msgid "Home, Voice"
 msgstr "Llamadas particulares"
 
-#: ../../include/event.php:1425 ../../include/connections.php:737
+#: ../../include/event.php:1507 ../../include/connections.php:755
 msgid "Home, Fax"
 msgstr "Fax particular"
 
-#: ../../include/event.php:1426 ../../include/connections.php:738
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796
-#: ../../Zotlabs/Module/Connedit.php:927
+#: ../../include/event.php:1508 ../../include/connections.php:756
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:743
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../../include/event.php:1427 ../../include/connections.php:739
+#: ../../include/event.php:1509 ../../include/connections.php:757
 msgid "Work, Voice"
 msgstr "Llamadas de trabajo"
 
-#: ../../include/event.php:1428 ../../include/connections.php:740
+#: ../../include/event.php:1510 ../../include/connections.php:758
 msgid "Work, Fax"
 msgstr "Fax de trabajo"
 
-#: ../../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
+#: ../../include/event.php:1511 ../../include/event.php:1518
+#: ../../include/selectors.php:64 ../../include/selectors.php:81
+#: ../../include/selectors.php:119 ../../include/selectors.php:155
+#: ../../include/connections.php:759 ../../include/connections.php:766
+#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Connedit.php:744
+#: ../../Zotlabs/Access/PermissionRoles.php:360
 msgid "Other"
 msgstr "Otro"
 
@@ -4674,8 +4353,8 @@ msgstr "Desactivado"
 msgid "On"
 msgstr "Activado"
 
-#: ../../include/features.php:82 ../../include/nav.php:463
-#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346
+#: ../../include/features.php:82 ../../include/nav.php:466
+#: ../../include/nav.php:469 ../../Zotlabs/Lib/Apps.php:350
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -4695,7 +4374,7 @@ msgstr "Selección del huso horario del evento"
 msgid "Allow event creation in timezones other than your own."
 msgstr "Permitir la creación de eventos en husos horarios distintos del suyo."
 
-#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:343
+#: ../../include/features.php:104
 msgid "Channel Home"
 msgstr "Mi canal"
 
@@ -4767,7 +4446,7 @@ msgstr "Responder a los comentarios"
 msgid "Ability to reply on selected comment"
 msgstr "Posibilidad de responder a los comentarios seleccionados"
 
-#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:347
+#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:351
 msgid "Directory"
 msgstr "Directorio"
 
@@ -4866,7 +4545,8 @@ msgstr "Navegación por el selector de canales"
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
 
-#: ../../include/features.php:290 ../../Zotlabs/Module/Connections.php:333
+#: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:22
+#: ../../Zotlabs/Module/Connections.php:338
 msgid "Network"
 msgstr "Red"
 
@@ -4886,7 +4566,7 @@ msgstr "Filtro de encuestas"
 msgid "Ability to display only polls"
 msgstr "Capacidad para mostrar solo encuestas"
 
-#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:83
+#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:89
 msgid "Saved Searches"
 msgstr "Búsquedas guardadas"
 
@@ -4895,8 +4575,8 @@ msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
 #: ../../include/features.php:318 ../../include/contact_widgets.php:53
-#: ../../Zotlabs/Widget/Activity_filter.php:189
-#: ../../Zotlabs/Widget/Filer.php:28
+#: ../../Zotlabs/Widget/Activity_filter.php:196
+#: ../../Zotlabs/Widget/Filer.php:33
 msgid "Saved Folders"
 msgstr "Carpetas guardadas"
 
@@ -4938,8 +4618,8 @@ msgstr "Filtro de entradas personales"
 msgid "Ability to display only posts that you've interacted on"
 msgstr "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado"
 
-#: ../../include/features.php:368 ../../include/nav.php:444
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345
+#: ../../include/features.php:368 ../../include/nav.php:447
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349
 msgid "Photos"
 msgstr "Fotos"
 
@@ -4951,7 +4631,8 @@ msgstr "Ubicación de las fotos"
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
 
-#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:363
+#: ../../include/features.php:382 ../../Zotlabs/Module/Contactedit.php:444
+#: ../../Zotlabs/Lib/Apps.php:367
 msgid "Profiles"
 msgstr "Perfiles"
 
@@ -4979,7 +4660,7 @@ msgstr "Múltiples perfiles"
 msgid "Ability to create multiple profiles"
 msgstr "Capacidad de crear múltiples perfiles"
 
-#: ../../include/security.php:607
+#: ../../include/security.php:629
 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."
@@ -4989,12 +4670,12 @@ msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrid
 msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
 
-#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1097
-#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Lib/ThreadItem.php:826
+#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1103
+#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:864
 msgid "Comment"
 msgstr "Comentar"
 
-#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:535
+#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:573
 #, php-format
 msgid "%s show all"
 msgstr "%s mostrar todo"
@@ -5018,7 +4699,7 @@ msgstr "%s contraer"
 msgid "Password too short"
 msgstr "Contraseña demasiado corta"
 
-#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:158
+#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:161
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
@@ -5050,8 +4731,7 @@ msgstr "Nada nuevo por aquí"
 msgid "Rate This Channel (this is public)"
 msgstr "Valorar este canal (esto es público)"
 
-#: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:157
-#: ../../Zotlabs/Module/Connedit.php:880
+#: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valoración"
 
@@ -5067,10 +4747,9 @@ msgstr "Por favor, introduzca una dirección de enlace"
 msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?"
 
-#: ../../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
+#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52
+#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Profiles.php:480
+#: ../../Zotlabs/Module/Profiles.php:751 ../../Zotlabs/Module/Locs.php:121
 msgid "Location"
 msgstr "Ubicación"
 
@@ -5124,12 +4803,12 @@ msgstr "Volver a la respuesta"
 msgid "Pinned"
 msgstr "Anclado/a"
 
-#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:473
+#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:509
 msgid "Pin to the top"
 msgstr "Anclar en la parte superior"
 
-#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155
-#: ../../Zotlabs/Lib/ThreadItem.php:473
+#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:158
+#: ../../Zotlabs/Lib/ThreadItem.php:509
 msgid "Unpin from the top"
 msgstr "Desanclar de la parte superior"
 
@@ -5331,38 +5010,38 @@ msgstr "Por favor, espere mientras se prepara la descarga."
 msgid "Email address not valid"
 msgstr "Dirección de correo electrónica no válida"
 
-#: ../../include/help.php:80
+#: ../../include/help.php:81
 msgid "Help:"
 msgstr "Ayuda:"
 
-#: ../../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
+#: ../../include/help.php:118 ../../include/help.php:126
+#: ../../include/nav.php:176 ../../include/nav.php:315
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../../include/help.php:129
+#: ../../include/help.php:130
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: ../../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
+#: ../../include/help.php:133 ../../Zotlabs/Module/Display.php:142
+#: ../../Zotlabs/Module/Display.php:159 ../../Zotlabs/Module/Display.php:179
+#: ../../Zotlabs/Module/Display.php:185 ../../Zotlabs/Module/Page.php:136
+#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:539
 #: ../../Zotlabs/Web/Router.php:186
 msgid "Page not found."
 msgstr "Página no encontrada."
 
-#: ../../include/photos.php:151
+#: ../../include/photos.php:153
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr "La imagen excede el límite de %lu bytes del sitio"
 
-#: ../../include/photos.php:162
+#: ../../include/photos.php:164
 msgid "Image file is empty."
 msgstr "El fichero de imagen está vacío. "
 
-#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:261
+#: ../../include/photos.php:198 ../../Zotlabs/Module/Profile_photo.php:275
 #: ../../Zotlabs/Module/Cover_photo.php:241
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
@@ -5381,19 +5060,35 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr "%1$s ha publicado %2$s en %3$s"
 
-#: ../../include/photos.php:666 ../../include/nav.php:447
+#: ../../include/photos.php:722 ../../include/nav.php:450
 msgid "Photo Albums"
 msgstr "Álbumes de fotos"
 
-#: ../../include/photos.php:667 ../../Zotlabs/Module/Photos.php:1348
-#: ../../Zotlabs/Module/Photos.php:1361 ../../Zotlabs/Module/Photos.php:1362
+#: ../../include/photos.php:723 ../../Zotlabs/Module/Photos.php:1352
+#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1366
 msgid "Recent Photos"
 msgstr "Fotos recientes"
 
-#: ../../include/photos.php:671
+#: ../../include/photos.php:727
 msgid "Upload New Photos"
 msgstr "Subir nuevas fotos"
 
+#: ../../include/network.php:412
+msgid "url: "
+msgstr "url: "
+
+#: ../../include/network.php:413
+msgid "error_code: "
+msgstr "código_de_error: "
+
+#: ../../include/network.php:414
+msgid "error_string: "
+msgstr "cadena_de_error: "
+
+#: ../../include/network.php:415
+msgid "content-type: "
+msgstr "tipo de contenido: "
+
 #: ../../include/network.php:1762 ../../include/network.php:1763
 msgid "Friendica"
 msgstr "Friendica"
@@ -5465,7 +5160,7 @@ msgstr[0] "%d invitación pendiente"
 msgstr[1] "%d invitaciones disponibles"
 
 #: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:416
+#: ../../Zotlabs/Module/Admin/Site.php:419
 msgid "Advanced"
 msgstr "Avanzado"
 
@@ -5485,14 +5180,14 @@ msgstr "Conectar/Seguir"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:433
-#: ../../Zotlabs/Module/Directory.php:438
-#: ../../Zotlabs/Module/Connections.php:382
+#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437
+#: ../../Zotlabs/Module/Connections.php:398
 msgid "Find"
 msgstr "Encontrar"
 
-#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:437
-#: ../../Zotlabs/Module/Suggest.php:79
+#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:436
+#: ../../Zotlabs/Module/Suggest.php:77
 msgid "Channel Suggestions"
 msgstr "Sugerencias de canales"
 
@@ -5508,255 +5203,255 @@ msgstr "Invitar a amigos"
 msgid "Advanced example: name=fred and country=iceland"
 msgstr "Ejemplo avanzado: nombre=juan y país=españa"
 
-#: ../../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
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:119
+#: ../../include/contact_widgets.php:163 ../../include/contact_widgets.php:208
+#: ../../include/contact_widgets.php:243
+#: ../../Zotlabs/Widget/Appcategories.php:52 ../../Zotlabs/Widget/Filer.php:36
 msgid "Everything"
 msgstr "Todo"
 
-#: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156
-#: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236
+#: ../../include/contact_widgets.php:116 ../../include/contact_widgets.php:160
+#: ../../include/contact_widgets.php:205 ../../include/contact_widgets.php:240
 #: ../../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/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293
 #: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
 msgid "Categories"
 msgstr "Temas"
 
-#: ../../include/contact_widgets.php:269
+#: ../../include/contact_widgets.php:273
 msgid "Common Connections"
 msgstr "Conexiones comunes"
 
-#: ../../include/contact_widgets.php:273
+#: ../../include/contact_widgets.php:277
 #, php-format
 msgid "View all %d common connections"
 msgstr "Ver todas las %d conexiones comunes"
 
-#: ../../include/language.php:441
+#: ../../include/language.php:446
 msgid "Select an alternate language"
 msgstr "Seleccionar un idioma alternativo"
 
-#: ../../include/import.php:29
+#: ../../include/import.php:30
 msgid "Unable to import a removed channel."
 msgstr "No se puede importar un canal eliminado."
 
-#: ../../include/import.php:55
+#: ../../include/import.php:56
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
 
-#: ../../include/import.php:121
+#: ../../include/import.php:122
 msgid "Cloned channel not found. Import failed."
 msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../include/nav.php:95
+#: ../../include/nav.php:92
 msgid "Remote authentication"
 msgstr "Acceder desde su servidor"
 
-#: ../../include/nav.php:95
+#: ../../include/nav.php:92
 msgid "Click to authenticate to your home hub"
 msgstr "Pulsar para identificarse en su servidor de inicio"
 
-#: ../../include/nav.php:101 ../../Zotlabs/Module/Manage.php:170
-#: ../../Zotlabs/Lib/Apps.php:337
-msgid "Channel Manager"
-msgstr "Administración de canales"
+#: ../../include/nav.php:98 ../../Zotlabs/Widget/Admin.php:29
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116
+msgid "Channels"
+msgstr "Canales"
 
-#: ../../include/nav.php:101
+#: ../../include/nav.php:98
 msgid "Manage your channels"
 msgstr "Gestionar sus canales"
 
-#: ../../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 "Grupos de canales"
-
-#: ../../include/nav.php:104
-msgid "Manage your privacy groups"
-msgstr "Gestionar sus grupos de canales"
-
-#: ../../include/nav.php:106 ../../Zotlabs/Widget/Settings_menu.php:61
-#: ../../Zotlabs/Widget/Newmember.php:53
+#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:71
+#: ../../Zotlabs/Widget/Newmember.php:58
 #: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339
+#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../../include/nav.php:106
+#: ../../include/nav.php:101
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
-#: ../../include/nav.php:163 ../../boot.php:1715
+#: ../../include/nav.php:107 ../../include/nav.php:137
+#: ../../include/nav.php:158 ../../boot.php:1751
 msgid "Logout"
 msgstr "Finalizar sesión"
 
-#: ../../include/nav.php:112 ../../include/nav.php:142
+#: ../../include/nav.php:107 ../../include/nav.php:137
 msgid "End this session"
 msgstr "Finalizar esta sesión"
 
-#: ../../include/nav.php:115
+#: ../../include/nav.php:110
 msgid "Your profile page"
 msgstr "Su página del perfil"
 
-#: ../../include/nav.php:118 ../../include/channel.php:1563
-#: ../../Zotlabs/Module/Profiles.php:832
+#: ../../include/nav.php:113 ../../include/channel.php:1530
+#: ../../Zotlabs/Module/Profiles.php:852
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
-#: ../../include/nav.php:118
+#: ../../include/nav.php:113
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:120 ../../Zotlabs/Widget/Newmember.php:35
+#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:40
 msgid "Edit your profile"
 msgstr "Editar su perfil"
 
-#: ../../include/nav.php:127 ../../include/nav.php:131
-#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1716
+#: ../../include/nav.php:122 ../../include/nav.php:126
+#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1752
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: ../../include/nav.php:127 ../../include/nav.php:131
+#: ../../include/nav.php:122 ../../include/nav.php:126
 msgid "Sign in"
 msgstr "Acceder"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:156
 msgid "Take me home"
 msgstr "Volver a la página principal"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:158
 msgid "Log me out of this site"
 msgstr "Salir de este sitio"
 
-#: ../../include/nav.php:168 ../../Zotlabs/Module/Register.php:566
-#: ../../boot.php:1696
+#: ../../include/nav.php:163 ../../Zotlabs/Module/Register.php:542
+#: ../../boot.php:1729
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../../include/nav.php:168
+#: ../../include/nav.php:163
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#: ../../include/nav.php:180
+#: ../../include/nav.php:176
 msgid "Help and documentation"
 msgstr "Ayuda y documentación"
 
-#: ../../include/nav.php:194
+#: ../../include/nav.php:190
 msgid "Search site @name, !forum, #tag, ?docs, content"
 msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido"
 
-#: ../../include/nav.php:200 ../../Zotlabs/Widget/Admin.php:55
+#: ../../include/nav.php:196 ../../Zotlabs/Widget/Admin.php:60
 msgid "Admin"
 msgstr "Administrador"
 
-#: ../../include/nav.php:200
+#: ../../include/nav.php:196
 msgid "Site Setup and Configuration"
 msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182
+#: ../../include/nav.php:319 ../../Zotlabs/Widget/Messages.php:36
+#: ../../Zotlabs/Widget/Notifications.php:172
 #: ../../Zotlabs/Module/New_channel.php:157
 #: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Defperms.php:254
 msgid "Loading"
 msgstr "Cargando"
 
-#: ../../include/nav.php:330
-msgid "@name, !forum, #tag, ?doc, content"
-msgstr "@nombre, !foro, #tag, ?docs, contenido"
+#: ../../include/nav.php:324
+msgid "@name, #tag, ?doc, content"
+msgstr "@nombre, #etiqueta, ?ayuda, contenido"
 
-#: ../../include/nav.php:331
+#: ../../include/nav.php:325
 msgid "Please wait..."
 msgstr "Espere por favor…"
 
-#: ../../include/nav.php:337
-msgid "Add Apps"
-msgstr "Añadir aplicaciones"
+#: ../../include/nav.php:331 ../../Zotlabs/Lib/Apps.php:327
+msgid "Apps"
+msgstr "Aplicaciones (apps)"
+
+#: ../../include/nav.php:332
+msgid "Channel Apps"
+msgstr "Apps del canal "
 
-#: ../../include/nav.php:338
-msgid "Arrange Apps"
-msgstr "Organizar aplicaciones"
+#: ../../include/nav.php:333
+msgid "System Apps"
+msgstr "Apps del sistema "
 
-#: ../../include/nav.php:339
-msgid "Toggle System Apps"
-msgstr "Alternar aplicaciones de sistema"
+#: ../../include/nav.php:334
+msgid "Pinned Apps"
+msgstr "Apps ancladas "
 
-#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/nav.php:335
+msgid "Featured Apps"
+msgstr "Apps destacadas "
+
+#: ../../include/nav.php:424 ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../Zotlabs/Lib/Apps.php:347
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../include/nav.php:424
+#: ../../include/nav.php:427
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83
+#: ../../include/nav.php:437 ../../Zotlabs/Module/Help.php:83
 msgid "About"
 msgstr "Mi perfil"
 
-#: ../../include/nav.php:437
+#: ../../include/nav.php:440
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:351
+#: ../../include/nav.php:455 ../../Zotlabs/Widget/Notifications.php:107
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:344
+#: ../../Zotlabs/Storage/Browser.php:351
 msgid "Files"
 msgstr "Ficheros"
 
-#: ../../include/nav.php:455
+#: ../../include/nav.php:458
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/nav.php:477 ../../include/nav.php:480
-#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:330
+#: ../../include/nav.php:480 ../../include/nav.php:483
+#: ../../Zotlabs/Widget/Chatroom_list.php:22 ../../Zotlabs/Lib/Apps.php:334
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
-#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:329
+#: ../../include/nav.php:493 ../../Zotlabs/Module/Bookmarks.php:90
+#: ../../Zotlabs/Lib/Apps.php:333
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../../include/nav.php:493
+#: ../../include/nav.php:496
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207
-#: ../../Zotlabs/Lib/Apps.php:326
+#: ../../include/nav.php:504 ../../Zotlabs/Module/Cards.php:205
+#: ../../Zotlabs/Lib/Apps.php:330
 msgid "Cards"
 msgstr "Fichas"
 
-#: ../../include/nav.php:504
+#: ../../include/nav.php:507
 msgid "View Cards"
 msgstr "Ver las fichas"
 
-#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:225
-#: ../../Zotlabs/Lib/Apps.php:325
+#: ../../include/nav.php:515 ../../Zotlabs/Module/Articles.php:223
+#: ../../Zotlabs/Lib/Apps.php:329
 msgid "Articles"
 msgstr "Artículos"
 
-#: ../../include/nav.php:515
+#: ../../include/nav.php:518
 msgid "View Articles"
 msgstr "Ver los artículos"
 
-#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:252
-#: ../../Zotlabs/Lib/Apps.php:341
+#: ../../include/nav.php:527 ../../Zotlabs/Module/Webpages.php:249
+#: ../../Zotlabs/Lib/Apps.php:345
 msgid "Webpages"
 msgstr "Páginas web"
 
-#: ../../include/nav.php:527
+#: ../../include/nav.php:530
 msgid "View Webpages"
 msgstr "Ver páginas web"
 
-#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../Zotlabs/Module/Wiki.php:205
+#: ../../include/nav.php:539 ../../Zotlabs/Widget/Wiki_list.php:20
+#: ../../Zotlabs/Module/Wiki.php:203
 msgid "Wikis"
 msgstr "Wikis"
 
-#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:342
+#: ../../include/nav.php:542 ../../Zotlabs/Lib/Apps.php:346
 msgid "Wiki"
 msgstr "Wiki"
 
@@ -5768,16 +5463,16 @@ msgstr "Finalizó la sesión de la delegación."
 msgid "Logged out."
 msgstr "Desconectado/a."
 
-#: ../../include/auth.php:294
+#: ../../include/auth.php:297
 msgid "Email validation is incomplete. Please check your email."
 msgstr "La validación del correo electrónico está incompleta. Por favor, compruebe su correo electrónico."
 
-#: ../../include/auth.php:310
+#: ../../include/auth.php:313
 msgid "Failed authentication"
 msgstr "Autenticación fallida."
 
-#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51
-#: ../../Zotlabs/Module/Profiles.php:738
+#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:56
+#: ../../Zotlabs/Module/Profiles.php:753
 msgid "Miscellaneous"
 msgstr "Varios"
 
@@ -5793,7 +5488,7 @@ msgstr "Edad:"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
-#: ../../include/datetime.php:238 ../../boot.php:2730
+#: ../../include/datetime.php:238 ../../boot.php:2768
 msgid "never"
 msgstr "nunca"
 
@@ -5874,6 +5569,17 @@ msgstr "¡EVENTO NO VÁLIDO RECHAZADO!"
 msgid "Summary: "
 msgstr "Resumen: "
 
+#: ../../include/cdav.php:158 ../../include/cdav.php:159
+#: ../../include/cdav.php:167 ../../include/conversation.php:1238
+#: ../../Zotlabs/Widget/Album.php:90 ../../Zotlabs/Widget/Pinned.php:271
+#: ../../Zotlabs/Widget/Portfolio.php:99
+#: ../../Zotlabs/Module/Embedphotos.php:177
+#: ../../Zotlabs/Module/Photos.php:799 ../../Zotlabs/Module/Photos.php:1259
+#: ../../Zotlabs/Lib/Activity.php:1691 ../../Zotlabs/Lib/Apps.php:1146
+#: ../../Zotlabs/Lib/Apps.php:1230
+msgid "Unknown"
+msgstr "Desconocido"
+
 #: ../../include/cdav.php:159
 msgid "Date: "
 msgstr "Fecha: "
@@ -5890,44 +5596,7 @@ msgstr "¡TARJETA NO VÁLIDA RECHAZADA!"
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../../include/follow.php:39 ../../Zotlabs/Lib/Connect.php:46
-#: ../../Zotlabs/Lib/Connect.php:143
-msgid "Channel is blocked on this site."
-msgstr "El canal está bloqueado en este sitio."
-
-#: ../../include/follow.php:44 ../../Zotlabs/Lib/Connect.php:51
-msgid "Channel location missing."
-msgstr "Falta la dirección del canal."
-
-#: ../../include/follow.php:86
-msgid "Response from remote channel was incomplete."
-msgstr "Respuesta incompleta del canal."
-
-#: ../../include/follow.php:98
-msgid "Premium channel - please visit:"
-msgstr "Canal Premium - por favor visite:"
-
-#: ../../include/follow.php:112
-msgid "Channel was deleted and no longer exists."
-msgstr "El canal ha sido eliminado y ya no existe."
-
-#: ../../include/follow.php:168 ../../Zotlabs/Lib/Connect.php:103
-msgid "Remote channel or protocol unavailable."
-msgstr "Canal remoto o protocolo no disponible."
-
-#: ../../include/follow.php:192 ../../Zotlabs/Lib/Connect.php:137
-msgid "Channel discovery failed."
-msgstr "El intento de acceder al canal ha fallado."
-
-#: ../../include/follow.php:204 ../../Zotlabs/Lib/Connect.php:155
-msgid "Protocol disabled."
-msgstr "Protocolo deshabilitado."
-
-#: ../../include/follow.php:215 ../../Zotlabs/Lib/Connect.php:167
-msgid "Cannot connect to yourself."
-msgstr "No puede conectarse consigo mismo."
-
-#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:178
+#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:184
 msgid "channel"
 msgstr "el canal"
 
@@ -5957,631 +5626,633 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:502
+#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:538
 msgid "This is an unsaved preview"
 msgstr "Esta es una previsualización sin guardar"
 
-#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1113
+#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1119
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1113
+#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1119
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:77
-#: ../../Zotlabs/Module/Photos.php:1114
+#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:80
+#: ../../Zotlabs/Module/Photos.php:1120
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:78
-#: ../../Zotlabs/Module/Photos.php:1114
+#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:81
+#: ../../Zotlabs/Module/Photos.php:1120
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:79
-#: ../../Zotlabs/Module/Photos.php:1114
+#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:82
+#: ../../Zotlabs/Module/Photos.php:1120
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:66
-#: ../../Zotlabs/Module/Photos.php:1115
+#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:69
+#: ../../Zotlabs/Module/Photos.php:1121
 msgctxt "title"
 msgid "Attending"
 msgstr "Participaré"
 
-#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:67
-#: ../../Zotlabs/Module/Photos.php:1115
+#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:70
+#: ../../Zotlabs/Module/Photos.php:1121
 msgctxt "title"
 msgid "Not attending"
 msgstr "No participaré"
 
-#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:68
-#: ../../Zotlabs/Module/Photos.php:1115
+#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:71
+#: ../../Zotlabs/Module/Photos.php:1121
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
 
-#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:181
+#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:210
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../../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
+#: ../../include/conversation.php:730 ../../include/conversation.php:790
+#: ../../Zotlabs/Module/Tokens.php:295
+#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Group.php:251 ../../Zotlabs/Module/Card_edit.php:130
+#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1389
+#: ../../Zotlabs/Module/Webpages.php:254
 #: ../../Zotlabs/Module/Admin/Accounts.php:320
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Admin/Profs.php:176
+#: ../../Zotlabs/Module/Permcats.php:261
+#: ../../Zotlabs/Module/Contactedit.php:667
 #: ../../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
+#: ../../Zotlabs/Module/Photos.php:1185 ../../Zotlabs/Module/Oauth2.php:193
+#: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Module/Connedit.php:540
+#: ../../Zotlabs/Module/Connedit.php:749 ../../Zotlabs/Lib/Apps.php:596
+#: ../../Zotlabs/Lib/ThreadItem.php:200 ../../Zotlabs/Storage/Browser.php:384
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../../include/conversation.php:734 ../../Zotlabs/Lib/ThreadItem.php:274
+#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:303
 msgid "Toggle Star Status"
 msgstr "Activar o desactivar el estado de entrada preferida"
 
-#: ../../include/conversation.php:739 ../../Zotlabs/Lib/ThreadItem.php:103
+#: ../../include/conversation.php:742
 msgid "Private Message"
 msgstr "Mensaje Privado"
 
-#: ../../include/conversation.php:748 ../../Zotlabs/Widget/Pinned.php:88
-#: ../../Zotlabs/Lib/ThreadItem.php:285
+#: ../../include/conversation.php:751 ../../Zotlabs/Widget/Pinned.php:91
+#: ../../Zotlabs/Lib/ThreadItem.php:314
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: ../../include/conversation.php:749 ../../Zotlabs/Widget/Pinned.php:89
-#: ../../Zotlabs/Lib/ThreadItem.php:286
+#: ../../include/conversation.php:752 ../../Zotlabs/Widget/Pinned.php:92
+#: ../../Zotlabs/Lib/ThreadItem.php:315
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
-#: ../../include/conversation.php:776
+#: ../../include/conversation.php:789
 #: ../../Zotlabs/Module/Admin/Accounts.php:318
-#: ../../Zotlabs/Module/Connections.php:343
+#: ../../Zotlabs/Module/Connections.php:349
+#: ../../Zotlabs/Module/Connections.php:400
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../../include/conversation.php:781
+#: ../../include/conversation.php:795
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Ver el perfil @ %s de %s"
 
-#: ../../include/conversation.php:802
+#: ../../include/conversation.php:816
 msgid "Categories:"
 msgstr "Temas:"
 
-#: ../../include/conversation.php:803
+#: ../../include/conversation.php:817
 msgid "Filed under:"
 msgstr "Archivado bajo:"
 
-#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:132
-#: ../../Zotlabs/Lib/ThreadItem.php:430
+#: ../../include/conversation.php:823 ../../Zotlabs/Widget/Pinned.php:135
+#: ../../Zotlabs/Lib/ThreadItem.php:466
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: ../../include/conversation.php:812 ../../Zotlabs/Widget/Pinned.php:135
-#: ../../Zotlabs/Lib/ThreadItem.php:433
+#: ../../include/conversation.php:826 ../../Zotlabs/Widget/Pinned.php:138
+#: ../../Zotlabs/Lib/ThreadItem.php:469
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: ../../include/conversation.php:813 ../../Zotlabs/Widget/Pinned.php:136
-#: ../../Zotlabs/Lib/ThreadItem.php:434
+#: ../../include/conversation.php:827 ../../Zotlabs/Widget/Pinned.php:139
+#: ../../Zotlabs/Lib/ThreadItem.php:470
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
 
-#: ../../include/conversation.php:828
+#: ../../include/conversation.php:842
 msgid "View in context"
 msgstr "Mostrar en su contexto"
 
-#: ../../include/conversation.php:830 ../../Zotlabs/Module/Photos.php:1079
-#: ../../Zotlabs/Lib/ThreadItem.php:503
+#: ../../include/conversation.php:844 ../../Zotlabs/Module/Photos.php:1085
+#: ../../Zotlabs/Lib/ThreadItem.php:539
 msgid "Please wait"
 msgstr "Espere por favor"
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:945
 msgid "remove"
 msgstr "eliminar"
 
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:949
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../../include/conversation.php:935 ../../Zotlabs/Lib/ThreadItem.php:302
-msgid "Conversation Tools"
-msgstr "Herramientas de conversación"
+#: ../../include/conversation.php:950 ../../Zotlabs/Lib/ThreadItem.php:331
+msgid "Conversation Features"
+msgstr "Funciones de conversación "
 
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:951
 msgid "Delete Selected Items"
 msgstr "Eliminar elementos seleccionados"
 
-#: ../../include/conversation.php:980
+#: ../../include/conversation.php:995
 msgid "View Source"
 msgstr "Ver el código fuente de la entrada"
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1005
 msgid "Follow Thread"
 msgstr "Seguir este hilo"
 
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1014
 msgid "Unfollow Thread"
 msgstr "Dejar de seguir este hilo"
 
-#: ../../include/conversation.php:1093 ../../Zotlabs/Module/Connedit.php:622
+#: ../../include/conversation.php:1105 ../../Zotlabs/Module/Connedit.php:501
 msgid "Recent Activity"
 msgstr "Actividad reciente"
 
-#: ../../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
+#: ../../include/conversation.php:1117 ../../include/connections.php:112
+#: ../../include/channel.php:1610 ../../Zotlabs/Widget/Suggestions.php:51
+#: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Directory.php:369
+#: ../../Zotlabs/Module/Connections.php:356
+#: ../../Zotlabs/Module/Suggest.php:69
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1129
 msgid "Edit Connection"
 msgstr "Editar conexión"
 
-#: ../../include/conversation.php:1123
+#: ../../include/conversation.php:1141
 #: ../../Zotlabs/Module/Admin/Accounts.php:347
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../include/conversation.php:1133 ../../Zotlabs/Module/Pubsites.php:36
-#: ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:1153 ../../Zotlabs/Module/Pubsites.php:35
 msgid "Ratings"
 msgstr "Valoraciones"
 
-#: ../../include/conversation.php:1143 ../../Zotlabs/Module/Poke.php:199
-#: ../../Zotlabs/Lib/Apps.php:351
+#: ../../include/conversation.php:1165 ../../Zotlabs/Module/Poke.php:197
+#: ../../Zotlabs/Lib/Apps.php:355
 msgid "Poke"
 msgstr "Toques y otras cosas"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1289
 #, php-format
 msgid "%s likes this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1289
 #, php-format
 msgid "%s doesn't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1269
+#: ../../include/conversation.php:1293
 #, 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] "a <span %1$s>%2$d personas</span> le gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> les gusta esto."
 
-#: ../../include/conversation.php:1271
+#: ../../include/conversation.php:1295
 #, 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] "a <span %1$s>%2$d personas</span> no les gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> no les gusta esto."
 
-#: ../../include/conversation.php:1277
+#: ../../include/conversation.php:1301
 msgid "and"
 msgstr "y"
 
-#: ../../include/conversation.php:1280
+#: ../../include/conversation.php:1304
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", y %d persona más"
 msgstr[1] ", y %d personas más"
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1305
 #, php-format
 msgid "%s like this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1281
+#: ../../include/conversation.php:1305
 #, php-format
 msgid "%s don't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1489
 msgid "Toggle poll"
 msgstr "Activar o desactivar encuestas"
 
-#: ../../include/conversation.php:1465
+#: ../../include/conversation.php:1490
 msgid "Option"
 msgstr "Opción"
 
-#: ../../include/conversation.php:1466
+#: ../../include/conversation.php:1491
 msgid "Add option"
 msgstr "Añadir una opción"
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1492
 msgid "Minutes"
 msgstr "Minutos "
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1492
 msgid "Hours"
 msgstr "Horas "
 
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1492
 msgid "Days"
 msgstr "Días "
 
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1493
 msgid "Allow multiple answers"
 msgstr "Permitir respuestas múltiples"
 
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1503
 msgid "Summary (optional)"
 msgstr "Sumario (opcional)"
 
-#: ../../include/conversation.php:1752 ../../include/taxonomy.php:670
-#: ../../include/channel.php:1806 ../../Zotlabs/Module/Photos.php:1136
-#: ../../Zotlabs/Lib/ThreadItem.php:243
+#: ../../include/conversation.php:1775 ../../include/taxonomy.php:670
+#: ../../include/channel.php:1774 ../../Zotlabs/Module/Photos.php:1142
+#: ../../Zotlabs/Lib/ThreadItem.php:272
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../include/conversation.php:1755 ../../Zotlabs/Module/Photos.php:1141
-#: ../../Zotlabs/Lib/ThreadItem.php:248
+#: ../../include/conversation.php:1778 ../../Zotlabs/Module/Photos.php:1147
+#: ../../Zotlabs/Lib/ThreadItem.php:277
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "No me gusta"
 msgstr[1] "No me gusta"
 
-#: ../../include/conversation.php:1758
+#: ../../include/conversation.php:1781
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participaré"
 msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1761
+#: ../../include/conversation.php:1784
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No participaré"
 msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1764
+#: ../../include/conversation.php:1787
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1767
+#: ../../include/conversation.php:1790
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "De acuerdo"
 msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1770
+#: ../../include/conversation.php:1793
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "En desacuerdo"
 msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1773
+#: ../../include/conversation.php:1796
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "se abstiene"
 msgstr[1] "Se abstienen"
 
-#: ../../include/selectors.php:18
-msgid "Profile to assign new connections"
-msgstr "Perfil para asignar a las nuevas conexiones"
+#: ../../include/selectors.php:17
+msgid "Select a profile to assign to this contact"
+msgstr "Seleccione un perfil para asignar a este contacto"
 
-#: ../../include/selectors.php:41
+#: ../../include/selectors.php:45
 msgid "Frequently"
 msgstr "Frecuentemente"
 
-#: ../../include/selectors.php:42
+#: ../../include/selectors.php:46
 msgid "Hourly"
 msgstr "Cada hora"
 
-#: ../../include/selectors.php:43
+#: ../../include/selectors.php:47
 msgid "Twice daily"
 msgstr "Dos veces al día"
 
-#: ../../include/selectors.php:44
+#: ../../include/selectors.php:48
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../../include/selectors.php:45
+#: ../../include/selectors.php:49
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: ../../include/selectors.php:46
+#: ../../include/selectors.php:50
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Currently Male"
 msgstr "Actualmente hombre"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Currently Female"
 msgstr "Actualmente mujer"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Mostly Male"
 msgstr "Generalmente hombre"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Mostly Female"
 msgstr "Generalmente mujer"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Transgender"
 msgstr "Transgénero"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Intersex"
 msgstr "Intersexual"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Transsexual"
 msgstr "Transexual"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Hermaphrodite"
 msgstr "Hermafrodita"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1751
+#: ../../include/selectors.php:64 ../../include/channel.php:1719
 msgid "Neuter"
 msgstr "Neutral"
 
-#: ../../include/selectors.php:60 ../../include/channel.php:1753
+#: ../../include/selectors.php:64 ../../include/channel.php:1721
 msgid "Non-specific"
 msgstr "No especificado"
 
-#: ../../include/selectors.php:60
+#: ../../include/selectors.php:64
 msgid "Undecided"
 msgstr "Indeciso/a"
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
+#: ../../include/selectors.php:100 ../../include/selectors.php:119
 msgid "Males"
 msgstr "Hombres"
 
-#: ../../include/selectors.php:96 ../../include/selectors.php:115
+#: ../../include/selectors.php:100 ../../include/selectors.php:119
 msgid "Females"
 msgstr "Mujeres"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Gay"
 msgstr "Homosexual"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Lesbian"
 msgstr "Lesbiana"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "No Preference"
 msgstr "Sin preferencias"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Bisexual"
 msgstr "Bisexual"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Autosexual"
 msgstr "Autosexual"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Abstinent"
 msgstr "Casto/a"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Virgin"
 msgstr "Virgen"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Deviant"
 msgstr "Fuera de lo común"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Fetish"
 msgstr "Fetichista"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Oodles"
 msgstr "Orgías"
 
-#: ../../include/selectors.php:96
+#: ../../include/selectors.php:100
 msgid "Nonsexual"
 msgstr "Asexual"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Single"
 msgstr "Soltero/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Lonely"
 msgstr "Solo/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Available"
 msgstr "Disponible"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Has crush"
 msgstr "Enamorado/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Infatuated"
 msgstr "Apasionado/a"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Dating"
 msgstr "Saliendo con alguien"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Unfaithful"
 msgstr "Infiel"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Sex Addict"
 msgstr "Con adicción al sexo"
 
-#: ../../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
+#: ../../include/selectors.php:138 ../../include/channel.php:456
+#: ../../include/channel.php:459 ../../Zotlabs/Widget/Affinity.php:38
+#: ../../Zotlabs/Module/Contactedit.php:297
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Friends/Benefits"
 msgstr "Amigos con algo extra"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Casual"
 msgstr "Casual"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Engaged"
 msgstr "Prometido/a"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Married"
 msgstr "Casado/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Imaginarily married"
 msgstr "Casado/a en sueños"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Partners"
 msgstr "Pareja"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Cohabiting"
 msgstr "Cohabitando"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Common law"
 msgstr "Matrimonio tradicional"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Happy"
 msgstr "Felíz"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Not looking"
 msgstr "No estoy buscando"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Swinger"
 msgstr "Libertino"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Betrayed"
 msgstr "Engañado/a"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Separated"
 msgstr "Separado/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Unstable"
 msgstr "Inestable"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Divorced"
 msgstr "Divorciado/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Imaginarily divorced"
 msgstr "Divorciado/a en sueños"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "Widowed"
 msgstr "Viudo/a"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Uncertain"
 msgstr "Indeterminado"
 
-#: ../../include/selectors.php:134 ../../include/selectors.php:151
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
 msgid "It's complicated"
 msgstr "Es complicado"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Don't care"
 msgstr "No me importa"
 
-#: ../../include/selectors.php:134
+#: ../../include/selectors.php:138
 msgid "Ask me"
 msgstr "Pregúnteme"
 
-#: ../../include/connections.php:134
+#: ../../include/connections.php:136
 msgid "New window"
 msgstr "Nueva ventana"
 
-#: ../../include/connections.php:135
+#: ../../include/connections.php:137
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte"
 
-#: ../../include/group.php:23 ../../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 "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos que ya existen  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."
 
-#: ../../include/group.php:271 ../../Zotlabs/Lib/Group.php:270
+#: ../../include/group.php:271
 msgid "Add new connections to this privacy group"
 msgstr "Añadir conexiones nuevas a este grupo de canales"
 
-#: ../../include/group.php:305 ../../Zotlabs/Lib/AccessList.php:311
-#: ../../Zotlabs/Lib/Group.php:302
+#: ../../include/group.php:305
 msgid "edit"
 msgstr "editar"
 
-#: ../../include/group.php:328 ../../Zotlabs/Lib/Group.php:325
+#: ../../include/group.php:327 ../../include/acl_selectors.php:87
+#: ../../Zotlabs/Widget/Activity_filter.php:95
+#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:368
+msgid "Privacy Groups"
+msgstr "Grupos de canales"
+
+#: ../../include/group.php:328
 msgid "Edit group"
 msgstr "Editar grupo"
 
-#: ../../include/group.php:329 ../../Zotlabs/Lib/Group.php:326
-msgid "Add privacy group"
-msgstr "Añadir un grupo de canales"
+#: ../../include/group.php:329
+msgid "Manage privacy groups"
+msgstr "Gestionar grupos de privacidad"
 
-#: ../../include/group.php:330 ../../Zotlabs/Lib/Group.php:327
+#: ../../include/group.php:330
 msgid "Channels not in any privacy group"
 msgstr "Sin canales en ningún grupo"
 
-#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84
-#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329
+#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:90
 msgid "add"
 msgstr "añadir"
 
@@ -6590,7 +6261,7 @@ msgid "Trending"
 msgstr "Etiquetas populares"
 
 #: ../../include/taxonomy.php:323 ../../include/taxonomy.php:460
-#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:22
+#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:27
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -6614,7 +6285,7 @@ msgstr "quiero"
 msgid "wants"
 msgstr "quiere"
 
-#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:318
+#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:347
 msgid "like"
 msgstr "me gusta"
 
@@ -6622,7 +6293,7 @@ msgstr "me gusta"
 msgid "likes"
 msgstr "gusta de"
 
-#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:319
+#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:348
 msgid "dislike"
 msgstr "no me gusta"
 
@@ -6630,104 +6301,109 @@ msgstr "no me gusta"
 msgid "dislikes"
 msgstr "no gusta de"
 
-#: ../../include/items.php:1037 ../../include/items.php:1097
+#: ../../include/items.php:980 ../../include/items.php:1040
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1301
+#: ../../include/items.php:1229
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1303
+#: ../../include/items.php:1231
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1305
+#: ../../include/items.php:1233
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1307
+#: ../../include/items.php:1235
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que esté autenticado."
 
-#: ../../include/items.php:1309
+#: ../../include/items.php:1237
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1311
+#: ../../include/items.php:1239
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1313
+#: ../../include/items.php:1241
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1315
+#: ../../include/items.php:1243
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4584 ../../Zotlabs/Module/Group.php:62
-#: ../../Zotlabs/Module/Group.php:214
+#: ../../include/items.php:3305 ../../Zotlabs/Module/Share.php:104
+#, php-format
+msgid "&#x1f501; Repeated %1$s's %2$s"
+msgstr "&#x1f501; Repetidos %2$sde %1$s"
+
+#: ../../include/items.php:4397 ../../Zotlabs/Module/Group.php:62
+#: ../../Zotlabs/Module/Group.php:206
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
-#: ../../include/items.php:4600
+#: ../../include/items.php:4413
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:4607
+#: ../../include/items.php:4420
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:4617 ../../Zotlabs/Module/Connedit.php:860
+#: ../../include/items.php:4430
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4619
+#: ../../include/items.php:4432
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:4965 ../../Zotlabs/Module/Cover_photo.php:297
+#: ../../include/items.php:4778 ../../Zotlabs/Module/Cover_photo.php:297
 msgid "female"
 msgstr "mujer"
 
-#: ../../include/items.php:4966 ../../Zotlabs/Module/Cover_photo.php:298
+#: ../../include/items.php:4779 ../../Zotlabs/Module/Cover_photo.php:298
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:4967 ../../Zotlabs/Module/Cover_photo.php:299
+#: ../../include/items.php:4780 ../../Zotlabs/Module/Cover_photo.php:299
 msgid "male"
 msgstr "hombre"
 
-#: ../../include/items.php:4968 ../../Zotlabs/Module/Cover_photo.php:300
+#: ../../include/items.php:4781 ../../Zotlabs/Module/Cover_photo.php:300
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:4970 ../../Zotlabs/Module/Cover_photo.php:302
+#: ../../include/items.php:4783 ../../Zotlabs/Module/Cover_photo.php:302
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:4972
+#: ../../include/items.php:4785
 msgid "profile photo"
 msgstr "foto del perfil"
 
-#: ../../include/items.php:5164
+#: ../../include/items.php:4978
 #, php-format
 msgid "[Edited %s]"
 msgstr "[se ha editado %s]"
 
-#: ../../include/items.php:5164
+#: ../../include/items.php:4978
 msgctxt "edit_activity"
 msgid "Post"
 msgstr "Publicar"
 
-#: ../../include/items.php:5164
+#: ../../include/items.php:4978
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr "Comentar"
@@ -6736,95 +6412,101 @@ msgstr "Comentar"
 msgid "The provided email address is not valid"
 msgstr "La dirección de correo electrónico proporcionada no es válida"
 
-#: ../../include/account.php:40
+#: ../../include/account.php:41
 msgid "The provided email domain is not among those allowed on this site"
 msgstr "El dominio de correo electrónico proporcionado no está entre los permitidos en este sitio"
 
-#: ../../include/account.php:51
+#: ../../include/account.php:48
 msgid "The provided email address is already registered at this site"
 msgstr "La dirección de correo electrónico proporcionada ya está registrada en este sitio"
 
-#: ../../include/account.php:88
+#: ../../include/account.php:55
+msgid ""
+"There is a pending registration for this address - click \"Register\" to "
+"continue verification"
+msgstr "Hay un registro pendiente para esta dirección - haga clic en \"Registro\" para continuar la verificación"
+
+#: ../../include/account.php:94
 msgid "An invitation is required."
 msgstr "Es obligatorio que le inviten."
 
-#: ../../include/account.php:97
+#: ../../include/account.php:103
 msgid "Invitation could not be verified."
 msgstr "No se ha podido verificar su invitación."
 
-#: ../../include/account.php:185
+#: ../../include/account.php:191
 msgid "Please enter the required information."
 msgstr "Por favor introduzca la información requerida."
 
-#: ../../include/account.php:252 ../../include/account.php:360
+#: ../../include/account.php:258 ../../include/account.php:366
 msgid "Failed to store account information."
 msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/account.php:429 ../../include/account.php:497
-#: ../../Zotlabs/Module/Register.php:352
+#: ../../include/account.php:435 ../../include/account.php:503
+#: ../../Zotlabs/Module/Register.php:328
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Confirmación de registro para %s"
 
-#: ../../include/account.php:572
+#: ../../include/account.php:578
 #, php-format
 msgid "Registration request at %s"
 msgstr "Solicitud de registro en %s"
 
-#: ../../include/account.php:594
+#: ../../include/account.php:600
 msgid "your registration password"
 msgstr "su contraseña de registro"
 
-#: ../../include/account.php:600 ../../include/account.php:689
+#: ../../include/account.php:606 ../../include/account.php:695
 #, php-format
 msgid "Registration details for %s"
 msgstr "Detalles del registro de %s"
 
-#: ../../include/account.php:700
+#: ../../include/account.php:706
 msgid "Account approved."
 msgstr "Cuenta aprobada."
 
-#: ../../include/account.php:756
+#: ../../include/account.php:762
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registro revocado para %s"
 
-#: ../../include/account.php:763
+#: ../../include/account.php:769
 #, php-format
 msgid "Could not revoke registration for %s"
 msgstr "No se ha podido revocar el registro de %s"
 
-#: ../../include/account.php:1179 ../../include/account.php:1181
+#: ../../include/account.php:1185 ../../include/account.php:1187
 msgid "Click here to upgrade."
 msgstr "Pulse aquí para actualizar"
 
-#: ../../include/account.php:1187
+#: ../../include/account.php:1193
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
 
-#: ../../include/account.php:1192
+#: ../../include/account.php:1198
 msgid "This action is not available under your subscription plan."
 msgstr "Esta acción no está disponible en su plan de suscripción."
 
-#: ../../include/account.php:1252
+#: ../../include/account.php:1258
 msgid "open"
 msgstr "abierto"
 
-#: ../../include/account.php:1252
+#: ../../include/account.php:1258
 msgid "closed"
 msgstr "cerrado"
 
-#: ../../include/account.php:1259
+#: ../../include/account.php:1265
 msgid "Registration is currently"
 msgstr "El registro está actualmente "
 
-#: ../../include/account.php:1268
+#: ../../include/account.php:1274
 msgid "please come back"
 msgstr "por favor, vuelva"
 
-#: ../../include/photo/photo_driver.php:435
-#: ../../Zotlabs/Module/Profile_photo.php:147
-#: ../../Zotlabs/Module/Profile_photo.php:284
+#: ../../include/photo/photo_driver.php:434
+#: ../../Zotlabs/Module/Profile_photo.php:167
+#: ../../Zotlabs/Module/Profile_photo.php:337
 msgid "Profile Photos"
 msgstr "Fotos del perfil"
 
@@ -6849,53 +6531,53 @@ msgstr "No se puede localizar el fichero que va a ser sustituido."
 msgid "Cannot locate file to revise/update"
 msgstr "No se puede localizar el fichero para revisar/actualizar"
 
-#: ../../include/attach.php:795
+#: ../../include/attach.php:800
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "El fichero supera el limite de tamaño de %d"
 
-#: ../../include/attach.php:816
+#: ../../include/attach.php:821
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
 
-#: ../../include/attach.php:1004
+#: ../../include/attach.php:1009
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
 
-#: ../../include/attach.php:1033
+#: ../../include/attach.php:1038
 msgid "Stored file could not be verified. Upload failed."
 msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
 
-#: ../../include/attach.php:1105 ../../include/attach.php:1121
+#: ../../include/attach.php:1110 ../../include/attach.php:1126
 msgid "Path not available."
 msgstr "Ruta no disponible."
 
-#: ../../include/attach.php:1169 ../../include/attach.php:1332
+#: ../../include/attach.php:1174 ../../include/attach.php:1337
 msgid "Empty pathname"
 msgstr "Ruta vacía"
 
-#: ../../include/attach.php:1195
+#: ../../include/attach.php:1200
 msgid "duplicate filename or path"
 msgstr "Nombre duplicado de ruta o fichero"
 
-#: ../../include/attach.php:1220
+#: ../../include/attach.php:1225
 msgid "Path not found."
 msgstr "Ruta no encontrada"
 
-#: ../../include/attach.php:1288
+#: ../../include/attach.php:1293
 msgid "mkdir failed."
 msgstr "mkdir ha fallado."
 
-#: ../../include/attach.php:1292
+#: ../../include/attach.php:1297
 msgid "database storage failed."
 msgstr "el almacenamiento en la base de datos ha fallado."
 
-#: ../../include/attach.php:1338
+#: ../../include/attach.php:1343
 msgid "Empty path"
 msgstr "Ruta vacía"
 
-#: ../../include/attach.php:2099
+#: ../../include/attach.php:2104
 #, php-format
 msgid "%s shared a %s with you"
 msgstr "%sha compartido un/una %scon usted"
@@ -6905,31 +6587,31 @@ msgstr "%sha compartido un/una %scon usted"
 msgid "%1$s's bookmarks"
 msgstr "Marcadores de %1$s"
 
-#: ../../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
+#: ../../include/menu.php:120 ../../include/channel.php:1530
+#: ../../include/channel.php:1534 ../../Zotlabs/Widget/Cdav.php:142
+#: ../../Zotlabs/Widget/Cdav.php:179 ../../Zotlabs/Module/Article_edit.php:97
+#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Card_edit.php:99
+#: ../../Zotlabs/Module/Oauth.php:171 ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Webpages.php:252
 #: ../../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
+#: ../../Zotlabs/Module/Connections.php:329
+#: ../../Zotlabs/Module/Connections.php:378
+#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176
+#: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268
+#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:381
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:595
+#: ../../Zotlabs/Lib/ThreadItem.php:178
 msgid "Edit"
 msgstr "Editar"
 
 #: ../../include/bbcode.php:233 ../../include/bbcode.php:928
-#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533
+#: ../../include/bbcode.php:1549 ../../include/bbcode.php:1557
 msgid "Image/photo"
 msgstr "Imagen/foto"
 
-#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550
+#: ../../include/bbcode.php:280 ../../include/bbcode.php:1574
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
@@ -6945,19 +6627,19 @@ msgid ""
 "to install it on this site."
 msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
 
-#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:43
+#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:47
 msgid "webpage"
 msgstr "página web"
 
-#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:53
+#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:57
 msgid "layout"
 msgstr "plantilla"
 
-#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:48
+#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:52
 msgid "block"
 msgstr "bloque"
 
-#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:60
+#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:64
 msgid "menu"
 msgstr "menú"
 
@@ -6969,7 +6651,7 @@ msgstr "ficha"
 msgid "article"
 msgstr "el artículo"
 
-#: ../../include/bbcode.php:559 ../../include/markdown.php:202
+#: ../../include/bbcode.php:559 ../../include/markdown.php:203
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr "%1$s escribió %2$s siguiente %3$s"
@@ -6978,7 +6660,7 @@ msgstr "%1$s escribió %2$s siguiente %3$s"
 msgid "Click to open/close"
 msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/bbcode.php:644 ../../include/markdown.php:255
+#: ../../include/bbcode.php:644 ../../include/markdown.php:256
 msgid "spoiler"
 msgstr "spoiler"
 
@@ -6990,242 +6672,242 @@ msgstr "Ver el artículo"
 msgid "View summary"
 msgstr "Ver sumario"
 
-#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1217
-#: ../../Zotlabs/Lib/NativeWikiPage.php:618
+#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1235
+#: ../../Zotlabs/Lib/NativeWikiPage.php:624
 msgid "Different viewers will see this text differently"
 msgstr "Visitantes diferentes verán este texto de forma distinta"
 
-#: ../../include/bbcode.php:1501
+#: ../../include/bbcode.php:1525
 msgid "$1 wrote:"
 msgstr "$1 escribió:"
 
-#: ../../include/channel.php:47
+#: ../../include/channel.php:48
 msgid "Unable to obtain identity information from database"
 msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
 
-#: ../../include/channel.php:80
+#: ../../include/channel.php:81
 msgid "Empty name"
 msgstr "Nombre vacío"
 
-#: ../../include/channel.php:83
+#: ../../include/channel.php:84
 msgid "Name too long"
 msgstr "Nombre demasiado largo"
 
-#: ../../include/channel.php:200
+#: ../../include/channel.php:201
 msgid "No account identifier"
 msgstr "Ningún identificador de la cuenta"
 
-#: ../../include/channel.php:212 ../../Zotlabs/Module/Register.php:95
+#: ../../include/channel.php:213 ../../Zotlabs/Module/Register.php:95
 msgid "Nickname is required."
 msgstr "Se requiere un sobrenombre (alias)."
 
-#: ../../include/channel.php:226 ../../include/channel.php:706
+#: ../../include/channel.php:227 ../../include/channel.php:659
 #: ../../Zotlabs/Module/Register.php:100
 #: ../../Zotlabs/Module/Changeaddr.php:46
 msgid "Reserved nickname. Please choose another."
 msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: ../../include/channel.php:231 ../../include/channel.php:711
+#: ../../include/channel.php:232 ../../include/channel.php:664
 #: ../../Zotlabs/Module/Register.php:105
 #: ../../Zotlabs/Module/Changeaddr.php:51
 msgid ""
 "Nickname has unsupported characters or is already being used on this site."
 msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."
 
-#: ../../include/channel.php:295
+#: ../../include/channel.php:292
 msgid "Unable to retrieve created identity"
 msgstr "No ha sido posible recuperar la identidad creada"
 
-#: ../../include/channel.php:442
+#: ../../include/channel.php:402
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/channel.php:639 ../../include/channel.php:728
+#: ../../include/channel.php:592 ../../include/channel.php:681
 msgid "Unable to retrieve modified identity"
 msgstr "No se puede recuperar la identidad modficada"
 
-#: ../../include/channel.php:1410
-msgid "Requested channel is not available."
-msgstr "El canal solicitado no está disponible."
+#: ../../include/channel.php:1373
+msgid "Requested channel is not available"
+msgstr "El canal solicitado no está disponible"
 
-#: ../../include/channel.php:1556 ../../Zotlabs/Module/Profiles.php:730
+#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:745
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../include/channel.php:1564
+#: ../../include/channel.php:1531
 msgid "Create New Profile"
 msgstr "Crear un nuevo perfil"
 
-#: ../../include/channel.php:1582 ../../Zotlabs/Module/Profiles.php:822
+#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:842
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
-#: ../../include/channel.php:1585
+#: ../../include/channel.php:1552
 msgid "Visible to everybody"
 msgstr "Visible para todos"
 
-#: ../../include/channel.php:1586 ../../Zotlabs/Module/Profiles.php:727
-#: ../../Zotlabs/Module/Profiles.php:826
+#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:846
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../include/channel.php:1662 ../../include/channel.php:1790
+#: ../../include/channel.php:1629 ../../include/channel.php:1758
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/channel.php:1663 ../../include/channel.php:1834
+#: ../../include/channel.php:1630 ../../include/channel.php:1802
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/channel.php:1664 ../../include/channel.php:1858
+#: ../../include/channel.php:1631 ../../include/channel.php:1826
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/channel.php:1665
+#: ../../include/channel.php:1632 ../../include/channel.php:1828
+#: ../../Zotlabs/Module/Directory.php:366
+msgid "Hometown:"
+msgstr "Lugar de nacimiento:"
+
+#: ../../include/channel.php:1633
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/channel.php:1718
+#: ../../include/channel.php:1686
 msgid "Change your profile photo"
 msgstr "Cambiar su foto del perfil"
 
-#: ../../include/channel.php:1749
+#: ../../include/channel.php:1717
 msgid "Trans"
 msgstr "Trans"
 
-#: ../../include/channel.php:1788
-#: ../../Zotlabs/Module/Settings/Channel.php:501
+#: ../../include/channel.php:1756
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../include/channel.php:1795
+#: ../../include/channel.php:1763
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/channel.php:1819
+#: ../../include/channel.php:1787
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/channel.php:1820
+#: ../../include/channel.php:1788
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/channel.php:1827
+#: ../../include/channel.php:1795
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/channel.php:1831 ../../Zotlabs/Module/Directory.php:349
+#: ../../include/channel.php:1799 ../../Zotlabs/Module/Directory.php:348
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../include/channel.php:1840
+#: ../../include/channel.php:1808
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/channel.php:1852
+#: ../../include/channel.php:1820
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/channel.php:1856
+#: ../../include/channel.php:1824
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/channel.php:1860 ../../Zotlabs/Module/Directory.php:367
-msgid "Hometown:"
-msgstr "Lugar de nacimiento:"
-
-#: ../../include/channel.php:1862
+#: ../../include/channel.php:1830
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/channel.php:1864
+#: ../../include/channel.php:1832
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/channel.php:1866 ../../Zotlabs/Module/Directory.php:369
+#: ../../include/channel.php:1834 ../../Zotlabs/Module/Directory.php:368
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../include/channel.php:1868
+#: ../../include/channel.php:1836
 msgid "Hobbies/Interests:"
 msgstr "Aficciones o intereses:"
 
-#: ../../include/channel.php:1870
+#: ../../include/channel.php:1838
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/channel.php:1872
+#: ../../include/channel.php:1840
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/channel.php:1874
+#: ../../include/channel.php:1842
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/channel.php:1876
+#: ../../include/channel.php:1844
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/channel.php:1878
+#: ../../include/channel.php:1846
 msgid "Musical interests:"
 msgstr "Preferencias musicales:"
 
-#: ../../include/channel.php:1880
+#: ../../include/channel.php:1848
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/channel.php:1882
+#: ../../include/channel.php:1850
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/channel.php:1884
+#: ../../include/channel.php:1852
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/channel.php:1886
+#: ../../include/channel.php:1854
 msgid "Love/Romance:"
 msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/channel.php:1888
+#: ../../include/channel.php:1856
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/channel.php:1890
+#: ../../include/channel.php:1858
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/channel.php:1911 ../../Zotlabs/Module/Profperm.php:113
-#: ../../Zotlabs/Lib/Apps.php:362
+#: ../../include/channel.php:1879 ../../Zotlabs/Module/Profperm.php:113
+#: ../../Zotlabs/Lib/Apps.php:366
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../include/channel.php:1913
+#: ../../include/channel.php:1881
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
-#: ../../include/channel.php:1914 ../../Zotlabs/Module/Events.php:699
+#: ../../include/channel.php:1882
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../include/channel.php:2353 ../../Zotlabs/Module/Cover_photo.php:304
+#: ../../include/channel.php:2335 ../../Zotlabs/Module/Cover_photo.php:304
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
-#: ../../include/channel.php:2622 ../../Zotlabs/Module/Rmagic.php:96
-#: ../../boot.php:1717
+#: ../../include/channel.php:2610 ../../Zotlabs/Module/Rmagic.php:96
+#: ../../boot.php:1753
 msgid "Remote Authentication"
 msgstr "Acceso desde su servidor"
 
-#: ../../include/channel.php:2623 ../../Zotlabs/Module/Rmagic.php:97
+#: ../../include/channel.php:2611 ../../Zotlabs/Module/Rmagic.php:97
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
 
-#: ../../include/channel.php:2624 ../../Zotlabs/Module/Rmagic.php:98
+#: ../../include/channel.php:2612 ../../Zotlabs/Module/Rmagic.php:98
 msgid "Authenticate"
 msgstr "Acceder"
 
-#: ../../include/channel.php:2782 ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../include/channel.php:2770 ../../Zotlabs/Module/Admin/Accounts.php:184
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
@@ -7243,14 +6925,15 @@ msgstr "Grupos de privacidad basados en perfiles"
 msgid "Private Forum"
 msgstr "Foro privado"
 
-#: ../../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
+#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Forums.php:77
+#: ../../Zotlabs/Widget/Activity_filter.php:130
+#: ../../Zotlabs/Widget/Notifications.php:130
+#: ../../Zotlabs/Widget/Notifications.php:131
 msgid "Forums"
 msgstr "Foros"
 
 #: ../../include/acl_selectors.php:136
+#: ../../Zotlabs/Module/Settings/Privacy.php:56
 #: ../../Zotlabs/Lib/PermissionDescription.php:107
 msgid "Only me"
 msgstr "Sólo yo"
@@ -7284,940 +6967,860 @@ msgid ""
 " permissions set who is allowed to view the post."
 msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
 
-#: ../../include/oembed.php:153
+#: ../../include/oembed.php:154
 msgid "View PDF"
 msgstr "Ver PDF"
 
-#: ../../include/oembed.php:365
+#: ../../include/oembed.php:367
 msgid " by "
 msgstr "por"
 
-#: ../../include/oembed.php:366
+#: ../../include/oembed.php:368
 msgid " on "
 msgstr "en"
 
-#: ../../include/oembed.php:395
+#: ../../include/oembed.php:397
 msgid "Embedded content"
 msgstr "Contenido incorporado"
 
-#: ../../include/oembed.php:404
+#: ../../include/oembed.php:406
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
-#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:163
-msgid "Directory Options"
-msgstr "Opciones del directorio"
-
-#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:165
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../../include/dir_fns.php:145 ../../Zotlabs/Lib/Libzotdir.php:166
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
-
-#: ../../include/dir_fns.php:146 ../../Zotlabs/Lib/Libzotdir.php:168
-msgid "This Website Only"
-msgstr "Solo este sitio web"
-
-#: ../../include/zid.php:360
+#: ../../include/zid.php:408
 #, php-format
 msgid "OpenWebAuth: %1$s welcomes %2$s"
 msgstr "OpenWebAuth:  %1$s da la bienvenida a %2$s"
 
-#: ../../include/message.php:41
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
-
-#: ../../include/message.php:80
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
-
-#: ../../include/message.php:85
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: ../../include/message.php:214
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las publicaciones guardadas."
-
-#: ../../Zotlabs/Widget/Activity_order.php:90
+#: ../../Zotlabs/Widget/Activity_order.php:96
 msgid "Commented Date"
 msgstr "Fecha de los comentarios"
 
-#: ../../Zotlabs/Widget/Activity_order.php:94
+#: ../../Zotlabs/Widget/Activity_order.php:100
 msgid "Order by last commented date"
 msgstr "Ordenar por la última fecha de los comentarios"
 
-#: ../../Zotlabs/Widget/Activity_order.php:97
+#: ../../Zotlabs/Widget/Activity_order.php:103
 msgid "Posted Date"
 msgstr "Fecha de publicación"
 
-#: ../../Zotlabs/Widget/Activity_order.php:101
+#: ../../Zotlabs/Widget/Activity_order.php:107
 msgid "Order by last posted date"
 msgstr "Ordenar por la ultima fecha de publicación"
 
-#: ../../Zotlabs/Widget/Activity_order.php:104
+#: ../../Zotlabs/Widget/Activity_order.php:110
 msgid "Date Unthreaded"
 msgstr "Sin enhebrar por fecha"
 
-#: ../../Zotlabs/Widget/Activity_order.php:108
+#: ../../Zotlabs/Widget/Activity_order.php:114
 msgid "Order unthreaded by date"
 msgstr "Ordenar sin enhebrar por fecha"
 
-#: ../../Zotlabs/Widget/Activity_order.php:123
+#: ../../Zotlabs/Widget/Activity_order.php:129
 msgid "Stream Order"
 msgstr "Orden del stream"
 
-#: ../../Zotlabs/Widget/Archive.php:43
+#: ../../Zotlabs/Widget/Tokens.php:41
+msgid "Add new guest"
+msgstr "Añadir un nuevo invitado"
+
+#: ../../Zotlabs/Widget/Tokens.php:49 ../../Zotlabs/Module/Lockview.php:226
+msgid "Guest access"
+msgstr "Acceso para invitados"
+
+#: ../../Zotlabs/Widget/Archive.php:49
 msgid "Archives"
 msgstr "Hemeroteca"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:34
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
+#: ../../Zotlabs/Widget/Wiki_pages.php:40
+#: ../../Zotlabs/Widget/Wiki_pages.php:97
 msgid "Add new page"
 msgstr "Añadir una nueva página"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:41
-#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:166
+#: ../../Zotlabs/Widget/Wiki_pages.php:47
+#: ../../Zotlabs/Widget/Wiki_pages.php:104
+#: ../../Zotlabs/Module/Dreport.php:130
 msgid "Options"
 msgstr "Opciones"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:85
+#: ../../Zotlabs/Widget/Wiki_pages.php:91
 msgid "Wiki Pages"
 msgstr "Páginas del wiki"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
+#: ../../Zotlabs/Widget/Wiki_pages.php:102
 msgid "Page name"
 msgstr "Nombre de la página"
 
-#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87
+#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:91
 #: ../../Zotlabs/Module/Embedphotos.php:171
-#: ../../Zotlabs/Module/Photos.php:787 ../../Zotlabs/Module/Photos.php:1333
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1337
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
+#: ../../Zotlabs/Widget/Album.php:101 ../../Zotlabs/Widget/Portfolio.php:112
 #: ../../Zotlabs/Module/Embedphotos.php:187
-#: ../../Zotlabs/Module/Photos.php:818
+#: ../../Zotlabs/Module/Photos.php:824
 msgid "Edit Album"
 msgstr "Editar álbum"
 
-#: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Cdav.php:146
-#: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110
+#: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Cdav.php:150
+#: ../../Zotlabs/Widget/Cdav.php:186 ../../Zotlabs/Widget/Portfolio.php:114
 #: ../../Zotlabs/Module/Embedphotos.php:189
-#: ../../Zotlabs/Module/Profile_photo.php:500
+#: ../../Zotlabs/Module/Profile_photo.php:543
 #: ../../Zotlabs/Module/Cover_photo.php:423
-#: ../../Zotlabs/Module/Photos.php:688 ../../Zotlabs/Storage/Browser.php:540
+#: ../../Zotlabs/Module/Photos.php:692 ../../Zotlabs/Storage/Browser.php:540
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
+#: ../../Zotlabs/Widget/Tasklist.php:26
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:25
-msgid "Public Hubs"
-msgstr "Servidores públicos"
-
-#: ../../Zotlabs/Widget/Conversations.php:17
-msgid "Received Messages"
-msgstr "Mensajes recibidos"
-
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Sent Messages"
-msgstr "Enviar mensajes"
-
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: ../../Zotlabs/Widget/Conversations.php:37
-msgid "No messages."
-msgstr "Sin mensajes."
-
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
-
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
+#: ../../Zotlabs/Widget/Chatroom_members.php:17
 msgid "Chat Members"
 msgstr "Miembros del chat"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
 msgid "I will attend"
 msgstr "Participaré"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
 msgid "I will not attend"
 msgstr "No participaré"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:206
+#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:235
 msgid "I might attend"
 msgstr "Quizá participe"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
 msgid "I agree"
 msgstr "Estoy de acuerdo"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
 msgid "I disagree"
 msgstr "No estoy de acuerdo"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:220
+#: ../../Zotlabs/Widget/Pinned.php:84 ../../Zotlabs/Lib/ThreadItem.php:249
 msgid "I abstain"
 msgstr "Me abstengo"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
+#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "Share This"
 msgstr "Compartir esto"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:330
+#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "share"
 msgstr "compartir"
 
-#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
+#: ../../Zotlabs/Widget/Pinned.php:125 ../../Zotlabs/Widget/Pinned.php:126
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Ver el perfil de %s - %s"
 
-#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Lib/ThreadItem.php:414
+#: ../../Zotlabs/Widget/Pinned.php:130 ../../Zotlabs/Widget/Messages.php:107
+#: ../../Zotlabs/Lib/ThreadItem.php:450
 msgid "via"
 msgstr "mediante"
 
-#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:445
+#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:481
 msgid "Attendance Options"
 msgstr "Opciones de participación o asistencia"
 
-#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:447
+#: ../../Zotlabs/Widget/Pinned.php:145 ../../Zotlabs/Lib/ThreadItem.php:483
 msgid "Voting Options"
 msgstr "Opciones de votación"
 
-#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:471
+#: ../../Zotlabs/Widget/Pinned.php:157 ../../Zotlabs/Lib/ThreadItem.php:507
 msgid "Pinned post"
 msgstr "Entradas ancladas"
 
-#: ../../Zotlabs/Widget/Pinned.php:156
+#: ../../Zotlabs/Widget/Pinned.php:159
 msgid "Don't show"
 msgstr "No mostrar"
 
-#: ../../Zotlabs/Widget/Activity.php:50
+#: ../../Zotlabs/Widget/Activity.php:55
 msgctxt "widget"
 msgid "Activity"
 msgstr "Actividad"
 
-#: ../../Zotlabs/Widget/Cdav.php:37
+#: ../../Zotlabs/Widget/Cdav.php:41
 msgid "Select Channel"
 msgstr "Seleccionar un canal"
 
-#: ../../Zotlabs/Widget/Cdav.php:42
+#: ../../Zotlabs/Widget/Cdav.php:46
 msgid "Read-write"
 msgstr "Lectura y escritura"
 
-#: ../../Zotlabs/Widget/Cdav.php:43
+#: ../../Zotlabs/Widget/Cdav.php:47
 msgid "Read-only"
 msgstr "Sólo lectura"
 
-#: ../../Zotlabs/Widget/Cdav.php:127
+#: ../../Zotlabs/Widget/Cdav.php:131
 msgid "Channel Calendar"
 msgstr "Calendario del canal"
 
-#: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143
-#: ../../Zotlabs/Module/Cdav.php:1056
+#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:147
+#: ../../Zotlabs/Module/Cdav.php:1054
 msgid "CalDAV Calendars"
 msgstr "Calendarios CalDAV"
 
-#: ../../Zotlabs/Widget/Cdav.php:131
+#: ../../Zotlabs/Widget/Cdav.php:135
 msgid "Shared CalDAV Calendars"
 msgstr "Calendarios CalDAV compartidos"
 
-#: ../../Zotlabs/Widget/Cdav.php:135
+#: ../../Zotlabs/Widget/Cdav.php:139
 msgid "Share this calendar"
 msgstr "Compartir este calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:137
+#: ../../Zotlabs/Widget/Cdav.php:141
 msgid "Calendar name and color"
 msgstr "Nombre y color del calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:139
+#: ../../Zotlabs/Widget/Cdav.php:143
 msgid "Create new CalDAV calendar"
 msgstr "Crear un nuevo calendario CalDAV"
 
-#: ../../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/Widget/Cdav.php:144 ../../Zotlabs/Widget/Cdav.php:182
+#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1387
+#: ../../Zotlabs/Module/Webpages.php:251
 #: ../../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
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Menu.php:182
+#: ../../Zotlabs/Module/Connedit.php:747 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
 msgid "Create"
 msgstr "Crear"
 
-#: ../../Zotlabs/Widget/Cdav.php:141
+#: ../../Zotlabs/Widget/Cdav.php:145
 msgid "Calendar Name"
 msgstr "Nombre del calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:142
+#: ../../Zotlabs/Widget/Cdav.php:146
 msgid "Calendar Tools"
 msgstr "Gestión de calendarios"
 
-#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1056
+#: ../../Zotlabs/Widget/Cdav.php:147 ../../Zotlabs/Module/Cdav.php:1054
 msgid "Channel Calendars"
 msgstr "Calendarios del canal"
 
-#: ../../Zotlabs/Widget/Cdav.php:144
+#: ../../Zotlabs/Widget/Cdav.php:148
 msgid "Import calendar"
 msgstr "Importar un calendario"
 
-#: ../../Zotlabs/Widget/Cdav.php:145
+#: ../../Zotlabs/Widget/Cdav.php:149
 msgid "Select a calendar to import to"
 msgstr "Seleccionar un calendario para importarlo"
 
-#: ../../Zotlabs/Widget/Cdav.php:172
+#: ../../Zotlabs/Widget/Cdav.php:176
 msgid "Addressbooks"
 msgstr "Agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:174
+#: ../../Zotlabs/Widget/Cdav.php:178
 msgid "Addressbook name"
 msgstr "Nombre de la agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:176
+#: ../../Zotlabs/Widget/Cdav.php:180
 msgid "Create new addressbook"
 msgstr "Crear una nueva agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:177
+#: ../../Zotlabs/Widget/Cdav.php:181
 msgid "Addressbook Name"
 msgstr "Nombre de la agenda"
 
-#: ../../Zotlabs/Widget/Cdav.php:179
+#: ../../Zotlabs/Widget/Cdav.php:183
 msgid "Addressbook Tools"
 msgstr "Gestión de agendas de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:180
+#: ../../Zotlabs/Widget/Cdav.php:184
 msgid "Import addressbook"
 msgstr "Importar una agenda de direcciones"
 
-#: ../../Zotlabs/Widget/Cdav.php:181
+#: ../../Zotlabs/Widget/Cdav.php:185
 msgid "Select an addressbook to import to"
 msgstr "Seleccionar una agenda para importarla"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
+#: ../../Zotlabs/Widget/Savedsearch.php:81
 msgid "Remove term"
 msgstr "Eliminar término"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
+#: ../../Zotlabs/Widget/Suggestedchats.php:36
 msgid "Suggested Chatrooms"
 msgstr "Salas de chat sugeridas"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:32
+#: ../../Zotlabs/Widget/Settings_menu.php:37
 msgid "Account settings"
 msgstr "Configuración de la cuenta"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:38
+#: ../../Zotlabs/Widget/Settings_menu.php:43
 msgid "Channel settings"
 msgstr "Configuración del canal"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:46
+#: ../../Zotlabs/Widget/Settings_menu.php:49
+msgid "Privacy settings"
+msgstr "Ajustes de peivacidad"
+
+#: ../../Zotlabs/Widget/Settings_menu.php:56
 msgid "Display settings"
 msgstr "Ajustes de visualización"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:53
+#: ../../Zotlabs/Widget/Settings_menu.php:63
 msgid "Manage locations"
 msgstr "Gestión de ubicaciones (clones) del canal"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
+#: ../../Zotlabs/Widget/Chatroom_list.php:26
 msgid "Overview"
 msgstr "Resumen"
 
-#: ../../Zotlabs/Widget/Suggestions.php:48 ../../Zotlabs/Module/Suggest.php:73
+#: ../../Zotlabs/Widget/Suggestions.php:53 ../../Zotlabs/Module/Suggest.php:71
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
-#: ../../Zotlabs/Widget/Suggestions.php:53
+#: ../../Zotlabs/Widget/Suggestions.php:58
 msgid "Suggestions"
 msgstr "Sugerencias"
 
-#: ../../Zotlabs/Widget/Suggestions.php:54
+#: ../../Zotlabs/Widget/Suggestions.php:59
 msgid "See more..."
 msgstr "Ver más..."
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:25
 msgid "Bookmarked Chatrooms"
 msgstr "Salas de chat preferidas"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+#: ../../Zotlabs/Widget/Appcategories.php:49
+msgid "App Categories"
+msgstr "Categorías de aplicaciones"
+
+#: ../../Zotlabs/Widget/Wiki_page_history.php:29
+#: ../../Zotlabs/Lib/NativeWikiPage.php:583
 msgctxt "wiki_history"
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:24
-#: ../../Zotlabs/Lib/NativeWikiPage.php:578
+#: ../../Zotlabs/Widget/Wiki_page_history.php:30
+#: ../../Zotlabs/Lib/NativeWikiPage.php:584
 msgid "Date"
 msgstr "Fecha"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:25
-#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579
+#: ../../Zotlabs/Widget/Wiki_page_history.php:31
+#: ../../Zotlabs/Module/Wiki.php:364 ../../Zotlabs/Lib/NativeWikiPage.php:585
 msgid "Revert"
 msgstr "Revertir"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:26
-#: ../../Zotlabs/Lib/NativeWikiPage.php:580
+#: ../../Zotlabs/Widget/Wiki_page_history.php:32
+#: ../../Zotlabs/Lib/NativeWikiPage.php:586
 msgid "Compare"
 msgstr "Comparar"
 
-#: ../../Zotlabs/Widget/Hq_controls.php:14
-msgid "HQ Control Panel"
-msgstr "Panel de control de HQ"
-
-#: ../../Zotlabs/Widget/Hq_controls.php:17
-msgid "Create a new post"
-msgstr "Crear una nueva entrada"
+#: ../../Zotlabs/Widget/Hq_controls.php:24
+msgid "Toggle post editor"
+msgstr "Alternar editor de entradas"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
-msgid "Private Mail Menu"
-msgstr "Menú de correo privado"
+#: ../../Zotlabs/Widget/Hq_controls.php:35
+msgid "Toggle personal notes"
+msgstr "Alternar notas personales"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
-msgid "Combined View"
-msgstr "Vista combinada"
+#: ../../Zotlabs/Widget/Permcats.php:42
+msgid "Add new role"
+msgstr "Añadir nuevo rol"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#: ../../Zotlabs/Widget/Permcats.php:93
+#: ../../Zotlabs/Module/Contactedit.php:409
+msgid "Contact roles"
+msgstr "Roles del contacto"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#: ../../Zotlabs/Widget/Permcats.php:94
+msgid "Role members"
+msgstr "Miembros del rol"
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30
-msgid "New Message"
-msgstr "Nuevo mensaje"
-
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+#: ../../Zotlabs/Widget/Photo.php:54 ../../Zotlabs/Widget/Photo_rand.php:63
 msgid "photo/image"
 msgstr "foto/imagen"
 
-#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:411
+#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Site.php:414
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../Zotlabs/Widget/Admin.php:23
+#: ../../Zotlabs/Widget/Admin.php:28
 #: ../../Zotlabs/Module/Admin/Accounts.php:308
 #: ../../Zotlabs/Module/Admin/Accounts.php:327
-#: ../../Zotlabs/Module/Admin.php:96
+#: ../../Zotlabs/Module/Admin.php:95
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Widget/Admin.php:65
 msgid "Member registrations waiting for confirmation"
 msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
 
-#: ../../Zotlabs/Widget/Admin.php:24
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Admin.php:117
-msgid "Channels"
-msgstr "Canales"
-
-#: ../../Zotlabs/Widget/Admin.php:25
+#: ../../Zotlabs/Widget/Admin.php:30
 #: ../../Zotlabs/Module/Admin/Security.php:99
 msgid "Security"
 msgstr "Seguridad"
 
-#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Widget/Admin.php:31 ../../Zotlabs/Lib/Apps.php:362
 msgid "Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Zotlabs/Widget/Admin.php:32 ../../Zotlabs/Module/Admin/Addons.php:343
 #: ../../Zotlabs/Module/Admin/Addons.php:441
 msgid "Addons"
 msgstr "Addons"
 
-#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Widget/Admin.php:33 ../../Zotlabs/Module/Admin/Themes.php:123
 #: ../../Zotlabs/Module/Admin/Themes.php:157
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../Zotlabs/Widget/Admin.php:29
+#: ../../Zotlabs/Widget/Admin.php:34
 msgid "Inspect queue"
 msgstr "Examinar la cola"
 
-#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168
+#: ../../Zotlabs/Widget/Admin.php:35 ../../Zotlabs/Module/Admin/Profs.php:168
 msgid "Profile Fields"
 msgstr "Campos del perfil"
 
-#: ../../Zotlabs/Widget/Admin.php:31
+#: ../../Zotlabs/Widget/Admin.php:36
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58
+#: ../../Zotlabs/Widget/Admin.php:53 ../../Zotlabs/Widget/Admin.php:63
 #: ../../Zotlabs/Module/Admin/Logs.php:83
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../Zotlabs/Widget/Admin.php:56
+#: ../../Zotlabs/Widget/Admin.php:61
 msgid "Addon Features"
 msgstr "Características del addon"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:37
+#: ../../Zotlabs/Widget/Activity_filter.php:44
+#: ../../Zotlabs/Widget/Notifications.php:61
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:41
+#: ../../Zotlabs/Widget/Activity_filter.php:48
 msgid "Show direct (private) messages"
 msgstr "Mostrar mensajes (privados) directos"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:46
+#: ../../Zotlabs/Widget/Activity_filter.php:53
+#: ../../Zotlabs/Widget/Notifications.php:80
 msgid "Events"
 msgstr "Eventos"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:50
+#: ../../Zotlabs/Widget/Activity_filter.php:57
 msgid "Show posts that include events"
 msgstr "Mostrar entradas que incluyan eventos"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:56
+#: ../../Zotlabs/Widget/Activity_filter.php:63
 msgid "Polls"
 msgstr "Encuestas"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:60
+#: ../../Zotlabs/Widget/Activity_filter.php:67
 msgid "Show posts that include polls"
 msgstr "Mostrar entradas que incluyan encuestas"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:83
+#: ../../Zotlabs/Widget/Activity_filter.php:90
 #, php-format
 msgid "Show posts related to the %s privacy group"
 msgstr "Mostrar entradas relacionadas con el grupo %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:92
+#: ../../Zotlabs/Widget/Activity_filter.php:99
 msgid "Show my privacy groups"
 msgstr "Mostrar mis grupos de canales"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:116
+#: ../../Zotlabs/Widget/Activity_filter.php:123
 msgid "Show posts to this forum"
 msgstr "Mostrar las entradas en este foro"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:127
+#: ../../Zotlabs/Widget/Activity_filter.php:134
 msgid "Show forums"
 msgstr "Mostrar los foros"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:141
+#: ../../Zotlabs/Widget/Activity_filter.php:148
 msgid "Starred Posts"
 msgstr "Entradas preferidas"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:145
+#: ../../Zotlabs/Widget/Activity_filter.php:152
 msgid "Show posts that I have starred"
 msgstr "Mostrar entradas que he señalado como preferidas"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:156
+#: ../../Zotlabs/Widget/Activity_filter.php:163
 msgid "Personal Posts"
 msgstr "Entradas personales"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:160
+#: ../../Zotlabs/Widget/Activity_filter.php:167
 msgid "Show posts that mention or involve me"
 msgstr "Mostrar entradas que me mencionen o involucren"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:183
+#: ../../Zotlabs/Widget/Activity_filter.php:190
 #, php-format
 msgid "Show posts that I have filed to %s"
 msgstr "Mostrar las entradas que he enviado a %s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:193
+#: ../../Zotlabs/Widget/Activity_filter.php:200
 msgid "Show filed post categories"
 msgstr "Mostrar los temas de las entradas archivadas"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:207
+#: ../../Zotlabs/Widget/Activity_filter.php:214
 msgid "Panel search"
 msgstr "Panel de búsqueda"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:217
+#: ../../Zotlabs/Widget/Activity_filter.php:224
 msgid "Filter by name"
 msgstr "Filtrar por nombre"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:232
+#: ../../Zotlabs/Widget/Activity_filter.php:239
 msgid "Remove active filter"
 msgstr "Eliminar el filtro activo"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:248
+#: ../../Zotlabs/Widget/Activity_filter.php:255
 msgid "Stream Filters"
 msgstr "Filtros del stream"
 
-#: ../../Zotlabs/Widget/Appstore.php:11
+#: ../../Zotlabs/Widget/Appstore.php:16
 msgid "App Collections"
 msgstr "Colección de aplicaciones"
 
-#: ../../Zotlabs/Widget/Appstore.php:13
+#: ../../Zotlabs/Widget/Appstore.php:18
 msgid "Installed apps"
 msgstr "Aplicaciones instaladas"
 
-#: ../../Zotlabs/Widget/Appstore.php:14 ../../Zotlabs/Module/Apps.php:50
+#: ../../Zotlabs/Widget/Appstore.php:19 ../../Zotlabs/Module/Apps.php:50
 msgid "Available Apps"
 msgstr "Aplicaciones disponibles"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
-msgstr "Gestión de eventos"
-
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
-msgstr "Exportar el calendario"
+#: ../../Zotlabs/Widget/Privacygroups.php:45
+msgid "Add new group"
+msgstr "Añadir nuevo grupo"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
-msgstr "Importar un calendario"
+#: ../../Zotlabs/Widget/Privacygroups.php:54
+#: ../../Zotlabs/Module/Contactedit.php:443
+msgid "Privacy groups"
+msgstr "Grupos de canales"
 
-#: ../../Zotlabs/Widget/Rating.php:51
+#: ../../Zotlabs/Widget/Rating.php:57
 msgid "Rating Tools"
 msgstr "Valoraciones"
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+#: ../../Zotlabs/Widget/Rating.php:61 ../../Zotlabs/Widget/Rating.php:63
 msgid "Rate Me"
 msgstr "Valorar este canal"
 
-#: ../../Zotlabs/Widget/Rating.php:60
+#: ../../Zotlabs/Widget/Rating.php:66
 msgid "View Ratings"
 msgstr "Mostrar las valoraciones"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:65
+#: ../../Zotlabs/Widget/Cover_photo.php:71
 msgid "Click to show more"
 msgstr "Hacer clic para ver más"
 
-#: ../../Zotlabs/Widget/Follow.php:22
+#: ../../Zotlabs/Widget/Follow.php:27 ../../Zotlabs/Module/Connections.php:368
 #, php-format
 msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
 
-#: ../../Zotlabs/Widget/Follow.php:29
+#: ../../Zotlabs/Widget/Follow.php:34
 msgid "Add New Connection"
 msgstr "Añadir nueva conexión"
 
-#: ../../Zotlabs/Widget/Follow.php:30
+#: ../../Zotlabs/Widget/Follow.php:35
 msgid "Enter channel address"
 msgstr "Dirección del canal"
 
-#: ../../Zotlabs/Widget/Follow.php:31
+#: ../../Zotlabs/Widget/Follow.php:36
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
+#: ../../Zotlabs/Widget/Messages.php:32
+msgid "Public and restricted messages"
+msgstr "Mensajes públicos y restringidos"
+
+#: ../../Zotlabs/Widget/Messages.php:33
+msgid "Direct messages"
+msgstr "Mensajes directos"
+
+#: ../../Zotlabs/Widget/Messages.php:34
+msgid "Starred messages"
+msgstr "Entradas preferidas"
+
+#: ../../Zotlabs/Widget/Messages.php:35
+#: ../../Zotlabs/Widget/Notifications.php:115
+#: ../../Zotlabs/Widget/Notifications.php:116
+msgid "Notices"
+msgstr "Avisos"
+
+#: ../../Zotlabs/Widget/Messages.php:37
+msgid "No messages"
+msgstr "Sin mensajes"
+
+#: ../../Zotlabs/Widget/Newmember.php:36
 msgid "Profile Creation"
 msgstr "Creación de perfiles"
 
-#: ../../Zotlabs/Widget/Newmember.php:33
+#: ../../Zotlabs/Widget/Newmember.php:38
 msgid "Upload profile photo"
 msgstr "Cargar la foto del perfil"
 
-#: ../../Zotlabs/Widget/Newmember.php:34
+#: ../../Zotlabs/Widget/Newmember.php:39
 msgid "Upload cover photo"
 msgstr "Cargar la foto de portada del perfil"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
+#: ../../Zotlabs/Widget/Newmember.php:43
 msgid "Find and Connect with others"
 msgstr "Encontrar y conectarse con otros"
 
-#: ../../Zotlabs/Widget/Newmember.php:40
+#: ../../Zotlabs/Widget/Newmember.php:45
 msgid "View the directory"
 msgstr "Ver el directorio"
 
-#: ../../Zotlabs/Widget/Newmember.php:41 ../../Zotlabs/Module/Go.php:38
+#: ../../Zotlabs/Widget/Newmember.php:46 ../../Zotlabs/Module/Go.php:38
 msgid "View friend suggestions"
 msgstr "Ver sugerencias de amistad"
 
-#: ../../Zotlabs/Widget/Newmember.php:42
+#: ../../Zotlabs/Widget/Newmember.php:47
 msgid "Manage your connections"
 msgstr "Gestionar sus conexiones"
 
-#: ../../Zotlabs/Widget/Newmember.php:45
+#: ../../Zotlabs/Widget/Newmember.php:50
 msgid "Communicate"
 msgstr "Comunicarse"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
+#: ../../Zotlabs/Widget/Newmember.php:52
 msgid "View your channel homepage"
 msgstr "Ver la página principal de su canal"
 
-#: ../../Zotlabs/Widget/Newmember.php:48
+#: ../../Zotlabs/Widget/Newmember.php:53
 msgid "View your network stream"
 msgstr "Ver el \"stream\" de su red"
 
-#: ../../Zotlabs/Widget/Newmember.php:54
+#: ../../Zotlabs/Widget/Newmember.php:59
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../Zotlabs/Widget/Newmember.php:57
+#: ../../Zotlabs/Widget/Newmember.php:62
 msgid "Missing Features?"
 msgstr "¿Faltan Características?"
 
-#: ../../Zotlabs/Widget/Newmember.php:59
+#: ../../Zotlabs/Widget/Newmember.php:64
 msgid "Pin apps to navigation bar"
 msgstr "Fijar apps a la barra de navegación"
 
-#: ../../Zotlabs/Widget/Newmember.php:60
+#: ../../Zotlabs/Widget/Newmember.php:65
 msgid "Install more apps"
 msgstr "Instalar más apps"
 
-#: ../../Zotlabs/Widget/Newmember.php:71
+#: ../../Zotlabs/Widget/Newmember.php:76
 msgid "View public stream"
 msgstr "Ver el \"stream\" público"
 
-#: ../../Zotlabs/Widget/Newmember.php:75
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Widget/Newmember.php:80
+#: ../../Zotlabs/Module/Settings/Display.php:200
 msgid "New Member Links"
 msgstr "Enlaces para nuevos miembros"
 
-#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:716
+#: ../../Zotlabs/Widget/Notes.php:35
+msgid "Read mode"
+msgstr "Modo lectura"
+
+#: ../../Zotlabs/Widget/Notes.php:36
+msgid "Edit mode"
+msgstr "Modo edición"
+
+#: ../../Zotlabs/Widget/Notes.php:37
+msgid "Editing"
+msgstr "Editar"
+
+#: ../../Zotlabs/Widget/Notes.php:38
+msgid "Saving"
+msgstr "Guardar"
+
+#: ../../Zotlabs/Widget/Notes.php:39
+msgid "Saved"
+msgstr "Guardado"
+
+#: ../../Zotlabs/Widget/Affinity.php:36
+#: ../../Zotlabs/Module/Contactedit.php:295
+#: ../../Zotlabs/Module/Connedit.php:579
 msgid "Me"
 msgstr "Yo"
 
-#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:717
+#: ../../Zotlabs/Widget/Affinity.php:37
+#: ../../Zotlabs/Module/Contactedit.php:296
+#: ../../Zotlabs/Module/Connedit.php:580
 msgid "Family"
 msgstr "Familia"
 
-#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Widget/Affinity.php:39
+#: ../../Zotlabs/Module/Contactedit.php:298
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
-#: ../../Zotlabs/Widget/Affinity.php:34
+#: ../../Zotlabs/Widget/Affinity.php:40
+#: ../../Zotlabs/Module/Contactedit.php:299
 #: ../../Zotlabs/Module/Connections.php:97
 #: ../../Zotlabs/Module/Connections.php:111
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:583
 msgid "All"
 msgstr "Todos/as"
 
-#: ../../Zotlabs/Widget/Affinity.php:54
+#: ../../Zotlabs/Widget/Affinity.php:60
 msgid "Refresh"
 msgstr "Recargar"
 
-#: ../../Zotlabs/Widget/Notifications.php:16
-msgid "New Network Activity"
-msgstr "Nueva actividad en la red"
-
-#: ../../Zotlabs/Widget/Notifications.php:17
-msgid "New Network Activity Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:23
+msgid "New network activity notifications"
 msgstr "Avisos de nueva actividad en la red"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
-msgid "View your network activity"
-msgstr "Ver la actividad de su red"
+#: ../../Zotlabs/Widget/Notifications.php:26
+msgid "Network stream"
+msgstr "Stream de la red"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
-#: ../../Zotlabs/Widget/Notifications.php:62
+#: ../../Zotlabs/Widget/Notifications.php:29
+#: ../../Zotlabs/Widget/Notifications.php:68
 msgid "Mark all notifications read"
 msgstr "Marcar todas las notificaciones como leídas"
 
-#: ../../Zotlabs/Widget/Notifications.php:26
-#: ../../Zotlabs/Widget/Notifications.php:46
-#: ../../Zotlabs/Widget/Notifications.php:65
-#: ../../Zotlabs/Widget/Notifications.php:172
+#: ../../Zotlabs/Widget/Notifications.php:32
+#: ../../Zotlabs/Widget/Notifications.php:52
+#: ../../Zotlabs/Widget/Notifications.php:71
+#: ../../Zotlabs/Widget/Notifications.php:163
 msgid "Show new posts only"
 msgstr "Mostrar solo las entradas nuevas"
 
-#: ../../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:33
+#: ../../Zotlabs/Widget/Notifications.php:53
+#: ../../Zotlabs/Widget/Notifications.php:72
+#: ../../Zotlabs/Widget/Notifications.php:133
+#: ../../Zotlabs/Widget/Notifications.php:164
 msgid "Filter by name or address"
 msgstr "Filtrar por nombre o dirección"
 
-#: ../../Zotlabs/Widget/Notifications.php:36
-msgid "New Home Activity"
-msgstr "Nueva actividad en su página principal"
-
-#: ../../Zotlabs/Widget/Notifications.php:37
-msgid "New Home Activity Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:43
+msgid "New home activity notifications"
 msgstr "Avisos de nueva actividad en su página principal"
 
-#: ../../Zotlabs/Widget/Notifications.php:40
-msgid "View your home activity"
-msgstr "Ver la actividad de su página principal"
+#: ../../Zotlabs/Widget/Notifications.php:46
+msgid "Home stream"
+msgstr "Stream de su página principal"
 
-#: ../../Zotlabs/Widget/Notifications.php:43
-#: ../../Zotlabs/Widget/Notifications.php:169
+#: ../../Zotlabs/Widget/Notifications.php:49
+#: ../../Zotlabs/Widget/Notifications.php:160
 msgid "Mark all notifications seen"
 msgstr "Marcar todas las notificaciones como vistas"
 
-#: ../../Zotlabs/Widget/Notifications.php:55
-msgid "New Direct Messages"
-msgstr "Nuevos mensajes directos"
-
-#: ../../Zotlabs/Widget/Notifications.php:56
-msgid "New Direct Messages Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:62
+msgid "New direct messages notifications"
 msgstr "Nuevas notificaciones de mensajes directos"
 
-#: ../../Zotlabs/Widget/Notifications.php:59
-msgid "View your direct messages"
-msgstr "Ver sus mensajes directos"
-
-#: ../../Zotlabs/Widget/Notifications.php:74
-msgid "New Mails"
-msgstr "Nuevos mensajes de correo"
-
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New Mails Notifications"
-msgstr "Avisos de nuevos mensajes de correo"
-
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View your private mails"
-msgstr "Ver sus correos privados"
+#: ../../Zotlabs/Widget/Notifications.php:65
+msgid "Direct messages stream"
+msgstr "Stream de mensajes directos"
 
 #: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all messages seen"
-msgstr "Marcar todos los mensajes como vistos"
-
-#: ../../Zotlabs/Widget/Notifications.php:89
-msgid "New Events"
-msgstr "Eventos nuevos"
-
-#: ../../Zotlabs/Widget/Notifications.php:90
-msgid "New Events Notifications"
+msgid "New events notifications"
 msgstr "Avisos de nuevos eventos"
 
-#: ../../Zotlabs/Widget/Notifications.php:93
+#: ../../Zotlabs/Widget/Notifications.php:84
 msgid "View events"
 msgstr "Ver los eventos"
 
-#: ../../Zotlabs/Widget/Notifications.php:96
+#: ../../Zotlabs/Widget/Notifications.php:87
 msgid "Mark all events seen"
 msgstr "Marcar todos los eventos como leidos"
 
-#: ../../Zotlabs/Widget/Notifications.php:104
+#: ../../Zotlabs/Widget/Notifications.php:95
 #: ../../Zotlabs/Module/Connections.php:165
 msgid "New Connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Widget/Notifications.php:105
-msgid "New Connections Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:96
+msgid "New connections notifications"
 msgstr "Avisos de nuevas conexiones"
 
-#: ../../Zotlabs/Widget/Notifications.php:108
+#: ../../Zotlabs/Widget/Notifications.php:99
 msgid "View all connections"
 msgstr "Ver todas las conexiones"
 
-#: ../../Zotlabs/Widget/Notifications.php:116
-msgid "New Files"
-msgstr "Ficheros nuevos"
-
-#: ../../Zotlabs/Widget/Notifications.php:117
-msgid "New Files Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:108
+msgid "New files notifications"
 msgstr "Avisos de nuevos ficheros"
 
-#: ../../Zotlabs/Widget/Notifications.php:124
-#: ../../Zotlabs/Widget/Notifications.php:125
-msgid "Notices"
-msgstr "Avisos"
-
-#: ../../Zotlabs/Widget/Notifications.php:128
+#: ../../Zotlabs/Widget/Notifications.php:119
 msgid "View all notices"
 msgstr "Ver todos los avisos"
 
-#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Zotlabs/Widget/Notifications.php:122
 msgid "Mark all notices seen"
 msgstr "Marcar como leídos todos los avisos"
 
-#: ../../Zotlabs/Widget/Notifications.php:152
-msgid "New Registrations"
-msgstr "Registros nuevos"
+#: ../../Zotlabs/Widget/Notifications.php:143
+msgid "Registrations"
+msgstr "Registros"
 
-#: ../../Zotlabs/Widget/Notifications.php:153
-msgid "New Registrations Notifications"
+#: ../../Zotlabs/Widget/Notifications.php:144
+msgid "New registrations notifications"
 msgstr "Notificaciones de nuevos registros"
 
-#: ../../Zotlabs/Widget/Notifications.php:162
-#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Widget/Notifications.php:153
+#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:379
 msgid "Public Stream"
 msgstr "\"Stream\" público"
 
-#: ../../Zotlabs/Widget/Notifications.php:163
-msgid "Public Stream Notifications"
-msgstr "Avisos del \"stream\" público"
+#: ../../Zotlabs/Widget/Notifications.php:154
+msgid "New public stream notifications"
+msgstr "Nuevos avisos del stream público"
 
-#: ../../Zotlabs/Widget/Notifications.php:166
-msgid "View the public stream"
-msgstr "Ver el \"stream\" público"
+#: ../../Zotlabs/Widget/Notifications.php:157
+msgid "Public stream"
+msgstr "\"Stream\" público"
 
-#: ../../Zotlabs/Widget/Notifications.php:181
+#: ../../Zotlabs/Widget/Notifications.php:171
 msgid "Sorry, you have got no notifications at the moment"
 msgstr "Lo sentimos, por el momento no ha recibido ninguna notificación"
 
-#: ../../Zotlabs/Module/Tokens.php:39
+#: ../../Zotlabs/Module/Tokens.php:94
 #, php-format
 msgid "This channel is limited to %d tokens"
 msgstr "Este canal tiene un límite de %d tokens"
 
-#: ../../Zotlabs/Module/Tokens.php:45
+#: ../../Zotlabs/Module/Tokens.php:100
 msgid "Name and Password are required."
 msgstr "Se requiere el nombre y la contraseña."
 
-#: ../../Zotlabs/Module/Tokens.php:85
+#: ../../Zotlabs/Module/Tokens.php:215
 msgid "Token saved."
 msgstr "Token salvado."
 
-#: ../../Zotlabs/Module/Tokens.php:99
-msgid "Guest Access App"
-msgstr "App Acceso para invitados"
-
-#: ../../Zotlabs/Module/Tokens.php:100
-msgid "Create access tokens so that non-members can access private content"
-msgstr "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado"
-
-#: ../../Zotlabs/Module/Tokens.php:133
+#: ../../Zotlabs/Module/Tokens.php:261
 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 "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros de Hubzilla. Estas identidades se pueden usar en las Listas de control de acceso (ACL) y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado."
+"non-members. These identities may be used in privacy groups and visitors may"
+" login using these credentials to access private content."
+msgstr "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros. Estas identidades se pueden usar en los grupos de canales y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado."
 
-#: ../../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 "También puede proporcionar, con el estilo <em>dropbox</em>, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: "
+#: ../../Zotlabs/Module/Tokens.php:274
+msgid "Please select a role for this guest!"
+msgstr "Por favor, seleccione un rol para este invitado"
 
-#: ../../Zotlabs/Module/Tokens.php:170
-msgid "Guest Access Tokens"
-msgstr "Tokens de acceso para invitados"
+#: ../../Zotlabs/Module/Tokens.php:287
+msgid "Select a role for this guest"
+msgstr "Seleccione un rol para este invitado"
+
+#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:373
+msgid "Guest Access"
+msgstr "Acceso para invitados"
 
-#: ../../Zotlabs/Module/Tokens.php:177
+#: ../../Zotlabs/Module/Tokens.php:291
 msgid "Login Name"
 msgstr "Nombre de inicio de sesión"
 
-#: ../../Zotlabs/Module/Tokens.php:178
+#: ../../Zotlabs/Module/Tokens.php:292
 msgid "Login Password"
 msgstr "Contraseña de inicio de sesión"
 
-#: ../../Zotlabs/Module/Tokens.php:179
+#: ../../Zotlabs/Module/Tokens.php:293
 msgid "Expires (yyyy-mm-dd)"
 msgstr "Expira (aaaa-mm-dd)"
 
-#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:900
-msgid "Their Settings"
-msgstr "Sus ajustes"
-
-#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:901
-msgid "My Settings"
-msgstr "Mis ajustes"
-
-#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124
-#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:896
-msgid "inherited"
-msgstr "heredado"
-
-#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127
-#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:903
-msgid "Individual Permissions"
-msgstr "Permisos individuales"
-
-#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128
-#: ../../Zotlabs/Module/Connedit.php:904
-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 "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
-
 #: ../../Zotlabs/Module/Article_edit.php:17
 #: ../../Zotlabs/Module/Article_edit.php:33
 #: ../../Zotlabs/Module/Card_edit.php:17 ../../Zotlabs/Module/Card_edit.php:33
@@ -8237,7 +7840,7 @@ msgstr "Elemento no encontrado"
 msgid "Channel not found."
 msgstr "Canal no encontrado."
 
-#: ../../Zotlabs/Module/Article_edit.php:128
+#: ../../Zotlabs/Module/Article_edit.php:127
 msgid "Edit Article"
 msgstr "Editar el artículo"
 
@@ -8255,69 +7858,91 @@ msgstr "No se puede copiar la carpeta en sí misma."
 msgid "Can not move folder \"%s\" into itself."
 msgstr "No se puede mover la carpeta\"%s\" en sí misma."
 
-#: ../../Zotlabs/Module/Network.php:107
+#: ../../Zotlabs/Module/Network.php:106
 msgid "No such group"
 msgstr "No se encuentra el grupo"
 
-#: ../../Zotlabs/Module/Network.php:156
+#: ../../Zotlabs/Module/Network.php:155
 msgid "No such channel"
 msgstr "No se encuentra el  canal"
 
-#: ../../Zotlabs/Module/Network.php:168 ../../Zotlabs/Module/Channel.php:221
+#: ../../Zotlabs/Module/Network.php:167 ../../Zotlabs/Module/Channel.php:232
 msgid "Search Results For:"
 msgstr "Buscar resultados para:"
 
-#: ../../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
+#: ../../Zotlabs/Module/Network.php:208 ../../Zotlabs/Module/Channel.php:267
+#: ../../Zotlabs/Module/Hq.php:114 ../../Zotlabs/Module/Pubstream.php:90
+#: ../../Zotlabs/Module/Display.php:87
 msgid "Reset form"
 msgstr "Reiniciar el formulario"
 
-#: ../../Zotlabs/Module/Network.php:243
+#: ../../Zotlabs/Module/Network.php:242
 msgid "Privacy group is empty"
 msgstr "El grupo de canales está vacío"
 
-#: ../../Zotlabs/Module/Network.php:253
+#: ../../Zotlabs/Module/Network.php:252
 msgid "Privacy group: "
 msgstr "Grupo de canales: "
 
-#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:69
-msgid "Nothing to import."
-msgstr "No hay nada para importar."
-
-#: ../../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 "No se han podido descargar datos de su antiguo servidor"
-
-#: ../../Zotlabs/Module/Import_items.php:77
-#: ../../Zotlabs/Module/Import.php:107
-msgid "Imported file is empty."
-msgstr "El fichero importado está vacío."
-
-#: ../../Zotlabs/Module/Import_items.php:93
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Atención: Las versiones de la base de datos difieren en %1$d actualizaciones."
-
-#: ../../Zotlabs/Module/Import_items.php:108
-msgid "Import completed"
-msgstr "Importación completada"
+#: ../../Zotlabs/Module/Import_items.php:50
+msgid "Not a zip file or zip file corrupted."
+msgstr "No es un archivo zip o un archivo zip corrupto."
 
-#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Zotlabs/Module/Import_items.php:121
 msgid "Import Items"
 msgstr "Importar elementos"
 
-#: ../../Zotlabs/Module/Import_items.php:126
+#: ../../Zotlabs/Module/Import_items.php:122
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Utilice este formulario para importar entradas y contenido desde un archivo de exportación."
 
-#: ../../Zotlabs/Module/Import_items.php:127
-#: ../../Zotlabs/Module/Import.php:630
+#: ../../Zotlabs/Module/Import_items.php:123
+#: ../../Zotlabs/Module/Import.php:594
 msgid "File to Upload"
 msgstr "Fichero para subir"
 
+#: ../../Zotlabs/Module/Import_items.php:136
+#: ../../Zotlabs/Module/Import.php:107
+msgid "Imported file is empty."
+msgstr "El fichero importado está vacío."
+
+#: ../../Zotlabs/Module/Import_items.php:159
+msgid "Content import completed"
+msgstr "Importación de contenidos completada"
+
+#: ../../Zotlabs/Module/Import_items.php:164
+msgid "Chatroom import completed"
+msgstr "Importación de salas de chat completada"
+
+#: ../../Zotlabs/Module/Import_items.php:170
+msgid "Channel calendar import 1/2 completed"
+msgstr "Importación del calendario del canal 1/2 completada"
+
+#: ../../Zotlabs/Module/Import_items.php:176
+msgid "Channel calendar import 2/2 completed"
+msgstr "Importación del calendario del canal 2/2 completada"
+
+#: ../../Zotlabs/Module/Import_items.php:181
+msgid "Menu import completed"
+msgstr "Importación de menús completada"
+
+#: ../../Zotlabs/Module/Import_items.php:186
+msgid "Wiki import completed"
+msgstr "Importación de wikis completada"
+
+#: ../../Zotlabs/Module/Import_items.php:191
+msgid "Webpages import completed"
+msgstr "Importación de páginas web completada"
+
+#: ../../Zotlabs/Module/Import.php:70
+msgid "Nothing to import."
+msgstr "No hay nada para importar."
+
+#: ../../Zotlabs/Module/Import.php:86 ../../Zotlabs/Module/Import.php:100
+msgid "Unable to download data from old server"
+msgstr "No se han podido descargar datos de su antiguo servidor"
+
 #: ../../Zotlabs/Module/Import.php:163
 #, php-format
 msgid "Your service plan only allows %d channels."
@@ -8327,42 +7952,48 @@ msgstr "Su paquete de servicios solo permite %d canales."
 msgid "No channel. Import failed."
 msgstr "No hay canal. La importación ha fallado"
 
-#: ../../Zotlabs/Module/Import.php:623
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"Automatic content and files import was not possible due to API version "
+"incompatiblity. Please import content and files manually!"
+msgstr "La importación automática de contenidos y archivos no fue posible debido a la incompatibilidad de la versión de la API. Por favor, importe el contenido y los archivos manualmente."
+
+#: ../../Zotlabs/Module/Import.php:585
 msgid "You must be logged in to use this feature."
 msgstr "Debe estar registrado para poder usar esta funcionalidad."
 
-#: ../../Zotlabs/Module/Import.php:628
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Import.php:592
+msgid "Channel Import"
 msgstr "Importar canal"
 
-#: ../../Zotlabs/Module/Import.php:629
+#: ../../Zotlabs/Module/Import.php:593
 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 "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
 
-#: ../../Zotlabs/Module/Import.php:631
+#: ../../Zotlabs/Module/Import.php:595
 msgid "Or provide the old server/hub details"
 msgstr "O proporcione los detalles de su antiguo servidor/hub"
 
-#: ../../Zotlabs/Module/Import.php:633
+#: ../../Zotlabs/Module/Import.php:597
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
 
-#: ../../Zotlabs/Module/Import.php:634
+#: ../../Zotlabs/Module/Import.php:598
 msgid "Your old login email address"
 msgstr "Su antigua dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Import.php:635
+#: ../../Zotlabs/Module/Import.php:599
 msgid "Your old login password"
 msgstr "Su antigua contraseña"
 
-#: ../../Zotlabs/Module/Import.php:636
-msgid "Import a few months of posts if possible (limited by available memory"
-msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible"
+#: ../../Zotlabs/Module/Import.php:600
+msgid "Import your items and files (limited by available memory)"
+msgstr "Importar sus artículos y archivos (limitado por la memoria disponible)"
 
-#: ../../Zotlabs/Module/Import.php:638
+#: ../../Zotlabs/Module/Import.php:602
 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"
@@ -8370,26 +8001,26 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
 
-#: ../../Zotlabs/Module/Import.php:640
+#: ../../Zotlabs/Module/Import.php:604
 msgid "Make this hub my primary location"
 msgstr "Convertir este servidor en mi ubicación primaria"
 
-#: ../../Zotlabs/Module/Import.php:641
+#: ../../Zotlabs/Module/Import.php:605
 msgid "Move this channel (disable all previous locations)"
 msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)"
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:606
 msgid "Use this channel nickname instead of the one provided"
 msgstr "Usa este alias de canal en lugar del que se proporciona"
 
-#: ../../Zotlabs/Module/Import.php:642
+#: ../../Zotlabs/Module/Import.php:606
 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 "Dejar en blanco para mantener su alias de canal . Se le asignará aleatoriamente uno similar si cualquiera de los dos nombres ya está asignado en este sitio."
 
-#: ../../Zotlabs/Module/Import.php:644
+#: ../../Zotlabs/Module/Import.php:608
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -8420,572 +8051,566 @@ msgstr "desde la terminal."
 msgid "Email address required"
 msgstr "Dirección de correo electrónico requerida"
 
-#: ../../Zotlabs/Module/Register.php:153
+#: ../../Zotlabs/Module/Register.php:156
 msgid "No password provided"
 msgstr "No se ha proporcionado la contraseña"
 
-#: ../../Zotlabs/Module/Register.php:176
+#: ../../Zotlabs/Module/Register.php:179
 msgid "Terms of Service not accepted"
 msgstr "No se han aceptado los Términos del servicio"
 
-#: ../../Zotlabs/Module/Register.php:238
+#: ../../Zotlabs/Module/Register.php:241
 msgid "Invitation code succesfully applied"
 msgstr "El código de invitación se ha aplicado con éxito"
 
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:261
 msgid "Invitation not in time or too late"
 msgstr "La invitación no llega a tiempo o llega demasiado tarde"
 
-#: ../../Zotlabs/Module/Register.php:264
+#: ../../Zotlabs/Module/Register.php:267
 msgid "Invitation email failed"
 msgstr "Error en el correo electrónico de invitación"
 
-#: ../../Zotlabs/Module/Register.php:272
+#: ../../Zotlabs/Module/Register.php:275
 msgid "Invitation code failed"
 msgstr "Código de invitación fallido"
 
-#: ../../Zotlabs/Module/Register.php:279
+#: ../../Zotlabs/Module/Register.php:282
 msgid "Invitations are not available"
 msgstr "No hay invitaciones disponibles"
 
-#: ../../Zotlabs/Module/Register.php:305
-msgid "Email address already in use"
-msgstr "La dirección de correo electrónico ya está en uso"
-
-#: ../../Zotlabs/Module/Register.php:315
+#: ../../Zotlabs/Module/Register.php:292
 msgid "Registration on this hub is by invitation only"
 msgstr "El registro en este hub solo es posible por invitación"
 
-#: ../../Zotlabs/Module/Register.php:423
+#: ../../Zotlabs/Module/Register.php:399
 msgid "New register request"
 msgstr "Nueva solicitud de registro"
 
-#: ../../Zotlabs/Module/Register.php:441
+#: ../../Zotlabs/Module/Register.php:417
 msgid "Error creating dId A"
 msgstr "Error al crear dId A"
 
-#: ../../Zotlabs/Module/Register.php:459
+#: ../../Zotlabs/Module/Register.php:435
 msgid "Registration on this hub is disabled."
 msgstr "El registro está deshabilitado en este sitio."
 
-#: ../../Zotlabs/Module/Register.php:468
+#: ../../Zotlabs/Module/Register.php:444
 msgid "Registration on this hub is by approval only."
 msgstr "El registro en este hub está sometido a aprobación previa."
 
-#: ../../Zotlabs/Module/Register.php:469
+#: ../../Zotlabs/Module/Register.php:445
 msgid "Register at another affiliated hub in case when prefered"
 msgstr "Regístrese en otro hub afiliado en caso de que lo prefiera"
 
-#: ../../Zotlabs/Module/Register.php:482
+#: ../../Zotlabs/Module/Register.php:458
 msgid "Registration on this hub is by invitation only."
 msgstr "La inscripción en este hub es sólo posible por invitación."
 
-#: ../../Zotlabs/Module/Register.php:483
+#: ../../Zotlabs/Module/Register.php:459
 msgid "Register at another affiliated hub"
 msgstr "Regístrese en otro hub afiliado"
 
-#: ../../Zotlabs/Module/Register.php:497 ../../Zotlabs/Module/Siteinfo.php:28
+#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
 msgid "Terms of Service"
 msgstr "Términos del servicio"
 
-#: ../../Zotlabs/Module/Register.php:503
+#: ../../Zotlabs/Module/Register.php:479
 #, php-format
 msgid "I accept the %s for this website"
 msgstr "Acepto los %s de este sitio"
 
-#: ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/Register.php:486
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr "Tengo más de %s años de edad y acepto los %s de este sitio web"
 
-#: ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Register.php:496
 msgid "Your email address"
 msgstr "Su dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Register.php:522 ../../Zotlabs/Module/Oauth.php:117
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Oauth.php:115
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../Zotlabs/Module/Register.php:527
+#: ../../Zotlabs/Module/Register.php:503
 msgid "Choose a password"
 msgstr "Elija una contraseña"
 
-#: ../../Zotlabs/Module/Register.php:528
+#: ../../Zotlabs/Module/Register.php:504
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
-#: ../../Zotlabs/Module/Register.php:530
+#: ../../Zotlabs/Module/Register.php:506
 msgid "Please enter your invitation code"
 msgstr "Por favor, introduzca el código de su invitación"
 
-#: ../../Zotlabs/Module/Register.php:532
+#: ../../Zotlabs/Module/Register.php:508
 msgid "Your name"
 msgstr "Su nombre"
 
-#: ../../Zotlabs/Module/Register.php:532
+#: ../../Zotlabs/Module/Register.php:508
 msgid "Real name is preferred"
 msgstr "Se prefiere el nombre real"
 
-#: ../../Zotlabs/Module/Register.php:534
+#: ../../Zotlabs/Module/Register.php:510
 #: ../../Zotlabs/Module/New_channel.php:177
 msgid "Choose a short nickname"
 msgstr "Elija un alias corto"
 
-#: ../../Zotlabs/Module/Register.php:534
+#: ../../Zotlabs/Module/Register.php:510
 msgid ""
 "Your nickname will be used to create an easy to remember channel address"
 msgstr "Tu alias se utilizará para crear una dirección de canal fácil de recordar"
 
-#: ../../Zotlabs/Module/Register.php:538
+#: ../../Zotlabs/Module/Register.php:514
 msgid "Why do you want to join this hub?"
 msgstr "¿Por qué quiere unirse a este hub?"
 
-#: ../../Zotlabs/Module/Register.php:538
+#: ../../Zotlabs/Module/Register.php:514
 msgid "This will help to review your registration"
 msgstr "Esto ayudará a revisar su registro"
 
-#: ../../Zotlabs/Module/Register.php:544
-#: ../../Zotlabs/Module/Admin/Site.php:413
+#: ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:416
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../Zotlabs/Module/Register.php:552
+#: ../../Zotlabs/Module/Register.php:528
 msgid "I have an invite code"
 msgstr "Tengo un código de invitación"
 
-#: ../../Zotlabs/Module/Register.php:599
+#: ../../Zotlabs/Module/Register.php:575
 msgid ""
 "This site has exceeded the number of allowed daily account registrations."
 msgstr "Este sitio ha superado el número permitido de registros diarios de cuentas."
 
-#: ../../Zotlabs/Module/Search.php:21
+#: ../../Zotlabs/Module/Search.php:23
 #: ../../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
+#: ../../Zotlabs/Module/Display.php:28 ../../Zotlabs/Module/Directory.php:72
+#: ../../Zotlabs/Module/Directory.php:77 ../../Zotlabs/Module/Photos.php:523
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: ../../Zotlabs/Module/Search.php:250
+#: ../../Zotlabs/Module/Search.php:256
 #, php-format
 msgid "Items tagged with: %s"
 msgstr "elementos etiquetados con: %s"
 
-#: ../../Zotlabs/Module/Search.php:252
+#: ../../Zotlabs/Module/Search.php:258
 #, php-format
 msgid "Search results for: %s"
 msgstr "Resultados de la búsqueda para: %s"
 
-#: ../../Zotlabs/Module/Setup.php:169
+#: ../../Zotlabs/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "Servidor $Projectname  - Instalación"
 
-#: ../../Zotlabs/Module/Setup.php:173
+#: ../../Zotlabs/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "No se ha podido conectar a la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:177
+#: ../../Zotlabs/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
 
-#: ../../Zotlabs/Module/Setup.php:184
+#: ../../Zotlabs/Module/Setup.php:194
 msgid "Could not create table."
 msgstr "No se puede crear la tabla."
 
-#: ../../Zotlabs/Module/Setup.php:190
+#: ../../Zotlabs/Module/Setup.php:200
 msgid "Your site database has been installed."
 msgstr "La base de datos del sitio ha sido instalada."
 
-#: ../../Zotlabs/Module/Setup.php:196
+#: ../../Zotlabs/Module/Setup.php:206
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261
-#: ../../Zotlabs/Module/Setup.php:768
+#: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:271
+#: ../../Zotlabs/Module/Setup.php:778
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:258
+#: ../../Zotlabs/Module/Setup.php:268
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../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
+#: ../../Zotlabs/Module/Setup.php:272 ../../Zotlabs/Module/Cdav.php:1035
+#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:962
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:273
 msgid "Check again"
 msgstr "Verificar de nuevo"
 
-#: ../../Zotlabs/Module/Setup.php:284
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Database connection"
 msgstr "Conexión a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:285
+#: ../../Zotlabs/Module/Setup.php:295
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:296
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:297
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Database Server Name"
 msgstr "Nombre del servidor de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Default is 127.0.0.1"
 msgstr "De forma predeterminada es 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Database Port"
 msgstr "Puerto de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Communication port number - use 0 for default"
 msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Zotlabs/Module/Setup.php:303
 msgid "Database Login Name"
 msgstr "Usuario de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:304
 msgid "Database Login Password"
 msgstr "Contraseña de acceso a la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:305
 msgid "Database Name"
 msgstr "Nombre de la base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:306
 msgid "Database Type"
 msgstr "Tipo de base de datos"
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348
 msgid "Site administrator email address"
 msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 msgid "Website URL"
 msgstr "Dirección del sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 msgid "Please use SSL (https) URL if available."
 msgstr "Por favor, use SSL (https) si está disponible."
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:342
+#: ../../Zotlabs/Module/Setup.php:310 ../../Zotlabs/Module/Setup.php:352
 msgid "Please select a default timezone for your website"
 msgstr "Por favor, selecciones el huso horario por defecto de su sitio web"
 
-#: ../../Zotlabs/Module/Setup.php:327
+#: ../../Zotlabs/Module/Setup.php:337
 msgid "Site settings"
 msgstr "Ajustes del sitio"
 
-#: ../../Zotlabs/Module/Setup.php:381
+#: ../../Zotlabs/Module/Setup.php:391
 msgid "PHP version 7.1 or greater is required."
 msgstr "Se requiere la versión 7.1 o superior de PHP."
 
-#: ../../Zotlabs/Module/Setup.php:382
+#: ../../Zotlabs/Module/Setup.php:392
 msgid "PHP version"
 msgstr "Versión de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:398
+#: ../../Zotlabs/Module/Setup.php:408
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
 
-#: ../../Zotlabs/Module/Setup.php:399
+#: ../../Zotlabs/Module/Setup.php:409
 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 "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá realizar envíos en segundo plano mediante cron."
 
-#: ../../Zotlabs/Module/Setup.php:403
+#: ../../Zotlabs/Module/Setup.php:413
 msgid "PHP executable path"
 msgstr "Ruta del ejecutable PHP"
 
-#: ../../Zotlabs/Module/Setup.php:403
+#: ../../Zotlabs/Module/Setup.php:413
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
 
-#: ../../Zotlabs/Module/Setup.php:408
+#: ../../Zotlabs/Module/Setup.php:418
 msgid "Command line PHP"
 msgstr "PHP en línea de comandos"
 
-#: ../../Zotlabs/Module/Setup.php:418
+#: ../../Zotlabs/Module/Setup.php:428
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "No se puede comprobar la línea de comandos PHP, ya que shell_exec() está deshabilitado. Es necesario que esté activado."
 
-#: ../../Zotlabs/Module/Setup.php:422
+#: ../../Zotlabs/Module/Setup.php:432
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:423
+#: ../../Zotlabs/Module/Setup.php:433
 msgid "This is required for message delivery to work."
 msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: ../../Zotlabs/Module/Setup.php:426
+#: ../../Zotlabs/Module/Setup.php:436
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Zotlabs/Module/Setup.php:456
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 4 MB at once."
 msgstr "Esto no es suficiente para subir imágenes o archivos más grandes. Usted debe ser capaz de subir al menos 4 MB a la vez."
 
-#: ../../Zotlabs/Module/Setup.php:448
+#: ../../Zotlabs/Module/Setup.php:458
 #, 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 "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
 
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Setup.php:464
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:456
+#: ../../Zotlabs/Module/Setup.php:466
 msgid "PHP upload limits"
 msgstr "Límites PHP de subida"
 
-#: ../../Zotlabs/Module/Setup.php:479
+#: ../../Zotlabs/Module/Setup.php:489
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Zotlabs/Module/Setup.php:490
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:483
+#: ../../Zotlabs/Module/Setup.php:493
 msgid "Generate encryption keys"
 msgstr "Generar claves de cifrado"
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Zotlabs/Module/Setup.php:510
 msgid "libCurl PHP module"
 msgstr "módulo libCurl PHP"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:511
 msgid "GD graphics PHP module"
 msgstr "módulo PHP GD graphics"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:512
 msgid "OpenSSL PHP module"
 msgstr "módulo PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:513
 msgid "PDO database PHP module"
 msgstr "Módulo PHP de la base de datos PDO "
 
-#: ../../Zotlabs/Module/Setup.php:504
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:516
 msgid "zip PHP module"
 msgstr "Módulo zip PHP"
 
-#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:522
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:520
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
 msgid "exec"
 msgstr "ejecutable"
 
-#: ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Error: se necesita un ejecutable pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525
+#: ../../Zotlabs/Module/Setup.php:532 ../../Zotlabs/Module/Setup.php:535
 msgid "shell_exec"
 msgstr "shell_exec"
 
-#: ../../Zotlabs/Module/Setup.php:522
+#: ../../Zotlabs/Module/Setup.php:532
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: se necesita shell_exec pero o no se instaló o está deshabilitado en php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:530
+#: ../../Zotlabs/Module/Setup.php:540
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../Zotlabs/Module/Setup.php:544
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
 msgstr "Error: Se requiere el módulo GD PHP con soporte para JPEG o la biblioteca de gráficos ImageMagick, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:548
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:544
+#: ../../Zotlabs/Module/Setup.php:554
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr "Error: El módulo PHP de la base de datos PDO carece de un controlador para mysql o pgsql."
 
-#: ../../Zotlabs/Module/Setup.php:549
+#: ../../Zotlabs/Module/Setup.php:559
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Error: se necesita el módulo PHP de la base de datos PDO, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:553
+#: ../../Zotlabs/Module/Setup.php:563
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:567
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:561
+#: ../../Zotlabs/Module/Setup.php:571
 msgid "Error: zip PHP module required but not installed."
 msgstr "Error: se requiere el módulo zip PHP pero no está instalado."
 
-#: ../../Zotlabs/Module/Setup.php:580 ../../Zotlabs/Module/Setup.php:589
+#: ../../Zotlabs/Module/Setup.php:590 ../../Zotlabs/Module/Setup.php:599
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:585
+#: ../../Zotlabs/Module/Setup.php:595
 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 "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:586
+#: ../../Zotlabs/Module/Setup.php:596
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
 
-#: ../../Zotlabs/Module/Setup.php:587
+#: ../../Zotlabs/Module/Setup.php:597
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Por favor, consulte install/INSTALL.txt para más información."
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:613
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Este software hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 compila las plantillas a PHP para acelerar la renderización."
 
-#: ../../Zotlabs/Module/Setup.php:604
+#: ../../Zotlabs/Module/Setup.php:614
 #, 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."
 msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal."
 
-#: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626
+#: ../../Zotlabs/Module/Setup.php:615 ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:616
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene."
 
-#: ../../Zotlabs/Module/Setup.php:609
+#: ../../Zotlabs/Module/Setup.php:619
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:625
+#: ../../Zotlabs/Module/Setup.php:635
 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 "Este software utiliza el directorio de almacenamiento para guardar los ficheros subidos. El servidor web debe tener acceso de escritura a este directorio en la carpeta de nivel superior"
 
-#: ../../Zotlabs/Module/Setup.php:629
+#: ../../Zotlabs/Module/Setup.php:639
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:671
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:672
 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 "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:673
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Se ha incorporado esta restricción para evitar que sus entradas públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:674
 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 "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:675
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:676
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:677
 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. "
@@ -8993,32 +8618,32 @@ msgid ""
 "server communications."
 msgstr "Si se tiene la certeza de que el certificado es válido y está firmado por una autoridad de confianza, comprobar para ver si hubo un error al instalar un certificado intermedio. Estos no son normalmente requeridos por los navegadores, pero son necesarios para las comunicaciones de servidor a servidor."
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Zotlabs/Module/Setup.php:679
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:675
+#: ../../Zotlabs/Module/Setup.php:685
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:678
+#: ../../Zotlabs/Module/Setup.php:688
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:691
+#: ../../Zotlabs/Module/Setup.php:701
 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 "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
 
-#: ../../Zotlabs/Module/Setup.php:766
+#: ../../Zotlabs/Module/Setup.php:776
 msgid "<h1>What next?</h1>"
 msgstr "<h1>¿Qué sigue?</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:767
+#: ../../Zotlabs/Module/Setup.php:777
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -9037,7 +8662,11 @@ msgstr "Visitar el perfil de %s [%s]"
 msgid "View Connections"
 msgstr "Ver conexiones"
 
-#: ../../Zotlabs/Module/Pubsites.php:28
+#: ../../Zotlabs/Module/Pubsites.php:24
+msgid "Public Hubs"
+msgstr "Servidores públicos"
+
+#: ../../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 "
@@ -9046,52 +8675,57 @@ msgid ""
 "additional details."
 msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales."
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Hub URL"
 msgstr "Dirección del hub"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Access Type"
 msgstr "Tipo de acceso"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Registration Policy"
 msgstr "Normas de registro"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Stats"
 msgstr "Estadísticas"
 
-#: ../../Zotlabs/Module/Pubsites.php:34
+#: ../../Zotlabs/Module/Pubsites.php:33
 msgid "Software"
 msgstr "Software"
 
-#: ../../Zotlabs/Module/Pubsites.php:50
+#: ../../Zotlabs/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Valorar"
 
-#: ../../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
+#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:258
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Layouts.php:198
 msgid "View"
 msgstr "Ver"
 
-#: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Hcard.php:37
+#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Hcard.php:37
 #: ../../Zotlabs/Module/Profile.php:62
 msgid "Posts and comments"
 msgstr "Publicaciones y comentarios"
 
-#: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Hcard.php:44
+#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Hcard.php:44
 #: ../../Zotlabs/Module/Profile.php:69
 msgid "Only posts"
 msgstr "Solo publicaciones"
 
-#: ../../Zotlabs/Module/Channel.php:206
+#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181
+#: ../../Zotlabs/Module/Hq.php:41 ../../Zotlabs/Module/Pubstream.php:47
+#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:83
+msgid "Malformed message id."
+msgstr "ID de mensaje malformado."
+
+#: ../../Zotlabs/Module/Channel.php:217
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
 
-#: ../../Zotlabs/Module/Channel.php:483 ../../Zotlabs/Module/Display.php:354
+#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:358
 msgid ""
 "You must enable javascript for your browser to be able to view this content."
 msgstr "Debe habilitar javascript para poder ver este contenido en su navegador."
@@ -9117,72 +8751,60 @@ msgstr "Visible para"
 msgid "All Connections"
 msgstr "Todas las conexiones"
 
-#: ../../Zotlabs/Module/Group.php:46
+#: ../../Zotlabs/Module/Group.php:47
 msgid "Privacy group created."
 msgstr "El grupo de canales ha sido creado."
 
-#: ../../Zotlabs/Module/Group.php:49
+#: ../../Zotlabs/Module/Group.php:50
 msgid "Could not create privacy group."
 msgstr "No se puede crear el grupo de canales"
 
-#: ../../Zotlabs/Module/Group.php:81
+#: ../../Zotlabs/Module/Group.php:82
 msgid "Privacy group updated."
 msgstr "Grupo de canales actualizado."
 
-#: ../../Zotlabs/Module/Group.php:107
-msgid "Privacy Groups App"
-msgstr "App Grupos de canales"
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:301
+msgid "Post to this group by default"
+msgstr "Publicar en este grupo por defecto"
 
-#: ../../Zotlabs/Module/Group.php:108
-msgid "Management of privacy groups"
-msgstr "Gestión de grupos de canales"
+#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302
+msgid "Add new contacts to this group by default"
+msgstr "Añadir nuevos contactos a este grupo por defecto"
 
-#: ../../Zotlabs/Module/Group.php:143
-msgid "Add Group"
-msgstr "Agregar un grupo"
-
-#: ../../Zotlabs/Module/Group.php:147
+#: ../../Zotlabs/Module/Group.php:146
 msgid "Privacy group name"
 msgstr "Nombre del grupo"
 
-#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
 msgid "Members are visible to other channels"
 msgstr "Los miembros son visibles para otros canales"
 
-#: ../../Zotlabs/Module/Group.php:156 ../../Zotlabs/Module/Help.php:84
-msgid "Members"
-msgstr "Miembros"
-
-#: ../../Zotlabs/Module/Group.php:183
+#: ../../Zotlabs/Module/Group.php:175
 msgid "Privacy group removed."
 msgstr "Grupo de canales eliminado."
 
-#: ../../Zotlabs/Module/Group.php:186
+#: ../../Zotlabs/Module/Group.php:178
 msgid "Unable to remove privacy group."
 msgstr "No se puede eliminar el grupo de canales."
 
-#: ../../Zotlabs/Module/Group.php:252
+#: ../../Zotlabs/Module/Group.php:244
 #, php-format
 msgid "Privacy Group: %s"
 msgstr "Grupo privado %s"
 
-#: ../../Zotlabs/Module/Group.php:254
+#: ../../Zotlabs/Module/Group.php:246
 msgid "Privacy group name: "
 msgstr "Nombre del grupo de canales:"
 
-#: ../../Zotlabs/Module/Group.php:259
-msgid "Delete Group"
-msgstr "Eliminar grupo"
-
-#: ../../Zotlabs/Module/Group.php:270
+#: ../../Zotlabs/Module/Group.php:262
 msgid "Group members"
 msgstr "Miembros del grupo"
 
-#: ../../Zotlabs/Module/Group.php:272
+#: ../../Zotlabs/Module/Group.php:264
 msgid "Not in this group"
 msgstr "No en este grupo"
 
-#: ../../Zotlabs/Module/Group.php:304
+#: ../../Zotlabs/Module/Group.php:296
 msgid "Click a channel to toggle membership"
 msgstr "Haga clic en un canal para cambiar los miembros"
 
@@ -9257,72 +8879,63 @@ msgstr "El nombre es obligatorio"
 msgid "Key and Secret are required"
 msgstr "\"Key\" y \"Secret\" son obligatorios"
 
-#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137
-#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389
+#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:135
+#: ../../Zotlabs/Module/Cdav.php:1052 ../../Zotlabs/Module/Cdav.php:1388
 #: ../../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
+#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:142
+#: ../../Zotlabs/Module/Connedit.php:748 ../../Zotlabs/Lib/Apps.php:540
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../../Zotlabs/Module/Oauth.php:100
-msgid "OAuth Apps Manager App"
-msgstr "App Gestión de apps OAuth"
-
-#: ../../Zotlabs/Module/Oauth.php:101
-msgid "OAuth authentication tokens for mobile and remote apps"
-msgstr "Tokens de autenticación de OAuth para aplicaciones móviles y remotas"
-
-#: ../../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
+#: ../../Zotlabs/Module/Oauth.php:108 ../../Zotlabs/Module/Oauth.php:134
+#: ../../Zotlabs/Module/Oauth.php:170 ../../Zotlabs/Module/Oauth2.php:141
+#: ../../Zotlabs/Module/Oauth2.php:191
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth2.php:118
-#: ../../Zotlabs/Module/Oauth2.php:146
+#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth2.php:116
+#: ../../Zotlabs/Module/Oauth2.php:144
 msgid "Name of application"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:113
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20"
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142
-#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth2.php:120
-#: ../../Zotlabs/Module/Oauth2.php:148
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth2.php:118
+#: ../../Zotlabs/Module/Oauth2.php:146
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI de redirección - dejar en blanco a menos que su aplicación específicamente lo requiera"
 
-#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143
+#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
 msgid "Icon url"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Oauth.php:128
+#: ../../Zotlabs/Module/Oauth.php:126
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
-#: ../../Zotlabs/Module/Oauth.php:171
+#: ../../Zotlabs/Module/Oauth.php:169
 msgid "Connected OAuth Apps"
 msgstr "Apps OAuth conectadas"
 
-#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
+#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Oauth2.php:194
 msgid "Client key starts with"
 msgstr "La \"client key\" empieza por"
 
-#: ../../Zotlabs/Module/Oauth.php:176 ../../Zotlabs/Module/Oauth2.php:197
+#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Oauth2.php:195
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../Zotlabs/Module/Oauth.php:177 ../../Zotlabs/Module/Oauth2.php:198
+#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
@@ -9334,407 +8947,375 @@ msgstr "Enlace de la página"
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
-#: ../../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 "Este sitio no es un servidor de directorio"
 
-#: ../../Zotlabs/Module/Dirsearch.php:37
+#: ../../Zotlabs/Module/Dirsearch.php:33
 msgid "This directory server requires an access token"
 msgstr "El servidor de este directorio necesita un \"token\" de acceso"
 
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "Welcome to Hubzilla!"
-msgstr "¡Bienvenido a Hubzilla!"
-
-#: ../../Zotlabs/Module/Hq.php:131
-msgid "You have got no unseen posts..."
-msgstr "No tiene ningún mensaje sin leer..."
-
-#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:471
+#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:466
 msgid "Unable to locate original post."
 msgstr "No ha sido posible encontrar la entrada original."
 
-#: ../../Zotlabs/Module/Chat.php:100
-msgid "Chatrooms App"
-msgstr "App Salas de chat"
-
-#: ../../Zotlabs/Module/Chat.php:101
-msgid "Access Controlled Chatrooms"
-msgstr "Salas de chat moderadas"
-
-#: ../../Zotlabs/Module/Chat.php:194
+#: ../../Zotlabs/Module/Chat.php:192
 msgid "Room not found"
 msgstr "Sala no encontrada"
 
-#: ../../Zotlabs/Module/Chat.php:210
+#: ../../Zotlabs/Module/Chat.php:208
 msgid "Leave Room"
 msgstr "Abandonar la sala"
 
-#: ../../Zotlabs/Module/Chat.php:211
+#: ../../Zotlabs/Module/Chat.php:209
 msgid "Delete Room"
 msgstr "Eliminar esta sala"
 
-#: ../../Zotlabs/Module/Chat.php:212
+#: ../../Zotlabs/Module/Chat.php:210
 msgid "I am away right now"
 msgstr "Estoy ausente momentáneamente"
 
-#: ../../Zotlabs/Module/Chat.php:213
+#: ../../Zotlabs/Module/Chat.php:211
 msgid "I am online"
 msgstr "Estoy conectado/a"
 
-#: ../../Zotlabs/Module/Chat.php:215
+#: ../../Zotlabs/Module/Chat.php:213
 msgid "Bookmark this room"
 msgstr "Añadir esta sala a Marcadores"
 
-#: ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Chat.php:236
 msgid "New Chatroom"
 msgstr "Nueva sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:239
+#: ../../Zotlabs/Module/Chat.php:237
 msgid "Chatroom name"
 msgstr "Nombre de la sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:240
+#: ../../Zotlabs/Module/Chat.php:238
 msgid "Expiration of chats (minutes)"
 msgstr "Caducidad de los mensajes en los chats (en minutos)"
 
-#: ../../Zotlabs/Module/Chat.php:256
+#: ../../Zotlabs/Module/Chat.php:254
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Salas de chat de %1$s"
 
-#: ../../Zotlabs/Module/Chat.php:261
+#: ../../Zotlabs/Module/Chat.php:259
 msgid "No chatrooms available"
 msgstr "No hay salas de chat disponibles"
 
-#: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:145
-#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213
-msgid "Create New"
-msgstr "Crear"
+#: ../../Zotlabs/Module/Chat.php:260
+msgid "Add Room"
+msgstr "Añadir una sala de chat"
 
-#: ../../Zotlabs/Module/Chat.php:265
+#: ../../Zotlabs/Module/Chat.php:263
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: ../../Zotlabs/Module/Chat.php:266
+#: ../../Zotlabs/Module/Chat.php:264
 msgid "min"
 msgstr "min"
 
 #: ../../Zotlabs/Module/Channel_calendar.php:62
-#: ../../Zotlabs/Module/Events.php:113
 msgid "Event can not end before it has started."
 msgstr "Un evento no puede terminar antes de que haya comenzado."
 
 #: ../../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 "No se puede crear la vista previa."
 
 #: ../../Zotlabs/Module/Channel_calendar.php:70
-#: ../../Zotlabs/Module/Events.php:122
 msgid "Event title and start time are required."
 msgstr "Se requieren el título del evento y su hora de inicio."
 
 #: ../../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 "Evento no encontrado."
 
 #: ../../Zotlabs/Module/Channel_calendar.php:370
-#: ../../Zotlabs/Module/Events.php:641
 msgid "Edit event"
 msgstr "Editar evento"
 
 #: ../../Zotlabs/Module/Channel_calendar.php:372
-#: ../../Zotlabs/Module/Events.php:643
 msgid "Delete event"
 msgstr "Borrar evento"
 
 #: ../../Zotlabs/Module/Channel_calendar.php:392
-#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165
+#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cal.php:165
 msgid "Link to source"
 msgstr "Enlace a la fuente"
 
 #: ../../Zotlabs/Module/Channel_calendar.php:406
-#: ../../Zotlabs/Module/Events.php:677
 msgid "calendar"
 msgstr "calendario"
 
 #: ../../Zotlabs/Module/Channel_calendar.php:493
-#: ../../Zotlabs/Module/Events.php:742
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
-#: ../../Zotlabs/Module/Like.php:106
+#: ../../Zotlabs/Module/Like.php:112
 msgid "Like/Dislike"
 msgstr "Me gusta/No me gusta"
 
-#: ../../Zotlabs/Module/Like.php:112
+#: ../../Zotlabs/Module/Like.php:118
 msgid "This action is restricted to members."
 msgstr "Esta acción está restringida solo para miembros."
 
-#: ../../Zotlabs/Module/Like.php:113
+#: ../../Zotlabs/Module/Like.php:119
 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 "Por favor, <a href=\"rmagic\">identifíquese con su $Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo $Projectname member</a> para continuar."
 
-#: ../../Zotlabs/Module/Like.php:166 ../../Zotlabs/Module/Like.php:192
-#: ../../Zotlabs/Module/Like.php:230
+#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198
+#: ../../Zotlabs/Module/Like.php:236
 msgid "Invalid request."
 msgstr "Solicitud incorrecta."
 
-#: ../../Zotlabs/Module/Like.php:207
+#: ../../Zotlabs/Module/Like.php:213
 msgid "thing"
 msgstr "elemento"
 
-#: ../../Zotlabs/Module/Like.php:253
+#: ../../Zotlabs/Module/Like.php:259
 msgid "Channel unavailable."
 msgstr "Canal no disponible."
 
-#: ../../Zotlabs/Module/Like.php:289
+#: ../../Zotlabs/Module/Like.php:295
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../Zotlabs/Module/Like.php:475
+#: ../../Zotlabs/Module/Like.php:481
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:477
+#: ../../Zotlabs/Module/Like.php:483
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:479
+#: ../../Zotlabs/Module/Like.php:485
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../Zotlabs/Module/Like.php:586
+#: ../../Zotlabs/Module/Like.php:592
 msgid "Action completed."
 msgstr "Acción completada."
 
-#: ../../Zotlabs/Module/Like.php:587
+#: ../../Zotlabs/Module/Like.php:593
 msgid "Thank you."
 msgstr "Gracias."
 
-#: ../../Zotlabs/Module/Poke.php:165
-msgid "Poke App"
-msgstr "App Toques"
-
-#: ../../Zotlabs/Module/Poke.php:166
-msgid "Poke somebody in your addressbook"
-msgstr "Dar un toque a alguien en su libreta de direcciones"
-
-#: ../../Zotlabs/Module/Poke.php:200
+#: ../../Zotlabs/Module/Poke.php:198
 msgid "Poke somebody"
 msgstr "Dar un toque a alguien"
 
-#: ../../Zotlabs/Module/Poke.php:203
+#: ../../Zotlabs/Module/Poke.php:201
 msgid "Poke/Prod"
 msgstr "Toque/Incitación"
 
-#: ../../Zotlabs/Module/Poke.php:204
+#: ../../Zotlabs/Module/Poke.php:202
 msgid "Poke, prod or do other things to somebody"
 msgstr "Dar un toque, incitar o hacer otras cosas a alguien"
 
-#: ../../Zotlabs/Module/Poke.php:211
+#: ../../Zotlabs/Module/Poke.php:209
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:212
+#: ../../Zotlabs/Module/Poke.php:210
 msgid "Choose what you wish to do to recipient"
 msgstr "Elegir qué desea enviar al destinatario"
 
-#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216
+#: ../../Zotlabs/Module/Poke.php:213 ../../Zotlabs/Module/Poke.php:214
 msgid "Make this post private"
 msgstr "Convertir en privado este envío"
 
-#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28
+#: ../../Zotlabs/Module/Cdav.php:819
 msgid "Calendar entries imported."
 msgstr "Entradas de calendario importadas."
 
-#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30
+#: ../../Zotlabs/Module/Cdav.php:821
 msgid "No calendar entries found."
 msgstr "No se han encontrado entradas de calendario."
 
-#: ../../Zotlabs/Module/Cdav.php:877
-msgid "CardDAV App"
-msgstr "App CarDav"
-
-#: ../../Zotlabs/Module/Cdav.php:878
-msgid "CalDAV capable addressbook"
-msgstr "Libreta de direcciones compatible con CalDav"
-
-#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Cdav.php:1008
 msgid "Event title"
 msgstr "Título del evento"
 
-#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474
+#: ../../Zotlabs/Module/Cdav.php:1009
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../Zotlabs/Module/Cdav.php:1012
+#: ../../Zotlabs/Module/Cdav.php:1010
 msgid "End date and time"
 msgstr "Fecha y hora de finalización"
 
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497
+#: ../../Zotlabs/Module/Cdav.php:1011
 msgid "Timezone:"
 msgstr "Zona horaria: "
 
-#: ../../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
+#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Cal.php:203
+#: ../../Zotlabs/Module/Photos.php:953
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708
-#: ../../Zotlabs/Module/Cal.php:205
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cal.php:205
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703
+#: ../../Zotlabs/Module/Cdav.php:1037
 msgid "Month"
 msgstr "Mes"
 
-#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704
+#: ../../Zotlabs/Module/Cdav.php:1038
 msgid "Week"
 msgstr "Semana"
 
-#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705
+#: ../../Zotlabs/Module/Cdav.php:1039
 msgid "Day"
 msgstr "Día"
 
-#: ../../Zotlabs/Module/Cdav.php:1042
+#: ../../Zotlabs/Module/Cdav.php:1040
 msgid "List month"
 msgstr "Lista mensual"
 
-#: ../../Zotlabs/Module/Cdav.php:1043
+#: ../../Zotlabs/Module/Cdav.php:1041
 msgid "List week"
 msgstr "Lista semanal"
 
-#: ../../Zotlabs/Module/Cdav.php:1044
+#: ../../Zotlabs/Module/Cdav.php:1042
 msgid "List day"
 msgstr "Lista diaria"
 
-#: ../../Zotlabs/Module/Cdav.php:1052
+#: ../../Zotlabs/Module/Cdav.php:1050
 msgid "More"
 msgstr "Más"
 
-#: ../../Zotlabs/Module/Cdav.php:1053
+#: ../../Zotlabs/Module/Cdav.php:1051
 msgid "Less"
 msgstr "Menos"
 
-#: ../../Zotlabs/Module/Cdav.php:1055
+#: ../../Zotlabs/Module/Cdav.php:1053
 msgid "Select calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../../Zotlabs/Module/Cdav.php:1058
+#: ../../Zotlabs/Module/Cdav.php:1056
 msgid "Delete all"
 msgstr "Eliminar todos"
 
-#: ../../Zotlabs/Module/Cdav.php:1061
+#: ../../Zotlabs/Module/Cdav.php:1059
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado."
 
-#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Cdav.php:1060
+msgid ""
+"Could not fetch calendar resource. The selected calendar might be disabled."
+msgstr "No se ha podido obtener el recurso del calendario. Es posible que el calendario seleccionado esté desactivado."
+
+#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733
 msgid "Organisation"
 msgstr "Organización"
 
-#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788
-#: ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:735
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Connedit.php:737
 msgid "Instant messenger"
 msgstr "Mensajería instantánea"
 
-#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791
-#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Connedit.php:738
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../../Zotlabs/Module/Cdav.php:1380
+#: ../../Zotlabs/Module/Cdav.php:1379
 #: ../../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
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Locs.php:122
 msgid "Address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Connedit.php:740
 msgid "Note"
 msgstr "Nota"
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Connedit.php:745
 msgid "Add Contact"
 msgstr "Añadir un contacto"
 
-#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799
-#: ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Connedit.php:746
 msgid "Add Field"
 msgstr "Añadir un campo"
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751
 msgid "P.O. Box"
 msgstr "Buzón de correos"
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752
 msgid "Additional"
 msgstr "Adicional"
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753
 msgid "Street"
 msgstr "Calle"
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755
 msgid "Region"
 msgstr "Provincia, región o estado"
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940
+#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756
 msgid "ZIP Code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759
-#: ../../Zotlabs/Module/Connedit.php:941
+#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid "Country"
 msgstr "País"
 
-#: ../../Zotlabs/Module/Cdav.php:1457
+#: ../../Zotlabs/Module/Cdav.php:1456
 msgid "Default Calendar"
 msgstr "Calendario por defecto"
 
-#: ../../Zotlabs/Module/Cdav.php:1468
+#: ../../Zotlabs/Module/Cdav.php:1467
 msgid "Default Addressbook"
 msgstr "Agenda de direcciones por defecto"
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
-msgstr "La información privada remota no está disponible."
+#: ../../Zotlabs/Module/Lockview.php:100
+msgid "Remote privacy information not available"
+msgstr "La información sobre privacidad remota no está disponible"
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
-msgstr "Visible para:"
-
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
+#: ../../Zotlabs/Module/Lockview.php:143 ../../Zotlabs/Module/Lockview.php:184
 #: ../../Zotlabs/Module/Acl.php:123
 msgctxt "acl"
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../Zotlabs/Module/Item.php:757
+#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193
+msgid "Privacy group"
+msgstr "Grupo de canales"
+
+#: ../../Zotlabs/Module/Lockview.php:214
+#, php-format
+msgid "Click to copy link to this ressource for guest %s to clipboard"
+msgstr "Haga clic para copiar el enlace a este recurso para invitados %sen el portapapeles"
+
+#: ../../Zotlabs/Module/Lockview.php:214
+msgid "Link copied"
+msgstr "Enlace copiado"
+
+#: ../../Zotlabs/Module/Lockview.php:221
+msgid "Access"
+msgstr "Acceso"
+
+#: ../../Zotlabs/Module/Item.php:749
 msgid "Empty post discarded."
 msgstr "La entrada vacía ha sido desechada."
 
@@ -9742,24 +9323,24 @@ msgstr "La entrada vacía ha sido desechada."
 msgid "Duplicate post suppressed."
 msgstr "Se ha suprimido la entrada duplicada."
 
-#: ../../Zotlabs/Module/Item.php:1334
+#: ../../Zotlabs/Module/Item.php:1332
 msgid "System error. Post not saved."
 msgstr "Error del sistema. La entrada no se ha podido salvar."
 
-#: ../../Zotlabs/Module/Item.php:1368
+#: ../../Zotlabs/Module/Item.php:1366
 msgid "Your comment is awaiting approval."
 msgstr "Su comentario está pendiente de aprobación."
 
-#: ../../Zotlabs/Module/Item.php:1498
+#: ../../Zotlabs/Module/Item.php:1499
 msgid "Unable to obtain post information from database."
 msgstr "No ha sido posible obtener información de la entrada en la base de datos."
 
-#: ../../Zotlabs/Module/Item.php:1505
+#: ../../Zotlabs/Module/Item.php:1506
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
 
-#: ../../Zotlabs/Module/Item.php:1512
+#: ../../Zotlabs/Module/Item.php:1513
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr "Ha alcanzado su límite de %1$.0f páginas web."
@@ -9790,7 +9371,6 @@ msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
 #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-#: ../../Zotlabs/Module/Settings/Channel.php:528
 msgid "(click to open/close)"
 msgstr "(pulsar para abrir o cerrar)"
 
@@ -9919,6 +9499,10 @@ msgstr "Eliminar este fichero"
 msgid "Documentation Search"
 msgstr "Búsqueda de Documentación"
 
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Members"
+msgstr "Miembros"
+
 #: ../../Zotlabs/Module/Help.php:85
 msgid "Administrators"
 msgstr "Administradores"
@@ -9939,69 +9523,61 @@ msgstr "Documentación de $Projectname"
 msgid "Contents"
 msgstr "Contenidos"
 
-#: ../../Zotlabs/Module/Webpages.php:48
-msgid "Webpages App"
-msgstr "App de Páginas web"
-
-#: ../../Zotlabs/Module/Webpages.php:49
-msgid "Provide managed web pages on your channel"
-msgstr "Proveer páginas web gestionadas en su canal"
-
-#: ../../Zotlabs/Module/Webpages.php:69
+#: ../../Zotlabs/Module/Webpages.php:67
 msgid "Import Webpage Elements"
 msgstr "Importar elementos de una página web"
 
-#: ../../Zotlabs/Module/Webpages.php:70
+#: ../../Zotlabs/Module/Webpages.php:68
 msgid "Import selected"
 msgstr "Importar elementos seleccionados"
 
-#: ../../Zotlabs/Module/Webpages.php:93
+#: ../../Zotlabs/Module/Webpages.php:91
 msgid "Export Webpage Elements"
 msgstr "Exportar elementos de una página web"
 
-#: ../../Zotlabs/Module/Webpages.php:94
+#: ../../Zotlabs/Module/Webpages.php:92
 msgid "Export selected"
 msgstr "Exportar los elementos seleccionados"
 
-#: ../../Zotlabs/Module/Webpages.php:263
+#: ../../Zotlabs/Module/Webpages.php:260
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../../Zotlabs/Module/Webpages.php:264
+#: ../../Zotlabs/Module/Webpages.php:261
 msgid "Page Link"
 msgstr "Vínculo de la página"
 
-#: ../../Zotlabs/Module/Webpages.php:265
+#: ../../Zotlabs/Module/Webpages.php:262
 msgid "Page Title"
 msgstr "Título de página"
 
-#: ../../Zotlabs/Module/Webpages.php:266 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Webpages.php:263 ../../Zotlabs/Module/Blocks.php:157
 #: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:191
 msgid "Created"
 msgstr "Creado"
 
-#: ../../Zotlabs/Module/Webpages.php:267 ../../Zotlabs/Module/Blocks.php:158
+#: ../../Zotlabs/Module/Webpages.php:264 ../../Zotlabs/Module/Blocks.php:158
 #: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:192
 msgid "Edited"
 msgstr "Editado"
 
-#: ../../Zotlabs/Module/Webpages.php:295
+#: ../../Zotlabs/Module/Webpages.php:292
 msgid "Invalid file type."
 msgstr "Tipo de fichero no válido."
 
-#: ../../Zotlabs/Module/Webpages.php:307
+#: ../../Zotlabs/Module/Webpages.php:304
 msgid "Error opening zip file"
 msgstr "Error al abrir el fichero comprimido zip"
 
-#: ../../Zotlabs/Module/Webpages.php:318
+#: ../../Zotlabs/Module/Webpages.php:315
 msgid "Invalid folder path."
 msgstr "La ruta de la carpeta no es válida."
 
-#: ../../Zotlabs/Module/Webpages.php:345
+#: ../../Zotlabs/Module/Webpages.php:342
 msgid "No webpage elements detected."
 msgstr "No se han detectado elementos de ninguna página web."
 
-#: ../../Zotlabs/Module/Webpages.php:420
+#: ../../Zotlabs/Module/Webpages.php:417
 msgid "Import complete."
 msgstr "Importación completada."
 
@@ -10112,11 +9688,6 @@ msgstr "No encontrado"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186
-#, php-format
-msgid "&#x1f501; Repeated %1$s's %2$s"
-msgstr "&#x1f501; Repetidos %2$sde %1$s"
-
 #: ../../Zotlabs/Module/Share.php:120
 msgid "Post repeated"
 msgstr "Entrada repetida"
@@ -10129,7 +9700,7 @@ msgstr "red"
 msgid "Item is not editable"
 msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:150
+#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:218
 msgid "Edit post"
 msgstr "Editar la entrada"
 
@@ -10160,31 +9731,35 @@ msgstr "¿Autoriza a la aplicación %s a acceder a los datos de su canal?"
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
+#: ../../Zotlabs/Module/Admin/Queue.php:46
 msgid "Queue Statistics"
 msgstr "Estadísticas de la cola"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
+#: ../../Zotlabs/Module/Admin/Queue.php:47
 msgid "Total Entries"
 msgstr "Total de entradas"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
+#: ../../Zotlabs/Module/Admin/Queue.php:48
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
+#: ../../Zotlabs/Module/Admin/Queue.php:49
 msgid "Destination URL"
 msgstr "Dirección de destino"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
+#: ../../Zotlabs/Module/Admin/Queue.php:50
 msgid "Mark hub permanently offline"
 msgstr "Marcar el servidor como permanentemente fuera de línea"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
+#: ../../Zotlabs/Module/Admin/Queue.php:51
+msgid "Retry delivery to this hub"
+msgstr "Reintentar la entrega a este hub"
+
+#: ../../Zotlabs/Module/Admin/Queue.php:52
 msgid "Empty queue for this hub"
 msgstr "Vaciar la cola para este servidor"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
+#: ../../Zotlabs/Module/Admin/Queue.php:53
 msgid "Last known contact"
 msgstr "Último contacto conocido"
 
@@ -10214,12 +9789,12 @@ msgstr "Instantánea de pantalla"
 #: ../../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/Site.php:411
 #: ../../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
+#: ../../Zotlabs/Module/Admin.php:140
 msgid "Administration"
 msgstr "Administración"
 
@@ -10469,12 +10044,14 @@ msgid "No verified registrations available"
 msgstr "No hay registros verificados disponibles"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:321
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:508
 msgid "Block"
 msgstr "Bloquear"
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:322
-#: ../../Zotlabs/Module/Connedit.php:629
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:508
 msgid "Unblock"
 msgstr "Desbloquear"
 
@@ -10536,7 +10113,7 @@ msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
 #: ../../Zotlabs/Module/Admin/Site.php:262
-#: ../../Zotlabs/Module/Settings/Display.php:118
+#: ../../Zotlabs/Module/Settings/Display.php:116
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr "%s - (Incompatible)"
@@ -10573,502 +10150,504 @@ msgstr "Mi sitio es un servicio gratuito"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:349
 msgid "Default permission role for new accounts"
 msgstr "Permisos de rol por defecto para las nuevas cuentas"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
+#: ../../Zotlabs/Module/Admin/Site.php:349
 msgid ""
 "This role will be used for the first channel created after registration."
 msgstr "Este rol se utilizará para el primer canal creado después del registro."
 
-#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398
+#: ../../Zotlabs/Module/Admin/Site.php:356 ../../Zotlabs/Module/Invite.php:397
 msgid "Minute(s)"
 msgstr "Minuto(s)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399
+#: ../../Zotlabs/Module/Admin/Site.php:357 ../../Zotlabs/Module/Invite.php:398
 msgid "Hour(s)"
 msgstr "Hora(s)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400
+#: ../../Zotlabs/Module/Admin/Site.php:358 ../../Zotlabs/Module/Invite.php:399
 msgid "Day(s)"
 msgstr "Día(s)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
+#: ../../Zotlabs/Module/Admin/Site.php:359
 msgid "Week(s)"
 msgstr "Semana(s)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:357
+#: ../../Zotlabs/Module/Admin/Site.php:360
 msgid "Month(s)"
 msgstr "Mes(Meses)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
+#: ../../Zotlabs/Module/Admin/Site.php:361
 msgid "Year(s)"
 msgstr "Año(s)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
+#: ../../Zotlabs/Module/Admin/Site.php:369
 msgid "Register verification delay"
 msgstr "Retraso en la verificación del registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
+#: ../../Zotlabs/Module/Admin/Site.php:372
 msgid "Time to wait before a registration can be verified"
 msgstr "Tiempo de espera para verificar un registro "
 
-#: ../../Zotlabs/Module/Admin/Site.php:372
-#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409
+#: ../../Zotlabs/Module/Admin/Site.php:375
+#: ../../Zotlabs/Module/Admin/Site.php:397 ../../Zotlabs/Module/Invite.php:408
 msgid "duration up from now"
 msgstr "duración a partir de ahora "
 
-#: ../../Zotlabs/Module/Admin/Site.php:388
+#: ../../Zotlabs/Module/Admin/Site.php:391
 msgid "Register verification expiration time"
 msgstr "Tiempo de caducidad de la verificación del registro "
 
-#: ../../Zotlabs/Module/Admin/Site.php:391
+#: ../../Zotlabs/Module/Admin/Site.php:394
 msgid "Time before an unverified registration will expire"
 msgstr "Tiempo antes de que caduque un registro no verificado "
 
-#: ../../Zotlabs/Module/Admin/Site.php:414
+#: ../../Zotlabs/Module/Admin/Site.php:417
 msgid "File upload"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Module/Admin/Site.php:415
+#: ../../Zotlabs/Module/Admin/Site.php:418
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
+#: ../../Zotlabs/Module/Admin/Site.php:425
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
+#: ../../Zotlabs/Module/Admin/Site.php:425
 msgid "Unfiltered HTML/CSS/JS is allowed"
 msgstr "Se permite HTML/CSS/JS sin filtrar"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
+#: ../../Zotlabs/Module/Admin/Site.php:426
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
+#: ../../Zotlabs/Module/Admin/Site.php:426
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:424
+#: ../../Zotlabs/Module/Admin/Site.php:427
 #: ../../Zotlabs/Module/Siteinfo.php:24
 msgid "Site Information"
 msgstr "Información sobre el sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:424
+#: ../../Zotlabs/Module/Admin/Site.php:427
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../Zotlabs/Module/Admin/Site.php:425
+#: ../../Zotlabs/Module/Admin/Site.php:428
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
+#: ../../Zotlabs/Module/Admin/Site.php:429
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
+#: ../../Zotlabs/Module/Admin/Site.php:429
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
+#: ../../Zotlabs/Module/Admin/Site.php:432
 msgid "Allow Feeds as Connections"
 msgstr "Permitir contenidos RSS como conexiones"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
+#: ../../Zotlabs/Module/Admin/Site.php:432
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso de los recursos del sistema)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
+#: ../../Zotlabs/Module/Admin/Site.php:433
 msgid "Maximum image size"
 msgstr "Tamaño máximo de la imagen"
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
+#: ../../Zotlabs/Module/Admin/Site.php:433
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites."
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
+#: ../../Zotlabs/Module/Admin/Site.php:434
 msgid "Minimum age"
 msgstr "Edad mínima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
+#: ../../Zotlabs/Module/Admin/Site.php:434
 msgid "Minimum age (in years) for who may register on this site."
 msgstr "Edad mínima (en años) para poder registrarse en este sitio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
+#: ../../Zotlabs/Module/Admin/Site.php:435
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
+#: ../../Zotlabs/Module/Admin/Site.php:435
 msgid "This is displayed on the public server site list."
 msgstr "Esto se muestra en la lista de sitios de servidores públicos."
 
-#: ../../Zotlabs/Module/Admin/Site.php:438
+#: ../../Zotlabs/Module/Admin/Site.php:441
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:440
+#: ../../Zotlabs/Module/Admin/Site.php:443
 msgid "This text will be displayed prominently at the registration page"
 msgstr "Este texto se mostrará de forma destacada en la página de registro "
 
-#: ../../Zotlabs/Module/Admin/Site.php:444
+#: ../../Zotlabs/Module/Admin/Site.php:447
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:451
+#: ../../Zotlabs/Module/Admin/Site.php:454
 msgid "Configure the registration open days/hours"
 msgstr "Configurar los días/horas de apertura del registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:453
+#: ../../Zotlabs/Module/Admin/Site.php:456
 msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
 msgstr "El valor vacío o \"-:-\" mantendrá el registro abierto 24/7 (por defecto)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:454
+#: ../../Zotlabs/Module/Admin/Site.php:457
 msgid ""
 "Weekdays and hours must be separated by colon ':', From-To ranges with a "
 "dash `-` example: 1:800-1200"
 msgstr "Los días de la semana y las horas deben separarse con dos puntos ':', los rangos Desde-Hasta con un guión `-` ejemplo: 1:800-1200"
 
-#: ../../Zotlabs/Module/Admin/Site.php:455
+#: ../../Zotlabs/Module/Admin/Site.php:458
 msgid ""
 "Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
 "2:900-1700"
 msgstr "Los pares día de la semana:hora deben estar separados por un espacio ' ' ejemplo: 1:900-1700 2:900-1700"
 
-#: ../../Zotlabs/Module/Admin/Site.php:456
+#: ../../Zotlabs/Module/Admin/Site.php:459
 msgid ""
 "From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 "
 "or 1-2,4-5:900-1700"
 msgstr "Los rangos desde-hasta deben estar separados por comas ',' ejemplo: 1:800-1200,1300-1700 o 1-2,4-5:900-1700"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
+#: ../../Zotlabs/Module/Admin/Site.php:460
 msgid "Advanced examples:"
 msgstr "Ejemplos avanzados: "
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-#: ../../Zotlabs/Module/Settings/Channel.php:420
+#: ../../Zotlabs/Module/Admin/Site.php:460
+#: ../../Zotlabs/Module/Settings/Channel.php:182
 msgid "or"
 msgstr "o"
 
-#: ../../Zotlabs/Module/Admin/Site.php:458
+#: ../../Zotlabs/Module/Admin/Site.php:461
 msgid "Check your configuration"
 msgstr "Compruebe su configuración"
 
-#: ../../Zotlabs/Module/Admin/Site.php:462
+#: ../../Zotlabs/Module/Admin/Site.php:465
 msgid "Max account registrations per day"
 msgstr "Máximo de registros de cuentas por día "
 
-#: ../../Zotlabs/Module/Admin/Site.php:464
+#: ../../Zotlabs/Module/Admin/Site.php:467
 msgid "Unlimited if zero or no value - default 50"
 msgstr "Ilimitado si es cero o sin valor - por defecto 50"
 
-#: ../../Zotlabs/Module/Admin/Site.php:468
+#: ../../Zotlabs/Module/Admin/Site.php:471
 msgid "Max account registrations from same IP"
 msgstr "Máximo de registros de cuentas desde la misma IP"
 
-#: ../../Zotlabs/Module/Admin/Site.php:470
+#: ../../Zotlabs/Module/Admin/Site.php:473
 msgid "Unlimited if zero or no value - default 3"
 msgstr "Ilimitado si es cero o sin valor - por defecto 3"
 
-#: ../../Zotlabs/Module/Admin/Site.php:476
+#: ../../Zotlabs/Module/Admin/Site.php:479
 msgid "Auto channel create"
 msgstr "Creación automática de canales"
 
-#: ../../Zotlabs/Module/Admin/Site.php:478
+#: ../../Zotlabs/Module/Admin/Site.php:481
 msgid ""
 "If disabled the channel will be created in a separate step during the "
 "registration process"
 msgstr "Si se desactiva, el canal se creará en un paso separado durante el proceso de registro"
 
-#: ../../Zotlabs/Module/Admin/Site.php:482
+#: ../../Zotlabs/Module/Admin/Site.php:485
 msgid "Require invite code"
 msgstr "Solicitar código de invitación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:487
+#: ../../Zotlabs/Module/Admin/Site.php:490
 msgid "Allow invite code"
 msgstr "Permitir código de invitación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:492
+#: ../../Zotlabs/Module/Admin/Site.php:495
 msgid "Require email address"
 msgstr "Solicitar dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Admin/Site.php:494
+#: ../../Zotlabs/Module/Admin/Site.php:497
 msgid "The provided email address will be verified (recommended)"
 msgstr "La dirección de correo electrónico proporcionada será verificada (recomendado)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:498
+#: ../../Zotlabs/Module/Admin/Site.php:501
 msgid "Abandon account after x days"
 msgstr "Abandonar la cuenta después de x días"
 
-#: ../../Zotlabs/Module/Admin/Site.php:500
+#: ../../Zotlabs/Module/Admin/Site.php:503
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
+#: ../../Zotlabs/Module/Admin/Site.php:508
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
+#: ../../Zotlabs/Module/Admin/Site.php:508
 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 "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo."
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
+#: ../../Zotlabs/Module/Admin/Site.php:509
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
+#: ../../Zotlabs/Module/Admin/Site.php:509
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
+#: ../../Zotlabs/Module/Admin/Site.php:510
 msgid "Allowed friend domains"
 msgstr "Dominios amigos permitidos"
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
+#: ../../Zotlabs/Module/Admin/Site.php:510
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
+#: ../../Zotlabs/Module/Admin/Site.php:511
 msgid "Force publish"
 msgstr "Forzar la publicación"
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
+#: ../../Zotlabs/Module/Admin/Site.php:511
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio."
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
+#: ../../Zotlabs/Module/Admin/Site.php:512
 msgid "Import Public Streams"
 msgstr "Importar contenido público"
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
+#: ../../Zotlabs/Module/Admin/Site.php:512
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas."
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
+#: ../../Zotlabs/Module/Admin/Site.php:513
 msgid "Site only Public Streams"
 msgstr "Solo contenido público en este sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
+#: ../../Zotlabs/Module/Admin/Site.php:513
 msgid ""
 "Allow access to public content originating only from this site if Imported "
 "Public Streams are disabled."
 msgstr "Permitir el acceso al contenido público originado sólo desde este sitio si los \"streams\" públicos Importados están deshabilitados."
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
+#: ../../Zotlabs/Module/Admin/Site.php:514
 msgid "Allow anybody on the internet to access the Public streams"
 msgstr "Permitir que cualquiera en Internet pueda acceder a los \"streams\" públicos"
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
+#: ../../Zotlabs/Module/Admin/Site.php:514
 msgid ""
 "Disable to require authentication before viewing. Warning: this content is "
 "unmoderated."
 msgstr "Desactivar para requerir autenticación antes de la visualización. Advertencia: este contenido no está moderado."
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
+#: ../../Zotlabs/Module/Admin/Site.php:515
 msgid "Only import Public stream posts with this text"
 msgstr "Importar solo entradas del stream púlbico con este texto "
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-#: ../../Zotlabs/Module/Admin/Site.php:513
-#: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Admin/Site.php:515
+#: ../../Zotlabs/Module/Admin/Site.php:516
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
 
-#: ../../Zotlabs/Module/Admin/Site.php:513
+#: ../../Zotlabs/Module/Admin/Site.php:516
 msgid "Do not import Public stream posts with this text"
 msgstr "No importar entradas del stream público con este texto "
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
+#: ../../Zotlabs/Module/Admin/Site.php:519
 msgid "Login on Homepage"
 msgstr "Iniciar sesión en la página personal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
+#: ../../Zotlabs/Module/Admin/Site.php:519
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido."
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
+#: ../../Zotlabs/Module/Admin/Site.php:520
 msgid "Enable context help"
 msgstr "Habilitar la ayuda contextual"
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
+#: ../../Zotlabs/Module/Admin/Site.php:520
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
 msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda."
 
-#: ../../Zotlabs/Module/Admin/Site.php:519
+#: ../../Zotlabs/Module/Admin/Site.php:522
 msgid "Reply-to email address for system generated email."
 msgstr "Dirección de respuesta para el correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:523
 msgid "Sender (From) email address for system generated email."
 msgstr "Dirección del remitente (From) para el correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:521
+#: ../../Zotlabs/Module/Admin/Site.php:524
 msgid "Name of email sender for system generated email."
 msgstr "Nombre del remitente del correo electrónico generado por el sistema."
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
+#: ../../Zotlabs/Module/Admin/Site.php:526
 msgid "Directory Server URL"
 msgstr "URL del servidor de directorio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
+#: ../../Zotlabs/Module/Admin/Site.php:526
 msgid "Default directory server"
 msgstr "Servidor de directorio predeterminado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
+#: ../../Zotlabs/Module/Admin/Site.php:528
 msgid "Enable SSE Notifications"
 msgstr "Habilitar notificaciones SSE"
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
+#: ../../Zotlabs/Module/Admin/Site.php:528
 msgid ""
 "If disabled, traditional polling will be used. Warning: this setting might "
 "not be suited for shared hosting"
 msgstr "Si está desactivado, se usará el sistema de votación tradicional. Advertencia: esta configuración podría no ser adecuada para el alojamiento compartido"
 
-#: ../../Zotlabs/Module/Admin/Site.php:527
+#: ../../Zotlabs/Module/Admin/Site.php:530
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:528
+#: ../../Zotlabs/Module/Admin/Site.php:531
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
+#: ../../Zotlabs/Module/Admin/Site.php:532
 msgid "Network timeout"
 msgstr "Tiempo de espera de la red"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
+#: ../../Zotlabs/Module/Admin/Site.php:532
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
+#: ../../Zotlabs/Module/Admin/Site.php:533
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
+#: ../../Zotlabs/Module/Admin/Site.php:533
 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 "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
+#: ../../Zotlabs/Module/Admin/Site.php:534
 msgid "Deliveries per process"
 msgstr "Intentos de envío por proceso"
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
+#: ../../Zotlabs/Module/Admin/Site.php:534
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust"
 " if necessary to tune system performance. Recommend: 1-5."
 msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
+#: ../../Zotlabs/Module/Admin/Site.php:535
 msgid "Queue Threshold"
 msgstr "Umbral de la cola de espera"
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
+#: ../../Zotlabs/Module/Admin/Site.php:535
 msgid ""
 "Always defer immediate delivery if queue contains more than this number of "
 "entries."
 msgstr "Aplazar siempre la entrega inmediata si la cola contiene más de este número de entradas."
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
+#: ../../Zotlabs/Module/Admin/Site.php:536
 msgid "Poll interval"
 msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos"
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
+#: ../../Zotlabs/Module/Admin/Site.php:536
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
+#: ../../Zotlabs/Module/Admin/Site.php:537
 msgid "Path to ImageMagick convert program"
 msgstr "Ruta al programa de conversión de ImageMagick"
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
+#: ../../Zotlabs/Module/Admin/Site.php:537
 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 "Si está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
+#: ../../Zotlabs/Module/Admin/Site.php:538
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
+#: ../../Zotlabs/Module/Admin/Site.php:538
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
+#: ../../Zotlabs/Module/Admin/Site.php:539
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr "Caducidad del contenido importado de otros sitios (en días)"
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
+#: ../../Zotlabs/Module/Admin/Site.php:539
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
-#: ../../Zotlabs/Module/Admin/Site.php:537
+#: ../../Zotlabs/Module/Admin/Site.php:540
 msgid ""
 "Do not expire any posts which have comments less than this many days ago"
 msgstr "No caduque ningún mensaje que tenga menos comentarios que este hace muchos días"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
+#: ../../Zotlabs/Module/Admin/Site.php:541
 msgid ""
 "Public servers: Optional landing (marketing) webpage for new registrants"
 msgstr "Servidores públicos: Página web de acogida (marketing) opcional para nuevos registros"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
+#: ../../Zotlabs/Module/Admin/Site.php:541
 #, php-format
 msgid "Create this page first. Default is %s/register"
 msgstr "Crear esta página primero. Por defecto es %s/register"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
+#: ../../Zotlabs/Module/Admin/Site.php:542
 msgid "Page to display after creating a new channel"
 msgstr "Página a mostrar después de la creación de un nuevo canal"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
+#: ../../Zotlabs/Module/Admin/Site.php:542
 msgid "Default: profiles"
 msgstr "Perfiles predeterminados"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
+#: ../../Zotlabs/Module/Admin/Site.php:543
 msgid "Optional: site location"
 msgstr "Opcional: ubicación del sitio"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
+#: ../../Zotlabs/Module/Admin/Site.php:543
 msgid "Region or country"
 msgstr "Región o país"
 
-#: ../../Zotlabs/Module/Admin/Site.php:625
-#: ../../Zotlabs/Module/Admin/Site.php:626
+#: ../../Zotlabs/Module/Admin/Site.php:628
+#: ../../Zotlabs/Module/Admin/Site.php:629
 msgid "Invalid 24h time value (hhmm/hmm)"
 msgstr "Valor de tiempo de 24h no válido (hhmm/hmm)"
 
@@ -11153,12 +10732,12 @@ msgid "select all"
 msgstr "seleccionar todo"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:150
-#: ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Censor"
 msgstr "Censurar"
 
 #: ../../Zotlabs/Module/Admin/Channels.php:151
-#: ../../Zotlabs/Module/Directory.php:362
+#: ../../Zotlabs/Module/Directory.php:361
 msgid "Uncensor"
 msgstr "No censurar"
 
@@ -11409,7 +10988,7 @@ msgstr "Descargar el repositorio"
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:536
+#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:540
 msgid "Install"
 msgstr "Instalar"
 
@@ -11451,9 +11030,10 @@ msgid ""
 "password."
 msgstr "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
-msgstr "Eliminar este canal"
+#: ../../Zotlabs/Module/Removeme.php:60 ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Settings/Channel.php:281
+msgid "Remove Channel"
+msgstr "Eliminar el canal"
 
 #: ../../Zotlabs/Module/Removeme.php:61
 #: ../../Zotlabs/Module/Removeaccount.php:58
@@ -11462,13 +11042,12 @@ msgid "WARNING: "
 msgstr "ATENCIÓN:"
 
 #: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
-msgstr "Este canal va a ser completamente eliminado de la red. "
+msgid "This channel will be permanently removed. "
+msgstr "Este canal será eliminado permanentemente. "
 
 #: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
+msgid "This action can not be undone!"
+msgstr "¡Esta acción no se puede deshacer!"
 
 #: ../../Zotlabs/Module/Removeme.php:62
 #: ../../Zotlabs/Module/Removeaccount.php:59
@@ -11476,256 +11055,193 @@ msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
 msgid "Please enter your password for verification:"
 msgstr "Por favor, introduzca su contraseña para su verificación:"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:596
-msgid "Remove Channel"
-msgstr "Eliminar el canal"
-
-#: ../../Zotlabs/Module/Regate.php:81
+#: ../../Zotlabs/Module/Regate.php:84
 msgid "Email resent"
 msgstr "Correo electrónico reenviado"
 
-#: ../../Zotlabs/Module/Regate.php:81
+#: ../../Zotlabs/Module/Regate.php:84
 msgid "Email resend failed"
 msgstr "Fallo en el reenvío del correo electrónico"
 
-#: ../../Zotlabs/Module/Regate.php:105
-msgid "Verify successfull"
-msgstr "Verificar que se ha hecho bien"
+#: ../../Zotlabs/Module/Regate.php:109
+msgid "Verification successful"
+msgstr "¡Verificación exitosa!"
 
-#: ../../Zotlabs/Module/Regate.php:149
+#: ../../Zotlabs/Module/Regate.php:153
 msgid "Account successfull created"
 msgstr "Cuenta creada con éxito"
 
-#: ../../Zotlabs/Module/Regate.php:190
+#: ../../Zotlabs/Module/Regate.php:211
 msgid "Channel successfull created"
 msgstr "Canal creado con éxito"
 
-#: ../../Zotlabs/Module/Regate.php:196
+#: ../../Zotlabs/Module/Regate.php:217
 msgid "Automatic channel creation failed. Please create a channel."
 msgstr "La creación automática de canales ha fallado. Por favor, cree un canal."
 
-#: ../../Zotlabs/Module/Regate.php:208
+#: ../../Zotlabs/Module/Regate.php:229
 msgid "Account creation error"
 msgstr "Error en la creación de la cuenta"
 
-#: ../../Zotlabs/Module/Regate.php:220
+#: ../../Zotlabs/Module/Regate.php:241
 msgid "Verify failed"
 msgstr "Verificación fallida"
 
-#: ../../Zotlabs/Module/Regate.php:225
+#: ../../Zotlabs/Module/Regate.php:246
 msgid "Token verification failed"
 msgstr "Ha fallado el token de verificación."
 
-#: ../../Zotlabs/Module/Regate.php:230
+#: ../../Zotlabs/Module/Regate.php:251
 msgid "Request not inside time frame"
 msgstr "Solicitud fuera de plazo"
 
-#: ../../Zotlabs/Module/Regate.php:236 ../../Zotlabs/Module/Regate.php:266
+#: ../../Zotlabs/Module/Regate.php:257 ../../Zotlabs/Module/Regate.php:287
 msgid "Identity unknown"
 msgstr "Identidad desconocida"
 
-#: ../../Zotlabs/Module/Regate.php:242
+#: ../../Zotlabs/Module/Regate.php:263
 msgid "dId2 mistaken"
 msgstr "did2 equivocado/a"
 
-#: ../../Zotlabs/Module/Regate.php:270
+#: ../../Zotlabs/Module/Regate.php:291
 msgid "Your Registration ID"
 msgstr "Su ID de registro"
 
-#: ../../Zotlabs/Module/Regate.php:283 ../../Zotlabs/Module/Regate.php:374
-#: ../../Zotlabs/Module/Regate.php:403
+#: ../../Zotlabs/Module/Regate.php:304 ../../Zotlabs/Module/Regate.php:396
+#: ../../Zotlabs/Module/Regate.php:428
 msgid "Registration verification"
 msgstr "Verificación del registro"
 
-#: ../../Zotlabs/Module/Regate.php:290 ../../Zotlabs/Module/Regate.php:408
+#: ../../Zotlabs/Module/Regate.php:311 ../../Zotlabs/Module/Regate.php:433
 msgid "Hold on, you can start verification in"
 msgstr "Espere, puede empezar la verificación en "
 
-#: ../../Zotlabs/Module/Regate.php:291
+#: ../../Zotlabs/Module/Regate.php:312
 msgid "Please remember your verification token for ID"
 msgstr "Por favor, recuerde su token de verificación para la identificación"
 
-#: ../../Zotlabs/Module/Regate.php:292
+#: ../../Zotlabs/Module/Regate.php:314
 msgid "Token validity"
 msgstr "Validez del token"
 
-#: ../../Zotlabs/Module/Regate.php:328
-msgid "Resend"
-msgstr "Reenviar"
+#: ../../Zotlabs/Module/Regate.php:350
+msgid "Resend email"
+msgstr "Reenvío de correo electrónico"
 
-#: ../../Zotlabs/Module/Regate.php:333
+#: ../../Zotlabs/Module/Regate.php:355
 msgid "Registration status"
 msgstr "Estado del registro"
 
-#: ../../Zotlabs/Module/Regate.php:336
+#: ../../Zotlabs/Module/Regate.php:358
 msgid "Verification successful!"
 msgstr "¡Verificación exitosa!"
 
-#: ../../Zotlabs/Module/Regate.php:337
+#: ../../Zotlabs/Module/Regate.php:359
 msgid "Your login ID is"
 msgstr "Su ID de acceso es"
 
-#: ../../Zotlabs/Module/Regate.php:338
+#: ../../Zotlabs/Module/Regate.php:360
 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 "Una vez que su cuenta haya sido aprobada por nuestro administrador, podrá iniciar sesión con su ID de acceso y la contraseña proporcionada."
 
-#: ../../Zotlabs/Module/Regate.php:350
+#: ../../Zotlabs/Module/Regate.php:372
 msgid "Registration request revoked"
 msgstr "Solicitud de registro anulada"
 
-#: ../../Zotlabs/Module/Regate.php:351
+#: ../../Zotlabs/Module/Regate.php:373
 msgid "Sorry for any inconvience. Thank you for your response."
 msgstr "Disculpe las molestias. Gracias por su respuesta."
 
-#: ../../Zotlabs/Module/Regate.php:375
+#: ../../Zotlabs/Module/Regate.php:397
 msgid "Please enter your verification token for ID"
 msgstr "Por favor, introduzca su token de verificación para la identificación"
 
-#: ../../Zotlabs/Module/Regate.php:385
+#: ../../Zotlabs/Module/Regate.php:398 ../../Zotlabs/Module/Regate.php:425
+msgid "Please check your email!"
+msgstr "¡Por favor, compruebe su correo electrónico!"
+
+#: ../../Zotlabs/Module/Regate.php:408
 msgid "Verification token"
 msgstr "Token de verificación "
 
-#: ../../Zotlabs/Module/Regate.php:396
+#: ../../Zotlabs/Module/Regate.php:419
 msgid "ID expired"
 msgstr "ID caducada"
 
-#: ../../Zotlabs/Module/Regate.php:409
+#: ../../Zotlabs/Module/Regate.php:434
 msgid "You will require the verification token for ID"
 msgstr "Necesitará el token de verificación para identificarse"
 
-#: ../../Zotlabs/Module/Regate.php:417
+#: ../../Zotlabs/Module/Regate.php:443
 msgid "Unknown or expired ID"
 msgstr "ID desconocida o caducada"
 
-#: ../../Zotlabs/Module/Regate.php:428
+#: ../../Zotlabs/Module/Regate.php:454
 msgid "dId2 malformed"
 msgstr "did2 malformado/a"
 
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit event title"
-msgstr "Editar el título del evento"
-
-#: ../../Zotlabs/Module/Events.php:470
-msgid "Categories (comma-separated list)"
-msgstr "Temas (lista separada por comas)"
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Edit Category"
-msgstr "Modificar el tema"
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid "Category"
-msgstr "Tema"
-
-#: ../../Zotlabs/Module/Events.php:474
-msgid "Edit start date and time"
-msgstr "Modificar la fecha y hora de comienzo"
-
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:478
-msgid "Finish date and time are not known or not relevant"
-msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Edit finish date and time"
-msgstr "Modificar la fecha y hora de terminación"
-
-#: ../../Zotlabs/Module/Events.php:477
-msgid "Finish date and time"
-msgstr "Fecha y hora de terminación"
-
-#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Events.php:480
-msgid "Adjust for viewer timezone"
-msgstr "Ajustar para obtener el visor de los husos horarios"
-
-#: ../../Zotlabs/Module/Events.php:479
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
-
-#: ../../Zotlabs/Module/Events.php:481
-msgid "Edit Description"
-msgstr "Editar la descripción"
-
-#: ../../Zotlabs/Module/Events.php:483
-msgid "Edit Location"
-msgstr "Modificar la dirección"
-
-#: ../../Zotlabs/Module/Events.php:502
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
-
-#: ../../Zotlabs/Module/Events.php:613
-msgid "l, F j"
-msgstr "l j F"
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Edit Event"
-msgstr "Editar el evento"
-
-#: ../../Zotlabs/Module/Events.php:696
-msgid "Create Event"
-msgstr "Crear un evento"
-
-#: ../../Zotlabs/Module/Events.php:739
-msgid "Event removed"
-msgstr "Evento borrado"
-
-#: ../../Zotlabs/Module/Manage.php:138
+#: ../../Zotlabs/Module/Manage.php:130
 #: ../../Zotlabs/Module/New_channel.php:147
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 
-#: ../../Zotlabs/Module/Manage.php:145
+#: ../../Zotlabs/Module/Manage.php:137
 msgid "Create a new channel"
 msgstr "Crear un nuevo canal"
 
-#: ../../Zotlabs/Module/Manage.php:171
+#: ../../Zotlabs/Module/Manage.php:137 ../../Zotlabs/Module/Profiles.php:853
+#: ../../Zotlabs/Module/Wiki.php:211
+msgid "Create New"
+msgstr "Crear"
+
+#: ../../Zotlabs/Module/Manage.php:163
 msgid "Current Channel"
 msgstr "Canal actual"
 
-#: ../../Zotlabs/Module/Manage.php:173
+#: ../../Zotlabs/Module/Manage.php:165
 msgid "Switch to one of your channels by selecting it."
 msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../Zotlabs/Module/Manage.php:174
+#: ../../Zotlabs/Module/Manage.php:166
 msgid "Default Channel"
 msgstr "Canal principal"
 
-#: ../../Zotlabs/Module/Manage.php:175
+#: ../../Zotlabs/Module/Manage.php:167
 msgid "Make Default"
 msgstr "Convertir en predeterminado"
 
-#: ../../Zotlabs/Module/Manage.php:178
-#, php-format
-msgid "%d new messages"
-msgstr "%d mensajes nuevos"
-
-#: ../../Zotlabs/Module/Manage.php:179
+#: ../../Zotlabs/Module/Manage.php:170
 #, php-format
 msgid "%d new introductions"
 msgstr "%d nuevas solicitudes de conexión"
 
-#: ../../Zotlabs/Module/Manage.php:181
+#: ../../Zotlabs/Module/Manage.php:172
 msgid "Delegated Channel"
 msgstr "Canal delegado"
 
+#: ../../Zotlabs/Module/Pdledit_gui.php:118
+msgid "Layout not found"
+msgstr "Diseño no encontrado"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:126
+msgid "This template does not support pdledi_gui (no content regions defined)"
+msgstr "Esta plantilla no es compatible con pdledi_gui (no hay regiones de contenido definidas)"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:361
+msgid "Main page content"
+msgstr "Contenido de la página principal"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:362
+msgid "The main page content can not be edited!"
+msgstr "El contenido de la página principal no se puede editar."
+
 #: ../../Zotlabs/Module/Chanview.php:132
 msgid "toggle full screen mode"
 msgstr "cambiar al modo de pantalla completa"
 
-#: ../../Zotlabs/Module/Pubstream.php:20
-msgid "Public Stream App"
-msgstr "App Stream público"
-
-#: ../../Zotlabs/Module/Pubstream.php:21
-msgid "The unmoderated public stream of this hub"
-msgstr "Stream público no moderado de este hub"
-
 #: ../../Zotlabs/Module/Chatsvc.php:131
 msgid "Away"
 msgstr "Ausente"
@@ -11734,35 +11250,68 @@ msgstr "Ausente"
 msgid "Online"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Permcats.php:29
+#: ../../Zotlabs/Module/Permcats.php:59
+msgid "Contact role deleted."
+msgstr "Rol de contacto eliminado."
+
+#: ../../Zotlabs/Module/Permcats.php:86
 msgid "Permission category name is required."
 msgstr "El nombre de la categoría de permiso es obligatorio."
 
-#: ../../Zotlabs/Module/Permcats.php:48
-msgid "Permission category saved."
-msgstr "Se ha guardado la categoría del permiso."
+#: ../../Zotlabs/Module/Permcats.php:102 ../../Zotlabs/Module/Permcats.php:154
+msgid "Contact role saved."
+msgstr "Rol de contacto guardado."
 
-#: ../../Zotlabs/Module/Permcats.php:63
-msgid "Permission Categories App"
-msgstr "App Categorías de permisos"
+#: ../../Zotlabs/Module/Permcats.php:204
+msgid "Role to assign affected contacts and default role to"
+msgstr "Rol a asignar a los contactos afectados y rol por defecto"
 
-#: ../../Zotlabs/Module/Permcats.php:64
-msgid "Create custom connection permission limits"
-msgstr "Crear límites de permisos de conexión personalizados"
+#: ../../Zotlabs/Module/Permcats.php:204
+msgid "Role to assign affected contacts to"
+msgstr "Rol al que asignar los contactos afectados"
 
-#: ../../Zotlabs/Module/Permcats.php:80
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones."
+#: ../../Zotlabs/Module/Permcats.php:234
+msgid "Assign this role to"
+msgstr "Asigne este rol a "
 
-#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374
-msgid "Permission Categories"
-msgstr "Tipos de permisos"
+#: ../../Zotlabs/Module/Permcats.php:236
+msgid "All my contacts"
+msgstr "Todos mis contactos"
+
+#: ../../Zotlabs/Module/Permcats.php:247
+msgid "Automatically assign this role to new contacts"
+msgstr "Asignar automáticamente este rol a los nuevos contactos"
+
+#: ../../Zotlabs/Module/Permcats.php:248 ../../Zotlabs/Lib/Apps.php:378
+msgid "Contact Roles"
+msgstr "Roles de contacto"
+
+#: ../../Zotlabs/Module/Permcats.php:249
+msgid "Role name"
+msgstr "Nombre del rol "
+
+#: ../../Zotlabs/Module/Permcats.php:249
+msgid "System role - not editable"
+msgstr "Rol de sistema - no editable"
+
+#: ../../Zotlabs/Module/Permcats.php:250
+msgid "Deleting"
+msgstr "Eliminación"
+
+#: ../../Zotlabs/Module/Permcats.php:253 ../../Zotlabs/Module/Defperms.php:262
+#: ../../Zotlabs/Module/Connedit.php:713
+msgid "inherited"
+msgstr "heredado"
+
+#: ../../Zotlabs/Module/Permcats.php:255
+msgid "Role Permissions"
+msgstr "Permisos de rol"
 
-#: ../../Zotlabs/Module/Permcats.php:121
-msgid "Permission category name"
-msgstr "Nombre de categoría de permiso"
+#: ../../Zotlabs/Module/Permcats.php:256
+msgid ""
+"Some permissions may be inherited from your <a href=\"settings\">channel "
+"role</a>, which have higher priority than contact role settings."
+msgstr "Algunos permisos pueden ser heredados de su <a href=\"settings\">rol de canal</a>, que tienen mayor prioridad que la configuración del rol de contacto."
 
 #: ../../Zotlabs/Module/Email_resend.php:12
 #: ../../Zotlabs/Module/Email_validation.php:24
@@ -11777,22 +11326,6 @@ msgstr "Reenvío del email de verificación"
 msgid "Unable to resend email verification message."
 msgstr "No se puede reenviar el mensaje de verificación por correo electrónico."
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr "Ninguna valoración"
-
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr "Valoración:"
-
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr "Sitio web:"
-
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr "Descripción:"
-
 #: ../../Zotlabs/Module/Cal.php:62
 msgid "Permissions denied."
 msgstr "Permisos denegados."
@@ -11851,90 +11384,93 @@ msgid ""
 "network. "
 msgstr "Esta cuenta y todos sus canales van a ser eliminados de la red."
 
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
+msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
+
 #: ../../Zotlabs/Module/Removeaccount.php:61
 #: ../../Zotlabs/Module/Settings/Account.php:109
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
-#: ../../Zotlabs/Module/Lang.php:17
+#: ../../Zotlabs/Module/Lang.php:20
 msgid "Language App"
 msgstr "App idioma"
 
-#: ../../Zotlabs/Module/Lang.php:18
-msgid "Change UI language"
-msgstr "Cambiar el idioma de la interfaz de usuario"
-
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid "Channel Export App"
-msgstr "App Exportación de canales"
-
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your channel"
-msgstr "Exportar su canal"
+#: ../../Zotlabs/Module/Uexport.php:108
+msgid "No content available for year"
+msgstr "No hay contenido disponible para el año"
 
-#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74
+#: ../../Zotlabs/Module/Uexport.php:171
 msgid "Export Channel"
 msgstr "Exportar el canal"
 
-#: ../../Zotlabs/Module/Uexport.php:75
+#: ../../Zotlabs/Module/Uexport.php:173
+msgid "Export channel"
+msgstr "Exportar canal"
+
+#: ../../Zotlabs/Module/Uexport.php:174
 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 "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."
+"This will export your identity and social graph into a file which can be "
+"used to import your channel to a new hub."
+msgstr "Esto exportará su identidad y su gráfico social a un archivo que puede utilizarse para importar su canal a un nuevo hub."
 
-#: ../../Zotlabs/Module/Uexport.php:76
-msgid "Export Content"
+#: ../../Zotlabs/Module/Uexport.php:177
+msgid "Export content"
 msgstr "Exportar contenidos"
 
-#: ../../Zotlabs/Module/Uexport.php:77
+#: ../../Zotlabs/Module/Uexport.php:178
 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 "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar."
+"This will export your posts, direct messages, articles and cards per month "
+"stored into a zip file per year. Months with no posts will be dismissed."
+msgstr "Esto exportará sus posts, mensajes directos, artículos y fichas por mes almacenados en un archivo zip por año. Los meses sin publicaciones serán descartados."
 
-#: ../../Zotlabs/Module/Uexport.php:79
-msgid "Export your posts from a given year."
-msgstr "Exporta sus publicaciones de un año dado."
+#: ../../Zotlabs/Module/Uexport.php:180
+msgid "Export wikis"
+msgstr "Exportar wikis"
 
-#: ../../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 "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño."
+#: ../../Zotlabs/Module/Uexport.php:181
+msgid "This will export your wikis and wiki pages."
+msgstr "Esto exportará sus wikis y páginas wiki."
 
-#: ../../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 "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Uexport.php:183
+msgid "Export webpages"
+msgstr "Exportar páginas web"
 
-#: ../../Zotlabs/Module/Uexport.php:83
-#, php-format
+#: ../../Zotlabs/Module/Uexport.php:184
+msgid "This will export your webpages and menus."
+msgstr "Esto exportará sus páginas web y menús."
+
+#: ../../Zotlabs/Module/Uexport.php:186
+msgid "Export channel calendar"
+msgstr "Exportar el calendario del canal"
+
+#: ../../Zotlabs/Module/Uexport.php:187
 msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1$s\">%2$s</a>"
+"This will export your channel calendar events and associated items. CalDAV "
+"calendars are not included."
+msgstr "Esto exportará los eventos del calendario de su canal y los elementos asociados. Los calendarios CalDAV no están incluidos."
+
+#: ../../Zotlabs/Module/Uexport.php:189
+msgid "Export chatrooms"
+msgstr "Exportar salas de chat"
+
+#: ../../Zotlabs/Module/Uexport.php:190
+msgid "This will export your chatrooms. Chat history is dismissed."
+msgstr "Esto exportará sus chats. Se descarta el historial de chats."
 
-#: ../../Zotlabs/Module/Uexport.php:84
+#: ../../Zotlabs/Module/Uexport.php:192
 #, 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 "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."
+"This export can be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel."
+msgstr "Esta exportación puede ser importada o restaurada visitando <a href=\"%1$s\">%2$s</a> cualquier sitio que contenga su canal."
 
-#: ../../Zotlabs/Module/Display.php:372
+#: ../../Zotlabs/Module/Display.php:376
 msgid "Article"
 msgstr "Artículo"
 
-#: ../../Zotlabs/Module/Display.php:417
+#: ../../Zotlabs/Module/Display.php:421
 msgid "Item has been removed."
 msgstr "Se ha eliminado el elemento."
 
@@ -11950,12 +11486,12 @@ msgstr "Ninguna  conexión en común."
 msgid "View Common Connections"
 msgstr "Ver las conexiones comunes"
 
-#: ../../Zotlabs/Module/Impel.php:185
+#: ../../Zotlabs/Module/Impel.php:188
 #, php-format
 msgid "%s element installed"
 msgstr "%s elemento instalado"
 
-#: ../../Zotlabs/Module/Impel.php:188
+#: ../../Zotlabs/Module/Impel.php:191
 #, php-format
 msgid "%s element installation failed"
 msgstr "Elemento con instalación fallida: %s"
@@ -11983,19 +11519,9 @@ msgid "Channel name"
 msgstr "Nombre del canal"
 
 #: ../../Zotlabs/Module/New_channel.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:537
-msgid "Channel role and privacy"
-msgstr "Clase de canal y privacidad"
-
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid ""
-"Select a channel permission role compatible with your usage needs and "
-"privacy requirements."
-msgstr "Seleccione unos permisos de rol del canal compatibles con sus necesidades de uso y requisitos de privacidad."
-
-#: ../../Zotlabs/Module/New_channel.php:178
-msgid "Read more about channel permission roles"
-msgstr "Leer más sobre los roles y permisos"
+#: ../../Zotlabs/Module/Settings/Channel.php:232
+msgid "Channel role"
+msgstr "Rol del canal"
 
 #: ../../Zotlabs/Module/New_channel.php:181
 msgid "Create a Channel"
@@ -12017,43 +11543,6 @@ msgstr "O <a href=\"import\">importar un canal </a> desde otro lugar."
 msgid "Validate"
 msgstr "Validar"
 
-#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948
-msgid "sent you a private message"
-msgstr "le ha enviado un mensaje privado"
-
-#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914
-msgid "added your channel"
-msgstr "añadió este canal a sus conexiones"
-
-#: ../../Zotlabs/Module/Ping.php:418
-msgid "requires approval"
-msgstr "requiere aprobación"
-
-#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960
-msgid "[today]"
-msgstr "[hoy]"
-
-#: ../../Zotlabs/Module/Ping.php:456
-msgid "posted an event"
-msgstr "publicó un evento"
-
-#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829
-#: ../../Zotlabs/Lib/Enotify.php:931
-msgid "shared a file with you"
-msgstr "compartió un archivo con usted"
-
-#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554
-msgid "Private forum"
-msgstr "Foro privado"
-
-#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554
-msgid "Public forum"
-msgstr "Foro público"
-
 #: ../../Zotlabs/Module/Dircensor.php:42
 msgid "Entry censored"
 msgstr "Entrada censurada"
@@ -12066,18 +11555,14 @@ msgstr "Entrada sin censurar"
 msgid "No service class restrictions found."
 msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: ../../Zotlabs/Module/Mood.php:134
-msgid "Mood App"
-msgstr "App Estados de ánimo"
+#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:354
+msgid "Mood"
+msgstr "Estado de ánimo"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Module/Mood.php:155
+#: ../../Zotlabs/Module/Mood.php:153
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350
-msgid "Mood"
-msgstr "Estado de ánimo"
-
 #: ../../Zotlabs/Module/Siteinfo.php:21
 msgid "About this site"
 msgstr "Acerca de este sitio"
@@ -12128,198 +11613,475 @@ msgstr "Aplicación instalada."
 msgid "Malformed app."
 msgstr "Aplicación con errores"
 
-#: ../../Zotlabs/Module/Appman.php:132
+#: ../../Zotlabs/Module/Appman.php:198
 msgid "Embed code"
 msgstr "Código incorporado"
 
-#: ../../Zotlabs/Module/Appman.php:138
+#: ../../Zotlabs/Module/Appman.php:204
 msgid "Edit App"
 msgstr "Modificar la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:138
+#: ../../Zotlabs/Module/Appman.php:204
 msgid "Create App"
 msgstr "Crear una aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:143
+#: ../../Zotlabs/Module/Appman.php:209
 msgid "Name of app"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:144
+#: ../../Zotlabs/Module/Appman.php:210
 msgid "Location (URL) of app"
 msgstr "Dirección (URL) de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Zotlabs/Module/Appman.php:212
 msgid "Photo icon URL"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Appman.php:146
+#: ../../Zotlabs/Module/Appman.php:212
 msgid "80 x 80 pixels - optional"
 msgstr "80 x 80 pixels - opcional"
 
-#: ../../Zotlabs/Module/Appman.php:147
+#: ../../Zotlabs/Module/Appman.php:213
 msgid "Categories (optional, comma separated list)"
 msgstr "Temas (opcional, lista separada por comas)"
 
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../Zotlabs/Module/Appman.php:214
 msgid "Version ID"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Appman.php:149
+#: ../../Zotlabs/Module/Appman.php:215
 msgid "Price of app"
 msgstr "Precio de la aplicación"
 
-#: ../../Zotlabs/Module/Appman.php:150
+#: ../../Zotlabs/Module/Appman.php:216
 msgid "Location (URL) to purchase app"
 msgstr "Dirección (URL) donde adquirir la aplicación"
 
-#: ../../Zotlabs/Module/Admin.php:97
+#: ../../Zotlabs/Module/Admin.php:96
 msgid "Blocked accounts"
 msgstr "Cuentas bloqueadas"
 
-#: ../../Zotlabs/Module/Admin.php:98
+#: ../../Zotlabs/Module/Admin.php:97
 msgid "Expired accounts"
 msgstr "Cuentas caducadas"
 
-#: ../../Zotlabs/Module/Admin.php:99
+#: ../../Zotlabs/Module/Admin.php:98
 msgid "Expiring accounts"
 msgstr "Cuentas que caducan"
 
-#: ../../Zotlabs/Module/Admin.php:123
+#: ../../Zotlabs/Module/Admin.php:122
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: ../../Zotlabs/Module/Admin.php:137
+#: ../../Zotlabs/Module/Admin.php:136
 msgid "Your software should be updated"
 msgstr "Debe actualizar su software"
 
-#: ../../Zotlabs/Module/Admin.php:142
+#: ../../Zotlabs/Module/Admin.php:141
 msgid "Summary"
 msgstr "Sumario"
 
-#: ../../Zotlabs/Module/Admin.php:145
+#: ../../Zotlabs/Module/Admin.php:144
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: ../../Zotlabs/Module/Admin.php:146
+#: ../../Zotlabs/Module/Admin.php:145
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: ../../Zotlabs/Module/Admin.php:147
+#: ../../Zotlabs/Module/Admin.php:146
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: ../../Zotlabs/Module/Admin.php:148
+#: ../../Zotlabs/Module/Admin.php:147
 msgid "Active addons"
 msgstr "Addons acivos"
 
-#: ../../Zotlabs/Module/Admin.php:149
+#: ../../Zotlabs/Module/Admin.php:148
 msgid "Version"
 msgstr "Versión"
 
-#: ../../Zotlabs/Module/Admin.php:150
+#: ../../Zotlabs/Module/Admin.php:149
 msgid "Repository version (master)"
 msgstr "Versión del repositorio (master)"
 
-#: ../../Zotlabs/Module/Admin.php:151
+#: ../../Zotlabs/Module/Admin.php:150
 msgid "Repository version (dev)"
 msgstr "Versión del repositorio (dev)"
 
-#: ../../Zotlabs/Module/Cards.php:51
-msgid "Cards App"
-msgstr "App de Fichas"
+#: ../../Zotlabs/Module/Contactedit.php:50
+msgid "Invalid abook_id"
+msgstr "Abook_id no válido"
+
+#: ../../Zotlabs/Module/Contactedit.php:78
+#: ../../Zotlabs/Module/Defperms.php:67 ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
+msgstr "No se ha podido acceder al registro de contacto."
+
+#: ../../Zotlabs/Module/Contactedit.php:107
+#: ../../Zotlabs/Module/Connedit.php:101
+msgid "Could not locate selected profile."
+msgstr "No se ha podido localizar el perfil seleccionado."
+
+#: ../../Zotlabs/Module/Contactedit.php:192
+#: ../../Zotlabs/Module/Connedit.php:215
+msgid "is now connected to"
+msgstr "ahora está conectado/a"
+
+#: ../../Zotlabs/Module/Contactedit.php:252
+#: ../../Zotlabs/Module/Contactedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Contact Tools"
+msgstr "Gestión de contactos"
+
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Approve this contact"
+msgstr "Aprobar este contacto"
+
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Accept contact to allow communication"
+msgstr "Aceptar el contacto para permitir la comunicación"
+
+#: ../../Zotlabs/Module/Contactedit.php:362
+#: ../../Zotlabs/Module/Connedit.php:658
+msgid "Please select a role for this contact!"
+msgstr "¡Por favor, seleccione un rol para este contacto!"
+
+#: ../../Zotlabs/Module/Contactedit.php:382
+#: ../../Zotlabs/Module/Connedit.php:678
+msgid "This contact is unreachable from this location."
+msgstr "Este contacto es inaccesible desde esta ubicación."
+
+#: ../../Zotlabs/Module/Contactedit.php:383
+#: ../../Zotlabs/Module/Connedit.php:679
+msgid "This contact may be unreachable from other channel locations."
+msgstr "Este contacto puede ser inaccesible desde otras ubicaciones del canal."
+
+#: ../../Zotlabs/Module/Contactedit.php:385
+#: ../../Zotlabs/Module/Connedit.php:681
+msgid "Location independence is not supported by their network."
+msgstr "La independencia de ubicación no es compatible con su red."
+
+#: ../../Zotlabs/Module/Contactedit.php:395
+msgid "View profile"
+msgstr "Ver el perfil"
+
+#: ../../Zotlabs/Module/Contactedit.php:397
+#: ../../Zotlabs/Module/Connections.php:405
+msgid "This is a group/forum channel"
+msgstr "Este es un canal de grupo/foro"
+
+#: ../../Zotlabs/Module/Contactedit.php:408
+msgid "Select a role for this contact"
+msgstr "Selecciones un rol para este contacto"
 
-#: ../../Zotlabs/Module/Cards.php:52
-msgid "Create personal planning cards"
-msgstr "Crear fichas de planificación personal"
+#: ../../Zotlabs/Module/Contactedit.php:420
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslizar para ajustar el grado de amistad"
+
+#: ../../Zotlabs/Module/Contactedit.php:422
+#: ../../Zotlabs/Module/Connedit.php:705
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Settings/Channel.php:285
+#: ../../Zotlabs/Module/Connedit.php:706
+msgid "Only import posts with this text"
+msgstr "Importar solo entradas que contengan este texto"
+
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Settings/Channel.php:284
+#: ../../Zotlabs/Module/Connedit.php:707
+msgid "Do not import posts with this text"
+msgstr "No importar entradas que contengan este texto"
+
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Approve contact"
+msgstr "Aprobar contacto"
+
+#: ../../Zotlabs/Module/Contactedit.php:431
+#: ../../Zotlabs/Module/Connedit.php:717
+msgid "Their"
+msgstr "Su/Sus"
+
+#: ../../Zotlabs/Module/Contactedit.php:432
+#: ../../Zotlabs/Module/Connedit.php:718
+msgid "My"
+msgstr "Mi"
+
+#: ../../Zotlabs/Module/Contactedit.php:440
+msgid "Roles"
+msgstr "Roles"
+
+#: ../../Zotlabs/Module/Contactedit.php:441
+msgid "Compare permissions"
+msgstr "Comparar permisos"
+
+#: ../../Zotlabs/Module/Contactedit.php:442
+msgid "Permission"
+msgstr "Permiso "
+
+#: ../../Zotlabs/Module/Contactedit.php:445
+#: ../../Zotlabs/Module/Connedit.php:572
+msgid "Affinity"
+msgstr "Afinidad"
+
+#: ../../Zotlabs/Module/Contactedit.php:446
+msgid "Content filter"
+msgstr "Filtro de contenidos"
+
+#: ../../Zotlabs/Module/Contactedit.php:456
+msgid "Contact updated"
+msgstr "Contacto actualizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:456
+msgid "Contact update failed"
+msgstr "Fallo en la actualización del contacto"
+
+#: ../../Zotlabs/Module/Contactedit.php:462
+#: ../../Zotlabs/Module/Connections.php:348
+msgid "Approve connection"
+msgstr "Aprobar esta conexión"
+
+#: ../../Zotlabs/Module/Contactedit.php:508
+#: ../../Zotlabs/Module/Contactedit.php:518
+msgid "Refresh succeeded"
+msgstr "Actualización con éxito"
+
+#: ../../Zotlabs/Module/Contactedit.php:511
+msgid "Refresh failed - channel is currently unavailable"
+msgstr "Error de actualización: el canal no está disponible en este momento"
+
+#: ../../Zotlabs/Module/Contactedit.php:530
+msgid "Block status updated"
+msgstr "Estado del bloqueo actualizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:534
+msgid "Block failed"
+msgstr "Bloqueo fallido"
+
+#: ../../Zotlabs/Module/Contactedit.php:545
+msgid "Ignore status updated"
+msgstr "Estado de ignorar actualizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:549
+msgid "Ignore failed"
+msgstr "Ignorar falló"
+
+#: ../../Zotlabs/Module/Contactedit.php:560
+msgid "Archive status updated"
+msgstr "Estado de archivar actualizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:564
+msgid "Archive failed"
+msgstr "Archivar falló"
+
+#: ../../Zotlabs/Module/Contactedit.php:575
+msgid "Hide status updated"
+msgstr "Estado de ocultación actualizado"
+
+#: ../../Zotlabs/Module/Contactedit.php:579
+msgid "Hide failed"
+msgstr "Ocultar falló"
+
+#: ../../Zotlabs/Module/Contactedit.php:614
+msgid "Contact removed"
+msgstr "Contacto eliminado"
+
+#: ../../Zotlabs/Module/Contactedit.php:618
+msgid "Delete failed"
+msgstr "Eliminar falló"
 
-#: ../../Zotlabs/Module/Cards.php:112
+#: ../../Zotlabs/Module/Contactedit.php:628
+#: ../../Zotlabs/Module/Connedit.php:487
+msgid "Refresh Permissions"
+msgstr "Recargar los permisos"
+
+#: ../../Zotlabs/Module/Contactedit.php:629
+#: ../../Zotlabs/Module/Connedit.php:490
+msgid "Fetch updated permissions"
+msgstr "Obtener los permisos actualizados"
+
+#: ../../Zotlabs/Module/Contactedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:494
+msgid "Refresh Photo"
+msgstr "Actualizar la foto"
+
+#: ../../Zotlabs/Module/Contactedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:497
+msgid "Fetch updated photo"
+msgstr "Obtener una foto actualizada"
+
+#: ../../Zotlabs/Module/Contactedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:511
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
+
+#: ../../Zotlabs/Module/Contactedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:512
+msgid "This connection is blocked!"
+msgstr "¡Esta conexión está bloqueada!"
+
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:516
+msgid "Unignore"
+msgstr "Dejar de ignorar"
+
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connections.php:351
+#: ../../Zotlabs/Module/Connedit.php:516
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../../Zotlabs/Module/Contactedit.php:648
+#: ../../Zotlabs/Module/Connedit.php:519
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
+
+#: ../../Zotlabs/Module/Contactedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:520
+msgid "This connection is ignored!"
+msgstr "¡Esta conexión es ignorada!"
+
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Unarchive"
+msgstr "Desarchivar"
+
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Archive"
+msgstr "Archivar"
+
+#: ../../Zotlabs/Module/Contactedit.php:655
+#: ../../Zotlabs/Module/Connedit.php:527
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
+
+#: ../../Zotlabs/Module/Contactedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:528
+msgid "This connection is archived!"
+msgstr "¡Esta conexión esta archivada!"
+
+#: ../../Zotlabs/Module/Contactedit.php:660
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Unhide"
+msgstr "Mostrar"
+
+#: ../../Zotlabs/Module/Contactedit.php:660
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../../Zotlabs/Module/Contactedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:535
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
+
+#: ../../Zotlabs/Module/Contactedit.php:663
+#: ../../Zotlabs/Module/Connedit.php:536
+msgid "This connection is hidden!"
+msgstr "¡Esta conexión está oculta!"
+
+#: ../../Zotlabs/Module/Contactedit.php:669
+#: ../../Zotlabs/Module/Connedit.php:543
+msgid "Delete this connection"
+msgstr "Eliminar esta conexión"
+
+#: ../../Zotlabs/Module/Cards.php:110
 msgid "Add Card"
 msgstr "Añadir una ficha"
 
-#: ../../Zotlabs/Module/Directory.php:122
+#: ../../Zotlabs/Module/Directory.php:121
 msgid "No default suggestions were found."
 msgstr "No se encontraron sugerencias por defecto."
 
-#: ../../Zotlabs/Module/Directory.php:282
+#: ../../Zotlabs/Module/Directory.php:281
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] "%d valoración"
 msgstr[1] "%d valoraciones"
 
-#: ../../Zotlabs/Module/Directory.php:293
+#: ../../Zotlabs/Module/Directory.php:292
 msgid "Gender: "
 msgstr "Género:"
 
-#: ../../Zotlabs/Module/Directory.php:295
+#: ../../Zotlabs/Module/Directory.php:294
 msgid "Status: "
 msgstr "Estado:"
 
-#: ../../Zotlabs/Module/Directory.php:297
+#: ../../Zotlabs/Module/Directory.php:296
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:360
+#: ../../Zotlabs/Module/Directory.php:359
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:371
+#: ../../Zotlabs/Module/Directory.php:370
 msgid "Public Forum:"
 msgstr "Foro público:"
 
-#: ../../Zotlabs/Module/Directory.php:374
+#: ../../Zotlabs/Module/Directory.php:373
 msgid "Keywords: "
 msgstr "Palabras clave:"
 
-#: ../../Zotlabs/Module/Directory.php:377
+#: ../../Zotlabs/Module/Directory.php:376
 msgid "Don't suggest"
 msgstr "No sugerir:"
 
-#: ../../Zotlabs/Module/Directory.php:379
+#: ../../Zotlabs/Module/Directory.php:378
 msgid "Common connections (estimated):"
 msgstr "Conexiones comunes (estimadas):  "
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Global Directory"
 msgstr "Directorio global:"
 
-#: ../../Zotlabs/Module/Directory.php:428
+#: ../../Zotlabs/Module/Directory.php:427
 msgid "Local Directory"
 msgstr "Directorio local:"
 
-#: ../../Zotlabs/Module/Directory.php:434
+#: ../../Zotlabs/Module/Directory.php:433
 msgid "Finding:"
 msgstr "Encontrar:"
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "next page"
 msgstr "siguiente página"
 
-#: ../../Zotlabs/Module/Directory.php:439
+#: ../../Zotlabs/Module/Directory.php:438
 msgid "previous page"
 msgstr "página anterior"
 
-#: ../../Zotlabs/Module/Directory.php:440
+#: ../../Zotlabs/Module/Directory.php:439
 msgid "Sort options"
 msgstr "Ordenar opciones"
 
-#: ../../Zotlabs/Module/Directory.php:441
+#: ../../Zotlabs/Module/Directory.php:440
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: ../../Zotlabs/Module/Directory.php:442
+#: ../../Zotlabs/Module/Directory.php:441
 msgid "Reverse Alphabetic"
 msgstr "Alfabético inverso"
 
-#: ../../Zotlabs/Module/Directory.php:443
+#: ../../Zotlabs/Module/Directory.php:442
 msgid "Newest to Oldest"
 msgstr "De más nuevo a más antiguo"
 
-#: ../../Zotlabs/Module/Directory.php:444
+#: ../../Zotlabs/Module/Directory.php:443
 msgid "Oldest to Newest"
 msgstr "De más antiguo a más nuevo"
 
-#: ../../Zotlabs/Module/Directory.php:461
+#: ../../Zotlabs/Module/Directory.php:460
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
@@ -12386,101 +12148,89 @@ msgstr "Encuesta no encontrada."
 msgid "Invalid response."
 msgstr "respuesta no válida."
 
-#: ../../Zotlabs/Module/Vote.php:132
+#: ../../Zotlabs/Module/Vote.php:127
 msgid "Response submitted. Updates may not appear instantly."
 msgstr "Respuesta enviada. Las actualizaciones pueden no aparecer al instante."
 
-#: ../../Zotlabs/Module/Profile_photo.php:93
+#: ../../Zotlabs/Module/Profile_photo.php:128
 #: ../../Zotlabs/Module/Cover_photo.php:85
 msgid "Image uploaded but image cropping failed."
 msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
-#: ../../Zotlabs/Module/Profile_photo.php:166
+#: ../../Zotlabs/Module/Profile_photo.php:184
 #: ../../Zotlabs/Module/Cover_photo.php:212
 msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
-#: ../../Zotlabs/Module/Profile_photo.php:296
+#: ../../Zotlabs/Module/Profile_photo.php:350
 #: ../../Zotlabs/Module/Cover_photo.php:265
 msgid "Image upload failed."
 msgstr "La carga de la imagen ha fallado."
 
-#: ../../Zotlabs/Module/Profile_photo.php:315
+#: ../../Zotlabs/Module/Profile_photo.php:370
 #: ../../Zotlabs/Module/Cover_photo.php:282
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: ../../Zotlabs/Module/Profile_photo.php:379
-#: ../../Zotlabs/Module/Profile_photo.php:431
+#: ../../Zotlabs/Module/Profile_photo.php:428
+#: ../../Zotlabs/Module/Profile_photo.php:493
 #: ../../Zotlabs/Module/Cover_photo.php:367
 #: ../../Zotlabs/Module/Cover_photo.php:382
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
-#: ../../Zotlabs/Module/Profile_photo.php:495
+#: ../../Zotlabs/Module/Profile_photo.php:540
 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 "Su foto de perfil predeterminada es visible para cualquiera en Internet. Las fotos de perfil para perfiles alternativos heredarán los permisos del predeterminado."
-
-#: ../../Zotlabs/Module/Profile_photo.php:495
-msgid ""
-"Your profile photo is visible to anybody on the internet and may be "
+"This profile photo will be visible to anybody on the internet and may be "
 "distributed to other websites."
-msgstr "La foto de su perfil es visible para cualquiera en Internet y puede ser distribuida en otros sitios web."
-
-#: ../../Zotlabs/Module/Profile_photo.php:497
-#: ../../Zotlabs/Module/Cover_photo.php:420
-msgid "Upload File:"
-msgstr "Subir fichero:"
+msgstr "Esta foto de perfil será visible para cualquier persona en Internet y podrá ser distribuida a otros sitios web."
 
-#: ../../Zotlabs/Module/Profile_photo.php:498
-#: ../../Zotlabs/Module/Cover_photo.php:421
-msgid "Select a profile:"
-msgstr "Seleccionar un perfil:"
+#: ../../Zotlabs/Module/Profile_photo.php:540
+msgid ""
+"This profile photo will be visible only to channels with permission to view "
+"this profile."
+msgstr "Esta foto de perfil sólo será visible para los canales con permiso para ver este perfil."
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
+#: ../../Zotlabs/Module/Profile_photo.php:542
 msgid "Use Photo for Profile"
 msgstr "Usar la fotografía para el perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:499
+#: ../../Zotlabs/Module/Profile_photo.php:542
 msgid "Change Profile Photo"
 msgstr "Cambiar la foto del perfil"
 
-#: ../../Zotlabs/Module/Profile_photo.php:500
-msgid "Use"
-msgstr "Usar"
+#: ../../Zotlabs/Module/Profile_photo.php:544
+msgid "Reset to default"
+msgstr "Restablecer los valores por defecto"
 
-#: ../../Zotlabs/Module/Profile_photo.php:505
-#: ../../Zotlabs/Module/Profile_photo.php:506
+#: ../../Zotlabs/Module/Profile_photo.php:547
+#: ../../Zotlabs/Module/Profile_photo.php:548
 #: ../../Zotlabs/Module/Cover_photo.php:426
 #: ../../Zotlabs/Module/Cover_photo.php:427
 msgid "Use a photo from your albums"
 msgstr "Usar una foto de sus álbumes"
 
-#: ../../Zotlabs/Module/Profile_photo.php:511
-#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:404
+#: ../../Zotlabs/Module/Profile_photo.php:553
+#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:402
 msgid "Choose a different album"
 msgstr "Elegir un álbum diferente..."
 
-#: ../../Zotlabs/Module/Profile_photo.php:516
-#: ../../Zotlabs/Module/Cover_photo.php:438
-msgid "Select existing photo"
-msgstr "Seleccionar una foto"
+#: ../../Zotlabs/Module/Profile_photo.php:558
+msgid "Select existing"
+msgstr "Seleccione lo que hay"
 
-#: ../../Zotlabs/Module/Profile_photo.php:535
+#: ../../Zotlabs/Module/Profile_photo.php:577
 #: ../../Zotlabs/Module/Cover_photo.php:455
 msgid "Crop Image"
 msgstr "Recortar imagen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:536
+#: ../../Zotlabs/Module/Profile_photo.php:578
 #: ../../Zotlabs/Module/Cover_photo.php:456
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 
-#: ../../Zotlabs/Module/Profile_photo.php:538
-#: ../../Zotlabs/Module/Cover_photo.php:458
-msgid "Done Editing"
+#: ../../Zotlabs/Module/Profile_photo.php:580
+msgid "Done editing"
 msgstr "Edición completada"
 
 #: ../../Zotlabs/Module/Editblock.php:138
@@ -12495,7 +12245,7 @@ msgstr "Escriba un nombre de carpeta"
 msgid "or select an existing folder (doubleclick)"
 msgstr "o seleccione una (con un doble click)"
 
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:214
 msgid "Save to Folder"
 msgstr "Guardar en carpeta"
 
@@ -12515,25 +12265,25 @@ msgstr "Modificar la plantilla"
 
 #: ../../Zotlabs/Module/Connections.php:58
 #: ../../Zotlabs/Module/Connections.php:116
-#: ../../Zotlabs/Module/Connections.php:274
+#: ../../Zotlabs/Module/Connections.php:282
 msgid "Active"
 msgstr "Activo/a"
 
 #: ../../Zotlabs/Module/Connections.php:63
 #: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:279
+#: ../../Zotlabs/Module/Connections.php:287
 msgid "Blocked"
 msgstr "Bloqueadas"
 
 #: ../../Zotlabs/Module/Connections.php:68
 #: ../../Zotlabs/Module/Connections.php:189
-#: ../../Zotlabs/Module/Connections.php:278
+#: ../../Zotlabs/Module/Connections.php:286
 msgid "Ignored"
 msgstr "Ignoradas"
 
 #: ../../Zotlabs/Module/Connections.php:73
 #: ../../Zotlabs/Module/Connections.php:203
-#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Connections.php:285
 msgid "Hidden"
 msgstr "Ocultas"
 
@@ -12544,7 +12294,7 @@ msgstr "Archivadas o inaccesibles"
 
 #: ../../Zotlabs/Module/Connections.php:83
 #: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:180
-#: ../../Zotlabs/Module/Notifications.php:53
+#: ../../Zotlabs/Module/Notifications.php:101
 msgid "New"
 msgstr "Nuevas"
 
@@ -12580,75 +12330,71 @@ msgstr "Mostrar solo las conexiones ocultas"
 msgid "Show all connections"
 msgstr "Mostrar todas las conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Connections.php:283
 msgid "Pending approval"
 msgstr "Pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connections.php:276
+#: ../../Zotlabs/Module/Connections.php:284
 msgid "Archived"
 msgstr "Archivadas"
 
-#: ../../Zotlabs/Module/Connections.php:280
+#: ../../Zotlabs/Module/Connections.php:288
 msgid "Not connected at this location"
 msgstr "No está conectado/a en esta ubicación"
 
-#: ../../Zotlabs/Module/Connections.php:319
+#: ../../Zotlabs/Module/Connections.php:327
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../Zotlabs/Module/Connections.php:320
+#: ../../Zotlabs/Module/Connections.php:328
 msgid "Edit connection"
 msgstr "Editar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:322
+#: ../../Zotlabs/Module/Connections.php:330
 msgid "Delete connection"
 msgstr "Eliminar conexión"
 
-#: ../../Zotlabs/Module/Connections.php:331
+#: ../../Zotlabs/Module/Connections.php:336
 msgid "Channel address"
 msgstr "Dirección del canal"
 
-#: ../../Zotlabs/Module/Connections.php:336
+#: ../../Zotlabs/Module/Connections.php:341
 msgid "Call"
 msgstr "Llamar"
 
-#: ../../Zotlabs/Module/Connections.php:338
+#: ../../Zotlabs/Module/Connections.php:343
 msgid "Status"
 msgstr "Estado"
 
-#: ../../Zotlabs/Module/Connections.php:340
+#: ../../Zotlabs/Module/Connections.php:346
 msgid "Connected"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Connections.php:342
-msgid "Approve connection"
-msgstr "Aprobar esta conexión"
-
-#: ../../Zotlabs/Module/Connections.php:344
+#: ../../Zotlabs/Module/Connections.php:350
 msgid "Ignore connection"
 msgstr "Ignorar esta conexión"
 
-#: ../../Zotlabs/Module/Connections.php:345
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../../Zotlabs/Module/Connections.php:346
+#: ../../Zotlabs/Module/Connections.php:352
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:352
+#: ../../Zotlabs/Module/Connections.php:358
 msgid "Connect at this location"
 msgstr "Conectar en esta ubicación "
 
-#: ../../Zotlabs/Module/Connections.php:380
+#: ../../Zotlabs/Module/Connections.php:395
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Contact role"
+msgstr "Rol del contacto"
+
+#: ../../Zotlabs/Module/Connections.php:396
 msgid "Search your connections"
 msgstr "Buscar sus conexiones"
 
-#: ../../Zotlabs/Module/Connections.php:381
-msgid "Connections search"
-msgstr "Buscar conexiones"
+#: ../../Zotlabs/Module/Connections.php:397
+msgid "Contact search"
+msgstr "Buscar  contacto"
 
 #: ../../Zotlabs/Module/Cover_photo.php:196
 #: ../../Zotlabs/Module/Cover_photo.php:254
@@ -12659,10 +12405,26 @@ msgstr "Imágenes de portada del perfil"
 msgid "Your cover photo may be visible to anybody on the internet"
 msgstr "La foto de la portada puede ser visible para cualquiera en Internet"
 
+#: ../../Zotlabs/Module/Cover_photo.php:420
+msgid "Upload File:"
+msgstr "Subir fichero:"
+
+#: ../../Zotlabs/Module/Cover_photo.php:421
+msgid "Select a profile:"
+msgstr "Seleccionar un perfil:"
+
 #: ../../Zotlabs/Module/Cover_photo.php:422
 msgid "Change Cover Photo"
 msgstr "Cambiar la foto de portada del perfil"
 
+#: ../../Zotlabs/Module/Cover_photo.php:438
+msgid "Select existing photo"
+msgstr "Seleccionar una foto"
+
+#: ../../Zotlabs/Module/Cover_photo.php:458
+msgid "Done Editing"
+msgstr "Edición completada"
+
 #: ../../Zotlabs/Module/Photos.php:80
 msgid "Page owner information could not be retrieved."
 msgstr "La información del propietario de la página no pudo ser recuperada."
@@ -12675,156 +12437,156 @@ msgstr "Álbum no encontrado."
 msgid "Delete Album"
 msgstr "Borrar álbum"
 
-#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1059
+#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1065
 msgid "Delete Photo"
 msgstr "Borrar foto"
 
-#: ../../Zotlabs/Module/Photos.php:530
+#: ../../Zotlabs/Module/Photos.php:534
 msgid "No photos selected"
 msgstr "No hay fotos seleccionadas"
 
-#: ../../Zotlabs/Module/Photos.php:579
+#: ../../Zotlabs/Module/Photos.php:583
 msgid "Access to this item is restricted."
 msgstr "El acceso a este elemento está restringido."
 
-#: ../../Zotlabs/Module/Photos.php:622
+#: ../../Zotlabs/Module/Photos.php:626
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:625
+#: ../../Zotlabs/Module/Photos.php:629
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:671
 msgid "Upload Photos"
 msgstr "Subir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:671
+#: ../../Zotlabs/Module/Photos.php:675
 msgid "Enter an album name"
 msgstr "Introducir un nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:672
+#: ../../Zotlabs/Module/Photos.php:676
 msgid "or select an existing album (doubleclick)"
 msgstr "o seleccionar un álbum (con un doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:673
+#: ../../Zotlabs/Module/Photos.php:677
 msgid "Create a status post for this upload"
 msgstr "Crear un mensaje de estado para esta subida"
 
-#: ../../Zotlabs/Module/Photos.php:675
+#: ../../Zotlabs/Module/Photos.php:679
 msgid "Description (optional)"
 msgstr "Descripción (opcional)"
 
-#: ../../Zotlabs/Module/Photos.php:761
+#: ../../Zotlabs/Module/Photos.php:767
 msgid "Show Newest First"
 msgstr "Mostrar lo más reciente primero"
 
-#: ../../Zotlabs/Module/Photos.php:763
+#: ../../Zotlabs/Module/Photos.php:769
 msgid "Show Oldest First"
 msgstr "Mostrar lo más antiguo primero"
 
-#: ../../Zotlabs/Module/Photos.php:820 ../../Zotlabs/Module/Photos.php:1364
+#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1368
 msgid "Add Photos"
 msgstr "Añadir fotos"
 
-#: ../../Zotlabs/Module/Photos.php:868
+#: ../../Zotlabs/Module/Photos.php:874
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
 
-#: ../../Zotlabs/Module/Photos.php:870
+#: ../../Zotlabs/Module/Photos.php:876
 msgid "Photo not available"
 msgstr "Foto no disponible"
 
-#: ../../Zotlabs/Module/Photos.php:928
+#: ../../Zotlabs/Module/Photos.php:934
 msgid "Use as profile photo"
 msgstr "Usar como foto del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:929
+#: ../../Zotlabs/Module/Photos.php:935
 msgid "Use as cover photo"
 msgstr "Usar como imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Photos.php:936
+#: ../../Zotlabs/Module/Photos.php:942
 msgid "Private Photo"
 msgstr "Foto privada"
 
-#: ../../Zotlabs/Module/Photos.php:951
+#: ../../Zotlabs/Module/Photos.php:957
 msgid "View Full Size"
 msgstr "Ver tamaño completo"
 
-#: ../../Zotlabs/Module/Photos.php:1033
+#: ../../Zotlabs/Module/Photos.php:1039
 msgid "Edit photo"
 msgstr "Editar foto"
 
-#: ../../Zotlabs/Module/Photos.php:1035
+#: ../../Zotlabs/Module/Photos.php:1041
 msgid "Rotate CW (right)"
 msgstr "Girar CW (a la derecha)"
 
-#: ../../Zotlabs/Module/Photos.php:1036
+#: ../../Zotlabs/Module/Photos.php:1042
 msgid "Rotate CCW (left)"
 msgstr "Girar CCW (a la izquierda)"
 
-#: ../../Zotlabs/Module/Photos.php:1039
+#: ../../Zotlabs/Module/Photos.php:1045
 msgid "Move photo to album"
 msgstr "Mover la foto a un álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1040
+#: ../../Zotlabs/Module/Photos.php:1046
 msgid "Enter a new album name"
 msgstr "Introducir un nuevo nombre de álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1041
+#: ../../Zotlabs/Module/Photos.php:1047
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleccionar un álbum (con un doble click)"
 
-#: ../../Zotlabs/Module/Photos.php:1046
+#: ../../Zotlabs/Module/Photos.php:1052
 msgid "Add a Tag"
 msgstr "Añadir una etiqueta"
 
-#: ../../Zotlabs/Module/Photos.php:1054
+#: ../../Zotlabs/Module/Photos.php:1060
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 
-#: ../../Zotlabs/Module/Photos.php:1057
+#: ../../Zotlabs/Module/Photos.php:1063
 msgid "Flag as adult in album view"
 msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318
+#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:347
 msgid "I like this (toggle)"
 msgstr "Me gusta (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:319
+#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:348
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:824
+#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:862
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../Zotlabs/Lib/ThreadItem.php:251
+#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150
+#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../Zotlabs/Lib/ThreadItem.php:280
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../Zotlabs/Module/Photos.php:1247
+#: ../../Zotlabs/Module/Photos.php:1251
 msgid "Photo Tools"
 msgstr "Gestión de las fotos"
 
-#: ../../Zotlabs/Module/Photos.php:1256
+#: ../../Zotlabs/Module/Photos.php:1260
 msgid "In This Photo:"
 msgstr "En esta foto:"
 
-#: ../../Zotlabs/Module/Photos.php:1261
+#: ../../Zotlabs/Module/Photos.php:1265
 msgid "Map"
 msgstr "Mapa"
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:491
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:527
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Photos.php:1270 ../../Zotlabs/Lib/ThreadItem.php:492
+#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:528
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
@@ -12853,7 +12615,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1761
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -12898,7 +12660,7 @@ msgstr "Introduzca y envíe su dirección de correo electrónico para el restabl
 msgid "Email Address"
 msgstr "Dirección de correo electrónico"
 
-#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78
+#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:76
 msgid "Reset"
 msgstr "Reiniciar"
 
@@ -12920,8 +12682,8 @@ msgid ""
 "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/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186
-#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661
+#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214
+#: ../../Zotlabs/Module/Profiles.php:643
 msgid "Profile not found."
 msgstr "Perfil no encontrado."
 
@@ -12945,230 +12707,238 @@ msgstr "Perfil no disponible para clonar."
 msgid "Profile unavailable to export."
 msgstr "Perfil no disponible para exportar."
 
-#: ../../Zotlabs/Module/Profiles.php:254
+#: ../../Zotlabs/Module/Profiles.php:225
 msgid "Profile Name is required."
 msgstr "Se necesita el nombre del perfil."
 
-#: ../../Zotlabs/Module/Profiles.php:461
+#: ../../Zotlabs/Module/Profiles.php:430
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../../Zotlabs/Module/Profiles.php:465
+#: ../../Zotlabs/Module/Profiles.php:434
 msgid "Romantic Partner"
 msgstr "Pareja sentimental"
 
-#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774
+#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:789
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775
+#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:790
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782
+#: ../../Zotlabs/Module/Profiles.php:446 ../../Zotlabs/Module/Profiles.php:797
 msgid "Work/Employment"
 msgstr "Trabajo:"
 
-#: ../../Zotlabs/Module/Profiles.php:480
+#: ../../Zotlabs/Module/Profiles.php:449
 msgid "Religion"
 msgstr "Religión"
 
-#: ../../Zotlabs/Module/Profiles.php:484
+#: ../../Zotlabs/Module/Profiles.php:453
 msgid "Political Views"
 msgstr "Ideas políticas"
 
-#: ../../Zotlabs/Module/Profiles.php:492
+#: ../../Zotlabs/Module/Profiles.php:461
 msgid "Sexual Preference"
 msgstr "Preferencia sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:496
+#: ../../Zotlabs/Module/Profiles.php:465
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../../Zotlabs/Module/Profiles.php:500
+#: ../../Zotlabs/Module/Profiles.php:469
 msgid "Interests"
 msgstr "Intereses"
 
-#: ../../Zotlabs/Module/Profiles.php:596
+#: ../../Zotlabs/Module/Profiles.php:577
 msgid "Profile updated."
 msgstr "Perfil actualizado."
 
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Hide your connections list from viewers of this profile"
-msgstr "Ocultar la lista de conexiones a los visitantes del perfil"
+#: ../../Zotlabs/Module/Profiles.php:673
+msgid "Hide my connections from viewers of this profile"
+msgstr "Ocultar mis conexiones a los espectadores de este perfil"
+
+#: ../../Zotlabs/Module/Profiles.php:686
+msgid "Publish my default profile in the network directory"
+msgstr "Publicar mi perfil por defecto en el directorio de la red"
+
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Suggest me as a potential contact to new members"
+msgstr "Sugerirme como contacto potencial a los nuevos miembros"
+
+#: ../../Zotlabs/Module/Profiles.php:698
+msgid "Reveal my online status"
+msgstr "Revelar mi estado en línea"
 
-#: ../../Zotlabs/Module/Profiles.php:724
+#: ../../Zotlabs/Module/Profiles.php:739
 msgid "Edit Profile Details"
 msgstr "Modificar los detalles de este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:726
+#: ../../Zotlabs/Module/Profiles.php:741
 msgid "View this profile"
 msgstr "Ver este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:728
+#: ../../Zotlabs/Module/Profiles.php:743
 msgid "Profile Tools"
 msgstr "Gestión del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:729
+#: ../../Zotlabs/Module/Profiles.php:744
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:731
+#: ../../Zotlabs/Module/Profiles.php:746
 msgid "Create a new profile using these settings"
 msgstr "Crear un nuevo perfil usando estos ajustes"
 
-#: ../../Zotlabs/Module/Profiles.php:732
+#: ../../Zotlabs/Module/Profiles.php:747
 msgid "Clone this profile"
 msgstr "Clonar este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:733
+#: ../../Zotlabs/Module/Profiles.php:748
 msgid "Delete this profile"
 msgstr "Eliminar este perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:734
+#: ../../Zotlabs/Module/Profiles.php:749
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Personal"
-msgstr "Personales"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "Basic"
+msgstr "Básico"
 
-#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Profiles.php:752
 msgid "Relationship"
 msgstr "Relación"
 
-#: ../../Zotlabs/Module/Profiles.php:740
+#: ../../Zotlabs/Module/Profiles.php:755
 msgid "Import profile from file"
 msgstr "Importar perfil desde un fichero"
 
-#: ../../Zotlabs/Module/Profiles.php:741
+#: ../../Zotlabs/Module/Profiles.php:756
 msgid "Export profile to file"
 msgstr "Exportar perfil a un fichero"
 
-#: ../../Zotlabs/Module/Profiles.php:742
+#: ../../Zotlabs/Module/Profiles.php:757
 msgid "Your gender"
 msgstr "Género"
 
-#: ../../Zotlabs/Module/Profiles.php:743
+#: ../../Zotlabs/Module/Profiles.php:758
 msgid "Marital status"
 msgstr "Estado civil"
 
-#: ../../Zotlabs/Module/Profiles.php:744
+#: ../../Zotlabs/Module/Profiles.php:759
 msgid "Sexual preference"
 msgstr "Preferencia sexual"
 
-#: ../../Zotlabs/Module/Profiles.php:747
+#: ../../Zotlabs/Module/Profiles.php:762
 msgid "Profile name"
 msgstr "Nombre del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:749
+#: ../../Zotlabs/Module/Profiles.php:764
 msgid "This is your default profile."
 msgstr "Este es su perfil principal."
 
-#: ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Profiles.php:766
 msgid "Your full name"
 msgstr "Nombre completo"
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:767
 msgid "Short title/description"
 msgstr "Breve título y descripción"
 
-#: ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Profiles.php:767
 msgid "Maximal 190 characters"
 msgstr "Máximo de 190 caracteres"
 
-#: ../../Zotlabs/Module/Profiles.php:755
+#: ../../Zotlabs/Module/Profiles.php:770
 msgid "Street address"
 msgstr "Dirección"
 
-#: ../../Zotlabs/Module/Profiles.php:756
+#: ../../Zotlabs/Module/Profiles.php:771
 msgid "Locality/City"
 msgstr "Ciudad"
 
-#: ../../Zotlabs/Module/Profiles.php:757
+#: ../../Zotlabs/Module/Profiles.php:772
 msgid "Region/State"
 msgstr "Región o Estado"
 
-#: ../../Zotlabs/Module/Profiles.php:758
+#: ../../Zotlabs/Module/Profiles.php:773
 msgid "Postal/Zip code"
 msgstr "Código postal"
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:779
 msgid "Who (if applicable)"
 msgstr "Quién (si es pertinente)"
 
-#: ../../Zotlabs/Module/Profiles.php:764
+#: ../../Zotlabs/Module/Profiles.php:779
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
 
-#: ../../Zotlabs/Module/Profiles.php:765
+#: ../../Zotlabs/Module/Profiles.php:780
 msgid "Since (date)"
 msgstr "Desde (fecha)"
 
-#: ../../Zotlabs/Module/Profiles.php:768
+#: ../../Zotlabs/Module/Profiles.php:783
 msgid "Tell us about yourself"
 msgstr "Háblenos de usted"
 
-#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../Zotlabs/Module/Profiles.php:785
 msgid "Hometown"
 msgstr "Lugar de nacimiento"
 
-#: ../../Zotlabs/Module/Profiles.php:771
+#: ../../Zotlabs/Module/Profiles.php:786
 msgid "Political views"
 msgstr "Ideas políticas"
 
-#: ../../Zotlabs/Module/Profiles.php:772
+#: ../../Zotlabs/Module/Profiles.php:787
 msgid "Religious views"
 msgstr "Creencias religiosas"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:788
 msgid "Keywords used in directory listings"
 msgstr "Palabras clave utilizadas en los listados de directorios"
 
-#: ../../Zotlabs/Module/Profiles.php:773
+#: ../../Zotlabs/Module/Profiles.php:788
 msgid "Example: fishing photography software"
 msgstr "Por ejemplo: software de fotografía submarina"
 
-#: ../../Zotlabs/Module/Profiles.php:776
+#: ../../Zotlabs/Module/Profiles.php:791
 msgid "Musical interests"
 msgstr "Preferencias musicales"
 
-#: ../../Zotlabs/Module/Profiles.php:777
+#: ../../Zotlabs/Module/Profiles.php:792
 msgid "Books, literature"
 msgstr "Libros, literatura"
 
-#: ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Profiles.php:793
 msgid "Television"
 msgstr "Televisión"
 
-#: ../../Zotlabs/Module/Profiles.php:779
+#: ../../Zotlabs/Module/Profiles.php:794
 msgid "Film/Dance/Culture/Entertainment"
 msgstr "Cine, danza, cultura, entretenimiento"
 
-#: ../../Zotlabs/Module/Profiles.php:780
+#: ../../Zotlabs/Module/Profiles.php:795
 msgid "Hobbies/Interests"
 msgstr "Aficiones o intereses"
 
-#: ../../Zotlabs/Module/Profiles.php:781
+#: ../../Zotlabs/Module/Profiles.php:796
 msgid "Love/Romance"
 msgstr "Vida sentimental o amorosa"
 
-#: ../../Zotlabs/Module/Profiles.php:783
+#: ../../Zotlabs/Module/Profiles.php:798
 msgid "School/Education"
 msgstr "Estudios"
 
-#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Profiles.php:799
 msgid "Contact information and social networks"
 msgstr "Información de contacto y redes sociales"
 
-#: ../../Zotlabs/Module/Profiles.php:785
+#: ../../Zotlabs/Module/Profiles.php:800
 msgid "My other channels"
 msgstr "Mis otros canales"
 
-#: ../../Zotlabs/Module/Profiles.php:787
-msgid "Communications"
-msgstr "Comunicaciones"
-
 #: ../../Zotlabs/Module/Subthread.php:128
 #, php-format
 msgid "%1$s is following %2$s's %3$s"
@@ -13179,15 +12949,7 @@ msgstr "%1$s está siguiendo %3$s de %2$s"
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr "%1$s ha dejado de seguir %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Articles.php:52
-msgid "Articles App"
-msgstr "App Artículos"
-
-#: ../../Zotlabs/Module/Articles.php:53
-msgid "Create interactive articles"
-msgstr "Crear artículos interactivos"
-
-#: ../../Zotlabs/Module/Articles.php:116
+#: ../../Zotlabs/Module/Articles.php:114
 msgid "Add Article"
 msgstr "Añadir un artículo"
 
@@ -13195,30 +12957,10 @@ msgstr "Añadir un artículo"
 msgid "Bookmark added"
 msgstr "Marcador añadido"
 
-#: ../../Zotlabs/Module/Bookmarks.php:78
-msgid "Bookmarks App"
-msgstr "App Marcadores"
-
-#: ../../Zotlabs/Module/Bookmarks.php:79
-msgid "Bookmark links from posts and manage them"
-msgstr "Añadir enlaces de las entradas a Marcadores y administrarlos"
-
-#: ../../Zotlabs/Module/Bookmarks.php:92
-msgid "My Bookmarks"
-msgstr "Mis marcadores"
-
-#: ../../Zotlabs/Module/Bookmarks.php:103
+#: ../../Zotlabs/Module/Bookmarks.php:101
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
-#: ../../Zotlabs/Module/Probe.php:19
-msgid "Remote Diagnostics App"
-msgstr "App Diagnósticos remotos"
-
-#: ../../Zotlabs/Module/Probe.php:20
-msgid "Perform diagnostics on remote channels"
-msgstr "Realizar diagnósticos en canales remotos"
-
 #: ../../Zotlabs/Module/Changeaddr.php:35
 msgid ""
 "Channel name changes are not allowed within 48 hours of changing the account"
@@ -13241,7 +12983,7 @@ msgstr "Nueva dirección del canal"
 msgid "Rename Channel"
 msgstr "Renombrar el canal"
 
-#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310
+#: ../../Zotlabs/Module/Invite.php:56
 msgid "Invite App"
 msgstr "Solicitar una app"
 
@@ -13262,11 +13004,6 @@ msgstr "Demasiados destinatarios para una invitación (máx %d)"
 msgid "No recipients for this invitation"
 msgstr "No hay destinatarios para esta invitación"
 
-#: ../../Zotlabs/Module/Invite.php:133
-#, php-format
-msgid "(%s) : Not a valid email address"
-msgstr "(%s): No es una dirección de correo electrónico válida"
-
 #: ../../Zotlabs/Module/Invite.php:138
 #, php-format
 msgid "(%s) : Not a real email address"
@@ -13297,31 +13034,31 @@ msgstr "To %s : Entrega exitosa del mensaje."
 msgid "%1$d mail(s) sent, %2$d mail error(s)"
 msgstr "%1$d correo(s) enviado, %2$d error(es) de correo"
 
-#: ../../Zotlabs/Module/Invite.php:315
+#: ../../Zotlabs/Module/Invite.php:314
 msgid "Invites not proposed by configuration"
 msgstr "Invitaciones no propuestas por la configuración"
 
-#: ../../Zotlabs/Module/Invite.php:316
+#: ../../Zotlabs/Module/Invite.php:315
 msgid "Contact the site admin"
 msgstr "Contactar con el administrador del sitio"
 
-#: ../../Zotlabs/Module/Invite.php:332
+#: ../../Zotlabs/Module/Invite.php:331
 msgid "Invites by users not enabled"
 msgstr "Invitaciones de usuarios no habilitadas"
 
-#: ../../Zotlabs/Module/Invite.php:337
+#: ../../Zotlabs/Module/Invite.php:336
 msgid "You have no more invitations available"
 msgstr "No tiene más invitaciones disponibles"
 
-#: ../../Zotlabs/Module/Invite.php:353
+#: ../../Zotlabs/Module/Invite.php:352
 msgid "Not on xchan"
 msgstr "No en xchan"
 
-#: ../../Zotlabs/Module/Invite.php:386
+#: ../../Zotlabs/Module/Invite.php:385
 msgid "All users invitation limit exceeded."
 msgstr "Se ha superado el límite de invitaciones a todos los usuarios."
 
-#: ../../Zotlabs/Module/Invite.php:404
+#: ../../Zotlabs/Module/Invite.php:403
 msgid "Invitation expires after"
 msgstr "La invitación expira después de "
 
@@ -13349,21 +13086,29 @@ msgstr "§ Nota: el/los correo(s) electrónicos enviados quedarán registrados e
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
+#: ../../Zotlabs/Module/Invite.php:539
+msgid "Your message:"
+msgstr "Su mensaje:"
+
 #: ../../Zotlabs/Module/Invite.php:540
 msgid "Invite template"
 msgstr "Plantilla de invitación"
 
+#: ../../Zotlabs/Module/Invite.php:542
+msgid "Subject:"
+msgstr "Asunto:"
+
 #: ../../Zotlabs/Module/Invite.php:548
 msgid "Here you may enter personal notes to the recipient(s)"
 msgstr "Aquí puede introducir notas personales para el/los destinatario(s)"
 
-#: ../../Zotlabs/Module/Notes.php:57
-msgid "Notes App"
-msgstr "App Notas"
+#: ../../Zotlabs/Module/Sse_bs.php:572
+msgid "Private forum"
+msgstr "Foro privado"
 
-#: ../../Zotlabs/Module/Notes.php:58
-msgid "A simple notes app with a widget (note: notes are not encrypted)"
-msgstr "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)"
+#: ../../Zotlabs/Module/Sse_bs.php:572
+msgid "Public forum"
+msgstr "Foro público"
 
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
@@ -13377,71 +13122,42 @@ msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 msgid "Affinity Tool settings updated."
 msgstr "Actualización de los ajustes de Affinity Tool."
 
-#: ../../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 "Esta aplicación presenta un control deslizante en su editor de conexión y también en su página de red. El control deslizante representa su grado de amistad (afinidad) con cada conexión. Le permite acercar o alejar y mostrar conversaciones sólo de sus amigos más cercanos o de todo el mundo en su stream."
-
-#: ../../Zotlabs/Module/Affinity.php:52
-msgid "Affinity Tool App"
-msgstr "App Affinity Tool "
-
-#: ../../Zotlabs/Module/Affinity.php:57
+#: ../../Zotlabs/Module/Affinity.php:54
 msgid ""
 "The numbers below represent the minimum and maximum slider default positions"
 " for your network/stream page as a percentage."
 msgstr "Los números que aparecen a continuación representan las posiciones predeterminadas mínimas y máximas de los controles deslizantes para su red/stream en forma de porcentaje."
 
-#: ../../Zotlabs/Module/Affinity.php:64
+#: ../../Zotlabs/Module/Affinity.php:61
 msgid "Default maximum affinity level"
 msgstr "Nivel máximo de afinidad por defecto"
 
-#: ../../Zotlabs/Module/Affinity.php:64
+#: ../../Zotlabs/Module/Affinity.php:61
 msgid "0-99 default 99"
 msgstr "0-99 por defecto 99"
 
-#: ../../Zotlabs/Module/Affinity.php:70
+#: ../../Zotlabs/Module/Affinity.php:67
 msgid "Default minimum affinity level"
 msgstr "Nivel mínimo de afinidad por defecto"
 
-#: ../../Zotlabs/Module/Affinity.php:70
+#: ../../Zotlabs/Module/Affinity.php:67
 msgid "0-99 - default 0"
 msgstr "0-99 - por defecto 0"
 
-#: ../../Zotlabs/Module/Affinity.php:76
+#: ../../Zotlabs/Module/Affinity.php:73
 msgid "Persistent affinity levels"
 msgstr "Niveles de afinidad persistentes"
 
-#: ../../Zotlabs/Module/Affinity.php:76
+#: ../../Zotlabs/Module/Affinity.php:73
 msgid ""
 "If disabled the max and min levels will be reset to default after page "
 "reload"
 msgstr "Si está desactivado, los niveles máximo y mínimo se restablecerán a los valores predeterminados después de recargar la página."
 
-#: ../../Zotlabs/Module/Affinity.php:84
+#: ../../Zotlabs/Module/Affinity.php:81
 msgid "Affinity Tool Settings"
 msgstr "Ajustes de Affinity Tool"
 
-#: ../../Zotlabs/Module/Rate.php:158
-msgid "Website:"
-msgstr "Sitio web:"
-
-#: ../../Zotlabs/Module/Rate.php:161
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal remoto [%s] (aún no es conocido en este sitio)"
-
-#: ../../Zotlabs/Module/Rate.php:162
-msgid "Rating (this information is public)"
-msgstr "Valoración (esta información es pública)"
-
-#: ../../Zotlabs/Module/Rate.php:163
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Opcionalmente puede explicar su valoración (esta información es pública)"
-
 #: ../../Zotlabs/Module/Settings/Network.php:42
 #: ../../Zotlabs/Module/Settings/Channel_home.php:46
 msgid "Max height of content (in pixels)"
@@ -13460,391 +13176,281 @@ msgstr "Ajustes del stream"
 msgid "Additional Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:329
-msgid "Nobody except yourself"
-msgstr "Nadie excepto usted"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:330
-msgid "Only those you specifically allow"
-msgstr "Solo aquellos a los que usted permita explícitamente"
+#: ../../Zotlabs/Module/Settings/Channel.php:105
+#: ../../Zotlabs/Module/Settings/Channel.php:216
+msgid "Please select a channel role"
+msgstr "Por favor, seleccione un rol de canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:331
-msgid "Approved connections"
-msgstr "Conexiones aprobadas"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:332
-msgid "Any connections"
-msgstr "Cualquier conexión"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:333
-msgid "Anybody on this website"
-msgstr "Cualquiera en este sitio web"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:334
-msgid "Anybody in this network"
-msgstr "Cualquiera en esta red"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:335
-msgid "Anybody authenticated"
-msgstr "Cualquiera que esté autenticado"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:336
-msgid "Anybody on the internet"
-msgstr "Cualquiera en internet"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:411
-msgid "Publish your default profile in the network directory"
-msgstr "Publicar su perfil principal en el directorio de la red"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:416
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:429
+#: ../../Zotlabs/Module/Settings/Channel.php:193
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:432
+#: ../../Zotlabs/Module/Settings/Channel.php:196
 msgid "Your files/photos are accessible via WebDAV at"
 msgstr "Sus archivos y fotos son accesibles a través de WebDAV en "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-msgid "Automatic membership approval"
-msgstr "Aprobación automática de nuevos miembros"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:472
-#: ../../Zotlabs/Module/Defperms.php:256
-msgid ""
-"If enabled, connection requests will be approved without your interaction"
-msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:493
+#: ../../Zotlabs/Module/Settings/Channel.php:227
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:500
+#: ../../Zotlabs/Module/Settings/Channel.php:234
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:502
-msgid "Email Address:"
-msgstr "Dirección de correo electrónico:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid "Your Timezone:"
-msgstr "Su huso horario:"
+#: ../../Zotlabs/Module/Settings/Channel.php:235
+msgid "Channel timezone:"
+msgstr "Zona horaria del canal: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
-msgid "Default Post Location:"
-msgstr "Localización geográfica predeterminada para sus publicaciones:"
+#: ../../Zotlabs/Module/Settings/Channel.php:236
+msgid "Default post location:"
+msgstr "Ubicación de publicación predeterminada: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:504
+#: ../../Zotlabs/Module/Settings/Channel.php:236
 msgid "Geographical location to display on your posts"
 msgstr "Localización geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:505
-msgid "Use Browser Location:"
-msgstr "Usar la localización geográfica del navegador:"
+#: ../../Zotlabs/Module/Settings/Channel.php:237
+msgid "Use browser location"
+msgstr "Usar la localización del navegador: "
 
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Adult Content"
+#: ../../Zotlabs/Module/Settings/Channel.php:238
+msgid "Adult content"
 msgstr "Contenido solo para adultos"
 
-#: ../../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 "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Security and Privacy Settings"
-msgstr "Configuración de seguridad y privacidad"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Hide my online presence"
-msgstr "Ocultar mi presencia en línea"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:513
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Evitar mostrar en su perfil que está en línea"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:515
-msgid "Simple Privacy Settings:"
-msgstr "Configuración de privacidad sencilla:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:516
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</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>"
-msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:518
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid "Allow others to tag your posts"
-msgstr "Permitir a otros etiquetar sus publicaciones"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:521
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:523
-msgid "Channel Permission Limits"
-msgstr "Límites de los permisos del canal"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Expire other channel content after this many days"
-msgstr "Caducar contenido de otros canales después de este número de días"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "0 or blank to use the website limit."
-msgstr "0 o en blanco para usar el límite del sitio web."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-#, php-format
-msgid "This website expires after %d days."
-msgstr "Este sitio web caduca después de %d días."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "This website does not expire imported content."
-msgstr "Este sitio web no caduca el contenido importado."
+#: ../../Zotlabs/Module/Settings/Channel.php:238
+msgid "This channel frequently or regularly publishes adult content"
+msgstr "Este canal publica con frecuencia o regularmente contenidos para adultos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "The website limit takes precedence if lower than your limit."
-msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite."
-
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Zotlabs/Module/Settings/Channel.php:239
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:526
+#: ../../Zotlabs/Module/Settings/Channel.php:239
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:527
-msgid "Default Privacy Group"
-msgstr "Grupo de canales predeterminado"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "Use my default audience setting for the type of object published"
-msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:538
-msgid "Default permissions category"
-msgstr "Categoría de permisos por defecto"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Máximo de mensajes privados por día de gente desconocida:"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:544
-msgid "Useful to reduce spamming"
-msgstr "Útil para reducir el envío de correo no deseado"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:547
+#: ../../Zotlabs/Module/Settings/Channel.php:240
 #: ../../Zotlabs/Lib/Enotify.php:68
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:548
+#: ../../Zotlabs/Module/Settings/Channel.php:241
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:549
+#: ../../Zotlabs/Module/Settings/Channel.php:242
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:243
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:551
+#: ../../Zotlabs/Module/Settings/Channel.php:244
 msgid "making an <em>interesting</em> profile change"
 msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:552
+#: ../../Zotlabs/Module/Settings/Channel.php:245
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:553
+#: ../../Zotlabs/Module/Settings/Channel.php:246
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:554
+#: ../../Zotlabs/Module/Settings/Channel.php:247
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:248
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:249
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../Zotlabs/Module/Settings/Channel.php:250
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:558
+#: ../../Zotlabs/Module/Settings/Channel.php:251
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:559
+#: ../../Zotlabs/Module/Settings/Channel.php:252
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:560
+#: ../../Zotlabs/Module/Settings/Channel.php:253
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Reciba un toque o incitación en una publicación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:562
+#: ../../Zotlabs/Module/Settings/Channel.php:254
 msgid "Someone likes your post/comment"
 msgstr "Alguien muestre agrado por su entrada o comentario"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:565
+#: ../../Zotlabs/Module/Settings/Channel.php:255
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:567
+#: ../../Zotlabs/Module/Settings/Channel.php:256
 msgid "Unseen stream activity"
 msgstr "Actividad del stream no vista"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:568
+#: ../../Zotlabs/Module/Settings/Channel.php:257
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
+#: ../../Zotlabs/Module/Settings/Channel.php:258
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:569
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:258
+#: ../../Zotlabs/Module/Settings/Channel.php:263
+#: ../../Zotlabs/Module/Settings/Channel.php:264
+#: ../../Zotlabs/Module/Settings/Channel.php:265
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:570
+#: ../../Zotlabs/Module/Settings/Channel.php:259
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:260
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:261
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:572
+#: ../../Zotlabs/Module/Settings/Channel.php:261
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:573
+#: ../../Zotlabs/Module/Settings/Channel.php:262
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:574
+#: ../../Zotlabs/Module/Settings/Channel.php:263
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:575
+#: ../../Zotlabs/Module/Settings/Channel.php:264
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:576
+#: ../../Zotlabs/Module/Settings/Channel.php:265
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:577
+#: ../../Zotlabs/Module/Settings/Channel.php:266
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:578
+#: ../../Zotlabs/Module/Settings/Channel.php:267
 msgid "Unseen shared files"
 msgstr "Ficheros compartidos no vistos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:579
+#: ../../Zotlabs/Module/Settings/Channel.php:268
 msgid "Unseen public stream activity"
 msgstr "Actividad del stream público no vista"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:580
+#: ../../Zotlabs/Module/Settings/Channel.php:269
 msgid "Unseen likes and dislikes"
 msgstr "Los \"me gusta\" y \"no me gusta\" no vistos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:581
+#: ../../Zotlabs/Module/Settings/Channel.php:270
 msgid "Unseen forum posts"
 msgstr "Entradas no vistas en el foro"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Zotlabs/Module/Settings/Channel.php:271
 msgid "Email notification hub (hostname)"
 msgstr "Email de notificación del hub (nombre del host)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:582
+#: ../../Zotlabs/Module/Settings/Channel.php:271
 #, 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 "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:583
+#: ../../Zotlabs/Module/Settings/Channel.php:272
 msgid "Show new wall posts, private messages and connections under Notices"
 msgstr "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:273
+msgid "Mark all notices of the thread read if a notice is clicked"
+msgstr "Marcar todos los avisos del hilo como leídos si se hace clic en un aviso"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:273
+msgid "If no, only the clicked notice will be marked read"
+msgstr "Si no, sólo se marcará como leída la notificación en la que se haya hecho clic"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:274
+msgid ""
+"Desktop notifications are unavailable because the required browser "
+"permission has not been granted"
+msgstr "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso necesario al navegador"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:275
+msgid "Grant permission"
+msgstr "Permiso concedido"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:276
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:585
+#: ../../Zotlabs/Module/Settings/Channel.php:276
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:590
-msgid "Advanced Account/Page Type Settings"
-msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:591
-msgid "Change the behaviour of this account for special situations"
-msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:593
-msgid "Miscellaneous Settings"
-msgstr "Ajustes diversos"
-
-#: ../../Zotlabs/Module/Settings/Channel.php:594
+#: ../../Zotlabs/Module/Settings/Channel.php:279
 msgid "Default photo upload folder"
 msgstr "Carpeta por defecto de las fotos subidas"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:594
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+#: ../../Zotlabs/Module/Settings/Channel.php:280
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:595
+#: ../../Zotlabs/Module/Settings/Channel.php:280
 msgid "Default file upload folder"
 msgstr "Carpeta por defecto de los ficheros subidos"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:597
+#: ../../Zotlabs/Module/Settings/Channel.php:282
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "Expire other channel content after this many days"
+msgstr "Caducar contenido de otros canales después de este número de días"
+
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "0 or blank to use the website limit."
+msgstr "0 o en blanco para usar el límite del sitio web."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+#, php-format
+msgid "This website expires after %d days."
+msgstr "Este sitio web caduca después de %d días."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "This website does not expire imported content."
+msgstr "Este sitio web no caduca el contenido importado."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "The website limit takes precedence if lower than your limit."
+msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite."
+
+#: ../../Zotlabs/Module/Settings/Channel.php:284
+#: ../../Zotlabs/Module/Settings/Channel.php:285
+msgid ""
+"Words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
+"leave blank to import all posts"
+msgstr "Palabras una por línea o #tags, $categories, /patterns/, lang=xx, lang!=xx - dejar en blanco para importar todas las entradas"
+
 #: ../../Zotlabs/Module/Settings/Account.php:21
 msgid "Not valid email."
 msgstr "Correo electrónico no válido."
@@ -13937,82 +13543,74 @@ msgstr "Ajustes del canal"
 msgid "Calendar Settings"
 msgstr "Ajustes del calendario"
 
-#: ../../Zotlabs/Module/Settings/Display.php:127
+#: ../../Zotlabs/Module/Settings/Display.php:125
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../Zotlabs/Module/Settings/Display.php:183
+#: ../../Zotlabs/Module/Settings/Display.php:181
 msgid "Display Settings"
 msgstr "Ajustes de visualización"
 
-#: ../../Zotlabs/Module/Settings/Display.php:184
+#: ../../Zotlabs/Module/Settings/Display.php:182
 msgid "Theme Settings"
 msgstr "Ajustes del tema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:185
+#: ../../Zotlabs/Module/Settings/Display.php:183
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados del tema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:186
+#: ../../Zotlabs/Module/Settings/Display.php:184
 msgid "Content Settings"
 msgstr "Ajustes del contenido"
 
-#: ../../Zotlabs/Module/Settings/Display.php:192
+#: ../../Zotlabs/Module/Settings/Display.php:190
 msgid "Display Theme:"
 msgstr "Tema gráfico del perfil:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
+#: ../../Zotlabs/Module/Settings/Display.php:191
 msgid "Select scheme"
 msgstr "Elegir un esquema"
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
+#: ../../Zotlabs/Module/Settings/Display.php:193
 msgid "Preload images before rendering the page"
 msgstr "Carga previa de las imágenes antes de generar la página"
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
+#: ../../Zotlabs/Module/Settings/Display.php:193
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre."
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
+#: ../../Zotlabs/Module/Settings/Display.php:194
 msgid "Enable user zoom on mobile devices"
 msgstr "Habilitar zoom de usuario en dispositivos móviles"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Zotlabs/Module/Settings/Display.php:195
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
+#: ../../Zotlabs/Module/Settings/Display.php:195
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínimo de 10 segundos, sin máximo"
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
+#: ../../Zotlabs/Module/Settings/Display.php:196
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Máximo número de conversaciones a cargar en cualquier momento:"
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
+#: ../../Zotlabs/Module/Settings/Display.php:196
 msgid "Maximum of 30 items"
 msgstr "Máximo de 30 elementos"
 
-#: ../../Zotlabs/Module/Settings/Display.php:199
+#: ../../Zotlabs/Module/Settings/Display.php:197
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostrar emoticonos (smilies) como imágenes"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Provide channel menu in navigation bar"
-msgstr "Proporcionar un menú de canales en la barra de navegación"
-
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Default: channel menu located in app menu"
-msgstr "Predeterminado: menú de canales ubicado en el menú de aplicaciones"
-
-#: ../../Zotlabs/Module/Settings/Display.php:201
+#: ../../Zotlabs/Module/Settings/Display.php:198
 msgid "Link post titles to source"
 msgstr "Enlazar título de la publicación a la fuente original"
 
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Display.php:200
 msgid "Display new member quick links menu"
 msgstr "Mostrar el menú de enlaces rápidos para nuevos miembros"
 
@@ -14032,10 +13630,90 @@ msgstr "Gestión de las conexiones"
 msgid "Photos Settings"
 msgstr "Gestión de las fotos"
 
+#: ../../Zotlabs/Module/Settings/Profiles.php:41
+msgid "Default profile for new contacts"
+msgstr "Perfil predeterminado para nuevos contactos"
+
 #: ../../Zotlabs/Module/Settings/Profiles.php:49
 msgid "Profiles Settings"
 msgstr "Gestión de los perfiles"
 
+#: ../../Zotlabs/Module/Settings/Privacy.php:39
+msgid "Privacy settings updated."
+msgstr "Se ha actualizado la configuración de la privacidad."
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:57
+msgid "Only those you specifically allow"
+msgstr "Solo aquellos a los que usted permita explícitamente"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:58
+msgid "Approved connections"
+msgstr "Conexiones aprobadas"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:59
+msgid "Any connections"
+msgstr "Cualquier conexión"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:60
+msgid "Anybody on this website"
+msgstr "Cualquiera en este sitio web"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:61
+msgid "Anybody in this network"
+msgstr "Cualquiera en esta red"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:62
+msgid "Anybody authenticated"
+msgstr "Cualquiera que esté autenticado"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:63
+msgid "Anybody on the internet"
+msgstr "Cualquiera en internet"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:73
+msgid ""
+"Advise: set to \"Anybody on the internet\" and use privacy groups to "
+"restrict access"
+msgstr "Consejo: establezca la opción \"Cualquiera en Internet\" y utilice los grupos de privacidad para restringir el acceso"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:109
+msgid "Privacy Settings"
+msgstr "Ajustes de privacidad"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:114
+msgid "Advanced configuration"
+msgstr "Ajustes avanzados"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:116
+msgid "Proceed with caution"
+msgstr "Proceda con precaución"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:117
+msgid ""
+"Changing advanced configuration settings can impact your, and your contacts "
+"channels functionality and security."
+msgstr "El cambio de los ajustes de configuración avanzada puede afectar a la funcionalidad y seguridad de sus canales y contactos."
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:118
+msgid "Accept the risk and continue"
+msgstr "Aceptar el riesgo y continuar"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+msgid "Automatically approve new contacts"
+msgstr "Aprobar automáticamente nuevos contactos"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+msgid "Opt-out of search engine indexing"
+msgstr "Exclusión de la indexación en los motores de búsqueda"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Group actor"
+msgstr "Grupo de actores"
+
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Allow this channel to act as a forum"
+msgstr "Permitir que este canal actúe como un foro"
+
 #: ../../Zotlabs/Module/Settings/Conversation.php:23
 msgid "Settings saved."
 msgstr "Configuración guardada."
@@ -14084,7 +13762,7 @@ msgstr "El menú se puede usar para guardar marcadores"
 msgid "Submit and proceed"
 msgstr "Enviar y proceder"
 
-#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:131
+#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:124
 msgid "Drop"
 msgstr "Eliminar"
 
@@ -14136,45 +13814,46 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
-#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:90
-msgid "Could not access contact record."
-msgstr "No se ha podido acceder al registro de contacto."
-
-#: ../../Zotlabs/Module/Defperms.php:190
-msgid "Default Permissions App"
-msgstr "App Permisos por defecto"
-
-#: ../../Zotlabs/Module/Defperms.php:191
-msgid "Set custom default permissions for new connections"
-msgstr "Establecer permisos predeterminados personalizados para nuevas conexiones"
-
-#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:860
+#: ../../Zotlabs/Module/Defperms.php:252
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Defperms.php:253
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862
+#: ../../Zotlabs/Module/Defperms.php:253
+msgid ""
+"If enabled, connection requests will be approved without your interaction"
+msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención."
+
+#: ../../Zotlabs/Module/Defperms.php:254
 msgid "Permission role"
 msgstr "Permisos de rol"
 
-#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:863
+#: ../../Zotlabs/Module/Defperms.php:255
 msgid "Add permission role"
 msgstr "Añadir permisos de rol"
 
-#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:876
+#: ../../Zotlabs/Module/Defperms.php:259 ../../Zotlabs/Module/Connedit.php:700
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../Zotlabs/Module/Defperms.php:263
+#: ../../Zotlabs/Module/Defperms.php:260
 msgid "Automatic approval settings"
 msgstr "Opciones de autorización automática"
 
-#: ../../Zotlabs/Module/Defperms.php:271
+#: ../../Zotlabs/Module/Defperms.php:264
+msgid "My Settings"
+msgstr "Mis ajustes"
+
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720
+msgid "Individual Permissions"
+msgstr "Permisos individuales"
+
+#: ../../Zotlabs/Module/Defperms.php:268
 msgid ""
 "Some individual permissions may have been preset or locked based on your "
 "channel type and privacy settings."
@@ -14199,108 +13878,80 @@ msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su can
 msgid "Name and Secret are required"
 msgstr "\"Key\" y \"Secret\" son obligatorios"
 
-#: ../../Zotlabs/Module/Oauth2.php:106
-msgid "OAuth2 Apps Manager App"
-msgstr "Aplicación del administrador de apps OAuth2"
-
-#: ../../Zotlabs/Module/Oauth2.php:107
-msgid "OAuth2 authenticatication tokens for mobile and remote apps"
-msgstr "Tokens de autenticación de OAuth2 para aplicaciones móviles y remotas"
-
-#: ../../Zotlabs/Module/Oauth2.php:115
+#: ../../Zotlabs/Module/Oauth2.php:113
 msgid "Add OAuth2 application"
 msgstr "Añadir aplicación OAuth2"
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
 msgid "Grant Types"
 msgstr "Tipos de permisos"
 
-#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:120
 msgid "leave blank unless your application sepcifically requires this"
 msgstr "Dejar en blanco a menos que su aplicación lo requiera específicamente"
 
-#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
 msgid "Authorization scope"
 msgstr "Alcance de la autorización"
 
-#: ../../Zotlabs/Module/Oauth2.php:134
+#: ../../Zotlabs/Module/Oauth2.php:132
 msgid "OAuth2 Application not found."
 msgstr "No se ha encontrado la aplicación OAuth2."
 
-#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150
+#: ../../Zotlabs/Module/Oauth2.php:147 ../../Zotlabs/Module/Oauth2.php:148
 msgid "leave blank unless your application specifically requires this"
 msgstr "dejar en blanco a menos que su aplicación lo requiera específicamente"
 
-#: ../../Zotlabs/Module/Oauth2.php:192
+#: ../../Zotlabs/Module/Oauth2.php:190
 msgid "Connected OAuth2 Apps"
 msgstr "Aplicaciones OAuth2 conectadas"
 
-#: ../../Zotlabs/Module/Randprof.php:29
-msgid "Random Channel App"
-msgstr "App Canal aleatorio"
-
-#: ../../Zotlabs/Module/Randprof.php:30
-msgid "Visit a random channel in the $Projectname network"
-msgstr "Visitar un canal aleatorio en la red $Projectname"
-
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:38
 msgid "Invalid message"
 msgstr "Mensaje no válido"
 
-#: ../../Zotlabs/Module/Dreport.php:93
+#: ../../Zotlabs/Module/Dreport.php:66
 msgid "no results"
 msgstr "sin resultados"
 
-#: ../../Zotlabs/Module/Dreport.php:107
+#: ../../Zotlabs/Module/Dreport.php:80
 msgid "channel sync processed"
 msgstr "se ha realizado la sincronización del canal"
 
-#: ../../Zotlabs/Module/Dreport.php:111
+#: ../../Zotlabs/Module/Dreport.php:84
 msgid "queued"
 msgstr "encolado"
 
-#: ../../Zotlabs/Module/Dreport.php:115
+#: ../../Zotlabs/Module/Dreport.php:88
 msgid "posted"
 msgstr "enviado"
 
-#: ../../Zotlabs/Module/Dreport.php:119
+#: ../../Zotlabs/Module/Dreport.php:92
 msgid "accepted for delivery"
 msgstr "aceptado para el envío"
 
-#: ../../Zotlabs/Module/Dreport.php:123
+#: ../../Zotlabs/Module/Dreport.php:96
 msgid "updated"
 msgstr "actualizado"
 
-#: ../../Zotlabs/Module/Dreport.php:126
+#: ../../Zotlabs/Module/Dreport.php:99
 msgid "update ignored"
 msgstr "actualización ignorada"
 
-#: ../../Zotlabs/Module/Dreport.php:129
+#: ../../Zotlabs/Module/Dreport.php:102
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../../Zotlabs/Module/Dreport.php:133
+#: ../../Zotlabs/Module/Dreport.php:106
 msgid "recipient not found"
 msgstr "destinatario no encontrado"
 
-#: ../../Zotlabs/Module/Dreport.php:136
-msgid "mail recalled"
-msgstr "mensaje de correo revocado"
-
-#: ../../Zotlabs/Module/Dreport.php:139
-msgid "duplicate mail received"
-msgstr "se ha recibido mensaje duplicado"
-
-#: ../../Zotlabs/Module/Dreport.php:142
-msgid "mail delivered"
-msgstr "correo enviado"
-
-#: ../../Zotlabs/Module/Dreport.php:162
+#: ../../Zotlabs/Module/Dreport.php:126
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de entrega para %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:167
+#: ../../Zotlabs/Module/Dreport.php:131
 msgid "Redeliver"
 msgstr "Volver a enviar"
 
@@ -14365,183 +14016,207 @@ msgstr "Añadir alguna cosa a su perfil"
 msgid "Authentication failed."
 msgstr "Falló la autenticación."
 
+#: ../../Zotlabs/Module/Import_progress.php:36
+msgid "Item sync completed!"
+msgstr "¡Sincronización de artículos completada!"
+
+#: ../../Zotlabs/Module/Import_progress.php:51
+msgid "Item sync completed but no items were found!"
+msgstr "¡Sincronización de artículos completada pero no se ha encontrado ningún artículo!"
+
+#: ../../Zotlabs/Module/Import_progress.php:73
+msgid "File sync completed!"
+msgstr "¡Sincronización de archivos completada!"
+
+#: ../../Zotlabs/Module/Import_progress.php:90
+msgid "File sync completed but no files were found!"
+msgstr "¡La sincronización de archivos se ha completado pero no se ha encontrado ningún archivo!"
+
+#: ../../Zotlabs/Module/Import_progress.php:105
+msgid "Channel clone status"
+msgstr "Estado de clonación del canal"
+
+#: ../../Zotlabs/Module/Import_progress.php:106
+msgid "Item sync status"
+msgstr "Estado de sincronización de artículos"
+
+#: ../../Zotlabs/Module/Import_progress.php:107
+msgid "File sync status"
+msgstr "Estado de sincronización de archivos"
+
+#: ../../Zotlabs/Module/Import_progress.php:114
+msgid "Channel cloning completed!"
+msgstr "Clonación del canal completada."
+
+#: ../../Zotlabs/Module/Import_progress.php:115
+msgid "Resume"
+msgstr "Reanudar"
+
+#: ../../Zotlabs/Module/Import_progress.php:116
+msgid "Only resume if sync stalled!"
+msgstr "Sólo se reanuda si la sincronización se estanca."
+
 #: ../../Zotlabs/Module/Pdledit.php:27
 msgid "Layout updated."
 msgstr "Plantilla actualizada."
 
-#: ../../Zotlabs/Module/Pdledit.php:43
-msgid "PDL Editor App"
-msgstr "App Editor PDL"
-
-#: ../../Zotlabs/Module/Pdledit.php:44
-msgid "Provides the ability to edit system page layouts"
-msgstr "Proporciona la capacidad de editar los diseños de página del sistema"
-
-#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100
+#: ../../Zotlabs/Module/Pdledit.php:55 ../../Zotlabs/Module/Pdledit.php:98
 msgid "Edit System Page Description"
 msgstr "Editor del Sistema de Descripción de Páginas"
 
-#: ../../Zotlabs/Module/Pdledit.php:78
+#: ../../Zotlabs/Module/Pdledit.php:76
 msgid "(modified)"
 msgstr "(modificado)"
 
-#: ../../Zotlabs/Module/Pdledit.php:95
+#: ../../Zotlabs/Module/Pdledit.php:93
 msgid "Layout not found."
 msgstr "Plantilla no encontrada"
 
-#: ../../Zotlabs/Module/Pdledit.php:101
+#: ../../Zotlabs/Module/Pdledit.php:99
 msgid "Module Name:"
 msgstr "Nombre del módulo:"
 
-#: ../../Zotlabs/Module/Pdledit.php:102
+#: ../../Zotlabs/Module/Pdledit.php:100
 msgid "Layout Help"
 msgstr "Ayuda para el diseño de plantillas de página"
 
-#: ../../Zotlabs/Module/Pdledit.php:103
+#: ../../Zotlabs/Module/Pdledit.php:101
 msgid "Edit another layout"
 msgstr "Editar otro diseño"
 
-#: ../../Zotlabs/Module/Pdledit.php:104
+#: ../../Zotlabs/Module/Pdledit.php:102
 msgid "System layout"
 msgstr "Diseño del sistema"
 
-#: ../../Zotlabs/Module/Wiki.php:52
-msgid "Wiki App"
-msgstr "App Wiki"
-
-#: ../../Zotlabs/Module/Wiki.php:53
-msgid "Provide a wiki for your channel"
-msgstr "Proporcionar un wiki para su canal"
-
-#: ../../Zotlabs/Module/Wiki.php:132
+#: ../../Zotlabs/Module/Wiki.php:130
 msgid "Error retrieving wiki"
 msgstr "Error al recuperar el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:139
+#: ../../Zotlabs/Module/Wiki.php:137
 msgid "Error creating zip file export folder"
 msgstr "Error al crear el fichero comprimido zip de la carpeta a exportar"
 
-#: ../../Zotlabs/Module/Wiki.php:190
+#: ../../Zotlabs/Module/Wiki.php:188
 msgid "Error downloading wiki: "
 msgstr "Error al descargar el wiki: "
 
-#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404
+#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Storage/Browser.php:404
 msgid "Download"
 msgstr "Descargar"
 
-#: ../../Zotlabs/Module/Wiki.php:215
+#: ../../Zotlabs/Module/Wiki.php:213
 msgid "Wiki name"
 msgstr "Nombre del wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:214
 msgid "Content type"
 msgstr "Tipo de contenido"
 
-#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Storage/Browser.php:378
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../Zotlabs/Module/Wiki.php:219
+#: ../../Zotlabs/Module/Wiki.php:217
 msgid "Any&nbsp;type"
 msgstr "Cualquier&nbsp;tipo"
 
-#: ../../Zotlabs/Module/Wiki.php:226
+#: ../../Zotlabs/Module/Wiki.php:224
 msgid "Lock content type"
 msgstr "Tipo de contenido bloqueado"
 
-#: ../../Zotlabs/Module/Wiki.php:227
+#: ../../Zotlabs/Module/Wiki.php:225
 msgid "Create a status post for this wiki"
 msgstr "Crear un mensaje de estado para este wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:228
+#: ../../Zotlabs/Module/Wiki.php:226
 msgid "Edit Wiki Name"
 msgstr "Editar el nombre del wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:273
+#: ../../Zotlabs/Module/Wiki.php:271
 msgid "Wiki not found"
 msgstr "Wiki no encontrado"
 
-#: ../../Zotlabs/Module/Wiki.php:299
+#: ../../Zotlabs/Module/Wiki.php:297
 msgid "Rename page"
 msgstr "Renombrar la página"
 
-#: ../../Zotlabs/Module/Wiki.php:320
+#: ../../Zotlabs/Module/Wiki.php:318
 msgid "Error retrieving page content"
 msgstr "Error al recuperar el contenido de la página"
 
-#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330
+#: ../../Zotlabs/Module/Wiki.php:326 ../../Zotlabs/Module/Wiki.php:328
 msgid "New page"
 msgstr "Nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:365
+#: ../../Zotlabs/Module/Wiki.php:363
 msgid "Revision Comparison"
 msgstr "Comparación de revisiones"
 
-#: ../../Zotlabs/Module/Wiki.php:373
+#: ../../Zotlabs/Module/Wiki.php:371
 msgid "Short description of your changes (optional)"
 msgstr "Breve descripción de sus cambios (opcional)"
 
-#: ../../Zotlabs/Module/Wiki.php:393
+#: ../../Zotlabs/Module/Wiki.php:391
 msgid "New page name"
 msgstr "Nombre de la nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:398
+#: ../../Zotlabs/Module/Wiki.php:396
 msgid "Embed image from photo albums"
 msgstr "Incluir una imagen de los álbumes de fotos"
 
-#: ../../Zotlabs/Module/Wiki.php:409
+#: ../../Zotlabs/Module/Wiki.php:407
 msgid "History"
 msgstr "Historial"
 
-#: ../../Zotlabs/Module/Wiki.php:487
+#: ../../Zotlabs/Module/Wiki.php:485
 msgid "Error creating wiki. Invalid name."
 msgstr "Error al crear el wiki: el nombre no es válido."
 
-#: ../../Zotlabs/Module/Wiki.php:494
+#: ../../Zotlabs/Module/Wiki.php:492
 msgid "A wiki with this name already exists."
 msgstr "Ya hay un wiki con este nombre."
 
-#: ../../Zotlabs/Module/Wiki.php:507
+#: ../../Zotlabs/Module/Wiki.php:505
 msgid "Wiki created, but error creating Home page."
 msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio."
 
-#: ../../Zotlabs/Module/Wiki.php:514
+#: ../../Zotlabs/Module/Wiki.php:512
 msgid "Error creating wiki"
 msgstr "Error al crear el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:538
+#: ../../Zotlabs/Module/Wiki.php:536
 msgid "Error updating wiki. Invalid name."
 msgstr "Error al actualizar el wiki. Nombre no válido."
 
-#: ../../Zotlabs/Module/Wiki.php:557
+#: ../../Zotlabs/Module/Wiki.php:555
 msgid "Error updating wiki"
 msgstr "Error al actualizar el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:572
+#: ../../Zotlabs/Module/Wiki.php:570
 msgid "Wiki delete permission denied."
 msgstr "Se ha denegado el permiso para eliminar el wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:582
+#: ../../Zotlabs/Module/Wiki.php:580
 msgid "Error deleting wiki"
 msgstr "Se ha producido un error al eliminar el wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:615
+#: ../../Zotlabs/Module/Wiki.php:613
 msgid "New page created"
 msgstr "Se ha creado la nueva página"
 
-#: ../../Zotlabs/Module/Wiki.php:741
+#: ../../Zotlabs/Module/Wiki.php:739
 msgid "Cannot delete Home"
 msgstr "No se puede eliminar la página principal"
 
-#: ../../Zotlabs/Module/Wiki.php:817
+#: ../../Zotlabs/Module/Wiki.php:815
 msgid "Current Revision"
 msgstr "Revisión actual"
 
-#: ../../Zotlabs/Module/Wiki.php:817
+#: ../../Zotlabs/Module/Wiki.php:815
 msgid "Selected Revision"
 msgstr "Revisión seleccionada"
 
-#: ../../Zotlabs/Module/Wiki.php:872
+#: ../../Zotlabs/Module/Wiki.php:870
 msgid "You must be authenticated."
 msgstr "Debe estar autenticado."
 
@@ -14550,260 +14225,116 @@ msgstr "Debe estar autenticado."
 msgid "Welcome to %s"
 msgstr "Bienvenido a %s"
 
-#: ../../Zotlabs/Module/Suggest.php:40
-msgid "Suggest Channels App"
-msgstr "App Sugerencia de canales"
-
-#: ../../Zotlabs/Module/Suggest.php:41
-msgid ""
-"Suggestions for channels in the $Projectname network you might be interested"
-" in"
-msgstr "Sugerencias de los canales de la red $Projectname en los que puede estar interesado"
-
-#: ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Module/Suggest.php:52
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."
 
-#: ../../Zotlabs/Module/Connedit.php:121
-msgid "Could not locate selected profile."
-msgstr "No se ha podido localizar el perfil seleccionado."
-
-#: ../../Zotlabs/Module/Connedit.php:265
+#: ../../Zotlabs/Module/Connedit.php:171
 msgid "Connection updated."
 msgstr "Conexión actualizada."
 
-#: ../../Zotlabs/Module/Connedit.php:267
+#: ../../Zotlabs/Module/Connedit.php:173
 msgid "Failed to update connection record."
 msgstr "Error al actualizar el registro de la conexión."
 
-#: ../../Zotlabs/Module/Connedit.php:310
-msgid "is now connected to"
-msgstr "ahora está conectado/a"
-
-#: ../../Zotlabs/Module/Connedit.php:435
+#: ../../Zotlabs/Module/Connedit.php:320
 msgid "Could not access address book record."
 msgstr "No se pudo acceder al registro en su libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:483 ../../Zotlabs/Module/Connedit.php:487
+#: ../../Zotlabs/Module/Connedit.php:368
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 
-#: ../../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:382 ../../Zotlabs/Module/Connedit.php:391
+#: ../../Zotlabs/Module/Connedit.php:400 ../../Zotlabs/Module/Connedit.php:409
+#: ../../Zotlabs/Module/Connedit.php:422
 msgid "Unable to set address book parameters."
 msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:441
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Zotlabs/Module/Connedit.php:483
 #, php-format
 msgid "View %s's profile"
 msgstr "Ver el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:608
-msgid "Refresh Permissions"
-msgstr "Recargar los permisos"
-
-#: ../../Zotlabs/Module/Connedit.php:611
-msgid "Fetch updated permissions"
-msgstr "Obtener los permisos actualizados"
-
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Refresh Photo"
-msgstr "Actualizar la foto"
-
-#: ../../Zotlabs/Module/Connedit.php:618
-msgid "Fetch updated photo"
-msgstr "Obtener una foto actualizada"
-
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Zotlabs/Module/Connedit.php:504
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../Zotlabs/Module/Connedit.php:632
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
-
-#: ../../Zotlabs/Module/Connedit.php:633
-msgid "This connection is blocked!"
-msgstr "¡Esta conexión está bloqueada!"
-
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Unignore"
-msgstr "Dejar de ignorar"
-
-#: ../../Zotlabs/Module/Connedit.php:640
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
-
-#: ../../Zotlabs/Module/Connedit.php:641
-msgid "This connection is ignored!"
-msgstr "¡Esta conexión es ignorada!"
-
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Unarchive"
-msgstr "Desarchivar"
-
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid "Archive"
-msgstr "Archivar"
-
-#: ../../Zotlabs/Module/Connedit.php:648
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
-
-#: ../../Zotlabs/Module/Connedit.php:649
-msgid "This connection is archived!"
-msgstr "¡Esta conexión esta archivada!"
-
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Unhide"
-msgstr "Mostrar"
-
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../../Zotlabs/Module/Connedit.php:656
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
-
-#: ../../Zotlabs/Module/Connedit.php:657
-msgid "This connection is hidden!"
-msgstr "¡Esta conexión está oculta!"
-
-#: ../../Zotlabs/Module/Connedit.php:664
-msgid "Delete this connection"
-msgstr "Eliminar esta conexión"
-
-#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Connedit.php:550
 msgid "Fetch Vcard"
 msgstr "Obtener una vcard"
 
-#: ../../Zotlabs/Module/Connedit.php:675
+#: ../../Zotlabs/Module/Connedit.php:553
 msgid "Fetch electronic calling card for this connection"
 msgstr "Obtener una tarjeta de llamada electrónica para esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Open Individual Permissions section by default"
-msgstr "Abrir la sección de permisos individuales por defecto"
-
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Affinity"
-msgstr "Afinidad"
-
-#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Zotlabs/Module/Connedit.php:575
 msgid "Open Set Affinity section by default"
 msgstr "Abrir por defecto la sección para definir la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Module/Connedit.php:612
 msgid "Filter"
 msgstr "Filtrar"
 
-#: ../../Zotlabs/Module/Connedit.php:752
+#: ../../Zotlabs/Module/Connedit.php:615
 msgid "Open Custom Filter section by default"
 msgstr "Abrir por defecto la sección de  personalización de filtros"
 
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Approve this connection"
-msgstr "Aprobar esta conexión"
-
-#: ../../Zotlabs/Module/Connedit.php:789
-msgid "Accept connection to allow communication"
-msgstr "Aceptar la conexión para permitir la comunicación"
-
-#: ../../Zotlabs/Module/Connedit.php:794
+#: ../../Zotlabs/Module/Connedit.php:626
 msgid "Set Affinity"
 msgstr "Ajustar la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:797
+#: ../../Zotlabs/Module/Connedit.php:629
 msgid "Set Profile"
 msgstr "Ajustar el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:800
+#: ../../Zotlabs/Module/Connedit.php:632
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:848
-msgid "This connection is unreachable from this location."
-msgstr "No se puede acceder a la conexión desde este sitio."
-
-#: ../../Zotlabs/Module/Connedit.php:849
-msgid "This connection may be unreachable from other channel locations."
-msgstr "Esta conexión puede ser inaccesible desde otras ubicaciones del canal."
-
-#: ../../Zotlabs/Module/Connedit.php:851
-msgid "Location independence is not supported by their network."
-msgstr "La independencia de ubicación no es compatible con su red."
-
-#: ../../Zotlabs/Module/Connedit.php:857
-msgid ""
-"This connection is unreachable from this location. Location independence is "
-"not supported by their network."
-msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red."
+#: ../../Zotlabs/Module/Connedit.php:685
+#, php-format
+msgid "Contact: %s"
+msgstr "Contacto: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:861
-msgid "Connection requests will be approved without your interaction"
-msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
+#: ../../Zotlabs/Module/Connedit.php:687
+msgid "Manage contact roles"
+msgstr "Gestionar roles de contactos"
 
-#: ../../Zotlabs/Module/Connedit.php:870
-msgid "This connection's primary address is"
-msgstr "La dirección primaria de esta conexión es"
+#: ../../Zotlabs/Module/Connedit.php:694
+msgid "This contacts's primary address is"
+msgstr "La dirección principal de este contactos es "
 
-#: ../../Zotlabs/Module/Connedit.php:871
+#: ../../Zotlabs/Module/Connedit.php:695
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Connection Tools"
-msgstr "Gestión de las conexiones"
-
-#: ../../Zotlabs/Module/Connedit.php:879
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslizar para ajustar el grado de amistad"
-
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "Slide to adjust your rating"
-msgstr "Deslizar para ajustar su valoración"
-
-#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Connedit.php:887
-msgid "Optionally explain your rating"
-msgstr "Opcionalmente, puede explicar su valoración"
-
-#: ../../Zotlabs/Module/Connedit.php:884
-msgid "Custom Filter"
-msgstr "Filtro personalizado"
-
-#: ../../Zotlabs/Module/Connedit.php:885
-msgid "Only import posts with this text"
-msgstr "Importar solo entradas que contengan este texto"
-
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "Do not import posts with this text"
-msgstr "No importar entradas que contengan este texto"
-
-#: ../../Zotlabs/Module/Connedit.php:888
-msgid "This information is public!"
-msgstr "¡Esta información es pública!"
+#: ../../Zotlabs/Module/Connedit.php:710
+msgid "Contact Pending Approval"
+msgstr "Contacto pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connedit.php:893
-msgid "Connection Pending Approval"
-msgstr "Conexión pendiente de aprobación"
-
-#: ../../Zotlabs/Module/Connedit.php:898
+#: ../../Zotlabs/Module/Connedit.php:715
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../Zotlabs/Module/Connedit.php:905
+#: ../../Zotlabs/Module/Connedit.php:721
+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 "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+
+#: ../../Zotlabs/Module/Connedit.php:722
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -14811,26 +14342,26 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../Zotlabs/Module/Connedit.php:906
+#: ../../Zotlabs/Module/Connedit.php:723
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Connedit.php:731
 msgid "Details"
 msgstr "Detalles"
 
-#: ../../Zotlabs/Module/Notifications.php:58
-#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:106
+#: ../../Zotlabs/Module/Notify.php:85
 msgid "No more system notifications."
 msgstr "No hay más notificaciones del sistema"
 
-#: ../../Zotlabs/Module/Notifications.php:62
-#: ../../Zotlabs/Module/Notify.php:65
+#: ../../Zotlabs/Module/Notifications.php:110
+#: ../../Zotlabs/Module/Notify.php:89
 msgid "System Notifications"
 msgstr "Notificaciones del sistema"
 
-#: ../../Zotlabs/Module/Notifications.php:63
-#: ../../Zotlabs/Lib/ThreadItem.php:484
+#: ../../Zotlabs/Module/Notifications.php:111
+#: ../../Zotlabs/Lib/ThreadItem.php:520
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
@@ -14846,47 +14377,47 @@ msgstr "Descripción de la plantilla"
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
-#: ../../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 "Dirección no encontrada."
 
-#: ../../Zotlabs/Module/Locs.php:75
+#: ../../Zotlabs/Module/Locs.php:74
 msgid "Location lookup failed."
 msgstr "Ha fallado la búsqueda de la dirección."
 
-#: ../../Zotlabs/Module/Locs.php:79
+#: ../../Zotlabs/Module/Locs.php:78
 msgid ""
 "Please select another location to become primary before removing the primary"
 " location."
 msgstr "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal."
 
-#: ../../Zotlabs/Module/Locs.php:108
+#: ../../Zotlabs/Module/Locs.php:106
 msgid "Syncing locations"
 msgstr "Sincronizando ubicaciones"
 
-#: ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Locs.php:115
 msgid "No locations found."
 msgstr "No encontrada ninguna dirección."
 
-#: ../../Zotlabs/Module/Locs.php:127
+#: ../../Zotlabs/Module/Locs.php:120
 msgid "Manage Channel Locations"
 msgstr "Gestionar las direcciones del canal"
 
-#: ../../Zotlabs/Module/Locs.php:133
+#: ../../Zotlabs/Module/Locs.php:126
 msgid "Sync Now"
 msgstr "Sincronizar ahora"
 
-#: ../../Zotlabs/Module/Locs.php:134
+#: ../../Zotlabs/Module/Locs.php:127
 msgid "Please wait several minutes between consecutive operations."
 msgstr "Por favor, espere algunos minutos entre operaciones consecutivas."
 
-#: ../../Zotlabs/Module/Locs.php:135
+#: ../../Zotlabs/Module/Locs.php:128
 msgid ""
 "When possible, drop a location by logging into that website/hub and removing"
 " your channel."
 msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal."
 
-#: ../../Zotlabs/Module/Locs.php:136
+#: ../../Zotlabs/Module/Locs.php:129
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
 
@@ -14902,177 +14433,133 @@ msgstr "Fuente creada."
 msgid "Source updated."
 msgstr "Fuente actualizada."
 
-#: ../../Zotlabs/Module/Sources.php:88
-msgid "Sources App"
-msgstr "App de Fuentes"
-
-#: ../../Zotlabs/Module/Sources.php:89
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
-
-#: ../../Zotlabs/Module/Sources.php:101
+#: ../../Zotlabs/Module/Sources.php:99
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368
+#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:372
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
-#: ../../Zotlabs/Module/Sources.php:108
+#: ../../Zotlabs/Module/Sources.php:106
 msgid "Manage remote sources of content for your channel."
 msgstr "Gestionar contenido de origen remoto para su canal."
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:117
 msgid "New Source"
 msgstr "Nueva fuente"
 
-#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154
+#: ../../Zotlabs/Module/Sources.php:118 ../../Zotlabs/Module/Sources.php:152
 msgid ""
 "Import all or selected content from the following channel into this channel "
 "and distribute it according to your channel settings."
 msgstr "Importar todo el contenido o una selección de los siguientes canales en este canal y distribuirlo de acuerdo con sus ajustes."
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
 msgid "Only import content with these words (one per line)"
 msgstr "Importar solo contenido que contenga estas palabras (una por línea)"
 
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155
+#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
 msgid "Leave blank to import all public content"
 msgstr "Dejar en blanco para importar todo el contenido público"
 
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161
+#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:159
 msgid "Channel Name"
 msgstr "Nombre del canal"
 
-#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
 msgid ""
 "Add the following categories to posts imported from this source (comma "
 "separated)"
 msgstr "Añadir los temas siguientes a las entradas importadas de esta fuente (separadas por comas)"
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
 msgid "Resend posts with this channel as author"
 msgstr "Reenviar mensajes con este canal como autor"
 
-#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
 msgid "Copyrights may apply"
 msgstr "Se pueden aplicar los derechos de autor"
 
-#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174
+#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Sources.php:172
 msgid "Source not found."
 msgstr "Fuente no encontrada"
 
-#: ../../Zotlabs/Module/Sources.php:151
+#: ../../Zotlabs/Module/Sources.php:149
 msgid "Edit Source"
 msgstr "Editar fuente"
 
-#: ../../Zotlabs/Module/Sources.php:152
+#: ../../Zotlabs/Module/Sources.php:150
 msgid "Delete Source"
 msgstr "Eliminar fuente"
 
-#: ../../Zotlabs/Module/Sources.php:182
+#: ../../Zotlabs/Module/Sources.php:180
 msgid "Source removed"
 msgstr "Fuente eliminada"
 
-#: ../../Zotlabs/Module/Sources.php:184
+#: ../../Zotlabs/Module/Sources.php:182
 msgid "Unable to remove source."
 msgstr "No se puede eliminar la fuente."
 
-#: ../../Zotlabs/Module/Rbmark.php:94
+#: ../../Zotlabs/Module/Rbmark.php:93
 msgid "Select a bookmark folder"
 msgstr "Seleccionar una carpeta de marcadores"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
+#: ../../Zotlabs/Module/Rbmark.php:98
 msgid "Save Bookmark"
 msgstr "Guardar marcador"
 
-#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../Zotlabs/Module/Rbmark.php:99
 msgid "URL of bookmark"
 msgstr "Dirección del marcador"
 
-#: ../../Zotlabs/Module/Rbmark.php:105
+#: ../../Zotlabs/Module/Rbmark.php:104
 msgid "Or enter new bookmark folder name"
 msgstr "O introduzca un nuevo nombre para la carpeta de marcadores"
 
-#: ../../Zotlabs/Zot/Auth.php:154
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
-
-#: ../../Zotlabs/Lib/AccessList.php:28
+#: ../../Zotlabs/Lib/AccessList.php:26
 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 "Una lista eliminada con este nombre ha sido reactivada. Los permisos <strong>de los elementos existentes pueden </strong>aplicarse a esta lista y a cualquier miembro futuro. Si esto no es lo que pretendía, por favor, cree otra lista con un nombre diferente."
-
-#: ../../Zotlabs/Lib/AccessList.php:286
-msgid "Add new connections to this access list"
-msgstr "Añadir nuevas conexiones a esta lista de acceso"
-
-#: ../../Zotlabs/Lib/AccessList.php:331
-msgid "Lists"
-msgstr "Listas"
-
-#: ../../Zotlabs/Lib/AccessList.php:332
-msgid "Edit list"
-msgstr "Editar lista"
-
-#: ../../Zotlabs/Lib/AccessList.php:333
-msgid "Create new list"
-msgstr "Crear una nueva lista"
-
-#: ../../Zotlabs/Lib/AccessList.php:334
-msgid "Channels not in any access list"
-msgstr "No hay canales en ninguna lista de acceso"
-
-#: ../../Zotlabs/Lib/Permcat.php:82
-msgctxt "permcat"
-msgid "default"
-msgstr "por defecto"
-
-#: ../../Zotlabs/Lib/Permcat.php:133
-msgctxt "permcat"
-msgid "follower"
-msgstr "seguidor"
+"A deleted privacy group with this name was revived. Existing item "
+"permissions <strong>may</strong> apply to this privacy group and any future "
+"members. If this is not what you intended, please create another privacy "
+"group with a different name."
+msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos que ya existen  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."
 
-#: ../../Zotlabs/Lib/Permcat.php:137
-msgctxt "permcat"
-msgid "contributor"
-msgstr "contribuidor"
+#: ../../Zotlabs/Lib/AccessList.php:268
+msgid "Select a privacy group"
+msgstr "Seleccionar un grupo privado de  canales"
 
-#: ../../Zotlabs/Lib/Permcat.php:141
+#: ../../Zotlabs/Lib/Permcat.php:83
 msgctxt "permcat"
-msgid "publisher"
-msgstr "editor"
+msgid "Default"
+msgstr "Predeterminado"
 
-#: ../../Zotlabs/Lib/Activity.php:2163
+#: ../../Zotlabs/Lib/Activity.php:2354
 #, php-format
 msgid "Likes %1$s's %2$s"
 msgstr "Gusta de %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2166
+#: ../../Zotlabs/Lib/Activity.php:2357
 #, php-format
 msgid "Doesn't like %1$s's %2$s"
 msgstr "No le gusta %2$sde %1$s"
 
-#: ../../Zotlabs/Lib/Activity.php:2172
+#: ../../Zotlabs/Lib/Activity.php:2363
 #, php-format
 msgid "Will attend %s's event"
 msgstr "Asistirá al evento de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2175
+#: ../../Zotlabs/Lib/Activity.php:2366
 #, php-format
 msgid "Will not attend %s's event"
 msgstr "No asistirá al evento de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2178
+#: ../../Zotlabs/Lib/Activity.php:2369
 #, php-format
 msgid "May attend %s's event"
 msgstr "Puede asistir al evento de %s"
 
-#: ../../Zotlabs/Lib/Activity.php:2181
+#: ../../Zotlabs/Lib/Activity.php:2372
 #, php-format
 msgid "May not attend %s's event"
 msgstr "Puede no asistir al evento de %s"
@@ -15107,84 +14594,84 @@ msgstr "Para dejar de recibir estos mensajes, por favor, ajuste su %s"
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../Zotlabs/Lib/Enotify.php:127
+#: ../../Zotlabs/Lib/Enotify.php:128
 #, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
-msgstr "[$Projectname:Aviso] Nuevo correo recibido en %s"
+msgid "[$Projectname:Notify] New direct message received at %s"
+msgstr "[$Projectname:Aviso] Nuevo mensaje directo recibido en %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:129
+#: ../../Zotlabs/Lib/Enotify.php:130
 #, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s le ha enviado un nuevo mensaje privado en %2$s."
+msgid "%1$s sent you a new direct message at %2$s"
+msgstr "%1$s le ha enviado un nuevo mensaje directo en %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
+#: ../../Zotlabs/Lib/Enotify.php:131
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s le ha enviado %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:130
-msgid "a private message"
-msgstr "un mensaje privado"
-
 #: ../../Zotlabs/Lib/Enotify.php:131
+msgid "a direct message"
+msgstr "un mensaje directo"
+
+#: ../../Zotlabs/Lib/Enotify.php:132
 #, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
+msgid "Please visit %s to view and/or reply to your direct messages."
+msgstr "Por favor visite %s para ver y/o responder a su mensaje directo."
 
-#: ../../Zotlabs/Lib/Enotify.php:144
+#: ../../Zotlabs/Lib/Enotify.php:145
 msgid "commented on"
 msgstr "ha comentado sobre "
 
-#: ../../Zotlabs/Lib/Enotify.php:157
+#: ../../Zotlabs/Lib/Enotify.php:158
 msgid "liked"
 msgstr "ha gustado de "
 
-#: ../../Zotlabs/Lib/Enotify.php:160
+#: ../../Zotlabs/Lib/Enotify.php:161
 msgid "disliked"
 msgstr "no ha gustado de "
 
-#: ../../Zotlabs/Lib/Enotify.php:165
+#: ../../Zotlabs/Lib/Enotify.php:166
 msgid "voted on"
 msgstr "votado en "
 
-#: ../../Zotlabs/Lib/Enotify.php:208
+#: ../../Zotlabs/Lib/Enotify.php:209
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]"
 msgstr "%1$s%2$s [zrl=%3$s ]un %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:216
+#: ../../Zotlabs/Lib/Enotify.php:217
 #, 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 de %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:225
+#: ../../Zotlabs/Lib/Enotify.php:226
 #, php-format
 msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]"
 msgstr "%1$s %2$s [zrl=%3$s]su %4$s[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:237
+#: ../../Zotlabs/Lib/Enotify.php:238
 #, php-format
 msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Aviso] Comentario moderado en la conversación #%1$d por %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:239
+#: ../../Zotlabs/Lib/Enotify.php:240
 #, php-format
 msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d"
 
-#: ../../Zotlabs/Lib/Enotify.php:240
+#: ../../Zotlabs/Lib/Enotify.php:241
 #, php-format
-msgid "%1$s commented on an item/conversation you have been following."
+msgid "%1$s commented on an item/conversation you have been following"
 msgstr "%1$sha comentado un elemento/conversación que ha estado siguiendo."
 
-#: ../../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
+#: ../../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 "Para ver o comentar la conversación, visite %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248
+#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249
 #, php-format
 msgid "Please visit %s to approve or reject this comment."
 msgstr "Por favor, visite %s para aprobar o rechazar este comentario."
@@ -15201,7 +14688,7 @@ msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d"
 
 #: ../../Zotlabs/Lib/Enotify.php:321
 #, php-format
-msgid "%1$s liked an item/conversation you created."
+msgid "%1$s liked an item/conversation you created"
 msgstr "A %1$s le ha gustado un elemento o conversación que ha creado usted."
 
 #: ../../Zotlabs/Lib/Enotify.php:332
@@ -15219,149 +14706,193 @@ msgstr "%1$s ha publicado en su muro en %2$s"
 msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
 msgstr "%1$sha publicado en [zrl=%2$s]su muro[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:359
+#: ../../Zotlabs/Lib/Enotify.php:358
 #, php-format
 msgid "[$Projectname:Notify] %s tagged you"
 msgstr "[$Projectname:Aviso] %s le ha etiquetado"
 
-#: ../../Zotlabs/Lib/Enotify.php:360
+#: ../../Zotlabs/Lib/Enotify.php:359
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$sle ha etiquetado en %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:361
+#: ../../Zotlabs/Lib/Enotify.php:360
 #, php-format
 msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
 msgstr "%1$s [zrl=%2$s]le ha etiquetado[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:372
+#: ../../Zotlabs/Lib/Enotify.php:371
 #, php-format
 msgid "[$Projectname:Notify] %1$s poked you"
 msgstr "[$Projectname:Aviso] %1$s le ha dado un toque"
 
-#: ../../Zotlabs/Lib/Enotify.php:373
+#: ../../Zotlabs/Lib/Enotify.php:372
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$sle ha dado un toque en %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:374
+#: ../../Zotlabs/Lib/Enotify.php:373
 #, php-format
 msgid "%1$s [zrl=%2$s]poked you[/zrl]."
 msgstr "%1$s [zrl=%2$s] le ha dado un toque[/zrl]."
 
-#: ../../Zotlabs/Lib/Enotify.php:389
+#: ../../Zotlabs/Lib/Enotify.php:388
 #, php-format
 msgid "[$Projectname:Notify] %s tagged your post"
 msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../Zotlabs/Lib/Enotify.php:389
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$sha etiquetado su entrada en %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:391
+#: ../../Zotlabs/Lib/Enotify.php:390
 #, php-format
 msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
 msgstr "%1$s ha etiquetado [zrl=%2$s]su entrada[/zrl]"
 
-#: ../../Zotlabs/Lib/Enotify.php:402
+#: ../../Zotlabs/Lib/Enotify.php:401
 msgid "[$Projectname:Notify] Introduction received"
 msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión"
 
-#: ../../Zotlabs/Lib/Enotify.php:403
+#: ../../Zotlabs/Lib/Enotify.php:402
 #, php-format
 msgid "You've received an new connection request from '%1$s' at %2$s"
 msgstr "Ha recibido una nueva solicitud de conexión de '%1$s' en %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:404
+#: ../../Zotlabs/Lib/Enotify.php:403
 #, php-format
 msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s."
 msgstr "Ha recibido [zrl=%1$s]una nueva solicitud de conexión[/zrl] de %2$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425
+#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puede visitar su perfil en %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:409
+#: ../../Zotlabs/Lib/Enotify.php:408
 #, php-format
 msgid "Please visit %s to approve or reject the connection request."
 msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
-#: ../../Zotlabs/Lib/Enotify.php:416
+#: ../../Zotlabs/Lib/Enotify.php:415
 msgid "[$Projectname:Notify] Friend suggestion received"
 msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión"
 
-#: ../../Zotlabs/Lib/Enotify.php:417
+#: ../../Zotlabs/Lib/Enotify.php:416
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Ha recibido una sugerencia de amistad de '%1$s' en %2$s"
 
-#: ../../Zotlabs/Lib/Enotify.php:418
+#: ../../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 "Ha recibido [zrl=%1$s]una sugerencia de amistad[/zrl] para %2$s de %3$s."
 
-#: ../../Zotlabs/Lib/Enotify.php:423
+#: ../../Zotlabs/Lib/Enotify.php:422
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../../Zotlabs/Lib/Enotify.php:424
+#: ../../Zotlabs/Lib/Enotify.php:423
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../Zotlabs/Lib/Enotify.php:427
+#: ../../Zotlabs/Lib/Enotify.php:426
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: ../../Zotlabs/Lib/Enotify.php:652
+#: ../../Zotlabs/Lib/Enotify.php:651
 msgid "[$Projectname:Notify]"
 msgstr "[$Projectname:Aviso]"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Zotlabs/Lib/Enotify.php:819
 msgid "created a new poll"
 msgstr "se ha creado una nueva encuesta"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
+#: ../../Zotlabs/Lib/Enotify.php:819
 msgid "created a new post"
 msgstr "ha creado una nueva entrada"
 
-#: ../../Zotlabs/Lib/Enotify.php:821
+#: ../../Zotlabs/Lib/Enotify.php:820
 #, php-format
 msgid "voted on %s's poll"
 msgstr "votado en la encuesta de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:821
+#: ../../Zotlabs/Lib/Enotify.php:820
 #, php-format
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:825
+#: ../../Zotlabs/Lib/Enotify.php:824
 #, php-format
 msgid "repeated %s's post"
 msgstr "repetida la entrada de %s"
 
+#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:931
+msgid "shared a file with you"
+msgstr "compartió un archivo con usted"
+
 #: ../../Zotlabs/Lib/Enotify.php:837
 #, php-format
 msgid "edited a post dated %s"
 msgstr "ha editado una entrada %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:841
+#: ../../Zotlabs/Lib/Enotify.php:840
 #, php-format
 msgid "edited a comment dated %s"
 msgstr "ha editado un comentario %s"
 
-#: ../../Zotlabs/Lib/Enotify.php:970
+#: ../../Zotlabs/Lib/Enotify.php:916
+msgid "added your channel"
+msgstr "añadió este canal a sus conexiones"
+
+#: ../../Zotlabs/Lib/Enotify.php:946
+msgid "sent you a direct message"
+msgstr "enviarle un mensaje directo"
+
+#: ../../Zotlabs/Lib/Enotify.php:953
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../Zotlabs/Lib/Enotify.php:956
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../Zotlabs/Lib/Enotify.php:966
 msgid "created an event"
 msgstr "se creó un evento"
 
-#: ../../Zotlabs/Lib/Enotify.php:986
-msgid "verified"
-msgstr "verificado"
+#: ../../Zotlabs/Lib/Enotify.php:981
+msgid "status verified"
+msgstr "estado verificado"
+
+#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
+msgid "Channel is blocked on this site."
+msgstr "El canal está bloqueado en este sitio."
+
+#: ../../Zotlabs/Lib/Connect.php:51
+msgid "Channel location missing."
+msgstr "Falta la dirección del canal."
+
+#: ../../Zotlabs/Lib/Connect.php:103
+msgid "Remote channel or protocol unavailable."
+msgstr "Canal remoto o protocolo no disponible."
+
+#: ../../Zotlabs/Lib/Connect.php:137
+msgid "Channel discovery failed."
+msgstr "El intento de acceder al canal ha fallado."
+
+#: ../../Zotlabs/Lib/Connect.php:155
+msgid "Protocol disabled."
+msgstr "Protocolo deshabilitado."
 
-#: ../../Zotlabs/Lib/Connect.php:271
+#: ../../Zotlabs/Lib/Connect.php:167
+msgid "Cannot connect to yourself."
+msgstr "No puede conectarse consigo mismo."
+
+#: ../../Zotlabs/Lib/Connect.php:272
 msgid "error saving data"
 msgstr "error guardando los datos"
 
@@ -15393,119 +14924,115 @@ msgstr "El wiki se ha actualizado con éxito"
 msgid "Wiki files deleted successfully"
 msgstr "Se han borrado con éxito los ficheros del wiki"
 
-#: ../../Zotlabs/Lib/Apps.php:323
-msgid "Apps"
-msgstr "Aplicaciones (apps)"
-
-#: ../../Zotlabs/Lib/Apps.php:324
+#: ../../Zotlabs/Lib/Apps.php:328
 msgid "Affinity Tool"
 msgstr "Herramienta de afinidad"
 
-#: ../../Zotlabs/Lib/Apps.php:327
+#: ../../Zotlabs/Lib/Apps.php:331
 msgid "Site Admin"
 msgstr "Administrador del sitio"
 
-#: ../../Zotlabs/Lib/Apps.php:331
+#: ../../Zotlabs/Lib/Apps.php:335
 msgid "Content Filter"
 msgstr "Filtro de contenido"
 
-#: ../../Zotlabs/Lib/Apps.php:334
+#: ../../Zotlabs/Lib/Apps.php:338
 msgid "Remote Diagnostics"
 msgstr "Diagnóstico remoto"
 
-#: ../../Zotlabs/Lib/Apps.php:335
+#: ../../Zotlabs/Lib/Apps.php:339
 msgid "Suggest Channels"
 msgstr "Sugerir canales"
 
-#: ../../Zotlabs/Lib/Apps.php:338
+#: ../../Zotlabs/Lib/Apps.php:341
+msgid "Channel Manager"
+msgstr "Administración de canales"
+
+#: ../../Zotlabs/Lib/Apps.php:342
 msgid "Stream"
 msgstr "Stream"
 
-#: ../../Zotlabs/Lib/Apps.php:349
+#: ../../Zotlabs/Lib/Apps.php:353
 msgid "Mail"
 msgstr "Correo"
 
-#: ../../Zotlabs/Lib/Apps.php:352
+#: ../../Zotlabs/Lib/Apps.php:356
 msgid "Chat"
 msgstr "Chat"
 
-#: ../../Zotlabs/Lib/Apps.php:354
+#: ../../Zotlabs/Lib/Apps.php:358
 msgid "Probe"
 msgstr "Probar"
 
-#: ../../Zotlabs/Lib/Apps.php:355
+#: ../../Zotlabs/Lib/Apps.php:359
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: ../../Zotlabs/Lib/Apps.php:356
+#: ../../Zotlabs/Lib/Apps.php:360
 msgid "Random Channel"
 msgstr "Canal aleatorio"
 
-#: ../../Zotlabs/Lib/Apps.php:357
+#: ../../Zotlabs/Lib/Apps.php:361
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../../Zotlabs/Lib/Apps.php:360 ../../Zotlabs/Storage/Browser.php:407
+#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Storage/Browser.php:407
 msgid "Post"
 msgstr "Publicación"
 
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:369
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:366
+#: ../../Zotlabs/Lib/Apps.php:370
 msgid "Order Apps"
 msgstr "Ordenar las apps"
 
-#: ../../Zotlabs/Lib/Apps.php:367
+#: ../../Zotlabs/Lib/Apps.php:371
 msgid "CardDAV"
 msgstr "CardDAV"
 
-#: ../../Zotlabs/Lib/Apps.php:369
-msgid "Guest Access"
-msgstr "Acceso para invitados"
-
-#: ../../Zotlabs/Lib/Apps.php:371
+#: ../../Zotlabs/Lib/Apps.php:375
 msgid "OAuth Apps Manager"
 msgstr "Administrador de apps OAuth"
 
-#: ../../Zotlabs/Lib/Apps.php:372
+#: ../../Zotlabs/Lib/Apps.php:376
 msgid "OAuth2 Apps Manager"
 msgstr "Administrador de apps OAuth2"
 
-#: ../../Zotlabs/Lib/Apps.php:373
+#: ../../Zotlabs/Lib/Apps.php:377
 msgid "PDL Editor"
 msgstr "Editor PDL"
 
-#: ../../Zotlabs/Lib/Apps.php:376
+#: ../../Zotlabs/Lib/Apps.php:380
 msgid "My Chatrooms"
 msgstr "Mis salas de chat"
 
-#: ../../Zotlabs/Lib/Apps.php:377
+#: ../../Zotlabs/Lib/Apps.php:381
 msgid "Channel Export"
 msgstr "Exportar canal"
 
-#: ../../Zotlabs/Lib/Apps.php:554
+#: ../../Zotlabs/Lib/Apps.php:570 ../../Zotlabs/Lib/Apps.php:592
 msgid "Purchase"
 msgstr "Comprar"
 
-#: ../../Zotlabs/Lib/Apps.php:559
+#: ../../Zotlabs/Lib/Apps.php:597
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: ../../Zotlabs/Lib/Apps.php:569
+#: ../../Zotlabs/Lib/Apps.php:605
 msgid "Add to app-tray"
 msgstr "Añadir a la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:570
+#: ../../Zotlabs/Lib/Apps.php:606
 msgid "Remove from app-tray"
 msgstr "Quitar de la bandeja de aplicaciones"
 
-#: ../../Zotlabs/Lib/Apps.php:571
+#: ../../Zotlabs/Lib/Apps.php:607
 msgid "Pin to navbar"
 msgstr "Fijar en la barra de navegación"
 
-#: ../../Zotlabs/Lib/Apps.php:572
+#: ../../Zotlabs/Lib/Apps.php:608
 msgid "Unpin from navbar"
 msgstr "Quitar de la barra de navegación"
 
@@ -15533,144 +15060,176 @@ msgstr "4. Experto - Puedo escribir código informático"
 msgid "5. Wizard - I probably know more than you do"
 msgstr "5. Colaborador - probablemente sé más que tú"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:42
-#: ../../Zotlabs/Lib/NativeWikiPage.php:94
+#: ../../Zotlabs/Lib/NativeWikiPage.php:43
+#: ../../Zotlabs/Lib/NativeWikiPage.php:111
 msgid "(No Title)"
 msgstr "(Sin título)"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:109
+#: ../../Zotlabs/Lib/NativeWikiPage.php:125
 msgid "Wiki page create failed."
 msgstr "Se ha producido un error en la creación de la página wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:123
+#: ../../Zotlabs/Lib/NativeWikiPage.php:139
 msgid "Wiki not found."
 msgstr "No se ha encontrado el wiki."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:134
+#: ../../Zotlabs/Lib/NativeWikiPage.php:150
 msgid "Destination name already exists"
 msgstr "El nombre de destino ya existe"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:167
-#: ../../Zotlabs/Lib/NativeWikiPage.php:368
+#: ../../Zotlabs/Lib/NativeWikiPage.php:183
+#: ../../Zotlabs/Lib/NativeWikiPage.php:378
 msgid "Page not found"
 msgstr "No se ha encontrado la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:200
+#: ../../Zotlabs/Lib/NativeWikiPage.php:213
 msgid "Error reading page content"
 msgstr "Se ha producido un error al leer el contenido de la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:359
-#: ../../Zotlabs/Lib/NativeWikiPage.php:409
-#: ../../Zotlabs/Lib/NativeWikiPage.php:480
-#: ../../Zotlabs/Lib/NativeWikiPage.php:522
+#: ../../Zotlabs/Lib/NativeWikiPage.php:369
+#: ../../Zotlabs/Lib/NativeWikiPage.php:419
+#: ../../Zotlabs/Lib/NativeWikiPage.php:487
+#: ../../Zotlabs/Lib/NativeWikiPage.php:528
 msgid "Error reading wiki"
 msgstr "Se ha producido un error al leer el wiki"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:396
+#: ../../Zotlabs/Lib/NativeWikiPage.php:406
 msgid "Page update failed."
 msgstr "Se ha producido un error al actualizar la página."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:431
+#: ../../Zotlabs/Lib/NativeWikiPage.php:441
 msgid "Nothing deleted"
 msgstr "No se ha eliminado nada"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:501
+#: ../../Zotlabs/Lib/NativeWikiPage.php:508
 msgid "Compare: object not found."
 msgstr "No se ha encontrado un objeto para comparar."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
+#: ../../Zotlabs/Lib/NativeWikiPage.php:515
 msgid "Page updated"
 msgstr "Se ha actualizado la página"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:511
-msgid "Untitled"
-msgstr "Sin título"
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:517
+#: ../../Zotlabs/Lib/NativeWikiPage.php:523
 msgid "Wiki resource_id required for git commit"
 msgstr "Se necesita Wiki resource_id para el git commit"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:131
+#: ../../Zotlabs/Lib/Libzotdir.php:163
+msgid "Directory Options"
+msgstr "Opciones del directorio"
+
+#: ../../Zotlabs/Lib/Libzotdir.php:165
+msgid "Safe Mode"
+msgstr "Modo seguro"
+
+#: ../../Zotlabs/Lib/Libzotdir.php:166
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
+
+#: ../../Zotlabs/Lib/Libzotdir.php:168
+msgid "This Website Only"
+msgstr "Solo este sitio web"
+
+#: ../../Zotlabs/Lib/Libzot.php:673
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:110
+msgid "Restricted message"
+msgstr "Mensaje restringido"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:117
+msgid "Direct message"
+msgstr "Mensaje directo"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:122
+msgid "Public Policy"
+msgstr "Política pública"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:160
 msgid "Privacy conflict. Discretion advised."
 msgstr "Conflicto de privacidad. Se aconseja discreción."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:175 ../../Zotlabs/Storage/Browser.php:369
+#: ../../Zotlabs/Lib/ThreadItem.php:204 ../../Zotlabs/Storage/Browser.php:369
 msgid "Admin Delete"
 msgstr "Eliminar admin"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:349
 msgid "Reply on this comment"
 msgstr "Responder a este comentario"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:349
 msgid "reply"
 msgstr "responder"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:320
+#: ../../Zotlabs/Lib/ThreadItem.php:349
 msgid "Reply to"
 msgstr "Responder a "
 
-#: ../../Zotlabs/Lib/ThreadItem.php:340
+#: ../../Zotlabs/Lib/ThreadItem.php:369
 msgid "Delivery Report"
 msgstr "Informe de transmisión"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:359
+#: ../../Zotlabs/Lib/ThreadItem.php:388
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:389
 #, php-format
 msgid "%d unseen"
 msgstr "%dno visto/a vistos/as"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:413
+#: ../../Zotlabs/Lib/ThreadItem.php:439
+msgid "Forum"
+msgstr "Foro"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:449
 msgid "to"
 msgstr "a"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:415
+#: ../../Zotlabs/Lib/ThreadItem.php:451
 msgid "Wall-to-Wall"
 msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:416
+#: ../../Zotlabs/Lib/ThreadItem.php:452
 msgid "via Wall-To-Wall:"
 msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:444
+#: ../../Zotlabs/Lib/ThreadItem.php:480
 msgid "Attend"
 msgstr "Participar o asistir"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:462
+#: ../../Zotlabs/Lib/ThreadItem.php:498
 msgid "Go to previous comment"
 msgstr "Ir al comentario anterior"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:475
+#: ../../Zotlabs/Lib/ThreadItem.php:511
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:833
+#: ../../Zotlabs/Lib/ThreadItem.php:871
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:835
+#: ../../Zotlabs/Lib/ThreadItem.php:873
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:836
+#: ../../Zotlabs/Lib/ThreadItem.php:874
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:846
+#: ../../Zotlabs/Lib/ThreadItem.php:884
 msgid "Your full name (required)"
 msgstr "Su nombre completo (requerido)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:847
+#: ../../Zotlabs/Lib/ThreadItem.php:885
 msgid "Your email address (required)"
 msgstr "Su dirección de correo electrónico (requerido)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:848
+#: ../../Zotlabs/Lib/ThreadItem.php:886
 msgid "Your website URL (optional)"
 msgstr "La URL de su sitio web (opcional)"
 
@@ -15689,6 +15248,7 @@ msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Zotlabs/Access/PermissionRoles.php:384
 msgid "Public"
 msgstr "Público"
 
@@ -15741,70 +15301,87 @@ msgstr "Este es su ajuste predeterminado para establecer quién puede ver su rep
 msgid "This is your default setting for the audience of your webpages"
 msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:287
+#: ../../Zotlabs/Lib/Libsync.php:805
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:337
 msgid "Social Networking"
 msgstr "Redes sociales"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:288
+#: ../../Zotlabs/Access/PermissionRoles.php:338
 msgid "Social - Federation"
 msgstr "Social - Federación"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:289
+#: ../../Zotlabs/Access/PermissionRoles.php:339
 msgid "Social - Mostly Public"
 msgstr "Social - Público en su mayor parte"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:290
+#: ../../Zotlabs/Access/PermissionRoles.php:340
 msgid "Social - Restricted"
 msgstr "Social - Restringido"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:291
+#: ../../Zotlabs/Access/PermissionRoles.php:341
 msgid "Social - Private"
 msgstr "Social - Privado"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:294
+#: ../../Zotlabs/Access/PermissionRoles.php:344
 msgid "Community Forum"
 msgstr "Foro de discusión"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:295
+#: ../../Zotlabs/Access/PermissionRoles.php:345
 msgid "Forum - Mostly Public"
 msgstr "Foro - Público en su mayor parte"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:296
+#: ../../Zotlabs/Access/PermissionRoles.php:346
 msgid "Forum - Restricted"
 msgstr "Foro - Restringido"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:297
+#: ../../Zotlabs/Access/PermissionRoles.php:347
 msgid "Forum - Private"
 msgstr "Foro - Privado"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:300
+#: ../../Zotlabs/Access/PermissionRoles.php:350
 msgid "Feed Republish"
 msgstr "Republicar un \"feed\""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:301
+#: ../../Zotlabs/Access/PermissionRoles.php:351
 msgid "Feed - Mostly Public"
 msgstr "Feed - Público en su mayor parte"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:302
+#: ../../Zotlabs/Access/PermissionRoles.php:352
 msgid "Feed - Restricted"
 msgstr "Feed - Restringido"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:305
+#: ../../Zotlabs/Access/PermissionRoles.php:355
 msgid "Special Purpose"
 msgstr "Propósito especial"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:306
+#: ../../Zotlabs/Access/PermissionRoles.php:356
 msgid "Special - Celebrity/Soapbox"
 msgstr "Especial - Celebridad / Tribuna improvisada"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:307
+#: ../../Zotlabs/Access/PermissionRoles.php:357
 msgid "Special - Group Repository"
 msgstr "Especial - Repositorio de grupo"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:311
+#: ../../Zotlabs/Access/PermissionRoles.php:361
 msgid "Custom/Expert Mode"
 msgstr "Modo personalizado/experto"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:385
+msgid "Personal"
+msgstr "Personales"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:386
+msgid "Community forum"
+msgstr "Foro de discusión"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:387
+msgid "Custom"
+msgstr "Personalizado"
+
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
 msgstr "Pueden verse la actividad y publicaciones de mi canal"
@@ -15854,7 +15431,7 @@ msgid "Can comment on or like my posts"
 msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
 
 #: ../../Zotlabs/Access/Permissions.php:68
-msgid "Can send me private mail messages"
+msgid "Can send me direct messages"
 msgstr "Se me pueden enviar mensajes privados"
 
 #: ../../Zotlabs/Access/Permissions.php:69
@@ -15862,16 +15439,12 @@ msgid "Can like/dislike profiles and profile things"
 msgstr "Se puede mostrar agrado o desagrado (Me gusta / No me gusta) en mis perfiles y sus distintos apartados"
 
 #: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can forward to all my channel connections via ! mentions in posts"
-msgstr "Pueden reenviarse publicaciones a todas las conexiones de mi canal a través de ! menciones en las entradas"
-
-#: ../../Zotlabs/Access/Permissions.php:71
 msgid "Can chat with me"
 msgstr "Se puede chatear conmigo"
 
-#: ../../Zotlabs/Access/Permissions.php:72
-msgid "Can source my public posts in derived channels"
-msgstr "Pueden utilizarse mis entradas públicas como origen de contenidos  en canales derivados"
+#: ../../Zotlabs/Access/Permissions.php:71
+msgid "Can source/mirror my public posts in derived channels"
+msgstr "Pueden utilizarse mis entradas públicas  en canales derivados"
 
 #: ../../Zotlabs/Access/Permissions.php:73
 msgid "Can administer my channel"
@@ -15985,40 +15558,40 @@ msgid ""
 "an existing folder."
 msgstr "Puede seleccionar los archivos a través del botón de subir o soltarlos aquí mismo o en una carpeta existente."
 
-#: ../../boot.php:1695
+#: ../../boot.php:1728
 msgid "Create an account to access services and applications"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones"
 
-#: ../../boot.php:1719
-msgid "Login/Email"
-msgstr "Inicio de sesión / Correo electrónico"
+#: ../../boot.php:1746
+msgid "Email or nickname"
+msgstr "Correo electrónico o apodo"
 
-#: ../../boot.php:1720
+#: ../../boot.php:1756
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1721
+#: ../../boot.php:1757
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1724
+#: ../../boot.php:1760
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2603
+#: ../../boot.php:2641
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr "[$Projectname] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2608
+#: ../../boot.php:2646
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2724
+#: ../../boot.php:2762
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s"
 
-#: ../../boot.php:2729
+#: ../../boot.php:2767
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index d61cb65c2..1e4b43055 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -6,6 +6,7 @@ function string_plural_select_es_es($n){
 }}
 App::$rtl = 0;
 App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
+App::$strings["Cover Photo"] = "Imagen de portada del perfil";
 App::$strings["Default"] = "Predeterminado";
 App::$strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
 App::$strings["Submit"] = "Enviar";
@@ -28,7 +29,7 @@ App::$strings["Set font-color for posts and comments"] = "Establecer el color de
 App::$strings["Set radius of corners"] = "Establecer el radio de curvatura de las esquinas";
 App::$strings["Example: 4px"] = "Ejemplo: 4px";
 App::$strings["Set shadow depth of photos"] = "Ajustar la profundidad de sombras de las fotos";
-App::$strings["Set maximum width of content region in pixel"] = "Ajustar la anchura máxima de la región de contenido, en pixels";
+App::$strings["Set maximum width of content region in rem"] = "Ajustar la anchura máxima de la región de contenido, en rem";
 App::$strings["Leave empty for default width"] = "Dejar en blanco para la anchura predeterminada";
 App::$strings["Set size of conversation author photo"] = "Ajustar el tamaño de la foto del autor de la conversación";
 App::$strings["Set size of followup author photos"] = "Ajustar el tamaño de foto de los seguidores del autor";
@@ -54,17 +55,12 @@ App::$strings["Upvote"] = "Votar a favor";
 App::$strings["Downvote"] = "Votar en contra";
 App::$strings["Can moderate reputation on my channel."] = "Se puede moderar la reputación en mi canal.";
 App::$strings["Block Completely"] = "Bloquear completamente";
-App::$strings["Superblock App"] = "App Superblock";
-App::$strings["Not Installed"] = "No instalado/a";
-App::$strings["Block channels"] = "Bloquear canales";
 App::$strings["superblock settings updated"] = "se han actualizado los ajustes de superblock";
 App::$strings["Currently blocked"] = "Actualmente bloqueado";
 App::$strings["No channels currently blocked"] = "No hay canales bloqueados actualmente";
 App::$strings["Remove"] = "Eliminar";
 App::$strings["NSA Bait App"] = "App NSA Bait ";
-App::$strings["Installed"] = "Instalado";
-App::$strings["Make yourself a political target"] = "Conviértase en un objetivo político";
-App::$strings["Who viewed my channel/profile"] = "Quién ha visto mi canal/perfi";
+App::$strings["Make yourself a political target."] = "Hazte un objetivo político.";
 App::$strings["Recent Channel/Profile Viewers"] = "Visitantes recientes del canal o perfil";
 App::$strings["No entries."] = "No hay entradas.";
 App::$strings["System defaults:"] = "Valores predeterminados del sistema: ";
@@ -104,20 +100,17 @@ App::$strings["Pause before starting next task"] = "Pausa antes de comenzar la s
 App::$strings["Minimum 100, default 100 microseconds"] = "Mínimo 100, por defecto 100 microsegundos";
 App::$strings["Queueworker Settings"] = "Configuración del gestor de procesos de trabajo en cola";
 App::$strings["Save"] = "Guardar";
-App::$strings["Add some colour to tag clouds"] = "Añadir color a las nubes de etiquetas";
 App::$strings["Rainbow Tag App"] = "App Etiqueta Arcoiris";
+App::$strings["Add some colour to tag clouds"] = "Añadir color a las nubes de etiquetas";
 App::$strings["Rainbow Tag"] = "Etiqueta Arcoiris";
 App::$strings["Photo Cache settings saved."] = "Se ha guardado la configuración de la caché de fotos.";
-App::$strings["Photo Cache addon saves a copy of images from external sites locally to increase your anonymity in the web."] = "El complemento Photo Cache guarda localmente una copia de las imágenes de sitios externos para aumentar su anonimato en la Web.";
-App::$strings["Photo Cache App"] = "App Photo Cache";
+App::$strings["Saves a copy of images from external sites locally to increase your anonymity in the web."] = "Guarde una copia de las imágenes de sitios externos localmente para aumentar su anonimato en la web.";
 App::$strings["Minimal photo size for caching"] = "Tamaño mínimo de la foto para el almacenamiento en caché";
 App::$strings["In pixels. From 1 up to 1024, 0 will be replaced with system default."] = "En píxeles. Desde 1 hasta 1024, 0 será reemplazado por el predeterminado del sistema.";
 App::$strings["Photo Cache"] = "Photo Cache";
 App::$strings["Gallery"] = "Galería";
 App::$strings["Photo Gallery"] = "Galería de fotos";
 App::$strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
-App::$strings["Gallery App"] = "App Gallery";
-App::$strings["A simple gallery for your photo albums"] = "Una galería sencilla para sus álbumes de fotos";
 App::$strings["Random Planet App"] = "App Random Planet";
 App::$strings["Set a random planet from the Star Wars Empire as your location when posting"] = "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias como su ubicación cuando publique.";
 App::$strings["Permission denied."] = "Acceso denegado.";
@@ -187,8 +180,6 @@ App::$strings["Please note Diaspora and Friendica statistics are merely those **
 App::$strings["Channel is required."] = "Se requiere un canal.";
 App::$strings["Invalid channel."] = "El canal no es válido.";
 App::$strings["Hubzilla Crosspost Connector Settings saved."] = "Se han guardado los ajustes de Hubzilla Crosspost Connector";
-App::$strings["Hubzilla Crosspost Connector App"] = "App Hubzilla Crosspost Connector";
-App::$strings["Relay public postings to another Hubzilla channel"] = "Retransmisión de entradas a otro canal de Hubzilla";
 App::$strings["Send public postings to Hubzilla channel by default"] = "Enviar entradas públicas al canal Hubzilla por defecto";
 App::$strings["Hubzilla API Path"] = "Ruta de la API de Hubzilla";
 App::$strings["https://{sitename}/api"] = "https://{sitename}/api";
@@ -212,7 +203,6 @@ App::$strings["photo"] = "foto";
 App::$strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Por favor, contacte con el administrador de su sitio.<br />La URL de la API proporcionada no es válida.";
 App::$strings["We could not contact the GNU social API with the Path you entered."] = "No podemos conectar con la API de GNU social con la ruta que ha proporcionado.";
 App::$strings["GNU social settings updated."] = "Se han guardado los ajustes de GNU social.";
-App::$strings["Relay public postings to a connected GNU social account (formerly StatusNet)"] = "Retransmisión de entradas públicas a una cuenta conectada de GNU social (antiguo StarusNet)";
 App::$strings["Globally Available GNU social OAuthKeys"] = "OAuthKeys globales de GNU social disponibles";
 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)."] = "Existen pares de claves OAuth preconfiguradas disponibles para algunos servidores libres de GNU social. Si está usando uno de ellos, utilice estas credenciales.<br />Si no se siente libre de conectarse a cualquier otra instancia de GNU social (vea a continuación).";
 App::$strings["Provide your own OAuth Credentials"] = "Proporcione sus propias credenciales de OAuth";
@@ -241,8 +231,6 @@ App::$strings["Consumer Secret"] = "Consumer Secret";
 App::$strings["Consumer Key"] = "Consumer Key";
 App::$strings["Application name"] = "Nombre de la aplicación";
 App::$strings["Friendica Crosspost Connector Settings saved."] = "Se han guardado los ajustes del conector de publicación cruzada con Friendica.";
-App::$strings["Friendica Crosspost Connector App"] = "App Friendica Crosspost Connector";
-App::$strings["Relay public postings to a connected Friendica account"] = "Retransmisión de entradas públicas a una cuenta Friendica conectada";
 App::$strings["Send public postings to Friendica by default"] = "Enviar entradas públicas a Friendica por defecto";
 App::$strings["Friendica API Path"] = "Ruta a la API de Friendica";
 App::$strings["Friendica login name"] = "Nombre de inicio de sesión en Friendica";
@@ -252,8 +240,6 @@ App::$strings["Post to Friendica"] = "Publicar en Friendica";
 App::$strings["Post to WordPress"] = "Publicar en WordPress";
 App::$strings["Source"] = "Fuente";
 App::$strings["Wordpress Settings saved."] = "Se han guardado los ajustes de WordPress.";
-App::$strings["Wordpress Post App"] = "App Publicar en Wordpress";
-App::$strings["Post to WordPress or anything else which uses the wordpress XMLRPC API"] = "Publicar en WordPress o cualquier otra cosa que utilice la API XMLRPC de wordpress";
 App::$strings["WordPress username"] = "Nombre de usuario de WordPress";
 App::$strings["WordPress password"] = "Contraseña de WordPress";
 App::$strings["WordPress API URL"] = "URL de la API de WordPress";
@@ -268,7 +254,6 @@ App::$strings["Wordpress Post"] = "Publicar en Wordpress";
 App::$strings["No server specified"] = "No se ha especificado ningún servidor";
 App::$strings["Posts imported"] = "Entradas importadas";
 App::$strings["Files imported"] = "Ficheros importados";
-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."] = "Este complemento copia el contenido existente y el almacenamiento de ficheros en un canal clonado/copiado. Una vez instalada la aplicación, visite la aplicación recién instalada. Esto le permitirá establecer la ubicación de su canal original y un rango de fechas opcional de ficheros/conversaciones para copiar.";
 App::$strings["Content Import"] = "Importación de contenidos";
 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."] = "Esto importará todas sus conversaciones y archivos de nube de un canal clonado en otro servidor. El proceso puede tardar un poco si tiene muchos mensajes y/o ficheros.";
 App::$strings["Include posts"] = "Incluir entradas";
@@ -331,6 +316,7 @@ App::$strings["Include a marker on the map."] = "Incluir un marcador en el mapa.
 App::$strings["Settings updated."] = "Ajustes actualizados.";
 App::$strings["Insane Journal Crosspost Connector Settings saved."] = "Se han guardado los ajustes del Conector de publicación cruzada de InsaneJournal.";
 App::$strings["Insane Journal Crosspost Connector App"] = "App Ajustes del Conector de publicación cruzada de InsaneJournal";
+App::$strings["Not Installed"] = "No instalado/a";
 App::$strings["Relay public postings to Insane Journal"] = "Retransmisión de entradas públicas a Insane Journal";
 App::$strings["InsaneJournal username"] = "Nombre de usuario en InsaneJournal";
 App::$strings["InsaneJournal password"] = "Contraseña en InsaneJournal";
@@ -341,24 +327,29 @@ App::$strings["Who likes me?"] = "¿Quién me ha puesto \"Me gusta\"?";
 App::$strings["QR code"] = "Código QR";
 App::$strings["QR Generator"] = "Generador QR";
 App::$strings["Enter some text"] = "Escribir algún texto";
-App::$strings["Unknown"] = "Desconocido";
 App::$strings["ActivityPub"] = "ActivityPub";
 App::$strings["status"] = "el mensaje de estado ";
 App::$strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s";
 App::$strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s";
 App::$strings["ActivityPub Protocol Settings updated."] = "Se han actualizado los ajustes del protocolo ActivityPub.";
 App::$strings["The activitypub protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo ActivityPub no soporta la independencia de ubicación. Las conexiones que realice dentro de esa red pueden no ser accesibles desde ubicaciones de canales alternativos.";
-App::$strings["Activitypub Protocol App"] = "App Protocolo Activitypub";
 App::$strings["Deliver to ActivityPub recipients in privacy groups"] = "Entregar a los destinatarios de ActivityPub en grupos de canales";
 App::$strings["May result in a large number of mentions and expose all the members of your privacy group"] = "Puede resultar en un gran número de menciones y exponer a todos los miembros de su grupo de canales";
 App::$strings["Send multi-media HTML articles"] = "Enviar artículos multimedia en HTML";
 App::$strings["Not supported by some microblog services such as Mastodon"] = "No soportado por algunos servicios de microblog como Mastodon";
 App::$strings["Activitypub Protocol"] = "Protocolo Activitypub";
+App::$strings["ERROR: word length is not correct!"] = "ERROR: ¡la longitud de la palabra no es correcta!";
+App::$strings["Fediwordle App"] = "App Fediwordle";
+App::$strings["A distributed word game inspired by wordle."] = "Un juego de palabras distribuido inspirado en el wordle.";
+App::$strings["To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel post."] = "Para empezar una partida, introduzca [wordle]mi_palabra[/wordle] en algún lugar de un post de nivel superior.";
+App::$strings["Your contacts can post their guess in the comments."] = "Sus contactos pueden publicar sus conjeturas en los comentarios.";
+App::$strings["Your channel will evaluate the guess and automatically post the response."] = "Su canal evaluará la conjetura y publicará automáticamente la respuesta.";
+App::$strings["Correct letters"] = "Letras correctas";
+App::$strings["Letters contained in the word but at the wrong spot"] = "Letras contenidas en la palabra pero en el lugar equivocado";
+App::$strings["Letters not contained in the word"] = "Letras no contenidas en la palabra";
 App::$strings["An account has been created for you."] = "Se ha creado una cuenta para usted.";
 App::$strings["Authentication successful but rejected: account creation is disabled."] = "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada.";
 App::$strings["Dreamwidth Crosspost Connector Settings saved."] = "Se han guardado los ajustes del conector de publicación cruzada Dreamwidth.";
-App::$strings["Dreamwidth Crosspost Connector App"] = "App Dreamwidth Crosspost Connector";
-App::$strings["Relay public posts to Dreamwidth"] = "Reenviar las entradas públicas a Dreamwidth";
 App::$strings["Dreamwidth username"] = "Nombre de usuario en Dreamwidth";
 App::$strings["Dreamwidth password"] = "Contraseña en Dreamwidth";
 App::$strings["Post to Dreamwidth by default"] = "Publicar en Dreamwidth de forma predeterminada";
@@ -432,35 +423,9 @@ App::$strings["Add new rendezvous"] = "Añadir una nueva cita";
 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."] = "Cree una nueva cita y comparta los enlaces de acceso con los que desea invitar al grupo. Aquellos que abran el enlace se convertirán en miembros de la cita. Pueden ver otras ubicaciones de miembros, añadir marcadores al mapa o compartir sus propias ubicaciones con el grupo.";
 App::$strings["You have no rendezvous. Press the button above to create a rendezvous!"] = "No tiene ninguna cita. ¡Presione el botón de arriba para crear una!";
 App::$strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
-App::$strings["Startpage App"] = "App Startpage";
-App::$strings["Set a preferred page to load on login from home page"] = "Establecer una página preferida para cargar al iniciar sesión desde la página de inicio";
 App::$strings["Page to load after login"] = "Página para cargar tras el inicio de sesión";
 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)."] = "Ejemplos: &quot;aplicaciones&quot;, &quot;mi red?f=&gid=37&quot; (grupo de canales), &quot;mi canal&quot; or &quot;notificaciones del sistema&quot; (dejar en blanco para la página de mi red por defecto (grid).";
 App::$strings["Startpage"] = "Startpage";
-App::$strings["Messages"] = "Mensajes";
-App::$strings["message"] = "mensaje";
-App::$strings["Message recalled."] = "Mensaje revocado.";
-App::$strings["Conversation removed."] = "Conversación eliminada.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM";
-App::$strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
-App::$strings["Send Private Message"] = "Enviar un mensaje privado";
-App::$strings["To:"] = "Para:";
-App::$strings["Subject:"] = "Asunto:";
-App::$strings["Your message:"] = "Su mensaje:";
-App::$strings["Attach file"] = "Adjuntar fichero";
-App::$strings["Send"] = "Enviar";
-App::$strings["Delete message"] = "Borrar mensaje";
-App::$strings["Delivery report"] = "Informe de transmisión";
-App::$strings["Recall message"] = "Revocar el mensaje";
-App::$strings["Message has been recalled."] = "El mensaje ha sido revocado.";
-App::$strings["Delete Conversation"] = "Eliminar conversación";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
-App::$strings["Send Reply"] = "Responder";
-App::$strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
-App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destinatario.";
-App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado.";
-App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
 App::$strings["Flag Adult Photos"] = "Indicador (\"flag\") de fotos de adultos";
 App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Proporcionar una opción de edición de fotos para ocultar las fotos inapropiadas de la vista de álbum predeterminada";
 App::$strings["Your channel has been upgraded to \$Projectname version"] = "Su canal ha sido actualizado a la versión \$Projectname";
@@ -471,8 +436,6 @@ App::$strings["for further info."] = "para más información.";
 App::$strings["Upgrade Info"] = "Información de actualización";
 App::$strings["Do not show this again"] = "No mostrar esto de nuevo";
 App::$strings["Twitter settings updated."] = "Se han actualizado los ajustes de Twitter.";
-App::$strings["Twitter Crosspost Connector App"] = "App Twitter Crosspost Connector";
-App::$strings["Relay public posts to Twitter"] = "Retransmisión de entradas públicas a Twitter";
 App::$strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No se encontró ningún par de \"consumer key\" para Twitter. Póngase en contacto con el administrador del sitio.";
 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."] = "En esta instancia de Hubzilla, el complemento de Twitter estaba habilitado pero aún no ha conectado su cuenta a la cuenta de Twitter. Para ello, haga clic en el botón de abajo, para obtener un PIN de Twitter que debe copiar en el cuadro de entrada a continuación y enviar el formulario. Solo sus entradas <strong>públicas</ strong> se publicarán en Twitter.";
 App::$strings["Log in with Twitter"] = "Iniciar sesión en Twitter";
@@ -488,8 +451,6 @@ App::$strings["You are now authenticated to pumpio."] = "Ahora está autenticado
 App::$strings["return to the featured settings page"] = "Volver a la página de configuración destacada";
 App::$strings["Post to Pump.io"] = "Publicar en Pump.io";
 App::$strings["Pump.io Settings saved."] = "Se han guardado los ajustes de Pump.io";
-App::$strings["Pump.io Crosspost Connector App"] = "App Pump.io Crosspost Connector";
-App::$strings["Relay public posts to pump.io"] = "Retransmisión de entradas públicas a pump.io";
 App::$strings["Pump.io servername"] = "Nombre del servidor de Pump.io";
 App::$strings["Without \"http://\" or \"https://\""] = "Sin \"http://\" or \"https://\"";
 App::$strings["Pump.io username"] = "Nombre de usuario en Pump.io";
@@ -516,7 +477,6 @@ App::$strings["Select the appropriate avatar rating for your site. See README"]
 App::$strings["Gravatar settings updated."] = "Se han actualizado los ajustes de Gravatar.";
 App::$strings["text to include in all outgoing posts from this site"] = "texto a incluir en todos los mensajes salientes de este sitio";
 App::$strings["Send your identity to all websites"] = "Enviar su identidad a todos los sitios web";
-App::$strings["Sendzid App"] = "App Sendzid";
 App::$strings["Send ZID"] = "Enviar ZID";
 App::$strings["Price"] = "Precio";
 App::$strings["Error: order mismatch. Please try again."] = "Error: desajuste de pedidos. Por favor, inténtelo de nuevo.";
@@ -577,7 +537,6 @@ App::$strings["Order already checked out."] = "El pedido ya ha sido revisado";
 App::$strings["Drop database tables when uninstalling."] = "Eliminar tablas de la base de datos al desinstalar.";
 App::$strings["Shop"] = "Comprar";
 App::$strings["Profile Unavailable."] = "Perfil no disponible";
-App::$strings["Cart utilities for orders and payments"] = "Utilidades del carro para pedidos y pagos";
 App::$strings["You must be logged into the Grid to shop."] = "Debe iniciar sesión en la red para comprar.";
 App::$strings["Access denied."] = "Acceso denegado";
 App::$strings["No Order Found"] = "No se ha encontrado ningún pedido";
@@ -587,13 +546,9 @@ App::$strings["Review your order and complete any needed requirements."] = "Revi
 App::$strings["Invalid Payment Type.  Please start again."] = "Tipo de pago no válido. Por favor, empiece de nuevo.";
 App::$strings["Order not found"] = "El pedido no se ha encontrado";
 App::$strings["nofed Settings saved."] = "Se han guardado los ajustes de nofed.";
-App::$strings["No Federation App"] = "App No Federation";
-App::$strings["Prevent posting from being federated to anybody. It will exist only on your channel page."] = "Evitar que la entrada sea federada con nadie. Sólo existirá en la página de su canal.";
 App::$strings["Federate posts by default"] = "Federar las publicaciones por defecto";
 App::$strings["No Federation"] = "No Federation";
 App::$strings["Federate"] = "Federar";
-App::$strings["Smileybutton App"] = "App Smileybutton";
-App::$strings["Adds a smileybutton to the jot editor"] = "Añade un botón de emoticonos al editor jot";
 App::$strings["Hide the button and show the smilies directly."] = "Ocultar el botón y mostrar los smilies directamente.";
 App::$strings["Smileybutton Settings"] = "Ajustes de Smileybutton";
 App::$strings["file"] = "fichero";
@@ -603,13 +558,13 @@ App::$strings["Please install the statistics addon to be able to configure a dia
 App::$strings["Diaspora Relay Handle"] = "Gestionar el reenvío de Diaspora";
 App::$strings["Address of a diaspora relay. Example: relay@diasporarelay.tld"] = "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporarelay.tld";
 App::$strings["Diaspora relay could not be imported"] = "El reenvío de Diaspora no ha podido ser importado";
+App::$strings["No subject"] = "Sin tema";
 App::$strings["\$projectname"] = "\$projectname";
 App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero de importación.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 App::$strings["Import completed."] = "Importación completada.";
 App::$strings["Diaspora Protocol Settings updated."] = "Los ajustes del protocolo de Diaspora se han actualizado.";
 App::$strings["The diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos.";
-App::$strings["Diaspora Protocol App"] = "App Protocolo Diaspora";
 App::$strings["Allow any Diaspora member to comment or like your public posts"] = "Permitir que cualquier miembro de Diaspora comente o ponga un like en sus entradas públicas";
 App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = "Si esta configuración está desactivada, sólo sus contactos podrán comentar o dar a \"me gusta\" en sus publicaciones públicas";
 App::$strings["Prevent your hashtags from being redirected to other sites"] = "Impedir que sus \"hashtags\" sean redirigidos a otros sitios ";
@@ -632,6 +587,7 @@ App::$strings["This feature requires Piwik >= 2.2.0"] = "Esta funcionalidad requ
 App::$strings["Workflow user."] = "Usuario de Workflow.";
 App::$strings["This channel"] = "Este canal";
 App::$strings["Primary"] = "Primario";
+App::$strings["Create New Workflow Item"] = "Crear un nuevo elemento de flujo de trabajo";
 App::$strings["Workflow"] = "Workflow";
 App::$strings["No Workflows Available"] = "No hay flujos de trabajo disponibles";
 App::$strings["Add item to which workflow"] = "A qué Workflow añadir un elemento";
@@ -668,8 +624,6 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["\$Projectname"] = "\$Projectname";
 App::$strings["Search \$Projectname"] = "Buscar \$Projectname";
 App::$strings["Fuzzloc Settings updated."] = "Los ajustes de Fuzzloc se han actualizado.";
-App::$strings["Fuzzy Location App"] = "App Fuzzy Location";
-App::$strings["Blur your precise location if your channel uses browser location mapping"] = "Desdibujar su ubicación precisa si su canal utiliza el mapeo de ubicación del navegador";
 App::$strings["Minimum offset in meters"] = "Offset mínimo en metros";
 App::$strings["Maximum offset in meters"] = "Offset máximo en metros";
 App::$strings["Fuzzy Location"] = "Fuzzy Location";
@@ -690,8 +644,6 @@ App::$strings["Set/edit permissions"] = "Establecer/editar los permisos";
 App::$strings["Item not found."] = "Elemento no encontrado.";
 App::$strings["Post to Libertree"] = "Publicar en Libertree";
 App::$strings["Libertree Crosspost Connector Settings saved."] = "Se han guardado los ajustes del conector de publicación cruzada con Libertree.";
-App::$strings["Libertree Crosspost Connector App"] = "App Libertree Crosspost Connector";
-App::$strings["Relay public posts to Libertree"] = "Retransmisión de entradas públicas a Libertree";
 App::$strings["Libertree API token"] = "Token de la API de Libertree";
 App::$strings["Libertree site URL"] = "URL del servidor de Libertree";
 App::$strings["Post to Libertree by default"] = "Publicar en Libertree por defecto";
@@ -728,16 +680,14 @@ App::$strings["Your account on %s will expire in a few days."] = "Su cuenta en %
 App::$strings["Your $Productname test account is about to expire."] = "Su cuenta de prueba de $Productname está a punto de caducar.";
 App::$strings["Hide Aside App"] = "App de ocultamiento del panel lateral";
 App::$strings["Fade out aside areas after a while when using endless scroll"] = "Se desvanecen las áreas laterales cuando se usa un scroll sin fin";
-App::$strings["Skeleton App"] = "App Skeleton";
-App::$strings["A skeleton for addons, you can copy/paste"] = "Skeleton para los addons, puede copiar/pegar";
 App::$strings["Some setting"] = "Algunos ajustes";
 App::$strings["A setting"] = "Un ajuste";
 App::$strings["Skeleton Settings"] = "Ajustes de Skeleton";
 App::$strings["Network error"] = "Error de red";
 App::$strings["API error"] = "Error de API";
 App::$strings["Unknown issue"] = "Problema desconocido";
+App::$strings["Unable to retrieve email address from remote identity provider"] = "No se puede recuperar la dirección de correo electrónico del proveedor de identidad remota";
 App::$strings["Unable to login using email address "] = "Imposible iniciar sesión usando la dirección de correo electrónico";
-App::$strings["Sign in to Hubzilla using a social account"] = "Iniciar sesión en Hubzilla usando una cuenta social";
 App::$strings["Social Authentication using your social media account"] = "Autenticación usando su cuenta de medios sociales";
 App::$strings["This app enables one or more social provider sign-in buttons on the login page."] = "Esta aplicación habilita uno o más botones de inicio de sesión de proveedores sociales en la página de inicio de sesión.";
 App::$strings["Add an identity provider"] = "Añadir un proveedor de identidad";
@@ -754,8 +704,6 @@ App::$strings["Social authentication settings saved."] = "Se han guardado los aj
 App::$strings["Possible adult content"] = "Posible contenido para adultos";
 App::$strings["%s - view"] = "ver - %s";
 App::$strings["NSFW Settings saved."] = "Se han guardado los ajustes de NSFW.";
-App::$strings["NSFW App"] = "App NSFW";
-App::$strings["Collapse content that contains predefined words"] = "Ocultar el contenido que contiene palabras predefinidas";
 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."] = "Esta aplicación busca en los mensajes las palabras o texto que especifique a continuación, y oculta cualquier contenido que contenga esas palabras clave, para que no se muestren en momentos inapropiados, como insinuaciones sexuales que puedan ser inapropiadas en un entorno laboral. Es cortés y recomendable etiquetar cualquier contenido que contenga desnudos con #NSFW. Este filtro también puede coincidir con cualquier otra palabra o texto que especifique y, por lo tanto, puede utilizarse como filtro de contenido de propósito general.";
 App::$strings["Comma separated list of keywords to hide"] = "Lista separada por comas de palabras clave para ocultar";
 App::$strings["Word, /regular-expression/, lang=xx, lang!=xx"] = "Palabra, /expresión regular/, lang=xx, lang!=xx";
@@ -776,17 +724,10 @@ App::$strings["I'm going first this time..."] = "Yo voy primero esta vez...";
 App::$strings["You won!"] = "¡Usted ha ganado!";
 App::$strings["\"Cat\" game!"] = "¡El juego del \"gato\"!";
 App::$strings["I won!"] = "¡He ganado yo!";
-App::$strings["Follow"] = "Seguir";
-App::$strings["%1\$s is now following %2\$s"] = "%1\$s está siguiendo ahora a %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."] = "El protocolo de GNU-Social no admite la independencia de la ubicación. Las\n conexiones que realice dentro de esa red pueden ser inaccesibles desde \nubicaciones de canales alternativos.";
-App::$strings["GNU-Social Protocol App"] = "App Protocolo GNU-Social";
-App::$strings["GNU-Social Protocol"] = "Protocolo GNU-Social";
 App::$strings["Send test email"] = "Enviar un correo electrónico de prueba";
 App::$strings["Mail sent."] = "El correo electrónico ha sido enviado.";
 App::$strings["Sending of mail failed."] = "No se pudo enviar el correo.";
 App::$strings["Mail Test"] = "Prueba de correo";
-App::$strings["Livejournal Crosspost Connector App"] = "App Livejournal Crosspost Connector";
-App::$strings["Relay public posts to Livejournal"] = "Retransmisión de entradas públicas a Livejournal";
 App::$strings["Livejournal username"] = "Nombre de usuario en Livejournal";
 App::$strings["Livejournal password"] = "Contraseña en Livejournal";
 App::$strings["Post to Livejournal by default"] = "Publicar en Livejournal por defecto";
@@ -800,11 +741,8 @@ App::$strings["Hubzilla File Storage Import"] = "Importar del depósito de fiche
 App::$strings["This will import all your cloud files from another server."] = "Esto importará todos sus ficheros en la nube desde otro servidor.";
 App::$strings["Hubzilla Server base URL"] = "URL base del servidor Hubzilla";
 App::$strings["Allow magic authentication only to websites of your immediate connections"] = "Permitir la autenticación mágica sólo a los sitios web de sus conexiones próximas";
-App::$strings["Authchoose App"] = "App Authchoose";
 App::$strings["Authchoose"] = "Autoseleccionar";
 App::$strings["pageheader Settings saved."] = "Se han guardado los ajustes del encabezado de página.";
-App::$strings["Page Header App"] = "App Page Header";
-App::$strings["Inserts a page header"] = "Inserta un encabezado de página";
 App::$strings["Message to display on every page on this server"] = "Mensaje para mostrar en todas las páginas de este servidor";
 App::$strings["Page Header"] = "Page Header";
 App::$strings["Popular Channels"] = "Canales populares";
@@ -822,17 +760,12 @@ App::$strings["Embedded XMPP (Jabber) client"] = "Cliente XMPP (Jabber) integrad
 App::$strings["Individual credentials"] = "Credenciales individuales";
 App::$strings["Jabber BOSH server"] = "Servidor BOSH de Jabber";
 App::$strings["XMPP Settings"] = "Ajustes de XMPP";
-App::$strings["Invalid data packet"] = "Paquete de datos no válido";
-App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["prev"] = "anterior";
 App::$strings["first"] = "primera";
 App::$strings["last"] = "última";
 App::$strings["next"] = "próxima";
 App::$strings["older"] = "más antiguas";
 App::$strings["newer"] = "más recientes";
-App::$strings["No connections"] = "Sin conexiones";
 App::$strings["Connections"] = "Conexiones";
 App::$strings["Accepts"] = "Se acepta";
 App::$strings["Comments"] = "Comentarios";
@@ -900,8 +833,16 @@ App::$strings["unknown"] = "desconocido";
 App::$strings["remove category"] = "eliminar el tema";
 App::$strings["remove from file"] = "eliminar del fichero";
 App::$strings["Download binary/encrypted content"] = "Descargar contenido binario o cifrado";
-App::$strings["Poll has ended."] = "La encuesta ha terminado";
-App::$strings["Poll ends: %s"] = "Finales de la encuesta: %s";
+App::$strings["__ctx:noun__ %d Vote"] = array(
+	0 => "%dVoto",
+	1 => "%dVotos",
+);
+App::$strings["__ctx:noun__ %d Vote in total"] = array(
+	0 => "%dVoto en total",
+	1 => "%dVotos en total",
+);
+App::$strings["Poll has ended"] = "La encuesta ha terminado";
+App::$strings["Poll ends in %s"] = "La encuesta termina en %s";
 App::$strings["Vote"] = "Votar";
 App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
 App::$strings["default"] = "por defecto";
@@ -1144,6 +1085,10 @@ App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha pu
 App::$strings["Photo Albums"] = "Álbumes de fotos";
 App::$strings["Recent Photos"] = "Fotos recientes";
 App::$strings["Upload New Photos"] = "Subir nuevas fotos";
+App::$strings["url: "] = "url: ";
+App::$strings["error_code: "] = "código_de_error: ";
+App::$strings["error_string: "] = "cadena_de_error: ";
+App::$strings["content-type: "] = "tipo de contenido: ";
 App::$strings["Friendica"] = "Friendica";
 App::$strings["OStatus"] = "OStatus";
 App::$strings["GNU-Social"] = "GNU Social";
@@ -1183,10 +1128,8 @@ App::$strings["Cannot create a duplicate channel identifier on this system. Impo
 App::$strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
 App::$strings["Remote authentication"] = "Acceder desde su servidor";
 App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
-App::$strings["Channel Manager"] = "Administración de canales";
+App::$strings["Channels"] = "Canales";
 App::$strings["Manage your channels"] = "Gestionar sus canales";
-App::$strings["Privacy Groups"] = "Grupos de canales";
-App::$strings["Manage your privacy groups"] = "Gestionar sus grupos de canales";
 App::$strings["Settings"] = "Ajustes";
 App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
 App::$strings["Logout"] = "Finalizar sesión";
@@ -1206,11 +1149,13 @@ App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Buscar en el
 App::$strings["Admin"] = "Administrador";
 App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
 App::$strings["Loading"] = "Cargando";
-App::$strings["@name, !forum, #tag, ?doc, content"] = "@nombre, !foro, #tag, ?docs, contenido";
+App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
 App::$strings["Please wait..."] = "Espere por favor…";
-App::$strings["Add Apps"] = "Añadir aplicaciones";
-App::$strings["Arrange Apps"] = "Organizar aplicaciones";
-App::$strings["Toggle System Apps"] = "Alternar aplicaciones de sistema";
+App::$strings["Apps"] = "Aplicaciones (apps)";
+App::$strings["Channel Apps"] = "Apps del canal ";
+App::$strings["System Apps"] = "Apps del sistema ";
+App::$strings["Pinned Apps"] = "Apps ancladas ";
+App::$strings["Featured Apps"] = "Apps destacadas ";
 App::$strings["Channel"] = "Canal";
 App::$strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
 App::$strings["About"] = "Mi perfil";
@@ -1271,19 +1216,11 @@ App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!";
 App::$strings["Summary: "] = "Resumen: ";
+App::$strings["Unknown"] = "Desconocido";
 App::$strings["Date: "] = "Fecha: ";
 App::$strings["Reason: "] = "Razón: ";
 App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!";
 App::$strings["Name: "] = "Nombre: ";
-App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
-App::$strings["Channel location missing."] = "Falta la dirección del canal.";
-App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
-App::$strings["Premium channel - please visit:"] = "Canal Premium - por favor visite:";
-App::$strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
-App::$strings["Remote channel or protocol unavailable."] = "Canal remoto o protocolo no disponible.";
-App::$strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
-App::$strings["Protocol disabled."] = "Protocolo deshabilitado.";
-App::$strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
 App::$strings["channel"] = "el canal";
 App::$strings["likes %1\$s's %2\$s"] = "gusta de %2\$s de %1\$s";
 App::$strings["doesn't like %1\$s's %2\$s"] = "no gusta de %2\$s de %1\$s";
@@ -1316,7 +1253,7 @@ App::$strings["View in context"] = "Mostrar en su contexto";
 App::$strings["Please wait"] = "Espere por favor";
 App::$strings["remove"] = "eliminar";
 App::$strings["Loading..."] = "Cargando...";
-App::$strings["Conversation Tools"] = "Herramientas de conversación";
+App::$strings["Conversation Features"] = "Funciones de conversación ";
 App::$strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
 App::$strings["View Source"] = "Ver el código fuente de la entrada";
 App::$strings["Follow Thread"] = "Seguir este hilo";
@@ -1384,7 +1321,7 @@ App::$strings["__ctx:noun__ Abstain"] = array(
 	0 => "se abstiene",
 	1 => "Se abstienen",
 );
-App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones";
+App::$strings["Select a profile to assign to this contact"] = "Seleccione un perfil para asignar a este contacto";
 App::$strings["Frequently"] = "Frecuentemente";
 App::$strings["Hourly"] = "Cada hora";
 App::$strings["Twice daily"] = "Dos veces al día";
@@ -1451,8 +1388,9 @@ 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."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos que ya existen  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 App::$strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales";
 App::$strings["edit"] = "editar";
+App::$strings["Privacy Groups"] = "Grupos de canales";
 App::$strings["Edit group"] = "Editar grupo";
-App::$strings["Add privacy group"] = "Añadir un grupo de canales";
+App::$strings["Manage privacy groups"] = "Gestionar grupos de privacidad";
 App::$strings["Channels not in any privacy group"] = "Sin canales en ningún grupo";
 App::$strings["add"] = "añadir";
 App::$strings["Trending"] = "Etiquetas populares";
@@ -1475,6 +1413,7 @@ App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
 App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
 App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
 App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+App::$strings["&#x1f501; Repeated %1\$s's %2\$s"] = "&#x1f501; Repetidos %2\$sde %1\$s";
 App::$strings["Privacy group not found."] = "Grupo de canales no encontrado.";
 App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
 App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
@@ -1492,6 +1431,7 @@ App::$strings["__ctx:edit_activity__ Comment"] = "Comentar";
 App::$strings["The provided email address is not valid"] = "La dirección de correo electrónico proporcionada no es válida";
 App::$strings["The provided email domain is not among those allowed on this site"] = "El dominio de correo electrónico proporcionado no está entre los permitidos en este sitio";
 App::$strings["The provided email address is already registered at this site"] = "La dirección de correo electrónico proporcionada ya está registrada en este sitio";
+App::$strings["There is a pending registration for this address - click \"Register\" to continue verification"] = "Hay un registro pendiente para esta dirección - haga clic en \"Registro\" para continuar la verificación";
 App::$strings["An invitation is required."] = "Es obligatorio que le inviten.";
 App::$strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
 App::$strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
@@ -1557,7 +1497,7 @@ App::$strings["Nickname has unsupported characters or is already being used on t
 App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
 App::$strings["Default Profile"] = "Perfil principal";
 App::$strings["Unable to retrieve modified identity"] = "No se puede recuperar la identidad modficada";
-App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
+App::$strings["Requested channel is not available"] = "El canal solicitado no está disponible";
 App::$strings["Change profile photo"] = "Cambiar la foto del perfil";
 App::$strings["Create New Profile"] = "Crear un nuevo perfil";
 App::$strings["Profile Image"] = "Imagen del perfil";
@@ -1566,6 +1506,7 @@ App::$strings["Edit visibility"] = "Editar visibilidad";
 App::$strings["Gender:"] = "Género:";
 App::$strings["Status:"] = "Estado:";
 App::$strings["Homepage:"] = "Página personal:";
+App::$strings["Hometown:"] = "Lugar de nacimiento:";
 App::$strings["Online Now"] = "Ahora en línea";
 App::$strings["Change your profile photo"] = "Cambiar su foto del perfil";
 App::$strings["Trans"] = "Trans";
@@ -1578,7 +1519,6 @@ App::$strings["Age:"] = "Edad:";
 App::$strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
 App::$strings["Tags:"] = "Etiquetas:";
 App::$strings["Sexual Preference:"] = "Orientación sexual:";
-App::$strings["Hometown:"] = "Lugar de nacimiento:";
 App::$strings["Political Views:"] = "Posición política:";
 App::$strings["Religion:"] = "Religión:";
 App::$strings["About:"] = "Sobre mí:";
@@ -1618,15 +1558,7 @@ App::$strings[" by "] = "por";
 App::$strings[" on "] = "en";
 App::$strings["Embedded content"] = "Contenido incorporado";
 App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
-App::$strings["Directory Options"] = "Opciones del directorio";
-App::$strings["Safe Mode"] = "Modo seguro";
-App::$strings["Public Forums Only"] = "Solo foros públicos";
-App::$strings["This Website Only"] = "Solo este sitio web";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth:  %1\$s da la bienvenida a %2\$s";
-App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-App::$strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-App::$strings["[no subject]"] = "[sin asunto]";
-App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
 App::$strings["Commented Date"] = "Fecha de los comentarios";
 App::$strings["Order by last commented date"] = "Ordenar por la última fecha de los comentarios";
 App::$strings["Posted Date"] = "Fecha de publicación";
@@ -1634,6 +1566,8 @@ App::$strings["Order by last posted date"] = "Ordenar por la ultima fecha de pub
 App::$strings["Date Unthreaded"] = "Sin enhebrar por fecha";
 App::$strings["Order unthreaded by date"] = "Ordenar sin enhebrar por fecha";
 App::$strings["Stream Order"] = "Orden del stream";
+App::$strings["Add new guest"] = "Añadir un nuevo invitado";
+App::$strings["Guest access"] = "Acceso para invitados";
 App::$strings["Archives"] = "Hemeroteca";
 App::$strings["Add new page"] = "Añadir una nueva página";
 App::$strings["Options"] = "Opciones";
@@ -1643,12 +1577,6 @@ App::$strings["View Photo"] = "Ver foto";
 App::$strings["Edit Album"] = "Editar álbum";
 App::$strings["Upload"] = "Subir";
 App::$strings["Tasks"] = "Tareas";
-App::$strings["Public Hubs"] = "Servidores públicos";
-App::$strings["Received Messages"] = "Mensajes recibidos";
-App::$strings["Sent Messages"] = "Enviar mensajes";
-App::$strings["Conversations"] = "Conversaciones";
-App::$strings["No messages."] = "Sin mensajes.";
-App::$strings["Delete conversation"] = "Eliminar conversación";
 App::$strings["Chat Members"] = "Miembros del chat";
 App::$strings["I will attend"] = "Participaré";
 App::$strings["I will not attend"] = "No participaré";
@@ -1691,6 +1619,7 @@ App::$strings["Remove term"] = "Eliminar término";
 App::$strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
 App::$strings["Account settings"] = "Configuración de la cuenta";
 App::$strings["Channel settings"] = "Configuración del canal";
+App::$strings["Privacy settings"] = "Ajustes de peivacidad";
 App::$strings["Display settings"] = "Ajustes de visualización";
 App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
 App::$strings["Overview"] = "Resumen";
@@ -1698,22 +1627,20 @@ App::$strings["Ignore/Hide"] = "Ignorar/Ocultar";
 App::$strings["Suggestions"] = "Sugerencias";
 App::$strings["See more..."] = "Ver más...";
 App::$strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
+App::$strings["App Categories"] = "Categorías de aplicaciones";
 App::$strings["__ctx:wiki_history__ Message"] = "Mensaje";
 App::$strings["Date"] = "Fecha";
 App::$strings["Revert"] = "Revertir";
 App::$strings["Compare"] = "Comparar";
-App::$strings["HQ Control Panel"] = "Panel de control de HQ";
-App::$strings["Create a new post"] = "Crear una nueva entrada";
-App::$strings["Private Mail Menu"] = "Menú de correo privado";
-App::$strings["Combined View"] = "Vista combinada";
-App::$strings["Inbox"] = "Bandeja de entrada";
-App::$strings["Outbox"] = "Bandeja de salida";
-App::$strings["New Message"] = "Nuevo mensaje";
+App::$strings["Toggle post editor"] = "Alternar editor de entradas";
+App::$strings["Toggle personal notes"] = "Alternar notas personales";
+App::$strings["Add new role"] = "Añadir nuevo rol";
+App::$strings["Contact roles"] = "Roles del contacto";
+App::$strings["Role members"] = "Miembros del rol";
 App::$strings["photo/image"] = "foto/imagen";
 App::$strings["Site"] = "Sitio";
 App::$strings["Accounts"] = "Cuentas";
 App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
-App::$strings["Channels"] = "Canales";
 App::$strings["Security"] = "Seguridad";
 App::$strings["Features"] = "Funcionalidades";
 App::$strings["Addons"] = "Addons";
@@ -1746,9 +1673,8 @@ App::$strings["Stream Filters"] = "Filtros del stream";
 App::$strings["App Collections"] = "Colección de aplicaciones";
 App::$strings["Installed apps"] = "Aplicaciones instaladas";
 App::$strings["Available Apps"] = "Aplicaciones disponibles";
-App::$strings["Events Tools"] = "Gestión de eventos";
-App::$strings["Export Calendar"] = "Exportar el calendario";
-App::$strings["Import Calendar"] = "Importar un calendario";
+App::$strings["Add new group"] = "Añadir nuevo grupo";
+App::$strings["Privacy groups"] = "Grupos de canales";
 App::$strings["Rating Tools"] = "Valoraciones";
 App::$strings["Rate Me"] = "Valorar este canal";
 App::$strings["View Ratings"] = "Mostrar las valoraciones";
@@ -1757,6 +1683,11 @@ App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f
 App::$strings["Add New Connection"] = "Añadir nueva conexión";
 App::$strings["Enter channel address"] = "Dirección del canal";
 App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen";
+App::$strings["Public and restricted messages"] = "Mensajes públicos y restringidos";
+App::$strings["Direct messages"] = "Mensajes directos";
+App::$strings["Starred messages"] = "Entradas preferidas";
+App::$strings["Notices"] = "Avisos";
+App::$strings["No messages"] = "Sin mensajes";
 App::$strings["Profile Creation"] = "Creación de perfiles";
 App::$strings["Upload profile photo"] = "Cargar la foto del perfil";
 App::$strings["Upload cover photo"] = "Cargar la foto de portada del perfil";
@@ -1773,62 +1704,51 @@ App::$strings["Pin apps to navigation bar"] = "Fijar apps a la barra de navegaci
 App::$strings["Install more apps"] = "Instalar más apps";
 App::$strings["View public stream"] = "Ver el \"stream\" público";
 App::$strings["New Member Links"] = "Enlaces para nuevos miembros";
+App::$strings["Read mode"] = "Modo lectura";
+App::$strings["Edit mode"] = "Modo edición";
+App::$strings["Editing"] = "Editar";
+App::$strings["Saving"] = "Guardar";
+App::$strings["Saved"] = "Guardado";
 App::$strings["Me"] = "Yo";
 App::$strings["Family"] = "Familia";
 App::$strings["Acquaintances"] = "Conocidos/as";
 App::$strings["All"] = "Todos/as";
 App::$strings["Refresh"] = "Recargar";
-App::$strings["New Network Activity"] = "Nueva actividad en la red";
-App::$strings["New Network Activity Notifications"] = "Avisos de nueva actividad en la red";
-App::$strings["View your network activity"] = "Ver la actividad de su red";
+App::$strings["New network activity notifications"] = "Avisos de nueva actividad en la red";
+App::$strings["Network stream"] = "Stream de la red";
 App::$strings["Mark all notifications read"] = "Marcar todas las notificaciones como leídas";
 App::$strings["Show new posts only"] = "Mostrar solo las entradas nuevas";
 App::$strings["Filter by name or address"] = "Filtrar por nombre o dirección";
-App::$strings["New Home Activity"] = "Nueva actividad en su página principal";
-App::$strings["New Home Activity Notifications"] = "Avisos de nueva actividad en su página principal";
-App::$strings["View your home activity"] = "Ver la actividad de su página principal";
+App::$strings["New home activity notifications"] = "Avisos de nueva actividad en su página principal";
+App::$strings["Home stream"] = "Stream de su página principal";
 App::$strings["Mark all notifications seen"] = "Marcar todas las notificaciones como vistas";
-App::$strings["New Direct Messages"] = "Nuevos mensajes directos";
-App::$strings["New Direct Messages Notifications"] = "Nuevas notificaciones de mensajes directos";
-App::$strings["View your direct messages"] = "Ver sus mensajes directos";
-App::$strings["New Mails"] = "Nuevos mensajes de correo";
-App::$strings["New Mails Notifications"] = "Avisos de nuevos mensajes de correo";
-App::$strings["View your private mails"] = "Ver sus correos privados";
-App::$strings["Mark all messages seen"] = "Marcar todos los mensajes como vistos";
-App::$strings["New Events"] = "Eventos nuevos";
-App::$strings["New Events Notifications"] = "Avisos de nuevos eventos";
+App::$strings["New direct messages notifications"] = "Nuevas notificaciones de mensajes directos";
+App::$strings["Direct messages stream"] = "Stream de mensajes directos";
+App::$strings["New events notifications"] = "Avisos de nuevos eventos";
 App::$strings["View events"] = "Ver los eventos";
 App::$strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
 App::$strings["New Connections"] = "Nuevas conexiones";
-App::$strings["New Connections Notifications"] = "Avisos de nuevas conexiones";
+App::$strings["New connections notifications"] = "Avisos de nuevas conexiones";
 App::$strings["View all connections"] = "Ver todas las conexiones";
-App::$strings["New Files"] = "Ficheros nuevos";
-App::$strings["New Files Notifications"] = "Avisos de nuevos ficheros";
-App::$strings["Notices"] = "Avisos";
+App::$strings["New files notifications"] = "Avisos de nuevos ficheros";
 App::$strings["View all notices"] = "Ver todos los avisos";
 App::$strings["Mark all notices seen"] = "Marcar como leídos todos los avisos";
-App::$strings["New Registrations"] = "Registros nuevos";
-App::$strings["New Registrations Notifications"] = "Notificaciones de nuevos registros";
+App::$strings["Registrations"] = "Registros";
+App::$strings["New registrations notifications"] = "Notificaciones de nuevos registros";
 App::$strings["Public Stream"] = "\"Stream\" público";
-App::$strings["Public Stream Notifications"] = "Avisos del \"stream\" público";
-App::$strings["View the public stream"] = "Ver el \"stream\" público";
+App::$strings["New public stream notifications"] = "Nuevos avisos del stream público";
+App::$strings["Public stream"] = "\"Stream\" público";
 App::$strings["Sorry, you have got no notifications at the moment"] = "Lo sentimos, por el momento no ha recibido ninguna notificación";
 App::$strings["This channel is limited to %d tokens"] = "Este canal tiene un límite de %d tokens";
 App::$strings["Name and Password are required."] = "Se requiere el nombre y la contraseña.";
 App::$strings["Token saved."] = "Token salvado.";
-App::$strings["Guest Access App"] = "App Acceso para invitados";
-App::$strings["Create access tokens so that non-members can access private content"] = "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado";
-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."] = "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros de Hubzilla. Estas identidades se pueden usar en las Listas de control de acceso (ACL) y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado.";
-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:"] = "También puede proporcionar, con el estilo <em>dropbox</em>, enlaces de acceso a sus amigos y asociados añadiendo la contraseña de inicio de sesión a cualquier dirección URL, como se muestra. Ejemplos: ";
-App::$strings["Guest Access Tokens"] = "Tokens de acceso para invitados";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in privacy groups and visitors may login using these credentials to access private content."] = "Utilice este formulario para crear identificadores de acceso temporal para compartir cosas con los no miembros. Estas identidades se pueden usar en los grupos de canales y así los visitantes pueden iniciar sesión, utilizando estas credenciales, para acceder a su contenido privado.";
+App::$strings["Please select a role for this guest!"] = "Por favor, seleccione un rol para este invitado";
+App::$strings["Select a role for this guest"] = "Seleccione un rol para este invitado";
+App::$strings["Guest Access"] = "Acceso para invitados";
 App::$strings["Login Name"] = "Nombre de inicio de sesión";
 App::$strings["Login Password"] = "Contraseña de inicio de sesión";
 App::$strings["Expires (yyyy-mm-dd)"] = "Expira (aaaa-mm-dd)";
-App::$strings["Their Settings"] = "Sus ajustes";
-App::$strings["My Settings"] = "Mis ajustes";
-App::$strings["inherited"] = "heredado";
-App::$strings["Individual Permissions"] = "Permisos individuales";
-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."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
 App::$strings["Item not found"] = "Elemento no encontrado";
 App::$strings["Channel not found."] = "Canal no encontrado.";
 App::$strings["Edit Article"] = "Editar el artículo";
@@ -1841,24 +1761,31 @@ App::$strings["Search Results For:"] = "Buscar resultados para:";
 App::$strings["Reset form"] = "Reiniciar el formulario";
 App::$strings["Privacy group is empty"] = "El grupo de canales está vacío";
 App::$strings["Privacy group: "] = "Grupo de canales: ";
-App::$strings["Nothing to import."] = "No hay nada para importar.";
-App::$strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
-App::$strings["Imported file is empty."] = "El fichero importado está vacío.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atención: Las versiones de la base de datos difieren en %1\$d actualizaciones.";
-App::$strings["Import completed"] = "Importación completada";
+App::$strings["Not a zip file or zip file corrupted."] = "No es un archivo zip o un archivo zip corrupto.";
 App::$strings["Import Items"] = "Importar elementos";
 App::$strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas y contenido desde un archivo de exportación.";
 App::$strings["File to Upload"] = "Fichero para subir";
+App::$strings["Imported file is empty."] = "El fichero importado está vacío.";
+App::$strings["Content import completed"] = "Importación de contenidos completada";
+App::$strings["Chatroom import completed"] = "Importación de salas de chat completada";
+App::$strings["Channel calendar import 1/2 completed"] = "Importación del calendario del canal 1/2 completada";
+App::$strings["Channel calendar import 2/2 completed"] = "Importación del calendario del canal 2/2 completada";
+App::$strings["Menu import completed"] = "Importación de menús completada";
+App::$strings["Wiki import completed"] = "Importación de wikis completada";
+App::$strings["Webpages import completed"] = "Importación de páginas web completada";
+App::$strings["Nothing to import."] = "No hay nada para importar.";
+App::$strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
 App::$strings["Your service plan only allows %d channels."] = "Su paquete de servicios solo permite %d canales.";
 App::$strings["No channel. Import failed."] = "No hay canal. La importación ha fallado";
+App::$strings["Automatic content and files import was not possible due to API version incompatiblity. Please import content and files manually!"] = "La importación automática de contenidos y archivos no fue posible debido a la incompatibilidad de la versión de la API. Por favor, importe el contenido y los archivos manualmente.";
 App::$strings["You must be logged in to use this feature."] = "Debe estar registrado para poder usar esta funcionalidad.";
-App::$strings["Import Channel"] = "Importar canal";
+App::$strings["Channel Import"] = "Importar canal";
 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."] = "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación.";
 App::$strings["Or provide the old server/hub details"] = "O proporcione los detalles de su antiguo servidor/hub";
 App::$strings["Your old identity address (xyz@example.com)"] = "Su identidad en el antiguo servidor  (canal@ejemplo.com)";
 App::$strings["Your old login email address"] = "Su antigua dirección de correo electrónico";
 App::$strings["Your old login password"] = "Su antigua contraseña";
-App::$strings["Import a few months of posts if possible (limited by available memory"] = "Importar unos meses de mensajes si es posible (limitado por la memoria disponible";
+App::$strings["Import your items and files (limited by available memory)"] = "Importar sus artículos y archivos (limitado por la memoria disponible)";
 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."] = "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos.";
 App::$strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
 App::$strings["Move this channel (disable all previous locations)"] = "Mover este canal (desactivar todas las ubicaciones anteriores)";
@@ -1878,7 +1805,6 @@ App::$strings["Invitation not in time or too late"] = "La invitación no llega a
 App::$strings["Invitation email failed"] = "Error en el correo electrónico de invitación";
 App::$strings["Invitation code failed"] = "Código de invitación fallido";
 App::$strings["Invitations are not available"] = "No hay invitaciones disponibles";
-App::$strings["Email address already in use"] = "La dirección de correo electrónico ya está en uso";
 App::$strings["Registration on this hub is by invitation only"] = "El registro en este hub solo es posible por invitación";
 App::$strings["New register request"] = "Nueva solicitud de registro";
 App::$strings["Error creating dId A"] = "Error al crear dId A";
@@ -2001,6 +1927,7 @@ App::$strings["IMPORTANT: You will need to [manually] setup a scheduled task for
 App::$strings["No connections."] = "Sin conexiones.";
 App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
 App::$strings["View Connections"] = "Ver conexiones";
+App::$strings["Public Hubs"] = "Servidores públicos";
 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."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales.";
 App::$strings["Hub URL"] = "Dirección del hub";
 App::$strings["Access Type"] = "Tipo de acceso";
@@ -2011,6 +1938,7 @@ App::$strings["Rate"] = "Valorar";
 App::$strings["View"] = "Ver";
 App::$strings["Posts and comments"] = "Publicaciones y comentarios";
 App::$strings["Only posts"] = "Solo publicaciones";
+App::$strings["Malformed message id."] = "ID de mensaje malformado.";
 App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
 App::$strings["You must enable javascript for your browser to be able to view this content."] = "Debe habilitar javascript para poder ver este contenido en su navegador.";
 App::$strings["Invalid profile identifier."] = "Identificador del perfil no válido";
@@ -2021,17 +1949,14 @@ App::$strings["All Connections"] = "Todas las conexiones";
 App::$strings["Privacy group created."] = "El grupo de canales ha sido creado.";
 App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales";
 App::$strings["Privacy group updated."] = "Grupo de canales actualizado.";
-App::$strings["Privacy Groups App"] = "App Grupos de canales";
-App::$strings["Management of privacy groups"] = "Gestión de grupos de canales";
-App::$strings["Add Group"] = "Agregar un grupo";
+App::$strings["Post to this group by default"] = "Publicar en este grupo por defecto";
+App::$strings["Add new contacts to this group by default"] = "Añadir nuevos contactos a este grupo por defecto";
 App::$strings["Privacy group name"] = "Nombre del grupo";
 App::$strings["Members are visible to other channels"] = "Los miembros son visibles para otros canales";
-App::$strings["Members"] = "Miembros";
 App::$strings["Privacy group removed."] = "Grupo de canales eliminado.";
 App::$strings["Unable to remove privacy group."] = "No se puede eliminar el grupo de canales.";
 App::$strings["Privacy Group: %s"] = "Grupo privado %s";
 App::$strings["Privacy group name: "] = "Nombre del grupo de canales:";
-App::$strings["Delete Group"] = "Eliminar grupo";
 App::$strings["Group members"] = "Miembros del grupo";
 App::$strings["Not in this group"] = "No en este grupo";
 App::$strings["Click a channel to toggle membership"] = "Haga clic en un canal para cambiar los miembros";
@@ -2053,8 +1978,6 @@ App::$strings["View the public stream. Warning: this content is not moderated"]
 App::$strings["Name is required"] = "El nombre es obligatorio";
 App::$strings["Key and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios";
 App::$strings["Update"] = "Actualizar";
-App::$strings["OAuth Apps Manager App"] = "App Gestión de apps OAuth";
-App::$strings["OAuth authentication tokens for mobile and remote apps"] = "Tokens de autenticación de OAuth para aplicaciones móviles y remotas";
 App::$strings["Add application"] = "Añadir aplicación";
 App::$strings["Name of application"] = "Nombre de la aplicación";
 App::$strings["Automatically generated - change if desired. Max length 20"] = "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20";
@@ -2070,11 +1993,7 @@ App::$strings["Page link"] = "Enlace de la página";
 App::$strings["Edit Webpage"] = "Editar la página web";
 App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
 App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
-App::$strings["Welcome to Hubzilla!"] = "¡Bienvenido a Hubzilla!";
-App::$strings["You have got no unseen posts..."] = "No tiene ningún mensaje sin leer...";
 App::$strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original.";
-App::$strings["Chatrooms App"] = "App Salas de chat";
-App::$strings["Access Controlled Chatrooms"] = "Salas de chat moderadas";
 App::$strings["Room not found"] = "Sala no encontrada";
 App::$strings["Leave Room"] = "Abandonar la sala";
 App::$strings["Delete Room"] = "Eliminar esta sala";
@@ -2086,7 +2005,7 @@ App::$strings["Chatroom name"] = "Nombre de la sala de chat";
 App::$strings["Expiration of chats (minutes)"] = "Caducidad de los mensajes en los chats (en minutos)";
 App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
 App::$strings["No chatrooms available"] = "No hay salas de chat disponibles";
-App::$strings["Create New"] = "Crear";
+App::$strings["Add Room"] = "Añadir una sala de chat";
 App::$strings["Expiration"] = "Caducidad";
 App::$strings["min"] = "min";
 App::$strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
@@ -2110,8 +2029,6 @@ App::$strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s
 App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s se abstiene";
 App::$strings["Action completed."] = "Acción completada.";
 App::$strings["Thank you."] = "Gracias.";
-App::$strings["Poke App"] = "App Toques";
-App::$strings["Poke somebody in your addressbook"] = "Dar un toque a alguien en su libreta de direcciones";
 App::$strings["Poke somebody"] = "Dar un toque a alguien";
 App::$strings["Poke/Prod"] = "Toque/Incitación";
 App::$strings["Poke, prod or do other things to somebody"] = "Dar un toque, incitar o hacer otras cosas a alguien";
@@ -2120,8 +2037,6 @@ App::$strings["Choose what you wish to do to recipient"] = "Elegir qué desea en
 App::$strings["Make this post private"] = "Convertir en privado este envío";
 App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
 App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
-App::$strings["CardDAV App"] = "App CarDav";
-App::$strings["CalDAV capable addressbook"] = "Libreta de direcciones compatible con CalDav";
 App::$strings["Event title"] = "Título del evento";
 App::$strings["Start date and time"] = "Fecha y hora de comienzo";
 App::$strings["End date and time"] = "Fecha y hora de finalización";
@@ -2139,6 +2054,7 @@ App::$strings["Less"] = "Menos";
 App::$strings["Select calendar"] = "Seleccionar un calendario";
 App::$strings["Delete all"] = "Eliminar todos";
 App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado.";
+App::$strings["Could not fetch calendar resource. The selected calendar might be disabled."] = "No se ha podido obtener el recurso del calendario. Es posible que el calendario seleccionado esté desactivado.";
 App::$strings["Organisation"] = "Organización";
 App::$strings["Phone"] = "Teléfono";
 App::$strings["Instant messenger"] = "Mensajería instantánea";
@@ -2156,9 +2072,12 @@ App::$strings["ZIP Code"] = "Código postal";
 App::$strings["Country"] = "País";
 App::$strings["Default Calendar"] = "Calendario por defecto";
 App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto";
-App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
-App::$strings["Visible to:"] = "Visible para:";
+App::$strings["Remote privacy information not available"] = "La información sobre privacidad remota no está disponible";
 App::$strings["__ctx:acl__ Profile"] = "Perfil";
+App::$strings["Privacy group"] = "Grupo de canales";
+App::$strings["Click to copy link to this ressource for guest %s to clipboard"] = "Haga clic para copiar el enlace a este recurso para invitados %sen el portapapeles";
+App::$strings["Link copied"] = "Enlace copiado";
+App::$strings["Access"] = "Acceso";
 App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada.";
 App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada.";
 App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar.";
@@ -2204,13 +2123,12 @@ App::$strings["Last Modified"] = "Última modificación";
 App::$strings["Remove all files"] = "Eliminar todos los ficheros";
 App::$strings["Remove this file"] = "Eliminar este fichero";
 App::$strings["Documentation Search"] = "Búsqueda de Documentación";
+App::$strings["Members"] = "Miembros";
 App::$strings["Administrators"] = "Administradores";
 App::$strings["Developers"] = "Desarrolladores";
 App::$strings["Tutorials"] = "Tutoriales";
 App::$strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
 App::$strings["Contents"] = "Contenidos";
-App::$strings["Webpages App"] = "App de Páginas web";
-App::$strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
 App::$strings["Import Webpage Elements"] = "Importar elementos de una página web";
 App::$strings["Import selected"] = "Importar elementos seleccionados";
 App::$strings["Export Webpage Elements"] = "Exportar elementos de una página web";
@@ -2249,7 +2167,6 @@ App::$strings["(No specific instructions have been provided by the channel owner
 App::$strings["Restricted or Premium Channel"] = "Canal premium o restringido";
 App::$strings["Not found"] = "No encontrado";
 App::$strings["Unknown error"] = "Error desconocido";
-App::$strings["&#x1f501; Repeated %1\$s's %2\$s"] = "&#x1f501; Repetidos %2\$sde %1\$s";
 App::$strings["Post repeated"] = "Entrada repetida";
 App::$strings["network"] = "red";
 App::$strings["Item is not editable"] = "El elemento no es editable";
@@ -2265,6 +2182,7 @@ App::$strings["Total Entries"] = "Total de entradas";
 App::$strings["Priority"] = "Prioridad";
 App::$strings["Destination URL"] = "Dirección de destino";
 App::$strings["Mark hub permanently offline"] = "Marcar el servidor como permanentemente fuera de línea";
+App::$strings["Retry delivery to this hub"] = "Reintentar la entrega a este hub";
 App::$strings["Empty queue for this hub"] = "Vaciar la cola para este servidor";
 App::$strings["Last known contact"] = "Último contacto conocido";
 App::$strings["Theme settings updated."] = "Ajustes del tema actualizados.";
@@ -2557,15 +2475,14 @@ App::$strings["Manage Apps"] = "Administrar apps";
 App::$strings["Create Custom App"] = "Crear una app personalizada";
 App::$strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
 App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña.";
-App::$strings["Remove This Channel"] = "Eliminar este canal";
+App::$strings["Remove Channel"] = "Eliminar el canal";
 App::$strings["WARNING: "] = "ATENCIÓN:";
-App::$strings["This channel will be completely removed from the network. "] = "Este canal va a ser completamente eliminado de la red. ";
-App::$strings["This action is permanent and can not be undone!"] = "¡Esta acción tiene carácter definitivo y no se puede deshacer!";
+App::$strings["This channel will be permanently removed. "] = "Este canal será eliminado permanentemente. ";
+App::$strings["This action can not be undone!"] = "¡Esta acción no se puede deshacer!";
 App::$strings["Please enter your password for verification:"] = "Por favor, introduzca su contraseña para su verificación:";
-App::$strings["Remove Channel"] = "Eliminar el canal";
 App::$strings["Email resent"] = "Correo electrónico reenviado";
 App::$strings["Email resend failed"] = "Fallo en el reenvío del correo electrónico";
-App::$strings["Verify successfull"] = "Verificar que se ha hecho bien";
+App::$strings["Verification successful"] = "¡Verificación exitosa!";
 App::$strings["Account successfull created"] = "Cuenta creada con éxito";
 App::$strings["Channel successfull created"] = "Canal creado con éxito";
 App::$strings["Automatic channel creation failed. Please create a channel."] = "La creación automática de canales ha fallado. Por favor, cree un canal.";
@@ -2580,7 +2497,7 @@ App::$strings["Registration verification"] = "Verificación del registro";
 App::$strings["Hold on, you can start verification in"] = "Espere, puede empezar la verificación en ";
 App::$strings["Please remember your verification token for ID"] = "Por favor, recuerde su token de verificación para la identificación";
 App::$strings["Token validity"] = "Validez del token";
-App::$strings["Resend"] = "Reenviar";
+App::$strings["Resend email"] = "Reenvío de correo electrónico";
 App::$strings["Registration status"] = "Estado del registro";
 App::$strings["Verification successful!"] = "¡Verificación exitosa!";
 App::$strings["Your login ID is"] = "Su ID de acceso es";
@@ -2588,56 +2505,46 @@ App::$strings["After your account has been approved by our administrator you wil
 App::$strings["Registration request revoked"] = "Solicitud de registro anulada";
 App::$strings["Sorry for any inconvience. Thank you for your response."] = "Disculpe las molestias. Gracias por su respuesta.";
 App::$strings["Please enter your verification token for ID"] = "Por favor, introduzca su token de verificación para la identificación";
+App::$strings["Please check your email!"] = "¡Por favor, compruebe su correo electrónico!";
 App::$strings["Verification token"] = "Token de verificación ";
 App::$strings["ID expired"] = "ID caducada";
 App::$strings["You will require the verification token for ID"] = "Necesitará el token de verificación para identificarse";
 App::$strings["Unknown or expired ID"] = "ID desconocida o caducada";
 App::$strings["dId2 malformed"] = "did2 malformado/a";
-App::$strings["Edit event title"] = "Editar el título del evento";
-App::$strings["Categories (comma-separated list)"] = "Temas (lista separada por comas)";
-App::$strings["Edit Category"] = "Modificar el tema";
-App::$strings["Category"] = "Tema";
-App::$strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
-App::$strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
-App::$strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
-App::$strings["Finish date and time"] = "Fecha y hora de terminación";
-App::$strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de los husos horarios";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
-App::$strings["Edit Description"] = "Editar la descripción";
-App::$strings["Edit Location"] = "Modificar la dirección";
-App::$strings["Advanced Options"] = "Opciones avanzadas";
-App::$strings["l, F j"] = "l j F";
-App::$strings["Edit Event"] = "Editar el evento";
-App::$strings["Create Event"] = "Crear un evento";
-App::$strings["Event removed"] = "Evento borrado";
 App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
 App::$strings["Create a new channel"] = "Crear un nuevo canal";
+App::$strings["Create New"] = "Crear";
 App::$strings["Current Channel"] = "Canal actual";
 App::$strings["Switch to one of your channels by selecting it."] = "Cambiar a uno de sus canales seleccionándolo.";
 App::$strings["Default Channel"] = "Canal principal";
 App::$strings["Make Default"] = "Convertir en predeterminado";
-App::$strings["%d new messages"] = "%d mensajes nuevos";
 App::$strings["%d new introductions"] = "%d nuevas solicitudes de conexión";
 App::$strings["Delegated Channel"] = "Canal delegado";
+App::$strings["Layout not found"] = "Diseño no encontrado";
+App::$strings["This template does not support pdledi_gui (no content regions defined)"] = "Esta plantilla no es compatible con pdledi_gui (no hay regiones de contenido definidas)";
+App::$strings["Main page content"] = "Contenido de la página principal";
+App::$strings["The main page content can not be edited!"] = "El contenido de la página principal no se puede editar.";
 App::$strings["toggle full screen mode"] = "cambiar al modo de pantalla completa";
-App::$strings["Public Stream App"] = "App Stream público";
-App::$strings["The unmoderated public stream of this hub"] = "Stream público no moderado de este hub";
 App::$strings["Away"] = "Ausente";
 App::$strings["Online"] = "Conectado/a";
+App::$strings["Contact role deleted."] = "Rol de contacto eliminado.";
 App::$strings["Permission category name is required."] = "El nombre de la categoría de permiso es obligatorio.";
-App::$strings["Permission category saved."] = "Se ha guardado la categoría del permiso.";
-App::$strings["Permission Categories App"] = "App Categorías de permisos";
-App::$strings["Create custom connection permission limits"] = "Crear límites de permisos de conexión personalizados";
-App::$strings["Use this form to create permission rules for various classes of people or connections."] = "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones.";
-App::$strings["Permission Categories"] = "Tipos de permisos";
-App::$strings["Permission category name"] = "Nombre de categoría de permiso";
+App::$strings["Contact role saved."] = "Rol de contacto guardado.";
+App::$strings["Role to assign affected contacts and default role to"] = "Rol a asignar a los contactos afectados y rol por defecto";
+App::$strings["Role to assign affected contacts to"] = "Rol al que asignar los contactos afectados";
+App::$strings["Assign this role to"] = "Asigne este rol a ";
+App::$strings["All my contacts"] = "Todos mis contactos";
+App::$strings["Automatically assign this role to new contacts"] = "Asignar automáticamente este rol a los nuevos contactos";
+App::$strings["Contact Roles"] = "Roles de contacto";
+App::$strings["Role name"] = "Nombre del rol ";
+App::$strings["System role - not editable"] = "Rol de sistema - no editable";
+App::$strings["Deleting"] = "Eliminación";
+App::$strings["inherited"] = "heredado";
+App::$strings["Role Permissions"] = "Permisos de rol";
+App::$strings["Some permissions may be inherited from your <a href=\"settings\">channel role</a>, which have higher priority than contact role settings."] = "Algunos permisos pueden ser heredados de su <a href=\"settings\">rol de canal</a>, que tienen mayor prioridad que la configuración del rol de contacto.";
 App::$strings["Token verification failed."] = "Ha fallado el token de verificación.";
 App::$strings["Email verification resent"] = "Reenvío del email de verificación";
 App::$strings["Unable to resend email verification message."] = "No se puede reenviar el mensaje de verificación por correo electrónico.";
-App::$strings["No ratings"] = "Ninguna valoración";
-App::$strings["Rating: "] = "Valoración:";
-App::$strings["Website: "] = "Sitio web:";
-App::$strings["Description: "] = "Descripción:";
 App::$strings["Permissions denied."] = "Permisos denegados.";
 App::$strings["item"] = "elemento";
 App::$strings["Change Order of Pinned Navbar Apps"] = "Cambiar el orden de las aplicaciones fijas en la barra de navegación";
@@ -2651,20 +2558,24 @@ App::$strings["Comment deleted"] = "Se ha eliminado el comentario";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña.";
 App::$strings["Remove This Account"] = "Eliminar esta cuenta";
 App::$strings["This account and all its channels will be completely removed from the network. "] = "Esta cuenta y todos sus canales van a ser eliminados de la red.";
+App::$strings["This action is permanent and can not be undone!"] = "¡Esta acción tiene carácter definitivo y no se puede deshacer!";
 App::$strings["Remove Account"] = "Eliminar cuenta";
 App::$strings["Language App"] = "App idioma";
-App::$strings["Change UI language"] = "Cambiar el idioma de la interfaz de usuario";
-App::$strings["Channel Export App"] = "App Exportación de canales";
-App::$strings["Export your channel"] = "Exportar su canal";
+App::$strings["No content available for year"] = "No hay contenido disponible para el año";
 App::$strings["Export Channel"] = "Exportar el canal";
-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."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
-App::$strings["Export Content"] = "Exportar contenidos";
-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."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
-App::$strings["Export your posts from a given year."] = "Exporta sus publicaciones de un año dado.";
-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."] = "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <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>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <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)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
+App::$strings["Export channel"] = "Exportar canal";
+App::$strings["This will export your identity and social graph into a file which can be used to import your channel to a new hub."] = "Esto exportará su identidad y su gráfico social a un archivo que puede utilizarse para importar su canal a un nuevo hub.";
+App::$strings["Export content"] = "Exportar contenidos";
+App::$strings["This will export your posts, direct messages, articles and cards per month stored into a zip file per year. Months with no posts will be dismissed."] = "Esto exportará sus posts, mensajes directos, artículos y fichas por mes almacenados en un archivo zip por año. Los meses sin publicaciones serán descartados.";
+App::$strings["Export wikis"] = "Exportar wikis";
+App::$strings["This will export your wikis and wiki pages."] = "Esto exportará sus wikis y páginas wiki.";
+App::$strings["Export webpages"] = "Exportar páginas web";
+App::$strings["This will export your webpages and menus."] = "Esto exportará sus páginas web y menús.";
+App::$strings["Export channel calendar"] = "Exportar el calendario del canal";
+App::$strings["This will export your channel calendar events and associated items. CalDAV calendars are not included."] = "Esto exportará los eventos del calendario de su canal y los elementos asociados. Los calendarios CalDAV no están incluidos.";
+App::$strings["Export chatrooms"] = "Exportar salas de chat";
+App::$strings["This will export your chatrooms. Chat history is dismissed."] = "Esto exportará sus chats. Se descarta el historial de chats.";
+App::$strings["This export can be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel."] = "Esta exportación puede ser importada o restaurada visitando <a href=\"%1\$s\">%2\$s</a> cualquier sitio que contenga su canal.";
 App::$strings["Article"] = "Artículo";
 App::$strings["Item has been removed."] = "Se ha eliminado el elemento.";
 App::$strings["No channel."] = "Ningún canal.";
@@ -2677,28 +2588,16 @@ App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \
 App::$strings["This will be used to create a unique network address (like an email address)."] = "Esto se utilizará para crear una dirección de red única (como una dirección de correo electrónico).";
 App::$strings["Allowed characters are a-z 0-9, - and _"] = "Los caracteres permitidos son a-z 0-9, - and _";
 App::$strings["Channel name"] = "Nombre del canal";
-App::$strings["Channel role and privacy"] = "Clase de canal y privacidad";
-App::$strings["Select a channel permission role compatible with your usage needs and privacy requirements."] = "Seleccione unos permisos de rol del canal compatibles con sus necesidades de uso y requisitos de privacidad.";
-App::$strings["Read more about channel permission roles"] = "Leer más sobre los roles y permisos";
+App::$strings["Channel role"] = "Rol del canal";
 App::$strings["Create a Channel"] = "Crear un canal";
 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."] = "Un canal es una identidad única en la red. Puede representar a una persona (un perfil de una red social), un foro o grupo, un negocio o una página de una celebridad, un \"feed\" de noticias, y muchas otras cosas.";
 App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal </a> desde otro lugar.";
 App::$strings["Validate"] = "Validar";
-App::$strings["sent you a private message"] = "le ha enviado un mensaje privado";
-App::$strings["added your channel"] = "añadió este canal a sus conexiones";
-App::$strings["requires approval"] = "requiere aprobación";
-App::$strings["g A l F d"] = "g A l d F";
-App::$strings["[today]"] = "[hoy]";
-App::$strings["posted an event"] = "publicó un evento";
-App::$strings["shared a file with you"] = "compartió un archivo con usted";
-App::$strings["Private forum"] = "Foro privado";
-App::$strings["Public forum"] = "Foro público";
 App::$strings["Entry censored"] = "Entrada censurada";
 App::$strings["Entry uncensored"] = "Entrada sin censurar";
 App::$strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
-App::$strings["Mood App"] = "App Estados de ánimo";
-App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
 App::$strings["Mood"] = "Estado de ánimo";
+App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
 App::$strings["About this site"] = "Acerca de este sitio";
 App::$strings["Site Name"] = "Nombre del sitio";
 App::$strings["Administrator"] = "Administrador";
@@ -2735,8 +2634,66 @@ App::$strings["Active addons"] = "Addons acivos";
 App::$strings["Version"] = "Versión";
 App::$strings["Repository version (master)"] = "Versión del repositorio (master)";
 App::$strings["Repository version (dev)"] = "Versión del repositorio (dev)";
-App::$strings["Cards App"] = "App de Fichas";
-App::$strings["Create personal planning cards"] = "Crear fichas de planificación personal";
+App::$strings["Invalid abook_id"] = "Abook_id no válido";
+App::$strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
+App::$strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
+App::$strings["is now connected to"] = "ahora está conectado/a";
+App::$strings["Contact Tools"] = "Gestión de contactos";
+App::$strings["Approve this contact"] = "Aprobar este contacto";
+App::$strings["Accept contact to allow communication"] = "Aceptar el contacto para permitir la comunicación";
+App::$strings["Please select a role for this contact!"] = "¡Por favor, seleccione un rol para este contacto!";
+App::$strings["This contact is unreachable from this location."] = "Este contacto es inaccesible desde esta ubicación.";
+App::$strings["This contact may be unreachable from other channel locations."] = "Este contacto puede ser inaccesible desde otras ubicaciones del canal.";
+App::$strings["Location independence is not supported by their network."] = "La independencia de ubicación no es compatible con su red.";
+App::$strings["View profile"] = "Ver el perfil";
+App::$strings["This is a group/forum channel"] = "Este es un canal de grupo/foro";
+App::$strings["Select a role for this contact"] = "Selecciones un rol para este contacto";
+App::$strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
+App::$strings["Custom Filter"] = "Filtro personalizado";
+App::$strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
+App::$strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
+App::$strings["Approve contact"] = "Aprobar contacto";
+App::$strings["Their"] = "Su/Sus";
+App::$strings["My"] = "Mi";
+App::$strings["Roles"] = "Roles";
+App::$strings["Compare permissions"] = "Comparar permisos";
+App::$strings["Permission"] = "Permiso ";
+App::$strings["Affinity"] = "Afinidad";
+App::$strings["Content filter"] = "Filtro de contenidos";
+App::$strings["Contact updated"] = "Contacto actualizado";
+App::$strings["Contact update failed"] = "Fallo en la actualización del contacto";
+App::$strings["Approve connection"] = "Aprobar esta conexión";
+App::$strings["Refresh succeeded"] = "Actualización con éxito";
+App::$strings["Refresh failed - channel is currently unavailable"] = "Error de actualización: el canal no está disponible en este momento";
+App::$strings["Block status updated"] = "Estado del bloqueo actualizado";
+App::$strings["Block failed"] = "Bloqueo fallido";
+App::$strings["Ignore status updated"] = "Estado de ignorar actualizado";
+App::$strings["Ignore failed"] = "Ignorar falló";
+App::$strings["Archive status updated"] = "Estado de archivar actualizado";
+App::$strings["Archive failed"] = "Archivar falló";
+App::$strings["Hide status updated"] = "Estado de ocultación actualizado";
+App::$strings["Hide failed"] = "Ocultar falló";
+App::$strings["Contact removed"] = "Contacto eliminado";
+App::$strings["Delete failed"] = "Eliminar falló";
+App::$strings["Refresh Permissions"] = "Recargar los permisos";
+App::$strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
+App::$strings["Refresh Photo"] = "Actualizar la foto";
+App::$strings["Fetch updated photo"] = "Obtener una foto actualizada";
+App::$strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
+App::$strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
+App::$strings["Unignore"] = "Dejar de ignorar";
+App::$strings["Ignore"] = "Ignorar";
+App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
+App::$strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
+App::$strings["Unarchive"] = "Desarchivar";
+App::$strings["Archive"] = "Archivar";
+App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
+App::$strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
+App::$strings["Unhide"] = "Mostrar";
+App::$strings["Hide"] = "Ocultar";
+App::$strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
+App::$strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
+App::$strings["Delete this connection"] = "Eliminar esta conexión";
 App::$strings["Add Card"] = "Añadir una ficha";
 App::$strings["No default suggestions were found."] = "No se encontraron sugerencias por defecto.";
 App::$strings["%d rating"] = array(
@@ -2782,19 +2739,17 @@ App::$strings["Image resize failed."] = "El ajuste del tamaño de la imagen ha f
 App::$strings["Image upload failed."] = "La carga de la imagen ha fallado.";
 App::$strings["Unable to process image."] = "No ha sido posible procesar la imagen.";
 App::$strings["Photo not available."] = "Foto no disponible.";
-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"] = "Su foto de perfil predeterminada es visible para cualquiera en Internet. Las fotos de perfil para perfiles alternativos heredarán los permisos del predeterminado.";
-App::$strings["Your profile photo is visible to anybody on the internet and may be distributed to other websites."] = "La foto de su perfil es visible para cualquiera en Internet y puede ser distribuida en otros sitios web.";
-App::$strings["Upload File:"] = "Subir fichero:";
-App::$strings["Select a profile:"] = "Seleccionar un perfil:";
+App::$strings["This profile photo will be visible to anybody on the internet and may be distributed to other websites."] = "Esta foto de perfil será visible para cualquier persona en Internet y podrá ser distribuida a otros sitios web.";
+App::$strings["This profile photo will be visible only to channels with permission to view this profile."] = "Esta foto de perfil sólo será visible para los canales con permiso para ver este perfil.";
 App::$strings["Use Photo for Profile"] = "Usar la fotografía para el perfil";
 App::$strings["Change Profile Photo"] = "Cambiar la foto del perfil";
-App::$strings["Use"] = "Usar";
+App::$strings["Reset to default"] = "Restablecer los valores por defecto";
 App::$strings["Use a photo from your albums"] = "Usar una foto de sus álbumes";
 App::$strings["Choose a different album"] = "Elegir un álbum diferente...";
-App::$strings["Select existing photo"] = "Seleccionar una foto";
+App::$strings["Select existing"] = "Seleccione lo que hay";
 App::$strings["Crop Image"] = "Recortar imagen";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
-App::$strings["Done Editing"] = "Edición completada";
+App::$strings["Done editing"] = "Edición completada";
 App::$strings["Edit Block"] = "Modificar este bloque";
 App::$strings["Enter a folder name"] = "Escriba un nombre de carpeta";
 App::$strings["or select an existing folder (doubleclick)"] = "o seleccione una (con un doble click)";
@@ -2826,16 +2781,19 @@ App::$strings["Channel address"] = "Dirección del canal";
 App::$strings["Call"] = "Llamar";
 App::$strings["Status"] = "Estado";
 App::$strings["Connected"] = "Conectado/a";
-App::$strings["Approve connection"] = "Aprobar esta conexión";
 App::$strings["Ignore connection"] = "Ignorar esta conexión";
-App::$strings["Ignore"] = "Ignorar";
 App::$strings["Recent activity"] = "Actividad reciente";
 App::$strings["Connect at this location"] = "Conectar en esta ubicación ";
+App::$strings["Contact role"] = "Rol del contacto";
 App::$strings["Search your connections"] = "Buscar sus conexiones";
-App::$strings["Connections search"] = "Buscar conexiones";
+App::$strings["Contact search"] = "Buscar  contacto";
 App::$strings["Cover Photos"] = "Imágenes de portada del perfil";
 App::$strings["Your cover photo may be visible to anybody on the internet"] = "La foto de la portada puede ser visible para cualquiera en Internet";
+App::$strings["Upload File:"] = "Subir fichero:";
+App::$strings["Select a profile:"] = "Seleccionar un perfil:";
 App::$strings["Change Cover Photo"] = "Cambiar la foto de portada del perfil";
+App::$strings["Select existing photo"] = "Seleccionar una foto";
+App::$strings["Done Editing"] = "Edición completada";
 App::$strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
 App::$strings["Album not found."] = "Álbum no encontrado.";
 App::$strings["Delete Album"] = "Borrar álbum";
@@ -2913,7 +2871,10 @@ App::$strings["Sexual Preference"] = "Preferencia sexual";
 App::$strings["Homepage"] = "Página personal";
 App::$strings["Interests"] = "Intereses";
 App::$strings["Profile updated."] = "Perfil actualizado.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Ocultar la lista de conexiones a los visitantes del perfil";
+App::$strings["Hide my connections from viewers of this profile"] = "Ocultar mis conexiones a los espectadores de este perfil";
+App::$strings["Publish my default profile in the network directory"] = "Publicar mi perfil por defecto en el directorio de la red";
+App::$strings["Suggest me as a potential contact to new members"] = "Sugerirme como contacto potencial a los nuevos miembros";
+App::$strings["Reveal my online status"] = "Revelar mi estado en línea";
 App::$strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
 App::$strings["View this profile"] = "Ver este perfil";
 App::$strings["Profile Tools"] = "Gestión del perfil";
@@ -2922,7 +2883,7 @@ App::$strings["Create a new profile using these settings"] = "Crear un nuevo per
 App::$strings["Clone this profile"] = "Clonar este perfil";
 App::$strings["Delete this profile"] = "Eliminar este perfil";
 App::$strings["Add profile things"] = "Añadir cosas al perfil";
-App::$strings["Personal"] = "Personales";
+App::$strings["Basic"] = "Básico";
 App::$strings["Relationship"] = "Relación";
 App::$strings["Import profile from file"] = "Importar perfil desde un fichero";
 App::$strings["Export profile to file"] = "Exportar perfil a un fichero";
@@ -2956,19 +2917,11 @@ App::$strings["Love/Romance"] = "Vida sentimental o amorosa";
 App::$strings["School/Education"] = "Estudios";
 App::$strings["Contact information and social networks"] = "Información de contacto y redes sociales";
 App::$strings["My other channels"] = "Mis otros canales";
-App::$strings["Communications"] = "Comunicaciones";
 App::$strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %3\$s de %2\$s";
 App::$strings["%1\$s stopped following %2\$s's %3\$s"] = "%1\$s ha dejado de seguir %3\$s de %2\$s";
-App::$strings["Articles App"] = "App Artículos";
-App::$strings["Create interactive articles"] = "Crear artículos interactivos";
 App::$strings["Add Article"] = "Añadir un artículo";
 App::$strings["Bookmark added"] = "Marcador añadido";
-App::$strings["Bookmarks App"] = "App Marcadores";
-App::$strings["Bookmark links from posts and manage them"] = "Añadir enlaces de las entradas a Marcadores y administrarlos";
-App::$strings["My Bookmarks"] = "Mis marcadores";
 App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
-App::$strings["Remote Diagnostics App"] = "App Diagnósticos remotos";
-App::$strings["Perform diagnostics on remote channels"] = "Realizar diagnósticos en canales remotos";
 App::$strings["Channel name changes are not allowed within 48 hours of changing the account password."] = "Los cambios en el nombre de un canal no está permitida hasta pasadas 48 horas desde el cambio de contraseña de la cuenta.";
 App::$strings["Change channel nickname/address"] = "Cambiar el alias o la dirección del canal";
 App::$strings["Any/all connections on other networks will be lost!"] = "¡Cualquier/todas las conexiones en otras redes se perderán!";
@@ -2979,7 +2932,6 @@ App::$strings["Register is closed"] = "El registro está cerrado";
 App::$strings["Note, the invitation code is valid up to"] = "Tenga en cuenta que el código de invitación es válido hasta ";
 App::$strings["Too many recipients for one invitation (max %d)"] = "Demasiados destinatarios para una invitación (máx %d)";
 App::$strings["No recipients for this invitation"] = "No hay destinatarios para esta invitación";
-App::$strings["(%s) : Not a valid email address"] = "(%s): No es una dirección de correo electrónico válida";
 App::$strings["(%s) : Not a real email address"] = "(%s) : No es una dirección de correo electrónica real";
 App::$strings["(%s) : Not allowed email address"] = "(%s) : Dirección de correo electrónico no permitida";
 App::$strings["(%s) : email address already in use"] = "(%s) : La dirección de correo electrónico ya está en uso";
@@ -2999,15 +2951,15 @@ App::$strings["Invitations I am using"] = "Invitaciones que estoy utilizando ";
 App::$strings["Invitations we are using"] = "Invitaciones que usamos ";
 App::$strings["§ Note, the email(s) sent will be recorded in the system logs"] = "§ Nota: el/los correo(s) electrónicos enviados quedarán registrados en los registros del sistema";
 App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
+App::$strings["Your message:"] = "Su mensaje:";
 App::$strings["Invite template"] = "Plantilla de invitación";
+App::$strings["Subject:"] = "Asunto:";
 App::$strings["Here you may enter personal notes to the recipient(s)"] = "Aquí puede introducir notas personales para el/los destinatario(s)";
-App::$strings["Notes App"] = "App Notas";
-App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)";
+App::$strings["Private forum"] = "Foro privado";
+App::$strings["Public forum"] = "Foro público";
 App::$strings["Xchan Lookup"] = "Búsqueda de canales";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
 App::$strings["Affinity Tool settings updated."] = "Actualización de los ajustes de Affinity Tool.";
-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."] = "Esta aplicación presenta un control deslizante en su editor de conexión y también en su página de red. El control deslizante representa su grado de amistad (afinidad) con cada conexión. Le permite acercar o alejar y mostrar conversaciones sólo de sus amigos más cercanos o de todo el mundo en su stream.";
-App::$strings["Affinity Tool App"] = "App Affinity Tool ";
 App::$strings["The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage."] = "Los números que aparecen a continuación representan las posiciones predeterminadas mínimas y máximas de los controles deslizantes para su red/stream en forma de porcentaje.";
 App::$strings["Default maximum affinity level"] = "Nivel máximo de afinidad por defecto";
 App::$strings["0-99 default 99"] = "0-99 por defecto 99";
@@ -3016,61 +2968,23 @@ App::$strings["0-99 - default 0"] = "0-99 - por defecto 0";
 App::$strings["Persistent affinity levels"] = "Niveles de afinidad persistentes";
 App::$strings["If disabled the max and min levels will be reset to default after page reload"] = "Si está desactivado, los niveles máximo y mínimo se restablecerán a los valores predeterminados después de recargar la página.";
 App::$strings["Affinity Tool Settings"] = "Ajustes de Affinity Tool";
-App::$strings["Website:"] = "Sitio web:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)";
-App::$strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
 App::$strings["Max height of content (in pixels)"] = "Altura máxima del contenido (en píxeles)";
 App::$strings["Click to expand content exceeding this height"] = "Haga clic para expandir el contenido que exceda esta altura";
 App::$strings["Stream Settings"] = "Ajustes del stream";
 App::$strings["Additional Features"] = "Funcionalidades";
-App::$strings["Nobody except yourself"] = "Nadie excepto usted";
-App::$strings["Only those you specifically allow"] = "Solo aquellos a los que usted permita explícitamente";
-App::$strings["Approved connections"] = "Conexiones aprobadas";
-App::$strings["Any connections"] = "Cualquier conexión";
-App::$strings["Anybody on this website"] = "Cualquiera en este sitio web";
-App::$strings["Anybody in this network"] = "Cualquiera en esta red";
-App::$strings["Anybody authenticated"] = "Cualquiera que esté autenticado";
-App::$strings["Anybody on the internet"] = "Cualquiera en internet";
-App::$strings["Publish your default profile in the network directory"] = "Publicar su perfil principal en el directorio de la red";
-App::$strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?";
+App::$strings["Please select a channel role"] = "Por favor, seleccione un rol de canal";
 App::$strings["Your channel address is"] = "Su dirección de canal es";
 App::$strings["Your files/photos are accessible via WebDAV at"] = "Sus archivos y fotos son accesibles a través de WebDAV en ";
-App::$strings["Automatic membership approval"] = "Aprobación automática de nuevos miembros";
-App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención.";
 App::$strings["Channel Settings"] = "Ajustes del canal";
 App::$strings["Basic Settings"] = "Configuración básica";
-App::$strings["Email Address:"] = "Dirección de correo electrónico:";
-App::$strings["Your Timezone:"] = "Su huso horario:";
-App::$strings["Default Post Location:"] = "Localización geográfica predeterminada para sus publicaciones:";
+App::$strings["Channel timezone:"] = "Zona horaria del canal: ";
+App::$strings["Default post location:"] = "Ubicación de publicación predeterminada: ";
 App::$strings["Geographical location to display on your posts"] = "Localización geográfica que debe mostrarse en sus publicaciones";
-App::$strings["Use Browser Location:"] = "Usar la localización geográfica del navegador:";
-App::$strings["Adult Content"] = "Contenido solo para adultos";
-App::$strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)";
-App::$strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad";
-App::$strings["Your permissions are already configured. Click to view/adjust"] = "Sus permisos ya están configurados. Pulse para ver/ajustar";
-App::$strings["Hide my online presence"] = "Ocultar mi presencia en línea";
-App::$strings["Prevents displaying in your profile that you are online"] = "Evitar mostrar en su perfil que está en línea";
-App::$strings["Simple Privacy Settings:"] = "Configuración de privacidad sencilla:";
-App::$strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>";
-App::$strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>";
-App::$strings["Private - <em>default private, never open or public</em>"] = "Privado - <em>por defecto, privado, nunca abierto o público</em>";
-App::$strings["Blocked - <em>default blocked to/from everybody</em>"] = "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>";
-App::$strings["Allow others to tag your posts"] = "Permitir a otros etiquetar sus publicaciones";
-App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva.";
-App::$strings["Channel Permission Limits"] = "Límites de los permisos del canal";
-App::$strings["Expire other channel content after this many days"] = "Caducar contenido de otros canales después de este número de días";
-App::$strings["0 or blank to use the website limit."] = "0 o en blanco para usar el límite del sitio web.";
-App::$strings["This website expires after %d days."] = "Este sitio web caduca después de %d días.";
-App::$strings["This website does not expire imported content."] = "Este sitio web no caduca el contenido importado.";
-App::$strings["The website limit takes precedence if lower than your limit."] = "El límite del sitio web tiene prioridad si es inferior a su propio límite.";
+App::$strings["Use browser location"] = "Usar la localización del navegador: ";
+App::$strings["Adult content"] = "Contenido solo para adultos";
+App::$strings["This channel frequently or regularly publishes adult content"] = "Este canal publica con frecuencia o regularmente contenidos para adultos";
 App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amistad por día:";
 App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam";
-App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado";
-App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación";
-App::$strings["Default permissions category"] = "Categoría de permisos por defecto";
-App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:";
-App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado";
 App::$strings["Notification Settings"] = "Configuración de las notificaciones";
 App::$strings["By default post a status message when:"] = "Por defecto, enviar un mensaje de estado cuando:";
 App::$strings["accepting a friend request"] = "Acepte una solicitud de amistad";
@@ -3107,15 +3021,22 @@ App::$strings["Unseen forum posts"] = "Entradas no vistas en el foro";
 App::$strings["Email notification hub (hostname)"] = "Email de notificación del hub (nombre del host)";
 App::$strings["If your channel is mirrored to multiple hubs, set this to your preferred location. This will prevent duplicate email notifications. Example: %s"] = "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s";
 App::$strings["Show new wall posts, private messages and connections under Notices"] = "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos";
+App::$strings["Mark all notices of the thread read if a notice is clicked"] = "Marcar todos los avisos del hilo como leídos si se hace clic en un aviso";
+App::$strings["If no, only the clicked notice will be marked read"] = "Si no, sólo se marcará como leída la notificación en la que se haya hecho clic";
+App::$strings["Desktop notifications are unavailable because the required browser permission has not been granted"] = "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso necesario al navegador";
+App::$strings["Grant permission"] = "Permiso concedido";
 App::$strings["Notify me of events this many days in advance"] = "Avisarme de los eventos con algunos días de antelación";
 App::$strings["Must be greater than 0"] = "Debe ser mayor que 0";
-App::$strings["Advanced Account/Page Type Settings"] = "Ajustes avanzados de la cuenta y de los tipos de página";
-App::$strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta en situaciones especiales";
-App::$strings["Miscellaneous Settings"] = "Ajustes diversos";
 App::$strings["Default photo upload folder"] = "Carpeta por defecto de las fotos subidas";
 App::$strings["%Y - current year, %m -  current month"] = "%Y - año en curso, %m - mes actual";
 App::$strings["Default file upload folder"] = "Carpeta por defecto de los ficheros subidos";
 App::$strings["Remove this channel."] = "Eliminar este canal.";
+App::$strings["Expire other channel content after this many days"] = "Caducar contenido de otros canales después de este número de días";
+App::$strings["0 or blank to use the website limit."] = "0 o en blanco para usar el límite del sitio web.";
+App::$strings["This website expires after %d days."] = "Este sitio web caduca después de %d días.";
+App::$strings["This website does not expire imported content."] = "Este sitio web no caduca el contenido importado.";
+App::$strings["The website limit takes precedence if lower than your limit."] = "El límite del sitio web tiene prioridad si es inferior a su propio límite.";
+App::$strings["Words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = "Palabras una por línea o #tags, \$categories, /patterns/, lang=xx, lang!=xx - dejar en blanco para importar todas las entradas";
 App::$strings["Not valid email."] = "Correo electrónico no válido.";
 App::$strings["Protected email address. Cannot change to that email."] = "Dirección de correo electrónico protegida. No se puede cambiar a ella.";
 App::$strings["System failure storing new email. Please try again."] = "Fallo de sistema al guardar el nuevo correo electrónico. Por favor, inténtelo de nuevo.";
@@ -3154,15 +3075,32 @@ App::$strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, si
 App::$strings["Maximum number of conversations to load at any time:"] = "Máximo número de conversaciones a cargar en cualquier momento:";
 App::$strings["Maximum of 30 items"] = "Máximo de 30 elementos";
 App::$strings["Show emoticons (smilies) as images"] = "Mostrar emoticonos (smilies) como imágenes";
-App::$strings["Provide channel menu in navigation bar"] = "Proporcionar un menú de canales en la barra de navegación";
-App::$strings["Default: channel menu located in app menu"] = "Predeterminado: menú de canales ubicado en el menú de aplicaciones";
 App::$strings["Link post titles to source"] = "Enlazar título de la publicación a la fuente original";
 App::$strings["Display new member quick links menu"] = "Mostrar el menú de enlaces rápidos para nuevos miembros";
 App::$strings["Directory Settings"] = "Configuración del directorio";
 App::$strings["Editor Settings"] = "Ajustes del editor";
 App::$strings["Connections Settings"] = "Gestión de las conexiones";
 App::$strings["Photos Settings"] = "Gestión de las fotos";
+App::$strings["Default profile for new contacts"] = "Perfil predeterminado para nuevos contactos";
 App::$strings["Profiles Settings"] = "Gestión de los perfiles";
+App::$strings["Privacy settings updated."] = "Se ha actualizado la configuración de la privacidad.";
+App::$strings["Only those you specifically allow"] = "Solo aquellos a los que usted permita explícitamente";
+App::$strings["Approved connections"] = "Conexiones aprobadas";
+App::$strings["Any connections"] = "Cualquier conexión";
+App::$strings["Anybody on this website"] = "Cualquiera en este sitio web";
+App::$strings["Anybody in this network"] = "Cualquiera en esta red";
+App::$strings["Anybody authenticated"] = "Cualquiera que esté autenticado";
+App::$strings["Anybody on the internet"] = "Cualquiera en internet";
+App::$strings["Advise: set to \"Anybody on the internet\" and use privacy groups to restrict access"] = "Consejo: establezca la opción \"Cualquiera en Internet\" y utilice los grupos de privacidad para restringir el acceso";
+App::$strings["Privacy Settings"] = "Ajustes de privacidad";
+App::$strings["Advanced configuration"] = "Ajustes avanzados";
+App::$strings["Proceed with caution"] = "Proceda con precaución";
+App::$strings["Changing advanced configuration settings can impact your, and your contacts channels functionality and security."] = "El cambio de los ajustes de configuración avanzada puede afectar a la funcionalidad y seguridad de sus canales y contactos.";
+App::$strings["Accept the risk and continue"] = "Aceptar el riesgo y continuar";
+App::$strings["Automatically approve new contacts"] = "Aprobar automáticamente nuevos contactos";
+App::$strings["Opt-out of search engine indexing"] = "Exclusión de la indexación en los motores de búsqueda";
+App::$strings["Group actor"] = "Grupo de actores";
+App::$strings["Allow this channel to act as a forum"] = "Permitir que este canal actúe como un foro";
 App::$strings["Settings saved."] = "Configuración guardada.";
 App::$strings["Settings saved. Reload page please."] = "Ajustes guardados. Recargue la página, por favor.";
 App::$strings["Conversation Settings"] = "Ajustes de conversación";
@@ -3188,22 +3126,20 @@ App::$strings["Must be unique, only seen by you"] = "Debe ser único, solo será
 App::$strings["Menu title"] = "Título del menú";
 App::$strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
 App::$strings["Allow bookmarks"] = "Permitir marcadores";
-App::$strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
-App::$strings["Default Permissions App"] = "App Permisos por defecto";
-App::$strings["Set custom default permissions for new connections"] = "Establecer permisos predeterminados personalizados para nuevas conexiones";
 App::$strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
 App::$strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
+App::$strings["If enabled, connection requests will be approved without your interaction"] = "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención.";
 App::$strings["Permission role"] = "Permisos de rol";
 App::$strings["Add permission role"] = "Añadir permisos de rol";
 App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
 App::$strings["Automatic approval settings"] = "Opciones de autorización automática";
+App::$strings["My Settings"] = "Mis ajustes";
+App::$strings["Individual Permissions"] = "Permisos individuales";
 App::$strings["Some individual permissions may have been preset or locked based on your channel type and privacy settings."] = "Es posible que se hayan preestablecido o bloqueado algunos permisos individuales según el tipo de canal y la configuración de privacidad.";
 App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
 App::$strings["Configuration Editor"] = "Editor de configuración";
 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."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
 App::$strings["Name and Secret are required"] = "\"Key\" y \"Secret\" son obligatorios";
-App::$strings["OAuth2 Apps Manager App"] = "Aplicación del administrador de apps OAuth2";
-App::$strings["OAuth2 authenticatication tokens for mobile and remote apps"] = "Tokens de autenticación de OAuth2 para aplicaciones móviles y remotas";
 App::$strings["Add OAuth2 application"] = "Añadir aplicación OAuth2";
 App::$strings["Grant Types"] = "Tipos de permisos";
 App::$strings["leave blank unless your application sepcifically requires this"] = "Dejar en blanco a menos que su aplicación lo requiera específicamente";
@@ -3211,8 +3147,6 @@ App::$strings["Authorization scope"] = "Alcance de la autorización";
 App::$strings["OAuth2 Application not found."] = "No se ha encontrado la aplicación OAuth2.";
 App::$strings["leave blank unless your application specifically requires this"] = "dejar en blanco a menos que su aplicación lo requiera específicamente";
 App::$strings["Connected OAuth2 Apps"] = "Aplicaciones OAuth2 conectadas";
-App::$strings["Random Channel App"] = "App Canal aleatorio";
-App::$strings["Visit a random channel in the \$Projectname network"] = "Visitar un canal aleatorio en la red \$Projectname";
 App::$strings["Invalid message"] = "Mensaje no válido";
 App::$strings["no results"] = "sin resultados";
 App::$strings["channel sync processed"] = "se ha realizado la sincronización del canal";
@@ -3223,9 +3157,6 @@ App::$strings["updated"] = "actualizado";
 App::$strings["update ignored"] = "actualización ignorada";
 App::$strings["permission denied"] = "permiso denegado";
 App::$strings["recipient not found"] = "destinatario no encontrado";
-App::$strings["mail recalled"] = "mensaje de correo revocado";
-App::$strings["duplicate mail received"] = "se ha recibido mensaje duplicado";
-App::$strings["mail delivered"] = "correo enviado";
 App::$strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
 App::$strings["Redeliver"] = "Volver a enviar";
 App::$strings["Thing updated"] = "Elemento actualizado.";
@@ -3243,9 +3174,17 @@ App::$strings["URL of thing (optional)"] = "Dirección del elemento (opcional)";
 App::$strings["URL for photo of thing (optional)"] = "Dirección para la foto o elemento (opcional)";
 App::$strings["Add Thing to your Profile"] = "Añadir alguna cosa a su perfil";
 App::$strings["Authentication failed."] = "Falló la autenticación.";
+App::$strings["Item sync completed!"] = "¡Sincronización de artículos completada!";
+App::$strings["Item sync completed but no items were found!"] = "¡Sincronización de artículos completada pero no se ha encontrado ningún artículo!";
+App::$strings["File sync completed!"] = "¡Sincronización de archivos completada!";
+App::$strings["File sync completed but no files were found!"] = "¡La sincronización de archivos se ha completado pero no se ha encontrado ningún archivo!";
+App::$strings["Channel clone status"] = "Estado de clonación del canal";
+App::$strings["Item sync status"] = "Estado de sincronización de artículos";
+App::$strings["File sync status"] = "Estado de sincronización de archivos";
+App::$strings["Channel cloning completed!"] = "Clonación del canal completada.";
+App::$strings["Resume"] = "Reanudar";
+App::$strings["Only resume if sync stalled!"] = "Sólo se reanuda si la sincronización se estanca.";
 App::$strings["Layout updated."] = "Plantilla actualizada.";
-App::$strings["PDL Editor App"] = "App Editor PDL";
-App::$strings["Provides the ability to edit system page layouts"] = "Proporciona la capacidad de editar los diseños de página del sistema";
 App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
 App::$strings["(modified)"] = "(modificado)";
 App::$strings["Layout not found."] = "Plantilla no encontrada";
@@ -3253,8 +3192,6 @@ App::$strings["Module Name:"] = "Nombre del módulo:";
 App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página";
 App::$strings["Edit another layout"] = "Editar otro diseño";
 App::$strings["System layout"] = "Diseño del sistema";
-App::$strings["Wiki App"] = "App Wiki";
-App::$strings["Provide a wiki for your channel"] = "Proporcionar un wiki para su canal";
 App::$strings["Error retrieving wiki"] = "Error al recuperar el wiki";
 App::$strings["Error creating zip file export folder"] = "Error al crear el fichero comprimido zip de la carpeta a exportar";
 App::$strings["Error downloading wiki: "] = "Error al descargar el wiki: ";
@@ -3289,66 +3226,30 @@ App::$strings["Current Revision"] = "Revisión actual";
 App::$strings["Selected Revision"] = "Revisión seleccionada";
 App::$strings["You must be authenticated."] = "Debe estar autenticado.";
 App::$strings["Welcome to %s"] = "Bienvenido a %s";
-App::$strings["Suggest Channels App"] = "App Sugerencia de canales";
-App::$strings["Suggestions for channels in the \$Projectname network you might be interested in"] = "Sugerencias de los canales de la red \$Projectname en los que puede estar interesado";
 App::$strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
-App::$strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
 App::$strings["Connection updated."] = "Conexión actualizada.";
 App::$strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
-App::$strings["is now connected to"] = "ahora está conectado/a";
 App::$strings["Could not access address book record."] = "No se pudo acceder al registro en su libreta de direcciones.";
 App::$strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
 App::$strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
 App::$strings["Connection has been removed."] = "La conexión ha sido eliminada.";
 App::$strings["View %s's profile"] = "Ver el perfil de %s";
-App::$strings["Refresh Permissions"] = "Recargar los permisos";
-App::$strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
-App::$strings["Refresh Photo"] = "Actualizar la foto";
-App::$strings["Fetch updated photo"] = "Obtener una foto actualizada";
 App::$strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
-App::$strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
-App::$strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
-App::$strings["Unignore"] = "Dejar de ignorar";
-App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
-App::$strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
-App::$strings["Unarchive"] = "Desarchivar";
-App::$strings["Archive"] = "Archivar";
-App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
-App::$strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
-App::$strings["Unhide"] = "Mostrar";
-App::$strings["Hide"] = "Ocultar";
-App::$strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
-App::$strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
-App::$strings["Delete this connection"] = "Eliminar esta conexión";
 App::$strings["Fetch Vcard"] = "Obtener una vcard";
 App::$strings["Fetch electronic calling card for this connection"] = "Obtener una tarjeta de llamada electrónica para esta conexión";
-App::$strings["Open Individual Permissions section by default"] = "Abrir la sección de permisos individuales por defecto";
-App::$strings["Affinity"] = "Afinidad";
 App::$strings["Open Set Affinity section by default"] = "Abrir por defecto la sección para definir la afinidad";
 App::$strings["Filter"] = "Filtrar";
 App::$strings["Open Custom Filter section by default"] = "Abrir por defecto la sección de  personalización de filtros";
-App::$strings["Approve this connection"] = "Aprobar esta conexión";
-App::$strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
 App::$strings["Set Affinity"] = "Ajustar la afinidad";
 App::$strings["Set Profile"] = "Ajustar el perfil";
 App::$strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
-App::$strings["This connection is unreachable from this location."] = "No se puede acceder a la conexión desde este sitio.";
-App::$strings["This connection may be unreachable from other channel locations."] = "Esta conexión puede ser inaccesible desde otras ubicaciones del canal.";
-App::$strings["Location independence is not supported by their network."] = "La independencia de ubicación no es compatible con su red.";
-App::$strings["This connection is unreachable from this location. Location independence is not supported by their network."] = "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red.";
-App::$strings["Connection requests will be approved without your interaction"] = "Las solicitudes de conexión serán aprobadas sin su intervención";
-App::$strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
+App::$strings["Contact: %s"] = "Contacto: %s";
+App::$strings["Manage contact roles"] = "Gestionar roles de contactos";
+App::$strings["This contacts's primary address is"] = "La dirección principal de este contactos es ";
 App::$strings["Available locations:"] = "Ubicaciones disponibles:";
-App::$strings["Connection Tools"] = "Gestión de las conexiones";
-App::$strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
-App::$strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
-App::$strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
-App::$strings["Custom Filter"] = "Filtro personalizado";
-App::$strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
-App::$strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
-App::$strings["This information is public!"] = "¡Esta información es pública!";
-App::$strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
+App::$strings["Contact Pending Approval"] = "Contacto pendiente de aprobación";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
+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."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
 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."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
 App::$strings["Last update:"] = "Última actualización:";
 App::$strings["Details"] = "Detalles";
@@ -3371,8 +3272,6 @@ App::$strings["Use this form to drop the location if the hub is no longer operat
 App::$strings["Failed to create source. No channel selected."] = "No se ha podido crear el origen de los contenidos. No ha sido seleccionado ningún canal.";
 App::$strings["Source created."] = "Fuente creada.";
 App::$strings["Source updated."] = "Fuente actualizada.";
-App::$strings["Sources App"] = "App de Fuentes";
-App::$strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
 App::$strings["*"] = "*";
 App::$strings["Channel Sources"] = "Orígenes de los contenidos del canal";
 App::$strings["Manage remote sources of content for your channel."] = "Gestionar contenido de origen remoto para su canal.";
@@ -3393,17 +3292,9 @@ App::$strings["Select a bookmark folder"] = "Seleccionar una carpeta de marcador
 App::$strings["Save Bookmark"] = "Guardar marcador";
 App::$strings["URL of bookmark"] = "Dirección del marcador";
 App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre para la carpeta de marcadores";
-App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
-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."] = "Una lista eliminada con este nombre ha sido reactivada. Los permisos <strong>de los elementos existentes pueden </strong>aplicarse a esta lista y a cualquier miembro futuro. Si esto no es lo que pretendía, por favor, cree otra lista con un nombre diferente.";
-App::$strings["Add new connections to this access list"] = "Añadir nuevas conexiones a esta lista de acceso";
-App::$strings["Lists"] = "Listas";
-App::$strings["Edit list"] = "Editar lista";
-App::$strings["Create new list"] = "Crear una nueva lista";
-App::$strings["Channels not in any access list"] = "No hay canales en ninguna lista de acceso";
-App::$strings["__ctx:permcat__ default"] = "por defecto";
-App::$strings["__ctx:permcat__ follower"] = "seguidor";
-App::$strings["__ctx:permcat__ contributor"] = "contribuidor";
-App::$strings["__ctx:permcat__ publisher"] = "editor";
+App::$strings["A deleted privacy group with this name was revived. Existing item permissions <strong>may</strong> apply to this privacy group and any future members. If this is not what you intended, please create another privacy group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos que ya existen  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
+App::$strings["Select a privacy group"] = "Seleccionar un grupo privado de  canales";
+App::$strings["__ctx:permcat__ Default"] = "Predeterminado";
 App::$strings["Likes %1\$s's %2\$s"] = "Gusta de %2\$sde %1\$s";
 App::$strings["Doesn't like %1\$s's %2\$s"] = "No le gusta %2\$sde %1\$s";
 App::$strings["Will attend %s's event"] = "Asistirá al evento de %s";
@@ -3416,11 +3307,11 @@ App::$strings["This email was sent by %1\$s at %2\$s."] = "Este email ha sido en
 App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Para dejar de recibir estos mensajes, por favor ajuste la configuración de notificación en %s";
 App::$strings["To stop receiving these messages, please adjust your %s."] = "Para dejar de recibir estos mensajes, por favor, ajuste su %s";
 App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
-App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Aviso] Nuevo correo recibido en %s";
-App::$strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s le ha enviado un nuevo mensaje privado en %2\$s.";
+App::$strings["[\$Projectname:Notify] New direct message received at %s"] = "[\$Projectname:Aviso] Nuevo mensaje directo recibido en %s";
+App::$strings["%1\$s sent you a new direct message at %2\$s"] = "%1\$s le ha enviado un nuevo mensaje directo en %2\$s.";
 App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
-App::$strings["a private message"] = "un mensaje privado";
-App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
+App::$strings["a direct message"] = "un mensaje directo";
+App::$strings["Please visit %s to view and/or reply to your direct messages."] = "Por favor visite %s para ver y/o responder a su mensaje directo.";
 App::$strings["commented on"] = "ha comentado sobre ";
 App::$strings["liked"] = "ha gustado de ";
 App::$strings["disliked"] = "no ha gustado de ";
@@ -3430,12 +3321,12 @@ App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s[zrl=%
 App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]su %4\$s[/zrl]";
 App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Comentario moderado en la conversación #%1\$d por %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
-App::$strings["%1\$s commented on an item/conversation you have been following."] = "%1\$sha comentado un elemento/conversación que ha estado siguiendo.";
+App::$strings["%1\$s commented on an item/conversation you have been following"] = "%1\$sha comentado un elemento/conversación que ha estado siguiendo.";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
 App::$strings["Please visit %s to approve or reject this comment."] = "Por favor, visite %s para aprobar o rechazar este comentario.";
 App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "A %1\$sle ha gustado [zrl=%2\$s]su %3\$s [/zrl]";
 App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] \"Me gusta\" de %2\$s en la conversación #%1\$d";
-App::$strings["%1\$s liked an item/conversation you created."] = "A %1\$s le ha gustado un elemento o conversación que ha creado usted.";
+App::$strings["%1\$s liked an item/conversation you created"] = "A %1\$s le ha gustado un elemento o conversación que ha creado usted.";
 App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")";
 App::$strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha publicado en su muro en %2\$s";
 App::$strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$sha publicado en [zrl=%2\$s]su muro[/zrl]";
@@ -3465,10 +3356,21 @@ App::$strings["created a new post"] = "ha creado una nueva entrada";
 App::$strings["voted on %s's poll"] = "votado en la encuesta de %s";
 App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
 App::$strings["repeated %s's post"] = "repetida la entrada de %s";
+App::$strings["shared a file with you"] = "compartió un archivo con usted";
 App::$strings["edited a post dated %s"] = "ha editado una entrada %s";
 App::$strings["edited a comment dated %s"] = "ha editado un comentario %s";
+App::$strings["added your channel"] = "añadió este canal a sus conexiones";
+App::$strings["sent you a direct message"] = "enviarle un mensaje directo";
+App::$strings["g A l F d"] = "g A l d F";
+App::$strings["[today]"] = "[hoy]";
 App::$strings["created an event"] = "se creó un evento";
-App::$strings["verified"] = "verificado";
+App::$strings["status verified"] = "estado verificado";
+App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
+App::$strings["Channel location missing."] = "Falta la dirección del canal.";
+App::$strings["Remote channel or protocol unavailable."] = "Canal remoto o protocolo no disponible.";
+App::$strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
+App::$strings["Protocol disabled."] = "Protocolo deshabilitado.";
+App::$strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
 App::$strings["error saving data"] = "error guardando los datos";
 App::$strings["Missing room name"] = "Sala de chat sin nombre";
 App::$strings["Duplicate room name"] = "Nombre de sala duplicado.";
@@ -3477,12 +3379,12 @@ App::$strings["Room not found."] = "Sala no encontrada.";
 App::$strings["Room is full"] = "La sala está llena.";
 App::$strings["Wiki updated successfully"] = "El wiki se ha actualizado con éxito";
 App::$strings["Wiki files deleted successfully"] = "Se han borrado con éxito los ficheros del wiki";
-App::$strings["Apps"] = "Aplicaciones (apps)";
 App::$strings["Affinity Tool"] = "Herramienta de afinidad";
 App::$strings["Site Admin"] = "Administrador del sitio";
 App::$strings["Content Filter"] = "Filtro de contenido";
 App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
 App::$strings["Suggest Channels"] = "Sugerir canales";
+App::$strings["Channel Manager"] = "Administración de canales";
 App::$strings["Stream"] = "Stream";
 App::$strings["Mail"] = "Correo";
 App::$strings["Chat"] = "Chat";
@@ -3494,7 +3396,6 @@ App::$strings["Post"] = "Publicación";
 App::$strings["Notifications"] = "Notificaciones";
 App::$strings["Order Apps"] = "Ordenar las apps";
 App::$strings["CardDAV"] = "CardDAV";
-App::$strings["Guest Access"] = "Acceso para invitados";
 App::$strings["OAuth Apps Manager"] = "Administrador de apps OAuth";
 App::$strings["OAuth2 Apps Manager"] = "Administrador de apps OAuth2";
 App::$strings["PDL Editor"] = "Editor PDL";
@@ -3523,8 +3424,15 @@ App::$strings["Page update failed."] = "Se ha producido un error al actualizar l
 App::$strings["Nothing deleted"] = "No se ha eliminado nada";
 App::$strings["Compare: object not found."] = "No se ha encontrado un objeto para comparar.";
 App::$strings["Page updated"] = "Se ha actualizado la página";
-App::$strings["Untitled"] = "Sin título";
 App::$strings["Wiki resource_id required for git commit"] = "Se necesita Wiki resource_id para el git commit";
+App::$strings["Directory Options"] = "Opciones del directorio";
+App::$strings["Safe Mode"] = "Modo seguro";
+App::$strings["Public Forums Only"] = "Solo foros públicos";
+App::$strings["This Website Only"] = "Solo este sitio web";
+App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+App::$strings["Restricted message"] = "Mensaje restringido";
+App::$strings["Direct message"] = "Mensaje directo";
+App::$strings["Public Policy"] = "Política pública";
 App::$strings["Privacy conflict. Discretion advised."] = "Conflicto de privacidad. Se aconseja discreción.";
 App::$strings["Admin Delete"] = "Eliminar admin";
 App::$strings["Reply on this comment"] = "Responder a este comentario";
@@ -3536,6 +3444,7 @@ App::$strings["%d comment"] = array(
 	1 => "%d comentarios",
 );
 App::$strings["%d unseen"] = "%dno visto/a vistos/as";
+App::$strings["Forum"] = "Foro";
 App::$strings["to"] = "a";
 App::$strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de \"muro\" a \"muro\")";
 App::$strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")";
@@ -3563,6 +3472,7 @@ App::$strings["This is your default setting for who can view your default channe
 App::$strings["This is your default setting for who can view your connections"] = "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones";
 App::$strings["This is your default setting for who can view your file storage and photos"] = "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos";
 App::$strings["This is your default setting for the audience of your webpages"] = "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web";
+App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
 App::$strings["Social Networking"] = "Redes sociales";
 App::$strings["Social - Federation"] = "Social - Federación";
 App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte";
@@ -3579,6 +3489,9 @@ App::$strings["Special Purpose"] = "Propósito especial";
 App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada";
 App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo";
 App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto";
+App::$strings["Personal"] = "Personales";
+App::$strings["Community forum"] = "Foro de discusión";
+App::$strings["Custom"] = "Personalizado";
 App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal";
 App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal";
 App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
@@ -3591,11 +3504,10 @@ App::$strings["Can create/edit my channel webpages"] = "Pueden crearse / modific
 App::$strings["Can write to my wiki pages"] = "Se pueden modificar las páginas de mi wiki";
 App::$strings["Can post on my channel (wall) page"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
 App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
-App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
+App::$strings["Can send me direct messages"] = "Se me pueden enviar mensajes privados";
 App::$strings["Can like/dislike profiles and profile things"] = "Se puede mostrar agrado o desagrado (Me gusta / No me gusta) en mis perfiles y sus distintos apartados";
-App::$strings["Can forward to all my channel connections via ! mentions in posts"] = "Pueden reenviarse publicaciones a todas las conexiones de mi canal a través de ! menciones en las entradas";
 App::$strings["Can chat with me"] = "Se puede chatear conmigo";
-App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis entradas públicas como origen de contenidos  en canales derivados";
+App::$strings["Can source/mirror my public posts in derived channels"] = "Pueden utilizarse mis entradas públicas  en canales derivados";
 App::$strings["Can administer my channel"] = "Se puede administrar mi canal";
 App::$strings["Change filename to"] = "Cambiar el nombre de archivo a ";
 App::$strings["Select a target location"] = "Seleccionar un lugar de destino ";
@@ -3624,7 +3536,7 @@ App::$strings["Upload file"] = "Subir fichero";
 App::$strings["Drop files here to immediately upload"] = "Arrastre los ficheros aquí para subirlos de forma inmediata";
 App::$strings["You can select files via the upload button or drop them right here or into an existing folder."] = "Puede seleccionar los archivos a través del botón de subir o soltarlos aquí mismo o en una carpeta existente.";
 App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones";
-App::$strings["Login/Email"] = "Inicio de sesión / Correo electrónico";
+App::$strings["Email or nickname"] = "Correo electrónico o apodo";
 App::$strings["Password"] = "Contraseña";
 App::$strings["Remember me"] = "Recordarme";
 App::$strings["Forgot your password?"] = "¿Olvidó su contraseña?";
diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl
deleted file mode 100644
index 051e89278..000000000
--- a/view/pdl/mod_articles.pdl
+++ /dev/null
@@ -1,14 +0,0 @@
-[region=aside]
-[widget=profile][/widget]
-[widget=archive][var=articles]1[/var][/widget]
-[widget=categories][var=articles]1[/var][/widget]
-[widget=tasklist][/widget]
-[widget=notes][/widget]
-[/region]
-[region=content]
-$content
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl
deleted file mode 100644
index 2252659a3..000000000
--- a/view/pdl/mod_cards.pdl
+++ /dev/null
@@ -1,13 +0,0 @@
-[region=aside]
-[widget=profile][/widget]
-[widget=categories][var=cards]1[/var][/widget]
-[widget=tasklist][/widget]
-[widget=notes][/widget]
-[/region]
-[region=content]
-$content
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl
deleted file mode 100644
index e650e364e..000000000
--- a/view/pdl/mod_wiki.pdl
+++ /dev/null
@@ -1,11 +0,0 @@
-[region=aside]
-[widget=profile][/widget]
-[widget=wiki_pages][/widget]
-[/region]
-[region=content]
-$content
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
diff --git a/view/ru/hmessages.po b/view/ru/hmessages.po
index 07a980a36..b1edc71ec 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: 7.0RC\n"
+"Project-Id-Version: 7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 18:27+0000\n"
-"PO-Revision-Date: 2022-01-14 21:20+0200\n"
+"POT-Creation-Date: 2022-05-28 15:01+0200\n"
+"PO-Revision-Date: 2022-05-28 15: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,7871 +18,6690 @@ 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))\n"
 
-#: ../../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:3425
-#: ../../Zotlabs/Module/Admin/Site.php:251
-msgid "Default"
-msgstr "По умолчанию"
+#: ../../boot.php:1724
+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:1725 ../../Zotlabs/Module/Register.php:542
+#: ../../include/nav.php:164
+msgid "Register"
+msgstr "Регистрация"
 
-#: ../../view/theme/redbasic/php/config.php:94
-#: ../../addon/channelreputation/channelreputation.php:143
-#: ../../addon/openclipatar/openclipatar.php:54
-#: ../../addon/photocache/Mod_Photocache.php:63
-#: ../../addon/redred/Mod_Redred.php:88 ../../addon/redphotos/redphotos.php:136
-#: ../../addon/statusnet/Mod_Statusnet.php:191
-#: ../../addon/statusnet/Mod_Statusnet.php:249
-#: ../../addon/statusnet/Mod_Statusnet.php:304
-#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:70
-#: ../../addon/wppost/Mod_Wppost.php:107
-#: ../../addon/content_import/Mod_content_import.php:141
-#: ../../addon/openstreetmap/openstreetmap.php:155
-#: ../../addon/ijpost/Mod_Ijpost.php:72
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:62
-#: ../../addon/dwpost/Mod_Dwpost.php:78
-#: ../../addon/startpage/Mod_Startpage.php:71
-#: ../../addon/twitter/Mod_Twitter.php:182
-#: ../../addon/pumpio/Mod_Pumpio.php:113
-#: ../../addon/cart/submodules/subscriptions.php:410
-#: ../../addon/cart/submodules/hzservices.php:645
-#: ../../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:51
-#: ../../addon/smileybutton/Mod_Smileybutton.php:53
-#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:86
-#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../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:54 ../../addon/hubwall/hubwall.php:95
-#: ../../addon/flashcards/Mod_Flashcards.php:269
-#: ../../addon/libertree/Mod_Libertree.php:68 ../../addon/logrot/logrot.php:35
-#: ../../addon/skeleton/Mod_Skeleton.php:49
-#: ../../addon/socialauth/Mod_SocialAuth.php:328
-#: ../../addon/nsfw/Mod_Nsfw.php:59 ../../addon/mailtest/mailtest.php:100
-#: ../../addon/ljpost/Mod_Ljpost.php:80 ../../addon/hzfiles/hzfiles.php:86
-#: ../../addon/pageheader/Mod_Pageheader.php:52 ../../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:294
-#: ../../Zotlabs/Module/Import_items.php:125
-#: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Setup.php:306
-#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:150
-#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Oauth.php:109
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246
-#: ../../Zotlabs/Module/Poke.php:215 ../../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:407 ../../Zotlabs/Module/Permcats.php:228
-#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Appman.php:221
-#: ../../Zotlabs/Module/Contactedit.php:429
-#: ../../Zotlabs/Module/Contactedit.php:455
-#: ../../Zotlabs/Module/Email_validation.php:40
-#: ../../Zotlabs/Module/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104
-#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Profiles.php:739
-#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Module/Affinity.php:84
-#: ../../Zotlabs/Module/Settings/Network.php:62
-#: ../../Zotlabs/Module/Settings/Features.php:48
-#: ../../Zotlabs/Module/Settings/Channel.php:224
-#: ../../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:186
-#: ../../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/Privacy.php:110
-#: ../../Zotlabs/Module/Settings/Conversation.php:49
-#: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Pconfig.php:116
-#: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328
-#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:106
-#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Connedit.php:714
-#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:123
-#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Lib/ThreadItem.php:851
-#: ../../Zotlabs/Storage/Browser.php:382
-msgid "Submit"
-msgstr "Отправить"
+#: ../../boot.php:1742
+msgid "Email or nickname"
+msgstr "Электронная почта или псевдоним"
 
-#: ../../view/theme/redbasic/php/config.php:98
-msgid "Theme settings"
-msgstr "Настройки темы"
+#: ../../boot.php:1742 ../../extend/addon/hzaddons/redred/Mod_Redred.php:73
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:54
+msgid "Nickname"
+msgstr "Псевдоним"
 
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Narrow navbar"
-msgstr "Узкая панель навигации"
+#: ../../boot.php:1747 ../../include/nav.php:108 ../../include/nav.php:138
+#: ../../include/nav.php:159
+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:61
-#: ../../addon/statusnet/Mod_Statusnet.php:258
-#: ../../addon/statusnet/Mod_Statusnet.php:280
-#: ../../addon/statusnet/Mod_Statusnet.php:289 ../../addon/rtof/Mod_Rtof.php:47
-#: ../../addon/wppost/Mod_Wppost.php:84 ../../addon/wppost/Mod_Wppost.php:88
-#: ../../addon/wppost/Mod_Wppost.php:92
-#: ../../addon/content_import/Mod_content_import.php:136
-#: ../../addon/content_import/Mod_content_import.php:137
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:42
-#: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63
-#: ../../addon/twitter/Mod_Twitter.php:160
-#: ../../addon/twitter/Mod_Twitter.php:169 ../../addon/pumpio/Mod_Pumpio.php:92
-#: ../../addon/pumpio/Mod_Pumpio.php:96 ../../addon/pumpio/Mod_Pumpio.php:100
-#: ../../addon/cart/submodules/subscriptions.php:153
-#: ../../addon/cart/submodules/subscriptions.php:425
-#: ../../addon/cart/submodules/hzservices.php:67
-#: ../../addon/cart/submodules/hzservices.php:651
-#: ../../addon/cart/submodules/hzservices.php:655
-#: ../../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:40
-#: ../../addon/smileybutton/Mod_Smileybutton.php:42
-#: ../../addon/diaspora/Mod_Diaspora.php:70
-#: ../../addon/libertree/Mod_Libertree.php:57
-#: ../../addon/socialauth/Mod_SocialAuth.php:212
-#: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65
-#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1486
-#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604
-#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512
-#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
-#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
-#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../boot.php:1748 ../../Zotlabs/Lib/Apps.php:340 ../../include/nav.php:123
+#: ../../include/nav.php:127
+msgid "Login"
+msgstr "Войти"
+
+#: ../../boot.php:1749 ../../Zotlabs/Module/Rmagic.php:96
+#: ../../include/channel.php:2610
+msgid "Remote Authentication"
+msgstr "Удаленная аутентификация"
+
+#: ../../boot.php:1752
+msgid "Password"
+msgstr "Пароль"
+
+#: ../../boot.php:1753
+msgid "Remember me"
+msgstr "Запомнить меня"
+
+#: ../../boot.php:1753 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Admin/Site.php:319
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+#: ../../Zotlabs/Module/Profiles.php:676 ../../Zotlabs/Module/Profiles.php:686
+#: ../../Zotlabs/Module/Profiles.php:694 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:99
 #: ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Admin/Site.php:319
-#: ../../Zotlabs/Module/Permcats.php:218
-#: ../../Zotlabs/Module/Contactedit.php:284
-#: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Api.php:99
-#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:675
-#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693
-#: ../../Zotlabs/Module/Profiles.php:697
-#: ../../Zotlabs/Module/Settings/Channel.php:219
-#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Permcats.php:247
 #: ../../Zotlabs/Module/Settings/Privacy.php:120
 #: ../../Zotlabs/Module/Settings/Privacy.php:121
 #: ../../Zotlabs/Module/Settings/Privacy.php:122
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
-#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Connedit.php:622
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
-#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
-#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310
+#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Settings/Channel.php:223
+#: ../../Zotlabs/Module/Contactedit.php:284
+#: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Menu.php:163
+#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Import.php:600
+#: ../../Zotlabs/Module/Import.php:604 ../../Zotlabs/Module/Import.php:605
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
+#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Mitem.php:176
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256
+#: ../../Zotlabs/Module/Mitem.php:257 ../../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:1743
+#: ../../Zotlabs/Storage/Browser.php:552 ../../Zotlabs/Lib/Libzotdir.php:165
+#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
+#: ../../include/conversation.php:1493
+#: ../../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:218
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:160
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:169
+#: ../../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:67
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655
+#: ../../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:84
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:88
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:92
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:40
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:61
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:258
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:280
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:289
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:230
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:231
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:42
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:70
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:47
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:42
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:61
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:65
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:69
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:92
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:96
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:100
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:57
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:136
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:59
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:63
 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:61
-#: ../../addon/statusnet/Mod_Statusnet.php:258
-#: ../../addon/statusnet/Mod_Statusnet.php:280
-#: ../../addon/statusnet/Mod_Statusnet.php:289 ../../addon/rtof/Mod_Rtof.php:47
-#: ../../addon/wppost/Mod_Wppost.php:84 ../../addon/wppost/Mod_Wppost.php:88
-#: ../../addon/wppost/Mod_Wppost.php:92
-#: ../../addon/content_import/Mod_content_import.php:136
-#: ../../addon/content_import/Mod_content_import.php:137
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:42
-#: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63
-#: ../../addon/twitter/Mod_Twitter.php:160
-#: ../../addon/twitter/Mod_Twitter.php:169 ../../addon/pumpio/Mod_Pumpio.php:92
-#: ../../addon/pumpio/Mod_Pumpio.php:96 ../../addon/pumpio/Mod_Pumpio.php:100
-#: ../../addon/cart/submodules/subscriptions.php:153
-#: ../../addon/cart/submodules/subscriptions.php:425
-#: ../../addon/cart/submodules/hzservices.php:67
-#: ../../addon/cart/submodules/hzservices.php:651
-#: ../../addon/cart/submodules/hzservices.php:655
-#: ../../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:40
-#: ../../addon/smileybutton/Mod_Smileybutton.php:42
-#: ../../addon/diaspora/Mod_Diaspora.php:70
-#: ../../addon/libertree/Mod_Libertree.php:57
-#: ../../addon/socialauth/Mod_SocialAuth.php:212
-#: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65
-#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1486
-#: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604
-#: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512
-#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
-#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
-#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
-#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
+#: ../../boot.php:1753 ../../Zotlabs/Module/Register.php:512
+#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Admin/Site.php:321
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+#: ../../Zotlabs/Module/Profiles.php:676 ../../Zotlabs/Module/Profiles.php:686
+#: ../../Zotlabs/Module/Profiles.php:694 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Api.php:98
 #: ../../Zotlabs/Module/Filestorage.php:203
 #: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Module/Admin/Site.php:321
-#: ../../Zotlabs/Module/Permcats.php:218
-#: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Api.php:98
-#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:675
-#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693
-#: ../../Zotlabs/Module/Profiles.php:697
-#: ../../Zotlabs/Module/Settings/Channel.php:219
-#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Permcats.php:247
 #: ../../Zotlabs/Module/Settings/Privacy.php:120
 #: ../../Zotlabs/Module/Settings/Privacy.php:121
 #: ../../Zotlabs/Module/Settings/Privacy.php:122
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-#: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Wiki.php:224
-#: ../../Zotlabs/Module/Wiki.php:225 ../../Zotlabs/Module/Sources.php:122
-#: ../../Zotlabs/Module/Sources.php:157 ../../Zotlabs/Lib/Libzotdir.php:165
-#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168
+#: ../../Zotlabs/Module/Settings/Display.php:86
+#: ../../Zotlabs/Module/Settings/Channel.php:223
+#: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Menu.php:163
+#: ../../Zotlabs/Module/Menu.php:222 ../../Zotlabs/Module/Import.php:600
+#: ../../Zotlabs/Module/Import.php:604 ../../Zotlabs/Module/Import.php:605
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
+#: ../../Zotlabs/Module/Group.php:301 ../../Zotlabs/Module/Group.php:302
+#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177
+#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257
 #: ../../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:1743
+#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166
+#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1493
+#: ../../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:218
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:160
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:169
+#: ../../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:67
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:651
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:655
+#: ../../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:84
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:88
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:92
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:40
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:61
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:258
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:280
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:289
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:230
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:231
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:42
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:70
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:47
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:42
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:61
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:65
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:69
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:92
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:96
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:100
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:57
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:136
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:59
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:63
 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 "Панель навигации, цвет значков"
-
-#: ../../view/theme/redbasic/php/config.php:102
-msgid "Navigation bar active icon color "
-msgstr "Панель навигации, цвет активного значка"
+#: ../../boot.php:1756
+msgid "Forgot your password?"
+msgstr "Забыли пароль или логин?"
 
-#: ../../view/theme/redbasic/php/config.php:103
-msgid "Link color"
-msgstr "Цвет ссылок"
+#: ../../boot.php:1757 ../../Zotlabs/Module/Lostpass.php:91
+msgid "Password Reset"
+msgstr "Сбросить пароль"
 
-#: ../../view/theme/redbasic/php/config.php:104
-msgid "Set font-color for banner"
-msgstr "Цвет текста в шапке"
+#: ../../boot.php:2637
+#, php-format
+msgid "[$Projectname] Website SSL error for %s"
+msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s"
 
-#: ../../view/theme/redbasic/php/config.php:105
-msgid "Set the background color"
-msgstr "Цвет фона"
+#: ../../boot.php:2642
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это."
 
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Set the background image"
-msgstr "Фоновое изображение"
+#: ../../boot.php:2758
+#, php-format
+msgid "[$Projectname] Cron tasks not running on %s"
+msgstr "[$Projectname] Задания Cron не запущены на %s"
 
-#: ../../view/theme/redbasic/php/config.php:107
-msgid "Set the background color of items"
-msgstr "Цвет фона элементов"
+#: ../../boot.php:2763
+msgid "Cron/Scheduled tasks not running."
+msgstr "Задания Cron / планировщика не запущены."
 
-#: ../../view/theme/redbasic/php/config.php:108
-msgid "Set the background color of comments"
-msgstr "Цвет фона комментариев"
+#: ../../boot.php:2764 ../../include/datetime.php:238
+msgid "never"
+msgstr "никогда"
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Set font-size for the entire application"
-msgstr "Установить системный размер шрифта"
+#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Block.php:24
+#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Channel.php:220
+#: ../../Zotlabs/Module/Channel.php:376 ../../Zotlabs/Module/Channel.php:415
+#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Photos.php:71
+#: ../../Zotlabs/Module/Appman.php:153 ../../Zotlabs/Module/Item.php:501
+#: ../../Zotlabs/Module/Item.php:520 ../../Zotlabs/Module/Item.php:530
+#: ../../Zotlabs/Module/Item.php:1410 ../../Zotlabs/Module/Sources.php:80
+#: ../../Zotlabs/Module/Poke.php:157 ../../Zotlabs/Module/Profiles.php:171
+#: ../../Zotlabs/Module/Profiles.php:615
+#: ../../Zotlabs/Module/Connections.php:32
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../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:181
+#: ../../Zotlabs/Module/Api.php:24 ../../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:111 ../../Zotlabs/Module/Chat.php:116
+#: ../../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:18
+#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/New_channel.php:105
+#: ../../Zotlabs/Module/New_channel.php:130 ../../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:131 ../../Zotlabs/Module/Moderate.php:15
+#: ../../Zotlabs/Module/Group.php:14 ../../Zotlabs/Module/Group.php:30
+#: ../../Zotlabs/Module/Profile.php:99 ../../Zotlabs/Module/Profile.php:114
+#: ../../Zotlabs/Module/Connedit.php:299 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Display.php:384 ../../Zotlabs/Module/Setup.php:218
+#: ../../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/Lib/Chatroom.php:135
+#: ../../Zotlabs/Web/WebServer.php:117 ../../include/photos.php:30
+#: ../../include/items.php:3898 ../../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:1096
+#: ../../include/attach.php:1169 ../../include/attach.php:1332
+#: ../../extend/addon/hzaddons/articles/Mod_Articles.php:94
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:51
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:51
+#: ../../extend/addon/hzaddons/cards/Mod_Cards.php:89
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:63
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:288
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:431
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:53
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:44
+#: ../../extend/addon/hzaddons/keepout/keepout.php:36
+msgid "Permission denied."
+msgstr "Доступ запрещен."
 
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Examples: 1rem, 100%, 16px"
-msgstr "Например: 1rem, 100%, 16px"
+#: ../../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:53 ../../Zotlabs/Module/Display.php:388
+#: ../../include/items.php:3821
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:291
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:292
+msgid "Item not found."
+msgstr "Элемент не найден."
 
-#: ../../view/theme/redbasic/php/config.php:110
-msgid "Set font-color for posts and comments"
-msgstr "Цвет шрифта для публикаций и комментариев"
+#: ../../Zotlabs/Module/Viewsrc.php:43
+msgid "item"
+msgstr "пункт"
 
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Set radius of corners"
-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 "Example: 4px"
-msgstr "Например: 4px"
+#: ../../Zotlabs/Module/Z6trans.php:21
+msgid "To complete the update please run"
+msgstr "Для завершения обновления пожалуйста выполните"
 
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Set shadow depth of photos"
-msgstr "Глубина теней фотографий"
+#: ../../Zotlabs/Module/Z6trans.php:23
+msgid "php util/z6convert.php"
+msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Set maximum width of content region in rem"
-msgstr "Установить максимальную ширину содержимого в rem"
+#: ../../Zotlabs/Module/Z6trans.php:25
+msgid "from the terminal."
+msgstr "из терминала."
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Leave empty for default width"
-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:114
-msgid "Set size of conversation author photo"
-msgstr "Размер фотографии автора беседы"
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Удалить этот аккаунт"
 
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Set size of followup author photos"
-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:116
-msgid "Show advanced settings"
-msgstr "Показать расширенные настройки"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr "Этот аккаунт и все его каналы будут полностью удалены из сети."
 
-#: ../../util/nconfig.php:34
-msgid "Source channel not found."
-msgstr "Канал-источник не найден."
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
+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:59
+#: ../../Zotlabs/Module/Changeaddr.php:79 ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
+msgstr "Пожалуйста, введите ваш пароль для проверки:"
 
-#: ../../addon/channelreputation/channelreputation.php:109
-msgid "Enable Community Moderation"
-msgstr "Включить модерацию сообщества"
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:109
+msgid "Remove Account"
+msgstr "Удалить аккаунт"
 
-#: ../../addon/channelreputation/channelreputation.php:117
-msgid "Reputation automatically given to new members"
-msgstr "Репутация автоматически предоставляемая новым участникам"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Невозможно найти ваш сервер"
 
-#: ../../addon/channelreputation/channelreputation.php:118
-msgid "Reputation will never fall below this value"
-msgstr "Репутация никогда не упадёт ниже этого значения"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Успешно опубликовано."
 
-#: ../../addon/channelreputation/channelreputation.php:119
-msgid "Minimum reputation before posting is allowed"
-msgstr "Минимальная репутация для разрешения возможности размещать публикации"
+#: ../../Zotlabs/Module/Uexport.php:108
+msgid "No content available for year"
+msgstr "Содержимое для года недоступно"
 
-#: ../../addon/channelreputation/channelreputation.php:120
-msgid "Minimum reputation before commenting is allowed"
-msgstr "Минимальная репутация для разрешения комментирования"
+#: ../../Zotlabs/Module/Uexport.php:171
+msgid "Export Channel"
+msgstr "Экспорт канала"
 
-#: ../../addon/channelreputation/channelreputation.php:121
-msgid "Minimum reputation before a member is able to moderate other posts"
-msgstr "Минимальная репутация для возможности модерирования участником чужих публикаций"
+#: ../../Zotlabs/Module/Uexport.php:173
+msgid "Export channel"
+msgstr "Экспортировать канал"
 
-#: ../../addon/channelreputation/channelreputation.php:122
+#: ../../Zotlabs/Module/Uexport.php:174
 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 "\"Стоимость\" репутации для публикации"
+"This will export your identity and social graph into a file which can be "
+"used to import your channel to a new hub."
+msgstr "Экспортировать ваши данные и социальный граф в файл, который можно использовать для импорта вашего канала на новом хабе."
 
-#: ../../addon/channelreputation/channelreputation.php:124
-msgid "Reputation \"cost\" to comment"
-msgstr "\"Стоимость\" репутации для комментирования"
+#: ../../Zotlabs/Module/Uexport.php:177
+msgid "Export content"
+msgstr "Экспортировать содержимое"
 
-#: ../../addon/channelreputation/channelreputation.php:125
+#: ../../Zotlabs/Module/Uexport.php:178
 msgid ""
-"Reputation automatically recovers at this rate per hour until it reaches "
-"minimum_to_post"
-msgstr "Репутация автоматически восстанавливается с этой скоростью в час пока не достигает значения minimum_to_post"
+"This will export your posts, direct messages, articles and cards per month "
+"stored into a zip file per year. Months with no posts will be dismissed."
+msgstr "Экспортировать ваши публикации, личные сообщения, статьи и карточки за месяц, хранящиеся в zip-файле за год. Месяцы без сообщений будут отклонены."
 
-#: ../../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:180
+msgid "Export wikis"
+msgstr "Экспортировать wiki"
 
-#: ../../addon/channelreputation/channelreputation.php:140
-msgid "Community Moderation Settings"
-msgstr "Настройки модерирования сообщества"
+#: ../../Zotlabs/Module/Uexport.php:181
+msgid "This will export your wikis and wiki pages."
+msgstr "Экспортировать ваши wiki и их страницы."
 
-#: ../../addon/channelreputation/channelreputation.php:232
-msgid "Channel Reputation"
-msgstr "Репутация канала"
+#: ../../Zotlabs/Module/Uexport.php:183
+msgid "Export webpages"
+msgstr "Экспортировать веб-страницы"
 
-#: ../../addon/channelreputation/channelreputation.php:233
-#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:158
-#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:521
-#: ../../Zotlabs/Storage/Browser.php:411
-msgid "Close"
-msgstr "Закрыть"
+#: ../../Zotlabs/Module/Uexport.php:184
+msgid "This will export your webpages and menus."
+msgstr "Экспортировать ваши веб-страницы и меню."
 
-#: ../../addon/channelreputation/channelreputation.php:236
-msgid "An Error has occurred."
-msgstr "Произошла ошибка."
+#: ../../Zotlabs/Module/Uexport.php:186
+msgid "Export channel calendar"
+msgstr "Экспортировать календарь канала"
 
-#: ../../addon/channelreputation/channelreputation.php:254
-msgid "Upvote"
-msgstr "За"
+#: ../../Zotlabs/Module/Uexport.php:187
+msgid ""
+"This will export your channel calendar events and associated items. CalDAV "
+"calendars are not included."
+msgstr "Экспортировать события календаря вашего канала и связанные элементы, за исключением календарей CalDAV."
 
-#: ../../addon/channelreputation/channelreputation.php:255
-msgid "Downvote"
-msgstr "Против"
+#: ../../Zotlabs/Module/Uexport.php:189
+msgid "Export chatrooms"
+msgstr "Экспортировать комнаты чатов"
 
-#: ../../addon/channelreputation/channelreputation.php:414
-msgid "Can moderate reputation on my channel."
-msgstr "Может модерировать репутацию на моём канале"
+#: ../../Zotlabs/Module/Uexport.php:190
+msgid "This will export your chatrooms. Chat history is dismissed."
+msgstr "Эксортировать ваши комнаты чатов. История не сохраняется."
 
-#: ../../addon/superblock/superblock.php:337
-msgid "Block Completely"
-msgstr "Заблокировать полностью"
+#: ../../Zotlabs/Module/Uexport.php:192
+#, php-format
+msgid ""
+"This export can be imported or restored by visiting <a href=\"%1$s\">%2$s</"
+"a> on any site containing your channel."
+msgstr "Этот файл можно импортировать или восстановить, посетив <a href=\"%1$s\">% 2 $ s </a> на любом сайте, где есть ваш канал."
 
-#: ../../addon/superblock/Mod_Superblock.php:62
-msgid "superblock settings updated"
-msgstr "Настройки Superblock обновлены."
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
+msgstr "Нет на месте"
 
-#: ../../addon/superblock/Mod_Superblock.php:86
-msgid "Currently blocked"
-msgstr "В настоящее время заблокирован"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
+msgstr "В сети"
 
-#: ../../addon/superblock/Mod_Superblock.php:88
-msgid "No channels currently blocked"
-msgstr "В настоящее время никакие каналы не блокируются"
+#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39
+msgid "Invalid item."
+msgstr "Недействительный элемент."
 
-#: ../../addon/superblock/Mod_Superblock.php:90
-#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459
-#: ../../Zotlabs/Module/Cover_photo.php:424
-#: ../../Zotlabs/Module/Photos.php:1002
-msgid "Remove"
-msgstr "Удалить"
+#: ../../Zotlabs/Module/Block.php:41 ../../Zotlabs/Module/Chanview.php:95
+#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Cal.php:31
+#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Attach.php:22
+#: ../../Zotlabs/Module/Attach_edit.php:52
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:44
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:44
+msgid "Channel not found."
+msgstr "Канал не найден."
 
-#: ../../addon/nsabait/Mod_Nsabait.php:23
-msgid "NSA Bait App"
-msgstr "Приложение NSA Bait"
+#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Module/Page.php:136
+#: ../../Zotlabs/Module/Display.php:142 ../../Zotlabs/Web/Router.php:186
+#: ../../include/help.php:133
+#: ../../extend/addon/hzaddons/articles/articles.php:103
+#: ../../extend/addon/hzaddons/cards/cards.php:103
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:537
+msgid "Page not found."
+msgstr "Страница не найдена."
 
-#: ../../addon/nsabait/Mod_Nsabait.php:25
-msgid "Make yourself a political target."
-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/visage/Mod_Visage.php:23
-msgid "Recent Channel/Profile Viewers"
-msgstr "Последние просмотры канала / профиля"
+#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Profile.php:62
+#: ../../Zotlabs/Module/Hcard.php:37
+msgid "Posts and comments"
+msgstr "Публикации и комментарии"
 
-#: ../../addon/visage/Mod_Visage.php:34
-msgid "No entries."
-msgstr "Нет записей."
+#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Profile.php:69
+#: ../../Zotlabs/Module/Hcard.php:44
+msgid "Only posts"
+msgstr "Только публикации"
 
-#: ../../addon/openclipatar/openclipatar.php:51
-#: ../../addon/openclipatar/openclipatar.php:129
-msgid "System defaults:"
-msgstr "Системные по умолчанию:"
+#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181
+#: ../../Zotlabs/Module/Pubstream.php:47 ../../Zotlabs/Module/Oep.php:83
+#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Hq.php:41
+msgid "Malformed message id."
+msgstr "Неверный идентификатор сообщения."
 
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "Preferred Clipart IDs"
-msgstr "Предпочитаемый Clipart ID"
+#: ../../Zotlabs/Module/Channel.php:217
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля."
 
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "List of preferred clipart ids. These will be shown first."
-msgstr "Список предпочитаемых Clipart ID. Эти будут показаны первыми."
+#: ../../Zotlabs/Module/Channel.php:232 ../../Zotlabs/Module/Network.php:167
+msgid "Search Results For:"
+msgstr "Результаты поиска для:"
 
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "Default Search Term"
-msgstr "Условие поиска по умолчанию"
+#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Network.php:208
+#: ../../Zotlabs/Module/Pubstream.php:90 ../../Zotlabs/Module/Display.php:87
+#: ../../Zotlabs/Module/Hq.php:114
+msgid "Reset form"
+msgstr "Очистить форму"
 
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "The default search term. These will be shown second."
-msgstr "Условие поиска по умолчанию. Показываются во вторую очередь."
+#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:318
+msgid ""
+"You must enable javascript for your browser to be able to view this content."
+msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript"
 
-#: ../../addon/openclipatar/openclipatar.php:57
-msgid "Return After"
-msgstr "Вернуться после"
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of Pinned Navbar Apps"
+msgstr "Изменить порядок приложений на панели навигации"
 
-#: ../../addon/openclipatar/openclipatar.php:57
-msgid "Page to load after image selection."
-msgstr "Страница для загрузки после выбора изображения."
+#: ../../Zotlabs/Module/Apporder.php:47
+msgid "Change Order of App Tray Apps"
+msgstr "Изменить порядок приложений в лотке"
 
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:110
-#: ../../include/conversation.php:1086 ../../Zotlabs/Module/Connedit.php:480
-#: ../../Zotlabs/Lib/Apps.php:348
-msgid "View 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/openclipatar/openclipatar.php:59 ../../include/nav.php:115
-#: ../../include/channel.php:1534
-msgid "Edit Profile"
-msgstr "Редактировать профиль"
+#: ../../Zotlabs/Module/Apporder.php:48
+msgid "Use arrows to move the corresponding app up or down in the app tray"
+msgstr "Используйте стрелки для перемещения приложения вверх или вниз в лотке"
 
-#: ../../addon/openclipatar/openclipatar.php:60
-msgid "Profile List"
-msgstr "Список профилей"
+#: ../../Zotlabs/Module/Register.php:95 ../../include/channel.php:213
+msgid "Nickname is required."
+msgstr "Требуется псевдоним."
 
-#: ../../addon/openclipatar/openclipatar.php:62
-msgid "Order of Preferred"
-msgstr "Порядок предпочтения"
+#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
+#: ../../include/channel.php:227 ../../include/channel.php:659
+msgid "Reserved nickname. Please choose another."
+msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой."
 
-#: ../../addon/openclipatar/openclipatar.php:62
-msgid "Sort order of preferred clipart ids."
-msgstr "Порядок сортировки предпочитаемых Clipart ID. "
+#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51
+#: ../../include/channel.php:232 ../../include/channel.php:664
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте."
 
-#: ../../addon/openclipatar/openclipatar.php:63
-#: ../../addon/openclipatar/openclipatar.php:69
-msgid "Newest first"
-msgstr "Новое первым"
+#: ../../Zotlabs/Module/Register.php:112
+msgid "Email address required"
+msgstr "Требуется адрес электронной почты"
 
-#: ../../addon/openclipatar/openclipatar.php:66
-msgid "As entered"
-msgstr "По мере ввода"
+#: ../../Zotlabs/Module/Register.php:156
+msgid "No password provided"
+msgstr "Пароль не указан"
 
-#: ../../addon/openclipatar/openclipatar.php:68
-msgid "Order of other"
-msgstr "Порядок других"
+#: ../../Zotlabs/Module/Register.php:161 ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr "Пароли не совпадают"
 
-#: ../../addon/openclipatar/openclipatar.php:68
-msgid "Sort order of other clipart ids."
-msgstr "Порядок сортировки остальных Clipart ID."
+#: ../../Zotlabs/Module/Register.php:179
+msgid "Terms of Service not accepted"
+msgstr "Условия использования не были приняты"
 
-#: ../../addon/openclipatar/openclipatar.php:70
-msgid "Most downloaded first"
-msgstr "Самое загружаемое первым"
+#: ../../Zotlabs/Module/Register.php:241
+msgid "Invitation code succesfully applied"
+msgstr "Код приглашения принят успешно"
 
-#: ../../addon/openclipatar/openclipatar.php:71
-msgid "Most liked first"
-msgstr "Самое нравящееся первым"
+#: ../../Zotlabs/Module/Register.php:261
+msgid "Invitation not in time or too late"
+msgstr "Приглашение истекло или введено не вовремя"
 
-#: ../../addon/openclipatar/openclipatar.php:73
-msgid "Preferred IDs Message"
-msgstr "Сообщение от предпочитаемых ID"
+#: ../../Zotlabs/Module/Register.php:267
+msgid "Invitation email failed"
+msgstr "Не удалось отправить письмо с приглашением "
 
-#: ../../addon/openclipatar/openclipatar.php:73
-msgid "Message to display above preferred results."
-msgstr "Отображаемое сообщение над предпочитаемыми результатами."
+#: ../../Zotlabs/Module/Register.php:275
+msgid "Invitation code failed"
+msgstr "Неверный код приглашения"
 
-#: ../../addon/openclipatar/openclipatar.php:79
-msgid "Uploaded by: "
-msgstr "Загружено:"
+#: ../../Zotlabs/Module/Register.php:282
+msgid "Invitations are not available"
+msgstr "Приглашения не доступны"
 
-#: ../../addon/openclipatar/openclipatar.php:79
-msgid "Drawn by: "
-msgstr "Нарисовано:"
+#: ../../Zotlabs/Module/Register.php:292
+msgid "Registration on this hub is by invitation only"
+msgstr "Регистрация на этом хабе возможна только по приглашениям"
 
-#: ../../addon/openclipatar/openclipatar.php:183
-#: ../../addon/openclipatar/openclipatar.php:195
-msgid "Use this image"
-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:193
-msgid "Or select from a free OpenClipart.org image:"
-msgstr "Или выберите из бесплатных изображений на OpenClipart.org"
+#: ../../Zotlabs/Module/Register.php:399
+msgid "New register request"
+msgstr "Новый запрос на регистрацию"
 
-#: ../../addon/openclipatar/openclipatar.php:196
-msgid "Search Term"
-msgstr "Условие поиска"
+#: ../../Zotlabs/Module/Register.php:417
+msgid "Error creating dId A"
+msgstr "Ошибка создания dId A"
 
-#: ../../addon/openclipatar/openclipatar.php:233
-msgid "Unknown error. Please try again later."
-msgstr "Неизвестная ошибка. Пожалуйста, повторите попытку позже."
+#: ../../Zotlabs/Module/Register.php:435
+msgid "Registration on this hub is disabled."
+msgstr "Регистрация на этом хабе отключена."
 
-#: ../../addon/openclipatar/openclipatar.php:299
-#: ../../Zotlabs/Module/Profile_photo.php:268
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Если новая фотография не отображается немедленно то нажмите Shift + \"Обновить\" для очистки кэша браузера"
+#: ../../Zotlabs/Module/Register.php:444
+msgid "Registration on this hub is by approval only."
+msgstr "Регистрация на этом хабе только с одобрения."
 
-#: ../../addon/openclipatar/openclipatar.php:309
-msgid "Profile photo updated successfully."
-msgstr "Фотография профиля обновлена успешно."
+#: ../../Zotlabs/Module/Register.php:445
+msgid "Register at another affiliated hub in case when prefered"
+msgstr "При необходимости вы можете зарегистрироваться на другом хабе"
 
-#: ../../addon/bookmarker/bookmarker.php:38
-#: ../../Zotlabs/Lib/ThreadItem.php:498
-msgid "Save Bookmarks"
-msgstr "Сохранить в закладках"
+#: ../../Zotlabs/Module/Register.php:458
+msgid "Registration on this hub is by invitation only."
+msgstr "Регистрация на этом хабе доступна только по приглашениям."
 
-#: ../../addon/queueworker/Mod_Queueworker.php:77
-msgid "Max queueworker threads"
-msgstr "Макс. количество обработчиков очереди"
+#: ../../Zotlabs/Module/Register.php:459
+msgid "Register at another affiliated hub"
+msgstr "Зарегистрироваться на другом хабе"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:79
-msgid "Minimum 4, default 4"
-msgstr "Минимум 4, по умолчанию 4"
+#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Terms of Service"
+msgstr "Условия предоставления услуг"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:90
-msgid "Assume workers dead after"
-msgstr "Считать обработчики неактивными после"
+#: ../../Zotlabs/Module/Register.php:479
+#, php-format
+msgid "I accept the %s for this website"
+msgstr "Я принимаю %s для этого веб-сайта."
 
-#: ../../addon/queueworker/Mod_Queueworker.php:92
-msgid "Minimum 120, default 300 seconds"
-msgstr "Минимум 120, по умолчанию 300 секунд"
+#: ../../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/queueworker/Mod_Queueworker.php:103
-msgid "Pause before starting next task"
-msgstr "Задержка перед запуском следующей задачи"
+#: ../../Zotlabs/Module/Register.php:496
+msgid "Your email address"
+msgstr "Ваш адрес электронной почты"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:105
-msgid "Minimum 100, default 100 microseconds"
-msgstr "Минимум 100, по умолчанию 100 микросекунд"
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:209
+#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:762
+#: ../../Zotlabs/Module/Profiles.php:766 ../../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/queueworker/Mod_Queueworker.php:113
-msgid "Queueworker Settings"
-msgstr "Настройки обработчика очереди"
+#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Sources.php:121
+#: ../../Zotlabs/Module/Sources.php:156 ../../Zotlabs/Module/Oauth.php:115
+msgid "Optional"
+msgstr "Необязательно"
 
-#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1146
-#: ../../include/text.php:1158 ../../Zotlabs/Module/Admin/Profs.php:94
-#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:111
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:115
-#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103
-msgid "Save"
-msgstr "Запомнить"
+#: ../../Zotlabs/Module/Register.php:503
+msgid "Choose a password"
+msgstr "Выберите пароль"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:22
-msgid "Rainbow Tag App"
-msgstr "Приложение \"Радуга тегов\""
+#: ../../Zotlabs/Module/Register.php:504
+msgid "Please re-enter your password"
+msgstr "Пожалуйста, введите пароль еще раз"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:23
-msgid "Add some colour to tag clouds"
-msgstr "Добавить немного цвета для облака тегов"
+#: ../../Zotlabs/Module/Register.php:506
+msgid "Please enter your invitation code"
+msgstr "Пожалуйста, введите Ваш код приглашения"
 
-#: ../../addon/rainbowtag/Mod_Rainbowtag.php:30
-msgid "Rainbow Tag"
-msgstr "Радуга тегов"
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Your name"
+msgstr "Ваше имя"
 
-#: ../../addon/photocache/Mod_Photocache.php:27
-msgid "Photo Cache settings saved."
-msgstr "Настройки кэширования изображений сохранены."
+#: ../../Zotlabs/Module/Register.php:508
+msgid "Real name is preferred"
+msgstr "Предпочтительнее использовать ваше настоящее имя"
+
+#: ../../Zotlabs/Module/Register.php:510
+#: ../../Zotlabs/Module/New_channel.php:177
+msgid "Choose a short nickname"
+msgstr "Выберите короткий псевдоним"
 
-#: ../../addon/photocache/Mod_Photocache.php:43
+#: ../../Zotlabs/Module/Register.php:510
 msgid ""
-"Saves a copy of images from external sites locally to increase your "
-"anonymity in the web."
-msgstr "Сохраняет копии изображений с внешних сайтов локально, чтобы повысить вашу анонимность в Интернете."
+"Your nickname will be used to create an easy to remember channel address"
+msgstr "Ваш псевдоним будет использован для создания легко запоминающегося адреса канала"
 
-#: ../../addon/photocache/Mod_Photocache.php:49
-msgid "Minimal photo size for caching"
-msgstr "Минимальный размер изображений для кэширования"
+#: ../../Zotlabs/Module/Register.php:514
+msgid "Why do you want to join this hub?"
+msgstr "Почему вы хотите зарегистрироваться на этом хабе?"
 
-#: ../../addon/photocache/Mod_Photocache.php:51
-msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
-msgstr "В пикселях. От 1 до 1024, 0 будет заменён значением по умолчанию."
+#: ../../Zotlabs/Module/Register.php:514
+msgid "This will help to review your registration"
+msgstr "Это поможет проверить вашу регистрацию "
 
-#: ../../addon/photocache/Mod_Photocache.php:60
-msgid "Photo Cache"
-msgstr "Кэширование изображений"
+#: ../../Zotlabs/Module/Register.php:520
+#: ../../Zotlabs/Module/Admin/Site.php:416
+msgid "Registration"
+msgstr "Регистрация"
 
-#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:134
-msgid "Gallery"
-msgstr "Галерея"
+#: ../../Zotlabs/Module/Register.php:528
+msgid "I have an invite code"
+msgstr "У меня есть код приглашения"
 
-#: ../../addon/gallery/gallery.php:46
-msgid "Photo Gallery"
-msgstr "Фотогалерея"
+#: ../../Zotlabs/Module/Register.php:575
+msgid ""
+"This site has exceeded the number of allowed daily account registrations."
+msgstr "На этом сайте превышено допустимое количество ежедневных регистраций учетных записей."
 
-#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1427
-#: ../../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:80
+msgid "Page owner information could not be retrieved."
+msgstr "Информация о владельце страницы не может быть получена."
 
-#: ../../addon/planets/Mod_Planets.php:23
-msgid "Random Planet App"
-msgstr "Приложение \"Случайная планета\""
+#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
+msgid "Album not found."
+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:105
+msgid "Delete Album"
+msgstr "Удалить альбом"
 
-#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44
-#: ../../addon/keepout/keepout.php:36 ../../include/photos.php:30
-#: ../../include/items.php:3881 ../../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:1096
-#: ../../include/attach.php:1169 ../../include/attach.php:1332
-#: ../../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:18
-#: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:208
-#: ../../Zotlabs/Module/Viewconnections.php:28
-#: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Channel.php:220 ../../Zotlabs/Module/Channel.php:376
-#: ../../Zotlabs/Module/Channel.php:415 ../../Zotlabs/Module/Group.php:14
-#: ../../Zotlabs/Module/Group.php:30 ../../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:111
-#: ../../Zotlabs/Module/Chat.php:116
-#: ../../Zotlabs/Module/Channel_calendar.php:232
-#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:157
-#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520
-#: ../../Zotlabs/Module/Item.php:530 ../../Zotlabs/Module/Item.php:1445
-#: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99
-#: ../../Zotlabs/Module/Profile.php:114
-#: ../../Zotlabs/Module/Sharedwithme.php:19
-#: ../../Zotlabs/Module/Webpages.php:131
-#: ../../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:424
-#: ../../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:153 ../../Zotlabs/Module/Cards.php:84
-#: ../../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:390
-#: ../../Zotlabs/Module/Profile_photo.php:417
-#: ../../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:171 ../../Zotlabs/Module/Profiles.php:614
-#: ../../Zotlabs/Module/Articles.php:87 ../../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:181 ../../Zotlabs/Module/Thing.php:282
-#: ../../Zotlabs/Module/Thing.php:302 ../../Zotlabs/Module/Thing.php:343
-#: ../../Zotlabs/Module/Pdledit.php:35 ../../Zotlabs/Module/Wiki.php:57
-#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:425
-#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:299
-#: ../../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:116
-msgid "Permission denied."
-msgstr "Доступ запрещен."
+#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1065
+msgid "Delete Photo"
+msgstr "Удалить фотографию"
 
-#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:64
-#: ../../include/selectors.php:81 ../../include/channel.php:1715
-msgid "Male"
-msgstr "Мужчина"
+#: ../../Zotlabs/Module/Photos.php:523 ../../Zotlabs/Module/Search.php:23
+#: ../../Zotlabs/Module/Display.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Directory.php:77
+msgid "Public access denied."
+msgstr "Публичный доступ запрещен."
 
-#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:64
-#: ../../include/selectors.php:81 ../../include/channel.php:1713
-msgid "Female"
-msgstr "Женщина"
+#: ../../Zotlabs/Module/Photos.php:534
+msgid "No photos selected"
+msgstr "Никакие фотографии не выбраны"
 
-#: ../../addon/openid/Mod_Openid.php:32
-msgid "OpenID protocol error. No ID returned."
-msgstr "Ошибка протокола OpenID. Идентификатор не возвращён."
+#: ../../Zotlabs/Module/Photos.php:583
+msgid "Access to this item is restricted."
+msgstr "Доступ к этому элементу ограничен."
 
-#: ../../addon/openid/Mod_Openid.php:78 ../../addon/openid/Mod_Openid.php:179
+#: ../../Zotlabs/Module/Photos.php:626
 #, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена."
-
-#: ../../addon/openid/Mod_Openid.php:189 ../../include/auth.php:320
-msgid "Login failed."
-msgstr "Не удалось войти."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."
 
-#: ../../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:629
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "Вы использовали %1$.2f мегабайт для хранения фото."
 
-#: ../../addon/openid/openid.php:49
-msgid "The error message was:"
-msgstr "Сообщение об ошибке было:"
+#: ../../Zotlabs/Module/Photos.php:671
+msgid "Upload Photos"
+msgstr "Загрузить фотографии"
 
-#: ../../addon/openid/MysqlProvider.php:52
-msgid "First Name"
-msgstr "Имя"
+#: ../../Zotlabs/Module/Photos.php:675
+msgid "Enter an album name"
+msgstr "Введите название альбома"
 
-#: ../../addon/openid/MysqlProvider.php:53
-msgid "Last Name"
-msgstr "Фамилия"
+#: ../../Zotlabs/Module/Photos.php:676
+msgid "or select an existing album (doubleclick)"
+msgstr "или выберите существующий альбом (двойной щелчок)"
 
-#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:73
-#: ../../boot.php:1732
-msgid "Nickname"
-msgstr "Псевдоним"
+#: ../../Zotlabs/Module/Photos.php:677
+msgid "Create a status post for this upload"
+msgstr "Сделать публикацию о статусе для этой загрузки"
 
-#: ../../addon/openid/MysqlProvider.php:55
-msgid "Full Name"
-msgstr "Полное имя"
+#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1502
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:116
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:118
+#: ../../extend/addon/hzaddons/hsse/hsse.php:221
+msgid "Title (optional)"
+msgstr "Заголовок (необязательно)"
 
-#: ../../addon/openid/MysqlProvider.php:56
-#: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:69
-#: ../../addon/rtof/Mod_Rtof.php:55 ../../include/network.php:1743
-#: ../../Zotlabs/Module/Cdav.php:1376
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-#: ../../Zotlabs/Module/Admin/Accounts.php:330
-#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Connedit.php:736
-msgid "Email"
-msgstr "Электронная почта"
+#: ../../Zotlabs/Module/Photos.php:679
+msgid "Description (optional)"
+msgstr "Описание (необязательно)"
 
-#: ../../addon/openid/MysqlProvider.php:58
-#: ../../addon/openid/MysqlProvider.php:59
-#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:365
-msgid "Profile Photo"
-msgstr "Фотография профиля"
+#: ../../Zotlabs/Module/Photos.php:682 ../../Zotlabs/Module/Photos.php:1053
+#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Chat.php:239
+#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374
+#: ../../include/acl_selectors.php:154
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:261
+msgid "Permissions"
+msgstr "Разрешения"
 
-#: ../../addon/openid/MysqlProvider.php:61
-msgid "Profile Photo 16px"
-msgstr "Фотография профиля 16px"
+#: ../../Zotlabs/Module/Photos.php:692
+#: ../../Zotlabs/Module/Profile_photo.php:547
+#: ../../Zotlabs/Module/Embedphotos.php:189
+#: ../../Zotlabs/Module/Cover_photo.php:423
+#: ../../Zotlabs/Storage/Browser.php:540 ../../Zotlabs/Widget/Cdav.php:150
+#: ../../Zotlabs/Widget/Cdav.php:186 ../../Zotlabs/Widget/Album.php:103
+#: ../../Zotlabs/Widget/Portfolio.php:114
+msgid "Upload"
+msgstr "Загрузка"
 
-#: ../../addon/openid/MysqlProvider.php:62
-msgid "Profile Photo 32px"
-msgstr "Фотография профиля 32px"
+#: ../../Zotlabs/Module/Photos.php:767
+msgid "Show Newest First"
+msgstr "Показать новые первыми"
 
-#: ../../addon/openid/MysqlProvider.php:63
-msgid "Profile Photo 48px"
-msgstr "Фотография профиля 48px"
+#: ../../Zotlabs/Module/Photos.php:769
+msgid "Show Oldest First"
+msgstr "Показать старые первыми"
 
-#: ../../addon/openid/MysqlProvider.php:64
-msgid "Profile Photo 64px"
-msgstr "Фотография профиля 64px"
+#: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1337
+#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Widget/Album.php:84
+#: ../../Zotlabs/Widget/Portfolio.php:91
+msgid "View Photo"
+msgstr "Посмотреть фотографию"
 
-#: ../../addon/openid/MysqlProvider.php:65
-msgid "Profile Photo 80px"
-msgstr "Фотография профиля 80px"
+#: ../../Zotlabs/Module/Photos.php:799 ../../Zotlabs/Module/Photos.php:1259
+#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Activity.php:1595
+#: ../../Zotlabs/Lib/Apps.php:1146 ../../Zotlabs/Lib/Apps.php:1230
+#: ../../Zotlabs/Widget/Album.php:90 ../../Zotlabs/Widget/Portfolio.php:99
+#: ../../Zotlabs/Widget/Pinned.php:271 ../../include/cdav.php:158
+#: ../../include/cdav.php:159 ../../include/cdav.php:167
+#: ../../include/conversation.php:1238
+msgid "Unknown"
+msgstr "Неизвестный"
 
-#: ../../addon/openid/MysqlProvider.php:66
-msgid "Profile Photo 128px"
-msgstr "Фотография профиля 128px"
+#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Embedphotos.php:187
+#: ../../Zotlabs/Widget/Album.php:101 ../../Zotlabs/Widget/Portfolio.php:112
+msgid "Edit Album"
+msgstr "Редактировать Фотоальбом"
 
-#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123
-msgid "Timezone"
-msgstr "Часовой пояс"
+#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1368
+msgid "Add Photos"
+msgstr "Добавить фотографии"
 
-#: ../../addon/openid/MysqlProvider.php:68
-#: ../../Zotlabs/Module/Profiles.php:783
-msgid "Homepage URL"
-msgstr "URL домашней страницы"
+#: ../../Zotlabs/Module/Photos.php:874
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен."
 
-#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:363
-msgid "Language"
-msgstr "Язык"
+#: ../../Zotlabs/Module/Photos.php:876
+msgid "Photo not available"
+msgstr "Фотография не доступна"
 
-#: ../../addon/openid/MysqlProvider.php:70
-msgid "Birth Year"
-msgstr "Год рождения"
+#: ../../Zotlabs/Module/Photos.php:934
+msgid "Use as profile photo"
+msgstr "Использовать в качестве фотографии профиля"
 
-#: ../../addon/openid/MysqlProvider.php:71
-msgid "Birth Month"
-msgstr "Месяц рождения"
+#: ../../Zotlabs/Module/Photos.php:935
+msgid "Use as cover photo"
+msgstr "Использовать в качестве фотографии обложки"
 
-#: ../../addon/openid/MysqlProvider.php:72
-msgid "Birth Day"
-msgstr "День рождения"
+#: ../../Zotlabs/Module/Photos.php:942
+msgid "Private Photo"
+msgstr "Личная фотография"
 
-#: ../../addon/openid/MysqlProvider.php:73
-msgid "Birthdate"
-msgstr "Дата рождения"
+#: ../../Zotlabs/Module/Photos.php:953 ../../Zotlabs/Module/Cdav.php:1034
+#: ../../Zotlabs/Module/Cal.php:203
+msgid "Previous"
+msgstr "Предыдущая"
 
-#: ../../addon/openid/MysqlProvider.php:74
-#: ../../Zotlabs/Module/Profiles.php:457
-msgid "Gender"
-msgstr "Гендер"
+#: ../../Zotlabs/Module/Photos.php:957
+msgid "View Full Size"
+msgstr "Посмотреть в полный размер"
 
-#: ../../addon/moremoods/moremoods.php:19
-msgid "lonely"
-msgstr "одинокий"
+#: ../../Zotlabs/Module/Photos.php:962 ../../Zotlabs/Module/Cdav.php:1035
+#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Setup.php:272
+msgid "Next"
+msgstr "Следующая"
 
-#: ../../addon/moremoods/moremoods.php:20
-msgid "drunk"
-msgstr "пьяный"
+#: ../../Zotlabs/Module/Photos.php:1002
+#: ../../Zotlabs/Module/Admin/Addons.php:459 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Cover_photo.php:424
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:90
+msgid "Remove"
+msgstr "Удалить"
 
-#: ../../addon/moremoods/moremoods.php:21
-msgid "horny"
-msgstr "возбуждённый"
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Edit photo"
+msgstr "Редактировать фотографию"
 
-#: ../../addon/moremoods/moremoods.php:22
-msgid "stoned"
-msgstr "под кайфом"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "Rotate CW (right)"
+msgstr "Повернуть CW (направо)"
 
-#: ../../addon/moremoods/moremoods.php:23
-msgid "fucked up"
-msgstr "облажался"
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Rotate CCW (left)"
+msgstr "Повернуть CCW (налево)"
 
-#: ../../addon/moremoods/moremoods.php:24
-msgid "clusterfucked"
-msgstr "в полной заднице"
+#: ../../Zotlabs/Module/Photos.php:1045
+msgid "Move photo to album"
+msgstr "Переместить фотографию в альбом"
 
-#: ../../addon/moremoods/moremoods.php:25
-msgid "crazy"
-msgstr "сумасшедший"
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Enter a new album name"
+msgstr "Введите новое название альбома"
 
-#: ../../addon/moremoods/moremoods.php:26
-msgid "hurt"
-msgstr "обиженный"
+#: ../../Zotlabs/Module/Photos.php:1047
+msgid "or select an existing one (doubleclick)"
+msgstr "или выбрать существующую (двойной щелчок)"
 
-#: ../../addon/moremoods/moremoods.php:27
-msgid "sleepy"
-msgstr "сонный"
+#: ../../Zotlabs/Module/Photos.php:1052
+msgid "Add a Tag"
+msgstr "Добавить тег"
 
-#: ../../addon/moremoods/moremoods.php:28
-msgid "grumpy"
-msgstr "сердитый"
+#: ../../Zotlabs/Module/Photos.php:1060
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../addon/moremoods/moremoods.php:29
-msgid "high"
-msgstr "кайфует"
+#: ../../Zotlabs/Module/Photos.php:1063
+msgid "Flag as adult in album view"
+msgstr "Пометить как альбом \"для взрослых\""
 
-#: ../../addon/moremoods/moremoods.php:30
-msgid "semi-conscious"
-msgstr "в полубезсознании"
+#: ../../Zotlabs/Module/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104
+#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Appman.php:221
+#: ../../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:415
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Security.php:120
+#: ../../Zotlabs/Module/Admin/Logs.php:84 ../../Zotlabs/Module/Sources.php:123
+#: ../../Zotlabs/Module/Sources.php:160 ../../Zotlabs/Module/Poke.php:215
+#: ../../Zotlabs/Module/Profiles.php:740 ../../Zotlabs/Module/Oauth.php:109
+#: ../../Zotlabs/Module/Connect.php:107
+#: ../../Zotlabs/Module/Import_items.php:125
+#: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Defperms.php:263
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Filestorage.php:208
+#: ../../Zotlabs/Module/Permcats.php:257 ../../Zotlabs/Module/Pdledit.php:106
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246
+#: ../../Zotlabs/Module/Settings/Privacy.php:110
+#: ../../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:186
+#: ../../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:228
+#: ../../Zotlabs/Module/Settings/Connections.php:42
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Contactedit.php:462 ../../Zotlabs/Module/Locs.php:125
+#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Affinity.php:84
+#: ../../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:611 ../../Zotlabs/Module/Group.php:150
+#: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Connedit.php:714
+#: ../../Zotlabs/Module/Editpost.php:86 ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:356 ../../Zotlabs/Module/Mitem.php:259
+#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Oauth2.php:114
+#: ../../Zotlabs/Module/Tokens.php:294 ../../Zotlabs/Storage/Browser.php:382
+#: ../../Zotlabs/Lib/ThreadItem.php:852 ../../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:63
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:143
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:341
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:182
+#: ../../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:645
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:410
+#: ../../extend/addon/hzaddons/cart/cart.php:1376
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:107
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:51
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:136
+#: ../../extend/addon/hzaddons/piwik/piwik.php:95
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:54
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:88
+#: ../../extend/addon/hzaddons/irc/irc.php:45
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:602
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:191
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:249
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:304
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:269
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:86
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:71
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:54
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:49
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:41
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:98
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:218
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:62
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:100
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:86
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:155
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:70
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:95
+#: ../../extend/addon/hzaddons/logrot/logrot.php:35
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:53
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:59
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:124
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:80
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:113
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:72
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:68
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:141
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:52
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:70
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:78
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1466
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1525
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1644
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2747
+#: ../../extend/addon/hzaddons/workflow/Settings/Mod_WorkflowSettings.php:94
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:100
+msgid "Submit"
+msgstr "Отправить"
 
-#: ../../addon/moremoods/moremoods.php:31
-msgid "in love"
-msgstr "влюблённый"
+#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "I like this (toggle)"
+msgstr "мне это нравится (переключение)"
 
-#: ../../addon/moremoods/moremoods.php:32
-msgid "in lust"
-msgstr "похотливый"
+#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "I don't like this (toggle)"
+msgstr "мне это не нравится (переключение)"
 
-#: ../../addon/moremoods/moremoods.php:33
-msgid "naked"
-msgstr "обнажённый"
+#: ../../Zotlabs/Module/Photos.php:1084 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:253
+#: ../../Zotlabs/Widget/Cdav.php:140 ../../include/conversation.php:1462
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:304
+#: ../../extend/addon/hzaddons/hsse/hsse.php:186
+msgid "Share"
+msgstr "Поделиться"
 
-#: ../../addon/moremoods/moremoods.php:34
-msgid "stinky"
-msgstr "вонючий"
+#: ../../Zotlabs/Module/Photos.php:1085 ../../Zotlabs/Lib/ThreadItem.php:526
+#: ../../include/conversation.php:844
+msgid "Please wait"
+msgstr "Подождите пожалуйста"
 
-#: ../../addon/moremoods/moremoods.php:35
-msgid "sweaty"
-msgstr "потный"
+#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:849
+msgid "This is you"
+msgstr "Это вы"
 
-#: ../../addon/moremoods/moremoods.php:36
-msgid "bleeding out"
-msgstr "истекающий кровью"
+#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Module/Photos.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:851 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Комментарий"
 
-#: ../../addon/moremoods/moremoods.php:37
-msgid "victorious"
-msgstr "победивший"
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Module/Webpages.php:259
+#: ../../Zotlabs/Lib/ThreadItem.php:862 ../../include/conversation.php:1429
+#: ../../extend/addon/hzaddons/hsse/hsse.php:153
+msgid "Preview"
+msgstr "Предварительный просмотр"
 
-#: ../../addon/moremoods/moremoods.php:38
-msgid "defeated"
-msgstr "проигравший"
+#: ../../Zotlabs/Module/Photos.php:1119 ../../include/conversation.php:652
+msgctxt "title"
+msgid "Likes"
+msgstr "Нравится"
 
-#: ../../addon/moremoods/moremoods.php:39
-msgid "envious"
-msgstr "завидует"
+#: ../../Zotlabs/Module/Photos.php:1119 ../../include/conversation.php:653
+msgctxt "title"
+msgid "Dislikes"
+msgstr "Не нравится"
 
-#: ../../addon/moremoods/moremoods.php:40
-msgid "jealous"
-msgstr "ревнует"
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:80
+#: ../../include/conversation.php:654
+msgctxt "title"
+msgid "Agree"
+msgstr "Согласен"
 
-#: ../../addon/dirstats/dirstats.php:94
-msgid "Hubzilla Directory Stats"
-msgstr "Каталог статистики Hubzilla"
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:81
+#: ../../include/conversation.php:655
+msgctxt "title"
+msgid "Disagree"
+msgstr "Не согласен"
 
-#: ../../addon/dirstats/dirstats.php:95
-msgid "Total Hubs"
-msgstr "Всего хабов"
+#: ../../Zotlabs/Module/Photos.php:1120 ../../Zotlabs/Widget/Pinned.php:82
+#: ../../include/conversation.php:656
+msgctxt "title"
+msgid "Abstain"
+msgstr "Воздержался"
 
-#: ../../addon/dirstats/dirstats.php:97
-msgid "Hubzilla Hubs"
-msgstr "Хабы Hubzilla"
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:69
+#: ../../include/conversation.php:657
+msgctxt "title"
+msgid "Attending"
+msgstr "Посещаю"
 
-#: ../../addon/dirstats/dirstats.php:99
-msgid "Friendica Hubs"
-msgstr "Хабы Friendica"
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:70
+#: ../../include/conversation.php:658
+msgctxt "title"
+msgid "Not attending"
+msgstr "Не посещаю"
 
-#: ../../addon/dirstats/dirstats.php:101
-msgid "Diaspora Pods"
-msgstr "Стручки Diaspora"
+#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Widget/Pinned.php:71
+#: ../../include/conversation.php:659
+msgctxt "title"
+msgid "Might attend"
+msgstr "Возможно посещу"
 
-#: ../../addon/dirstats/dirstats.php:103
-msgid "Hubzilla Channels"
-msgstr "Каналы Hubzilla"
+#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150
+#: ../../Zotlabs/Lib/ThreadItem.php:255 ../../Zotlabs/Lib/ThreadItem.php:267
+msgid "View all"
+msgstr "Просмотреть все"
 
-#: ../../addon/dirstats/dirstats.php:105
-msgid "Friendica Channels"
-msgstr "Каналы Friendica"
+#: ../../Zotlabs/Module/Photos.php:1142 ../../Zotlabs/Lib/ThreadItem.php:259
+#: ../../include/channel.php:1774 ../../include/taxonomy.php:670
+#: ../../include/conversation.php:1775
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Нравится"
+msgstr[1] "Нравится"
+msgstr[2] "Нравится"
 
-#: ../../addon/dirstats/dirstats.php:107
-msgid "Diaspora Channels"
-msgstr "Каналы Diaspora"
+#: ../../Zotlabs/Module/Photos.php:1147 ../../Zotlabs/Lib/ThreadItem.php:264
+#: ../../include/conversation.php:1778
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Не нравится"
+msgstr[1] "Не нравится"
+msgstr[2] "Не нравится"
 
-#: ../../addon/dirstats/dirstats.php:109
-msgid "Aged 35 and above"
-msgstr "Возраст 35 и выше"
+#: ../../Zotlabs/Module/Photos.php:1185
+#: ../../Zotlabs/Module/Admin/Accounts.php:320
+#: ../../Zotlabs/Module/Admin/Profs.php:176
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1389
+#: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Editwebpage.php:167
+#: ../../Zotlabs/Module/Permcats.php:261 ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Contactedit.php:667
+#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Thing.php:269
+#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Module/Group.php:251
+#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Module/Oauth2.php:193 ../../Zotlabs/Module/Tokens.php:295
+#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/ThreadItem.php:187
+#: ../../Zotlabs/Lib/Apps.php:596 ../../include/conversation.php:730
+#: ../../include/conversation.php:790
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:128
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:130
+msgid "Delete"
+msgstr "Удалить"
 
-#: ../../addon/dirstats/dirstats.php:111
-msgid "Aged 34 and under"
-msgstr "Возраст 34 и ниже"
+#: ../../Zotlabs/Module/Photos.php:1251
+msgid "Photo Tools"
+msgstr "Фото-Инструменты"
 
-#: ../../addon/dirstats/dirstats.php:113
-msgid "Average Age"
-msgstr "Средний возраст"
+#: ../../Zotlabs/Module/Photos.php:1260
+msgid "In This Photo:"
+msgstr "На этой фотографии:"
 
-#: ../../addon/dirstats/dirstats.php:115
-msgid "Known Chatrooms"
-msgstr "Известные чаты"
+#: ../../Zotlabs/Module/Photos.php:1265
+msgid "Map"
+msgstr "Карта"
 
-#: ../../addon/dirstats/dirstats.php:117
-msgid "Known Tags"
-msgstr "Известные теги"
+#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:514
+msgctxt "noun"
+msgid "Likes"
+msgstr "Нравится"
 
-#: ../../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/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:515
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Не нравится"
 
-#: ../../addon/redred/Mod_Redred.php:24
-msgid "Channel is required."
-msgstr "Необходим канал."
+#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Storage/Browser.php:411
+#: ../../Zotlabs/Lib/ThreadItem.php:520 ../../Zotlabs/Widget/Pinned.php:161
+#: ../../include/acl_selectors.php:156
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:233
+msgid "Close"
+msgstr "Закрыть"
 
-#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:325
-msgid "Invalid channel."
-msgstr "Недействительный канал."
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366 ../../include/photos.php:723
+msgid "Recent Photos"
+msgstr "Последние фотографии"
 
-#: ../../addon/redred/Mod_Redred.php:38
-msgid "Hubzilla Crosspost Connector Settings saved."
-msgstr "Настройки пересылки публикаций Hubzilla сохранены."
+#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
+msgid "App installed."
+msgstr "Приложение установлено."
 
-#: ../../addon/redred/Mod_Redred.php:61
-msgid "Send public postings to Hubzilla channel by default"
-msgstr "Отправлять общедоступные публикации в канал Hubzilla по умолчанию"
+#: ../../Zotlabs/Module/Appman.php:49
+msgid "Malformed app."
+msgstr "Неработающее приложение."
 
-#: ../../addon/redred/Mod_Redred.php:65
-msgid "Hubzilla API Path"
-msgstr "Путь к Hubzilla API"
+#: ../../Zotlabs/Module/Appman.php:198
+msgid "Embed code"
+msgstr "Встроить код"
 
-#: ../../addon/redred/Mod_Redred.php:65 ../../addon/rtof/Mod_Rtof.php:51
-msgid "https://{sitename}/api"
-msgstr ""
+#: ../../Zotlabs/Module/Appman.php:204
+msgid "Edit App"
+msgstr "Редактировать приложение"
 
-#: ../../addon/redred/Mod_Redred.php:69
-msgid "Hubzilla login name"
-msgstr "Имя входа Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:204
+msgid "Create App"
+msgstr "Создать приложение"
 
-#: ../../addon/redred/Mod_Redred.php:73
-msgid "Hubzilla channel name"
-msgstr "Название канала Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:209
+msgid "Name of app"
+msgstr "Наименование приложения"
 
-#: ../../addon/redred/Mod_Redred.php:77
-msgid "Hubzilla password"
-msgstr "Пароль Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:210
+msgid "Location (URL) of app"
+msgstr "Местоположение (URL) приложения"
 
-#: ../../addon/redred/Mod_Redred.php:85
-msgid "Hubzilla Crosspost Connector"
-msgstr "Пересылка публикаций Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:211 ../../Zotlabs/Module/Cdav.php:1013
+#: ../../Zotlabs/Module/Rbmark.php:100
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:260
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:657
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr "Описание"
 
-#: ../../addon/redred/redred.php:50
-msgid "Post to Hubzilla"
-msgstr "Опубликовать в Hubzilla"
+#: ../../Zotlabs/Module/Appman.php:212
+msgid "Photo icon URL"
+msgstr "URL пиктограммы"
 
-#: ../../addon/redphotos/redphotos.php:106
-msgid "Photos imported"
-msgstr "Фотографии импортированы"
+#: ../../Zotlabs/Module/Appman.php:212
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 пикселей - необязательно"
 
-#: ../../addon/redphotos/redphotos.php:119
-#: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75
-#: ../../include/items.php:440 ../../Zotlabs/Module/Import_items.php:116
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:108
-#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Cloud.php:123
-#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55
-#: ../../Zotlabs/Web/WebServer.php:115
-msgid "Permission denied"
-msgstr "Доступ запрещен"
+#: ../../Zotlabs/Module/Appman.php:213
+msgid "Categories (optional, comma separated list)"
+msgstr "Категории (необязательно, список через запятую)"
 
-#: ../../addon/redphotos/redphotos.php:129
-msgid "Redmatrix Photo Album Import"
-msgstr "Импортировать альбом фотографий Redmatrix"
+#: ../../Zotlabs/Module/Appman.php:214
+msgid "Version ID"
+msgstr "ID версии"
 
-#: ../../addon/redphotos/redphotos.php:130
-msgid "This will import all your Redmatrix photo albums to this channel."
-msgstr "Это позволит импортировать все ваши альбомы фотографий Redmatrix в этот канал."
+#: ../../Zotlabs/Module/Appman.php:215
+msgid "Price of app"
+msgstr "Цена приложения"
 
-#: ../../addon/redphotos/redphotos.php:131
-#: ../../addon/redfiles/redfiles.php:121
-msgid "Redmatrix Server base URL"
-msgstr "Базовый URL сервера Redmatrix"
+#: ../../Zotlabs/Module/Appman.php:216
+msgid "Location (URL) to purchase app"
+msgstr "Ссылка (URL) для покупки приложения"
 
-#: ../../addon/redphotos/redphotos.php:132
-#: ../../addon/redfiles/redfiles.php:122
-msgid "Redmatrix Login Username"
-msgstr "Имя пользователя Redmatrix"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Update has been marked successful"
+msgstr "Обновление было помечено как успешное"
 
-#: ../../addon/redphotos/redphotos.php:133
-#: ../../addon/redfiles/redfiles.php:123
-msgid "Redmatrix Login Password"
-msgstr "Пароль Redmatrix"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Verification of update %s failed. Check system logs."
+msgstr "Проверка обновления %s не удалась. Проверьте системный журнал."
 
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Import just this album"
-msgstr "Импортировать только этот альбом"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:35
+#: ../../Zotlabs/Module/Admin/Dbsync.php:74
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Обновление %s было успешно применено."
 
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Leave blank to import all albums"
-msgstr "Оставьте пустым для импорта всех альбомов"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Verifying update %s did not return a status. Unknown if it succeeded."
+msgstr "Проверка обновления %s не вернула его состояние. Неизвестно было ли оно успешным."
 
-#: ../../addon/redphotos/redphotos.php:135
-msgid "Maximum count to import"
-msgstr "Максимальное количество для импорта"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#, php-format
+msgid "Update %s does not contain a verification function."
+msgstr "Обновление %s не содержит функцию проверки."
 
-#: ../../addon/redphotos/redphotos.php:135
-msgid "0 or blank to import all available"
-msgstr "0 или пусто для импорта всех доступных"
+#: ../../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/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1943
-#: ../../addon/diaspora/Receiver.php:1629 ../../include/text.php:2302
-#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:445
-#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115
-#: ../../Zotlabs/Lib/Activity.php:3391
-msgid "photo"
-msgstr "фото"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#, php-format
+msgid "Executing update procedure %s failed. Check system logs."
+msgstr "Не удалось выполнить процедуру обновления %s.Проверьте системный журнал."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:61
+#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#, php-format
 msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr "Пожалуйста свяжитесь с администратором сайта. <br />Предоставленный URL API недействителен."
-
-#: ../../addon/statusnet/Mod_Statusnet.php:98
-msgid "We could not contact the GNU social API with the Path you entered."
-msgstr "Нам не удалось установить контакт с GNU Social API по введённому вами пути"
-
-#: ../../addon/statusnet/Mod_Statusnet.php:130
-msgid "GNU social settings updated."
-msgstr "Настройки GNU Social обновлены."
+"Update %s did not return a status. It cannot be determined if it was "
+"successful."
+msgstr "Обновление %s не вернуло свой статус. Невозможно определить было ли оно успешным."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:179
-msgid "Globally Available GNU social OAuthKeys"
-msgstr "Глобально доступные ключи OAuthKeys GNU Social"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:99
+msgid "Failed Updates"
+msgstr "Обновления с ошибками"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:181
-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/Dbsync.php:101
+msgid "Mark success (if update was manually applied)"
+msgstr "Пометить успешным (если обновление было применено вручную)"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:196
-msgid "Provide your own OAuth Credentials"
-msgstr "Предоставьте ваши собственные регистрационные данные OAuth"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:102
+msgid "Attempt to verify this update if a verification procedure exists"
+msgstr "Попытайтесь проверить это обновление, если существует процедура проверки"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:198
-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/Dbsync.php:103
+msgid "Attempt to execute this update step automatically"
+msgstr "Попытаться применить этот этап обновления автоматически"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:202
-msgid "OAuth Consumer Key"
-msgstr "Ключ клиента OAuth"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:108
+msgid "No failed updates."
+msgstr "Ошибок обновлений нет."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:206
-msgid "OAuth Consumer Secret"
-msgstr "Пароль клиента OAuth"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
+msgstr "Пароль для аккаунта %d изменён."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:210
-msgid "Base API Path"
-msgstr "Основной путь к API"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
+msgstr "Настройки аккаунта обновлены."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:210
-msgid "Remember the trailing /"
-msgstr "Запомнить закрывающий /"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
+msgstr "Учётная запись не найдена."
 
-#: ../../addon/statusnet/Mod_Statusnet.php:214
-msgid "GNU social application name"
-msgstr "Имя приложения GNU social"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
+msgstr "Редактировать аккаунт"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:237
-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/Account_edit.php:69
+msgid "New Password"
+msgstr "Новый пароль"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:239
-msgid "Log in with GNU social"
-msgstr "Войти с GNU social"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
+msgstr "Повторите новый пароль"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:242
-msgid "Copy the security code from GNU social here"
-msgstr "Скопируйте код безопасности GNU social здесь"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Account language (for emails)"
+msgstr "Язык сообщения для email"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:252
-msgid "Cancel Connection Process"
-msgstr "Отменить процесс подключения"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+#: ../../Zotlabs/Module/Admin/Accounts.php:335
+msgid "Service class"
+msgstr "Класс обслуживания"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:254
-msgid "Current GNU social API is"
-msgstr "Текущий GNU social API"
+#: ../../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:258
-msgid "Cancel GNU social Connection"
-msgstr "Отменить подключение с GNU social"
+#: ../../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:270
-#: ../../addon/twitter/Mod_Twitter.php:145
-msgid "Currently connected to: "
-msgstr "В настоящее время подключён к: "
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Account not found"
+msgstr "Аккаунт не найден"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:275
-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:184 ../../include/channel.php:2770
+#, php-format
+msgid "Account '%s' deleted"
+msgstr "Аккаунт '%s' удален"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:280
-msgid "Post to GNU social by default"
-msgstr "Публиковать в GNU social по умолчанию"
+#: ../../Zotlabs/Module/Admin/Accounts.php:192
+#, php-format
+msgid "Account '%s' blocked"
+msgstr "Аккаунт '%s' заблокирован"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:280
-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:200
+#, php-format
+msgid "Account '%s' unblocked"
+msgstr "Аккаунт '%s' разблокирован"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:289
-#: ../../addon/twitter/Mod_Twitter.php:169
-msgid "Clear OAuth configuration"
-msgstr "Очистить конфигурацию OAuth"
+#: ../../Zotlabs/Module/Admin/Accounts.php:240
+msgid "Unverified"
+msgstr "Непроверено"
 
-#: ../../addon/statusnet/Mod_Statusnet.php:301
-msgid "GNU-Social Crosspost Connector"
-msgstr "Подключение пересылки публикаций GNU Social"
+#: ../../Zotlabs/Module/Admin/Accounts.php:243
+msgid "Expired"
+msgstr "Истёк"
 
-#: ../../addon/statusnet/statusnet.php:145
-msgid "Post to GNU social"
-msgstr "Опубликовать в 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:411
+#: ../../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/statusnet.php:593
-#: ../../Zotlabs/Module/Admin/Site.php:420
-msgid "Site name"
-msgstr "Название сайта"
+#: ../../Zotlabs/Module/Admin/Accounts.php:308
+#: ../../Zotlabs/Module/Admin/Accounts.php:327
+#: ../../Zotlabs/Module/Admin.php:95 ../../Zotlabs/Widget/Admin.php:28
+msgid "Accounts"
+msgstr "Учётные записи"
 
-#: ../../addon/statusnet/statusnet.php:594
-msgid "API URL"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show verified registrations"
+msgstr "Показать проверенные регистрации"
 
-#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:505
-#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
-#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
-msgid "Consumer Secret"
-msgstr "Код клиента"
+#: ../../Zotlabs/Module/Admin/Accounts.php:310
+msgid "Show all registrations"
+msgstr "Показать все регистрации"
 
-#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:504
-#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
-msgid "Consumer Key"
-msgstr "Ключ клиента"
+#: ../../Zotlabs/Module/Admin/Accounts.php:312
+msgid "Select toggle"
+msgstr "Выбрать"
 
-#: ../../addon/statusnet/statusnet.php:597
-msgid "Application name"
-msgstr "Название приложения"
+#: ../../Zotlabs/Module/Admin/Accounts.php:313
+msgid "Deny selected"
+msgstr "Запретить выбранное"
 
-#: ../../addon/rtof/Mod_Rtof.php:24
-msgid "Friendica Crosspost Connector Settings saved."
-msgstr "Настройки пересылки публикаций Friendica сохранены."
+#: ../../Zotlabs/Module/Admin/Accounts.php:314
+msgid "Approve selected"
+msgstr "Утвердить выбранное"
 
-#: ../../addon/rtof/Mod_Rtof.php:47
-msgid "Send public postings to Friendica by default"
-msgstr "Отправлять общедоступные публикации во Friendica по умолчанию"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "All registrations"
+msgstr "Все регистрации"
 
-#: ../../addon/rtof/Mod_Rtof.php:51
-msgid "Friendica API Path"
-msgstr "Путь к Friendica API"
+#: ../../Zotlabs/Module/Admin/Accounts.php:315
+msgid "Verified registrations waiting for approval"
+msgstr "Проверенные регистрации ожидающие утверждения"
 
-#: ../../addon/rtof/Mod_Rtof.php:55
-msgid "Friendica login name"
-msgstr "Имя входа Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Request date"
+msgstr "Дата запроса"
 
-#: ../../addon/rtof/Mod_Rtof.php:59
-msgid "Friendica password"
-msgstr "Пароль Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+#: ../../Zotlabs/Module/Admin/Accounts.php:330
+#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:736
+#: ../../include/network.php:1768
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:69
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:55
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:56
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:57
+msgid "Email"
+msgstr "Электронная почта"
 
-#: ../../addon/rtof/Mod_Rtof.php:67
-msgid "Friendica Crosspost Connector"
-msgstr "Публикация в Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:316
+msgid "Requests"
+msgstr "Запросы"
 
-#: ../../addon/rtof/rtof.php:51
-msgid "Post to Friendica"
-msgstr "Опубликовать в Friendica"
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No registrations available"
+msgstr "Нет доступных регистраций"
 
-#: ../../addon/wppost/wppost.php:47
-msgid "Post to WordPress"
-msgstr "Опубликовать в WordPress"
+#: ../../Zotlabs/Module/Admin/Accounts.php:317
+msgid "No verified registrations available"
+msgstr "Нет доступных подтвержденных регистраций "
 
-#: ../../addon/wppost/wppost.php:174 ../../addon/wppost/Mod_Wppost.php:96
-#: ../../addon/dwpost/Mod_Dwpost.php:67 ../../addon/dwpost/dwpost.php:134
-#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:381
-msgid "Source"
-msgstr "Источник"
+#: ../../Zotlabs/Module/Admin/Accounts.php:318
+#: ../../Zotlabs/Module/Connections.php:349
+#: ../../Zotlabs/Module/Connections.php:400 ../../include/conversation.php:789
+msgid "Approve"
+msgstr "Утвердить"
 
-#: ../../addon/wppost/Mod_Wppost.php:30
-msgid "Wordpress Settings saved."
-msgstr "Настройки WordPress сохранены."
+#: ../../Zotlabs/Module/Admin/Accounts.php:319
+#: ../../Zotlabs/Module/Authorize.php:33
+msgid "Deny"
+msgstr "Запретить"
 
-#: ../../addon/wppost/Mod_Wppost.php:67
-msgid "WordPress username"
-msgstr "Имя пользователя WordPress"
+#: ../../Zotlabs/Module/Admin/Accounts.php:321
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:508
+msgid "Block"
+msgstr "Блокировать"
 
-#: ../../addon/wppost/Mod_Wppost.php:71
-msgid "WordPress password"
-msgstr "Пароль WordPress"
+#: ../../Zotlabs/Module/Admin/Accounts.php:322
+#: ../../Zotlabs/Module/Contactedit.php:639
+#: ../../Zotlabs/Module/Connedit.php:508
+msgid "Unblock"
+msgstr "Разблокировать"
 
-#: ../../addon/wppost/Mod_Wppost.php:75
-msgid "WordPress API URL"
-msgstr "URL API WordPress"
+#: ../../Zotlabs/Module/Admin/Accounts.php:323
+msgid "Verified"
+msgstr "Подтверждён"
 
-#: ../../addon/wppost/Mod_Wppost.php:76
-msgid "Typically https://your-blog.tld/xmlrpc.php"
-msgstr "Обычно https://your-blog.tld/xmlrpc.php"
+#: ../../Zotlabs/Module/Admin/Accounts.php:324
+msgid "Not yet verified"
+msgstr "Ещё не проверено"
 
-#: ../../addon/wppost/Mod_Wppost.php:79
-msgid "WordPress blogid"
+#: ../../Zotlabs/Module/Admin/Accounts.php:329
+msgid "ID"
 msgstr ""
 
-#: ../../addon/wppost/Mod_Wppost.php:80
-msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
-msgstr "Для многопользовательских сайтов, таких, как wordpress.com. В противном случае оставьте пустым"
-
-#: ../../addon/wppost/Mod_Wppost.php:84
-msgid "Post to WordPress by default"
-msgstr "Публиковать в WordPress по умолчанию"
-
-#: ../../addon/wppost/Mod_Wppost.php:88
-msgid "Forward comments (requires hubzilla_wp plugin)"
-msgstr "Пересылать комментарии (требуется плагин hubzilla_wp)"
-
-#: ../../addon/wppost/Mod_Wppost.php:92 ../../addon/dwpost/Mod_Dwpost.php:63
-#: ../../addon/ljpost/Mod_Ljpost.php:69
-msgid "Add link to original post"
-msgstr "Добавить ссылку на оригинальную заметку"
-
-#: ../../addon/wppost/Mod_Wppost.php:96 ../../addon/dwpost/Mod_Dwpost.php:67
-msgid "Link description (default:"
-msgstr "Описание ссылки (по-умолчанию:"
-
-#: ../../addon/wppost/Mod_Wppost.php:104
-msgid "Wordpress Post"
-msgstr "Публикация в WordPress"
-
-#: ../../addon/content_import/Mod_content_import.php:27
-msgid "No server specified"
-msgstr "Сервер не указан"
+#: ../../Zotlabs/Module/Admin/Accounts.php:331
+msgid "All channels"
+msgstr "Все каналы"
 
-#: ../../addon/content_import/Mod_content_import.php:73
-msgid "Posts imported"
-msgstr "Публикации импортированы"
+#: ../../Zotlabs/Module/Admin/Accounts.php:332
+msgid "Register date"
+msgstr "Дата регистрации"
 
-#: ../../addon/content_import/Mod_content_import.php:113
-msgid "Files imported"
-msgstr "Файлы импортированы"
+#: ../../Zotlabs/Module/Admin/Accounts.php:333
+msgid "Last login"
+msgstr "Последний вход"
 
-#: ../../addon/content_import/Mod_content_import.php:134
-#: ../../Zotlabs/Lib/Apps.php:336
-msgid "Content Import"
-msgstr "Импорт содержимого"
+#: ../../Zotlabs/Module/Admin/Accounts.php:334
+msgid "Expires"
+msgstr "Срок действия"
 
-#: ../../addon/content_import/Mod_content_import.php:135
+#: ../../Zotlabs/Module/Admin/Accounts.php:337
 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 "Импортировать все ваши разговоры и хранилище файлов из клонируемого канала на другом сервере. Это может занять некоторое время, если у вас много публикаций и / или файлов."
-
-#: ../../addon/content_import/Mod_content_import.php:136
-msgid "Include posts"
-msgstr "Включая публикации"
-
-#: ../../addon/content_import/Mod_content_import.php:136
-msgid "Conversations, Articles, Cards, and other posted content"
-msgstr "Беседы, Статьи, Карточки и другое опубликованное содержимое"
+"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/content_import/Mod_content_import.php:137
-msgid "Include files"
-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?"
+msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
 
-#: ../../addon/content_import/Mod_content_import.php:137
-msgid "Files, Photos and other cloud storage"
-msgstr "Файлы, Фотографии и прочее из хранилища"
+#: ../../Zotlabs/Module/Admin/Accounts.php:347
+#: ../../include/conversation.php:1141
+msgid "Message"
+msgstr "Сообщение"
 
-#: ../../addon/content_import/Mod_content_import.php:138
-msgid "Original Server base URL"
-msgstr "Базовый URL сервера-источника"
+#: ../../Zotlabs/Module/Admin/Queue.php:46
+msgid "Queue Statistics"
+msgstr "Статистика очереди"
 
-#: ../../addon/content_import/Mod_content_import.php:139
-#: ../../addon/hzfiles/hzfiles.php:84
-msgid "Since modified date yyyy-mm-dd"
-msgstr "Начиная с даты изменений yyyy-mm-dd"
+#: ../../Zotlabs/Module/Admin/Queue.php:47
+msgid "Total Entries"
+msgstr "Всего записей"
 
-#: ../../addon/content_import/Mod_content_import.php:140
-#: ../../addon/hzfiles/hzfiles.php:85
-msgid "Until modified date yyyy-mm-dd"
-msgstr "Заканчивая датой изменений yyyy-mm-dd"
+#: ../../Zotlabs/Module/Admin/Queue.php:48
+msgid "Priority"
+msgstr "Приоритет"
 
-#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1349
-msgid "Set your location"
-msgstr "Задать своё местоположение"
+#: ../../Zotlabs/Module/Admin/Queue.php:49
+msgid "Destination URL"
+msgstr "Конечный URL-адрес"
 
-#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1350
-msgid "Clear browser location"
-msgstr "Очистить местоположение из браузера"
+#: ../../Zotlabs/Module/Admin/Queue.php:50
+msgid "Mark hub permanently offline"
+msgstr "Пометить хаб как постоянно отключенный"
 
-#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1362
-#: ../../Zotlabs/Module/Article_edit.php:99
-#: ../../Zotlabs/Module/Card_edit.php:101
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:218
-#: ../../Zotlabs/Module/Editblock.php:116
-msgid "Insert web link"
-msgstr "Вставить веб-ссылку"
+#: ../../Zotlabs/Module/Admin/Queue.php:51
+msgid "Retry delivery to this hub"
+msgstr "Повторить доставку на этот хаб"
 
-#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1366
-msgid "Embed (existing) photo from your photo albums"
-msgstr "Встроить (существующее) фото из вашего фотоальбома"
-
-#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1399
-#: ../../Zotlabs/Module/Chat.php:216
-msgid "Please enter a link URL:"
-msgstr "Пожалуйста введите URL ссылки:"
+#: ../../Zotlabs/Module/Admin/Queue.php:52
+msgid "Empty queue for this hub"
+msgstr "Освободить очередь для этого хаба"
 
-#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1400
-msgid "Tag term:"
-msgstr "Теги:"
+#: ../../Zotlabs/Module/Admin/Queue.php:53
+msgid "Last known contact"
+msgstr "Последний известный контакт"
 
-#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1401
-msgid "Where are you right now?"
-msgstr "Где вы сейчас?"
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
+msgstr "Настройки темы обновленны."
 
-#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1404
-#: ../../Zotlabs/Module/Profile_photo.php:551
-#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:400
-msgid "Choose images to embed"
-msgstr "Выбрать изображения для встраивания"
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
+msgstr "Темы не найдены."
 
-#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1405
-#: ../../Zotlabs/Module/Profile_photo.php:552
-#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:401
-msgid "Choose an album"
-msgstr "Выбрать альбом"
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+#: ../../Zotlabs/Module/Admin/Addons.php:311
+msgid "Disable"
+msgstr "Запретить"
 
-#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1406
-msgid "Choose a different album..."
-msgstr "Выбрать другой альбом..."
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+#: ../../Zotlabs/Module/Admin/Addons.php:314
+msgid "Enable"
+msgstr "Разрешить"
 
-#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1407
-#: ../../Zotlabs/Module/Profile_photo.php:554
-#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:403
-msgid "Error getting album list"
-msgstr "Ошибка получения списка альбомов"
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
+msgstr "Снимок экрана"
 
-#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1408
-#: ../../Zotlabs/Module/Profile_photo.php:555
-#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:404
-msgid "Error getting photo link"
-msgstr "Ошибка получения ссылки на фотографию"
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:33
+msgid "Themes"
+msgstr "Темы"
 
-#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1409
-#: ../../Zotlabs/Module/Profile_photo.php:556
-#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:405
-msgid "Error getting album"
-msgstr "Ошибка получения альбома"
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+#: ../../Zotlabs/Module/Admin/Addons.php:344
+msgid "Toggle"
+msgstr "Переключить"
 
-#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1410
-msgid "Comments enabled"
-msgstr "Комментарии включены"
+#: ../../Zotlabs/Module/Admin/Themes.php:125
+#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343
+#: ../../Zotlabs/Widget/Newmember.php:58
+#: ../../Zotlabs/Widget/Settings_menu.php:71 ../../include/nav.php:102
+msgid "Settings"
+msgstr "Настройки"
 
-#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1411
-msgid "Comments disabled"
-msgstr "Комментарии отключены"
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+#: ../../Zotlabs/Module/Admin/Addons.php:352
+msgid "Author: "
+msgstr "Автор: "
 
-#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1422
-#: ../../Zotlabs/Module/Webpages.php:259 ../../Zotlabs/Module/Photos.php:1105
-#: ../../Zotlabs/Lib/ThreadItem.php:861
-msgid "Preview"
-msgstr "Предварительный просмотр"
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+#: ../../Zotlabs/Module/Admin/Addons.php:353
+msgid "Maintainer: "
+msgstr "Сопровождающий:"
 
-#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1455
-#: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:253
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1084
-#: ../../Zotlabs/Module/Wiki.php:298 ../../Zotlabs/Module/Layouts.php:194
-msgid "Share"
-msgstr "Поделиться"
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
+msgstr "[экспериментальный]"
 
-#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1464
-msgid "Page link name"
-msgstr "Название ссылки на страницу "
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
+msgstr "[неподдерживаемый]"
 
-#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1467
-msgid "Post as"
-msgstr "Опубликовать как"
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "New Profile Field"
+msgstr "Поле нового профиля"
 
-#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1469
-#: ../../Zotlabs/Lib/ThreadItem.php:852
-msgid "Bold"
-msgstr "Жирный"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "Field nickname"
+msgstr "Псевдоним поля"
 
-#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1470
-#: ../../Zotlabs/Lib/ThreadItem.php:853
-msgid "Italic"
-msgstr "Курсив"
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+#: ../../Zotlabs/Module/Admin/Profs.php:110
+msgid "System name of field"
+msgstr "Системное имя поля"
 
-#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1471
-#: ../../Zotlabs/Lib/ThreadItem.php:854
-msgid "Underline"
-msgstr "Подчеркнутый"
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+#: ../../Zotlabs/Module/Admin/Profs.php:111
+msgid "Input type"
+msgstr "Тип ввода"
 
-#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1472
-#: ../../Zotlabs/Lib/ThreadItem.php:855
-msgid "Quote"
-msgstr "Цитата"
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Field Name"
+msgstr "Имя поля"
 
-#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1473
-#: ../../Zotlabs/Lib/ThreadItem.php:856
-msgid "Code"
-msgstr "Код"
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+#: ../../Zotlabs/Module/Admin/Profs.php:112
+msgid "Label on profile pages"
+msgstr "Метка на странице профиля"
 
-#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1474
-#: ../../Zotlabs/Lib/ThreadItem.php:858
-msgid "Attach/Upload file"
-msgstr "Прикрепить/загрузить файл"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Help text"
+msgstr "Текст подсказки"
 
-#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1477
-#: ../../Zotlabs/Module/Wiki.php:397
-msgid "Embed an image from your albums"
-msgstr "Встроить изображение из ваших альбомов"
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+#: ../../Zotlabs/Module/Admin/Profs.php:113
+msgid "Additional info (optional)"
+msgstr "Дополнительная информация (необязательно)"
 
-#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258
-#: ../../include/conversation.php:1478 ../../include/conversation.php:1533
-#: ../../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:110
-#: ../../Zotlabs/Module/Oauth.php:136 ../../Zotlabs/Module/Editwebpage.php:169
-#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
-#: ../../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:549
-#: ../../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:817 ../../Zotlabs/Module/Oauth2.php:115
-#: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Wiki.php:365
-#: ../../Zotlabs/Module/Wiki.php:398 ../../Zotlabs/Module/Connedit.php:750
-#: ../../Zotlabs/Storage/Browser.php:383
-msgid "Cancel"
-msgstr "Отменить"
+#: ../../Zotlabs/Module/Admin/Profs.php:94
+#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54
+#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103
+#: ../../include/text.php:1168 ../../include/text.php:1180
+#: ../../extend/addon/hzaddons/articles/Mod_Articles.php:120
+#: ../../extend/addon/hzaddons/cards/Mod_Cards.php:116
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:116
+msgid "Save"
+msgstr "Запомнить"
 
-#: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257
-#: ../../include/conversation.php:1479 ../../include/conversation.php:1532
-#: ../../Zotlabs/Module/Profile_photo.php:550
-#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:399
-msgid "OK"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Profs.php:103
+msgid "Field definition not found"
+msgstr "Определения поля не найдено"
 
-#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1481
-msgid "Toggle voting"
-msgstr "Переключить голосование"
+#: ../../Zotlabs/Module/Admin/Profs.php:109
+msgid "Edit Profile Field"
+msgstr "Редактировать поле профиля"
 
-#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1488
-msgid "Disable comments"
-msgstr "Отключить комментарии"
+#: ../../Zotlabs/Module/Admin/Profs.php:168 ../../Zotlabs/Widget/Admin.php:35
+msgid "Profile Fields"
+msgstr "Поля профиля"
 
-#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1489
-msgid "Toggle comments"
-msgstr "Переключить комментарии"
+#: ../../Zotlabs/Module/Admin/Profs.php:169
+msgid "Basic Profile Fields"
+msgstr "Основные поля профиля"
 
-#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1495
-#: ../../Zotlabs/Module/Article_edit.php:116
-#: ../../Zotlabs/Module/Card_edit.php:118
-#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:678
-#: ../../Zotlabs/Module/Photos.php:1050
-msgid "Title (optional)"
-msgstr "Заголовок (необязательно)"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "Advanced Profile Fields"
+msgstr "Дополнительные поля профиля"
 
-#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1499
-msgid "Categories (optional, comma-separated list)"
-msgstr "Категории (необязательно, список через запятую)"
+#: ../../Zotlabs/Module/Admin/Profs.php:170
+msgid "(In addition to basic fields)"
+msgstr "(к основым полям)"
 
-#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1500
-msgid "Permission settings"
-msgstr "Настройки разрешений"
+#: ../../Zotlabs/Module/Admin/Profs.php:172
+msgid "All available fields"
+msgstr "Все доступные поля"
 
-#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1522
-msgid "Other networks and post services"
-msgstr "Другие сети и службы публикаций"
+#: ../../Zotlabs/Module/Admin/Profs.php:173
+msgid "Custom Fields"
+msgstr "Настраиваемые поля"
 
-#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1525
-msgid "Set expiration date"
-msgstr "Установить срок действия"
+#: ../../Zotlabs/Module/Admin/Profs.php:175
+#: ../../Zotlabs/Module/Connections.php:329
+#: ../../Zotlabs/Module/Connections.php:378
+#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Oauth.php:171
+#: ../../Zotlabs/Module/Editwebpage.php:142
+#: ../../Zotlabs/Module/Layouts.php:193 ../../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:252 ../../Zotlabs/Module/Group.php:245
+#: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Lib/ThreadItem.php:166
+#: ../../Zotlabs/Lib/Apps.php:595 ../../Zotlabs/Widget/Cdav.php:142
+#: ../../Zotlabs/Widget/Cdav.php:179 ../../include/channel.php:1530
+#: ../../include/channel.php:1534 ../../include/menu.php:120
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:97
+#: ../../extend/addon/hzaddons/articles/articles.php:73
+#: ../../extend/addon/hzaddons/cards/cards.php:73
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:99
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:214
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:387
+msgid "Edit"
+msgstr "Изменить"
 
-#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1528
-msgid "Set publish date"
-msgstr "Установить дату публикации"
+#: ../../Zotlabs/Module/Admin/Profs.php:177
+msgid "Create Custom Field"
+msgstr "Создать настраиваемое поле"
 
-#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1530
-#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:865
-msgid "Encrypt text"
-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/Mod_Hsse.php:15
-msgid "WYSIWYG status editor"
-msgstr "WYSIWYG редактор статуса "
+#: ../../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/Mod_Hsse.php:24
-msgid "WYSIWYG Status App"
-msgstr "Приложение \"WYSIWYG статус\""
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
+msgstr "Заблокировать функцию \"%s\""
 
-#: ../../addon/hsse/Mod_Hsse.php:32
-msgid "WYSIWYG Status"
-msgstr "WYSIWYG статус"
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
+msgstr "Управление дополнительными функциями"
 
-#: ../../addon/openstreetmap/openstreetmap.php:133
-msgid "View Larger"
-msgstr "Увеличить"
+#: ../../Zotlabs/Module/Admin/Addons.php:290
+#, php-format
+msgid "Plugin %s disabled."
+msgstr "Плагин %s отключен."
 
-#: ../../addon/openstreetmap/openstreetmap.php:156
-msgid "Tile Server URL"
-msgstr "URL сервера Tile"
+#: ../../Zotlabs/Module/Admin/Addons.php:295
+#, php-format
+msgid "Plugin %s enabled."
+msgstr "Плагин %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 "Список <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">общедоступных серверов</a>"
+#: ../../Zotlabs/Module/Admin/Addons.php:343
+#: ../../Zotlabs/Module/Admin/Addons.php:441 ../../Zotlabs/Widget/Admin.php:32
+msgid "Addons"
+msgstr "Расширения"
 
-#: ../../addon/openstreetmap/openstreetmap.php:157
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "URL сервера Nominatim (обратное геокодирование)"
+#: ../../Zotlabs/Module/Admin/Addons.php:354
+msgid "Minimum project version: "
+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/Addons.php:355
+msgid "Maximum project version: "
+msgstr "Максимальная версия проекта: "
 
-#: ../../addon/openstreetmap/openstreetmap.php:158
-msgid "Default zoom"
-msgstr "Масштаб по умолчанию"
+#: ../../Zotlabs/Module/Admin/Addons.php:356
+msgid "Minimum PHP version: "
+msgstr "Минимальная версия PHP: "
 
-#: ../../addon/openstreetmap/openstreetmap.php:158
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Уровень размера по умолчанию (1 - весь мир, 18 - максимальный; зависит от сервера)."
+#: ../../Zotlabs/Module/Admin/Addons.php:357
+msgid "Compatible Server Roles: "
+msgstr "Совместимые роли сервера: "
 
-#: ../../addon/openstreetmap/openstreetmap.php:159
-msgid "Include marker on map"
-msgstr "Включите маркер на карте"
+#: ../../Zotlabs/Module/Admin/Addons.php:358
+msgid "Requires: "
+msgstr "Необходимо:"
 
-#: ../../addon/openstreetmap/openstreetmap.php:159
-msgid "Include a marker on the map."
-msgstr "Включить маркер на карте"
+#: ../../Zotlabs/Module/Admin/Addons.php:359
+#: ../../Zotlabs/Module/Admin/Addons.php:446
+msgid "Disabled - version incompatibility"
+msgstr "Отключено - несовместимость версий"
 
-#: ../../addon/openstreetmap/openstreetmap.php:171
-#: ../../addon/rendezvous/rendezvous.php:82 ../../addon/twitter/twitter.php:493
-#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/diaspora/diaspora.php:104
-#: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54
-#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:146
-#: ../../Zotlabs/Module/Defperms.php:111
-msgid "Settings updated."
-msgstr "Настройки обновлены."
+#: ../../Zotlabs/Module/Admin/Addons.php:415
+msgid "Enter the public git repository URL of the addon repo."
+msgstr "Введите URL публичного репозитория расширений git"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:23
-msgid "Insane Journal Crosspost Connector Settings saved."
-msgstr "Настройки пересылки публикаций Insane Journal сохранены."
+#: ../../Zotlabs/Module/Admin/Addons.php:416
+msgid "Addon repo git URL"
+msgstr "URL репозитория расширений git"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:35
-msgid "Insane Journal Crosspost Connector App"
-msgstr "Приложение \"Публикация в Insane Journal\""
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "Custom repo name"
+msgstr "Пользовательское имя репозитория"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/xmpp/Mod_Xmpp.php:35
-#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Invite.php:56
-msgid "Not Installed"
-msgstr "не установлено"
+#: ../../Zotlabs/Module/Admin/Addons.php:417
+msgid "(optional)"
+msgstr "(необязательно)"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:36
-msgid "Relay public postings to Insane Journal"
-msgstr "Пересылает общедоступные публикации в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Addons.php:418
+msgid "Download Addon Repo"
+msgstr "Загрузить репозиторий расширений"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:53
-msgid "InsaneJournal username"
-msgstr "Имя пользователя Insane Journal"
+#: ../../Zotlabs/Module/Admin/Addons.php:425
+msgid "Install new repo"
+msgstr "Установить новый репозиторий"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:57
-msgid "InsaneJournal password"
-msgstr "Пароль Insane Journal"
+#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:540
+msgid "Install"
+msgstr "Установить"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:61
-msgid "Post to InsaneJournal by default"
-msgstr "Публиковать в Insane Journal по умолчанию"
+#: ../../Zotlabs/Module/Admin/Addons.php:427 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138
+#: ../../Zotlabs/Module/Profile_photo.php:553
+#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390
+#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136
+#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editblock.php:141
+#: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Filer.php:56
+#: ../../Zotlabs/Module/Editlayout.php:140
+#: ../../Zotlabs/Module/Connedit.php:750 ../../Zotlabs/Module/Editpost.php:111
+#: ../../Zotlabs/Module/Oauth2.php:115 ../../Zotlabs/Module/Oauth2.php:143
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1485
+#: ../../include/conversation.php:1540
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:130
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:132
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:371
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:404
+#: ../../extend/addon/hzaddons/hsse/hsse.php:209
+#: ../../extend/addon/hzaddons/hsse/hsse.php:258
+msgid "Cancel"
+msgstr "Отменить"
 
-#: ../../addon/ijpost/Mod_Ijpost.php:69
-msgid "Insane Journal Crosspost Connector"
-msgstr "Публикация в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Addons.php:449
+msgid "Manage Repos"
+msgstr "Управление репозиториями"
 
-#: ../../addon/ijpost/ijpost.php:44
-msgid "Post to Insane Journal"
-msgstr "Опубликовать в Insane Journal"
+#: ../../Zotlabs/Module/Admin/Addons.php:450
+msgid "Installed Addon Repositories"
+msgstr "Установленные репозитории расширений"
 
-#: ../../addon/wholikesme/wholikesme.php:29
-msgid "Who likes me?"
-msgstr "Кому я нравлюсь?"
+#: ../../Zotlabs/Module/Admin/Addons.php:451
+msgid "Install a New Addon Repository"
+msgstr "Установить новый репозиторий расширений"
 
-#: ../../addon/qrator/qrator.php:48
-msgid "QR code"
-msgstr "QR-код"
+#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Module/Cdav.php:1052
+#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Oauth.php:53
+#: ../../Zotlabs/Module/Oauth.php:135 ../../Zotlabs/Module/Connedit.php:748
+#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:142
+#: ../../Zotlabs/Lib/Apps.php:540
+msgid "Update"
+msgstr "Обновить"
 
-#: ../../addon/qrator/qrator.php:63
-msgid "QR Generator"
-msgstr "Генератор QR-кодов"
+#: ../../Zotlabs/Module/Admin/Addons.php:458
+msgid "Switch branch"
+msgstr "Переключить ветку"
 
-#: ../../addon/qrator/qrator.php:64
-msgid "Enter some text"
-msgstr "Введите любой текст"
+#: ../../Zotlabs/Module/Admin/Site.php:112
+msgid "Invalid input"
+msgstr "Неверный ввод"
 
-#: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:1776
-#: ../../addon/pubcrawl/as.php:1987 ../../include/network.php:1742
-#: ../../Zotlabs/Lib/Activity.php:3241 ../../Zotlabs/Lib/Activity.php:3433
-msgid "ActivityPub"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:132
+msgid "Errors"
+msgstr "Ошибки"
 
-#: ../../addon/pubcrawl/as.php:1943 ../../addon/diaspora/Receiver.php:1629
-#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Subthread.php:115
-msgid "status"
-msgstr "статус"
+#: ../../Zotlabs/Module/Admin/Site.php:225
+msgid "Site settings updated."
+msgstr "Настройки сайта обновлены."
 
-#: ../../addon/pubcrawl/as.php:1978 ../../addon/diaspora/Receiver.php:1575
-#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:477
-#: ../../Zotlabs/Lib/Activity.php:3424
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s нравится %3$s %2$s"
+#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3451
+#: ../../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/pubcrawl/as.php:1980 ../../include/conversation.php:177
-#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3426
+#: ../../Zotlabs/Module/Admin/Site.php:262
+#: ../../Zotlabs/Module/Settings/Display.php:116
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s не нравится %2$s %3$s"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25
-msgid "ActivityPub Protocol Settings updated."
-msgstr "Настройки протокола ActivityPub обновлены."
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:41
-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:47
-msgid "Deliver to ActivityPub recipients in privacy groups"
-msgstr "Доставить получателям ActivityPub в группах конфиденциальности"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:47
-msgid ""
-"May result in a large number of mentions and expose all the members of your "
-"privacy group"
-msgstr "Может привести к большому количеству упоминаний и раскрытию участников группы конфиденциальности"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51
-msgid "Send multi-media HTML articles"
-msgstr "Отправить HTML статьи с мультимедиа"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:51
-msgid "Not supported by some microblog services such as Mastodon"
-msgstr "Не поддерживается некоторыми микроблогами, например Mastodon"
-
-#: ../../addon/pubcrawl/Mod_Pubcrawl.php:59
-msgid "Activitypub Protocol"
-msgstr "Протокол ActivityPub"
-
-#: ../../addon/ldapauth/ldapauth.php:101
-msgid "An account has been created for you."
-msgstr "Учётная запись, которая была для вас создана."
-
-#: ../../addon/ldapauth/ldapauth.php:108
-msgid "Authentication successful but rejected: account creation is disabled."
-msgstr "Аутентификация выполнена успешно, но отклонена: создание учетной записи отключено."
-
-#: ../../addon/dwpost/Mod_Dwpost.php:26
-msgid "Dreamwidth Crosspost Connector Settings saved."
-msgstr "Настройки пересылки публикаций Dreamwidth сохранены."
+msgid "%s - (Incompatible)"
+msgstr "%s - (несовместимо)"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:51
-msgid "Dreamwidth username"
-msgstr "Имя пользователя Dreamwidth"
+#: ../../Zotlabs/Module/Admin/Site.php:269
+msgid "mobile"
+msgstr "мобильный"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:55
-msgid "Dreamwidth password"
-msgstr "Пароль Dreamwidth"
+#: ../../Zotlabs/Module/Admin/Site.php:271
+msgid "experimental"
+msgstr "экспериментальный"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:59
-msgid "Post to Dreamwidth by default"
-msgstr "Публиковать в Dreamwidth по умолчанию"
+#: ../../Zotlabs/Module/Admin/Site.php:273
+msgid "unsupported"
+msgstr "неподдерживаемый"
 
-#: ../../addon/dwpost/Mod_Dwpost.php:75
-msgid "Dreamwidth Crosspost Connector"
-msgstr "Публикация в Dreamwidth"
+#: ../../Zotlabs/Module/Admin/Site.php:320
+msgid "Yes - with approval"
+msgstr "Да - требует подтверждения"
 
-#: ../../addon/dwpost/dwpost.php:49
-msgid "Post to Dreamwidth"
-msgstr "Публиковать в Dreamwidth"
+#: ../../Zotlabs/Module/Admin/Site.php:328
+msgid "My site is not a public server"
+msgstr "Мой сайт не является публичным сервером"
 
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslap"
-msgstr "дал леща"
+#: ../../Zotlabs/Module/Admin/Site.php:329
+msgid "My site has paid access only"
+msgstr "Мой сайт доступен только с оплатой "
 
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslapped"
-msgstr "получил леща"
+#: ../../Zotlabs/Module/Admin/Site.php:330
+msgid "My site has free access only"
+msgstr "На моём сайте разрешён свободный доступ"
 
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shag"
-msgstr "вздрючил"
+#: ../../Zotlabs/Module/Admin/Site.php:331
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами"
 
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shagged"
-msgstr "вздрюченный"
+#: ../../Zotlabs/Module/Admin/Site.php:349
+msgid "Default permission role for new accounts"
+msgstr "Разрешения по умолчанию для новых аккаунтов"
 
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patent"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:349
+msgid ""
+"This role will be used for the first channel created after registration."
+msgstr "Эта роль будет использоваться для первого канала, созданного после регистрации."
 
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patented"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:356 ../../Zotlabs/Module/Invite.php:397
+msgid "Minute(s)"
+msgstr "Минут"
 
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hug"
-msgstr "обнял"
+#: ../../Zotlabs/Module/Admin/Site.php:357 ../../Zotlabs/Module/Invite.php:398
+msgid "Hour(s)"
+msgstr "Часов"
 
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hugged"
-msgstr "обнятый"
+#: ../../Zotlabs/Module/Admin/Site.php:358 ../../Zotlabs/Module/Invite.php:399
+msgid "Day(s)"
+msgstr "Дней"
 
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murder"
-msgstr "убил"
+#: ../../Zotlabs/Module/Admin/Site.php:359
+msgid "Week(s)"
+msgstr "Недель"
 
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murdered"
-msgstr "убитый"
+#: ../../Zotlabs/Module/Admin/Site.php:360
+msgid "Month(s)"
+msgstr "Месяцев"
 
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worship"
-msgstr "почитает"
+#: ../../Zotlabs/Module/Admin/Site.php:361
+msgid "Year(s)"
+msgstr "Лет"
 
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worshipped"
-msgstr "почитаемый"
+#: ../../Zotlabs/Module/Admin/Site.php:369
+msgid "Register verification delay"
+msgstr "Задержка проверки регистрации"
 
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kiss"
-msgstr "поцеловал"
+#: ../../Zotlabs/Module/Admin/Site.php:372
+msgid "Time to wait before a registration can be verified"
+msgstr "Время ожидания до того, как регистрация может быть проверена"
 
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kissed"
-msgstr "поцелованный"
+#: ../../Zotlabs/Module/Admin/Site.php:375
+#: ../../Zotlabs/Module/Admin/Site.php:397 ../../Zotlabs/Module/Invite.php:408
+msgid "duration up from now"
+msgstr "продолжительность с настоящего момента"
 
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempt"
-msgstr "искушает"
+#: ../../Zotlabs/Module/Admin/Site.php:391
+msgid "Register verification expiration time"
+msgstr "Время истечения срока проверки регистрации"
 
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempted"
-msgstr "искушённый"
+#: ../../Zotlabs/Module/Admin/Site.php:394
+msgid "Time before an unverified registration will expire"
+msgstr "Время до истечения срока непроверенной регистрации "
 
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raise eyebrows at"
-msgstr "поднял брови"
+#: ../../Zotlabs/Module/Admin/Site.php:414 ../../Zotlabs/Widget/Admin.php:27
+msgid "Site"
+msgstr "Сайт"
 
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raised their eyebrows at"
-msgstr "поднял брови"
+#: ../../Zotlabs/Module/Admin/Site.php:417
+msgid "File upload"
+msgstr "Загрузка файла"
 
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insult"
-msgstr "оскорбил"
+#: ../../Zotlabs/Module/Admin/Site.php:418
+msgid "Policies"
+msgstr "Правила"
 
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insulted"
-msgstr "оскорблённый"
+#: ../../Zotlabs/Module/Admin/Site.php:419 ../../include/acl_selectors.php:145
+#: ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr "Дополнительно"
 
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praise"
-msgstr "похвалил"
+#: ../../Zotlabs/Module/Admin/Site.php:423
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:593
+msgid "Site name"
+msgstr "Название сайта"
 
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praised"
-msgstr "похваленный"
+#: ../../Zotlabs/Module/Admin/Site.php:425
+msgid "Banner/Logo"
+msgstr "Баннер / логотип"
 
-#: ../../addon/morepokes/morepokes.php:30
-msgid "be dubious of"
-msgstr "сомневается"
+#: ../../Zotlabs/Module/Admin/Site.php:425
+msgid "Unfiltered HTML/CSS/JS is allowed"
+msgstr "Разрешён нефильтруемый HTML/CSS/JS"
 
-#: ../../addon/morepokes/morepokes.php:30
-msgid "was dubious of"
-msgstr "усомнился"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid "Administrator Information"
+msgstr "Информация об администраторе"
 
-#: ../../addon/morepokes/morepokes.php:31
-msgid "eat"
-msgstr "ест"
+#: ../../Zotlabs/Module/Admin/Site.php:426
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode."
 
-#: ../../addon/morepokes/morepokes.php:31
-msgid "ate"
-msgstr "съел"
+#: ../../Zotlabs/Module/Admin/Site.php:427 ../../Zotlabs/Module/Siteinfo.php:24
+msgid "Site Information"
+msgstr "Информация о сайте"
 
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggle and fawn at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:427
+msgid ""
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr "Публичное видимое описание сайта. Показывается на информационной странице сайта. Можно использовать BBCode."
 
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggled and fawned at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:428
+msgid "System language"
+msgstr "Язык системы"
 
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubt"
-msgstr "сомневается"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+msgid "System theme"
+msgstr "Системная тема"
 
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubted"
-msgstr "усомнился"
+#: ../../Zotlabs/Module/Admin/Site.php:429
+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:34
-msgid "glare"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "Allow Feeds as Connections"
+msgstr "Разрешить ленты новостей как контакты"
 
-#: ../../addon/morepokes/morepokes.php:34
-msgid "glared at"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:432
+msgid "(Heavy system resource usage)"
+msgstr "(Высокое использование системных ресурсов)"
 
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fuck"
-msgstr "трахает"
+#: ../../Zotlabs/Module/Admin/Site.php:433
+msgid "Maximum image size"
+msgstr "Максимальный размер изображения"
 
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fucked"
-msgstr "трахнул"
+#: ../../Zotlabs/Module/Admin/Site.php:433
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Максимальный размер загруженных изображений в байтах. По умолчанию 0 или без ограничений."
 
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonk"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:434
+msgid "Minimum age"
+msgstr "Минимальный возраст"
 
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonked"
-msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:434
+msgid "Minimum age (in years) for who may register on this site."
+msgstr "Минимальный возраст (в годах) для регистрации на этом сайте."
 
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declare undying love for"
-msgstr "признаётся в любви к"
+#: ../../Zotlabs/Module/Admin/Site.php:435
+msgid "Which best describes the types of account offered by this hub?"
+msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?"
 
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declared undying love for"
-msgstr "признался в любви к"
+#: ../../Zotlabs/Module/Admin/Site.php:435
+msgid "This is displayed on the public server site list."
+msgstr "Это отображается в списке общедоступных серверов."
 
-#: ../../addon/rendezvous/rendezvous.php:57
-msgid "Errors encountered deleting database table "
-msgstr "Возникшие при удалении таблицы базы данных ошибки"
+#: ../../Zotlabs/Module/Admin/Site.php:441
+msgid "Register text"
+msgstr "Текст регистрации"
 
-#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:502
-msgid "Submit Settings"
-msgstr "Отправить настройки"
+#: ../../Zotlabs/Module/Admin/Site.php:443
+msgid "This text will be displayed prominently at the registration page"
+msgstr "Этот текст будет отображаться на видном месте на странице регистрации"
 
-#: ../../addon/rendezvous/rendezvous.php:96
-msgid "Drop tables when uninstalling?"
-msgstr "Удалить таблицы при деинсталляции?"
+#: ../../Zotlabs/Module/Admin/Site.php:447
+msgid "Does this site allow new member registration?"
+msgstr "Разрешается ли регистрация новых пользователей на этом сайте?"
 
-#: ../../addon/rendezvous/rendezvous.php:96
-msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin "
-"is uninstalled."
-msgstr "Если включено, то таблицы базы данных Rendezvous будут удалены при удалении плагина."
+#: ../../Zotlabs/Module/Admin/Site.php:454
+msgid "Configure the registration open days/hours"
+msgstr "Настройте рабочие дни / часы регистрации"
 
-#: ../../addon/rendezvous/rendezvous.php:97
-msgid "Mapbox Access Token"
-msgstr "Токен доступа к Mapbox"
+#: ../../Zotlabs/Module/Admin/Site.php:456
+msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
+msgstr "Пустое значение или '-:-' даст возможность регистрироваться 24/7 (по умолчанию) "
 
-#: ../../addon/rendezvous/rendezvous.php:97
+#: ../../Zotlabs/Module/Admin/Site.php:457
 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."
-
-#: ../../addon/rendezvous/rendezvous.php:162
-msgid "Rendezvous"
-msgstr ""
+"Weekdays and hours must be separated by colon ':', From-To ranges with a "
+"dash `-` example: 1:800-1200"
+msgstr "Рабочие дни и часы должны быть разделены двоеточием ':', диапазоны от-до - тире '-'. Пример: 1:800-1200"
 
-#: ../../addon/rendezvous/rendezvous.php:167
+#: ../../Zotlabs/Module/Admin/Site.php:458
 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 "Этот идентификатор был удалён другим участником из-за неактивности. Пожалуйста нажмите кнопку \"Новый идентификатор\" для обновления страницы и получения нового идентификатора. Вы можете использовать то же имя."
-
-#: ../../addon/rendezvous/rendezvous.php:168
-msgid "Welcome to Rendezvous!"
-msgstr "Добро пожаловать в Rendezvous!"
+"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 "
+"2:900-1700"
+msgstr "День недели: пары часов должны быть разделены пробелом ' ' пример: 1:900-1700 2:900-1700"
 
-#: ../../addon/rendezvous/rendezvous.php:169
+#: ../../Zotlabs/Module/Admin/Site.php:459
 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 "Давайте встретимся здесь"
+"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/rendezvous/rendezvous.php:172
-#: ../../Zotlabs/Widget/Wiki_page_history.php:22
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137
-#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372
-#: ../../Zotlabs/Module/Sharedwithme.php:106
-#: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
-#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:732
-#: ../../Zotlabs/Lib/NativeWikiPage.php:582
-#: ../../Zotlabs/Storage/Browser.php:377
-msgid "Name"
-msgstr "Имя"
+#: ../../Zotlabs/Module/Admin/Site.php:460
+msgid "Advanced examples:"
+msgstr "Дополнительные примеры:"
 
-#: ../../addon/rendezvous/rendezvous.php:173
-#: ../../addon/cart/submodules/hzservices.php:657
-#: ../../addon/cart/submodules/manualcat.php:260
-#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Appman.php:211
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "Description"
-msgstr "Описание"
+#: ../../Zotlabs/Module/Admin/Site.php:460
+#: ../../Zotlabs/Module/Settings/Channel.php:182
+msgid "or"
+msgstr "или"
 
-#: ../../addon/rendezvous/rendezvous.php:174
-msgid "New marker"
-msgstr "Новый маркер"
+#: ../../Zotlabs/Module/Admin/Site.php:461
+msgid "Check your configuration"
+msgstr "Проверьте ваши настройки"
 
-#: ../../addon/rendezvous/rendezvous.php:175
-msgid "Edit marker"
-msgstr "Редактировать маркер"
+#: ../../Zotlabs/Module/Admin/Site.php:465
+msgid "Max account registrations per day"
+msgstr "Максимальное количество регистраций в день"
 
-#: ../../addon/rendezvous/rendezvous.php:176
-msgid "New identity"
-msgstr "Новый идентификатор"
+#: ../../Zotlabs/Module/Admin/Site.php:467
+msgid "Unlimited if zero or no value - default 50"
+msgstr "Без ограничений если значение не предоставлено или равно 0 (по умолчанию 50)"
 
-#: ../../addon/rendezvous/rendezvous.php:177
-msgid "Delete marker"
-msgstr "Удалить маркер"
+#: ../../Zotlabs/Module/Admin/Site.php:471
+msgid "Max account registrations from same IP"
+msgstr "Максимальное количество регистраций с одного IP-адреса"
 
-#: ../../addon/rendezvous/rendezvous.php:178
-msgid "Delete member"
-msgstr "Удалить участника"
+#: ../../Zotlabs/Module/Admin/Site.php:473
+msgid "Unlimited if zero or no value - default 3"
+msgstr "Без ограничений если значение не предоставлено или равно 0 (по умолчанию 3)"
 
-#: ../../addon/rendezvous/rendezvous.php:179
-msgid "Edit proximity alert"
-msgstr "Изменить оповещение о близости"
+#: ../../Zotlabs/Module/Admin/Site.php:479
+msgid "Auto channel create"
+msgstr "Автоматическое создание канала"
 
-#: ../../addon/rendezvous/rendezvous.php:180
+#: ../../Zotlabs/Module/Admin/Site.php:481
 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 для отключения):"
+"If disabled the channel will be created in a separate step during the "
+"registration process"
+msgstr "Если отключено, канал будет создан на отдельном этапе в процессе регистрации"
 
-#: ../../addon/rendezvous/rendezvous.php:180
-#: ../../addon/rendezvous/rendezvous.php:185
-msgid "distance"
-msgstr "расстояние"
+#: ../../Zotlabs/Module/Admin/Site.php:485
+msgid "Require invite code"
+msgstr "Требуется код приглашения"
 
-#: ../../addon/rendezvous/rendezvous.php:181
-msgid "Proximity alert distance (meters)"
-msgstr "Расстояние для уведомления о близости (метров)"
+#: ../../Zotlabs/Module/Admin/Site.php:490
+msgid "Allow invite code"
+msgstr "Разрешить использовать код приглашения"
 
-#: ../../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 "Оповещение о близости будет произведено, если вы находитесь на определённом расстоянии местоположения маркера. <br><br>Введите радиус в метрах (0 для отключения):"
+#: ../../Zotlabs/Module/Admin/Site.php:495
+msgid "Require email address"
+msgstr "Требуется адрес электронной почты"
 
-#: ../../addon/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
-msgstr "Маркер уведомления о близости"
+#: ../../Zotlabs/Module/Admin/Site.php:497
+msgid "The provided email address will be verified (recommended)"
+msgstr "Предоставленный адрес электронной почты должен быт подтверждён (рекомендуется)"
 
-#: ../../addon/rendezvous/rendezvous.php:186
-msgid "Reminder note"
-msgstr "Напоминание"
+#: ../../Zotlabs/Module/Admin/Site.php:501
+msgid "Abandon account after x days"
+msgstr "Учётная запись считается заброшенной после X дней"
 
-#: ../../addon/rendezvous/rendezvous.php:187
+#: ../../Zotlabs/Module/Admin/Site.php:503
 msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
-msgstr "Введите сообщение для отображения когда вы находитесь рядом"
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Системные ресурсы не будут расходоваться для опроса внешних сайтов для заброшенных аккаунтов. Введите 0 для отсутствия ограничений."
 
-#: ../../addon/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
-msgstr "Добавить новое Rendezvous."
+#: ../../Zotlabs/Module/Admin/Site.php:508
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."
 
-#: ../../addon/rendezvous/rendezvous.php:200
+#: ../../Zotlabs/Module/Admin/Site.php:508
 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 "При создании базы данных возникли ошибки."
+"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/startpage/Mod_Startpage.php:60
-msgid "Page to load after login"
-msgstr "Страница для загрузки после входа"
+#: ../../Zotlabs/Module/Admin/Site.php:509
+msgid "Preserve site homepage URL"
+msgstr "Сохранить URL главной страницы сайта"
 
-#: ../../addon/startpage/Mod_Startpage.php:60
+#: ../../Zotlabs/Module/Admin/Site.php:509
 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:68
-msgid "Startpage"
-msgstr "Стартовая страница"
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"
 
-#: ../../addon/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
-msgstr "Пометка фотографий для взрослых"
+#: ../../Zotlabs/Module/Admin/Site.php:510
+msgid "Allowed friend domains"
+msgstr "Разрешенные домены друзей"
 
-#: ../../addon/adultphotoflag/adultphotoflag.php:25
+#: ../../Zotlabs/Module/Admin/Site.php:510
 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 "Сведения об обновлении"
-
-#: ../../addon/upgrade_info/upgrade_info.php:64
-msgid "Do not show this again"
-msgstr "Больше не показывать"
-
-#: ../../addon/twitter/Mod_Twitter.php:65
-msgid "Twitter settings updated."
-msgstr "Настройки Twitter обновлены"
+"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/twitter/Mod_Twitter.php:101
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "Не найдено пары ключей для Twitter. Пожалуйста, свяжитесь с администратором сайта."
+#: ../../Zotlabs/Module/Admin/Site.php:511
+msgid "Force publish"
+msgstr "Принудительно публиковать"
 
-#: ../../addon/twitter/Mod_Twitter.php:123
+#: ../../Zotlabs/Module/Admin/Site.php:511
 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:125
-msgid "Log in with Twitter"
-msgstr "Войти в Twitter"
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Включите для принудительного включения всех учётных записей на данном сайте в каталог."
 
-#: ../../addon/twitter/Mod_Twitter.php:128
-msgid "Copy the PIN from Twitter here"
-msgstr "Скопируйте PIN-код из Twitter здесь"
+#: ../../Zotlabs/Module/Admin/Site.php:512
+msgid "Import Public Streams"
+msgstr "Импортированные публичные потоки"
 
-#: ../../addon/twitter/Mod_Twitter.php:150
+#: ../../Zotlabs/Module/Admin/Site.php:512
 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:155
-msgid "Twitter post length"
-msgstr "Длина публикации Twitter"
-
-#: ../../addon/twitter/Mod_Twitter.php:155
-msgid "Maximum tweet length"
-msgstr "Максимальная длина твита"
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr "Импортировать и разрешить всем доступ к загружаемым с других сайтов потоков. Внимание - этот контент не может модерироваться."
 
-#: ../../addon/twitter/Mod_Twitter.php:160
-msgid "Send public postings to Twitter by default"
-msgstr "Отправлять общедоступные публикации в Twitter по умолчанию"
+#: ../../Zotlabs/Module/Admin/Site.php:513
+msgid "Site only Public Streams"
+msgstr "Публичные потоки только с сайта"
 
-#: ../../addon/twitter/Mod_Twitter.php:160
+#: ../../Zotlabs/Module/Admin/Site.php:513
 msgid ""
-"If enabled your public postings will be posted to the associated Twitter "
-"account by default"
-msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter по умолчанию"
-
-#: ../../addon/twitter/Mod_Twitter.php:179
-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:71
-msgid "Pump.io servername"
-msgstr "Имя сервера Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:71
-msgid "Without \"http://\" or \"https://\""
-msgstr "Без \"http://\" или \"https://\""
-
-#: ../../addon/pumpio/Mod_Pumpio.php:75
-msgid "Pump.io username"
-msgstr "Имя пользователя Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:75
-msgid "Without the servername"
-msgstr "без имени сервера"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:86
-msgid "You are not authenticated to pumpio"
-msgstr "Вы не аутентифицированы на Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:88
-msgid "(Re-)Authenticate your pump.io connection"
-msgstr "Аутентифицировать (повторно) ваше соединение с Pump.io"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:92
-msgid "Post to pump.io by default"
-msgstr "Публиковать в Pump.io по умолчанию"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:96
-msgid "Should posts be public"
-msgstr "Публикации должны быть общедоступными"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:100
-msgid "Mirror all public posts"
-msgstr "Отображать все общедоступные публикации"
-
-#: ../../addon/pumpio/Mod_Pumpio.php:110
-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 "Фотография профиля по умолчанию"
+"Allow access to public content originating only from this site if Imported "
+"Public Streams are disabled."
+msgstr "Разрешить доступ к общедоступному контенту, исходящему только с этого сайта, если импортированные публичные потоки отключены."
 
-#: ../../addon/gravatar/gravatar.php:143
-msgid "Information"
-msgstr "Информация"
+#: ../../Zotlabs/Module/Admin/Site.php:514
+msgid "Allow anybody on the internet to access the Public streams"
+msgstr "Разрешить всем доступ к публичным потокам"
 
-#: ../../addon/gravatar/gravatar.php:143
+#: ../../Zotlabs/Module/Admin/Site.php:514
 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:21
-msgid "Send your identity to all websites"
-msgstr "Отправить ваши данные на все веб-сайты"
-
-#: ../../addon/sendzid/Mod_Sendzid.php:29
-msgid "Send ZID"
-msgstr "Отправить ZID"
-
-#: ../../addon/cart/widgets/catalogitem.php:57
-#: ../../addon/cart/submodules/hzservices.php:660
-#: ../../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:1580
-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:1558
-#: ../../Zotlabs/Module/Wiki.php:75
-msgid "Invalid channel"
-msgstr "Недействительный канал"
+"Disable to require authentication before viewing. Warning: this content is "
+"unmoderated."
+msgstr "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться."
 
-#: ../../addon/cart/submodules/subscriptions.php:151
-msgid "Enable Subscription Management Module"
-msgstr "Включить модуль управления подписками"
+#: ../../Zotlabs/Module/Admin/Site.php:515
+msgid "Only import Public stream posts with this text"
+msgstr "Импортировать только публичные потоки с этим текстом"
 
-#: ../../addon/cart/submodules/subscriptions.php:223
+#: ../../Zotlabs/Module/Admin/Site.php:515
+#: ../../Zotlabs/Module/Admin/Site.php:516
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707
 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:65
-msgid "Enable Hubzilla Services Module"
-msgstr "Включить модуль сервиса Hubzilla"
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr "слова по одному в строку, #тег,  /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций"
 
-#: ../../addon/cart/submodules/hzservices.php:164
-#: ../../addon/cart/submodules/manualcat.php:172
-msgid "New Sku"
-msgstr "Новый код"
+#: ../../Zotlabs/Module/Admin/Site.php:516
+msgid "Do not import Public stream posts with this text"
+msgstr "Не импортировать публичные потоки с этим текстом"
 
-#: ../../addon/cart/submodules/hzservices.php:199
-#: ../../addon/cart/submodules/manualcat.php:208
-msgid "Cannot save edits to locked item."
-msgstr "Невозможно сохранить изменения заблокированной позиции."
+#: ../../Zotlabs/Module/Admin/Site.php:519
+msgid "Login on Homepage"
+msgstr "Вход на домашней странице"
 
-#: ../../addon/cart/submodules/hzservices.php:248
-#: ../../addon/cart/submodules/hzservices.php:335
-msgid "SKU not found."
-msgstr "Код не найден."
+#: ../../Zotlabs/Module/Admin/Site.php:519
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Предоставлять форму входа для посетителей на домашней странице если другого содержимого не настроено."
 
-#: ../../addon/cart/submodules/hzservices.php:301
-#: ../../addon/cart/submodules/hzservices.php:305
-msgid "Invalid Activation Directive."
-msgstr "Недействительная директива активации."
+#: ../../Zotlabs/Module/Admin/Site.php:520
+msgid "Enable context help"
+msgstr "Включить контекстную помощь"
 
-#: ../../addon/cart/submodules/hzservices.php:376
-#: ../../addon/cart/submodules/hzservices.php:380
-msgid "Invalid Deactivation Directive."
-msgstr "Недействительная директива деактивации"
+#: ../../Zotlabs/Module/Admin/Site.php:520
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
+msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"."
 
-#: ../../addon/cart/submodules/hzservices.php:566
-msgid "Add to this privacy group"
-msgstr "Добавить в эту группу конфиденциальности"
+#: ../../Zotlabs/Module/Admin/Site.php:522
+msgid "Reply-to email address for system generated email."
+msgstr "Адрес email Reply-to для генерируемых системой сообщений."
 
-#: ../../addon/cart/submodules/hzservices.php:582
-msgid "Set user service class"
-msgstr "Установить класс обслуживания пользователя"
+#: ../../Zotlabs/Module/Admin/Site.php:523
+msgid "Sender (From) email address for system generated email."
+msgstr "Адрес email отправителя (From) для генерируемых системой сообщений."
 
-#: ../../addon/cart/submodules/hzservices.php:609
-msgid "You must be using a local account to purchase this service."
-msgstr "Вы должны использовать локальную учётноую запись для покупки этого сервиса."
+#: ../../Zotlabs/Module/Admin/Site.php:524
+msgid "Name of email sender for system generated email."
+msgstr "Имя отправителя для генерируемых системой сообщений."
 
-#: ../../addon/cart/submodules/hzservices.php:649
-#: ../../addon/cart/submodules/manualcat.php:252
-msgid "Changes Locked"
-msgstr "Изменения заблокированы"
+#: ../../Zotlabs/Module/Admin/Site.php:526
+msgid "Directory Server URL"
+msgstr "URL сервера каталогов"
 
-#: ../../addon/cart/submodules/hzservices.php:653
-#: ../../addon/cart/submodules/manualcat.php:256
-msgid "Item available for purchase."
-msgstr "Позиция доступна для приобретения."
+#: ../../Zotlabs/Module/Admin/Site.php:526
+msgid "Default directory server"
+msgstr "Сервер каталогов по умолчанию"
 
-#: ../../addon/cart/submodules/hzservices.php:663
-#: ../../addon/cart/submodules/manualcat.php:266
-msgid "Photo URL"
-msgstr "URL изображения"
+#: ../../Zotlabs/Module/Admin/Site.php:528
+msgid "Enable SSE Notifications"
+msgstr "Включить уведомления SSE"
 
-#: ../../addon/cart/submodules/hzservices.php:667
-msgid "Add buyer to privacy group"
-msgstr "Добавить покупателя в группу конфиденциальности"
+#: ../../Zotlabs/Module/Admin/Site.php:528
+msgid ""
+"If disabled, traditional polling will be used. Warning: this setting might "
+"not be suited for shared hosting"
+msgstr "Если выключено будет использоваться традиционный периодический опрос. Предупреждение: этот режим не подходит для виртуального (shared) хостинга"
 
-#: ../../addon/cart/submodules/hzservices.php:672
-msgid "Add buyer as connection"
-msgstr "Добавить покупателя как контакт"
+#: ../../Zotlabs/Module/Admin/Site.php:530
+msgid "Proxy user"
+msgstr "Имя пользователя proxy-сервера"
 
-#: ../../addon/cart/submodules/hzservices.php:680
-#: ../../addon/cart/submodules/hzservices.php:722
-msgid "Set Service Class"
-msgstr "Установить класс обслуживания"
+#: ../../Zotlabs/Module/Admin/Site.php:531
+msgid "Proxy URL"
+msgstr "URL proxy-сервера"
 
-#: ../../addon/cart/submodules/orderoptions.php:70
-msgid "Enable Order/Item Options"
-msgstr "Включить параметры заказа / позиции"
+#: ../../Zotlabs/Module/Admin/Site.php:532
+msgid "Network timeout"
+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 "Метка"
+#: ../../Zotlabs/Module/Admin/Site.php:532
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)."
 
-#: ../../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:209
-#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:761
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Required"
-msgstr "Требуется"
+#: ../../Zotlabs/Module/Admin/Site.php:533
+msgid "Delivery interval"
+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 "Инструкции"
+#: ../../Zotlabs/Module/Admin/Site.php:533
+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 для выделенных серверов."
 
-#: ../../addon/cart/submodules/paypalbutton.php:85
-msgid "Enable Paypal Button Module"
-msgstr "Включить модуль кнопки Paypal"
+#: ../../Zotlabs/Module/Admin/Site.php:534
+msgid "Deliveries per process"
+msgstr "Доставок на процесс"
 
-#: ../../addon/cart/submodules/paypalbutton.php:93
-#: ../../addon/cart/submodules/paypalbuttonV2.php:94
-msgid "Use Production Key"
-msgstr "Использовать ключ Production"
+#: ../../Zotlabs/Module/Admin/Site.php:534
+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."
 
-#: ../../addon/cart/submodules/paypalbutton.php:100
-#: ../../addon/cart/submodules/paypalbuttonV2.php:101
-msgid "Paypal Sandbox Client Key"
-msgstr "Ключ клиента Paypal Sandbox"
+#: ../../Zotlabs/Module/Admin/Site.php:535
+msgid "Queue Threshold"
+msgstr "Порог очереди"
 
-#: ../../addon/cart/submodules/paypalbutton.php:107
-#: ../../addon/cart/submodules/paypalbuttonV2.php:108
-msgid "Paypal Sandbox Secret Key"
-msgstr "Секретный ключ Paypal Sandbox"
+#: ../../Zotlabs/Module/Admin/Site.php:535
+msgid ""
+"Always defer immediate delivery if queue contains more than this number of "
+"entries."
+msgstr "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это."
 
-#: ../../addon/cart/submodules/paypalbutton.php:113
-#: ../../addon/cart/submodules/paypalbuttonV2.php:114
-msgid "Paypal Production Client Key"
-msgstr "Ключ клиента Paypal Production"
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid "Poll interval"
+msgstr "Интервал опроса"
 
-#: ../../addon/cart/submodules/paypalbutton.php:120
-#: ../../addon/cart/submodules/paypalbuttonV2.php:121
-msgid "Paypal Production Secret Key"
-msgstr "Секретный ключ Paypal Production"
+#: ../../Zotlabs/Module/Admin/Site.php:536
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr "Задержка фоновых процессов опроса на указанное количество секунд для снижения нагрузки на систему. Если 0 - использовать интервал доставки."
 
-#: ../../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:537
+msgid "Path to ImageMagick convert program"
+msgstr "Путь к ImageMagick"
 
-#: ../../addon/cart/submodules/paypalbutton.php:270
-#: ../../addon/cart/submodules/paypalbuttonV2.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:537
 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)"
+"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/manualcat.php:61
-msgid "Enable Manual Cart Module"
-msgstr "Включить модуль ручного управления карточками"
+#: ../../Zotlabs/Module/Admin/Site.php:538
+msgid "Maximum Load Average"
+msgstr "Максимальная средняя нагрузка"
 
-#: ../../addon/cart/myshop.php:30
-msgid "Access Denied."
-msgstr "Доступ запрещён."
+#: ../../Zotlabs/Module/Admin/Site.php:538
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50."
 
-#: ../../addon/cart/myshop.php:112 ../../addon/cart/cart.php:1446
-msgid "Order Not Found"
-msgstr "Заказ не найден"
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "Expiration period in days for imported (grid/network) content"
+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 "Недействительный элемент"
+#: ../../Zotlabs/Module/Admin/Site.php:539
+msgid "0 for no expiration of imported content"
+msgstr "0 для постоянного хранения импортированного содержимого"
 
-#: ../../addon/cart/Settings/Cart.php:58
-msgid "Enable Test Catalog"
-msgstr "Включить тестовый каталог"
+#: ../../Zotlabs/Module/Admin/Site.php:540
+msgid ""
+"Do not expire any posts which have comments less than this many days ago"
+msgstr "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения"
 
-#: ../../addon/cart/Settings/Cart.php:70
-msgid "Enable Manual Payments"
-msgstr "Включить ручные платежи"
+#: ../../Zotlabs/Module/Admin/Site.php:541
+msgid ""
+"Public servers: Optional landing (marketing) webpage for new registrants"
+msgstr "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей"
 
-#: ../../addon/cart/Settings/Cart.php:90
-msgid "Base Merchant Currency"
-msgstr "Основная торговая валюта"
+#: ../../Zotlabs/Module/Admin/Site.php:541
+#, php-format
+msgid "Create this page first. Default is %s/register"
+msgstr "Создать эту страницу первой. По умолчанию %s/register"
 
-#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1375
-msgid "Cart Settings"
-msgstr "Настройки карточек"
+#: ../../Zotlabs/Module/Admin/Site.php:542
+msgid "Page to display after creating a new channel"
+msgstr "Страница для показа после создания нового канала"
 
-#: ../../addon/cart/cart.php:252
-msgid "DB Cleanup Failure"
-msgstr "Сбой очистки базы данных"
+#: ../../Zotlabs/Module/Admin/Site.php:542
+msgid "Default: profiles"
+msgstr "По умолчанию: profiles"
 
-#: ../../addon/cart/cart.php:674
-msgid "[cart] Item Added"
-msgstr "[cart] Элемент добавлен"
+#: ../../Zotlabs/Module/Admin/Site.php:543
+msgid "Optional: site location"
+msgstr "Необязательно: место размещения сайта"
 
-#: ../../addon/cart/cart.php:1063
-msgid "Order already checked out."
-msgstr "Заказ уже проверен."
+#: ../../Zotlabs/Module/Admin/Site.php:543
+msgid "Region or country"
+msgstr "Регион или страна"
 
-#: ../../addon/cart/cart.php:1368
-msgid "Drop database tables when uninstalling."
-msgstr "Сбросить таблицы базы данных при деинсталляции"
+#: ../../Zotlabs/Module/Admin/Site.php:628
+#: ../../Zotlabs/Module/Admin/Site.php:629
+msgid "Invalid 24h time value (hhmm/hmm)"
+msgstr "Неверное 24-часовое значение (допустимо \"ччмм\" или \"чмм\")"
 
-#: ../../addon/cart/cart.php:1387 ../../addon/cart/cart.php:1390
-msgid "Shop"
-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/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:52
-#: ../../Zotlabs/Module/Wiki.php:35
-msgid "Profile Unavailable."
-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 каналах код разрешён/запрещён"
 
-#: ../../addon/cart/cart.php:1547
-msgid "You must be logged into the Grid to shop."
-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/cart/cart.php:1594
-msgid "Access denied."
-msgstr "Доступ запрещён."
+#: ../../Zotlabs/Module/Admin/Channels.php:65
+msgid "Channel not found"
+msgstr "Канал не найден"
 
-#: ../../addon/cart/cart.php:1646 ../../addon/cart/cart.php:1789
-msgid "No Order Found"
-msgstr "Нет найденных заказов"
+#: ../../Zotlabs/Module/Admin/Channels.php:75
+#, php-format
+msgid "Channel '%s' deleted"
+msgstr "Канал '%s' удалён"
 
-#: ../../addon/cart/cart.php:1655
-msgid "An unknown error has occurred Please start again."
-msgstr "Произошла неизвестная ошибка. Пожалуйста, начните снова."
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' censored"
+msgstr "Канал '%s' цензурируется"
 
-#: ../../addon/cart/cart.php:1798
-msgid "Requirements not met."
-msgstr "Требования не соблюдены."
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' uncensored"
+msgstr "Канал '%s' нецензурируется"
 
-#: ../../addon/cart/cart.php:1798
-msgid "Review your order and complete any needed requirements."
-msgstr "Ÿросмотрите свой заказ и выполните все необходимые требования"
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code allowed"
+msgstr "Код в канале '%s' разрешён"
 
-#: ../../addon/cart/cart.php:1824
-msgid "Invalid Payment Type.  Please start again."
-msgstr "Недействительный тип платежа. Пожалуйста, начните снова."
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr "Код в канале '%s' запрещён"
 
-#: ../../addon/cart/cart.php:1831
-msgid "Order not found"
-msgstr "Заказ не найден"
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Module/Admin.php:116 ../../Zotlabs/Module/Manage.php:162
+#: ../../Zotlabs/Widget/Admin.php:29 ../../include/nav.php:99
+msgid "Channels"
+msgstr "Каналы"
 
-#: ../../addon/nofed/Mod_Nofed.php:21
-msgid "nofed Settings saved."
-msgstr "Настройки nofed сохранены."
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
+msgstr "выбрать все"
 
-#: ../../addon/nofed/Mod_Nofed.php:40
-msgid "Federate posts by default"
-msgstr "Разрешить федерацию публикаций по умолчанию"
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Censor"
+msgstr "Цензурировать"
 
-#: ../../addon/nofed/Mod_Nofed.php:48
-msgid "No Federation"
-msgstr "Отключить Federation"
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+#: ../../Zotlabs/Module/Directory.php:361
+msgid "Uncensor"
+msgstr "Нецензурировать"
 
-#: ../../addon/nofed/nofed.php:47
-msgid "Federate"
-msgstr "Федерировать"
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
+msgstr "Разрешить код"
 
-#: ../../addon/smileybutton/Mod_Smileybutton.php:42
-msgid "Hide the button and show the smilies directly."
-msgstr "Скрыть кнопку и сразу показывать смайлики."
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
+msgstr "Запретить код"
 
-#: ../../addon/smileybutton/Mod_Smileybutton.php:50
-msgid "Smileybutton Settings"
-msgstr "Настройки кнопки со смайликами"
+#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../Zotlabs/Lib/Apps.php:347
+#: ../../include/nav.php:425
+msgid "Channel"
+msgstr "Канал"
 
-#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2104
-msgid "file"
-msgstr "файл"
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
+msgstr ""
 
-#: ../../addon/redfiles/redfiles.php:119
-msgid "Redmatrix File Storage Import"
-msgstr "Импорт файлового хранилища Redmatrix"
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Oauth.php:111
+#: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Chat.php:255
+#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Sharedwithme.php:106
+#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144
+#: ../../Zotlabs/Storage/Browser.php:377
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:172
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:580
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_page_history.php:28
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:221
+msgid "Name"
+msgstr "Имя"
 
-#: ../../addon/redfiles/redfiles.php:120
-msgid "This will import all your Redmatrix cloud files to this channel."
-msgstr "Это позволит импортировать все ваши файлы в Redmatrix в этот канал."
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Cdav.php:1379
+#: ../../Zotlabs/Module/Locs.php:122 ../../Zotlabs/Module/Connedit.php:739
+msgid "Address"
+msgstr "Адрес"
 
-#: ../../addon/diaspora/diaspora.php:77
+#: ../../Zotlabs/Module/Admin/Channels.php:162
 msgid ""
-"Please install the statistics addon to be able to configure a diaspora relay"
-msgstr "Пожалуйста, установите расширение статистики, чтобы иметь возможность настраивать пересылку Diaspora"
-
-#: ../../addon/diaspora/diaspora.php:87
-msgid "Diaspora Relay Handle"
-msgstr "Пересылка Diaspora"
-
-#: ../../addon/diaspora/diaspora.php:87
-msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
-msgstr "Адрес пересылки Diaspora. Например: relay@diasporarelay.tld"
-
-#: ../../addon/diaspora/diaspora.php:107
-msgid "Diaspora relay could not be imported"
-msgstr "Невозможно импортировать адрес пересылки Diaspora"
-
-#: ../../addon/diaspora/diaspora.php:1027
-msgid "No subject"
-msgstr "Без темы"
-
-#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:337
-#: ../../addon/diaspora/util.php:350 ../../Zotlabs/Lib/Enotify.php:61
-msgid "$projectname"
-msgstr "$projectname"
-
-#: ../../addon/diaspora/import_diaspora.php:18
-msgid "No username found in import file."
-msgstr "Имя пользователя не найдено в файле для импорта."
-
-#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:77
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Не удалось создать уникальный адрес канала. Импорт не завершен."
-
-#: ../../addon/diaspora/import_diaspora.php:140
-msgid "Import completed."
-msgstr "Импорт завершен."
-
-#: ../../addon/diaspora/Mod_Diaspora.php:43
-msgid "Diaspora Protocol Settings updated."
-msgstr "Настройки протокола Diaspora обновлены."
+"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/diaspora/Mod_Diaspora.php:52
+#: ../../Zotlabs/Module/Admin/Channels.php:163
 msgid ""
-"The diaspora protocol does not support location independence. Connections "
-"you make within that network may be unreachable from alternate channel "
-"locations."
-msgstr "Протокол Diaspora не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала."
-
-#: ../../addon/diaspora/Mod_Diaspora.php:75
-msgid "Allow any Diaspora member to comment or like your public posts"
-msgstr "Разрешить любому участнику Diaspora комментировать или отмечать понравившимися ваши общедоступные сообщения"
+"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/diaspora/Mod_Diaspora.php:75
+#: ../../Zotlabs/Module/Admin/Security.php:89
 msgid ""
-"If this setting is disabled only your contacts will be able to comment or "
-"like your public posts"
-msgstr "Если этот параметр отключен, только ваши контакты смогут комментировать или лайкать ваши общедоступные сообщения"
-
-#: ../../addon/diaspora/Mod_Diaspora.php:79
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Предотвратить перенаправление тегов на другие сайты"
-
-#: ../../addon/diaspora/Mod_Diaspora.php:83
-msgid "Sign and forward posts and comments with no existing Diaspora signature"
-msgstr "Подписывать и отправлять публикации и комментарии с несуществующей подписью Diaspora"
-
-#: ../../addon/diaspora/Mod_Diaspora.php:88
-msgid "Followed hashtags (comma separated, do not include the #)"
-msgstr "Отслеживаемые теги (через запятую, исключая #)"
-
-#: ../../addon/diaspora/Mod_Diaspora.php:97
-msgid "Diaspora Protocol"
-msgstr "Протокол Diaspora"
-
-#: ../../addon/diaspora/Receiver.php:1579
-#, php-format
-msgid "%1$s dislikes %2$s's %3$s"
-msgstr "%1$s не нравится %2$s's %3$s"
-
-#: ../../addon/diaspora/Receiver.php:2208 ../../Zotlabs/Module/Like.php:487
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s посещает %2$s%3$s"
-
-#: ../../addon/diaspora/Receiver.php:2210 ../../Zotlabs/Module/Like.php:489
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s не посещает %2$s%3$s"
-
-#: ../../addon/diaspora/Receiver.php:2212 ../../Zotlabs/Module/Like.php:491
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s может посетить %2$s%3$s"
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
+msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."
 
-#: ../../addon/piwik/piwik.php:85
+#: ../../Zotlabs/Module/Admin/Security.php:92
 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>."
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"
 
-#: ../../addon/piwik/piwik.php:88
-#, php-format
+#: ../../Zotlabs/Module/Admin/Security.php:93
 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"
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr ""
 
-#: ../../addon/piwik/piwik.php:96
+#: ../../Zotlabs/Module/Admin/Security.php:94
 msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
-msgstr "Абсолютный путь к вашей установке Piwik (без типа протокола, с начальным слэшем)"
-
-#: ../../addon/piwik/piwik.php:97
-msgid "Site ID"
-msgstr "ID сайта"
-
-#: ../../addon/piwik/piwik.php:98
-msgid "Show opt-out cookie link?"
-msgstr "Показывать ссылку на отказ от использования cookies?"
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr "Все остальные встроенные материалы будут отфильтрованы, <strong>если</strong> встроенное содержимое с этого сайта явно заблокировано."
 
-#: ../../addon/piwik/piwik.php:99
-msgid "Asynchronous tracking"
-msgstr "Асинхронное отслеживание"
+#: ../../Zotlabs/Module/Admin/Security.php:99 ../../Zotlabs/Widget/Admin.php:30
+msgid "Security"
+msgstr "Безопасность"
 
-#: ../../addon/piwik/piwik.php:100
-msgid "Enable frontend JavaScript error tracking"
-msgstr "Включить отслеживание ошибок JavaScript на фронтенде."
+#: ../../Zotlabs/Module/Admin/Security.php:101
+msgid "Block public"
+msgstr "Блокировать публичный доступ"
 
-#: ../../addon/piwik/piwik.php:100
-msgid "This feature requires Piwik >= 2.2.0"
-msgstr "Эта функция требует версию Piwik >= 2.2.0"
+#: ../../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:222
-msgid "Workflow user."
-msgstr "Пользователь \"Рабочего процесса\"."
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid "Provide a cloud root directory"
+msgstr "Предоставить корневой каталог в облаке"
 
-#: ../../addon/workflow/workflow.php:272
-msgid "This channel"
-msgstr "Этот канал"
+#: ../../Zotlabs/Module/Admin/Security.php:102
+msgid ""
+"The cloud root directory lists all channel names which provide public files"
+msgstr "В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы"
 
-#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123
-msgid "Primary"
-msgstr "Основной"
+#: ../../Zotlabs/Module/Admin/Security.php:103
+msgid "Show total disk space available to cloud uploads"
+msgstr "Показывать общее доступное для загрузок место в хранилище"
 
-#: ../../addon/workflow/workflow.php:327
-msgid "Create New Workflow Item"
-msgstr "Создать новый элемент рабочего процесса"
+#: ../../Zotlabs/Module/Admin/Security.php:104
+msgid "Set \"Transport Security\" HTTP header"
+msgstr "Установить HTTP-заголовок \"Transport Security\""
 
-#: ../../addon/workflow/workflow.php:541 ../../addon/workflow/workflow.php:1437
-#: ../../addon/workflow/workflow.php:1456
-msgid "Workflow"
-msgstr "Рабочий процесс"
+#: ../../Zotlabs/Module/Admin/Security.php:105
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr "Установить HTTP-заголовок \"Content Security Policy\""
 
-#: ../../addon/workflow/workflow.php:1425
-msgid "No Workflows Available"
-msgstr "Нет доступных рабочих процессов"
+#: ../../Zotlabs/Module/Admin/Security.php:106
+msgid "Allowed email domains"
+msgstr "Разрешённые домены email"
 
-#: ../../addon/workflow/workflow.php:1455
-msgid "Add item to which workflow"
-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 разрешены. Если пусто то разрешены любые домены."
 
-#: ../../addon/workflow/workflow.php:1515
-#: ../../addon/workflow/workflow.php:1634
-msgid "Create Workflow Item"
-msgstr "Создать элемент рабочего процесса"
+#: ../../Zotlabs/Module/Admin/Security.php:107
+msgid "Not allowed email domains"
+msgstr "Запрещённые домены email"
 
-#: ../../addon/workflow/workflow.php:2596
-msgid "Link"
-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 разрешены. Если пусто то разрешены любые домены до тех пор, пока разрешённые домены не будут указаны."
 
-#: ../../addon/workflow/workflow.php:2598
-msgid "Web link."
-msgstr "Веб-ссылка."
+#: ../../Zotlabs/Module/Admin/Security.php:108
+msgid "Allow communications only from these sites"
+msgstr "Разрешить связь только с этими сайтами"
 
-#: ../../addon/workflow/workflow.php:2617
-#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374
-#: ../../Zotlabs/Module/Connedit.php:734
-msgid "Title"
-msgstr "Наименование"
+#: ../../Zotlabs/Module/Admin/Security.php:108
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr "Один сайт на строку. Оставьте пустым для разрешения взаимодействия без ограничений (по умочанию)."
 
-#: ../../addon/workflow/workflow.php:2619
-#: ../../addon/workflow/workflow.php:2680
-msgid "Brief description or title"
-msgstr "Подробное описание или заголовок"
+#: ../../Zotlabs/Module/Admin/Security.php:109
+msgid "Block communications from these sites"
+msgstr "Блокировать связь с этими сайтами"
 
-#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:26
-#: ../../Zotlabs/Lib/Apps.php:374
-msgid "Notes"
-msgstr "Записки"
+#: ../../Zotlabs/Module/Admin/Security.php:110
+msgid "Allow communications only from these channels"
+msgstr "Разрешить связь только для этих каналов"
 
-#: ../../addon/workflow/workflow.php:2627
-#: ../../addon/workflow/workflow.php:2688
-msgid "Notes and Info"
-msgstr "Замечания и информация"
+#: ../../Zotlabs/Module/Admin/Security.php:110
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
+msgstr "Один канал (или его хэш) на строку. Оставьте пустым для разрешения взаимодействия с любым каналом (по умолчанию)."
 
-#: ../../addon/workflow/workflow.php:2686
-msgid "Body"
-msgstr "Текст"
+#: ../../Zotlabs/Module/Admin/Security.php:111
+msgid "Block communications from these channels"
+msgstr "Блокировать связь с этими каналами"
 
-#: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:101
-msgid "Workflow Settings"
-msgstr "Настройки \"Рабочего процесса\""
+#: ../../Zotlabs/Module/Admin/Security.php:112
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr "Разрешать встраивание только для безопасных (SSL/TLS) сайтов и ссылок."
 
-#: ../../addon/donate/donate.php:21
-msgid "Project Servers and Resources"
-msgstr "Серверы и ресурсы проекта"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr "Разрешить  встраивать нефильтруемое HTML-содержимое только для этих доменов"
 
-#: ../../addon/donate/donate.php:22
-msgid "Project Creator and Tech Lead"
-msgstr "Создатель проекта и технический руководитель"
+#: ../../Zotlabs/Module/Admin/Security.php:113
+msgid "One site per line. By default embedded content is filtered."
+msgstr "Один сайт на строку. По умолчанию встраиваемое содержимое фильтруется."
 
-#: ../../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:114
+msgid "Block embedded HTML from these domains"
+msgstr "Блокировать встраивание HTML-содержимого для этих доменов"
 
-#: ../../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:115
+msgid "Allow SVG thumbnails in file browser"
+msgstr "Разрешить SVG миниатюры в просмотрщике файлов"
 
-#: ../../addon/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/Module/Admin/Security.php:115
+msgid "WARNING: SVG images may contain malicious code."
+msgstr "Внимание: изображения SVG могут содержать вредоносный код."
 
-#: ../../addon/donate/donate.php:54
-msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and "
-"privacy."
-msgstr "Помогите поддержать нашу новаторскую работу в областях децентрализации, веб-идентификации и конфиденциальности."
+#: ../../Zotlabs/Module/Admin/Security.php:116
+msgid "Allow embedded (inline) PDF files"
+msgstr "Разрешить встраивание для файлов PDF"
 
-#: ../../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/Admin/Logs.php:28
+msgid "Log settings updated."
+msgstr "Настройки журнала обновлены."
 
-#: ../../addon/donate/donate.php:59
-msgid "Donate"
-msgstr "Пожертвовать"
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:53
+#: ../../Zotlabs/Widget/Admin.php:63
+msgid "Logs"
+msgstr "Журналы"
 
-#: ../../addon/donate/donate.php:61
-msgid ""
-"Choose a project, developer, or public hub to support with a one-time "
-"donation"
-msgstr "Выберите проект, разработчика или общедоступный узел для поддержки в форме единоразового пожертвования"
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
+msgstr "Очистить"
 
-#: ../../addon/donate/donate.php:62
-msgid "Donate Now"
-msgstr "Пожертвовать сейчас"
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
+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/Logs.php:92
+msgid "Log file"
+msgstr "Файл журнала"
 
-#: ../../addon/donate/donate.php:64
+#: ../../Zotlabs/Module/Admin/Logs.php:92
 msgid ""
-"Please indicate if you would like your first name or full name (or nothing) "
-"to appear in our sponsor listing"
-msgstr "Пожалуйста, если желаете, укажите ваше имя для отображения в списке спонсоров."
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта."
 
-#: ../../addon/donate/donate.php:65
-msgid "Sponsor"
-msgstr "Спонсор"
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
+msgstr "Уровень журнала"
 
-#: ../../addon/donate/donate.php:68
-msgid "Special thanks to: "
-msgstr "Особые благодарности:"
+#: ../../Zotlabs/Module/Item.php:466 ../../Zotlabs/Module/Pin.php:36
+msgid "Unable to locate original post."
+msgstr "Не удалось найти оригинальную публикацию."
 
-#: ../../addon/likebanner/likebanner.php:51
-msgid "Your Webbie:"
-msgstr "Ваш Webbie:"
+#: ../../Zotlabs/Module/Item.php:751
+msgid "Empty post discarded."
+msgstr "Пустая публикация отклонена."
 
-#: ../../addon/likebanner/likebanner.php:54
-msgid "Fontsize (px):"
-msgstr "Размер шрифта (px):"
+#: ../../Zotlabs/Module/Item.php:1153
+msgid "Duplicate post suppressed."
+msgstr "Подавлена дублирующаяся публикация."
 
-#: ../../addon/likebanner/likebanner.php:68
-msgid "Link:"
-msgstr "Ссылка:"
+#: ../../Zotlabs/Module/Item.php:1296
+msgid "System error. Post not saved."
+msgstr "Системная ошибка. Публикация не сохранена."
 
-#: ../../addon/likebanner/likebanner.php:70
-msgid "Like us on Hubzilla"
-msgstr "Нравится на Hubzilla"
+#: ../../Zotlabs/Module/Item.php:1330
+msgid "Your comment is awaiting approval."
+msgstr "Ваш комментарий ожидает одобрения."
 
-#: ../../addon/likebanner/likebanner.php:72
-msgid "Embed:"
-msgstr "Встроить:"
+#: ../../Zotlabs/Module/Item.php:1463
+msgid "Unable to obtain post information from database."
+msgstr "Невозможно получить информацию о публикации из базы данных"
 
-#: ../../addon/opensearch/opensearch.php:26
+#: ../../Zotlabs/Module/Item.php:1470
 #, php-format
-msgctxt "opensearch"
-msgid "Search %1$s (%2$s)"
-msgstr "Искать %1$s (%2$s)"
-
-#: ../../addon/opensearch/opensearch.php:28
-msgctxt "opensearch"
-msgid "$Projectname"
-msgstr "$Projectname"
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."
 
-#: ../../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/Item.php:1477
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Вы достигли вашего ограничения в %1$.0f  страниц."
 
-#: ../../addon/opensearch/opensearch.php:43
-msgid "Search $Projectname"
-msgstr "Поиск $Projectname"
+#: ../../Zotlabs/Module/Sources.php:41
+msgid "Failed to create source. No channel selected."
+msgstr "Не удалось создать источник. Канал не выбран."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:22
-msgid "Fuzzloc Settings updated."
-msgstr "Настройки примерного положения обновлены."
+#: ../../Zotlabs/Module/Sources.php:57
+msgid "Source created."
+msgstr "Источник создан."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:38
-msgid "Minimum offset in meters"
-msgstr "Минимальное смещение в метрах"
+#: ../../Zotlabs/Module/Sources.php:70
+msgid "Source updated."
+msgstr "Источник обновлен."
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:42
-msgid "Maximum offset in meters"
-msgstr "Максимальное смещение в метрах"
+#: ../../Zotlabs/Module/Sources.php:99
+msgid "*"
+msgstr ""
 
-#: ../../addon/fuzzloc/Mod_Fuzzloc.php:51
-msgid "Fuzzy Location"
-msgstr "Примерное положение"
+#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:372
+msgid "Channel Sources"
+msgstr "Источники канала"
 
-#: ../../addon/hubwall/hubwall.php:19
-msgid "Send email to all members"
-msgstr "Отправить email всем участникам"
+#: ../../Zotlabs/Module/Sources.php:106
+msgid "Manage remote sources of content for your channel."
+msgstr "Управление удалённым источниками содержимого для вашего канала"
 
-#: ../../addon/hubwall/hubwall.php:33 ../../Zotlabs/Lib/Enotify.php:65
-#, php-format
-msgid "%s Administrator"
-msgstr "администратор %s"
+#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:117
+msgid "New Source"
+msgstr "Новый источник"
 
-#: ../../addon/hubwall/hubwall.php:50 ../../addon/mailtest/mailtest.php:50
-msgid "No recipients found."
-msgstr "Получателей не найдено."
+#: ../../Zotlabs/Module/Sources.php:118 ../../Zotlabs/Module/Sources.php:152
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Импортировать всё или выбранное содержимое из следующего канала в этот канал и распределить его в соответствии с вашими настройками."
 
-#: ../../addon/hubwall/hubwall.php:73
-#, php-format
-msgid "%1$d of %2$d messages sent."
-msgstr "%1$d из %2$d сообщений отправлено."
+#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
+msgid "Only import content with these words (one per line)"
+msgstr "Импортировать содержимое только с этим текстом (построчно)"
 
-#: ../../addon/hubwall/hubwall.php:81
-msgid "Send email to all hub members."
-msgstr "Отправить email всем участникам узла."
+#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
+msgid "Leave blank to import all public content"
+msgstr "Оставьте пустым для импорта всего общедоступного содержимого"
 
-#: ../../addon/hubwall/hubwall.php:92 ../../addon/mailtest/mailtest.php:96
-msgid "Message subject"
-msgstr "Тема сообщения"
+#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:159
+msgid "Channel Name"
+msgstr "Название канала"
 
-#: ../../addon/hubwall/hubwall.php:93
-msgid "Sender Email address"
-msgstr "Адрес электронной почты отправителя"
+#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Добавить следующие категории к импортированным публикациям из этого источника (через запятые)"
 
-#: ../../addon/hubwall/hubwall.php:94
-msgid "Test mode (only send to hub administrator)"
-msgstr "Тестовый режим (отправка только администратору узла)"
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+msgid "Resend posts with this channel as author"
+msgstr "Отправить публикации в этот канал повторно как автор"
 
-#: ../../addon/notifyadmin/notifyadmin.php:34
-msgid "New registration"
-msgstr "Новая регистрация"
+#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
+msgid "Copyrights may apply"
+msgstr "Могут применяться авторские права"
 
-#: ../../addon/notifyadmin/notifyadmin.php:40
-#: ../../Zotlabs/Module/Invite.php:252
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Доставка сообщения не удалась."
+#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Sources.php:172
+msgid "Source not found."
+msgstr "Источник не найден."
 
-#: ../../addon/notifyadmin/notifyadmin.php:42
-#, php-format
-msgid "Message sent to %s. New account registration: %s"
-msgstr "Сообщение отправлено в %s. Регистрация нового аккаунта: %s"
+#: ../../Zotlabs/Module/Sources.php:149
+msgid "Edit Source"
+msgstr "Редактировать источник"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:225
-msgid "Not allowed."
-msgstr "Запрещено."
+#: ../../Zotlabs/Module/Sources.php:150
+msgid "Delete Source"
+msgstr "Удалить источник"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:261
-#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:239
-#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:682
-#: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Thing.php:321
-#: ../../Zotlabs/Module/Thing.php:374
-msgid "Permissions"
-msgstr "Разрешения"
+#: ../../Zotlabs/Module/Sources.php:180
+msgid "Source removed"
+msgstr "Источник удален"
 
-#: ../../addon/flashcards/Mod_Flashcards.php:268
-#: ../../Zotlabs/Module/Filestorage.php:202
-msgid "Set/edit permissions"
-msgstr "Редактировать разрешения"
+#: ../../Zotlabs/Module/Sources.php:182
+msgid "Unable to remove source."
+msgstr "Невозможно удалить источник."
 
-#: ../../addon/flashcards/Mod_Flashcards.php:291
-#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3804
-#: ../../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:53
-#: ../../Zotlabs/Module/Display.php:428 ../../Zotlabs/Module/Admin.php:61
-#: ../../Zotlabs/Module/Thing.php:96
-msgid "Item not found."
-msgstr "Элемент не найден."
+#: ../../Zotlabs/Module/Acl.php:123 ../../Zotlabs/Module/Lockview.php:143
+#: ../../Zotlabs/Module/Lockview.php:184
+msgctxt "acl"
+msgid "Profile"
+msgstr "Профиль"
 
-#: ../../addon/libertree/libertree.php:43
-msgid "Post to Libertree"
-msgstr "Опубликовать в Libertree"
+#: ../../Zotlabs/Module/Acl.php:370
+msgid "network"
+msgstr "сеть"
 
-#: ../../addon/libertree/Mod_Libertree.php:25
-msgid "Libertree Crosspost Connector Settings saved."
-msgstr "Настройки пересылки публикаций Libertree сохранены."
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:89
+#: ../../Zotlabs/Module/Import_items.php:116 ../../Zotlabs/Module/Share.php:72
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55
+#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Group.php:108
+#: ../../Zotlabs/Module/Cloud.php:123 ../../Zotlabs/Web/WebServer.php:116
+#: ../../include/items.php:441
+#: ../../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/libertree/Mod_Libertree.php:49
-msgid "Libertree API token"
-msgstr "Токен Libertree API"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Неверный идентификатор профиля"
 
-#: ../../addon/libertree/Mod_Libertree.php:53
-msgid "Libertree site URL"
-msgstr "URL сайта Libertree"
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr "Редактор видимости профиля"
 
-#: ../../addon/libertree/Mod_Libertree.php:57
-msgid "Post to Libertree by default"
-msgstr "Публиковать в Libertree по умолчанию"
+#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:366
+#: ../../include/channel.php:1879
+msgid "Profile"
+msgstr "Профиль"
 
-#: ../../addon/libertree/Mod_Libertree.php:65
-msgid "Libertree Crosspost Connector"
-msgstr "Пересылка публикаций Libertree"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr "Нажмите на контакт, чтобы добавить или удалить."
 
-#: ../../addon/randpost/randpost.php:99
-msgid "You're welcome."
-msgstr "Пожалуйста."
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
+msgstr "Видно"
 
-#: ../../addon/randpost/randpost.php:100
-msgid "Ah shucks..."
-msgstr "О, чёрт..."
+#: ../../Zotlabs/Module/Profperm.php:140
+#: ../../Zotlabs/Module/Connections.php:218
+msgid "All Connections"
+msgstr "Все контакты"
 
-#: ../../addon/randpost/randpost.php:101
-msgid "Don't mention it."
-msgstr "Не стоит благодарности."
+#: ../../Zotlabs/Module/Poke.php:197 ../../Zotlabs/Lib/Apps.php:355
+#: ../../include/conversation.php:1165
+msgid "Poke"
+msgstr "Ткнуть"
 
-#: ../../addon/randpost/randpost.php:102
-msgid "&lt;blush&gt;"
-msgstr "&lt;краснею&gt;"
+#: ../../Zotlabs/Module/Poke.php:198
+msgid "Poke somebody"
+msgstr "Ткнуть кого-нибудь"
 
-#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:332
-msgid "Report Bug"
-msgstr "Сообщить об ошибке"
+#: ../../Zotlabs/Module/Poke.php:201
+msgid "Poke/Prod"
+msgstr "Толкнуть / подтолкнуть"
 
-#: ../../addon/totp/Mod_Totp.php:32
-msgid "TOTP Two-Step Verification"
-msgstr "Двухэтапная верификация TOTP"
+#: ../../Zotlabs/Module/Poke.php:202
+msgid "Poke, prod or do other things to somebody"
+msgstr "Толкнуть, подтолкнуть или сделать что-то ещё с кем-то"
 
-#: ../../addon/totp/Mod_Totp.php:33
-msgid "Enter the 2-step verification generated by your authenticator app:"
-msgstr "Введите код проверки, созданный вашим приложением для аутентификации"
+#: ../../Zotlabs/Module/Poke.php:209
+msgid "Recipient"
+msgstr "Получатель"
 
-#: ../../addon/totp/Mod_Totp.php:34
-msgid "Success!"
-msgstr "Успех!"
+#: ../../Zotlabs/Module/Poke.php:210
+msgid "Choose what you wish to do to recipient"
+msgstr "Выбрать что вы хотите сделать с получателем"
 
-#: ../../addon/totp/Mod_Totp.php:35
-msgid "Invalid code, please try again."
-msgstr "Неверный код. Пожалуйста, попробуйте ещё раз."
+#: ../../Zotlabs/Module/Poke.php:213 ../../Zotlabs/Module/Poke.php:214
+msgid "Make this post private"
+msgstr "Сделать эту публикацию частной"
 
-#: ../../addon/totp/Mod_Totp.php:36
-msgid "Too many invalid codes..."
-msgstr "Слишком много неверных кодов..."
+#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214
+#: ../../Zotlabs/Module/Profiles.php:643
+msgid "Profile not found."
+msgstr "Профиль не найден."
 
-#: ../../addon/totp/Mod_Totp.php:37
-msgid "Verify"
-msgstr "Проверить"
+#: ../../Zotlabs/Module/Profiles.php:46
+msgid "Profile deleted."
+msgstr "Профиль удален."
 
-#: ../../addon/totp/Settings/Totp.php:92
-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/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
+msgid "Profile-"
+msgstr "Профиль -"
 
-#: ../../addon/totp/Settings/Totp.php:95
-msgid "Your TOTP secret is"
-msgstr "Ваш секретный код TOTP"
+#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
+msgid "New profile created."
+msgstr "Новый профиль создан."
 
-#: ../../addon/totp/Settings/Totp.php:96
-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/Profiles.php:113
+msgid "Profile unavailable to clone."
+msgstr "Профиль недоступен для клонирования."
 
-#: ../../addon/totp/Settings/Totp.php:101
-msgid "Test"
-msgstr "Тест"
+#: ../../Zotlabs/Module/Profiles.php:148
+msgid "Profile unavailable to export."
+msgstr "Профиль недоступен для экспорта."
 
-#: ../../addon/totp/Settings/Totp.php:102
-msgid "Generate New Secret"
-msgstr "Сгенерировать новый код"
+#: ../../Zotlabs/Module/Profiles.php:225
+msgid "Profile Name is required."
+msgstr "Требуется имя профиля."
 
-#: ../../addon/totp/Settings/Totp.php:103
-msgid "Go"
-msgstr "Вперёд"
+#: ../../Zotlabs/Module/Profiles.php:430
+msgid "Marital Status"
+msgstr "Семейное положение"
 
-#: ../../addon/totp/Settings/Totp.php:104
-msgid "Enter your password"
-msgstr "Введите ваш пароль"
+#: ../../Zotlabs/Module/Profiles.php:434
+msgid "Romantic Partner"
+msgstr "Романтический партнер"
 
-#: ../../addon/totp/Settings/Totp.php:105
-msgid "enter TOTP code from your device"
-msgstr "введите код TOTP из вашего устройства"
+#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:789
+msgid "Likes"
+msgstr "Нравится"
 
-#: ../../addon/totp/Settings/Totp.php:106
-msgid "Pass!"
-msgstr "Принято!"
+#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:790
+msgid "Dislikes"
+msgstr "Не нравится"
 
-#: ../../addon/totp/Settings/Totp.php:107
-msgid "Fail"
-msgstr "Отказано"
+#: ../../Zotlabs/Module/Profiles.php:446 ../../Zotlabs/Module/Profiles.php:797
+msgid "Work/Employment"
+msgstr "Работа / Занятость"
 
-#: ../../addon/totp/Settings/Totp.php:108
-msgid "Incorrect password, try again."
-msgstr "Неверный пароль, попробуйте снова."
+#: ../../Zotlabs/Module/Profiles.php:449
+msgid "Religion"
+msgstr "Религия"
 
-#: ../../addon/totp/Settings/Totp.php:109
-msgid "Record your new TOTP secret and rescan the QR code above."
-msgstr "Запишите ваш секретный код TOTP и повторно отсканируйте приведенный ниже QR-код."
+#: ../../Zotlabs/Module/Profiles.php:453
+msgid "Political Views"
+msgstr "Политические взгляды"
 
-#: ../../addon/totp/Settings/Totp.php:117
-msgid "TOTP Settings"
-msgstr "Настройки TOTP"
+#: ../../Zotlabs/Module/Profiles.php:457
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:74
+msgid "Gender"
+msgstr "Гендер"
 
-#: ../../addon/logrot/logrot.php:36
-msgid "Logfile archive directory"
-msgstr "Каталог архивирования журнала"
+#: ../../Zotlabs/Module/Profiles.php:461
+msgid "Sexual Preference"
+msgstr "Сексуальная ориентация"
 
-#: ../../addon/logrot/logrot.php:36
-msgid "Directory to store rotated logs"
-msgstr "Каталог для хранения заархивированных журналов"
+#: ../../Zotlabs/Module/Profiles.php:465
+msgid "Homepage"
+msgstr "Домашняя страница"
 
-#: ../../addon/logrot/logrot.php:37
-msgid "Logfile size in bytes before rotating"
-msgstr "Размер файла журнала в байтах для архивирования"
+#: ../../Zotlabs/Module/Profiles.php:469
+msgid "Interests"
+msgstr "Интересы"
 
-#: ../../addon/logrot/logrot.php:38
-msgid "Number of logfiles to retain"
-msgstr "Количество сохраняемых файлов журналов"
+#: ../../Zotlabs/Module/Profiles.php:480 ../../Zotlabs/Module/Profiles.php:751
+#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Pubsites.php:52 ../../include/js_strings.php:25
+msgid "Location"
+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:577
+msgid "Profile updated."
+msgstr "Профиль обновлен."
 
-#: ../../addon/testdrive/testdrive.php:105
-msgid "Your $Productname test account is about to expire."
-msgstr "Ваша тестовая учётная запись в $Productname близка к окончанию срока действия."
+#: ../../Zotlabs/Module/Profiles.php:673
+msgid "Hide my connections from viewers of this profile"
+msgstr "Скрыть мои контакты от просматривающих этот профиль"
 
-#: ../../addon/hideaside/Mod_Hideaside.php:28
-msgid "Hide Aside App"
-msgstr "Скрывать приложения"
+#: ../../Zotlabs/Module/Profiles.php:686
+msgid "Publish my default profile in the network directory"
+msgstr "Опубликовать мой профиль по умолчанию в каталоге сети"
 
-#: ../../addon/hideaside/Mod_Hideaside.php:29
-msgid "Fade out aside areas after a while when using endless scroll"
-msgstr "Через некоторое время при использовании прокрутки область приложений исчезает"
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Suggest me as a potential contact to new members"
+msgstr "Предлагать меня как потенциальный новый контакт для новых участников"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:38
-msgid "Some setting"
-msgstr "Некоторые настройки"
+#: ../../Zotlabs/Module/Profiles.php:698
+msgid "Reveal my online status"
+msgstr "Показать мой статус в сети"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:38
-msgid "A setting"
-msgstr "Настройка"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Edit Profile Details"
+msgstr "Редактирование профиля"
 
-#: ../../addon/skeleton/Mod_Skeleton.php:46
-msgid "Skeleton Settings"
-msgstr "Настройки скелета"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "View this profile"
+msgstr "Посмотреть этот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:104
-#: ../../addon/socialauth/Mod_SocialAuth.php:176
-msgid "Network error"
-msgstr "Сетевая ошибка"
+#: ../../Zotlabs/Module/Profiles.php:742 ../../Zotlabs/Module/Profiles.php:846
+#: ../../include/channel.php:1553
+msgid "Edit visibility"
+msgstr "Редактировать видимость"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:108
-#: ../../addon/socialauth/Mod_SocialAuth.php:180
-msgid "API error"
-msgstr "Ошибка API"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Profile Tools"
+msgstr "Инструменты профиля"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:112
-#: ../../addon/socialauth/Mod_SocialAuth.php:184
-msgid "Unknown issue"
-msgstr "Неизвестная проблема"
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Change cover photo"
+msgstr "Изменить фотографию обложки"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:168
-msgid "Unable to login using email address "
-msgstr "Невозможно войти, используя адрес электронной почты "
+#: ../../Zotlabs/Module/Profiles.php:745 ../../include/channel.php:1523
+msgid "Change profile photo"
+msgstr "Изменить фотографию профиля"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:205
-msgid "Social Authentication using your social media account"
-msgstr "Social Authentication с использованием вашей учетной записи в социальных сетях"
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Create a new profile using these settings"
+msgstr "Создать новый профиль с теми же настройками"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:209
-msgid ""
-"This app enables one or more social provider sign-in buttons on the login "
-"page."
-msgstr "Это приложение добавляет на странице входа в систему одну или несколько кнопок для аутентификации при помощи учётных записей в социальных сетях"
+#: ../../Zotlabs/Module/Profiles.php:747
+msgid "Clone this profile"
+msgstr "Клонировать этот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:227
-msgid "Add an identity provider"
-msgstr "Добавить провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Delete this profile"
+msgstr "Удалить этот профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:254
-msgid "Enable "
-msgstr "Включить "
+#: ../../Zotlabs/Module/Profiles.php:749
+msgid "Add profile things"
+msgstr "Добавить в профиль"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:261
-msgid "Key"
-msgstr "Ключ"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "Basic"
+msgstr "Основной"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:261
-#: ../../addon/socialauth/Mod_SocialAuth.php:266
-#: ../../addon/socialauth/Mod_SocialAuth.php:282
-#: ../../addon/socialauth/Mod_SocialAuth.php:295
-msgid "Word"
-msgstr "Слово"
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Relationship"
+msgstr "Отношения"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:266
-msgid "Secret"
-msgstr "Секрет"
+#: ../../Zotlabs/Module/Profiles.php:753 ../../Zotlabs/Widget/Newmember.php:56
+#: ../../include/datetime.php:58
+msgid "Miscellaneous"
+msgstr "Прочее"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:295
-msgid "Add a custom provider"
-msgstr "Добавить собственного провайдера"
+#: ../../Zotlabs/Module/Profiles.php:755
+msgid "Import profile from file"
+msgstr "Импортировать профиль из файла"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:315
-msgid "Remove an identity provider"
-msgstr "Удалить провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Export profile to file"
+msgstr "Экспортировать профиль в файл"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:325
-msgid "Social authentication"
-msgstr "Аутентификация в социальных сетях"
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Your gender"
+msgstr "Ваш пол"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:364
-msgid "Error while saving provider settings"
-msgstr "Ошибка при сохранении настроек провайдера идентификации"
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Marital status"
+msgstr "Семейное положение"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:380
-msgid "Custom provider already exists"
-msgstr "Собственный провайдер уже существует"
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Sexual preference"
+msgstr "Сексуальная ориентация"
 
-#: ../../addon/socialauth/Mod_SocialAuth.php:397
-msgid "Social authentication settings saved."
-msgstr "Настройки Social authentication сохранены."
+#: ../../Zotlabs/Module/Profiles.php:762
+msgid "Profile name"
+msgstr "Имя профиля"
 
-#: ../../addon/nsfw/nsfw.php:152
-msgid "Possible adult content"
-msgstr "Возможно содержимое для взрослых"
+#: ../../Zotlabs/Module/Profiles.php:764
+msgid "This is your default profile."
+msgstr "Это ваш профиль по умолчанию."
 
-#: ../../addon/nsfw/nsfw.php:167
-#, php-format
-msgid "%s - view"
-msgstr "%s -  просмотр"
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Your full name"
+msgstr "Ваше полное имя"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:22
-msgid "NSFW Settings saved."
-msgstr "Настройки NSFW сохранены."
+#: ../../Zotlabs/Module/Profiles.php:767
+msgid "Short title/description"
+msgstr "Краткий заголовок или наименование"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:42
-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:767
+msgid "Maximal 190 characters"
+msgstr "Не более 190 символов"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:47
-msgid "Comma separated list of keywords to hide"
-msgstr "Список ключевых слов для скрытия, через запятую"
+#: ../../Zotlabs/Module/Profiles.php:770
+msgid "Street address"
+msgstr "Улица, дом, квартира"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:47
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
-msgstr "слово, /регулярное_выражение/, lang=xx, lang!=xx"
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Locality/City"
+msgstr "Населенный пункт / город"
 
-#: ../../addon/nsfw/Mod_Nsfw.php:56
-msgid "NSFW"
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Region/State"
+msgstr "Регион / Область"
 
-#: ../../addon/upload_limits/upload_limits.php:25
-msgid "Show Upload Limits"
-msgstr "Показать ограничения на загрузку"
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Postal/Zip code"
+msgstr "Почтовый индекс"
 
-#: ../../addon/upload_limits/upload_limits.php:27
-msgid "Hubzilla configured maximum size: "
-msgstr "Максимальный размер настроенный в Hubzilla:"
+#: ../../Zotlabs/Module/Profiles.php:774 ../../Zotlabs/Module/Cdav.php:1397
+#: ../../Zotlabs/Module/Connedit.php:757
+msgid "Country"
+msgstr "Страна"
 
-#: ../../addon/upload_limits/upload_limits.php:28
-msgid "PHP upload_max_filesize: "
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Who (if applicable)"
+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:779
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
 
-#: ../../addon/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Tic-Tac-Toe в трёх измерениях"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Since (date)"
+msgstr "С (дата)"
 
-#: ../../addon/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
-msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:783
+msgid "Tell us about yourself"
+msgstr "Расскажите нам о себе"
 
-#: ../../addon/tictac/tictac.php:59
-msgid "New game"
-msgstr "Новая игра"
+#: ../../Zotlabs/Module/Profiles.php:784
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr "URL домашней страницы"
 
-#: ../../addon/tictac/tictac.php:60
-msgid "New game with handicap"
-msgstr "Новая игра с форой"
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Hometown"
+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:786
+msgid "Political views"
+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:787
+msgid "Religious views"
+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:788
+msgid "Keywords used in directory listings"
+msgstr "Ключевые слова для участия в каталоге"
 
-#: ../../addon/tictac/tictac.php:183
-msgid "You go first..."
-msgstr "Вы начинаете..."
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Example: fishing photography software"
+msgstr "Например: fishing photography software"
 
-#: ../../addon/tictac/tictac.php:188
-msgid "I'm going first this time..."
-msgstr "На этот раз начинаю я..."
+#: ../../Zotlabs/Module/Profiles.php:791
+msgid "Musical interests"
+msgstr "Музыкальные интересы"
 
-#: ../../addon/tictac/tictac.php:194
-msgid "You won!"
-msgstr "Вы выиграли!"
+#: ../../Zotlabs/Module/Profiles.php:792
+msgid "Books, literature"
+msgstr "Книги, литература"
 
-#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225
-msgid "\"Cat\" game!"
-msgstr "Ничья!"
+#: ../../Zotlabs/Module/Profiles.php:793
+msgid "Television"
+msgstr "Телевидение"
 
-#: ../../addon/tictac/tictac.php:223
-msgid "I won!"
-msgstr "Я выиграл!"
+#: ../../Zotlabs/Module/Profiles.php:794
+msgid "Film/Dance/Culture/Entertainment"
+msgstr "Кино / танцы / культура / развлечения"
 
-#: ../../addon/mailtest/mailtest.php:19
-msgid "Send test email"
-msgstr "Отправить тестовый email"
+#: ../../Zotlabs/Module/Profiles.php:795
+msgid "Hobbies/Interests"
+msgstr "Хобби / интересы"
 
-#: ../../addon/mailtest/mailtest.php:66
-msgid "Mail sent."
-msgstr "Сообщение отправлено"
+#: ../../Zotlabs/Module/Profiles.php:796
+msgid "Love/Romance"
+msgstr "Любовь / романтические отношения"
 
-#: ../../addon/mailtest/mailtest.php:68
-msgid "Sending of mail failed."
-msgstr "Не удалось отправить сообщение."
+#: ../../Zotlabs/Module/Profiles.php:798
+msgid "School/Education"
+msgstr "Школа / образование"
 
-#: ../../addon/mailtest/mailtest.php:77
-msgid "Mail Test"
-msgstr "Тестовое сообщение"
+#: ../../Zotlabs/Module/Profiles.php:799
+msgid "Contact information and social networks"
+msgstr "Информация и социальные сети для связи"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:53
-msgid "Livejournal username"
-msgstr "Имя пользователя Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:800
+msgid "My other channels"
+msgstr "Мои другие контакты"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:57
-msgid "Livejournal password"
-msgstr "Пароль Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:842 ../../include/channel.php:1549
+msgid "Profile Image"
+msgstr "Изображение профиля"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:61
-msgid "Post to Livejournal by default"
-msgstr "Публиковать в Livejournal по умолчанию"
+#: ../../Zotlabs/Module/Profiles.php:852 ../../include/channel.php:1530
+#: ../../include/nav.php:114
+msgid "Edit Profiles"
+msgstr "Редактирование профилей"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:65
-msgid "Send wall-to-wall posts to Livejournal"
-msgstr "Отправлять публикации на стене в Livejournal"
+#: ../../Zotlabs/Module/Profiles.php:853 ../../Zotlabs/Module/Manage.php:137
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:217
+msgid "Create New"
+msgstr "Создать новый"
 
-#: ../../addon/ljpost/Mod_Ljpost.php:77
-msgid "Livejournal Crosspost Connector"
-msgstr "Публикация в Livejournal"
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "Blocked accounts"
+msgstr "Заблокированные аккаунты"
 
-#: ../../addon/ljpost/ljpost.php:49
-msgid "Post to Livejournal"
-msgstr "Опубликовать в Livejournal"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "Expired accounts"
+msgstr "Просроченные аккаунты"
 
-#: ../../addon/ljpost/ljpost.php:127
-msgid "Posted by"
-msgstr "Опубликовано"
+#: ../../Zotlabs/Module/Admin.php:98
+msgid "Expiring accounts"
+msgstr "Близкие к просрочке аккаунты"
 
-#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2166
-#: ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214
-#: ../../Zotlabs/Module/Wiki.php:368
-msgid "Markdown"
-msgstr "Разметка Markdown"
+#: ../../Zotlabs/Module/Admin.php:122
+msgid "Message queues"
+msgstr "Очередь сообщений"
 
-#: ../../addon/mdpost/mdpost.php:42
-msgid "Use markdown for editing posts"
-msgstr "Использовать язык разметки Markdown для редактирования публикаций"
+#: ../../Zotlabs/Module/Admin.php:136
+msgid "Your software should be updated"
+msgstr "Ваше программное обеспечение должно быть обновлено"
 
-#: ../../addon/hzfiles/hzfiles.php:81
-msgid "Hubzilla File Storage Import"
-msgstr "Импорт файлового хранилища Hubzilla"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Summary"
+msgstr "Резюме"
 
-#: ../../addon/hzfiles/hzfiles.php:82
-msgid "This will import all your cloud files from another server."
-msgstr "Это позволит импортировать все ваши файлы с другого сервера."
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Registered accounts"
+msgstr "Зарегистрированные аккаунты"
 
-#: ../../addon/hzfiles/hzfiles.php:83
-msgid "Hubzilla Server base URL"
-msgstr "Базовый URL сервера Hubzilla"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Pending registrations"
+msgstr "Ждут утверждения"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:30
-msgid ""
-"Allow magic authentication only to websites of your immediate connections"
-msgstr "Разрешить волшебную аутентификацию только на сайтах ваших непосредственных соединений"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Registered channels"
+msgstr "Зарегистрированные каналы"
 
-#: ../../addon/authchoose/Mod_Authchoose.php:36
-msgid "Authchoose"
-msgstr ""
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Active addons"
+msgstr "Активные расширения"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:22
-msgid "pageheader Settings saved."
-msgstr "Настройки шапки страницы сохранены."
+#: ../../Zotlabs/Module/Admin.php:148
+msgid "Version"
+msgstr "Версия системы"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:41
-msgid "Message to display on every page on this server"
-msgstr "Отображаемое сообщение на каждой странице на этом сервере."
+#: ../../Zotlabs/Module/Admin.php:149
+msgid "Repository version (master)"
+msgstr "Версия репозитория (master)"
 
-#: ../../addon/pageheader/Mod_Pageheader.php:49
-msgid "Page Header"
-msgstr "Заголовок страницы"
+#: ../../Zotlabs/Module/Admin.php:150
+msgid "Repository version (dev)"
+msgstr "Версия репозитория (dev)"
 
-#: ../../addon/irc/Mod_Irc.php:23 ../../addon/irc/irc.php:41
-msgid "Popular Channels"
-msgstr "Популярные каналы"
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
+msgstr "Тег удалён"
 
-#: ../../addon/irc/irc.php:37
-msgid "Channels to auto connect"
-msgstr "Каналы для автоматического подключения"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
+msgstr "Удалить тег элемента"
 
-#: ../../addon/irc/irc.php:37 ../../addon/irc/irc.php:41
-msgid "Comma separated list"
-msgstr "Список, разделённый запятыми"
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
+msgstr "Выбрать тег для удаления:"
 
-#: ../../addon/irc/irc.php:45
-msgid "IRC Settings"
-msgstr "Настройки IRC"
+#: ../../Zotlabs/Module/Connections.php:58
+#: ../../Zotlabs/Module/Connections.php:116
+#: ../../Zotlabs/Module/Connections.php:282
+msgid "Active"
+msgstr "Активен"
 
-#: ../../addon/irc/irc.php:54
-msgid "IRC settings saved."
-msgstr "Настройки IRC сохранены"
+#: ../../Zotlabs/Module/Connections.php:63
+#: ../../Zotlabs/Module/Connections.php:182
+#: ../../Zotlabs/Module/Connections.php:287
+msgid "Blocked"
+msgstr "Заблокирован"
 
-#: ../../addon/irc/irc.php:58
-msgid "IRC Chatroom"
-msgstr "Чат IRC"
+#: ../../Zotlabs/Module/Connections.php:68
+#: ../../Zotlabs/Module/Connections.php:189
+#: ../../Zotlabs/Module/Connections.php:286
+msgid "Ignored"
+msgstr "Игнорируется"
 
-#: ../../addon/xmpp/xmpp.php:44
-msgid "Jabber BOSH host"
-msgstr "Узел Jabber BOSH"
+#: ../../Zotlabs/Module/Connections.php:73
+#: ../../Zotlabs/Module/Connections.php:203
+#: ../../Zotlabs/Module/Connections.php:285
+msgid "Hidden"
+msgstr "Скрыт"
 
-#: ../../addon/xmpp/xmpp.php:45
-msgid "Use central userbase"
-msgstr "Использовать центральную базу данных"
+#: ../../Zotlabs/Module/Connections.php:78
+#: ../../Zotlabs/Module/Connections.php:196
+msgid "Archived/Unreachable"
+msgstr "Заархивировано / недоступно"
 
-#: ../../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/Connections.php:83
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Notifications.php:101 ../../Zotlabs/Module/Menu.php:180
+msgid "New"
+msgstr "Новые"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:23
-msgid "XMPP settings updated."
-msgstr "Настройки XMPP обновлены."
+#: ../../Zotlabs/Module/Connections.php:97
+#: ../../Zotlabs/Module/Connections.php:111
+#: ../../Zotlabs/Module/Contactedit.php:299
+#: ../../Zotlabs/Module/Connedit.php:583 ../../Zotlabs/Widget/Affinity.php:40
+msgid "All"
+msgstr "Все"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:35
-msgid "XMPP App"
-msgstr "Приложение XMPP"
+#: ../../Zotlabs/Module/Connections.php:158
+msgid "Active Connections"
+msgstr "Активные контакты"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:36
-msgid "Embedded XMPP (Jabber) client"
-msgstr "Встренный клиент XMPP (Jabber)"
+#: ../../Zotlabs/Module/Connections.php:161
+msgid "Show active connections"
+msgstr "Показать активные контакты"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:52
-msgid "Individual credentials"
-msgstr "Индивидуальные разрешения"
+#: ../../Zotlabs/Module/Connections.php:165
+#: ../../Zotlabs/Widget/Notifications.php:95
+msgid "New Connections"
+msgstr "Новые контакты"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:58
-msgid "Jabber BOSH server"
-msgstr "Сервер Jabber BOSH"
+#: ../../Zotlabs/Module/Connections.php:168
+msgid "Show pending (new) connections"
+msgstr "Просмотр (новых) ожидающих контактов"
 
-#: ../../addon/xmpp/Mod_Xmpp.php:67
-msgid "XMPP Settings"
-msgstr "Настройки XMPP"
+#: ../../Zotlabs/Module/Connections.php:185
+msgid "Only show blocked connections"
+msgstr "Показать только заблокированные контакты"
 
-#: ../../include/text.php:525
-msgid "prev"
-msgstr "предыдущий"
+#: ../../Zotlabs/Module/Connections.php:192
+msgid "Only show ignored connections"
+msgstr "Показать только проигнорированные контакты"
 
-#: ../../include/text.php:527
-msgid "first"
-msgstr "первый"
+#: ../../Zotlabs/Module/Connections.php:199
+msgid "Only show archived/unreachable connections"
+msgstr "Показать только заархивированные / недоступные контакты"
 
-#: ../../include/text.php:556
-msgid "last"
-msgstr "последний"
+#: ../../Zotlabs/Module/Connections.php:206
+msgid "Only show hidden connections"
+msgstr "Показать только скрытые контакты"
 
-#: ../../include/text.php:559
-msgid "next"
-msgstr "следующий"
+#: ../../Zotlabs/Module/Connections.php:221
+msgid "Show all connections"
+msgstr "Просмотр всех контактов"
 
-#: ../../include/text.php:577
-msgid "older"
-msgstr "старше"
+#: ../../Zotlabs/Module/Connections.php:283
+msgid "Pending approval"
+msgstr "Ожидающие подтверждения"
 
-#: ../../include/text.php:579
-msgid "newer"
-msgstr "новее"
+#: ../../Zotlabs/Module/Connections.php:284
+msgid "Archived"
+msgstr "Зархивирован"
 
-#: ../../include/text.php:1033 ../../include/features.php:133
-#: ../../Zotlabs/Module/Connections.php:390 ../../Zotlabs/Lib/Apps.php:337
-msgid "Connections"
-msgstr "Контакты"
+#: ../../Zotlabs/Module/Connections.php:288
+msgid "Not connected at this location"
+msgstr "Не подключено в этом месте"
 
-#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:80
 #: ../../Zotlabs/Module/Connections.php:297
+#: ../../Zotlabs/Module/Viewconnections.php:80 ../../include/text.php:1063
 msgid "Accepts"
 msgstr "Принимает"
 
-#: ../../include/text.php:1044 ../../Zotlabs/Module/Viewconnections.php:83
 #: ../../Zotlabs/Module/Connections.php:300
+#: ../../Zotlabs/Module/Viewconnections.php:83 ../../include/text.php:1066
 msgid "Comments"
 msgstr "комментарии"
 
-#: ../../include/text.php:1049 ../../Zotlabs/Module/Viewconnections.php:88
 #: ../../Zotlabs/Module/Connections.php:305
+#: ../../Zotlabs/Module/Viewconnections.php:88 ../../include/text.php:1071
 msgid "Stream items"
 msgstr "публикации в потоке"
 
-#: ../../include/text.php:1054 ../../Zotlabs/Module/Viewconnections.php:93
 #: ../../Zotlabs/Module/Connections.php:310
+#: ../../Zotlabs/Module/Viewconnections.php:93 ../../include/text.php:1076
 msgid "Wall posts"
 msgstr "публикации на стене"
 
-#: ../../include/text.php:1058 ../../Zotlabs/Module/Viewconnections.php:97
 #: ../../Zotlabs/Module/Connections.php:314
+#: ../../Zotlabs/Module/Viewconnections.php:97 ../../include/text.php:1080
 msgid "Nothing"
 msgstr "ничего"
 
-#: ../../include/text.php:1071
-#, php-format
-msgid "View all %s connections"
-msgstr "Просмотреть все %s контактов"
-
-#: ../../include/text.php:1134
+#: ../../Zotlabs/Module/Connections.php:327
 #, php-format
-msgid "Network: %s"
-msgstr "Сеть: %s"
-
-#: ../../include/text.php:1145 ../../include/text.php:1157
-#: ../../include/nav.php:190 ../../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:394
-#: ../../Zotlabs/Lib/Apps.php:357
-msgid "Search"
-msgstr "Поиск"
-
-#: ../../include/text.php:1237 ../../include/text.php:1241
-msgid "poke"
-msgstr "Ткнуть"
-
-#: ../../include/text.php:1237 ../../include/text.php:1241
-#: ../../include/conversation.php:267
-msgid "poked"
-msgstr "ткнут"
-
-#: ../../include/text.php:1242
-msgid "ping"
-msgstr "Пингануть"
-
-#: ../../include/text.php:1242
-msgid "pinged"
-msgstr "Отпингован"
-
-#: ../../include/text.php:1243
-msgid "prod"
-msgstr "Подтолкнуть"
-
-#: ../../include/text.php:1243
-msgid "prodded"
-msgstr "Подтолкнут"
-
-#: ../../include/text.php:1244
-msgid "slap"
-msgstr "Шлёпнуть"
-
-#: ../../include/text.php:1244
-msgid "slapped"
-msgstr "Шлёпнут"
-
-#: ../../include/text.php:1245
-msgid "finger"
-msgstr "Указать"
-
-#: ../../include/text.php:1245
-msgid "fingered"
-msgstr "Указан"
-
-#: ../../include/text.php:1246
-msgid "rebuff"
-msgstr "Дать отпор"
-
-#: ../../include/text.php:1246
-msgid "rebuffed"
-msgstr "Дан отпор"
-
-#: ../../include/text.php:1269
-msgid "happy"
-msgstr "счастливый"
-
-#: ../../include/text.php:1270
-msgid "sad"
-msgstr "грустный"
-
-#: ../../include/text.php:1271
-msgid "mellow"
-msgstr "спокойный"
-
-#: ../../include/text.php:1272
-msgid "tired"
-msgstr "усталый"
-
-#: ../../include/text.php:1273
-msgid "perky"
-msgstr "весёлый"
-
-#: ../../include/text.php:1274
-msgid "angry"
-msgstr "сердитый"
-
-#: ../../include/text.php:1275
-msgid "stupefied"
-msgstr "отупевший"
-
-#: ../../include/text.php:1276
-msgid "puzzled"
-msgstr "недоумевающий"
-
-#: ../../include/text.php:1277
-msgid "interested"
-msgstr "заинтересованный"
-
-#: ../../include/text.php:1278
-msgid "bitter"
-msgstr "едкий"
-
-#: ../../include/text.php:1279
-msgid "cheerful"
-msgstr "бодрый"
-
-#: ../../include/text.php:1280
-msgid "alive"
-msgstr "энергичный"
-
-#: ../../include/text.php:1281
-msgid "annoyed"
-msgstr "раздражённый"
-
-#: ../../include/text.php:1282
-msgid "anxious"
-msgstr "обеспокоенный"
-
-#: ../../include/text.php:1283
-msgid "cranky"
-msgstr "капризный"
-
-#: ../../include/text.php:1284
-msgid "disturbed"
-msgstr "встревоженный"
-
-#: ../../include/text.php:1285
-msgid "frustrated"
-msgstr "разочарованный"
-
-#: ../../include/text.php:1286
-msgid "depressed"
-msgstr "подавленный"
-
-#: ../../include/text.php:1287
-msgid "motivated"
-msgstr "мотивированный"
-
-#: ../../include/text.php:1288
-msgid "relaxed"
-msgstr "расслабленный"
-
-#: ../../include/text.php:1289
-msgid "surprised"
-msgstr "удивленный"
-
-#: ../../include/text.php:1477 ../../include/js_strings.php:99
-msgid "Monday"
-msgstr "Понедельник"
-
-#: ../../include/text.php:1477 ../../include/js_strings.php:100
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: ../../include/text.php:1477 ../../include/js_strings.php:101
-msgid "Wednesday"
-msgstr "Среда"
+msgid "%1$s [%2$s]"
+msgstr ""
 
-#: ../../include/text.php:1477 ../../include/js_strings.php:102
-msgid "Thursday"
-msgstr "Четверг"
+#: ../../Zotlabs/Module/Connections.php:328
+msgid "Edit connection"
+msgstr "Редактировать контакт"
 
-#: ../../include/text.php:1477 ../../include/js_strings.php:103
-msgid "Friday"
-msgstr "Пятница"
+#: ../../Zotlabs/Module/Connections.php:330
+msgid "Delete connection"
+msgstr "Удалить контакт"
 
-#: ../../include/text.php:1477 ../../include/js_strings.php:104
-msgid "Saturday"
-msgstr "Суббота"
+#: ../../Zotlabs/Module/Connections.php:336
+msgid "Channel address"
+msgstr "Адрес канала"
 
-#: ../../include/text.php:1477 ../../include/js_strings.php:98
-msgid "Sunday"
-msgstr "Воскресенье"
+#: ../../Zotlabs/Module/Connections.php:338
+#: ../../Zotlabs/Widget/Notifications.php:22 ../../include/features.php:290
+msgid "Network"
+msgstr "Сеть"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:74
-msgid "January"
-msgstr "Январь"
+#: ../../Zotlabs/Module/Connections.php:341
+msgid "Call"
+msgstr "Вызов"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:75
-msgid "February"
-msgstr "Февраль"
+#: ../../Zotlabs/Module/Connections.php:343
+msgid "Status"
+msgstr "Статус"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:76
-msgid "March"
-msgstr "Март"
+#: ../../Zotlabs/Module/Connections.php:346
+msgid "Connected"
+msgstr "Подключено"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:77
-msgid "April"
-msgstr "Апрель"
+#: ../../Zotlabs/Module/Connections.php:348
+#: ../../Zotlabs/Module/Contactedit.php:462
+msgid "Approve connection"
+msgstr "Утвердить контакт"
 
-#: ../../include/text.php:1481
-msgid "May"
-msgstr "Май"
+#: ../../Zotlabs/Module/Connections.php:350
+msgid "Ignore connection"
+msgstr "Игнорировать контакт"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:79
-msgid "June"
-msgstr "Июнь"
+#: ../../Zotlabs/Module/Connections.php:351
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:516
+msgid "Ignore"
+msgstr "Игнорировать"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:80
-msgid "July"
-msgstr "Июль"
+#: ../../Zotlabs/Module/Connections.php:352
+msgid "Recent activity"
+msgstr "Последние действия"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:81
-msgid "August"
-msgstr "Август"
+#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Suggest.php:69
+#: ../../Zotlabs/Module/Directory.php:369
+#: ../../Zotlabs/Widget/Suggestions.php:51 ../../Zotlabs/Widget/Follow.php:37
+#: ../../include/channel.php:1610 ../../include/connections.php:112
+#: ../../include/conversation.php:1117
+msgid "Connect"
+msgstr "Подключить"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:82
-msgid "September"
-msgstr "Сентябрь"
+#: ../../Zotlabs/Module/Connections.php:358
+msgid "Connect at this location"
+msgstr "Подключить в этом месте"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:83
-msgid "October"
-msgstr "Октябрь"
+#: ../../Zotlabs/Module/Connections.php:368 ../../Zotlabs/Widget/Follow.php:27
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов."
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:84
-msgid "November"
-msgstr "Ноябрь"
+#: ../../Zotlabs/Module/Connections.php:390 ../../Zotlabs/Lib/Apps.php:337
+#: ../../include/features.php:133 ../../include/text.php:1055
+msgid "Connections"
+msgstr "Контакты"
 
-#: ../../include/text.php:1481 ../../include/js_strings.php:85
-msgid "December"
-msgstr "Декабрь"
+#: ../../Zotlabs/Module/Connections.php:394 ../../Zotlabs/Module/Search.php:46
+#: ../../Zotlabs/Lib/Apps.php:357 ../../Zotlabs/Widget/Sitesearch.php:37
+#: ../../Zotlabs/Widget/Activity_filter.php:210 ../../include/nav.php:191
+#: ../../include/acl_selectors.php:149 ../../include/text.php:1167
+#: ../../include/text.php:1179
+msgid "Search"
+msgstr "Поиск"
 
-#: ../../include/text.php:1539
-msgid "Unknown Attachment"
-msgstr "Неизвестное вложение"
+#: ../../Zotlabs/Module/Connections.php:395
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Contact role"
+msgstr "Роль контакта"
 
-#: ../../include/text.php:1541 ../../Zotlabs/Module/Sharedwithme.php:108
-#: ../../Zotlabs/Storage/Browser.php:379
-msgid "Size"
-msgstr "Размер"
+#: ../../Zotlabs/Module/Connections.php:396
+msgid "Search your connections"
+msgstr "Поиск ваших контактов"
 
-#: ../../include/text.php:1541 ../../include/feedutils.php:874
-msgid "unknown"
-msgstr "неизвестный"
+#: ../../Zotlabs/Module/Connections.php:397
+msgid "Contact search"
+msgstr "Поиск контакта"
 
-#: ../../include/text.php:1582
-msgid "remove category"
-msgstr "удалить категорию"
+#: ../../Zotlabs/Module/Connections.php:398
+#: ../../Zotlabs/Module/Directory.php:432
+#: ../../Zotlabs/Module/Directory.php:437 ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr "Поиск"
 
-#: ../../include/text.php:1659
-msgid "remove from file"
-msgstr "удалить из файла"
+#: ../../Zotlabs/Module/Connections.php:405
+#: ../../Zotlabs/Module/Contactedit.php:397
+msgid "This is a group/forum channel"
+msgstr "Это канал группы или форума"
 
-#: ../../include/text.php:1843
-msgid "Download binary/encrypted content"
-msgstr "Загрузить двоичное / зашифрованное содержимое"
+#: ../../Zotlabs/Module/Profile_photo.php:128
+#: ../../Zotlabs/Module/Cover_photo.php:85
+msgid "Image uploaded but image cropping failed."
+msgstr "Изображение загружено но обрезка не удалась."
 
-#: ../../include/text.php:1901 ../../include/text.php:1910
-#: ../../include/text.php:1937 ../../include/text.php:1946
-#, php-format
-msgctxt "noun"
-msgid "%d Vote"
-msgid_plural "%d Votes"
-msgstr[0] ""
+#: ../../Zotlabs/Module/Profile_photo.php:167
+#: ../../Zotlabs/Module/Profile_photo.php:337
+#: ../../include/photo/photo_driver.php:434
+msgid "Profile Photos"
+msgstr "Фотографии профиля"
 
-#: ../../include/text.php:1953
-#, php-format
-msgctxt "noun"
-msgid "%d Vote in total"
-msgid_plural "%d Votes in total"
-msgstr[0] ""
+#: ../../Zotlabs/Module/Profile_photo.php:184
+#: ../../Zotlabs/Module/Cover_photo.php:212
+msgid "Image resize failed."
+msgstr "Не удалось изменить размер изображения."
 
-#: ../../include/text.php:1959
-msgid "Poll has ended"
-msgstr "Опрос завершён"
+#: ../../Zotlabs/Module/Profile_photo.php:268
+#: ../../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:1962
-#, php-format
-msgid "Poll ends in %s"
-msgstr "Опрос заканчивается %s"
+#: ../../Zotlabs/Module/Profile_photo.php:275
+#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:198
+msgid "Unable to process image"
+msgstr "Не удается обработать изображение"
 
-#: ../../include/text.php:1969 ../../Zotlabs/Lib/ThreadItem.php:470
-msgid "Vote"
-msgstr "Голосовать"
+#: ../../Zotlabs/Module/Profile_photo.php:350
+#: ../../Zotlabs/Module/Cover_photo.php:265
+msgid "Image upload failed."
+msgstr "Загрузка изображения не удалась."
 
-#: ../../include/text.php:2124
-msgid "Link to Source"
-msgstr "Ссылка на источник"
+#: ../../Zotlabs/Module/Profile_photo.php:370
+#: ../../Zotlabs/Module/Cover_photo.php:282
+msgid "Unable to process image."
+msgstr "Невозможно обработать изображение."
 
-#: ../../include/text.php:2146 ../../include/language.php:428
-msgid "default"
-msgstr "по умолчанию"
+#: ../../Zotlabs/Module/Profile_photo.php:432
+#: ../../Zotlabs/Module/Profile_photo.php:497
+#: ../../Zotlabs/Module/Cover_photo.php:367
+#: ../../Zotlabs/Module/Cover_photo.php:382
+msgid "Photo not available."
+msgstr "Фотография недоступна."
 
-#: ../../include/text.php:2154
-msgid "Page layout"
-msgstr "Шаблон страницы"
+#: ../../Zotlabs/Module/Profile_photo.php:544
+msgid ""
+"This profile photo will be visible to anybody on the internet and may be "
+"distributed to other websites."
+msgstr "Эта фотография профиля будет видна любому человеку в Интернете и может быть отправлена на другие сайты."
 
-#: ../../include/text.php:2154
-msgid "You can create your own with the layouts tool"
-msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов"
+#: ../../Zotlabs/Module/Profile_photo.php:544
+msgid ""
+"This profile photo will be visible only to channels with permission to view "
+"this profile."
+msgstr "Это фото профиля будет видно только тем каналам, у которых есть разрешение на просмотр этого профиля."
 
-#: ../../include/text.php:2164 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214
-#: ../../Zotlabs/Module/Wiki.php:368
-msgid "BBcode"
-msgstr ""
+#: ../../Zotlabs/Module/Profile_photo.php:546
+msgid "Use Photo for Profile"
+msgstr "Использовать фотографию для профиля"
 
-#: ../../include/text.php:2165
-msgid "HTML"
-msgstr ""
+#: ../../Zotlabs/Module/Profile_photo.php:546
+msgid "Change Profile Photo"
+msgstr "Изменить фотографию профиля"
 
-#: ../../include/text.php:2167 ../../Zotlabs/Widget/Wiki_pages.php:38
-#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:214
-msgid "Text"
-msgstr "Текст"
+#: ../../Zotlabs/Module/Profile_photo.php:548
+msgid "Reset to default"
+msgstr "Сброс до настроек по умолчанию"
 
-#: ../../include/text.php:2168
-msgid "Comanche Layout"
-msgstr "Шаблон Comanche"
+#: ../../Zotlabs/Module/Profile_photo.php:551
+#: ../../Zotlabs/Module/Profile_photo.php:552
+#: ../../Zotlabs/Module/Cover_photo.php:426
+#: ../../Zotlabs/Module/Cover_photo.php:427
+msgid "Use a photo from your albums"
+msgstr "Использовать фотографию из ваших альбомов"
 
-#: ../../include/text.php:2173
-msgid "PHP"
+#: ../../Zotlabs/Module/Profile_photo.php:554
+#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1486
+#: ../../include/conversation.php:1539
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:405
+#: ../../extend/addon/hzaddons/hsse/hsse.php:210
+#: ../../extend/addon/hzaddons/hsse/hsse.php:257
+msgid "OK"
 msgstr ""
 
-#: ../../include/text.php:2182
-msgid "Page content type"
-msgstr "Тип содержимого страницы"
-
-#: ../../include/text.php:2305 ../../include/event.php:1259
-#: ../../include/conversation.php:132
-#: ../../Zotlabs/Module/Channel_calendar.php:221
-#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Module/Tagger.php:75
-msgid "event"
-msgstr "событие"
-
-#: ../../include/text.php:2308 ../../include/conversation.php:158
-#: ../../include/bbcode.php:555 ../../include/markdown.php:205
-#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3391
-msgid "post"
-msgstr "публикация"
+#: ../../Zotlabs/Module/Profile_photo.php:555
+#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1411
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:406
+#: ../../extend/addon/hzaddons/hsse/hsse.php:139
+msgid "Choose images to embed"
+msgstr "Выбрать изображения для встраивания"
 
-#: ../../include/text.php:2310 ../../include/conversation.php:160
-#: ../../Zotlabs/Module/Tagger.php:81
-msgid "comment"
-msgstr "комментарий"
+#: ../../Zotlabs/Module/Profile_photo.php:556
+#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1412
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:407
+#: ../../extend/addon/hzaddons/hsse/hsse.php:140
+msgid "Choose an album"
+msgstr "Выбрать альбом"
 
-#: ../../include/text.php:2315
-msgid "activity"
-msgstr "активность"
+#: ../../Zotlabs/Module/Profile_photo.php:557
+#: ../../Zotlabs/Module/Cover_photo.php:432
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:408
+msgid "Choose a different album"
+msgstr "Выбрать другой альбом"
 
-#: ../../include/text.php:2318
-msgid "poll"
-msgstr "голосование"
+#: ../../Zotlabs/Module/Profile_photo.php:558
+#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1414
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:409
+#: ../../extend/addon/hzaddons/hsse/hsse.php:142
+msgid "Error getting album list"
+msgstr "Ошибка получения списка альбомов"
 
-#: ../../include/text.php:2431
-msgid "a-z, 0-9, -, and _ only"
-msgstr "Только a-z, 0-9, -, и _"
+#: ../../Zotlabs/Module/Profile_photo.php:559
+#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1415
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:410
+#: ../../extend/addon/hzaddons/hsse/hsse.php:143
+msgid "Error getting photo link"
+msgstr "Ошибка получения ссылки на фотографию"
 
-#: ../../include/text.php:2736
-msgid "Design Tools"
-msgstr "Инструменты дизайна"
+#: ../../Zotlabs/Module/Profile_photo.php:560
+#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1416
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:411
+#: ../../extend/addon/hzaddons/hsse/hsse.php:144
+msgid "Error getting album"
+msgstr "Ошибка получения альбома"
 
-#: ../../include/text.php:2739 ../../Zotlabs/Module/Blocks.php:154
-msgid "Blocks"
-msgstr "Блокировки"
+#: ../../Zotlabs/Module/Profile_photo.php:562
+msgid "Select existing"
+msgstr "Выберите существующее"
 
-#: ../../include/text.php:2740 ../../Zotlabs/Module/Menu.php:171
-msgid "Menus"
-msgstr "Меню"
+#: ../../Zotlabs/Module/Profile_photo.php:581
+#: ../../Zotlabs/Module/Cover_photo.php:455
+msgid "Crop Image"
+msgstr "Обрезать изображение"
 
-#: ../../include/text.php:2741 ../../Zotlabs/Module/Layouts.php:184
-msgid "Layouts"
-msgstr "Шаблоны"
+#: ../../Zotlabs/Module/Profile_photo.php:582
+#: ../../Zotlabs/Module/Cover_photo.php:456
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Пожалуйста настройте обрезку изображения для оптимального просмотра."
 
-#: ../../include/text.php:2742
-msgid "Pages"
-msgstr "Страницы"
+#: ../../Zotlabs/Module/Profile_photo.php:584
+msgid "Done editing"
+msgstr "Редактирование завершено"
 
-#: ../../include/text.php:2754
-msgid "Import"
-msgstr "Импортировать"
+#: ../../Zotlabs/Module/Cdav.php:819
+msgid "Calendar entries imported."
+msgstr "События календаря импортированы."
 
-#: ../../include/text.php:2755
-msgid "Import website..."
-msgstr "Импорт веб-сайта..."
+#: ../../Zotlabs/Module/Cdav.php:821
+msgid "No calendar entries found."
+msgstr "Не найдено событий в календаре."
 
-#: ../../include/text.php:2756
-msgid "Select folder to import"
-msgstr "Выбрать каталог для импорта"
+#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cal.php:165
+#: ../../Zotlabs/Module/Channel_calendar.php:392
+msgid "Link to source"
+msgstr "Ссылка на источник"
 
-#: ../../include/text.php:2757
-msgid "Import from a zipped folder:"
-msgstr "Импортировать из каталога в zip-архиве:"
+#: ../../Zotlabs/Module/Cdav.php:1008
+msgid "Event title"
+msgstr "Наименование события"
 
-#: ../../include/text.php:2758
-msgid "Import from cloud files:"
-msgstr "Импортировать из сетевых файлов:"
+#: ../../Zotlabs/Module/Cdav.php:1009
+msgid "Start date and time"
+msgstr "Дата и время начала"
 
-#: ../../include/text.php:2759
-msgid "/cloud/channel/path/to/folder"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1010
+msgid "End date and time"
+msgstr "Дата и время окончания"
 
-#: ../../include/text.php:2760
-msgid "Enter path to website files"
-msgstr "Введите путь к файлам веб-сайта"
+#: ../../Zotlabs/Module/Cdav.php:1011
+msgid "Timezone:"
+msgstr "Часовой пояс:"
 
-#: ../../include/text.php:2761
-msgid "Select folder"
-msgstr "Выбрать каталог"
+#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cal.php:205
+msgid "Today"
+msgstr "Сегодня"
 
-#: ../../include/text.php:2762
-msgid "Export website..."
-msgstr "Экспорт веб-сайта..."
+#: ../../Zotlabs/Module/Cdav.php:1037
+msgid "Month"
+msgstr "Месяц"
 
-#: ../../include/text.php:2763
-msgid "Export to a zip file"
-msgstr "Экспортировать в ZIP файл."
+#: ../../Zotlabs/Module/Cdav.php:1038
+msgid "Week"
+msgstr "Неделя"
 
-#: ../../include/text.php:2764
-msgid "website.zip"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1039
+msgid "Day"
+msgstr "День"
 
-#: ../../include/text.php:2765
-msgid "Enter a name for the zip file."
-msgstr "Введите имя для ZIP файла."
+#: ../../Zotlabs/Module/Cdav.php:1040
+msgid "List month"
+msgstr "Просмотреть месяц"
 
-#: ../../include/text.php:2766
-msgid "Export to cloud files"
-msgstr "Эскпортировать в сетевые файлы:"
+#: ../../Zotlabs/Module/Cdav.php:1041
+msgid "List week"
+msgstr "Просмотреть неделю"
 
-#: ../../include/text.php:2767
-msgid "/path/to/export/folder"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1042
+msgid "List day"
+msgstr "Просмотреть день"
 
-#: ../../include/text.php:2768
-msgid "Enter a path to a cloud files destination."
-msgstr "Введите путь к расположению сетевых файлов."
+#: ../../Zotlabs/Module/Cdav.php:1050
+msgid "More"
+msgstr "Больше"
 
-#: ../../include/text.php:2769
-msgid "Specify folder"
-msgstr "Указать каталог"
+#: ../../Zotlabs/Module/Cdav.php:1051
+msgid "Less"
+msgstr "Меньше"
 
-#: ../../include/opengraph.php:56
-#, php-format
-msgid "This is the home page of %s."
-msgstr "Это домашняя страница %s."
+#: ../../Zotlabs/Module/Cdav.php:1053
+msgid "Select calendar"
+msgstr "Выбрать календарь"
 
-#: ../../include/event.php:33 ../../include/event.php:110
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Widget/Cdav.php:147
+msgid "Channel Calendars"
+msgstr "Календари канала"
 
-#: ../../include/event.php:41
-msgid "Starts:"
-msgstr "Начало:"
+#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Widget/Cdav.php:133
+#: ../../Zotlabs/Widget/Cdav.php:147
+msgid "CalDAV Calendars"
+msgstr "Календари CalDAV"
 
-#: ../../include/event.php:51
-msgid "Finishes:"
-msgstr "Окончание:"
+#: ../../Zotlabs/Module/Cdav.php:1056
+msgid "Delete all"
+msgstr "Удалить всё"
 
-#: ../../include/event.php:63 ../../include/event.php:134
-#: ../../include/channel.php:1625 ../../Zotlabs/Module/Directory.php:353
-msgid "Location:"
-msgstr "Местоположение:"
+#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1387
+#: ../../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:251 ../../Zotlabs/Module/Connedit.php:747
+#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
+#: ../../Zotlabs/Widget/Cdav.php:144 ../../Zotlabs/Widget/Cdav.php:182
+msgid "Create"
+msgstr "Создать"
 
-#: ../../include/event.php:110
-msgid "l F d, Y"
-msgstr ""
+#: ../../Zotlabs/Module/Cdav.php:1059
+msgid "Sorry! Editing of recurrent events is not yet implemented."
+msgstr "Простите, но редактирование повторяющихся событий пока не реализовано."
 
-#: ../../include/event.php:114
-msgid "Start:"
-msgstr "Начало:"
+#: ../../Zotlabs/Module/Cdav.php:1060
+msgid ""
+"Could not fetch calendar resource. The selected calendar might be disabled."
+msgstr "Не удалось получить содержимое календаря. Выбранный календарь может быть отключен."
 
-#: ../../include/event.php:118
-msgid "End:"
-msgstr "Окончание:"
+#: ../../Zotlabs/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293
+#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
+#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502
+#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543
+#: ../../include/contact_widgets.php:115 ../../include/contact_widgets.php:149
+#: ../../extend/addon/hzaddons/articles/Widget/Articles_categories.php:72
+#: ../../extend/addon/hzaddons/cards/Widget/Cards_categories.php:72
+msgid "Categories"
+msgstr "Категории"
 
-#: ../../include/event.php:1106
-msgid "This event has been added to your calendar."
-msgstr "Это событие было добавлено в ваш календарь."
+#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733
+msgid "Organisation"
+msgstr "Организация"
 
-#: ../../include/event.php:1337
-msgid "Not specified"
-msgstr "Не указано"
+#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:734
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2622
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2683
+msgid "Title"
+msgstr "Наименование"
 
-#: ../../include/event.php:1338
-msgid "Needs Action"
-msgstr "Требует действия"
+#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:735
+msgid "Phone"
+msgstr "Телефон"
 
-#: ../../include/event.php:1339
-msgid "Completed"
-msgstr "Завершено"
+#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Connedit.php:737
+msgid "Instant messenger"
+msgstr "Мессенджер"
 
-#: ../../include/event.php:1340
-msgid "In Process"
-msgstr "В процессе"
+#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Connedit.php:738
+msgid "Website"
+msgstr "Веб-сайт"
 
-#: ../../include/event.php:1341
-msgid "Cancelled"
-msgstr "Отменено"
+#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Connedit.php:740
+msgid "Note"
+msgstr "Заметка"
 
-#: ../../include/event.php:1422 ../../include/connections.php:751
-#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:808
-#: ../../Zotlabs/Module/Connedit.php:741
+#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Connedit.php:741
+#: ../../include/event.php:1511 ../../include/connections.php:752
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: ../../include/event.php:1423 ../../include/connections.php:752
-#: ../../Zotlabs/Widget/Notifications.php:36 ../../Zotlabs/Module/Cdav.php:1382
-#: ../../Zotlabs/Module/Profiles.php:809 ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Connedit.php:742
+#: ../../Zotlabs/Widget/Notifications.php:42 ../../include/event.php:1512
+#: ../../include/connections.php:753
 msgid "Home"
 msgstr "Домашний"
 
-#: ../../include/event.php:1424 ../../include/connections.php:753
-msgid "Home, Voice"
-msgstr "Дом, голос"
-
-#: ../../include/event.php:1425 ../../include/connections.php:754
-msgid "Home, Fax"
-msgstr "Дом, факс"
-
-#: ../../include/event.php:1426 ../../include/connections.php:755
-#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:810
-#: ../../Zotlabs/Module/Connedit.php:743
+#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:743
+#: ../../include/event.php:1515 ../../include/connections.php:756
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../../include/event.php:1427 ../../include/connections.php:756
-msgid "Work, Voice"
-msgstr "Работа, голос"
-
-#: ../../include/event.php:1428 ../../include/connections.php:757
-msgid "Work, Fax"
-msgstr "Работа, факс"
-
-#: ../../include/event.php:1429 ../../include/event.php:1436
-#: ../../include/selectors.php:64 ../../include/selectors.php:81
-#: ../../include/selectors.php:119 ../../include/selectors.php:155
-#: ../../include/connections.php:758 ../../include/connections.php:765
-#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:811
-#: ../../Zotlabs/Module/Connedit.php:744
-#: ../../Zotlabs/Access/PermissionRoles.php:360
+#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Connedit.php:744
+#: ../../Zotlabs/Access/PermissionRoles.php:360 ../../include/event.php:1518
+#: ../../include/event.php:1525 ../../include/connections.php:759
+#: ../../include/connections.php:766 ../../include/selectors.php:64
+#: ../../include/selectors.php:81 ../../include/selectors.php:119
+#: ../../include/selectors.php:155
 msgid "Other"
 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 "Выкл."
-
-#: ../../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 "Вкл."
-
-#: ../../include/features.php:82 ../../include/nav.php:466
-#: ../../include/nav.php:469 ../../Zotlabs/Lib/Apps.php:350
-msgid "Calendar"
-msgstr "Календарь"
-
-#: ../../include/features.php:86
-msgid "Start calendar week on Monday"
-msgstr "Начинать календарную неделю с понедельника"
-
-#: ../../include/features.php:87
-msgid "Default is Sunday"
-msgstr "По умолчанию - воскресенье"
-
-#: ../../include/features.php:94
-msgid "Event Timezone Selection"
-msgstr "Выбор часового пояса события"
-
-#: ../../include/features.php:95
-msgid "Allow event creation in timezones other than your own."
-msgstr "Разрешить создание события в часовой зоне отличной от вашей"
-
-#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:347
-msgid "Channel Home"
-msgstr "Главная канала"
-
-#: ../../include/features.php:108
-msgid "Search by Date"
-msgstr "Поиск по дате"
-
-#: ../../include/features.php:109
-msgid "Ability to select posts by date ranges"
-msgstr "Возможность выбора сообщений по диапазонам дат"
-
-#: ../../include/features.php:116
-msgid "Tag Cloud"
-msgstr "Облако тегов"
-
-#: ../../include/features.php:117
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Показывает личное облако тегов на странице канала"
-
-#: ../../include/features.php:124 ../../include/features.php:358
-msgid "Use blog/list mode"
-msgstr "Использовать режим блога / списка"
-
-#: ../../include/features.php:125 ../../include/features.php:359
-msgid "Comments will be displayed separately"
-msgstr "Комментарии будут отображаться отдельно"
-
-#: ../../include/features.php:137
-msgid "Connection Filtering"
-msgstr "Фильтрация контактов"
-
-#: ../../include/features.php:138
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Фильтр входящих сообщений от контактов на основе ключевых слов / контента"
-
-#: ../../include/features.php:146
-msgid "Conversation"
-msgstr "Диалоги"
-
-#: ../../include/features.php:158
-msgid "Emoji Reactions"
-msgstr "Реакции Emoji"
-
-#: ../../include/features.php:159
-msgid "Add emoji reaction ability to posts"
-msgstr "Возможность добавлять реакции Emoji к публикациям"
-
-#: ../../include/features.php:166
-msgid "Dislike Posts"
-msgstr "Не нравящиеся публикации"
-
-#: ../../include/features.php:167
-msgid "Ability to dislike posts/comments"
-msgstr "Возможность отмечать не нравящиеся публикации / комментарии"
-
-#: ../../include/features.php:174
-msgid "Star Posts"
-msgstr "Помечать сообщения"
-
-#: ../../include/features.php:175
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Возможность отметить специальные сообщения индикатором-звёздочкой"
-
-#: ../../include/features.php:182
-msgid "Reply on comment"
-msgstr "Ответить на комментарий"
-
-#: ../../include/features.php:183
-msgid "Ability to reply on selected comment"
-msgstr "Возможность ответить на выбранный комментарий"
-
-#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:351
-msgid "Directory"
-msgstr "Каталог"
+#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Connedit.php:745
+msgid "Add Contact"
+msgstr "Добавить контакт"
 
-#: ../../include/features.php:196
-msgid "Advanced Directory Search"
-msgstr "Расширенный поиск в каталоге"
+#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Connedit.php:746
+msgid "Add Field"
+msgstr "Добавить поле"
 
-#: ../../include/features.php:197
-msgid "Allows creation of complex directory search queries"
-msgstr "Позволяет создание сложных поисковых запросов в каталоге"
+#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751
+msgid "P.O. Box"
+msgstr "абонентский ящик"
 
-#: ../../include/features.php:206
-msgid "Editor"
-msgstr "Редактор"
+#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752
+msgid "Additional"
+msgstr "Дополнительно"
 
-#: ../../include/features.php:210
-msgid "Post Categories"
-msgstr "Категории публикаций"
+#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753
+msgid "Street"
+msgstr "Улица"
 
-#: ../../include/features.php:211
-msgid "Add categories to your posts"
-msgstr "Добавить категории для ваших публикаций"
+#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754
+msgid "Locality"
+msgstr "Населённый пункт"
 
-#: ../../include/features.php:218
-msgid "Large Photos"
-msgstr "Большие фотографии"
+#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755
+msgid "Region"
+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/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756
+msgid "ZIP Code"
+msgstr "Индекс"
 
-#: ../../include/features.php:226
-msgid "Even More Encryption"
-msgstr "Еще больше шифрования"
+#: ../../Zotlabs/Module/Cdav.php:1456
+msgid "Default Calendar"
+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/Cdav.php:1467
+msgid "Default Addressbook"
+msgstr "Адресная книга по умолчанию"
 
-#: ../../include/features.php:234
-msgid "Disable Comments"
-msgstr "Отключить комментарии"
+#: ../../Zotlabs/Module/Chanview.php:132
+msgid "toggle full screen mode"
+msgstr "переключение полноэкранного режима"
 
-#: ../../include/features.php:235
-msgid "Provide the option to disable comments for a post"
-msgstr "Предоставить возможность отключать комментарии для публикаций"
+#: ../../Zotlabs/Module/Oauth.php:45
+msgid "Name is required"
+msgstr "Необходимо имя"
 
-#: ../../include/features.php:242
-msgid "Delayed Posting"
-msgstr "Задержанная публикация"
+#: ../../Zotlabs/Module/Oauth.php:49
+msgid "Key and Secret are required"
+msgstr "Требуются ключ и код"
 
-#: ../../include/features.php:243
-msgid "Allow posts to be published at a later date"
-msgstr "Разрешить размешать публикации следующими датами"
+#: ../../Zotlabs/Module/Oauth.php:108 ../../Zotlabs/Module/Oauth.php:134
+#: ../../Zotlabs/Module/Oauth.php:170 ../../Zotlabs/Module/Oauth2.php:141
+#: ../../Zotlabs/Module/Oauth2.php:191
+msgid "Add application"
+msgstr "Добавить приложение"
 
-#: ../../include/features.php:250
-msgid "Content Expiration"
-msgstr "Истечение срока действия содержимого"
+#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth2.php:116
+#: ../../Zotlabs/Module/Oauth2.php:144
+msgid "Name of application"
+msgstr "Название приложения"
 
-#: ../../include/features.php:251
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Удалять публикации / комментарии и / или личные сообщения"
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138
+#: ../../extend/addon/hzaddons/twitter/twitter.php:504
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:596
+msgid "Consumer Key"
+msgstr "Ключ клиента"
 
-#: ../../include/features.php:258
-msgid "Suppress Duplicate Posts/Comments"
-msgstr "Подавлять дублирующие публикации / комментарии"
+#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:113
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Сгенерирован автоматические - измените если требуется. Макс. длина 20"
 
-#: ../../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/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139
+#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
+#: ../../extend/addon/hzaddons/twitter/twitter.php:505
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:595
+msgid "Consumer Secret"
+msgstr "Код клиента"
 
-#: ../../include/features.php:266
-msgid "Auto-save drafts of posts and comments"
-msgstr "Автоматически сохранять черновики публикаций и комментариев"
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
+#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
+msgid "Redirect"
+msgstr "Перенаправление"
 
-#: ../../include/features.php:267
+#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth2.php:118
+#: ../../Zotlabs/Module/Oauth2.php:146
 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 "Изменить канал напрямую из выпадающего меню"
+"Redirect URI - leave blank unless your application specifically requires this"
+msgstr "URI перенаправления - оставьте пустыми до тех пока ваше приложение не требует этого"
 
-#: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:16
-#: ../../Zotlabs/Module/Connections.php:338
-msgid "Network"
-msgstr "Сеть"
+#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
+msgid "Icon url"
+msgstr "URL значка"
 
-#: ../../include/features.php:294
-msgid "Events Filter"
-msgstr "Фильтр событий"
+#: ../../Zotlabs/Module/Oauth.php:126
+msgid "Application not found."
+msgstr "Приложение не найдено."
 
-#: ../../include/features.php:295
-msgid "Ability to display only events"
-msgstr "Возможность отображать только события"
+#: ../../Zotlabs/Module/Oauth.php:169
+msgid "Connected OAuth Apps"
+msgstr "Подключенные приложения OAuth"
 
-#: ../../include/features.php:302
-msgid "Polls Filter"
-msgstr "Фильтр голосований"
+#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Oauth2.php:194
+msgid "Client key starts with"
+msgstr "Ключ клиента начинается с"
 
-#: ../../include/features.php:303
-msgid "Ability to display only polls"
-msgstr "Возможность отображать только опросы"
+#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Oauth2.php:195
+msgid "No name"
+msgstr "Без названия"
 
-#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:83
-msgid "Saved Searches"
-msgstr "Сохранённые поиски"
+#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
+msgid "Remove authorization"
+msgstr "Удалить разрешение"
 
-#: ../../include/features.php:311
-msgid "Save search terms for re-use"
-msgstr "Сохранять результаты поиска для повторного использования"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+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/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Запрос на сброс пароля отправлен. Проверьте вашу электронную почту."
 
-#: ../../include/features.php:319
-msgid "Ability to file posts under folders"
-msgstr "Возможность размещать публикации в каталогах"
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Участник сайта (%s)"
 
-#: ../../include/features.php:326
-msgid "Alternate Stream Order"
-msgstr "Отображение потока"
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Запрошен сброс пароля на %s"
 
-#: ../../include/features.php:327
+#: ../../Zotlabs/Module/Lostpass.php:68
 msgid ""
-"Ability to order the stream by last post date, last comment date or "
-"unthreaded activities"
-msgstr "Возможность показывать поток по дате последнего сообщения, последнего комментария или в порядке поступления"
-
-#: ../../include/features.php:334
-msgid "Contact Filter"
-msgstr "Фильтр контактов"
-
-#: ../../include/features.php:335
-msgid "Ability to display only posts of a selected contact"
-msgstr "Возможность показа публикаций только от выбранных контактов"
-
-#: ../../include/features.php:342
-msgid "Forum Filter"
-msgstr "Фильтр по форумам"
-
-#: ../../include/features.php:343
-msgid "Ability to display only posts of a specific forum"
-msgstr "Возможность показа публикаций только определённого форума"
-
-#: ../../include/features.php:350
-msgid "Personal Posts Filter"
-msgstr "Персональный фильтр публикаций"
-
-#: ../../include/features.php:351
-msgid "Ability to display only posts that you've interacted on"
-msgstr "Возможность показа только тех публикаций с которыми вы взаимодействовали"
-
-#: ../../include/features.php:368 ../../include/nav.php:447
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349
-msgid "Photos"
-msgstr "Фотографии"
-
-#: ../../include/features.php:372
-msgid "Photo Location"
-msgstr "Местоположение фотографии"
-
-#: ../../include/features.php:373
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Если данные о местоположении доступны на загруженных фотографий, связать их с картой."
-
-#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:367
-msgid "Profiles"
-msgstr "Редактировать профиль"
-
-#: ../../include/features.php:386
-msgid "Advanced Profiles"
-msgstr "Расширенные профили"
-
-#: ../../include/features.php:387
-msgid "Additional profile sections and selections"
-msgstr "Дополнительные секции и выборы профиля"
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Запрос не может быть проверен. (Вы могли отправить его раньше). Сброс пароля не возможен."
 
-#: ../../include/features.php:394
-msgid "Profile Import/Export"
-msgstr "Импорт / экспорт профиля"
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr "Ваш пароль в соответствии с просьбой сброшен."
 
-#: ../../include/features.php:395
-msgid "Save and load profile details across sites/channels"
-msgstr "Сохранение и загрузка настроек профиля на всех сайтах / каналах"
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr "Ваш новый пароль"
 
-#: ../../include/features.php:402
-msgid "Multiple Profiles"
-msgstr "Несколько профилей"
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr "Сохраните ваш новый пароль и затем"
 
-#: ../../include/features.php:403
-msgid "Ability to create multiple profiles"
-msgstr "Возможность создания нескольких профилей"
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr "нажмите здесь чтобы войти"
 
-#: ../../include/security.php:629
+#: ../../Zotlabs/Module/Lostpass.php:96
 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:1103
-#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:850
-msgid "Comment"
-msgstr "Комментарий"
-
-#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:559
-#, php-format
-msgid "%s show all"
-msgstr "%s показать всё"
-
-#: ../../include/js_strings.php:8
-#, php-format
-msgid "%s show less"
-msgstr "%s показать меньше"
-
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
-msgstr "%s развернуть"
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Ваш пароль может быть изменён на странице <em>Настройки</em> после успешного входа."
 
-#: ../../include/js_strings.php:10
+#: ../../Zotlabs/Module/Lostpass.php:117
 #, php-format
-msgid "%s collapse"
-msgstr "%s свернуть"
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr "Пароль слишком короткий"
+msgid "Your password has changed at %s"
+msgstr "Пароль был изменен на %s"
 
-#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:161
-msgid "Passwords do not match"
-msgstr "Пароли не совпадают"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
+msgstr "Забыли ваш пароль?"
 
-#: ../../include/js_strings.php:13
-msgid "everybody"
-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/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr "Тайный пароль"
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
+msgstr "Адрес электронной почты"
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr "Подсказка для пароля"
+#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:76
+msgid "Reset"
+msgstr "Сбросить"
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr "Уведомление: Права доступа изменились, но до сих пор не сохранены."
+#: ../../Zotlabs/Module/Notifications.php:106
+#: ../../Zotlabs/Module/Notify.php:85
+msgid "No more system notifications."
+msgstr "Нет новых оповещений системы."
 
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr "закрыть все"
+#: ../../Zotlabs/Module/Notifications.php:110
+#: ../../Zotlabs/Module/Notify.php:89
+msgid "System Notifications"
+msgstr "Системные оповещения "
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr "Здесь нет ничего нового"
+#: ../../Zotlabs/Module/Notifications.php:111
+#: ../../Zotlabs/Lib/ThreadItem.php:507
+msgid "Mark all seen"
+msgstr "Отметить как просмотренное"
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr "Оценкa этoго канала (общедоступно)"
+#: ../../Zotlabs/Module/Lockview.php:100
+msgid "Remote privacy information not available"
+msgstr "Информация о конфиденциальности удалённо недоступна"
 
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr "Оценка"
+#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193
+msgid "Privacy group"
+msgstr "Группы конфиденциальности"
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr "Охарактеризовать (необязательно)"
+#: ../../Zotlabs/Module/Lockview.php:214
+#, php-format
+msgid "Click to copy link to this ressource for guest %s to clipboard"
+msgstr "Нажмите чтобы скопировать этот ресурс в буфер для гостя %s"
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Пожалуйста, введите URL ссылки"
+#: ../../Zotlabs/Module/Lockview.php:214
+msgid "Link copied"
+msgstr "Ссылка скопирована"
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?"
+#: ../../Zotlabs/Module/Lockview.php:221
+msgid "Access"
+msgstr "Доступ"
 
-#: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52
-#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Profiles.php:480
-#: ../../Zotlabs/Module/Profiles.php:750 ../../Zotlabs/Module/Locs.php:121
-msgid "Location"
-msgstr "Место"
+#: ../../Zotlabs/Module/Lockview.php:226 ../../Zotlabs/Widget/Tokens.php:49
+msgid "Guest access"
+msgstr "Гостевой доступ"
 
-#: ../../include/js_strings.php:26
-msgid "lovely"
-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/Menu.php:92 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Profile.php:27
+#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12
+#: ../../include/channel.php:1427
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:49
+#: ../../extend/addon/hzaddons/articles/Mod_Articles.php:46
+#: ../../extend/addon/hzaddons/cards/Mod_Cards.php:42
+msgid "Requested profile is not available."
+msgstr "Запрашиваемый профиль не доступен."
 
-#: ../../include/js_strings.php:27
-msgid "wonderful"
-msgstr "замечательно"
+#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
+msgid "Continue"
+msgstr "Продолжить"
 
-#: ../../include/js_strings.php:28
-msgid "fantastic"
-msgstr "фантастично"
+#: ../../Zotlabs/Module/Connect.php:99
+msgid "Premium Channel Setup"
+msgstr "Установка премиального канала"
 
-#: ../../include/js_strings.php:29
-msgid "great"
-msgstr "отлично"
+#: ../../Zotlabs/Module/Connect.php:101
+msgid "Enable premium channel connection restrictions"
+msgstr "Включить ограничения для премиального канала"
 
-#: ../../include/js_strings.php:30
+#: ../../Zotlabs/Module/Connect.php:102
 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 "Спасибо, этот псевдоним может быть использован."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Пожалуйста введите ваши ограничения или условия, такие, как оплата PayPal, правила использования и т.п."
 
-#: ../../include/js_strings.php:33
-msgid "A channel name is required."
-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 "Этот канал до подключения может требовать дополнительных шагов или подтверждений следующих условий:"
 
-#: ../../include/js_strings.php:34
-msgid "This is a "
-msgstr "Это "
+#: ../../Zotlabs/Module/Connect.php:105
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Потенциальные соединения будут видеть следующий предварительный текст:"
 
-#: ../../include/js_strings.php:35
-msgid " channel name"
-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 "Продолжая, я подтверждаю что я выполнил все условия представленные на данной странице."
 
-#: ../../include/js_strings.php:36
-msgid "Back to reply"
-msgstr "Вернуться к ответу"
+#: ../../Zotlabs/Module/Connect.php:115
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Владельцем канала не было представлено никаких специальных инструкций.)"
 
-#: ../../include/js_strings.php:37
-msgid "Pinned"
-msgstr "Прикреплено"
+#: ../../Zotlabs/Module/Connect.php:123
+msgid "Restricted or Premium Channel"
+msgstr "Ограниченный или премиальный канал"
 
-#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:497
-msgid "Pin to the top"
-msgstr "Прикрепить сверху"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Канала нет."
 
-#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155
-#: ../../Zotlabs/Lib/ThreadItem.php:497
-msgid "Unpin from the top"
-msgstr "Открепить"
+#: ../../Zotlabs/Module/Common.php:45
+msgid "No connections in common."
+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/Common.php:65
+msgid "View Common Connections"
+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/Subthread.php:115 ../../Zotlabs/Module/Tagger.php:71
+#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Lib/Activity.php:3528
+#: ../../include/conversation.php:128 ../../include/text.php:2328
+#: ../../extend/addon/hzaddons/redphotos/redphotohelper.php:71
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1958
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1642
+msgid "photo"
+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/Subthread.php:115 ../../Zotlabs/Module/Like.php:445
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1958
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1642
+msgid "status"
+msgstr "статус"
 
-#: ../../include/js_strings.php:48
+#: ../../Zotlabs/Module/Subthread.php:128
 #, php-format
-msgid "%d months"
-msgid_plural "%d months"
-msgstr[0] "%d месяц"
-msgstr[1] "%d месяца"
-msgstr[2] "%d месяцев"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s отслеживает %2$s's %3$s"
 
-#: ../../include/js_strings.php:49
+#: ../../Zotlabs/Module/Subthread.php:130
 #, 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 "через"
-
-#: ../../include/js_strings.php:56
-msgid "timeago.suffixAgo"
-msgstr "назад"
-
-#: ../../include/js_strings.php:57
-msgid "timeago.suffixFromNow"
-msgstr "NONE"
-
-#: ../../include/js_strings.php:60
-msgid "less than a minute"
-msgstr "менее чем одну минуту"
-
-#: ../../include/js_strings.php:61
-msgid "about a minute"
-msgstr "около минуты"
-
-#: ../../include/js_strings.php:63
-msgid "about an hour"
-msgstr "около часа"
-
-#: ../../include/js_strings.php:65
-msgid "a day"
-msgstr "день"
-
-#: ../../include/js_strings.php:67
-msgid "about a month"
-msgstr "около месяца"
-
-#: ../../include/js_strings.php:69
-msgid "about a year"
-msgstr "около года"
-
-#: ../../include/js_strings.php:71
-msgid " "
-msgstr " "
-
-#: ../../include/js_strings.php:72
-msgid "timeago.numbers"
-msgstr ""
-
-#: ../../include/js_strings.php:78
-msgctxt "long"
-msgid "May"
-msgstr "Май"
-
-#: ../../include/js_strings.php:86
-msgid "Jan"
-msgstr "Янв"
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s прекратил отслеживать %2$s's %3$s"
 
-#: ../../include/js_strings.php:87
-msgid "Feb"
-msgstr "Фев"
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editpost.php:24
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:17
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:33
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:17
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:33
+msgid "Item not found"
+msgstr "Элемент не найден"
 
-#: ../../include/js_strings.php:88
-msgid "Mar"
-msgstr "Мар"
+#: ../../Zotlabs/Module/Editwebpage.php:139
+msgid "Page link"
+msgstr "Ссылка страницы"
 
-#: ../../include/js_strings.php:89
-msgid "Apr"
-msgstr "Апр"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:218
+#: ../../include/conversation.php:1369
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:99
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:101
+#: ../../extend/addon/hzaddons/hsse/hsse.php:95
+msgid "Insert web link"
+msgstr "Вставить веб-ссылку"
 
-#: ../../include/js_strings.php:90
-msgctxt "short"
-msgid "May"
-msgstr "Май"
+#: ../../Zotlabs/Module/Editwebpage.php:166
+msgid "Edit Webpage"
+msgstr "Редактировать веб-страницу"
 
-#: ../../include/js_strings.php:91
-msgid "Jun"
-msgstr "Июн"
+#: ../../Zotlabs/Module/Email_resend.php:12
+#: ../../Zotlabs/Module/Email_validation.php:24
+msgid "Token verification failed."
+msgstr "Не удалось выполнить проверку токена."
 
-#: ../../include/js_strings.php:92
-msgid "Jul"
-msgstr "Июл"
+#: ../../Zotlabs/Module/Email_resend.php:30
+msgid "Email verification resent"
+msgstr "Сообщение для проверки email отправлено повторно"
 
-#: ../../include/js_strings.php:93
-msgid "Aug"
-msgstr "Авг"
+#: ../../Zotlabs/Module/Email_resend.php:33
+msgid "Unable to resend email verification message."
+msgstr "Невозможно повторно отправить сообщение для проверки email"
 
-#: ../../include/js_strings.php:94
-msgid "Sep"
-msgstr "Сен"
+#: ../../Zotlabs/Module/Dircensor.php:42
+msgid "Entry censored"
+msgstr "Запись цензурирована"
 
-#: ../../include/js_strings.php:95
-msgid "Oct"
-msgstr "Окт"
+#: ../../Zotlabs/Module/Dircensor.php:45
+msgid "Entry uncensored"
+msgstr "Запись нецензурирована"
 
-#: ../../include/js_strings.php:96
-msgid "Nov"
-msgstr "Ноя"
+#: ../../Zotlabs/Module/Import_items.php:50
+msgid "Not a zip file or zip file corrupted."
+msgstr "Не zip файл или повреждённый zip файл."
 
-#: ../../include/js_strings.php:97
-msgid "Dec"
-msgstr "Дек"
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "Import Items"
+msgstr "Импортировать объекты"
 
-#: ../../include/js_strings.php:105
-msgid "Sun"
-msgstr "Вск"
+#: ../../Zotlabs/Module/Import_items.php:122
+msgid "Use this form to import existing posts and content from an export file."
+msgstr "Используйте эту форму для импорта существующих публикаций и содержимого из файла."
 
-#: ../../include/js_strings.php:106
-msgid "Mon"
-msgstr "Пон"
+#: ../../Zotlabs/Module/Import_items.php:123
+#: ../../Zotlabs/Module/Import.php:594
+msgid "File to Upload"
+msgstr "Файл для загрузки"
 
-#: ../../include/js_strings.php:107
-msgid "Tue"
-msgstr "Вт"
+#: ../../Zotlabs/Module/Import_items.php:136
+#: ../../Zotlabs/Module/Import.php:107
+msgid "Imported file is empty."
+msgstr "Импортированный файл пуст."
 
-#: ../../include/js_strings.php:108
-msgid "Wed"
-msgstr "Ср"
+#: ../../Zotlabs/Module/Import_items.php:159
+msgid "Content import completed"
+msgstr "Импорт содержимого завершён"
 
-#: ../../include/js_strings.php:109
-msgid "Thu"
-msgstr "Чет"
+#: ../../Zotlabs/Module/Import_items.php:164
+msgid "Chatroom import completed"
+msgstr "Импорт комнат чатов завершён"
 
-#: ../../include/js_strings.php:110
-msgid "Fri"
-msgstr "Пят"
+#: ../../Zotlabs/Module/Import_items.php:170
+msgid "Channel calendar import 1/2 completed"
+msgstr "Импорт календаря канала завершён на 1/2"
 
-#: ../../include/js_strings.php:111
-msgid "Sat"
-msgstr "Суб"
+#: ../../Zotlabs/Module/Import_items.php:176
+msgid "Channel calendar import 2/2 completed"
+msgstr "Импорт календаря канала завершён на 2/2"
 
-#: ../../include/js_strings.php:112
-msgctxt "calendar"
-msgid "today"
-msgstr "сегодня"
+#: ../../Zotlabs/Module/Import_items.php:181
+msgid "Menu import completed"
+msgstr "Импорт меню завершён"
 
-#: ../../include/js_strings.php:113
-msgctxt "calendar"
-msgid "month"
-msgstr "месяц"
+#: ../../Zotlabs/Module/Import_items.php:186
+msgid "Wiki import completed"
+msgstr "Импорт wiki завершён"
 
-#: ../../include/js_strings.php:114
-msgctxt "calendar"
-msgid "week"
-msgstr "неделя"
+#: ../../Zotlabs/Module/Import_items.php:191
+msgid "Webpages import completed"
+msgstr "Импорт веб-страниц завершён"
 
-#: ../../include/js_strings.php:115
-msgctxt "calendar"
-msgid "day"
-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/js_strings.php:116
-msgctxt "calendar"
-msgid "All day"
-msgstr "Весь день"
+#: ../../Zotlabs/Module/Regate.php:84
+msgid "Email resent"
+msgstr "Электронная почта повторно отправлена"
 
-#: ../../include/js_strings.php:119
-msgid "Please stand by while your download is being prepared."
-msgstr "Пожалуйста, подождите, пока готовится загрузка."
+#: ../../Zotlabs/Module/Regate.php:84
+msgid "Email resend failed"
+msgstr "Ошибка повторной отправки электронной почты"
 
-#: ../../include/js_strings.php:122
-msgid "Email address not valid"
-msgstr "Адрес электронной почты недействителен"
+#: ../../Zotlabs/Module/Regate.php:109
+msgid "Verification successful"
+msgstr "Проверка прошла успешно"
 
-#: ../../include/help.php:81
-msgid "Help:"
-msgstr "Помощь:"
+#: ../../Zotlabs/Module/Regate.php:153
+msgid "Account successfull created"
+msgstr "Учётная запись успешно создана"
 
-#: ../../include/help.php:118 ../../include/help.php:126
-#: ../../include/nav.php:176 ../../include/nav.php:315
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352
-msgid "Help"
-msgstr "Помощь"
+#: ../../Zotlabs/Module/Regate.php:211
+msgid "Channel successfull created"
+msgstr "Канал успешно создан"
 
-#: ../../include/help.php:130
-msgid "Not Found"
-msgstr "Не найдено"
+#: ../../Zotlabs/Module/Regate.php:217
+msgid "Automatic channel creation failed. Please create a channel."
+msgstr "Автоматической создание канала не удалось. Пожалуйста создайте канал."
 
-#: ../../include/help.php:133 ../../Zotlabs/Module/Display.php:142
-#: ../../Zotlabs/Module/Display.php:159 ../../Zotlabs/Module/Display.php:179
-#: ../../Zotlabs/Module/Display.php:185 ../../Zotlabs/Module/Page.php:136
-#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:539
-#: ../../Zotlabs/Web/Router.php:186
-msgid "Page not found."
-msgstr "Страница не найдена."
+#: ../../Zotlabs/Module/Regate.php:229
+msgid "Account creation error"
+msgstr "Ошибка создания учётной записи"
 
-#: ../../include/photos.php:153
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Файл превышает предельный размер для сайта в %lu байт"
+#: ../../Zotlabs/Module/Regate.php:241
+msgid "Verify failed"
+msgstr "Проверка не удалась"
 
-#: ../../include/photos.php:164
-msgid "Image file is empty."
-msgstr "Файл изображения пуст."
+#: ../../Zotlabs/Module/Regate.php:246
+msgid "Token verification failed"
+msgstr "Неверный проверочный код"
 
-#: ../../include/photos.php:198 ../../Zotlabs/Module/Profile_photo.php:275
-#: ../../Zotlabs/Module/Cover_photo.php:241
-msgid "Unable to process image"
-msgstr "Не удается обработать изображение"
+#: ../../Zotlabs/Module/Regate.php:251
+msgid "Request not inside time frame"
+msgstr "Запрос в не установленные сроки "
 
-#: ../../include/photos.php:324
-msgid "Photo storage failed."
-msgstr "Ошибка хранилища фотографий."
+#: ../../Zotlabs/Module/Regate.php:257 ../../Zotlabs/Module/Regate.php:287
+msgid "Identity unknown"
+msgstr "Личность не установлена"
 
-#: ../../include/photos.php:373
-msgid "a new photo"
-msgstr "новая фотография"
+#: ../../Zotlabs/Module/Regate.php:263
+msgid "dId2 mistaken"
+msgstr "ошибочный dId2"
 
-#: ../../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/Regate.php:291
+msgid "Your Registration ID"
+msgstr "Идентификатор вашей регистрации"
 
-#: ../../include/photos.php:722 ../../include/nav.php:450
-msgid "Photo Albums"
-msgstr "Фотоальбомы"
+#: ../../Zotlabs/Module/Regate.php:304 ../../Zotlabs/Module/Regate.php:396
+#: ../../Zotlabs/Module/Regate.php:428
+msgid "Registration verification"
+msgstr "Проверка регистрации"
 
-#: ../../include/photos.php:723 ../../Zotlabs/Module/Photos.php:1352
-#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1366
-msgid "Recent Photos"
-msgstr "Последние фотографии"
+#: ../../Zotlabs/Module/Regate.php:311 ../../Zotlabs/Module/Regate.php:433
+msgid "Hold on, you can start verification in"
+msgstr "Подождите, вы можете начать проверку через "
 
-#: ../../include/photos.php:727
-msgid "Upload New Photos"
-msgstr "Загрузить новые фотографии"
+#: ../../Zotlabs/Module/Regate.php:312
+msgid "Please remember your verification token for ID"
+msgstr "Пожалуйста, запомните свой код подтверждения для идентификации"
 
-#: ../../include/network.php:1737 ../../include/network.php:1738
-msgid "Friendica"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:314
+msgid "Token validity"
+msgstr "Срок действия кода"
 
-#: ../../include/network.php:1739
-msgid "OStatus"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:350
+msgid "Resend email"
+msgstr "Отправить электронное письмо повторно"
 
-#: ../../include/network.php:1740
-msgid "GNU-Social"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:355
+msgid "Registration status"
+msgstr "Статус регистрации"
 
-#: ../../include/network.php:1741
-msgid "RSS/Atom"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:358
+msgid "Verification successful!"
+msgstr "Проверка прошла успешно! "
 
-#: ../../include/network.php:1744
-msgid "Diaspora"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:359
+msgid "Your login ID is"
+msgstr "Ваш логин для входа"
 
-#: ../../include/network.php:1745
-msgid "Facebook"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:360
+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/network.php:1746
-msgid "Zot"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:372
+msgid "Registration request revoked"
+msgstr "Запрос на регистрацию был отозван"
 
-#: ../../include/network.php:1747
-msgid "LinkedIn"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:373
+msgid "Sorry for any inconvience. Thank you for your response."
+msgstr "Приносим извинения за неудобства. Благодарим за ваш ответ."
 
-#: ../../include/network.php:1748
-msgid "XMPP/IM"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:397
+msgid "Please enter your verification token for ID"
+msgstr "Пожалуйста введите ваш проверочный код для идентификации"
 
-#: ../../include/network.php:1749
-msgid "MySpace"
-msgstr ""
+#: ../../Zotlabs/Module/Regate.php:398 ../../Zotlabs/Module/Regate.php:425
+msgid "Please check your email!"
+msgstr "Пожалуйста, проверьте вашу электронную почту!"
 
-#: ../../include/activities.php:42
-msgid " and "
-msgstr " и "
+#: ../../Zotlabs/Module/Regate.php:408
+msgid "Verification token"
+msgstr "Код проверки"
 
-#: ../../include/activities.php:50
-msgid "public profile"
-msgstr "общедоступный профиль"
+#: ../../Zotlabs/Module/Regate.php:419
+msgid "ID expired"
+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/Regate.php:434
+msgid "You will require the verification token for ID"
+msgstr "Вам потребуется проверочный кода для идентификации"
 
-#: ../../include/activities.php:60
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Посетить %1$s %2$s"
+#: ../../Zotlabs/Module/Regate.php:443
+msgid "Unknown or expired ID"
+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/Regate.php:454
+msgid "dId2 malformed"
+msgstr "Неверный dId2"
 
-#: ../../include/contact_widgets.php:11
+#: ../../Zotlabs/Module/Share.php:104 ../../include/items.php:3306
 #, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "доступно %d приглашение"
-msgstr[1] "доступны %d приглашения"
-msgstr[2] "доступны %d приглашений"
-
-#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:416
-msgid "Advanced"
-msgstr "Дополнительно"
-
-#: ../../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:23 ../../Zotlabs/Module/Directory.php:432
-#: ../../Zotlabs/Module/Directory.php:437
-#: ../../Zotlabs/Module/Connections.php:398
-msgid "Find"
-msgstr "Поиск"
-
-#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:436
-#: ../../Zotlabs/Module/Suggest.php:77
-msgid "Channel Suggestions"
-msgstr "Рекомендации каналов"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Случайный профиль"
+msgid "&#x1f501; Repeated %1$s's %2$s"
+msgstr "&#x1f501; Повторил %1$s %2$s"
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Пригласить друзей"
+#: ../../Zotlabs/Module/Share.php:120
+msgid "Post repeated"
+msgstr "Публикация повторяется"
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Расширенный пример: name=ivan and country=russia"
+#: ../../Zotlabs/Module/Impel.php:47 ../../include/bbcode.php:348
+msgid "webpage"
+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/Impel.php:52 ../../include/bbcode.php:354
+msgid "block"
+msgstr "заблокировать"
 
-#: ../../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/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293
-#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403
-msgid "Categories"
-msgstr "Категории"
+#: ../../Zotlabs/Module/Impel.php:57 ../../include/bbcode.php:351
+msgid "layout"
+msgstr "шаблон"
 
-#: ../../include/contact_widgets.php:269
-msgid "Common Connections"
-msgstr "Общие контакты"
+#: ../../Zotlabs/Module/Impel.php:64 ../../include/bbcode.php:357
+msgid "menu"
+msgstr "меню"
 
-#: ../../include/contact_widgets.php:273
+#: ../../Zotlabs/Module/Impel.php:188
 #, php-format
-msgid "View all %d common connections"
-msgstr "Просмотреть все %d общих контактов"
+msgid "%s element installed"
+msgstr "%s элемент установлен"
 
-#: ../../include/language.php:441
-msgid "Select an alternate language"
-msgstr "Выбор дополнительного языка"
+#: ../../Zotlabs/Module/Impel.php:191
+#, php-format
+msgid "%s element installation failed"
+msgstr "%sустановка элемента неудачна."
 
-#: ../../include/import.php:30
-msgid "Unable to import a removed channel."
-msgstr "Невозможно импортировать удалённый канал."
+#: ../../Zotlabs/Module/Regdir.php:52 ../../Zotlabs/Module/Dirsearch.php:24
+msgid "This site is not a directory server"
+msgstr "Этот сайт не является сервером каталога"
 
-#: ../../include/import.php:56
+#: ../../Zotlabs/Module/Changeaddr.php:35
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен."
+"Channel name changes are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Изменение названия канала не разрешается в течении 48 часов после смены пароля у аккаунта."
 
-#: ../../include/import.php:122
-msgid "Cloned channel not found. Import failed."
-msgstr "Клон канала не найден. Импорт невозможен."
+#: ../../Zotlabs/Module/Changeaddr.php:77
+msgid "Change channel nickname/address"
+msgstr "Изменить псевдоним / адрес канала"
 
-#: ../../include/nav.php:92
-msgid "Remote authentication"
-msgstr "Удаленная аутентификация"
+#: ../../Zotlabs/Module/Changeaddr.php:78
+msgid "Any/all connections on other networks will be lost!"
+msgstr "Любые / все контакты в других сетях будут утеряны!"
 
-#: ../../include/nav.php:92
-msgid "Click to authenticate to your home hub"
-msgstr "Нажмите, чтобы аутентифицировать себя на домашнем узле"
+#: ../../Zotlabs/Module/Changeaddr.php:80
+msgid "New channel address"
+msgstr "Новый адрес канала"
 
-#: ../../include/nav.php:98 ../../Zotlabs/Widget/Admin.php:24
-#: ../../Zotlabs/Module/Admin/Channels.php:146
-#: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116
-msgid "Channels"
-msgstr "Каналы"
+#: ../../Zotlabs/Module/Changeaddr.php:81
+msgid "Rename Channel"
+msgstr "Переименовать канал"
 
-#: ../../include/nav.php:98
-msgid "Manage your channels"
-msgstr "Управление вашими каналами"
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Editlayout.php:128
+msgid "Layout Name"
+msgstr "Название шаблона"
 
-#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:66
-#: ../../Zotlabs/Widget/Newmember.php:53
-#: ../../Zotlabs/Module/Admin/Themes.php:125
-#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343
-msgid "Settings"
-msgstr "Настройки"
+#: ../../Zotlabs/Module/Layouts.php:132 ../../Zotlabs/Module/Editlayout.php:129
+msgid "Layout Description (Optional)"
+msgstr "Описание шаблона (необязательно)"
 
-#: ../../include/nav.php:101
-msgid "Account/Channel Settings"
-msgstr "Настройки аккаунта / канала"
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2767
+msgid "Layouts"
+msgstr "Шаблоны"
 
-#: ../../include/nav.php:107 ../../include/nav.php:137
-#: ../../include/nav.php:158 ../../boot.php:1737
-msgid "Logout"
-msgstr "Выход"
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352
+#: ../../include/help.php:118 ../../include/help.php:126
+#: ../../include/nav.php:177 ../../include/nav.php:316
+msgid "Help"
+msgstr "Помощь"
 
-#: ../../include/nav.php:107 ../../include/nav.php:137
-msgid "End this session"
-msgstr "Закончить эту сессию"
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
+msgstr "Помощь по языку описания страниц Comanche "
 
-#: ../../include/nav.php:110
-msgid "Your profile page"
-msgstr "Страницa вашего профиля"
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
+msgstr "Описание шаблона"
 
-#: ../../include/nav.php:113 ../../include/channel.php:1530
-#: ../../Zotlabs/Module/Profiles.php:851
-msgid "Edit Profiles"
-msgstr "Редактирование профилей"
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Webpages.php:263
+msgid "Created"
+msgstr "Создано"
 
-#: ../../include/nav.php:113
-msgid "Manage/Edit profiles"
-msgstr "Управление / редактирование профилей"
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:158
+#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Webpages.php:264
+msgid "Edited"
+msgstr "Отредактировано"
 
-#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:35
-msgid "Edit your profile"
-msgstr "Редактировать профиль"
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
+msgstr "Загрузить PDL файл"
 
-#: ../../include/nav.php:122 ../../include/nav.php:126
-#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1738
-msgid "Login"
-msgstr "Войти"
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:258 ../../Zotlabs/Module/Pubsites.php:60
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:216
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:412
+msgid "View"
+msgstr "Просмотр"
 
-#: ../../include/nav.php:122 ../../include/nav.php:126
-msgid "Sign in"
-msgstr "Войти"
+#: ../../Zotlabs/Module/Bookmarks.php:62
+msgid "Bookmark added"
+msgstr "Закладка добавлена"
 
-#: ../../include/nav.php:156
-msgid "Take me home"
-msgstr "Домой"
+#: ../../Zotlabs/Module/Bookmarks.php:90 ../../Zotlabs/Lib/Apps.php:333
+#: ../../include/nav.php:494
+msgid "Bookmarks"
+msgstr "Закладки"
 
-#: ../../include/nav.php:158
-msgid "Log me out of this site"
-msgstr "Выйти с этого сайта"
+#: ../../Zotlabs/Module/Bookmarks.php:101
+msgid "My Connections Bookmarks"
+msgstr "Закладки моих контактов"
 
-#: ../../include/nav.php:163 ../../Zotlabs/Module/Register.php:542
-#: ../../boot.php:1715
-msgid "Register"
-msgstr "Регистрация"
+#: ../../Zotlabs/Module/Defperms.php:67 ../../Zotlabs/Module/Contactedit.php:78
+#: ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
+msgstr "Не удалось получить доступ к записи контакта."
 
-#: ../../include/nav.php:163
-msgid "Create an account"
-msgstr "Создать аккаунт"
+#: ../../Zotlabs/Module/Defperms.php:111
+#: ../../Zotlabs/Module/Settings/Channel.php:150
+#: ../../extend/addon/hzaddons/twitter/twitter.php:493
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:82
+#: ../../extend/addon/hzaddons/piwik/piwik.php:116
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:104
+#: ../../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/nav.php:176
-msgid "Help and documentation"
-msgstr "Справочная информация и документация"
+#: ../../Zotlabs/Module/Defperms.php:252
+msgid "Connection Default Permissions"
+msgstr "Разрешения по умолчанию для контакта"
 
-#: ../../include/nav.php:190
-msgid "Search site @name, !forum, #tag, ?docs, content"
-msgstr "Искать на сайте @имя, !форум, #тег, ?документ, содержимое"
+#: ../../Zotlabs/Module/Defperms.php:253
+msgid "Apply these permissions automatically"
+msgstr "Применить эти разрешения автоматически"
 
-#: ../../include/nav.php:196 ../../Zotlabs/Widget/Admin.php:55
-msgid "Admin"
-msgstr "Администрирование"
+#: ../../Zotlabs/Module/Defperms.php:253
+msgid ""
+"If enabled, connection requests will be approved without your interaction"
+msgstr "Если включено, запросы контактов будут одобрены без вашего участия"
 
-#: ../../include/nav.php:196
-msgid "Site Setup and Configuration"
-msgstr "Установка и конфигурация сайта"
+#: ../../Zotlabs/Module/Defperms.php:254
+msgid "Permission role"
+msgstr "Роль разрешения"
 
-#: ../../include/nav.php:319 ../../Zotlabs/Widget/Messages.php:28
-#: ../../Zotlabs/Widget/Notifications.php:166
+#: ../../Zotlabs/Module/Defperms.php:254
 #: ../../Zotlabs/Module/New_channel.php:157
 #: ../../Zotlabs/Module/New_channel.php:164
-#: ../../Zotlabs/Module/Defperms.php:254
+#: ../../Zotlabs/Widget/Notifications.php:172
+#: ../../Zotlabs/Widget/Messages.php:36 ../../include/nav.php:320
 msgid "Loading"
 msgstr "Загрузка"
 
-#: ../../include/nav.php:324
-msgid "@name, #tag, ?doc, content"
-msgstr "@имя, #тег, ?документ, содержимое"
-
-#: ../../include/nav.php:325
-msgid "Please wait..."
-msgstr "Подождите пожалуйста ..."
-
-#: ../../include/nav.php:331 ../../Zotlabs/Lib/Apps.php:327
-msgid "Apps"
-msgstr "Приложения"
-
-#: ../../include/nav.php:332
-msgid "Channel Apps"
-msgstr "Приложения канала"
-
-#: ../../include/nav.php:333
-msgid "System Apps"
-msgstr "Системные приложения"
-
-#: ../../include/nav.php:334
-msgid "Pinned Apps"
-msgstr "Прикреплённые приложения"
-
-#: ../../include/nav.php:335
-msgid "Featured Apps"
-msgstr "Популярные приложения"
-
-#: ../../include/nav.php:424 ../../Zotlabs/Module/Admin/Channels.php:154
-msgid "Channel"
-msgstr "Канал"
-
-#: ../../include/nav.php:427
-msgid "Status Messages and Posts"
-msgstr "Статусы и публикации"
-
-#: ../../include/nav.php:437 ../../Zotlabs/Module/Help.php:83
-msgid "About"
-msgstr "О себе"
-
-#: ../../include/nav.php:440
-msgid "Profile Details"
-msgstr "Информация о профиле"
-
-#: ../../include/nav.php:455 ../../Zotlabs/Widget/Notifications.php:101
-#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:344
-#: ../../Zotlabs/Storage/Browser.php:351
-msgid "Files"
-msgstr "Файлы"
-
-#: ../../include/nav.php:458
-msgid "Files and Storage"
-msgstr "Файлы и хранилище"
-
-#: ../../include/nav.php:480 ../../include/nav.php:483
-#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:334
-msgid "Chatrooms"
-msgstr "Чаты"
-
-#: ../../include/nav.php:493 ../../Zotlabs/Module/Bookmarks.php:90
-#: ../../Zotlabs/Lib/Apps.php:333
-msgid "Bookmarks"
-msgstr "Закладки"
-
-#: ../../include/nav.php:496
-msgid "Saved Bookmarks"
-msgstr "Сохранённые закладки"
-
-#: ../../include/nav.php:504 ../../Zotlabs/Module/Cards.php:205
-#: ../../Zotlabs/Lib/Apps.php:330
-msgid "Cards"
-msgstr "Карточки"
-
-#: ../../include/nav.php:507
-msgid "View Cards"
-msgstr "Просмотреть карточки"
-
-#: ../../include/nav.php:515 ../../Zotlabs/Module/Articles.php:223
-#: ../../Zotlabs/Lib/Apps.php:329
-msgid "Articles"
-msgstr "Статьи"
-
-#: ../../include/nav.php:518
-msgid "View Articles"
-msgstr "Просмотр статей"
+#: ../../Zotlabs/Module/Defperms.php:255
+msgid "Add permission role"
+msgstr "Добавить роль разрешения"
 
-#: ../../include/nav.php:527 ../../Zotlabs/Module/Webpages.php:249
-#: ../../Zotlabs/Lib/Apps.php:345
-msgid "Webpages"
-msgstr "Веб-страницы"
+#: ../../Zotlabs/Module/Defperms.php:259 ../../Zotlabs/Module/Connedit.php:700
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям."
 
-#: ../../include/nav.php:530
-msgid "View Webpages"
-msgstr "Просмотр веб-страниц"
+#: ../../Zotlabs/Module/Defperms.php:260
+msgid "Automatic approval settings"
+msgstr "Настройки автоматического одобрения"
 
-#: ../../include/nav.php:539 ../../Zotlabs/Widget/Wiki_list.php:15
-#: ../../Zotlabs/Module/Wiki.php:203
-msgid "Wikis"
-msgstr ""
+#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Permcats.php:253
+#: ../../Zotlabs/Module/Connedit.php:713
+msgid "inherited"
+msgstr "наследуется"
 
-#: ../../include/nav.php:542 ../../Zotlabs/Lib/Apps.php:346
-msgid "Wiki"
-msgstr ""
+#: ../../Zotlabs/Module/Defperms.php:264
+msgid "My Settings"
+msgstr "Мои настройки"
 
-#: ../../include/auth.php:194
-msgid "Delegation session ended."
-msgstr "Делегированная сессия завершена."
+#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720
+msgid "Individual Permissions"
+msgstr "Индивидуальные разрешения"
 
-#: ../../include/auth.php:198
-msgid "Logged out."
-msgstr "Вышел из системы."
+#: ../../Zotlabs/Module/Defperms.php:268
+msgid ""
+"Some individual permissions may have been preset or locked based on your "
+"channel type and privacy settings."
+msgstr "Некоторые индивидуальные разрешения могут быть предустановлены или заблокированы на основании типа вашего канала и настроек приватности."
 
-#: ../../include/auth.php:294
-msgid "Email validation is incomplete. Please check your email."
-msgstr "Проверка email не завершена. Пожалуйста, проверьте вашу почту."
+#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
+msgid "Authorize application connection"
+msgstr "Авторизовать подключение приложения"
 
-#: ../../include/auth.php:310
-msgid "Failed authentication"
-msgstr "Ошибка аутентификации"
+#: ../../Zotlabs/Module/Api.php:75
+msgid "Return to your app and insert this Security Code:"
+msgstr "Вернитесь к своему приложению и вставьте этот код безопасности:"
 
-#: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Miscellaneous"
-msgstr "Прочее"
+#: ../../Zotlabs/Module/Api.php:85
+msgid "Please login to continue."
+msgstr "Пожалуйста, войдите, чтобы продолжить."
 
-#: ../../include/datetime.php:140
-msgid "Birthday"
-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/datetime.php:140
-msgid "Age: "
-msgstr "Возраст:"
+#: ../../Zotlabs/Module/Xchan.php:10
+msgid "Xchan Lookup"
+msgstr "Поиск Xchan"
 
-#: ../../include/datetime.php:140
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD или MM-DD"
+#: ../../Zotlabs/Module/Xchan.php:13
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Запрос Xchan начинается с (или webbie):"
 
-#: ../../include/datetime.php:238 ../../boot.php:2751
-msgid "never"
-msgstr "никогда"
+#: ../../Zotlabs/Module/Xchan.php:41 ../../Zotlabs/Module/Menu.php:232
+#: ../../Zotlabs/Module/Mitem.php:134
+msgid "Not found."
+msgstr "Не найдено."
 
-#: ../../include/datetime.php:244
-msgid "less than a second ago"
-msgstr "менее чем одну секунду"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
+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/Suggest.php:52
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Нет предложений. Если это новый сайт, повторите попытку через 24 часа."
 
-#: ../../include/datetime.php:273
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "год"
-msgstr[1] "года"
-msgstr[2] "лет"
+#: ../../Zotlabs/Module/Suggest.php:71 ../../Zotlabs/Widget/Suggestions.php:53
+msgid "Ignore/Hide"
+msgstr "Игнорировать / cкрыть"
 
-#: ../../include/datetime.php:276
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "месяц"
-msgstr[1] "месяца"
-msgstr[2] "месяцев"
+#: ../../Zotlabs/Module/Suggest.php:77 ../../Zotlabs/Module/Directory.php:436
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr "Рекомендации каналов"
 
-#: ../../include/datetime.php:279
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "неделю"
-msgstr[1] "недели"
-msgstr[2] "недель"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr "Поиск документации"
 
-#: ../../include/datetime.php:282
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "день"
-msgstr[1] "дня"
-msgstr[2] "дней"
+#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:438
+msgid "About"
+msgstr "О себе"
 
-#: ../../include/datetime.php:285
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "час"
-msgstr[1] "часа"
-msgstr[2] "часов"
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Members"
+msgstr "Участники"
 
-#: ../../include/datetime.php:288
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "минуту"
-msgstr[1] "минуты"
-msgstr[2] "минут"
+#: ../../Zotlabs/Module/Help.php:85
+msgid "Administrators"
+msgstr "Администраторы"
 
-#: ../../include/datetime.php:291
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "секунду"
-msgstr[1] "секунды"
-msgstr[2] "секунд"
+#: ../../Zotlabs/Module/Help.php:86
+msgid "Developers"
+msgstr "Разработчики"
 
-#: ../../include/datetime.php:520
-#, php-format
-msgid "%1$s's birthday"
-msgstr "День рождения %1$s"
+#: ../../Zotlabs/Module/Help.php:87
+msgid "Tutorials"
+msgstr "Руководства"
 
-#: ../../include/datetime.php:521
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "С Днем рождения %1$s !"
+#: ../../Zotlabs/Module/Help.php:98
+msgid "$Projectname Documentation"
+msgstr "$Projectname Документация"
 
-#: ../../include/cdav.php:157
-msgid "INVALID EVENT DISMISSED!"
-msgstr "НЕДЕЙСТВИТЕЛЬНОЕ СОБЫТИЕ ОТКЛОНЕНО!"
+#: ../../Zotlabs/Module/Help.php:99
+msgid "Contents"
+msgstr "Содержимое"
 
-#: ../../include/cdav.php:158
-msgid "Summary: "
-msgstr "Резюме: "
+#: ../../Zotlabs/Module/Filestorage.php:14
+#: ../../Zotlabs/Module/Filestorage.php:53
+msgid "Deprecated!"
+msgstr "Не рекомендовано!"
 
-#: ../../include/cdav.php:158 ../../include/cdav.php:159
-#: ../../include/cdav.php:167 ../../include/conversation.php:1231
-#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Pinned.php:268
-#: ../../Zotlabs/Widget/Portfolio.php:95
-#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:799
-#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1656
-#: ../../Zotlabs/Lib/Apps.php:1146 ../../Zotlabs/Lib/Apps.php:1230
-msgid "Unknown"
-msgstr "Неизвестный"
+#: ../../Zotlabs/Module/Filestorage.php:109
+#: ../../Zotlabs/Module/Attach_edit.php:69
+msgid "File not found."
+msgstr "Файл не найден."
 
-#: ../../include/cdav.php:159
-msgid "Date: "
-msgstr "Дата: "
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Permission Denied."
+msgstr "Доступ запрещен."
 
-#: ../../include/cdav.php:160 ../../include/cdav.php:168
-msgid "Reason: "
-msgstr "Причина: "
+#: ../../Zotlabs/Module/Filestorage.php:190
+msgid "Edit file permissions"
+msgstr "Редактировать разрешения файла"
 
-#: ../../include/cdav.php:166
-msgid "INVALID CARD DISMISSED!"
-msgstr "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!"
+#: ../../Zotlabs/Module/Filestorage.php:202
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:268
+msgid "Set/edit permissions"
+msgstr "Редактировать разрешения"
 
-#: ../../include/cdav.php:167
-msgid "Name: "
-msgstr "Имя: "
+#: ../../Zotlabs/Module/Filestorage.php:203
+msgid "Include all files and sub folders"
+msgstr "Включить все файлы и подкаталоги"
 
-#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:184
-msgid "channel"
-msgstr "канал"
+#: ../../Zotlabs/Module/Filestorage.php:204
+msgid "Return to file list"
+msgstr "Вернутся к списку файлов"
 
-#: ../../include/conversation.php:183
-#, php-format
-msgid "likes %1$s's %2$s"
-msgstr "Нравится %1$s %2$s"
+#: ../../Zotlabs/Module/Filestorage.php:206
+#: ../../Zotlabs/Storage/Browser.php:386
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Копировать / вставить этот код для прикрепления файла к публикации"
 
-#: ../../include/conversation.php:186
-#, php-format
-msgid "doesn't like %1$s's %2$s"
-msgstr "Не нравится %1$s %2$s"
+#: ../../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/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/Filestorage.php:209
+msgid "Share this file"
+msgstr "Поделиться этим файлом"
 
-#: ../../include/conversation.php:263
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ткнул %2$s"
+#: ../../Zotlabs/Module/Filestorage.php:210
+msgid "Show URL to this file"
+msgstr "Показать URL этого файла"
 
-#: ../../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/Filestorage.php:211
+#: ../../Zotlabs/Storage/Browser.php:552
+msgid "Show in your contacts shared folder"
+msgstr "Показать общий каталог в ваших контактах"
 
-#: ../../include/conversation.php:516 ../../Zotlabs/Lib/ThreadItem.php:526
-msgid "This is an unsaved preview"
-msgstr "Это несохранённый просмотр"
+#: ../../Zotlabs/Module/Permcats.php:59
+msgid "Contact role deleted."
+msgstr "Роль контакта удалена."
 
-#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1119
-msgctxt "title"
-msgid "Likes"
-msgstr "Нравится"
+#: ../../Zotlabs/Module/Permcats.php:86
+msgid "Permission category name is required."
+msgstr "Требуется категория разрешений."
 
-#: ../../include/conversation.php:653 ../../Zotlabs/Module/Photos.php:1119
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Не нравится"
+#: ../../Zotlabs/Module/Permcats.php:102 ../../Zotlabs/Module/Permcats.php:154
+msgid "Contact role saved."
+msgstr "Роль контакта сохранена."
 
-#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:77
-#: ../../Zotlabs/Module/Photos.php:1120
-msgctxt "title"
-msgid "Agree"
-msgstr "Согласен"
+#: ../../Zotlabs/Module/Permcats.php:204
+msgid "Role to assign affected contacts and default role to"
+msgstr "Назначить роль выбранных контактов и роль по умолчанию для "
 
-#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:78
-#: ../../Zotlabs/Module/Photos.php:1120
-msgctxt "title"
-msgid "Disagree"
-msgstr "Не согласен"
+#: ../../Zotlabs/Module/Permcats.php:204
+msgid "Role to assign affected contacts to"
+msgstr "Назначить роль выбранных контактов для"
 
-#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:79
-#: ../../Zotlabs/Module/Photos.php:1120
-msgctxt "title"
-msgid "Abstain"
-msgstr "Воздержался"
+#: ../../Zotlabs/Module/Permcats.php:234
+msgid "Assign this role to"
+msgstr "Назначить эту роль для"
 
-#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:66
-#: ../../Zotlabs/Module/Photos.php:1121
-msgctxt "title"
-msgid "Attending"
-msgstr "Посещаю"
+#: ../../Zotlabs/Module/Permcats.php:236
+msgid "All my contacts"
+msgstr "Все мои контакты"
 
-#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:67
-#: ../../Zotlabs/Module/Photos.php:1121
-msgctxt "title"
-msgid "Not attending"
-msgstr "Не посещаю"
+#: ../../Zotlabs/Module/Permcats.php:247
+msgid "Automatically assign this role to new contacts"
+msgstr "Автоматически назначать эту роль для новых контактов"
 
-#: ../../include/conversation.php:659 ../../Zotlabs/Widget/Pinned.php:68
-#: ../../Zotlabs/Module/Photos.php:1121
-msgctxt "title"
-msgid "Might attend"
-msgstr "Возможно посещу"
+#: ../../Zotlabs/Module/Permcats.php:248 ../../Zotlabs/Lib/Apps.php:378
+msgid "Contact Roles"
+msgstr "Роли контактов"
 
-#: ../../include/conversation.php:729 ../../Zotlabs/Lib/ThreadItem.php:204
-msgid "Select"
-msgstr "Выбрать"
+#: ../../Zotlabs/Module/Permcats.php:249
+msgid "Role name"
+msgstr "Наименование роли"
 
-#: ../../include/conversation.php:730 ../../include/conversation.php:784
-#: ../../Zotlabs/Module/Tokens.php:295
-#: ../../Zotlabs/Module/Article_edit.php:128 ../../Zotlabs/Module/Group.php:251
-#: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:172
-#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1055
-#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Webpages.php:254
-#: ../../Zotlabs/Module/Admin/Accounts.php:320
-#: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Admin/Profs.php:176
-#: ../../Zotlabs/Module/Permcats.php:232
-#: ../../Zotlabs/Module/Contactedit.php:660 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1185
-#: ../../Zotlabs/Module/Profiles.php:816 ../../Zotlabs/Module/Oauth2.php:193
-#: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Module/Connedit.php:540
-#: ../../Zotlabs/Module/Connedit.php:749 ../../Zotlabs/Lib/Apps.php:596
-#: ../../Zotlabs/Lib/ThreadItem.php:194 ../../Zotlabs/Storage/Browser.php:384
-msgid "Delete"
-msgstr "Удалить"
+#: ../../Zotlabs/Module/Permcats.php:249
+msgid "System role - not editable"
+msgstr "Системная роль (не редактируется)"
 
-#: ../../include/conversation.php:736 ../../Zotlabs/Lib/ThreadItem.php:297
-msgid "Toggle Star Status"
-msgstr "Переключить статус пометки"
+#: ../../Zotlabs/Module/Permcats.php:250
+msgid "Deleting"
+msgstr "Удаляем"
 
-#: ../../include/conversation.php:742
-msgid "Private Message"
-msgstr "Личное сообщение"
+#: ../../Zotlabs/Module/Permcats.php:255
+msgid "Role Permissions"
+msgstr "Разрешения роли"
 
-#: ../../include/conversation.php:751 ../../Zotlabs/Widget/Pinned.php:88
-#: ../../Zotlabs/Lib/ThreadItem.php:308
-msgid "Message signature validated"
-msgstr "Подпись сообщения проверена"
+#: ../../Zotlabs/Module/Permcats.php:256
+msgid ""
+"Some permissions may be inherited from your <a href=\"settings\">channel "
+"role</a>, which have higher priority than contact role settings."
+msgstr "Некоторые разрешения могут быть унаследованы от вашей <a href=\"settings\">роли канала</a>, которые имеют более высокий приоритет, чем настройки роли контакта."
 
-#: ../../include/conversation.php:752 ../../Zotlabs/Widget/Pinned.php:89
-#: ../../Zotlabs/Lib/ThreadItem.php:309
-msgid "Message signature incorrect"
-msgstr "Подпись сообщения неверная"
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
+msgstr "Название блока"
 
-#: ../../include/conversation.php:783
-#: ../../Zotlabs/Module/Admin/Accounts.php:318
-#: ../../Zotlabs/Module/Connections.php:349
-#: ../../Zotlabs/Module/Connections.php:400
-msgid "Approve"
-msgstr "Утвердить"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr "Редактировать блок"
 
-#: ../../include/conversation.php:789
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Просмотреть профиль %s @ %s"
+#: ../../Zotlabs/Module/Tagger.php:50
+msgid "Post not found."
+msgstr "Публикация не найдена"
 
-#: ../../include/conversation.php:810
-msgid "Categories:"
-msgstr "Категории:"
+#: ../../Zotlabs/Module/Tagger.php:75 ../../Zotlabs/Module/Like.php:447
+#: ../../Zotlabs/Module/Channel_calendar.php:221 ../../include/event.php:1347
+#: ../../include/conversation.php:132 ../../include/text.php:2331
+msgid "event"
+msgstr "событие"
 
-#: ../../include/conversation.php:811
-msgid "Filed under:"
-msgstr "Хранить под:"
+#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3528
+#: ../../include/conversation.php:158 ../../include/bbcode.php:555
+#: ../../include/markdown.php:205 ../../include/text.php:2334
+msgid "post"
+msgstr "публикация"
 
-#: ../../include/conversation.php:817 ../../Zotlabs/Widget/Pinned.php:132
-#: ../../Zotlabs/Lib/ThreadItem.php:454
-#, php-format
-msgid "from %s"
-msgstr "от %s"
+#: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160
+#: ../../include/text.php:2336
+msgid "comment"
+msgstr "комментарий"
 
-#: ../../include/conversation.php:820 ../../Zotlabs/Widget/Pinned.php:135
-#: ../../Zotlabs/Lib/ThreadItem.php:457
+#: ../../Zotlabs/Module/Tagger.php:121
 #, php-format
-msgid "last edited: %s"
-msgstr "последнее редактирование: %s"
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s отметил тегом %4$s %3$s %2$s"
 
-#: ../../include/conversation.php:821 ../../Zotlabs/Widget/Pinned.php:136
-#: ../../Zotlabs/Lib/ThreadItem.php:458
-#, php-format
-msgid "Expires: %s"
-msgstr "Срок действия: %s"
+#: ../../Zotlabs/Module/Pdledit.php:27
+msgid "Layout updated."
+msgstr "Шаблон обновлен."
 
-#: ../../include/conversation.php:836
-msgid "View in context"
-msgstr "Показать в контексте"
+#: ../../Zotlabs/Module/Pdledit.php:55 ../../Zotlabs/Module/Pdledit.php:98
+msgid "Edit System Page Description"
+msgstr "Редактировать описание системной страницы"
 
-#: ../../include/conversation.php:838 ../../Zotlabs/Module/Photos.php:1085
-#: ../../Zotlabs/Lib/ThreadItem.php:527
-msgid "Please wait"
-msgstr "Подождите пожалуйста"
+#: ../../Zotlabs/Module/Pdledit.php:76
+msgid "(modified)"
+msgstr "(изменено)"
 
-#: ../../include/conversation.php:938
-msgid "remove"
-msgstr "удалить"
+#: ../../Zotlabs/Module/Pdledit.php:93
+msgid "Layout not found."
+msgstr "Шаблон не найден."
 
-#: ../../include/conversation.php:942
-msgid "Loading..."
-msgstr "Загрузка..."
+#: ../../Zotlabs/Module/Pdledit.php:99
+msgid "Module Name:"
+msgstr "Имя модуля:"
 
-#: ../../include/conversation.php:943 ../../Zotlabs/Lib/ThreadItem.php:325
-msgid "Conversation Features"
-msgstr "Возможности бесед"
+#: ../../Zotlabs/Module/Pdledit.php:100
+msgid "Layout Help"
+msgstr "Помощь к шаблону"
 
-#: ../../include/conversation.php:944
-msgid "Delete Selected Items"
-msgstr "Удалить выбранные элементы"
+#: ../../Zotlabs/Module/Pdledit.php:101
+msgid "Edit another layout"
+msgstr "Редактировать другой шаблон"
 
-#: ../../include/conversation.php:988
-msgid "View Source"
-msgstr "Просмотреть источник"
+#: ../../Zotlabs/Module/Pdledit.php:102
+msgid "System layout"
+msgstr "Системный шаблон"
 
-#: ../../include/conversation.php:998
-msgid "Follow Thread"
-msgstr "Следить за темой"
+#: ../../Zotlabs/Module/Chat.php:192
+msgid "Room not found"
+msgstr "Комната не найдена"
 
-#: ../../include/conversation.php:1007
-msgid "Unfollow Thread"
-msgstr "Прекратить отслеживать тему"
+#: ../../Zotlabs/Module/Chat.php:208
+msgid "Leave Room"
+msgstr "Покинуть комнату"
 
-#: ../../include/conversation.php:1098 ../../Zotlabs/Module/Connedit.php:501
-msgid "Recent Activity"
-msgstr "Последние действия"
+#: ../../Zotlabs/Module/Chat.php:209
+msgid "Delete Room"
+msgstr "Удалить комнату"
 
-#: ../../include/conversation.php:1110 ../../include/connections.php:112
-#: ../../include/channel.php:1610 ../../Zotlabs/Widget/Suggestions.php:46
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:369
-#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Suggest.php:69
-msgid "Connect"
-msgstr "Подключить"
+#: ../../Zotlabs/Module/Chat.php:210
+msgid "I am away right now"
+msgstr "Я сейчас отошёл"
 
-#: ../../include/conversation.php:1122
-msgid "Edit Connection"
-msgstr "Редактировать контакт"
+#: ../../Zotlabs/Module/Chat.php:211
+msgid "I am online"
+msgstr "Я на связи"
 
-#: ../../include/conversation.php:1134
-#: ../../Zotlabs/Module/Admin/Accounts.php:347
-msgid "Message"
-msgstr "Сообщение"
+#: ../../Zotlabs/Module/Chat.php:213
+msgid "Bookmark this room"
+msgstr "Запомнить эту комнату"
 
-#: ../../include/conversation.php:1146 ../../Zotlabs/Module/Pubsites.php:35
-msgid "Ratings"
-msgstr "Оценки"
+#: ../../Zotlabs/Module/Chat.php:216 ../../include/conversation.php:1406
+#: ../../extend/addon/hzaddons/hsse/hsse.php:134
+msgid "Please enter a link URL:"
+msgstr "Пожалуйста введите URL ссылки:"
 
-#: ../../include/conversation.php:1158 ../../Zotlabs/Module/Poke.php:197
-#: ../../Zotlabs/Lib/Apps.php:355
-msgid "Poke"
-msgstr "Ткнуть"
+#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:866
+#: ../../include/conversation.php:1537
+#: ../../extend/addon/hzaddons/hsse/hsse.php:255
+msgid "Encrypt text"
+msgstr "Зашифровать текст"
 
-#: ../../include/conversation.php:1282
-#, php-format
-msgid "%s likes this."
-msgstr "%s нравится это."
+#: ../../Zotlabs/Module/Chat.php:236
+msgid "New Chatroom"
+msgstr "Новый чат"
 
-#: ../../include/conversation.php:1282
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s не нравится это."
+#: ../../Zotlabs/Module/Chat.php:237
+msgid "Chatroom name"
+msgstr "Название чата"
 
-#: ../../include/conversation.php:1286
-#, 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/Chat.php:238
+msgid "Expiration of chats (minutes)"
+msgstr "Завершение чатов (минут)"
 
-#: ../../include/conversation.php:1288
+#: ../../Zotlabs/Module/Chat.php:254
 #, 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> это не нравится."
-
-#: ../../include/conversation.php:1294
-msgid "and"
-msgstr "и"
+msgid "%1$s's Chatrooms"
+msgstr "Чаты пользователя %1$s"
 
-#: ../../include/conversation.php:1297
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ", и ещё %d человеку"
-msgstr[1] ", и ещё %d человекам"
-msgstr[2] ", и ещё %d человекам"
+#: ../../Zotlabs/Module/Chat.php:259
+msgid "No chatrooms available"
+msgstr "Нет доступных чатов"
 
-#: ../../include/conversation.php:1298
-#, php-format
-msgid "%s like this."
-msgstr "%s нравится это."
+#: ../../Zotlabs/Module/Chat.php:260
+msgid "Add Room"
+msgstr "Добавить комнату"
 
-#: ../../include/conversation.php:1298
-#, php-format
-msgid "%s don't like this."
-msgstr "%s не нравится это."
+#: ../../Zotlabs/Module/Chat.php:263
+msgid "Expiration"
+msgstr "Срок действия"
 
-#: ../../include/conversation.php:1482
-msgid "Toggle poll"
-msgstr "Переключить опрос"
+#: ../../Zotlabs/Module/Chat.php:264
+msgid "min"
+msgstr "мин."
 
-#: ../../include/conversation.php:1483
-msgid "Option"
-msgstr "Вариант"
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2765
+msgid "Blocks"
+msgstr "Блокировки"
 
-#: ../../include/conversation.php:1484
-msgid "Add option"
-msgstr "Добавить вариант"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Заблокировать заголовок"
 
-#: ../../include/conversation.php:1485
-msgid "Minutes"
-msgstr "Минут"
+#: ../../Zotlabs/Module/Settings/Privacy.php:39
+msgid "Privacy settings updated."
+msgstr "Настройки конфиденциальности обновлены."
 
-#: ../../include/conversation.php:1485
-msgid "Hours"
-msgstr "Часов"
+#: ../../Zotlabs/Module/Settings/Privacy.php:56
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:136
+msgid "Only me"
+msgstr "Только мне"
 
-#: ../../include/conversation.php:1485
-msgid "Days"
-msgstr "Дней"
+#: ../../Zotlabs/Module/Settings/Privacy.php:57
+msgid "Only those you specifically allow"
+msgstr "Только персонально разрешённые"
 
-#: ../../include/conversation.php:1486
-msgid "Allow multiple answers"
-msgstr "Разрешить несколько ответов"
+#: ../../Zotlabs/Module/Settings/Privacy.php:58
+msgid "Approved connections"
+msgstr "Одобренные контакты"
 
-#: ../../include/conversation.php:1496
-msgid "Summary (optional)"
-msgstr "Резюме (необязательно)"
+#: ../../Zotlabs/Module/Settings/Privacy.php:59
+msgid "Any connections"
+msgstr "Любые контакты"
 
-#: ../../include/conversation.php:1768 ../../include/taxonomy.php:670
-#: ../../include/channel.php:1774 ../../Zotlabs/Module/Photos.php:1142
-#: ../../Zotlabs/Lib/ThreadItem.php:266
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Нравится"
-msgstr[1] "Нравится"
-msgstr[2] "Нравится"
+#: ../../Zotlabs/Module/Settings/Privacy.php:60
+msgid "Anybody on this website"
+msgstr "Любой на этом сайте"
 
-#: ../../include/conversation.php:1771 ../../Zotlabs/Module/Photos.php:1147
-#: ../../Zotlabs/Lib/ThreadItem.php:271
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Не нравится"
-msgstr[1] "Не нравится"
-msgstr[2] "Не нравится"
+#: ../../Zotlabs/Module/Settings/Privacy.php:61
+msgid "Anybody in this network"
+msgstr "Любой в этой сети"
 
-#: ../../include/conversation.php:1774
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Посетит"
-msgstr[1] "Посетят"
-msgstr[2] "Посетят"
+#: ../../Zotlabs/Module/Settings/Privacy.php:62
+msgid "Anybody authenticated"
+msgstr "Любой аутентифицированный"
 
-#: ../../include/conversation.php:1777
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Не посетит"
-msgstr[1] "Не посетят"
-msgstr[2] "Не посетят"
+#: ../../Zotlabs/Module/Settings/Privacy.php:63
+msgid "Anybody on the internet"
+msgstr "Любой в интернете"
 
-#: ../../include/conversation.php:1780
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr "Не решил"
+#: ../../Zotlabs/Module/Settings/Privacy.php:73
+msgid ""
+"Advise: set to \"Anybody on the internet\" and use privacy groups to "
+"restrict access"
+msgstr "Совет: установите значение «Кто угодно в Интернете» и используйте группы конфиденциальности для ограничения доступа."
 
-#: ../../include/conversation.php:1783
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "Согласен"
-msgstr[1] "Согласны"
-msgstr[2] "Согласны"
+#: ../../Zotlabs/Module/Settings/Privacy.php:109
+msgid "Privacy Settings"
+msgstr "Настройки конфиденциальности"
 
-#: ../../include/conversation.php:1786
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "Не согласен"
-msgstr[1] "Не согласны"
-msgstr[2] "Не согласны"
+#: ../../Zotlabs/Module/Settings/Privacy.php:114
+msgid "Advanced configuration"
+msgstr "Расширенная конфигурация"
 
-#: ../../include/conversation.php:1789
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "Воздержался"
-msgstr[1] "Воздержались"
-msgstr[2] "Воздержались"
+#: ../../Zotlabs/Module/Settings/Privacy.php:116
+msgid "Proceed with caution"
+msgstr "Применять с осторожностью"
 
-#: ../../include/selectors.php:17
-msgid "Select a profile to assign to this contact"
-msgstr "Выберите профиль для этого контакта"
+#: ../../Zotlabs/Module/Settings/Privacy.php:117
+msgid ""
+"Changing advanced configuration settings can impact your, and your contacts "
+"channels functionality and security."
+msgstr "Изменение дополнительных параметров конфигурации может повлиять на работу и безопасность ваших каналов и контактов."
 
-#: ../../include/selectors.php:45
-msgid "Frequently"
-msgstr "Часто"
+#: ../../Zotlabs/Module/Settings/Privacy.php:118
+msgid "Accept the risk and continue"
+msgstr "Принять риск и продолжить"
 
-#: ../../include/selectors.php:46
-msgid "Hourly"
-msgstr "Ежечасно"
+#: ../../Zotlabs/Module/Settings/Privacy.php:120
+msgid "Automatically approve new contacts"
+msgstr "Автоматически одобрять новые контакты"
 
-#: ../../include/selectors.php:47
-msgid "Twice daily"
-msgstr "Дважды в день"
+#: ../../Zotlabs/Module/Settings/Privacy.php:121
+msgid "Opt-out of search engine indexing"
+msgstr "Исключить из индексирования поисковых систем"
 
-#: ../../include/selectors.php:48
-msgid "Daily"
-msgstr "Ежедневно"
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Group actor"
+msgstr "Представление группы"
 
-#: ../../include/selectors.php:49
-msgid "Weekly"
-msgstr "Еженедельно"
+#: ../../Zotlabs/Module/Settings/Privacy.php:122
+msgid "Allow this channel to act as a forum"
+msgstr "Разрешить выступать этому каналу в качестве форума"
 
-#: ../../include/selectors.php:50
-msgid "Monthly"
-msgstr "Ежемесячно"
+#: ../../Zotlabs/Module/Settings/Directory.php:40
+msgid "Directory Settings"
+msgstr "Настройки каталога"
 
-#: ../../include/selectors.php:64
-msgid "Currently Male"
-msgstr "В настоящее время мужской"
+#: ../../Zotlabs/Module/Settings/Account.php:21
+msgid "Not valid email."
+msgstr "Не действительный адрес email."
 
-#: ../../include/selectors.php:64
-msgid "Currently Female"
-msgstr "В настоящее время женский"
+#: ../../Zotlabs/Module/Settings/Account.php:24
+msgid "Protected email address. Cannot change to that email."
+msgstr "Защищенный адрес электронной почты. Нельзя изменить."
 
-#: ../../include/selectors.php:64
-msgid "Mostly Male"
-msgstr "В основном мужской"
+#: ../../Zotlabs/Module/Settings/Account.php:33
+msgid "System failure storing new email. Please try again."
+msgstr "Системная ошибка сохранения email. Пожалуйста попробуйте ещё раз."
 
-#: ../../include/selectors.php:64
-msgid "Mostly Female"
-msgstr "В основном женский"
+#: ../../Zotlabs/Module/Settings/Account.php:51
+msgid "Password verification failed."
+msgstr "Не удалось выполнить проверку пароля."
 
-#: ../../include/selectors.php:64
-msgid "Transgender"
-msgstr "Трансгендер"
+#: ../../Zotlabs/Module/Settings/Account.php:58
+msgid "Passwords do not match. Password unchanged."
+msgstr "Пароли не совпадают. Пароль не изменён."
 
-#: ../../include/selectors.php:64
-msgid "Intersex"
-msgstr "Интерсексуал"
+#: ../../Zotlabs/Module/Settings/Account.php:62
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Пустые пароли не допускаются. Пароль не изменён."
 
-#: ../../include/selectors.php:64
-msgid "Transsexual"
-msgstr "Транссексуал"
+#: ../../Zotlabs/Module/Settings/Account.php:76
+msgid "Password changed."
+msgstr "Пароль изменен."
 
-#: ../../include/selectors.php:64
-msgid "Hermaphrodite"
-msgstr "Гермафродит"
+#: ../../Zotlabs/Module/Settings/Account.php:78
+msgid "Password update failed. Please try again."
+msgstr "Изменение пароля не удалось. Пожалуйста, попробуйте ещё раз."
 
-#: ../../include/selectors.php:64 ../../include/channel.php:1719
-msgid "Neuter"
-msgstr "Среднего рода"
+#: ../../Zotlabs/Module/Settings/Account.php:103
+msgid "Account Settings"
+msgstr "Настройки аккаунта"
 
-#: ../../include/selectors.php:64 ../../include/channel.php:1721
-msgid "Non-specific"
-msgstr "Неспецифический"
+#: ../../Zotlabs/Module/Settings/Account.php:104
+msgid "Current Password"
+msgstr "Текущий пароль"
 
-#: ../../include/selectors.php:64
-msgid "Undecided"
-msgstr "Не решил"
+#: ../../Zotlabs/Module/Settings/Account.php:105
+msgid "Enter New Password"
+msgstr "Введите новый пароль:"
 
-#: ../../include/selectors.php:100 ../../include/selectors.php:119
-msgid "Males"
-msgstr "Мужчины"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Confirm New Password"
+msgstr "Подтвердите новый пароль:"
 
-#: ../../include/selectors.php:100 ../../include/selectors.php:119
-msgid "Females"
-msgstr "Женщины"
+#: ../../Zotlabs/Module/Settings/Account.php:106
+msgid "Leave password fields blank unless changing"
+msgstr "Оставьте поля пустыми до измнения"
 
-#: ../../include/selectors.php:100
-msgid "Gay"
-msgstr "Гей"
+#: ../../Zotlabs/Module/Settings/Account.php:108
+msgid "DId2 or Email Address:"
+msgstr "dId2 или адрес электронной почты:"
 
-#: ../../include/selectors.php:100
-msgid "Lesbian"
-msgstr "Лесбиянка"
+#: ../../Zotlabs/Module/Settings/Account.php:110
+msgid "Remove this account including all its channels"
+msgstr "Удалить этот аккаунт включая все каналы"
 
-#: ../../include/selectors.php:100
-msgid "No Preference"
-msgstr "Без предпочтений"
+#: ../../Zotlabs/Module/Settings/Calendar.php:40
+msgid "Calendar Settings"
+msgstr "Настройки календаря"
 
-#: ../../include/selectors.php:100
-msgid "Bisexual"
-msgstr "Бисексуал"
+#: ../../Zotlabs/Module/Settings/Manage.php:41
+msgid "Channel Manager Settings"
+msgstr "Настройки менеджера канала"
 
-#: ../../include/selectors.php:100
-msgid "Autosexual"
-msgstr "Автосексуал"
+#: ../../Zotlabs/Module/Settings/Network.php:42
+#: ../../Zotlabs/Module/Settings/Channel_home.php:46
+msgid "Max height of content (in pixels)"
+msgstr "Максимальная высота содержимого (в пикселях)"
 
-#: ../../include/selectors.php:100
-msgid "Abstinent"
-msgstr "Воздержание"
+#: ../../Zotlabs/Module/Settings/Network.php:44
+#: ../../Zotlabs/Module/Settings/Channel_home.php:48
+msgid "Click to expand content exceeding this height"
+msgstr "Нажмите чтобы развернуть содержимое превышающее эту высоту"
 
-#: ../../include/selectors.php:100
-msgid "Virgin"
-msgstr "Девственник"
+#: ../../Zotlabs/Module/Settings/Network.php:59
+msgid "Stream Settings"
+msgstr "Настройки потока"
 
-#: ../../include/selectors.php:100
-msgid "Deviant"
-msgstr "Отклоняющийся от нормы"
+#: ../../Zotlabs/Module/Settings/Conversation.php:23
+msgid "Settings saved."
+msgstr "Настройки сохранены."
 
-#: ../../include/selectors.php:100
-msgid "Fetish"
-msgstr "Фетишист"
+#: ../../Zotlabs/Module/Settings/Conversation.php:25
+msgid "Settings saved. Reload page please."
+msgstr "Настройки сохранены. Пожалуйста, перезагрузите страницу."
 
-#: ../../include/selectors.php:100
-msgid "Oodles"
-msgstr "Множественный"
+#: ../../Zotlabs/Module/Settings/Conversation.php:47
+msgid "Conversation Settings"
+msgstr "Настройки бесед"
 
-#: ../../include/selectors.php:100
-msgid "Nonsexual"
-msgstr "Асексуал"
+#: ../../Zotlabs/Module/Settings/Features.php:45
+msgid "Additional Features"
+msgstr "Дополнительные функции"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Single"
-msgstr "Одиночка"
+#: ../../Zotlabs/Module/Settings/Display.php:125
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (экспериментальный)"
 
-#: ../../include/selectors.php:138
-msgid "Lonely"
-msgstr "Одинокий"
+#: ../../Zotlabs/Module/Settings/Display.php:181
+msgid "Display Settings"
+msgstr "Настройки отображения"
 
-#: ../../include/selectors.php:138
-msgid "Available"
-msgstr "Свободен"
+#: ../../Zotlabs/Module/Settings/Display.php:182
+msgid "Theme Settings"
+msgstr "Настройки темы"
 
-#: ../../include/selectors.php:138
-msgid "Unavailable"
-msgstr "Занят"
+#: ../../Zotlabs/Module/Settings/Display.php:183
+msgid "Custom Theme Settings"
+msgstr "Дополнительные настройки темы"
 
-#: ../../include/selectors.php:138
-msgid "Has crush"
-msgstr "Влюблён"
+#: ../../Zotlabs/Module/Settings/Display.php:184
+msgid "Content Settings"
+msgstr "Настройки содержимого"
 
-#: ../../include/selectors.php:138
-msgid "Infatuated"
-msgstr "без ума"
+#: ../../Zotlabs/Module/Settings/Display.php:190
+msgid "Display Theme:"
+msgstr "Тема отображения:"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Dating"
-msgstr "Встречаюсь"
+#: ../../Zotlabs/Module/Settings/Display.php:191
+msgid "Select scheme"
+msgstr "Выбрать схему"
 
-#: ../../include/selectors.php:138
-msgid "Unfaithful"
-msgstr "Неверный"
+#: ../../Zotlabs/Module/Settings/Display.php:193
+msgid "Preload images before rendering the page"
+msgstr "Предзагрузка изображений перед обработкой страницы"
 
-#: ../../include/selectors.php:138
-msgid "Sex Addict"
-msgstr "Эротоман"
+#: ../../Zotlabs/Module/Settings/Display.php:193
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
+msgstr "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении"
 
-#: ../../include/selectors.php:138 ../../include/channel.php:456
-#: ../../include/channel.php:459 ../../Zotlabs/Widget/Affinity.php:32
-#: ../../Zotlabs/Module/Contactedit.php:297
-#: ../../Zotlabs/Module/Connedit.php:581
-msgid "Friends"
-msgstr "Друзья"
+#: ../../Zotlabs/Module/Settings/Display.php:194
+msgid "Enable user zoom on mobile devices"
+msgstr "Включить масштабирование на мобильных устройствах"
 
-#: ../../include/selectors.php:138
-msgid "Friends/Benefits"
-msgstr "Друзья / Выгоды"
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid "Update browser every xx seconds"
+msgstr "Обновление браузера каждые N секунд"
 
-#: ../../include/selectors.php:138
-msgid "Casual"
-msgstr "Легкомысленный"
+#: ../../Zotlabs/Module/Settings/Display.php:195
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Минимум 10 секунд, без максимума"
 
-#: ../../include/selectors.php:138
-msgid "Engaged"
-msgstr "Помолвлен"
+#: ../../Zotlabs/Module/Settings/Display.php:196
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Максимальное количество бесед для загрузки одновременно:"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Married"
-msgstr "В браке"
+#: ../../Zotlabs/Module/Settings/Display.php:196
+msgid "Maximum of 30 items"
+msgstr "Не более 30 элементов"
 
-#: ../../include/selectors.php:138
-msgid "Imaginarily married"
-msgstr "В воображаемом браке"
+#: ../../Zotlabs/Module/Settings/Display.php:197
+msgid "Show emoticons (smilies) as images"
+msgstr "Показывать эмотиконы (смайлики) как изображения"
 
-#: ../../include/selectors.php:138
-msgid "Partners"
-msgstr "Партнёрство"
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Link post titles to source"
+msgstr "Ссылки на источник заголовков публикаций"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Cohabiting"
-msgstr "Сожительствующие"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+#: ../../Zotlabs/Widget/Newmember.php:80
+msgid "New Member Links"
+msgstr "Ссылки для новичков"
 
-#: ../../include/selectors.php:138
-msgid "Common law"
-msgstr "Гражданский брак"
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Display new member quick links menu"
+msgstr "Показать меню быстрых ссылок для новых участников"
 
-#: ../../include/selectors.php:138
-msgid "Happy"
-msgstr "Счастлив"
+#: ../../Zotlabs/Module/Settings/Editor.php:40
+msgid "Editor Settings"
+msgstr "Настройки редактора"
 
-#: ../../include/selectors.php:138
-msgid "Not looking"
-msgstr "Не нуждаюсь"
+#: ../../Zotlabs/Module/Settings/Photos.php:40
+msgid "Photos Settings"
+msgstr "Настройки фотографий"
 
-#: ../../include/selectors.php:138
-msgid "Swinger"
-msgstr "Свингер"
+#: ../../Zotlabs/Module/Settings/Events.php:40
+msgid "Events Settings"
+msgstr "Настройки событий"
 
-#: ../../include/selectors.php:138
-msgid "Betrayed"
-msgstr "Предан"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:61
+msgid "Personal menu to display in your channel pages"
+msgstr "Персональное меню для отображения на странице вашего канала"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Separated"
-msgstr "Разделён"
+#: ../../Zotlabs/Module/Settings/Channel_home.php:88
+msgid "Channel Home Settings"
+msgstr "Настройки главной страницы канала"
 
-#: ../../include/selectors.php:138
-msgid "Unstable"
-msgstr "Нестабильно"
+#: ../../Zotlabs/Module/Settings/Profiles.php:41
+msgid "Default profile for new contacts"
+msgstr "Профиль по умолчанию для новых контактов"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Divorced"
-msgstr "В разводе"
+#: ../../Zotlabs/Module/Settings/Profiles.php:49
+msgid "Profiles Settings"
+msgstr "Настройки профилей"
 
-#: ../../include/selectors.php:138
-msgid "Imaginarily divorced"
-msgstr "В воображаемом разводе"
+#: ../../Zotlabs/Module/Settings/Channel.php:105
+#: ../../Zotlabs/Module/Settings/Channel.php:216
+msgid "Please select a channel role"
+msgstr "Пожалуйста, выберите роль канала"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "Widowed"
-msgstr "Вдовец / вдова"
+#: ../../Zotlabs/Module/Settings/Channel.php:193
+msgid "Your channel address is"
+msgstr "Адрес вашего канала"
 
-#: ../../include/selectors.php:138
-msgid "Uncertain"
-msgstr "Неопределенный"
+#: ../../Zotlabs/Module/Settings/Channel.php:196
+msgid "Your files/photos are accessible via WebDAV at"
+msgstr "Ваши файлы / фотографии доступны через WebDAV по"
 
-#: ../../include/selectors.php:138 ../../include/selectors.php:155
-msgid "It's complicated"
-msgstr "Это сложно"
+#: ../../Zotlabs/Module/Settings/Channel.php:227
+msgid "Channel Settings"
+msgstr "Настройки канала"
 
-#: ../../include/selectors.php:138
-msgid "Don't care"
-msgstr "Всё равно"
+#: ../../Zotlabs/Module/Settings/Channel.php:232
+#: ../../Zotlabs/Module/New_channel.php:178
+msgid "Channel role"
+msgstr "Роль канала"
 
-#: ../../include/selectors.php:138
-msgid "Ask me"
-msgstr "Спроси меня"
+#: ../../Zotlabs/Module/Settings/Channel.php:234
+msgid "Basic Settings"
+msgstr "Основные настройки"
 
-#: ../../include/connections.php:136
-msgid "New window"
-msgstr "Новое окно"
+#: ../../Zotlabs/Module/Settings/Channel.php:235
+msgid "Channel timezone:"
+msgstr "Часовой пояс канала:"
 
-#: ../../include/connections.php:137
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера"
+#: ../../Zotlabs/Module/Settings/Channel.php:236
+msgid "Default post location:"
+msgstr "Местоположение публикации по умолчанию:"
 
-#: ../../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/Settings/Channel.php:236
+msgid "Geographical location to display on your posts"
+msgstr "Показывать географическое положение в ваших публикациях"
 
-#: ../../include/group.php:271
-msgid "Add new connections to this privacy group"
-msgstr "Добавить новые контакты в группу конфиденциальности"
+#: ../../Zotlabs/Module/Settings/Channel.php:237
+msgid "Use browser location"
+msgstr "Использовать данные о местоположении из браузера"
 
-#: ../../include/group.php:305
-msgid "edit"
-msgstr "редактировать"
+#: ../../Zotlabs/Module/Settings/Channel.php:238
+msgid "Adult content"
+msgstr "Содержимое для взрослых"
 
-#: ../../include/group.php:327 ../../include/acl_selectors.php:87
-#: ../../Zotlabs/Widget/Activity_filter.php:88
-#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:368
-msgid "Privacy Groups"
-msgstr "Группы конфиденциальности"
+#: ../../Zotlabs/Module/Settings/Channel.php:238
+msgid "This channel frequently or regularly publishes adult content"
+msgstr "На этом канале часто или регулярно публикуется контент для взрослых"
 
-#: ../../include/group.php:328
-msgid "Edit group"
-msgstr "Редактировать группу"
+#: ../../Zotlabs/Module/Settings/Channel.php:239
+msgid "Maximum Friend Requests/Day:"
+msgstr "Запросов в друзья в день:"
 
-#: ../../include/group.php:329
-msgid "Manage privacy groups"
-msgstr "Управлять группами конфиденциальности"
+#: ../../Zotlabs/Module/Settings/Channel.php:239
+msgid "May reduce spam activity"
+msgstr "Может ограничить спам активность"
 
-#: ../../include/group.php:330
-msgid "Channels not in any privacy group"
-msgstr "Каналы не включены ни в одну группу конфиденциальности"
+#: ../../Zotlabs/Module/Settings/Channel.php:240
+#: ../../Zotlabs/Lib/Enotify.php:68
+msgid "Notification Settings"
+msgstr "Настройки уведомлений"
 
-#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84
-msgid "add"
-msgstr "добавить"
+#: ../../Zotlabs/Module/Settings/Channel.php:241
+msgid "By default post a status message when:"
+msgstr "По умолчанию публиковать новый статус при:"
 
-#: ../../include/taxonomy.php:323
-msgid "Trending"
-msgstr "В тренде"
+#: ../../Zotlabs/Module/Settings/Channel.php:242
+msgid "accepting a friend request"
+msgstr "одобрении запроса в друзья"
 
-#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:460
-#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:22
-msgid "Tags"
-msgstr "Теги"
+#: ../../Zotlabs/Module/Settings/Channel.php:243
+msgid "joining a forum/community"
+msgstr "вступлении в сообщество / форум"
 
-#: ../../include/taxonomy.php:561
-msgid "Keywords"
-msgstr "Ключевые слова"
+#: ../../Zotlabs/Module/Settings/Channel.php:244
+msgid "making an <em>interesting</em> profile change"
+msgstr "<em>интересном</em> изменении профиля"
 
-#: ../../include/taxonomy.php:582
-msgid "have"
-msgstr "иметь"
+#: ../../Zotlabs/Module/Settings/Channel.php:245
+msgid "Send a notification email when:"
+msgstr "Отправить уведомление по email когда:"
 
-#: ../../include/taxonomy.php:582
-msgid "has"
-msgstr "есть"
+#: ../../Zotlabs/Module/Settings/Channel.php:246
+msgid "You receive a connection request"
+msgstr "вы получили новый запрос контакта"
 
-#: ../../include/taxonomy.php:583
-msgid "want"
-msgstr "хотеть"
+#: ../../Zotlabs/Module/Settings/Channel.php:247
+msgid "Your connections are confirmed"
+msgstr "Ваш запрос контакта был одобрен"
 
-#: ../../include/taxonomy.php:583
-msgid "wants"
-msgstr "хотеть"
+#: ../../Zotlabs/Module/Settings/Channel.php:248
+msgid "Someone writes on your profile wall"
+msgstr "Кто-то написал на стене вашего профиля"
 
-#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:341
-msgid "like"
-msgstr "нравится"
+#: ../../Zotlabs/Module/Settings/Channel.php:249
+msgid "Someone writes a followup comment"
+msgstr "Кто-то пишет комментарий"
 
-#: ../../include/taxonomy.php:584
-msgid "likes"
-msgstr "нравится"
+#: ../../Zotlabs/Module/Settings/Channel.php:250
+msgid "You receive a private message"
+msgstr "Вы получили личное сообщение"
 
-#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:342
-msgid "dislike"
-msgstr "не нравится"
+#: ../../Zotlabs/Module/Settings/Channel.php:251
+msgid "You receive a friend suggestion"
+msgstr "Вы получили предложение друзей"
 
-#: ../../include/taxonomy.php:585
-msgid "dislikes"
-msgstr "не нравится"
+#: ../../Zotlabs/Module/Settings/Channel.php:252
+msgid "You are tagged in a post"
+msgstr "Вы были отмечены в публикации"
 
-#: ../../include/items.php:979 ../../include/items.php:1039
-msgid "(Unknown)"
-msgstr "(Неизвестный)"
+#: ../../Zotlabs/Module/Settings/Channel.php:253
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Вас толкнули, подтолкнули и т.п. в публикации"
 
-#: ../../include/items.php:1246
-msgid "Visible to anybody on the internet."
-msgstr "Виден всем в интернете."
+#: ../../Zotlabs/Module/Settings/Channel.php:254
+msgid "Someone likes your post/comment"
+msgstr "Кому-то нравится ваша публикация / комментарий"
 
-#: ../../include/items.php:1248
-msgid "Visible to you only."
-msgstr "Видно только вам."
+#: ../../Zotlabs/Module/Settings/Channel.php:255
+msgid "Show visual notifications including:"
+msgstr "Показывать визуальные оповещения включая:"
 
-#: ../../include/items.php:1250
-msgid "Visible to anybody in this network."
-msgstr "Видно всем в этой сети."
+#: ../../Zotlabs/Module/Settings/Channel.php:256
+msgid "Unseen stream activity"
+msgstr "Новая активность в потоке"
 
-#: ../../include/items.php:1252
-msgid "Visible to anybody authenticated."
-msgstr "Видно всем аутентифицированным."
+#: ../../Zotlabs/Module/Settings/Channel.php:257
+msgid "Unseen channel activity"
+msgstr "Новая активность в канале"
 
-#: ../../include/items.php:1254
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Видно всем в %s."
+#: ../../Zotlabs/Module/Settings/Channel.php:258
+msgid "Unseen private messages"
+msgstr "Новые личные сообщения"
 
-#: ../../include/items.php:1256
-msgid "Visible to all connections."
-msgstr "Видно всем контактам."
+#: ../../Zotlabs/Module/Settings/Channel.php:258
+#: ../../Zotlabs/Module/Settings/Channel.php:263
+#: ../../Zotlabs/Module/Settings/Channel.php:264
+#: ../../Zotlabs/Module/Settings/Channel.php:265
+msgid "Recommended"
+msgstr "Рекомендовано"
 
-#: ../../include/items.php:1258
-msgid "Visible to approved connections."
-msgstr "Видно только одобренным контактам."
+#: ../../Zotlabs/Module/Settings/Channel.php:259
+msgid "Upcoming events"
+msgstr "Грядущие события"
 
-#: ../../include/items.php:1260
-msgid "Visible to specific connections."
-msgstr "Видно указанным контактам."
+#: ../../Zotlabs/Module/Settings/Channel.php:260
+msgid "Events today"
+msgstr "События сегодня"
 
-#: ../../include/items.php:3322 ../../Zotlabs/Module/Share.php:104
-#: ../../Zotlabs/Lib/Activity.php:2310
-#, php-format
-msgid "&#x1f501; Repeated %1$s's %2$s"
-msgstr "&#x1f501; Повторил %1$s %2$s"
+#: ../../Zotlabs/Module/Settings/Channel.php:261
+msgid "Upcoming birthdays"
+msgstr "Грядущие дни рождения"
 
-#: ../../include/items.php:4381 ../../Zotlabs/Module/Group.php:62
-#: ../../Zotlabs/Module/Group.php:206
-msgid "Privacy group not found."
-msgstr "Группа конфиденциальности не найдена."
+#: ../../Zotlabs/Module/Settings/Channel.php:261
+msgid "Not available in all themes"
+msgstr "Не доступно во всех темах"
 
-#: ../../include/items.php:4397
-msgid "Privacy group is empty."
-msgstr "Группа конфиденциальности пуста"
+#: ../../Zotlabs/Module/Settings/Channel.php:262
+msgid "System (personal) notifications"
+msgstr "Системные (личные) уведомления"
 
-#: ../../include/items.php:4404
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Группа конфиденциальности: %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:263
+msgid "System info messages"
+msgstr "Сообщения с системной информацией"
 
-#: ../../include/items.php:4414
-#, php-format
-msgid "Connection: %s"
-msgstr "Контакт: %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:264
+msgid "System critical alerts"
+msgstr "Критические уведомления системы"
 
-#: ../../include/items.php:4416
-msgid "Connection not found."
-msgstr "Контакт не найден."
+#: ../../Zotlabs/Module/Settings/Channel.php:265
+msgid "New connections"
+msgstr "Новые контакты"
 
-#: ../../include/items.php:4762 ../../Zotlabs/Module/Cover_photo.php:297
-msgid "female"
-msgstr "женщина"
+#: ../../Zotlabs/Module/Settings/Channel.php:266
+msgid "System Registrations"
+msgstr "Системные регистрации"
 
-#: ../../include/items.php:4763 ../../Zotlabs/Module/Cover_photo.php:298
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr "%1$s обновила её %2$s"
+#: ../../Zotlabs/Module/Settings/Channel.php:267
+msgid "Unseen shared files"
+msgstr "Новые общие файлы"
 
-#: ../../include/items.php:4764 ../../Zotlabs/Module/Cover_photo.php:299
-msgid "male"
-msgstr "мужчина"
+#: ../../Zotlabs/Module/Settings/Channel.php:268
+msgid "Unseen public stream activity"
+msgstr "Новая активность в публичном потоке"
 
-#: ../../include/items.php:4765 ../../Zotlabs/Module/Cover_photo.php:300
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr "%1$s обновил его %2$s"
+#: ../../Zotlabs/Module/Settings/Channel.php:269
+msgid "Unseen likes and dislikes"
+msgstr "Новые лайки и дислайки"
 
-#: ../../include/items.php:4767 ../../Zotlabs/Module/Cover_photo.php:302
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr "%2$s %1$s обновлена"
+#: ../../Zotlabs/Module/Settings/Channel.php:270
+msgid "Unseen forum posts"
+msgstr "Новые публикации на форуме"
 
-#: ../../include/items.php:4769
-msgid "profile photo"
-msgstr "Фотография профиля"
+#: ../../Zotlabs/Module/Settings/Channel.php:271
+msgid "Email notification hub (hostname)"
+msgstr "Центр уведомлений по email (имя хоста)"
 
-#: ../../include/items.php:4962
+#: ../../Zotlabs/Module/Settings/Channel.php:271
 #, php-format
-msgid "[Edited %s]"
-msgstr "[Отредактировано %s]"
-
-#: ../../include/items.php:4962
-msgctxt "edit_activity"
-msgid "Post"
-msgstr "Публикация"
-
-#: ../../include/items.php:4962
-msgctxt "edit_activity"
-msgid "Comment"
-msgstr "Комментарий"
+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/account.php:38
-msgid "The provided email address is not valid"
-msgstr "Предоставленный адрес электронной почты недействителен"
+#: ../../Zotlabs/Module/Settings/Channel.php:272
+msgid "Show new wall posts, private messages and connections under Notices"
+msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\""
 
-#: ../../include/account.php:41
-msgid "The provided email domain is not among those allowed on this site"
-msgstr "Домен электронной почты не входит в число разрешенных на этом сайте"
+#: ../../Zotlabs/Module/Settings/Channel.php:273
+msgid "Mark all notices of the thread read if a notice is clicked"
+msgstr "Отметить все уведомления цепочки как прочитанные при нажатии"
 
-#: ../../include/account.php:48
-msgid "The provided email address is already registered at this site"
-msgstr "Предоставленный адрес электронной почты уже зарегистрирован на этом сайте"
+#: ../../Zotlabs/Module/Settings/Channel.php:273
+msgid "If no, only the clicked notice will be marked read"
+msgstr "Если выключено, только одно уведомление будет помечено как прочитанное"
 
-#: ../../include/account.php:55
+#: ../../Zotlabs/Module/Settings/Channel.php:274
 msgid ""
-"There is a pending registration for this address - click \"Register\" to "
-"continue verification"
-msgstr "Для этого адреса ожидается регистрация - нажмите \"Зарегистрироваться\", чтобы продолжить проверку"
+"Desktop notifications are unavailable because the required browser "
+"permission has not been granted"
+msgstr "Уведомления на рабочем столе недоступны, поскольку не предоставлено необходимое разрешение от браузера."
 
-#: ../../include/account.php:94
-msgid "An invitation is required."
-msgstr "Требуется приглашение."
+#: ../../Zotlabs/Module/Settings/Channel.php:275
+msgid "Grant permission"
+msgstr "Предоставить разрешение"
 
-#: ../../include/account.php:103
-msgid "Invitation could not be verified."
-msgstr "Не удалось проверить приглашение."
+#: ../../Zotlabs/Module/Settings/Channel.php:276
+msgid "Notify me of events this many days in advance"
+msgstr "Уведомлять меня о событиях заранее, дней"
 
-#: ../../include/account.php:191
-msgid "Please enter the required information."
-msgstr "Пожалуйста, введите необходимую информацию."
+#: ../../Zotlabs/Module/Settings/Channel.php:276
+msgid "Must be greater than 0"
+msgstr "Должно быть больше 0"
 
-#: ../../include/account.php:258 ../../include/account.php:366
-msgid "Failed to store account information."
-msgstr "Не удалось сохранить информацию аккаунта."
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+msgid "Default photo upload folder"
+msgstr "Каталог загрузки фотографий по умолчанию"
 
-#: ../../include/account.php:435 ../../include/account.php:503
-#: ../../Zotlabs/Module/Register.php:328
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Подтверждение регистрации на %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:279
+#: ../../Zotlabs/Module/Settings/Channel.php:280
+msgid "%Y - current year, %m -  current month"
+msgstr "%Y - текущий год, %y - текущий месяц"
 
-#: ../../include/account.php:578
-#, php-format
-msgid "Registration request at %s"
-msgstr "Запрос регистрации на %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:280
+msgid "Default file upload folder"
+msgstr "Каталог загрузки файлов по умолчанию"
 
-#: ../../include/account.php:600
-msgid "your registration password"
-msgstr "ваш пароль регистрации"
+#: ../../Zotlabs/Module/Settings/Channel.php:281
+#: ../../Zotlabs/Module/Removeme.php:60 ../../Zotlabs/Module/Removeme.php:64
+msgid "Remove Channel"
+msgstr "Удаление канала"
 
-#: ../../include/account.php:606 ../../include/account.php:695
-#, php-format
-msgid "Registration details for %s"
-msgstr "Регистрационные данные для %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:282
+msgid "Remove this channel."
+msgstr "Удалить этот канал."
 
-#: ../../include/account.php:706
-msgid "Account approved."
-msgstr "Аккаунт утвержден."
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "Expire other channel content after this many days"
+msgstr "Храненить содержимое других каналов, дней"
 
-#: ../../include/account.php:762
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Регистрация отозвана для %s"
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "0 or blank to use the website limit."
+msgstr "0 или пусто - использовать настройки сайта."
 
-#: ../../include/account.php:769
+#: ../../Zotlabs/Module/Settings/Channel.php:283
 #, php-format
-msgid "Could not revoke registration for %s"
-msgstr "Не удалось отозвать регистрацию для %s"
-
-#: ../../include/account.php:1185 ../../include/account.php:1187
-msgid "Click here to upgrade."
-msgstr "Нажмите здесь для обновления."
-
-#: ../../include/account.php:1193
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Это действие превышает ограничения, установленные в вашем плане."
-
-#: ../../include/account.php:1198
-msgid "This action is not available under your subscription plan."
-msgstr "Это действие невозможно из-за ограничений в вашем плане."
-
-#: ../../include/account.php:1258
-msgid "open"
-msgstr "открыта"
-
-#: ../../include/account.php:1258
-msgid "closed"
-msgstr "закрыта"
-
-#: ../../include/account.php:1265
-msgid "Registration is currently"
-msgstr "В настоящее время регистрация"
-
-#: ../../include/account.php:1274
-msgid "please come back"
-msgstr "пожалуйста, возвращайтесь позднее"
-
-#: ../../include/photo/photo_driver.php:434
-#: ../../Zotlabs/Module/Profile_photo.php:167
-#: ../../Zotlabs/Module/Profile_photo.php:337
-msgid "Profile Photos"
-msgstr "Фотографии профиля"
-
-#: ../../include/attach.php:273 ../../include/attach.php:324
-#: ../../include/attach.php:419
-msgid "Item was not found."
-msgstr "Элемент не найден."
+msgid "This website expires after %d days."
+msgstr "Срок хранения содержимого этого сайта истекает через %d дней"
 
-#: ../../include/attach.php:290
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "This website does not expire imported content."
+msgstr "Срок хранения импортированного содержимого этого сайта не ограничен."
 
-#: ../../include/attach.php:612
-msgid "No source file."
-msgstr "Нет исходного файла."
+#: ../../Zotlabs/Module/Settings/Channel.php:283
+msgid "The website limit takes precedence if lower than your limit."
+msgstr "Ограничение сайта имеет приоритет если ниже вашего значения."
 
-#: ../../include/attach.php:634
-msgid "Cannot locate file to replace"
-msgstr "Не удается найти файл для замены"
+#: ../../Zotlabs/Module/Settings/Channel.php:284
+#: ../../Zotlabs/Module/Contactedit.php:424
+#: ../../Zotlabs/Module/Connedit.php:707
+msgid "Do not import posts with this text"
+msgstr "Не импортировать публикации с этим текстом"
 
-#: ../../include/attach.php:653
-msgid "Cannot locate file to revise/update"
-msgstr "Не удается найти файл для пересмотра / обновления"
+#: ../../Zotlabs/Module/Settings/Channel.php:284
+#: ../../Zotlabs/Module/Settings/Channel.php:285
+msgid ""
+"Words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - "
+"leave blank to import all posts"
+msgstr "Слова, по одному на строку, или #теги, $категории, /шаблоны/, lang=xx, lang!=xx - оставьте пустым для импорта всех публикаций"
 
-#: ../../include/attach.php:800
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Файл превышает предельный размер %d"
+#: ../../Zotlabs/Module/Settings/Channel.php:285
+#: ../../Zotlabs/Module/Contactedit.php:423
+#: ../../Zotlabs/Module/Connedit.php:706
+msgid "Only import posts with this text"
+msgstr "Импортировать публикации только с этим текстом"
 
-#: ../../include/attach.php:821
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Вы достигли предела %1$.0f Мбайт для хранения вложений."
+#: ../../Zotlabs/Module/Settings/Connections.php:40
+msgid "Connections Settings"
+msgstr "Настройки контактов"
 
-#: ../../include/attach.php:1009
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена."
+#: ../../Zotlabs/Module/Settings/Featured.php:25
+msgid "No feature settings configured"
+msgstr "Параметры функций не настроены"
 
-#: ../../include/attach.php:1038
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Файл для сохранения не может быть проверен. Загрузка не удалась."
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "Addon Settings"
+msgstr "Настройки расширений"
 
-#: ../../include/attach.php:1110 ../../include/attach.php:1126
-msgid "Path not available."
-msgstr "Путь недоступен."
+#: ../../Zotlabs/Module/Settings/Featured.php:35
+msgid "Please save/submit changes to any panel before opening another."
+msgstr "Пожалуйста сохраните / отправьте изменения на панели прежде чем открывать другую."
 
-#: ../../include/attach.php:1174 ../../include/attach.php:1337
-msgid "Empty pathname"
-msgstr "Пустое имя пути"
+#: ../../Zotlabs/Module/Vote.php:40
+msgid "Poll not found."
+msgstr "Опрос не найден"
 
-#: ../../include/attach.php:1200
-msgid "duplicate filename or path"
-msgstr "дублирующееся имя файла или пути"
+#: ../../Zotlabs/Module/Vote.php:71
+msgid "Invalid response."
+msgstr "Неверный ответ."
 
-#: ../../include/attach.php:1225
-msgid "Path not found."
-msgstr "Путь не найден."
+#: ../../Zotlabs/Module/Vote.php:127
+msgid "Response submitted. Updates may not appear instantly."
+msgstr "Ответ отправлен. Обновления могут отображаться не сразу."
 
-#: ../../include/attach.php:1293
-msgid "mkdir failed."
-msgstr "mkdir не удался"
+#: ../../Zotlabs/Module/Contactedit.php:50
+msgid "Invalid abook_id"
+msgstr "Недействительный abook_id"
 
-#: ../../include/attach.php:1297
-msgid "database storage failed."
-msgstr "ошибка при записи базы данных."
+#: ../../Zotlabs/Module/Contactedit.php:107
+#: ../../Zotlabs/Module/Connedit.php:101
+msgid "Could not locate selected profile."
+msgstr "Не удалось обнаружить выбранный профиль."
 
-#: ../../include/attach.php:1343
-msgid "Empty path"
-msgstr "Пустое имя пути"
+#: ../../Zotlabs/Module/Contactedit.php:192
+#: ../../Zotlabs/Module/Connedit.php:215
+msgid "is now connected to"
+msgstr "теперь подключён к"
 
-#: ../../include/attach.php:2104
-#, php-format
-msgid "%s shared a %s with you"
-msgstr "%s поделился с вами %s"
+#: ../../Zotlabs/Module/Contactedit.php:252
+#: ../../Zotlabs/Module/Contactedit.php:401
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Contact Tools"
+msgstr "Инструменты контактов"
 
-#: ../../include/bookmarks.php:34
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Закладки пользователя %1$s"
+#: ../../Zotlabs/Module/Contactedit.php:295
+#: ../../Zotlabs/Module/Connedit.php:579 ../../Zotlabs/Widget/Affinity.php:36
+msgid "Me"
+msgstr "Я"
 
-#: ../../include/menu.php:120 ../../include/channel.php:1530
-#: ../../include/channel.php:1534 ../../Zotlabs/Widget/Cdav.php:138
-#: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:97
-#: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Card_edit.php:99
-#: ../../Zotlabs/Module/Oauth.php:171 ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:252
-#: ../../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:329
-#: ../../Zotlabs/Module/Connections.php:378
-#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176
-#: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268
-#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:381
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:595
-#: ../../Zotlabs/Lib/ThreadItem.php:172
-msgid "Edit"
-msgstr "Изменить"
+#: ../../Zotlabs/Module/Contactedit.php:296
+#: ../../Zotlabs/Module/Connedit.php:580 ../../Zotlabs/Widget/Affinity.php:37
+msgid "Family"
+msgstr "Семья"
 
-#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
-#: ../../include/bbcode.php:1549 ../../include/bbcode.php:1557
-msgid "Image/photo"
-msgstr "Изображение / фотография"
+#: ../../Zotlabs/Module/Contactedit.php:297
+#: ../../Zotlabs/Module/Connedit.php:581 ../../Zotlabs/Widget/Affinity.php:38
+#: ../../include/channel.php:456 ../../include/channel.php:459
+#: ../../include/selectors.php:138
+msgid "Friends"
+msgstr "Друзья"
 
-#: ../../include/bbcode.php:280 ../../include/bbcode.php:1574
-msgid "Encrypted content"
-msgstr "Зашифрованное содержание"
+#: ../../Zotlabs/Module/Contactedit.php:298
+#: ../../Zotlabs/Module/Connedit.php:582 ../../Zotlabs/Widget/Affinity.php:39
+msgid "Acquaintances"
+msgstr "Знакомые"
 
-#: ../../include/bbcode.php:334
-#, php-format
-msgid "Install %1$s element %2$s"
-msgstr "Установить %1$s элемент %2$s"
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Approve this contact"
+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."
-msgstr "Эта публикация содержит устанавливаемый %s элемент, однако у вас нет разрешений для его установки на этом сайте."
+#: ../../Zotlabs/Module/Contactedit.php:329
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "Accept contact to allow communication"
+msgstr "Принять контакт, чтобы разрешить общение"
 
-#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:47
-msgid "webpage"
-msgstr "веб-страница"
+#: ../../Zotlabs/Module/Contactedit.php:362
+#: ../../Zotlabs/Module/Connedit.php:658
+msgid "Please select a role for this contact!"
+msgstr "Пожалуйста, выберите роль для этого контакта!"
 
-#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:57
-msgid "layout"
-msgstr "шаблон"
+#: ../../Zotlabs/Module/Contactedit.php:382
+#: ../../Zotlabs/Module/Connedit.php:678
+msgid "This contact is unreachable from this location."
+msgstr "Этот контакт недоступен из этого местоположения."
 
-#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:52
-msgid "block"
-msgstr "заблокировать"
+#: ../../Zotlabs/Module/Contactedit.php:383
+#: ../../Zotlabs/Module/Connedit.php:679
+msgid "This contact may be unreachable from other channel locations."
+msgstr "Этот контакт может быть недоступен из других мест размещения канала."
 
-#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:64
-msgid "menu"
-msgstr "меню"
+#: ../../Zotlabs/Module/Contactedit.php:385
+#: ../../Zotlabs/Module/Connedit.php:681
+msgid "Location independence is not supported by their network."
+msgstr "Независимое местоположение не поддерживается их сетью."
 
-#: ../../include/bbcode.php:551
-msgid "card"
-msgstr "карточка"
+#: ../../Zotlabs/Module/Contactedit.php:395
+msgid "View profile"
+msgstr "Просмотреть профиль"
 
-#: ../../include/bbcode.php:553
-msgid "article"
-msgstr "статья"
+#: ../../Zotlabs/Module/Contactedit.php:408
+msgid "Select a role for this contact"
+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/Contactedit.php:409
+#: ../../Zotlabs/Widget/Permcats.php:93
+msgid "Contact roles"
+msgstr "Роли контакта"
 
-#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
-msgid "Click to open/close"
-msgstr "Нажмите, чтобы открыть/закрыть"
+#: ../../Zotlabs/Module/Contactedit.php:420
+#: ../../Zotlabs/Module/Connedit.php:703
+msgid "Slide to adjust your degree of friendship"
+msgstr "Прокрутить для настройки степени дружбы"
 
-#: ../../include/bbcode.php:644 ../../include/markdown.php:256
-msgid "spoiler"
-msgstr "спойлер"
+#: ../../Zotlabs/Module/Contactedit.php:422
+#: ../../Zotlabs/Module/Connedit.php:705
+msgid "Custom Filter"
+msgstr "Настраиваемый фильтр"
 
-#: ../../include/bbcode.php:657
-msgid "View article"
-msgstr "Просмотр статьи"
+#: ../../Zotlabs/Module/Contactedit.php:429
+#: ../../Zotlabs/Module/Connedit.php:714
+msgid "Approve contact"
+msgstr "Утвердить контакт"
 
-#: ../../include/bbcode.php:657
-msgid "View summary"
-msgstr "Просмотр резюме"
+#: ../../Zotlabs/Module/Contactedit.php:431
+#: ../../Zotlabs/Module/Connedit.php:717
+msgid "Their"
+msgstr "Их"
 
-#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1235
-#: ../../Zotlabs/Lib/NativeWikiPage.php:624
-msgid "Different viewers will see this text differently"
-msgstr "Различные зрители увидят этот текст по-разному"
+#: ../../Zotlabs/Module/Contactedit.php:432
+#: ../../Zotlabs/Module/Connedit.php:718
+msgid "My"
+msgstr "Мои"
 
-#: ../../include/bbcode.php:1525
-msgid "$1 wrote:"
-msgstr "$1 писал:"
+#: ../../Zotlabs/Module/Contactedit.php:440
+msgid "Roles"
+msgstr "Роли"
 
-#: ../../include/channel.php:48
-msgid "Unable to obtain identity information from database"
-msgstr "Невозможно получить идентификационную информацию из базы данных"
+#: ../../Zotlabs/Module/Contactedit.php:441
+msgid "Compare permissions"
+msgstr "Сравнить разрешения"
 
-#: ../../include/channel.php:81
-msgid "Empty name"
-msgstr "Пустое имя"
+#: ../../Zotlabs/Module/Contactedit.php:442
+msgid "Permission"
+msgstr "Разрешение"
 
-#: ../../include/channel.php:84
-msgid "Name too long"
-msgstr "Слишком длинное имя"
+#: ../../Zotlabs/Module/Contactedit.php:443
+#: ../../Zotlabs/Widget/Privacygroups.php:54
+msgid "Privacy groups"
+msgstr "Группы конфиденциальности"
 
-#: ../../include/channel.php:201
-msgid "No account identifier"
-msgstr "Идентификатор аккаунта отсутствует"
+#: ../../Zotlabs/Module/Contactedit.php:444 ../../Zotlabs/Lib/Apps.php:367
+#: ../../include/features.php:390
+msgid "Profiles"
+msgstr "Редактировать профиль"
 
-#: ../../include/channel.php:213 ../../Zotlabs/Module/Register.php:95
-msgid "Nickname is required."
-msgstr "Требуется псевдоним."
+#: ../../Zotlabs/Module/Contactedit.php:445
+#: ../../Zotlabs/Module/Connedit.php:572
+msgid "Affinity"
+msgstr "Сходство"
 
-#: ../../include/channel.php:227 ../../include/channel.php:659
-#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46
-msgid "Reserved nickname. Please choose another."
-msgstr "Зарезервированый псевдоним. Пожалуйста, выберите другой."
+#: ../../Zotlabs/Module/Contactedit.php:446
+msgid "Content filter"
+msgstr "Фильтр содержимого"
 
-#: ../../include/channel.php:232 ../../include/channel.php:664
-#: ../../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/Contactedit.php:456
+msgid "Contact updated"
+msgstr "Контакт обновлён"
 
-#: ../../include/channel.php:292
-msgid "Unable to retrieve created identity"
-msgstr "Не удается получить созданный идентификатор"
+#: ../../Zotlabs/Module/Contactedit.php:456
+msgid "Contact update failed"
+msgstr "Обновление контакта не удалось"
 
-#: ../../include/channel.php:402
-msgid "Default Profile"
-msgstr "Профиль по умолчанию"
+#: ../../Zotlabs/Module/Contactedit.php:508
+#: ../../Zotlabs/Module/Contactedit.php:518
+msgid "Refresh succeeded"
+msgstr "Обновление выполнено"
 
-#: ../../include/channel.php:592 ../../include/channel.php:681
-msgid "Unable to retrieve modified identity"
-msgstr "Не удается найти изменённый идентификатор"
+#: ../../Zotlabs/Module/Contactedit.php:511
+msgid "Refresh failed - channel is currently unavailable"
+msgstr "Ошибка обновления - канал в настоящее время недоступен"
 
-#: ../../include/channel.php:1373
-msgid "Requested channel is not available"
-msgstr "Запрошенный канал недоступен"
+#: ../../Zotlabs/Module/Contactedit.php:530
+msgid "Block status updated"
+msgstr "Статус блокировки обновлён"
 
-#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:744
-msgid "Change profile photo"
-msgstr "Изменить фотографию профиля"
+#: ../../Zotlabs/Module/Contactedit.php:534
+msgid "Block failed"
+msgstr "Блокировка не удалась"
 
-#: ../../include/channel.php:1531
-msgid "Create New Profile"
-msgstr "Создать новый профиль"
+#: ../../Zotlabs/Module/Contactedit.php:545
+msgid "Ignore status updated"
+msgstr "Статус игнорирования обновлён"
 
-#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:841
-msgid "Profile Image"
-msgstr "Изображение профиля"
+#: ../../Zotlabs/Module/Contactedit.php:549
+msgid "Ignore failed"
+msgstr "Игнорирование не удалось"
 
-#: ../../include/channel.php:1552
-msgid "Visible to everybody"
-msgstr "Видно всем"
+#: ../../Zotlabs/Module/Contactedit.php:560
+msgid "Archive status updated"
+msgstr "Статус архивации обновлён"
 
-#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:741
-#: ../../Zotlabs/Module/Profiles.php:845
-msgid "Edit visibility"
-msgstr "Редактировать видимость"
+#: ../../Zotlabs/Module/Contactedit.php:564
+msgid "Archive failed"
+msgstr "Архивация не удалась"
 
-#: ../../include/channel.php:1629 ../../include/channel.php:1758
-msgid "Gender:"
-msgstr "Пол:"
+#: ../../Zotlabs/Module/Contactedit.php:575
+msgid "Hide status updated"
+msgstr "Статус скрытия обновлён"
 
-#: ../../include/channel.php:1630 ../../include/channel.php:1802
-msgid "Status:"
-msgstr "Статус:"
+#: ../../Zotlabs/Module/Contactedit.php:579
+msgid "Hide failed"
+msgstr "Скрытие не удалось"
 
-#: ../../include/channel.php:1631 ../../include/channel.php:1826
-msgid "Homepage:"
-msgstr "Домашняя страница:"
+#: ../../Zotlabs/Module/Contactedit.php:614
+msgid "Contact removed"
+msgstr "Контакт удалён"
 
-#: ../../include/channel.php:1632 ../../include/channel.php:1828
-#: ../../Zotlabs/Module/Directory.php:366
-msgid "Hometown:"
-msgstr "Родной город:"
+#: ../../Zotlabs/Module/Contactedit.php:618
+msgid "Delete failed"
+msgstr "Не удалось удалить"
 
-#: ../../include/channel.php:1633
-msgid "Online Now"
-msgstr "Сейчас в сети"
+#: ../../Zotlabs/Module/Contactedit.php:628
+#: ../../Zotlabs/Module/Connedit.php:487
+msgid "Refresh Permissions"
+msgstr "Обновить разрешения"
 
-#: ../../include/channel.php:1686
-msgid "Change your profile photo"
-msgstr "Изменить фотографию вашего профиля"
+#: ../../Zotlabs/Module/Contactedit.php:629
+#: ../../Zotlabs/Module/Connedit.php:490
+msgid "Fetch updated permissions"
+msgstr "Получить обновлённые разрешения"
 
-#: ../../include/channel.php:1717
-msgid "Trans"
-msgstr "Трансексуал"
+#: ../../Zotlabs/Module/Contactedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:494
+msgid "Refresh Photo"
+msgstr "Обновить фотографию"
 
-#: ../../include/channel.php:1756
-msgid "Full Name:"
-msgstr "Полное имя:"
+#: ../../Zotlabs/Module/Contactedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:497
+msgid "Fetch updated photo"
+msgstr "Получить обновлённую фотографию"
 
-#: ../../include/channel.php:1763
-msgid "Like this channel"
-msgstr "нравится этот канал"
+#: ../../Zotlabs/Module/Contactedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:511
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Блокировать (или разблокировать) связи с этим контактом"
 
-#: ../../include/channel.php:1787
-msgid "j F, Y"
-msgstr ""
+#: ../../Zotlabs/Module/Contactedit.php:642
+#: ../../Zotlabs/Module/Connedit.php:512
+msgid "This connection is blocked!"
+msgstr "Этот контакт заблокирован!"
 
-#: ../../include/channel.php:1788
-msgid "j F"
-msgstr ""
+#: ../../Zotlabs/Module/Contactedit.php:646
+#: ../../Zotlabs/Module/Connedit.php:516
+msgid "Unignore"
+msgstr "Не игнорировать"
 
-#: ../../include/channel.php:1795
-msgid "Birthday:"
-msgstr "День рождения:"
+#: ../../Zotlabs/Module/Contactedit.php:648
+#: ../../Zotlabs/Module/Connedit.php:519
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Игнорировать (или не игнорировать) все связи для этого контакта"
 
-#: ../../include/channel.php:1799 ../../Zotlabs/Module/Directory.php:348
-msgid "Age:"
-msgstr "Возраст:"
+#: ../../Zotlabs/Module/Contactedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:520
+msgid "This connection is ignored!"
+msgstr "Этот контакт игнорируется!"
 
-#: ../../include/channel.php:1808
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "для %1$d %2$s"
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Unarchive"
+msgstr "Разархивировать"
 
-#: ../../include/channel.php:1820
-msgid "Tags:"
-msgstr "Теги:"
+#: ../../Zotlabs/Module/Contactedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:524
+msgid "Archive"
+msgstr "Заархивировать"
 
-#: ../../include/channel.php:1824
-msgid "Sexual Preference:"
-msgstr "Сексуальные предпочтения:"
+#: ../../Zotlabs/Module/Contactedit.php:655
+#: ../../Zotlabs/Module/Connedit.php:527
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"
 
-#: ../../include/channel.php:1830
-msgid "Political Views:"
-msgstr "Политические взгляды:"
+#: ../../Zotlabs/Module/Contactedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:528
+msgid "This connection is archived!"
+msgstr "Этот контакт заархивирован!"
 
-#: ../../include/channel.php:1832
-msgid "Religion:"
-msgstr "Религия:"
+#: ../../Zotlabs/Module/Contactedit.php:660
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Unhide"
+msgstr "Показать"
 
-#: ../../include/channel.php:1834 ../../Zotlabs/Module/Directory.php:368
-msgid "About:"
-msgstr "О себе:"
+#: ../../Zotlabs/Module/Contactedit.php:660
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Hide"
+msgstr "Скрыть"
 
-#: ../../include/channel.php:1836
-msgid "Hobbies/Interests:"
-msgstr "Хобби / интересы:"
+#: ../../Zotlabs/Module/Contactedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:535
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Скрыть или показать этот контакт от / для остальных"
 
-#: ../../include/channel.php:1838
-msgid "Likes:"
-msgstr "Что вам нравится:"
+#: ../../Zotlabs/Module/Contactedit.php:663
+#: ../../Zotlabs/Module/Connedit.php:536
+msgid "This connection is hidden!"
+msgstr "Этот контакт скрыт!"
 
-#: ../../include/channel.php:1840
-msgid "Dislikes:"
-msgstr "Что вам не нравится:"
+#: ../../Zotlabs/Module/Contactedit.php:669
+#: ../../Zotlabs/Module/Connedit.php:543
+msgid "Delete this connection"
+msgstr "Удалить этот контакт"
 
-#: ../../include/channel.php:1842
-msgid "Contact information and Social Networks:"
-msgstr "Контактная информация и социальные сети:"
+#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
+msgid "Location not found."
+msgstr "Местоположение не найдено"
 
-#: ../../include/channel.php:1844
-msgid "My other channels:"
-msgstr "Мои другие каналы:"
+#: ../../Zotlabs/Module/Locs.php:74
+msgid "Location lookup failed."
+msgstr "Поиск местоположения не удался"
 
-#: ../../include/channel.php:1846
-msgid "Musical interests:"
-msgstr "Музыкальные интересы:"
+#: ../../Zotlabs/Module/Locs.php:78
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
+msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее"
 
-#: ../../include/channel.php:1848
-msgid "Books, literature:"
-msgstr "Книги, литература:"
+#: ../../Zotlabs/Module/Locs.php:106
+msgid "Syncing locations"
+msgstr "Синхронизировать местоположение"
 
-#: ../../include/channel.php:1850
-msgid "Television:"
-msgstr "Телевидение:"
+#: ../../Zotlabs/Module/Locs.php:115
+msgid "No locations found."
+msgstr "Местоположений не найдено"
 
-#: ../../include/channel.php:1852
-msgid "Film/dance/culture/entertainment:"
-msgstr "Кино / танцы / культура / развлечения:"
+#: ../../Zotlabs/Module/Locs.php:120
+msgid "Manage Channel Locations"
+msgstr "Управление местоположением канала"
 
-#: ../../include/channel.php:1854
-msgid "Love/Romance:"
-msgstr "Любовь / романтика:"
+#: ../../Zotlabs/Module/Locs.php:123
+#: ../../extend/addon/hzaddons/workflow/workflow.php:285
+msgid "Primary"
+msgstr "Основной"
 
-#: ../../include/channel.php:1856
-msgid "Work/employment:"
-msgstr "Работа / занятость:"
+#: ../../Zotlabs/Module/Locs.php:124 ../../Zotlabs/Module/Menu.php:177
+msgid "Drop"
+msgstr "Удалить"
 
-#: ../../include/channel.php:1858
-msgid "School/education:"
-msgstr "Школа / образование:"
+#: ../../Zotlabs/Module/Locs.php:126
+msgid "Sync Now"
+msgstr "Синхронизировать"
 
-#: ../../include/channel.php:1879 ../../Zotlabs/Module/Profperm.php:113
-#: ../../Zotlabs/Lib/Apps.php:366
-msgid "Profile"
-msgstr "Профиль"
+#: ../../Zotlabs/Module/Locs.php:127
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Пожалуйста, подождите несколько минут между последовательными операциями."
 
-#: ../../include/channel.php:1881
-msgid "Like this thing"
-msgstr "нравится этo"
+#: ../../Zotlabs/Module/Locs.php:128
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
+msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал."
 
-#: ../../include/channel.php:1882
-msgid "Export"
-msgstr "Экспорт"
+#: ../../Zotlabs/Module/Locs.php:129
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует."
 
-#: ../../include/channel.php:2335 ../../Zotlabs/Module/Cover_photo.php:304
-msgid "cover photo"
-msgstr "фотография обложки"
+#: ../../Zotlabs/Module/Invite.php:56
+msgid "Invite App"
+msgstr "Приложение \"Пригласить\""
 
-#: ../../include/channel.php:2610 ../../Zotlabs/Module/Rmagic.php:96
-#: ../../boot.php:1739
-msgid "Remote Authentication"
-msgstr "Удаленная аутентификация"
+#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Lang.php:20
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:35
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:35
+msgid "Not Installed"
+msgstr "не установлено"
 
-#: ../../include/channel.php:2611 ../../Zotlabs/Module/Rmagic.php:97
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Введите адрес вашего канала (например: channel@example.com)"
+#: ../../Zotlabs/Module/Invite.php:68
+msgid "Register is closed"
+msgstr "Регистрация закрыта"
 
-#: ../../include/channel.php:2612 ../../Zotlabs/Module/Rmagic.php:98
-msgid "Authenticate"
-msgstr "Проверка подлинности"
+#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
+msgid "Note, the invitation code is valid up to"
+msgstr "Обратите внимание: код приглашения действителен до "
 
-#: ../../include/channel.php:2770 ../../Zotlabs/Module/Admin/Accounts.php:184
+#: ../../Zotlabs/Module/Invite.php:115
 #, 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:124
-#: ../../Zotlabs/Widget/Notifications.php:125
-msgid "Forums"
-msgstr "Форумы"
-
-#: ../../include/acl_selectors.php:136
-#: ../../Zotlabs/Module/Settings/Privacy.php:56
-#: ../../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 "Разрешить"
+msgid "Too many recipients for one invitation (max %d)"
+msgstr "Слишком много получателей для одного кода приглашения (не более %d)"
 
-#: ../../include/acl_selectors.php:148
-msgid "Don't allow"
-msgstr "Не разрешать"
+#: ../../Zotlabs/Module/Invite.php:119
+msgid "No recipients for this invitation"
+msgstr "Нет получателей для этого приглашения"
 
-#: ../../include/acl_selectors.php:181
+#: ../../Zotlabs/Module/Invite.php:138
 #, 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 "Встраивание отключено"
+msgid "(%s) : Not a real email address"
+msgstr "(%s) : Не настоящий адрес электронной почты"
 
-#: ../../include/zid.php:406
+#: ../../Zotlabs/Module/Invite.php:145
 #, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr "OpenWebAuth: %1$s приветствует %2$s"
-
-#: ../../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 "По публикациям"
+msgid "(%s) : Not allowed email address"
+msgstr "(%s) : Не разрешённый адрес электронной почты"
 
-#: ../../Zotlabs/Widget/Activity_order.php:101
-msgid "Order by last posted date"
-msgstr "Сортировка по дате последней публикации"
+#: ../../Zotlabs/Module/Invite.php:158
+#, php-format
+msgid "(%s) : email address already in use"
+msgstr "(%s) : Адрес электронной почты уже используется"
 
-#: ../../Zotlabs/Widget/Activity_order.php:104
-msgid "Date Unthreaded"
-msgstr "По порядку"
+#: ../../Zotlabs/Module/Invite.php:165
+#, php-format
+msgid "(%s) : Accepted email address"
+msgstr "%s) : Подтверждённый адрес электронной почты"
 
-#: ../../Zotlabs/Widget/Activity_order.php:108
-msgid "Order unthreaded by date"
-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"
 
-#: ../../Zotlabs/Widget/Activity_order.php:123
-msgid "Stream Order"
-msgstr "Упорядочить поток"
+#: ../../Zotlabs/Module/Invite.php:252
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:40
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Доставка сообщения не удалась."
 
-#: ../../Zotlabs/Widget/Tokens.php:35
-msgid "Add new guest"
-msgstr "Добавить нового гостя"
+#: ../../Zotlabs/Module/Invite.php:257
+#, php-format
+msgid "To %s : Message delivery success."
+msgstr "Для %s : Сообщение успешно доставлено."
 
-#: ../../Zotlabs/Widget/Tokens.php:43 ../../Zotlabs/Module/Lockview.php:226
-msgid "Guest access"
-msgstr "Гостевой доступ"
+#: ../../Zotlabs/Module/Invite.php:289
+#, php-format
+msgid "%1$d mail(s) sent, %2$d mail error(s)"
+msgstr "%1$d писем отправлено, %2$d ошибок доставки"
 
-#: ../../Zotlabs/Widget/Archive.php:43
-msgid "Archives"
-msgstr "Архивы"
+#: ../../Zotlabs/Module/Invite.php:314
+msgid "Invites not proposed by configuration"
+msgstr "Использование приглашений не предлагается"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:34
-#: ../../Zotlabs/Widget/Wiki_pages.php:91
-msgid "Add new page"
-msgstr "Добавить новую страницу"
+#: ../../Zotlabs/Module/Invite.php:315
+msgid "Contact the site admin"
+msgstr "Связатся с администратором сайта"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:41
-#: ../../Zotlabs/Widget/Wiki_pages.php:98 ../../Zotlabs/Module/Dreport.php:129
-msgid "Options"
-msgstr "Параметры"
+#: ../../Zotlabs/Module/Invite.php:331
+msgid "Invites by users not enabled"
+msgstr "Приглашения от пользователей отключены"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:85
-msgid "Wiki Pages"
-msgstr "Wiki страницы"
+#: ../../Zotlabs/Module/Invite.php:336
+msgid "You have no more invitations available"
+msgstr "У вас больше нет приглашений"
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:96
-msgid "Page name"
-msgstr "Название страницы"
+#: ../../Zotlabs/Module/Invite.php:352
+msgid "Not on xchan"
+msgstr "Неизвестный пользователь"
 
-#: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87
-#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:793
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Photo"
-msgstr "Посмотреть фотографию"
+#: ../../Zotlabs/Module/Invite.php:385
+msgid "All users invitation limit exceeded."
+msgstr "Превышен лимит приглашений для всех пользователей."
 
-#: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108
-#: ../../Zotlabs/Module/Embedphotos.php:187 ../../Zotlabs/Module/Photos.php:824
-msgid "Edit Album"
-msgstr "Редактировать Фотоальбом"
+#: ../../Zotlabs/Module/Invite.php:403
+msgid "Invitation expires after"
+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:543
-#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:692
-#: ../../Zotlabs/Storage/Browser.php:540
-msgid "Upload"
-msgstr "Загрузка"
+#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
+msgid "Invitation"
+msgstr "Приглашение"
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
-msgstr "Задачи"
+#: ../../Zotlabs/Module/Invite.php:534
+msgid "Send invitations"
+msgstr "Отправить приглашение"
 
-#: ../../Zotlabs/Widget/Pubsites.php:12 ../../Zotlabs/Module/Pubsites.php:24
-msgid "Public Hubs"
-msgstr "Публичные хабы"
+#: ../../Zotlabs/Module/Invite.php:535
+msgid "Invitations I am using"
+msgstr "Приглашения, которые я использую"
 
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
-msgid "Chat Members"
-msgstr "Участники чата"
+#: ../../Zotlabs/Module/Invite.php:536
+msgid "Invitations we are using"
+msgstr "Приглашения, которые мы используем"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "I will attend"
-msgstr "Я буду участвовать"
+#: ../../Zotlabs/Module/Invite.php:537
+msgid "§ Note, the email(s) sent will be recorded in the system logs"
+msgstr "Внимание: адреса электронной почты будут записаны в системные журналы."
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "I will not attend"
-msgstr "Я не буду участвовать"
+#: ../../Zotlabs/Module/Invite.php:538
+msgid "Enter email addresses, one per line:"
+msgstr "Введите адреса электронной почты, по одному в строке:"
 
-#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "I might attend"
-msgstr "Я возможно буду присутствовать"
+#: ../../Zotlabs/Module/Invite.php:539
+msgid "Your message:"
+msgstr "Сообщение:"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243
-msgid "I agree"
-msgstr "Я согласен"
+#: ../../Zotlabs/Module/Invite.php:540
+msgid "Invite template"
+msgstr "Шаблон приглашения"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243
-msgid "I disagree"
-msgstr "Я не согласен"
+#: ../../Zotlabs/Module/Invite.php:542
+msgid "Subject:"
+msgstr "Тема:"
 
-#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:243
-msgid "I abstain"
-msgstr "Я воздержался"
+#: ../../Zotlabs/Module/Invite.php:548
+msgid "Here you may enter personal notes to the recipient(s)"
+msgstr "Здесь вы можете ввести личные заметки для получателей"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:353
-msgid "Share This"
-msgstr "Поделиться этим"
+#: ../../Zotlabs/Module/Cover_photo.php:196
+#: ../../Zotlabs/Module/Cover_photo.php:254
+msgid "Cover Photos"
+msgstr "Фотографии обложки"
 
-#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:353
-msgid "share"
-msgstr "поделиться"
+#: ../../Zotlabs/Module/Cover_photo.php:297 ../../include/items.php:4779
+msgid "female"
+msgstr "женщина"
 
-#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123
+#: ../../Zotlabs/Module/Cover_photo.php:298 ../../include/items.php:4780
 #, php-format
-msgid "View %s's profile - %s"
-msgstr "Просмотр профиля %s - %s"
-
-#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Widget/Messages.php:99
-#: ../../Zotlabs/Lib/ThreadItem.php:438
-msgid "via"
-msgstr "через"
-
-#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:469
-msgid "Attendance Options"
-msgstr "Параметры посещаемости"
-
-#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:471
-msgid "Voting Options"
-msgstr "Параметры голосования"
-
-#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:495
-msgid "Pinned post"
-msgstr "Прикреплённая заметка"
-
-#: ../../Zotlabs/Widget/Pinned.php:156
-msgid "Don't show"
-msgstr "Не показывать"
-
-#: ../../Zotlabs/Widget/Activity.php:50
-msgctxt "widget"
-msgid "Activity"
-msgstr "Активность"
-
-#: ../../Zotlabs/Widget/Cdav.php:37
-msgid "Select Channel"
-msgstr "Выбрать канал"
-
-#: ../../Zotlabs/Widget/Cdav.php:42
-msgid "Read-write"
-msgstr "Чтение-запись"
-
-#: ../../Zotlabs/Widget/Cdav.php:43
-msgid "Read-only"
-msgstr "Только чтение"
-
-#: ../../Zotlabs/Widget/Cdav.php:127
-msgid "Channel Calendar"
-msgstr "Календарь канала"
-
-#: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143
-#: ../../Zotlabs/Module/Cdav.php:1054
-msgid "CalDAV Calendars"
-msgstr "Календари CalDAV"
-
-#: ../../Zotlabs/Widget/Cdav.php:131
-msgid "Shared CalDAV Calendars"
-msgstr "Общие календари CalDAV"
-
-#: ../../Zotlabs/Widget/Cdav.php:135
-msgid "Share this calendar"
-msgstr "Поделиться этим календарём"
-
-#: ../../Zotlabs/Widget/Cdav.php:137
-msgid "Calendar name and color"
-msgstr "Имя и цвет календаря"
-
-#: ../../Zotlabs/Widget/Cdav.php:139
-msgid "Create new CalDAV calendar"
-msgstr "Создать новый календарь CalDAV"
-
-#: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178
-#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1387
-#: ../../Zotlabs/Module/Webpages.php:251
-#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Profiles.php:814 ../../Zotlabs/Module/Menu.php:182
-#: ../../Zotlabs/Module/Connedit.php:747 ../../Zotlabs/Module/Layouts.php:185
-#: ../../Zotlabs/Storage/Browser.php:365 ../../Zotlabs/Storage/Browser.php:538
-msgid "Create"
-msgstr "Создать"
+msgid "%1$s updated her %2$s"
+msgstr "%1$s обновила её %2$s"
 
-#: ../../Zotlabs/Widget/Cdav.php:141
-msgid "Calendar Name"
-msgstr "Имя календаря"
+#: ../../Zotlabs/Module/Cover_photo.php:299 ../../include/items.php:4781
+msgid "male"
+msgstr "мужчина"
 
-#: ../../Zotlabs/Widget/Cdav.php:142
-msgid "Calendar Tools"
-msgstr "Инструменты календаря"
+#: ../../Zotlabs/Module/Cover_photo.php:300 ../../include/items.php:4782
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr "%1$s обновил его %2$s"
 
-#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1054
-msgid "Channel Calendars"
-msgstr "Календари канала"
+#: ../../Zotlabs/Module/Cover_photo.php:302 ../../include/items.php:4784
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr "%2$s %1$s обновлена"
 
-#: ../../Zotlabs/Widget/Cdav.php:144
-msgid "Import calendar"
-msgstr "Импортировать календарь"
+#: ../../Zotlabs/Module/Cover_photo.php:304 ../../include/channel.php:2335
+msgid "cover photo"
+msgstr "фотография обложки"
 
-#: ../../Zotlabs/Widget/Cdav.php:145
-msgid "Select a calendar to import to"
-msgstr "Выбрать календарь для импорта в"
+#: ../../Zotlabs/Module/Cover_photo.php:418
+msgid "Your cover photo may be visible to anybody on the internet"
+msgstr "Фотография вашей обложки может быть видна всем в Интернете"
 
-#: ../../Zotlabs/Widget/Cdav.php:172
-msgid "Addressbooks"
-msgstr "Адресные книги"
+#: ../../Zotlabs/Module/Cover_photo.php:420
+msgid "Upload File:"
+msgstr "Загрузить файл:"
 
-#: ../../Zotlabs/Widget/Cdav.php:174
-msgid "Addressbook name"
-msgstr "Имя адресной книги"
+#: ../../Zotlabs/Module/Cover_photo.php:421
+msgid "Select a profile:"
+msgstr "Выбрать профиль:"
 
-#: ../../Zotlabs/Widget/Cdav.php:176
-msgid "Create new addressbook"
-msgstr "Создать новую адресную книгу"
+#: ../../Zotlabs/Module/Cover_photo.php:422
+msgid "Change Cover Photo"
+msgstr "Изменить фотографию обложки"
 
-#: ../../Zotlabs/Widget/Cdav.php:177
-msgid "Addressbook Name"
-msgstr "Имя адресной книги"
+#: ../../Zotlabs/Module/Cover_photo.php:438
+msgid "Select existing photo"
+msgstr "Выбрать существующую фотографию"
 
-#: ../../Zotlabs/Widget/Cdav.php:179
-msgid "Addressbook Tools"
-msgstr "Инструменты адресной книги"
+#: ../../Zotlabs/Module/Cover_photo.php:458
+msgid "Done Editing"
+msgstr "Закончить редактирование"
 
-#: ../../Zotlabs/Widget/Cdav.php:180
-msgid "Import addressbook"
-msgstr "Импортировать адресную книгу"
+#: ../../Zotlabs/Module/Network.php:106
+msgid "No such group"
+msgstr "Нет такой группы"
 
-#: ../../Zotlabs/Widget/Cdav.php:181
-msgid "Select an addressbook to import to"
-msgstr "Выбрать адресную книгу для импорта в"
+#: ../../Zotlabs/Module/Network.php:155
+msgid "No such channel"
+msgstr "Нет такого канала"
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
-msgid "Remove term"
-msgstr "Удалить выражение"
+#: ../../Zotlabs/Module/Network.php:242
+msgid "Privacy group is empty"
+msgstr "Группа конфиденциальности пуста"
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
-msgid "Suggested Chatrooms"
-msgstr "Рекомендуемые чаты"
+#: ../../Zotlabs/Module/Network.php:252
+msgid "Privacy group: "
+msgstr "Группа конфиденциальности: "
 
-#: ../../Zotlabs/Widget/Settings_menu.php:32
-msgid "Account settings"
-msgstr "Настройки аккаунта"
+#: ../../Zotlabs/Module/Network.php:327
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:29
+msgid "Invalid channel."
+msgstr "Недействительный канал."
 
-#: ../../Zotlabs/Widget/Settings_menu.php:38
-msgid "Channel settings"
-msgstr "Настройки канала"
+#: ../../Zotlabs/Module/Dreport.php:38
+msgid "Invalid message"
+msgstr "Неверное сообщение"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:44
-msgid "Privacy settings"
-msgstr "Настройки конфиденциальности"
+#: ../../Zotlabs/Module/Dreport.php:66
+msgid "no results"
+msgstr "Ничего не найдено."
 
-#: ../../Zotlabs/Widget/Settings_menu.php:51
-msgid "Display settings"
-msgstr "Настройки отображения"
+#: ../../Zotlabs/Module/Dreport.php:80
+msgid "channel sync processed"
+msgstr "синхронизация канала завершена"
 
-#: ../../Zotlabs/Widget/Settings_menu.php:58
-msgid "Manage locations"
-msgstr "Управление местоположением"
+#: ../../Zotlabs/Module/Dreport.php:84
+msgid "queued"
+msgstr "в очереди"
 
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
-msgid "Overview"
-msgstr "Обзор"
+#: ../../Zotlabs/Module/Dreport.php:88
+msgid "posted"
+msgstr "опубликовано"
 
-#: ../../Zotlabs/Widget/Suggestions.php:48 ../../Zotlabs/Module/Suggest.php:71
-msgid "Ignore/Hide"
-msgstr "Игнорировать / cкрыть"
+#: ../../Zotlabs/Module/Dreport.php:92
+msgid "accepted for delivery"
+msgstr "принято к доставке"
 
-#: ../../Zotlabs/Widget/Suggestions.php:53
-msgid "Suggestions"
-msgstr "Рекомендации"
+#: ../../Zotlabs/Module/Dreport.php:96
+msgid "updated"
+msgstr "обновлено"
 
-#: ../../Zotlabs/Widget/Suggestions.php:54
-msgid "See more..."
-msgstr "Просмотреть больше..."
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "update ignored"
+msgstr "обновление игнорируется"
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
-msgid "Bookmarked Chatrooms"
-msgstr "Закладки чатов"
+#: ../../Zotlabs/Module/Dreport.php:102
+msgid "permission denied"
+msgstr "доступ запрещен"
 
-#: ../../Zotlabs/Widget/Appcategories.php:43
-msgid "App Categories"
-msgstr "Категории приложений"
+#: ../../Zotlabs/Module/Dreport.php:106
+msgid "recipient not found"
+msgstr "получатель не найден"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-#: ../../Zotlabs/Lib/NativeWikiPage.php:583
-msgctxt "wiki_history"
-msgid "Message"
-msgstr "Сообщение"
+#: ../../Zotlabs/Module/Dreport.php:126
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr "Отчёт о доставке для %1$s"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:24
-#: ../../Zotlabs/Lib/NativeWikiPage.php:584
-msgid "Date"
-msgstr "Дата"
+#: ../../Zotlabs/Module/Dreport.php:130
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:40
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:97
+msgid "Options"
+msgstr "Параметры"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:25
-#: ../../Zotlabs/Module/Wiki.php:364 ../../Zotlabs/Lib/NativeWikiPage.php:585
-msgid "Revert"
-msgstr "Отменить"
+#: ../../Zotlabs/Module/Dreport.php:131
+msgid "Redeliver"
+msgstr "Доставить повторно"
 
-#: ../../Zotlabs/Widget/Wiki_page_history.php:26
-#: ../../Zotlabs/Lib/NativeWikiPage.php:586
-msgid "Compare"
-msgstr "Сравнить"
+#: ../../Zotlabs/Module/Affinity.php:35
+msgid "Affinity Tool settings updated."
+msgstr "Настройки степени сходства обновлены."
 
-#: ../../Zotlabs/Widget/Hq_controls.php:17
-msgid "Toggle post editor"
-msgstr "Переключить редактор сообщений"
+#: ../../Zotlabs/Module/Affinity.php:54
+msgid ""
+"The numbers below represent the minimum and maximum slider default positions "
+"for your network/stream page as a percentage."
+msgstr "Числа ниже представляют минимальное и максимальное значение по умолчанию для вашей сети / потока в процентах."
 
-#: ../../Zotlabs/Widget/Hq_controls.php:28
-msgid "Toggle personal notes"
-msgstr "Переключить личные заметки"
+#: ../../Zotlabs/Module/Affinity.php:61
+msgid "Default maximum affinity level"
+msgstr "Максимальная степень сходства по умолчанию."
 
-#: ../../Zotlabs/Widget/Permcats.php:35
-msgid "Add new role"
-msgstr "Добавить новую роль"
+#: ../../Zotlabs/Module/Affinity.php:61
+msgid "0-99 default 99"
+msgstr "0-99 (по умолчанию 99)"
 
-#: ../../Zotlabs/Widget/Permcats.php:86
-#: ../../Zotlabs/Module/Contactedit.php:409
-msgid "Contact roles"
-msgstr "Роли контакта"
+#: ../../Zotlabs/Module/Affinity.php:67
+msgid "Default minimum affinity level"
+msgstr "Максимальная степень сходства по умолчанию."
 
-#: ../../Zotlabs/Widget/Permcats.php:87
-msgid "Role members"
-msgstr "Обладатели роли"
+#: ../../Zotlabs/Module/Affinity.php:67
+msgid "0-99 - default 0"
+msgstr "0-99 (по умолчанию 0)"
 
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
-msgid "photo/image"
-msgstr "фотография / изображение"
+#: ../../Zotlabs/Module/Affinity.php:73
+msgid "Persistent affinity levels"
+msgstr "Устоявшиеся степени сходства"
 
-#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:411
-msgid "Site"
-msgstr "Сайт"
+#: ../../Zotlabs/Module/Affinity.php:73
+msgid ""
+"If disabled the max and min levels will be reset to default after page reload"
+msgstr "Если этот параметр отключен, максимальный и минимальный уровни будут сброшены к значениям по умолчанию после перезагрузки страницы"
 
-#: ../../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/Affinity.php:81
+msgid "Affinity Tool Settings"
+msgstr "Настройки степени сходства"
 
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
-msgid "Member registrations waiting for confirmation"
-msgstr "Регистрации участников, ожидающие подверждения"
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "Enter a folder name"
+msgstr "Введите название каталога"
 
-#: ../../Zotlabs/Widget/Admin.php:25 ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Security"
-msgstr "Безопасность"
+#: ../../Zotlabs/Module/Filer.php:53
+msgid "or select an existing folder (doubleclick)"
+msgstr "или выберите существующий каталог (двойной щелчок)"
 
-#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:362
-msgid "Features"
-msgstr "Функции"
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:201
+msgid "Save to Folder"
+msgstr "Сохранить в каталог"
 
-#: ../../Zotlabs/Widget/Admin.php:27 ../../Zotlabs/Module/Admin/Addons.php:343
-#: ../../Zotlabs/Module/Admin/Addons.php:441
-msgid "Addons"
-msgstr "Расширения"
+#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Widget/Appstore.php:19
+msgid "Available Apps"
+msgstr "Доступные приложения"
 
-#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157
-msgid "Themes"
-msgstr "Темы"
+#: ../../Zotlabs/Module/Apps.php:50
+msgid "Installed Apps"
+msgstr "Установленные приложения"
 
-#: ../../Zotlabs/Widget/Admin.php:29
-msgid "Inspect queue"
-msgstr "Просмотр очереди"
+#: ../../Zotlabs/Module/Apps.php:53
+msgid "Manage Apps"
+msgstr "Управление приложениями"
 
-#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Profs.php:168
-msgid "Profile Fields"
-msgstr "Поля профиля"
+#: ../../Zotlabs/Module/Apps.php:54
+msgid "Create Custom App"
+msgstr "Создать пользовательское приложение"
 
-#: ../../Zotlabs/Widget/Admin.php:31
-msgid "DB updates"
-msgstr "Обновление базы данных"
+#: ../../Zotlabs/Module/Follow.php:93
+msgid "Connection added."
+msgstr "Контакт добавлен."
 
-#: ../../Zotlabs/Widget/Admin.php:48 ../../Zotlabs/Widget/Admin.php:58
-#: ../../Zotlabs/Module/Admin/Logs.php:83
-msgid "Logs"
-msgstr "Журналы"
+#: ../../Zotlabs/Module/Like.php:112
+msgid "Like/Dislike"
+msgstr "Нравится / не нравится"
 
-#: ../../Zotlabs/Widget/Admin.php:56
-msgid "Addon Features"
-msgstr "Настройки расширений"
+#: ../../Zotlabs/Module/Like.php:118
+msgid "This action is restricted to members."
+msgstr "Это действие доступно только участникам."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:37
-#: ../../Zotlabs/Widget/Notifications.php:55
-msgid "Direct Messages"
-msgstr "Личные сообщения"
+#: ../../Zotlabs/Module/Like.php:119
+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/Widget/Activity_filter.php:41
-msgid "Show direct (private) messages"
-msgstr "Показать личные (прямые) сообщения"
+#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198
+#: ../../Zotlabs/Module/Like.php:236
+msgid "Invalid request."
+msgstr "Неверный запрос."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:46
-#: ../../Zotlabs/Widget/Notifications.php:74
-msgid "Events"
-msgstr "События"
+#: ../../Zotlabs/Module/Like.php:184 ../../include/conversation.php:135
+msgid "channel"
+msgstr "канал"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:50
-msgid "Show posts that include events"
-msgstr "Показывать публикации с событиями"
+#: ../../Zotlabs/Module/Like.php:213
+msgid "thing"
+msgstr "предмет"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:56
-msgid "Polls"
-msgstr "Опросы"
+#: ../../Zotlabs/Module/Like.php:259
+msgid "Channel unavailable."
+msgstr "Канал недоступен."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:60
-msgid "Show posts that include polls"
-msgstr "Показывать публикации с опросами"
+#: ../../Zotlabs/Module/Like.php:295
+msgid "Previous action reversed."
+msgstr "Предыдущее действие отменено."
 
-#: ../../Zotlabs/Widget/Activity_filter.php:83
+#: ../../Zotlabs/Module/Like.php:477 ../../Zotlabs/Lib/Activity.php:3561
+#: ../../include/conversation.php:174
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1993
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1588
 #, 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 "Показывать публикации этого форума"
-
-#: ../../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 "Показывать публикации где вы были упомянуты или привлечены"
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s нравится %3$s %2$s"
 
-#: ../../Zotlabs/Widget/Activity_filter.php:183
+#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3563
+#: ../../include/conversation.php:177
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1995
 #, php-format
-msgid "Show posts that I have filed to %s"
-msgstr "Показывать публикации которые я добавил в %s"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:193
-msgid "Show filed post categories"
-msgstr "Показывать категории добавленных публикаций"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:207
-msgid "Panel search"
-msgstr "Панель поиска"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:217
-msgid "Filter by name"
-msgstr "Отфильтровать по имени"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:232
-msgid "Remove active filter"
-msgstr "Удалить активный фильтр"
-
-#: ../../Zotlabs/Widget/Activity_filter.php:248
-msgid "Stream Filters"
-msgstr "Фильтры потока"
-
-#: ../../Zotlabs/Widget/Appstore.php:10
-msgid "App Collections"
-msgstr "Коллекции приложений"
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s не нравится %2$s %3$s"
 
-#: ../../Zotlabs/Widget/Appstore.php:12
-msgid "Installed apps"
-msgstr "Установленные приложения"
+#: ../../Zotlabs/Module/Like.php:481
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr "%1$s согласен с %2$s %3$s"
 
-#: ../../Zotlabs/Widget/Appstore.php:13 ../../Zotlabs/Module/Apps.php:50
-msgid "Available Apps"
-msgstr "Доступные приложения"
+#: ../../Zotlabs/Module/Like.php:483
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr "%1$s не согласен с %2$s %3$s"
 
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
-msgstr "Инструменты для событий"
+#: ../../Zotlabs/Module/Like.php:485
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr "%1$s воздерживается от решения по %2$s%3$s"
 
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
-msgstr "Экспортировать календарь"
+#: ../../Zotlabs/Module/Like.php:487
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2221
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s посещает %2$s%3$s"
 
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
-msgstr "Импортировать календарь"
+#: ../../Zotlabs/Module/Like.php:489
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2223
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s не посещает %2$s%3$s"
 
-#: ../../Zotlabs/Widget/Privacygroups.php:38
-msgid "Add new group"
-msgstr "Добавить новую группу"
+#: ../../Zotlabs/Module/Like.php:491
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:2225
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s может посетить %2$s%3$s"
 
-#: ../../Zotlabs/Widget/Privacygroups.php:47
-msgid "Privacy groups"
-msgstr "Группы конфиденциальности"
+#: ../../Zotlabs/Module/Like.php:592
+msgid "Action completed."
+msgstr "Действие завершено."
 
-#: ../../Zotlabs/Widget/Rating.php:51
-msgid "Rating Tools"
-msgstr "Инструменты оценки"
+#: ../../Zotlabs/Module/Like.php:593
+msgid "Thank you."
+msgstr "Спасибо."
 
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
-msgid "Rate Me"
-msgstr "Оценить меня"
+#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован."
 
-#: ../../Zotlabs/Widget/Rating.php:60
-msgid "View Ratings"
-msgstr "Просмотр оценок"
+#: ../../Zotlabs/Module/Pconfig.php:57
+msgid "Configuration Editor"
+msgstr "Редактор конфигурации"
 
-#: ../../Zotlabs/Widget/Cover_photo.php:65
-msgid "Click to show more"
-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 "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не знаете, как правильно использовать эту функцию."
 
-#: ../../Zotlabs/Widget/Follow.php:22 ../../Zotlabs/Module/Connections.php:368
+#: ../../Zotlabs/Module/New_channel.php:147 ../../Zotlabs/Module/Manage.php:130
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "У вас есть %1$.0f из %2$.0f разрешенных контактов."
-
-#: ../../Zotlabs/Widget/Follow.php:29
-msgid "Add New Connection"
-msgstr "Добавить новый контакт"
-
-#: ../../Zotlabs/Widget/Follow.php:30
-msgid "Enter channel address"
-msgstr "Введите адрес канала"
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Вы создали %1$.0f из %2$.0f возможных каналов."
 
-#: ../../Zotlabs/Widget/Follow.php:31
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Пример: ivan@example.com, http://example.com/ivan"
+#: ../../Zotlabs/Module/New_channel.php:159
+msgid "Your real name is recommended."
+msgstr "Рекомендуется использовать ваше настоящее имя."
 
-#: ../../Zotlabs/Widget/Messages.php:24
-msgid "Public and restricted messages"
-msgstr "Общедоступные и частные публикации"
+#: ../../Zotlabs/Module/New_channel.php:160
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
+msgstr "Примеры: \"Иван Иванов\", \"Оксана и кони\", \"Футбол\", \"Тимур и его команда\""
 
-#: ../../Zotlabs/Widget/Messages.php:25
-msgid "Direct messages"
-msgstr "Сообщения"
+#: ../../Zotlabs/Module/New_channel.php:165
+msgid ""
+"This will be used to create a unique network address (like an email address)."
+msgstr "Это будет использовано для создания уникального сетевого адреса (наподобие email)."
 
-#: ../../Zotlabs/Widget/Messages.php:26
-msgid "Starred messages"
-msgstr "Отмеченные публикации"
+#: ../../Zotlabs/Module/New_channel.php:167
+msgid "Allowed characters are a-z 0-9, - and _"
+msgstr "Разрешённые символы a-z 0-9, - и _"
 
-#: ../../Zotlabs/Widget/Messages.php:27
-#: ../../Zotlabs/Widget/Notifications.php:109
-#: ../../Zotlabs/Widget/Notifications.php:110
-msgid "Notices"
-msgstr "Оповещения"
+#: ../../Zotlabs/Module/New_channel.php:175
+msgid "Channel name"
+msgstr "Название канала"
 
-#: ../../Zotlabs/Widget/Messages.php:29
-msgid "No messages"
-msgstr "Сообщений нет"
+#: ../../Zotlabs/Module/New_channel.php:181
+msgid "Create a Channel"
+msgstr "Создать канал"
 
-#: ../../Zotlabs/Widget/Newmember.php:31
-msgid "Profile Creation"
-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 "Канал это уникальная сетевая идентичность. Он может представлять человека (профиль в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту и многие другие вещи."
 
-#: ../../Zotlabs/Widget/Newmember.php:33
-msgid "Upload profile photo"
-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> из другого места."
 
-#: ../../Zotlabs/Widget/Newmember.php:34
-msgid "Upload cover photo"
-msgstr "Загрузить фотографию обложки"
+#: ../../Zotlabs/Module/New_channel.php:188
+msgid "Validate"
+msgstr "Проверить"
 
-#: ../../Zotlabs/Widget/Newmember.php:38
-msgid "Find and Connect with others"
-msgstr "Найти и вступить в контакт"
+#: ../../Zotlabs/Module/Menu.php:68
+msgid "Unable to update menu."
+msgstr "Невозможно обновить меню."
 
-#: ../../Zotlabs/Widget/Newmember.php:40
-msgid "View the directory"
-msgstr "Просмотреть каталог"
+#: ../../Zotlabs/Module/Menu.php:79
+msgid "Unable to create menu."
+msgstr "Невозможно создать меню."
 
-#: ../../Zotlabs/Widget/Newmember.php:41 ../../Zotlabs/Module/Go.php:38
-msgid "View friend suggestions"
-msgstr "Просмотр рекомендуемых друзей"
+#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
+msgid "Menu Name"
+msgstr "Название меню"
 
-#: ../../Zotlabs/Widget/Newmember.php:42
-msgid "Manage your connections"
-msgstr "Управление вашими контактами"
+#: ../../Zotlabs/Module/Menu.php:161
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Уникальное название (не видимо на странице) - требуется"
 
-#: ../../Zotlabs/Widget/Newmember.php:45
-msgid "Communicate"
-msgstr "Связаться"
+#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
+msgid "Menu Title"
+msgstr "Заголовок меню"
 
-#: ../../Zotlabs/Widget/Newmember.php:47
-msgid "View your channel homepage"
-msgstr "Домашняя страница канала"
+#: ../../Zotlabs/Module/Menu.php:162
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Видимость на странице - оставьте пустым если не хотите иметь заголовок"
 
-#: ../../Zotlabs/Widget/Newmember.php:48
-msgid "View your network stream"
-msgstr "Просмотреть ваш сетевой поток"
+#: ../../Zotlabs/Module/Menu.php:163
+msgid "Allow Bookmarks"
+msgstr "Разрешить закладки"
 
-#: ../../Zotlabs/Widget/Newmember.php:54
-msgid "Documentation"
-msgstr "Документация"
+#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Меню может использоваться, чтобы сохранить закладки"
 
-#: ../../Zotlabs/Widget/Newmember.php:57
-msgid "Missing Features?"
-msgstr "Отсутствует функция?"
+#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
+msgid "Submit and proceed"
+msgstr "Отправить и обработать"
 
-#: ../../Zotlabs/Widget/Newmember.php:59
-msgid "Pin apps to navigation bar"
-msgstr "Прикрепить приложение к панели"
+#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2766
+msgid "Menus"
+msgstr "Меню"
 
-#: ../../Zotlabs/Widget/Newmember.php:60
-msgid "Install more apps"
-msgstr "Установить больше приложений"
+#: ../../Zotlabs/Module/Menu.php:181
+msgid "Bookmarks allowed"
+msgstr "Закладки разрешены"
 
-#: ../../Zotlabs/Widget/Newmember.php:71
-msgid "View public stream"
-msgstr "Просмотреть публичный поток"
+#: ../../Zotlabs/Module/Menu.php:183
+msgid "Delete this menu"
+msgstr "Удалить это меню"
 
-#: ../../Zotlabs/Widget/Newmember.php:75
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "New Member Links"
-msgstr "Ссылки для новичков"
+#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
+msgid "Edit menu contents"
+msgstr "Редактировать содержание меню"
 
-#: ../../Zotlabs/Widget/Notes.php:27
-msgid "Read mode"
-msgstr "Читать дальше"
+#: ../../Zotlabs/Module/Menu.php:185
+msgid "Edit this menu"
+msgstr "Редактировать это меню"
 
-#: ../../Zotlabs/Widget/Notes.php:28
-msgid "Edit mode"
-msgstr "Режим редактирования"
+#: ../../Zotlabs/Module/Menu.php:201
+msgid "Menu could not be deleted."
+msgstr "Меню не может быть удалено."
 
-#: ../../Zotlabs/Widget/Notes.php:29
-msgid "Editing"
-msgstr "Редактируем"
+#: ../../Zotlabs/Module/Menu.php:209 ../../Zotlabs/Module/Mitem.php:31
+msgid "Menu not found."
+msgstr "Меню не найдено"
 
-#: ../../Zotlabs/Widget/Notes.php:30
-msgid "Saving"
-msgstr "Сохраняем"
+#: ../../Zotlabs/Module/Menu.php:214
+msgid "Edit Menu"
+msgstr "Редактировать меню"
 
-#: ../../Zotlabs/Widget/Notes.php:31
-msgid "Saved"
-msgstr "Сохранено"
+#: ../../Zotlabs/Module/Menu.php:218
+msgid "Add or remove entries to this menu"
+msgstr "Добавить или удалить пункты этого меню"
 
-#: ../../Zotlabs/Widget/Affinity.php:30
-#: ../../Zotlabs/Module/Contactedit.php:295
-#: ../../Zotlabs/Module/Connedit.php:579
-msgid "Me"
-msgstr "Я"
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Menu name"
+msgstr "Название меню"
 
-#: ../../Zotlabs/Widget/Affinity.php:31
-#: ../../Zotlabs/Module/Contactedit.php:296
-#: ../../Zotlabs/Module/Connedit.php:580
-msgid "Family"
-msgstr "Семья"
+#: ../../Zotlabs/Module/Menu.php:220
+msgid "Must be unique, only seen by you"
+msgstr "Должно быть уникальным (видно только вам)"
 
-#: ../../Zotlabs/Widget/Affinity.php:33
-#: ../../Zotlabs/Module/Contactedit.php:298
-#: ../../Zotlabs/Module/Connedit.php:582
-msgid "Acquaintances"
-msgstr "Знакомые"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title"
+msgstr "Заголовок меню"
 
-#: ../../Zotlabs/Widget/Affinity.php:34
-#: ../../Zotlabs/Module/Contactedit.php:299
-#: ../../Zotlabs/Module/Connections.php:97
-#: ../../Zotlabs/Module/Connections.php:111
-#: ../../Zotlabs/Module/Connedit.php:583
-msgid "All"
-msgstr "Все"
+#: ../../Zotlabs/Module/Menu.php:221
+msgid "Menu title as seen by others"
+msgstr "Видимый другими заголовок меню"
 
-#: ../../Zotlabs/Widget/Affinity.php:54
-msgid "Refresh"
-msgstr "Обновить"
+#: ../../Zotlabs/Module/Menu.php:222
+msgid "Allow bookmarks"
+msgstr "Разрешить закладки"
 
-#: ../../Zotlabs/Widget/Notifications.php:17
-msgid "New network activity notifications"
-msgstr "Уведомления о новой сетевой активности "
+#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:379
+#: ../../Zotlabs/Widget/Notifications.php:153
+msgid "Public Stream"
+msgstr "Публичный поток"
 
-#: ../../Zotlabs/Widget/Notifications.php:20
-msgid "Network stream"
-msgstr "Сетевой поток"
+#: ../../Zotlabs/Module/Search.php:252
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Объекты помечены как: %s"
 
-#: ../../Zotlabs/Widget/Notifications.php:23
-#: ../../Zotlabs/Widget/Notifications.php:62
-msgid "Mark all notifications read"
-msgstr "Пометить уведомления как прочитанные"
+#: ../../Zotlabs/Module/Search.php:254
+#, php-format
+msgid "Search results for: %s"
+msgstr "Результаты поиска для: %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/Authorize.php:17
+msgid "Unknown App"
+msgstr "Неизвестное приложение"
 
-#: ../../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/Authorize.php:29
+msgid "Authorize"
+msgstr "Авторизовать"
 
-#: ../../Zotlabs/Widget/Notifications.php:37
-msgid "New home activity notifications"
-msgstr "Уведомления о взаимодействии с вами"
+#: ../../Zotlabs/Module/Authorize.php:30
+#, php-format
+msgid "Do you authorize the app %s to access your channel data?"
+msgstr "Авторизуете ли вы приложение %s для доступа к данным вашего канала?"
 
-#: ../../Zotlabs/Widget/Notifications.php:40
-msgid "Home stream"
-msgstr "Ваш поток"
+#: ../../Zotlabs/Module/Authorize.php:32 ../../include/acl_selectors.php:147
+msgid "Allow"
+msgstr "Разрешить"
 
-#: ../../Zotlabs/Widget/Notifications.php:43
-#: ../../Zotlabs/Widget/Notifications.php:154
-msgid "Mark all notifications seen"
-msgstr "Пометить уведомления как просмотренные"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
+msgstr "Редактировать шаблон"
 
-#: ../../Zotlabs/Widget/Notifications.php:56
-msgid "New direct messages notifications"
-msgstr "Уведомления о новых сообщениях"
+#: ../../Zotlabs/Module/Rbmark.php:93
+msgid "Select a bookmark folder"
+msgstr "Выбрать каталог для закладок"
 
-#: ../../Zotlabs/Widget/Notifications.php:59
-msgid "Direct messages stream"
-msgstr "Поток сообщений"
+#: ../../Zotlabs/Module/Rbmark.php:98
+msgid "Save Bookmark"
+msgstr "Сохранить закладку"
 
-#: ../../Zotlabs/Widget/Notifications.php:75
-msgid "New events notifications"
-msgstr "Уведомления о новых событиях"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "URL of bookmark"
+msgstr "URL закладки"
 
-#: ../../Zotlabs/Widget/Notifications.php:78
-msgid "View events"
-msgstr "Просмотреть события"
+#: ../../Zotlabs/Module/Rbmark.php:104
+msgid "Or enter new bookmark folder name"
+msgstr "или введите новое имя каталога закладок"
 
-#: ../../Zotlabs/Widget/Notifications.php:81
-msgid "Mark all events seen"
-msgstr "Пометить все события как просмотренные"
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "About this site"
+msgstr "Об этом сайте"
 
-#: ../../Zotlabs/Widget/Notifications.php:89
-#: ../../Zotlabs/Module/Connections.php:165
-msgid "New Connections"
-msgstr "Новые контакты"
+#: ../../Zotlabs/Module/Siteinfo.php:22
+msgid "Site Name"
+msgstr "Название сайта"
 
-#: ../../Zotlabs/Widget/Notifications.php:90
-msgid "New connections notifications"
-msgstr "Уведомления о новых контактах"
+#: ../../Zotlabs/Module/Siteinfo.php:26
+msgid "Administrator"
+msgstr "Администратор"
 
-#: ../../Zotlabs/Widget/Notifications.php:93
-msgid "View all connections"
-msgstr "Просмотр всех контактов"
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "Software and Project information"
+msgstr "Информация о программном обеспечении и проекте"
 
-#: ../../Zotlabs/Widget/Notifications.php:102
-msgid "New files notifications"
-msgstr "Уведомления о новых файлах"
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid "This site is powered by $Projectname"
+msgstr "Этот сайт работает на $Projectname"
 
-#: ../../Zotlabs/Widget/Notifications.php:113
-msgid "View all notices"
-msgstr "Просмотреть все оповещения"
+#: ../../Zotlabs/Module/Siteinfo.php:31
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr "Объединенные и децентрализованные сети и службы идентификациии обеспечиваются Zot"
 
-#: ../../Zotlabs/Widget/Notifications.php:116
-msgid "Mark all notices seen"
-msgstr "Пометить все оповещения как просмотренные"
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Additional federated transport protocols:"
+msgstr "Дополнительные федеративные транспортные протоколы:"
 
-#: ../../Zotlabs/Widget/Notifications.php:137
-msgid "Registrations"
-msgstr "Регистрации"
+#: ../../Zotlabs/Module/Siteinfo.php:36
+#, php-format
+msgid "Version %s"
+msgstr "Версия %s"
 
-#: ../../Zotlabs/Widget/Notifications.php:138
-msgid "New registrations notifications"
-msgstr "Уведомления о новых регистрациях"
+#: ../../Zotlabs/Module/Siteinfo.php:37
+msgid "Project homepage"
+msgstr "Домашняя страница проекта"
 
-#: ../../Zotlabs/Widget/Notifications.php:147
-#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:379
-msgid "Public Stream"
-msgstr "Публичный поток"
+#: ../../Zotlabs/Module/Siteinfo.php:38
+msgid "Developer homepage"
+msgstr "Домашняя страница разработчика"
 
-#: ../../Zotlabs/Widget/Notifications.php:148
-msgid "New public stream notifications"
-msgstr "Уведомления о новом в публичном потоке"
+#: ../../Zotlabs/Module/Thing.php:122
+msgid "Thing updated"
+msgstr "Обновлено"
 
-#: ../../Zotlabs/Widget/Notifications.php:151
-msgid "Public stream"
-msgstr "Публичный поток"
+#: ../../Zotlabs/Module/Thing.php:174
+msgid "Object store: failed"
+msgstr "Хранлищие объектов: неудача"
 
-#: ../../Zotlabs/Widget/Notifications.php:165
-msgid "Sorry, you have got no notifications at the moment"
-msgstr "Извините, но сейчас у вас нет уведомлений"
+#: ../../Zotlabs/Module/Thing.php:178
+msgid "Thing added"
+msgstr "Добавлено"
 
-#: ../../Zotlabs/Module/Tokens.php:94
+#: ../../Zotlabs/Module/Thing.php:204
 #, php-format
-msgid "This channel is limited to %d tokens"
-msgstr "Этот канал ограничен %d токенами"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr ""
 
-#: ../../Zotlabs/Module/Tokens.php:100
-msgid "Name and Password are required."
-msgstr "Требуются имя и пароль."
+#: ../../Zotlabs/Module/Thing.php:267
+msgid "Show Thing"
+msgstr "Показать"
 
-#: ../../Zotlabs/Module/Tokens.php:215
-msgid "Token saved."
-msgstr "Токен сохранён."
+#: ../../Zotlabs/Module/Thing.php:274
+msgid "item not found."
+msgstr "Элемент не найден."
 
-#: ../../Zotlabs/Module/Tokens.php:261
-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/Thing.php:307
+msgid "Edit Thing"
+msgstr "Редактировать"
 
-#: ../../Zotlabs/Module/Tokens.php:274
-msgid "Please select a role for this guest!"
-msgstr "Пожалуйста, выберите роль для этого гостя!"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
+msgid "Select a profile"
+msgstr "Выбрать профиль"
 
-#: ../../Zotlabs/Module/Tokens.php:287
-msgid "Select a role for this guest"
-msgstr "Выбрать роль для этого гостя"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Post an activity"
+msgstr "Опубликовать мероприятие"
 
-#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:373
-msgid "Guest Access"
-msgstr "Гостевой доступ"
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Отправлять только подходящий профиль"
 
-#: ../../Zotlabs/Module/Tokens.php:291
-msgid "Login Name"
-msgstr "Имя"
+#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
+msgid "Name of thing e.g. something"
+msgstr "Наименование, например \"нечто\""
 
-#: ../../Zotlabs/Module/Tokens.php:292
-msgid "Login Password"
-msgstr "Пароль"
+#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
+msgid "URL of thing (optional)"
+msgstr "URL (необязательно)"
 
-#: ../../Zotlabs/Module/Tokens.php:293
-msgid "Expires (yyyy-mm-dd)"
-msgstr "Срок действия (yyyy-mm-dd)"
+#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
+msgid "URL for photo of thing (optional)"
+msgstr "URL для фотографии (необязательно)"
 
-#: ../../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/Thing.php:364
+msgid "Add Thing to your Profile"
+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/Email_validation.php:36
+msgid "Email Verification Required"
+msgstr "Требуется проверка адреса email"
 
-#: ../../Zotlabs/Module/Article_edit.php:127
-msgid "Edit Article"
-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/Module/Attach_edit.php:69
-#: ../../Zotlabs/Module/Filestorage.php:109
-msgid "File not found."
-msgstr "Файл не найден."
+#: ../../Zotlabs/Module/Email_validation.php:38
+msgid "Resend Email"
+msgstr "Выслать повторно"
 
-#: ../../Zotlabs/Module/Attach_edit.php:118
-msgid "Can not copy folder into itself."
-msgstr "Невозможно скопировать каталог в самого себя."
+#: ../../Zotlabs/Module/Email_validation.php:41
+msgid "Validation token"
+msgstr "Проверочный код"
 
-#: ../../Zotlabs/Module/Attach_edit.php:131
-#, php-format
-msgid "Can not move folder \"%s\" into itself."
-msgstr "Невозможно скопировать каталог \"%s\" в самого себя."
+#: ../../Zotlabs/Module/Webpages.php:67
+msgid "Import Webpage Elements"
+msgstr "Импортировать части веб-страницы"
 
-#: ../../Zotlabs/Module/Network.php:106
-msgid "No such group"
-msgstr "Нет такой группы"
+#: ../../Zotlabs/Module/Webpages.php:68
+msgid "Import selected"
+msgstr "Импортировать выбранное"
 
-#: ../../Zotlabs/Module/Network.php:155
-msgid "No such channel"
-msgstr "Нет такого канала"
+#: ../../Zotlabs/Module/Webpages.php:91
+msgid "Export Webpage Elements"
+msgstr "Экспортировать часть веб-страницы"
 
-#: ../../Zotlabs/Module/Network.php:167 ../../Zotlabs/Module/Channel.php:232
-msgid "Search Results For:"
-msgstr "Результаты поиска для:"
+#: ../../Zotlabs/Module/Webpages.php:92
+msgid "Export selected"
+msgstr "Экспортировать выбранное"
 
-#: ../../Zotlabs/Module/Network.php:208 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Hq.php:114 ../../Zotlabs/Module/Pubstream.php:90
-#: ../../Zotlabs/Module/Display.php:87
-msgid "Reset form"
-msgstr "Очистить форму"
+#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Lib/Apps.php:345
+#: ../../include/nav.php:505
+msgid "Webpages"
+msgstr "Веб-страницы"
 
-#: ../../Zotlabs/Module/Network.php:242
-msgid "Privacy group is empty"
-msgstr "Группа конфиденциальности пуста"
+#: ../../Zotlabs/Module/Webpages.php:260
+msgid "Actions"
+msgstr "Действия"
 
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Privacy group: "
-msgstr "Группа конфиденциальности: "
+#: ../../Zotlabs/Module/Webpages.php:261
+msgid "Page Link"
+msgstr "Ссылка страницы"
 
-#: ../../Zotlabs/Module/Import_items.php:50
-msgid "Not a zip file or zip file corrupted."
-msgstr "Не zip файл или повреждённый zip файл."
+#: ../../Zotlabs/Module/Webpages.php:262
+msgid "Page Title"
+msgstr "Заголовок страницы"
 
-#: ../../Zotlabs/Module/Import_items.php:121
-msgid "Import Items"
-msgstr "Импортировать объекты"
+#: ../../Zotlabs/Module/Webpages.php:292
+msgid "Invalid file type."
+msgstr "Неверный тип файла."
 
-#: ../../Zotlabs/Module/Import_items.php:122
-msgid "Use this form to import existing posts and content from an export file."
-msgstr "Используйте эту форму для импорта существующих публикаций и содержимого из файла."
+#: ../../Zotlabs/Module/Webpages.php:304
+msgid "Error opening zip file"
+msgstr "Ошибка открытия ZIP файла"
 
-#: ../../Zotlabs/Module/Import_items.php:123
-#: ../../Zotlabs/Module/Import.php:594
-msgid "File to Upload"
-msgstr "Файл для загрузки"
+#: ../../Zotlabs/Module/Webpages.php:315
+msgid "Invalid folder path."
+msgstr "Неверный путь к каталогу."
 
-#: ../../Zotlabs/Module/Import_items.php:136
-#: ../../Zotlabs/Module/Import.php:107
-msgid "Imported file is empty."
-msgstr "Импортированный файл пуст."
+#: ../../Zotlabs/Module/Webpages.php:342
+msgid "No webpage elements detected."
+msgstr "Не обнаружено частей веб-страницы."
 
-#: ../../Zotlabs/Module/Import_items.php:159
-msgid "Content import completed"
-msgstr "Импорт содержимого завершён"
+#: ../../Zotlabs/Module/Webpages.php:417
+msgid "Import complete."
+msgstr "Импорт завершен."
 
-#: ../../Zotlabs/Module/Import_items.php:164
-msgid "Chatroom import completed"
-msgstr "Импорт комнат чатов завершён"
+#: ../../Zotlabs/Module/Moderate.php:67
+msgid "Comment approved"
+msgstr "Комментарий одобрен"
 
-#: ../../Zotlabs/Module/Import_items.php:170
-msgid "Channel calendar import 1/2 completed"
-msgstr "Импорт календаря канала завершён на 1/2"
+#: ../../Zotlabs/Module/Moderate.php:71
+msgid "Comment deleted"
+msgstr "Комментарий удалён"
 
-#: ../../Zotlabs/Module/Import_items.php:176
-msgid "Channel calendar import 2/2 completed"
-msgstr "Импорт календаря канала завершён на 2/2"
+#: ../../Zotlabs/Module/Rmagic.php:46
+msgid "Authentication failed."
+msgstr "Ошибка аутентификации."
 
-#: ../../Zotlabs/Module/Import_items.php:181
-msgid "Menu import completed"
-msgstr "Импорт меню завершён"
+#: ../../Zotlabs/Module/Rmagic.php:97 ../../include/channel.php:2611
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Введите адрес вашего канала (например: channel@example.com)"
 
-#: ../../Zotlabs/Module/Import_items.php:186
-msgid "Wiki import completed"
-msgstr "Импорт wiki завершён"
+#: ../../Zotlabs/Module/Rmagic.php:98 ../../include/channel.php:2612
+msgid "Authenticate"
+msgstr "Проверка подлинности"
 
-#: ../../Zotlabs/Module/Import_items.php:191
-msgid "Webpages import completed"
-msgstr "Импорт веб-страниц завершён"
+#: ../../Zotlabs/Module/Cal.php:62
+msgid "Permissions denied."
+msgstr "Доступ запрещен."
 
 #: ../../Zotlabs/Module/Import.php:70
 msgid "Nothing to import."
@@ -7974,590 +6793,714 @@ msgid ""
 "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/Group.php:47
+msgid "Privacy group created."
+msgstr "Группа конфиденциальности создана."
 
-#: ../../Zotlabs/Module/Z6trans.php:19
-msgid "Update to Hubzilla 5.0 step 2"
-msgstr "Обновление Hubzilla 5.0, этап 2"
+#: ../../Zotlabs/Module/Group.php:50
+msgid "Could not create privacy group."
+msgstr "Не удалось создать группу конфиденциальности."
 
-#: ../../Zotlabs/Module/Z6trans.php:21
-msgid "To complete the update please run"
-msgstr "Для завершения обновления пожалуйста выполните"
+#: ../../Zotlabs/Module/Group.php:62 ../../Zotlabs/Module/Group.php:206
+#: ../../include/items.php:4398
+msgid "Privacy group not found."
+msgstr "Группа конфиденциальности не найдена."
 
-#: ../../Zotlabs/Module/Z6trans.php:23
-msgid "php util/z6convert.php"
-msgstr ""
+#: ../../Zotlabs/Module/Group.php:82
+msgid "Privacy group updated."
+msgstr "Группа конфиденциальности обновлена."
 
-#: ../../Zotlabs/Module/Z6trans.php:25
-msgid "from the terminal."
-msgstr "из терминала."
+#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:301
+msgid "Post to this group by default"
+msgstr "Публиковать в этой группе по умолчанию"
 
-#: ../../Zotlabs/Module/Register.php:112
-msgid "Email address required"
-msgstr "Требуется адрес электронной почты"
+#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302
+msgid "Add new contacts to this group by default"
+msgstr "Добавлять новые контакты в эту группу по умолчанию"
 
-#: ../../Zotlabs/Module/Register.php:156
-msgid "No password provided"
-msgstr "Пароль не указан"
+#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:368
+#: ../../Zotlabs/Widget/Activity_filter.php:95 ../../include/group.php:327
+#: ../../include/acl_selectors.php:87
+msgid "Privacy Groups"
+msgstr "Группы конфиденциальности"
 
-#: ../../Zotlabs/Module/Register.php:179
-msgid "Terms of Service not accepted"
-msgstr "Условия использования не были приняты"
+#: ../../Zotlabs/Module/Group.php:146
+msgid "Privacy group name"
+msgstr "Имя группы конфиденциальности"
 
-#: ../../Zotlabs/Module/Register.php:241
-msgid "Invitation code succesfully applied"
-msgstr "Код приглашения принят успешно"
+#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
+msgid "Members are visible to other channels"
+msgstr "Участники канала видимые для остальных"
 
-#: ../../Zotlabs/Module/Register.php:261
-msgid "Invitation not in time or too late"
-msgstr "Приглашение истекло или введено не вовремя"
+#: ../../Zotlabs/Module/Group.php:175
+msgid "Privacy group removed."
+msgstr "Группа конфиденциальности удалена."
 
-#: ../../Zotlabs/Module/Register.php:267
-msgid "Invitation email failed"
-msgstr "Не удалось отправить письмо с приглашением "
+#: ../../Zotlabs/Module/Group.php:178
+msgid "Unable to remove privacy group."
+msgstr "Ну удалось удалить группу конфиденциальности."
 
-#: ../../Zotlabs/Module/Register.php:275
-msgid "Invitation code failed"
-msgstr "Неверный код приглашения"
+#: ../../Zotlabs/Module/Group.php:244
+#, php-format
+msgid "Privacy Group: %s"
+msgstr "Группа конфиденциальности: %s"
 
-#: ../../Zotlabs/Module/Register.php:282
-msgid "Invitations are not available"
-msgstr "Приглашения не доступны"
+#: ../../Zotlabs/Module/Group.php:246
+msgid "Privacy group name: "
+msgstr "Название группы конфиденциальности: "
 
-#: ../../Zotlabs/Module/Register.php:292
-msgid "Registration on this hub is by invitation only"
-msgstr "Регистрация на этом хабе возможна только по приглашениям"
+#: ../../Zotlabs/Module/Group.php:262
+msgid "Group members"
+msgstr "Члены группы"
 
-#: ../../Zotlabs/Module/Register.php:399
-msgid "New register request"
-msgstr "Новый запрос на регистрацию"
+#: ../../Zotlabs/Module/Group.php:264
+msgid "Not in this group"
+msgstr "Не в этой группе"
 
-#: ../../Zotlabs/Module/Register.php:417
-msgid "Error creating dId A"
-msgstr "Ошибка создания dId A"
+#: ../../Zotlabs/Module/Group.php:296
+msgid "Click a channel to toggle membership"
+msgstr "Нажмите на канал для просмотра членства"
 
-#: ../../Zotlabs/Module/Register.php:435
-msgid "Registration on this hub is disabled."
-msgstr "Регистрация на этом хабе отключена."
+#: ../../Zotlabs/Module/Profile.php:106
+msgid "vcard"
+msgstr "vCard"
 
-#: ../../Zotlabs/Module/Register.php:444
-msgid "Registration on this hub is by approval only."
-msgstr "Регистрация на этом хабе только с одобрения."
+#: ../../Zotlabs/Module/Connedit.php:171
+msgid "Connection updated."
+msgstr "Контакты обновлены."
 
-#: ../../Zotlabs/Module/Register.php:445
-msgid "Register at another affiliated hub in case when prefered"
-msgstr "При необходимости вы можете зарегистрироваться на другом хабе"
+#: ../../Zotlabs/Module/Connedit.php:173
+msgid "Failed to update connection record."
+msgstr "Не удалось обновить запись контакта."
 
-#: ../../Zotlabs/Module/Register.php:458
-msgid "Registration on this hub is by invitation only."
-msgstr "Регистрация на этом хабе доступна только по приглашениям."
+#: ../../Zotlabs/Module/Connedit.php:320
+msgid "Could not access address book record."
+msgstr "Не удалось получить доступ к записи адресной книги."
 
-#: ../../Zotlabs/Module/Register.php:459
-msgid "Register at another affiliated hub"
-msgstr "Зарегистрироваться на другом хабе"
+#: ../../Zotlabs/Module/Connedit.php:368
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Обновление невозможно - в настоящее время канал недоступен."
 
-#: ../../Zotlabs/Module/Register.php:473 ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Terms of Service"
-msgstr "Условия предоставления услуг"
+#: ../../Zotlabs/Module/Connedit.php:382 ../../Zotlabs/Module/Connedit.php:391
+#: ../../Zotlabs/Module/Connedit.php:400 ../../Zotlabs/Module/Connedit.php:409
+#: ../../Zotlabs/Module/Connedit.php:422
+msgid "Unable to set address book parameters."
+msgstr "Не удалось получить доступ к параметрам адресной книги."
 
-#: ../../Zotlabs/Module/Register.php:479
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Я принимаю %s для этого веб-сайта."
+#: ../../Zotlabs/Module/Connedit.php:441
+msgid "Connection has been removed."
+msgstr "Контакт был удалён."
 
-#: ../../Zotlabs/Module/Register.php:486
+#: ../../Zotlabs/Module/Connedit.php:480 ../../Zotlabs/Lib/Apps.php:348
+#: ../../include/nav.php:111 ../../include/conversation.php:1093
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:58
+msgid "View Profile"
+msgstr "Просмотреть профиль"
+
+#: ../../Zotlabs/Module/Connedit.php:483
 #, php-format
-msgid "I am over %s years of age and accept the %s for this website"
-msgstr "Мой возраст превышает %s лет и я принимаю %s для этого веб-сайта."
+msgid "View %s's profile"
+msgstr "Просмотр %s профиля"
 
-#: ../../Zotlabs/Module/Register.php:496
-msgid "Your email address"
-msgstr "Ваш адрес электронной почты"
+#: ../../Zotlabs/Module/Connedit.php:501 ../../include/conversation.php:1105
+msgid "Recent Activity"
+msgstr "Последние действия"
 
-#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Oauth.php:115
-#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:156
-msgid "Optional"
-msgstr "Необязательно"
+#: ../../Zotlabs/Module/Connedit.php:504
+msgid "View recent posts and comments"
+msgstr "Просмотреть последние публикации и комментарии"
 
-#: ../../Zotlabs/Module/Register.php:503
-msgid "Choose a password"
-msgstr "Выберите пароль"
+#: ../../Zotlabs/Module/Connedit.php:550
+msgid "Fetch Vcard"
+msgstr "Получить vCard"
 
-#: ../../Zotlabs/Module/Register.php:504
-msgid "Please re-enter your password"
-msgstr "Пожалуйста, введите пароль еще раз"
+#: ../../Zotlabs/Module/Connedit.php:553
+msgid "Fetch electronic calling card for this connection"
+msgstr "Получить электронную телефонную карточку для этого контакта"
 
-#: ../../Zotlabs/Module/Register.php:506
-msgid "Please enter your invitation code"
-msgstr "Пожалуйста, введите Ваш код приглашения"
+#: ../../Zotlabs/Module/Connedit.php:575
+msgid "Open Set Affinity section by default"
+msgstr "Открыть секцию установления сходства по умолчанию"
 
-#: ../../Zotlabs/Module/Register.php:508
-msgid "Your name"
-msgstr "Ваше имя"
+#: ../../Zotlabs/Module/Connedit.php:612
+msgid "Filter"
+msgstr "Фильтр"
 
-#: ../../Zotlabs/Module/Register.php:508
-msgid "Real name is preferred"
-msgstr "Предпочтительнее использовать ваше настоящее имя"
+#: ../../Zotlabs/Module/Connedit.php:615
+msgid "Open Custom Filter section by default"
+msgstr "Открывать секцию \"Настраиваемый фильтр\" по умолчанию"
 
-#: ../../Zotlabs/Module/Register.php:510
-#: ../../Zotlabs/Module/New_channel.php:177
-msgid "Choose a short nickname"
-msgstr "Выберите короткий псевдоним"
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Set Affinity"
+msgstr "Установить сходство"
 
-#: ../../Zotlabs/Module/Register.php:510
-msgid ""
-"Your nickname will be used to create an easy to remember channel address"
-msgstr "Ваш псевдоним будет использован для создания легко запоминающегося адреса канала"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Set Profile"
+msgstr "Установить профиль"
 
-#: ../../Zotlabs/Module/Register.php:514
-msgid "Why do you want to join this hub?"
-msgstr "Почему вы хотите зарегистрироваться на этом хабе?"
+#: ../../Zotlabs/Module/Connedit.php:632
+msgid "Set Affinity & Profile"
+msgstr "Установить сходство и профиль"
 
-#: ../../Zotlabs/Module/Register.php:514
-msgid "This will help to review your registration"
-msgstr "Это поможет проверить вашу регистрацию "
+#: ../../Zotlabs/Module/Connedit.php:685
+#, php-format
+msgid "Contact: %s"
+msgstr "Контакт: %s"
 
-#: ../../Zotlabs/Module/Register.php:520
-#: ../../Zotlabs/Module/Admin/Site.php:413
-msgid "Registration"
-msgstr "Регистрация"
+#: ../../Zotlabs/Module/Connedit.php:687
+msgid "Manage contact roles"
+msgstr "Управление ролями контактов"
 
-#: ../../Zotlabs/Module/Register.php:528
-msgid "I have an invite code"
-msgstr "У меня есть код приглашения"
+#: ../../Zotlabs/Module/Connedit.php:694
+msgid "This contacts's primary address is"
+msgstr "Основной адрес этого контакта:"
 
-#: ../../Zotlabs/Module/Register.php:575
+#: ../../Zotlabs/Module/Connedit.php:695
+msgid "Available locations:"
+msgstr "Доступные расположения:"
+
+#: ../../Zotlabs/Module/Connedit.php:710
+msgid "Contact Pending Approval"
+msgstr "Контакты ожидающие утверждения"
+
+#: ../../Zotlabs/Module/Connedit.php:715
+#, php-format
 msgid ""
-"This site has exceeded the number of allowed daily account registrations."
-msgstr "На этом сайте превышено допустимое количество ежедневных регистраций учетных записей."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре."
 
-#: ../../Zotlabs/Module/Search.php:22
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../Zotlabs/Module/Display.php:28 ../../Zotlabs/Module/Directory.php:72
-#: ../../Zotlabs/Module/Directory.php:77 ../../Zotlabs/Module/Photos.php:523
-msgid "Public access denied."
-msgstr "Публичный доступ запрещен."
+#: ../../Zotlabs/Module/Connedit.php:721
+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/Connedit.php:722
+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> вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек."
+
+#: ../../Zotlabs/Module/Connedit.php:723
+msgid "Last update:"
+msgstr "Последнее обновление:"
+
+#: ../../Zotlabs/Module/Connedit.php:731
+msgid "Details"
+msgstr "Сведения"
+
+#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
+msgid "Item is not editable"
+msgstr "Элемент нельзя редактировать"
+
+#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:218
+msgid "Edit post"
+msgstr "Редактировать сообщение"
+
+#: ../../Zotlabs/Module/Manage.php:137
+msgid "Create a new channel"
+msgstr "Создать новый канал"
+
+#: ../../Zotlabs/Module/Manage.php:163
+msgid "Current Channel"
+msgstr "Текущий канал"
 
-#: ../../Zotlabs/Module/Search.php:239
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Switch to one of your channels by selecting it."
+msgstr "Выбрать и переключиться на один из ваших каналов"
+
+#: ../../Zotlabs/Module/Manage.php:166
+msgid "Default Channel"
+msgstr "Основной канал"
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Make Default"
+msgstr "Сделать основным"
+
+#: ../../Zotlabs/Module/Manage.php:170
 #, php-format
-msgid "Items tagged with: %s"
-msgstr "Объекты помечены как: %s"
+msgid "%d new introductions"
+msgstr "%d новых представлений"
+
+#: ../../Zotlabs/Module/Manage.php:172
+msgid "Delegated Channel"
+msgstr "Делегированный канал"
+
+#: ../../Zotlabs/Module/Import_progress.php:36
+msgid "Item sync completed!"
+msgstr "Синхронизация объектов завершена!"
+
+#: ../../Zotlabs/Module/Import_progress.php:51
+msgid "Item sync completed but no items were found!"
+msgstr "Синхронизация объектов завершена, но объекты не найдены!"
+
+#: ../../Zotlabs/Module/Import_progress.php:73
+msgid "File sync completed!"
+msgstr "Синхронизация файлов завершена!"
+
+#: ../../Zotlabs/Module/Import_progress.php:90
+msgid "File sync completed but no files were found!"
+msgstr "Синхронизация файлов завершена, но файлы не найдены! "
+
+#: ../../Zotlabs/Module/Import_progress.php:105
+msgid "Channel clone status"
+msgstr "Статус клонирования канала"
+
+#: ../../Zotlabs/Module/Import_progress.php:106
+msgid "Item sync status"
+msgstr "Статус синхронизации объектов"
+
+#: ../../Zotlabs/Module/Import_progress.php:107
+msgid "File sync status"
+msgstr "Статус синхронизации файлов"
+
+#: ../../Zotlabs/Module/Import_progress.php:114
+msgid "Channel cloning completed!"
+msgstr "Клонирование канала завершено!"
+
+#: ../../Zotlabs/Module/Import_progress.php:115
+msgid "Resume"
+msgstr "Возобновить"
+
+#: ../../Zotlabs/Module/Import_progress.php:116
+msgid "Only resume if sync stalled!"
+msgstr "Возобновлять только в том случае, если синхронизация остановилась! "
+
+#: ../../Zotlabs/Module/Achievements.php:38
+msgid "Some blurb about what to do when you're new here"
+msgstr "Некоторые предложения о том, что делать, если вы здесь новичок "
 
-#: ../../Zotlabs/Module/Search.php:241
+#: ../../Zotlabs/Module/Cloud.php:120
+msgid "Not found"
+msgstr "Не найдено."
+
+#: ../../Zotlabs/Module/Cloud.php:130
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../../Zotlabs/Module/Display.php:336
+msgid "Article"
+msgstr "Статья"
+
+#: ../../Zotlabs/Module/Display.php:381
+msgid "Item has been removed."
+msgstr "Элемент был удалён."
+
+#: ../../Zotlabs/Module/Attach.php:68
+msgid "Item not available."
+msgstr "Элемент недоступен."
+
+#: ../../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
+#: ../../Zotlabs/Module/Setup.php:179
 msgid "$Projectname Server - Setup"
 msgstr "$Projectname сервер - Установка"
 
-#: ../../Zotlabs/Module/Setup.php:173
+#: ../../Zotlabs/Module/Setup.php:183
 msgid "Could not connect to database."
 msgstr "Не удалось подключиться к серверу баз данных."
 
-#: ../../Zotlabs/Module/Setup.php:177
+#: ../../Zotlabs/Module/Setup.php:187
 msgid ""
 "Could not connect to specified site URL. Possible SSL certificate or DNS "
 "issue."
 msgstr "Не удалось подключиться к указанному URL. Вероятно проблема с SSL сертификатом или DNS."
 
-#: ../../Zotlabs/Module/Setup.php:184
+#: ../../Zotlabs/Module/Setup.php:194
 msgid "Could not create table."
 msgstr "Не удалось создать таблицу."
 
-#: ../../Zotlabs/Module/Setup.php:190
+#: ../../Zotlabs/Module/Setup.php:200
 msgid "Your site database has been installed."
 msgstr "Ваша база данных установлена."
 
-#: ../../Zotlabs/Module/Setup.php:196
+#: ../../Zotlabs/Module/Setup.php:206
 msgid ""
 "You may need to import the file \"install/schema_xxx.sql\" manually using a "
 "database client."
 msgstr "Вам может понадобится импортировать файл \"install/schema_xxx.sql\" вручную используя клиент базы данных."
 
-#: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261
-#: ../../Zotlabs/Module/Setup.php:768
+#: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:271
+#: ../../Zotlabs/Module/Setup.php:778
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Пожалуйста, обратитесь к файлу \"install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:258
+#: ../../Zotlabs/Module/Setup.php:268
 msgid "System check"
 msgstr "Проверка системы"
 
-#: ../../Zotlabs/Module/Setup.php:262 ../../Zotlabs/Module/Cdav.php:1035
-#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:962
-msgid "Next"
-msgstr "Следующая"
-
-#: ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:273
 msgid "Check again"
 msgstr "Перепроверить"
 
-#: ../../Zotlabs/Module/Setup.php:284
+#: ../../Zotlabs/Module/Setup.php:294
 msgid "Database connection"
 msgstr "Подключение к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:285
+#: ../../Zotlabs/Module/Setup.php:295
 msgid ""
 "In order to install $Projectname we need to know how to connect to your "
 "database."
 msgstr "Для установки $Projectname необходимо знать как подключиться к ваше базе данных."
 
-#: ../../Zotlabs/Module/Setup.php:286
+#: ../../Zotlabs/Module/Setup.php:296
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr "Пожалуйста, свяжитесь с вашим хостинг провайдером или администрацией сайта если у вас есть вопросы об этих настройках."
 
-#: ../../Zotlabs/Module/Setup.php:287
+#: ../../Zotlabs/Module/Setup.php:297
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr "Указанная ниже база данных должна существовать. Если это не так, пожалуйста, создайте её перед тем, как продолжить."
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Database Server Name"
 msgstr "Имя сервера баз данных"
 
-#: ../../Zotlabs/Module/Setup.php:291
+#: ../../Zotlabs/Module/Setup.php:301
 msgid "Default is 127.0.0.1"
 msgstr "По умолчанию 127.0.0.1"
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Database Port"
 msgstr "Порт сервера баз данных"
 
-#: ../../Zotlabs/Module/Setup.php:292
+#: ../../Zotlabs/Module/Setup.php:302
 msgid "Communication port number - use 0 for default"
 msgstr "Порт коммуникации - используйте 0 по умолчанию"
 
-#: ../../Zotlabs/Module/Setup.php:293
+#: ../../Zotlabs/Module/Setup.php:303
 msgid "Database Login Name"
 msgstr "Имя для подключения к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:294
+#: ../../Zotlabs/Module/Setup.php:304
 msgid "Database Login Password"
 msgstr "Пароль для подключения к базе данных"
 
-#: ../../Zotlabs/Module/Setup.php:295
+#: ../../Zotlabs/Module/Setup.php:305
 msgid "Database Name"
 msgstr "Имя базы данных"
 
-#: ../../Zotlabs/Module/Setup.php:296
+#: ../../Zotlabs/Module/Setup.php:306
 msgid "Database Type"
 msgstr "Тип базы данных"
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348
 msgid "Site administrator email address"
 msgstr "Адрес электронной почты администратора сайта"
 
-#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:348
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr "Ваш адрес электронной почты должен соответствовать этому для использования веб-панели администратора."
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 msgid "Website URL"
 msgstr "URL веб-сайта"
 
-#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 msgid "Please use SSL (https) URL if available."
 msgstr "Пожалуйста, используйте SSL (https) URL если возможно."
 
-#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:342
+#: ../../Zotlabs/Module/Setup.php:310 ../../Zotlabs/Module/Setup.php:352
 msgid "Please select a default timezone for your website"
 msgstr "Пожалуйста, выберите часовой пояс по умолчанию для вашего сайта"
 
-#: ../../Zotlabs/Module/Setup.php:327
+#: ../../Zotlabs/Module/Setup.php:337
 msgid "Site settings"
 msgstr "Настройки сайта"
 
-#: ../../Zotlabs/Module/Setup.php:381
-msgid "PHP version 7.1 or greater is required."
-msgstr "Требуется PHP версии 7.1 или старше."
+#: ../../Zotlabs/Module/Setup.php:391
+msgid "PHP version 8.0 or greater is required."
+msgstr "Требуется PHP версии 8.0 или выше."
 
-#: ../../Zotlabs/Module/Setup.php:382
+#: ../../Zotlabs/Module/Setup.php:392
 msgid "PHP version"
 msgstr "Версия PHP"
 
-#: ../../Zotlabs/Module/Setup.php:398
+#: ../../Zotlabs/Module/Setup.php:408
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Не удалось найти консольную версию PHP в путях переменной PATH веб-сервера."
 
-#: ../../Zotlabs/Module/Setup.php:399
+#: ../../Zotlabs/Module/Setup.php:409
 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 "Если у вас на сервере не установлена консольная версия PHP вы не сможете запустить фоновый опрос через cron. "
 
-#: ../../Zotlabs/Module/Setup.php:403
+#: ../../Zotlabs/Module/Setup.php:413
 msgid "PHP executable path"
 msgstr "Пусть к исполняемому модулю PHP"
 
-#: ../../Zotlabs/Module/Setup.php:403
+#: ../../Zotlabs/Module/Setup.php:413
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Введите полный путь к исполняемому модулю PHP. Вы можете оставить его пустым для продолжения установки."
 
-#: ../../Zotlabs/Module/Setup.php:408
+#: ../../Zotlabs/Module/Setup.php:418
 msgid "Command line PHP"
 msgstr "Командная строка PHP"
 
-#: ../../Zotlabs/Module/Setup.php:418
+#: ../../Zotlabs/Module/Setup.php:428
 msgid ""
 "Unable to check command line PHP, as shell_exec() is disabled. This is "
 "required."
 msgstr "Невозможно проверить командную строку PHP поскольку требуемая функция shell_exec() отключена."
 
-#: ../../Zotlabs/Module/Setup.php:422
+#: ../../Zotlabs/Module/Setup.php:432
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "В консольной версии PHP в вашей системе отключена опция \"register_argc_argv\"."
 
-#: ../../Zotlabs/Module/Setup.php:423
+#: ../../Zotlabs/Module/Setup.php:433
 msgid "This is required for message delivery to work."
 msgstr "Это необходимо для функционирования доставки сообщений."
 
-#: ../../Zotlabs/Module/Setup.php:426
+#: ../../Zotlabs/Module/Setup.php:436
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:446
+#: ../../Zotlabs/Module/Setup.php:456
 msgid ""
 "This is not sufficient to upload larger images or files. You should be able "
 "to upload at least 4 MB at once."
 msgstr "Этого недостаточно для загрузки больших изображений или файлов. Вы должны иметь возможность загрузить как минимум 4 Мб за раз."
 
-#: ../../Zotlabs/Module/Setup.php:448
+#: ../../Zotlabs/Module/Setup.php:458
 #, 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 "Максимально разрешённый общий размер загрузок установлен в %s. Максимальный размер одной загрузки установлен в %s. Вам разрешено загружать до %d файлов за один приём."
 
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Setup.php:464
 msgid "You can adjust these settings in the server php.ini file."
 msgstr "Вы можете изменить эти настройки в файле php.ini на сервере."
 
-#: ../../Zotlabs/Module/Setup.php:456
+#: ../../Zotlabs/Module/Setup.php:466
 msgid "PHP upload limits"
 msgstr "Максимальный размер загрузки в PHP"
 
-#: ../../Zotlabs/Module/Setup.php:479
+#: ../../Zotlabs/Module/Setup.php:489
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Ошибка: функция \"openssl_pkey_new\" не может сгенерировать ключи шифрования"
 
-#: ../../Zotlabs/Module/Setup.php:480
+#: ../../Zotlabs/Module/Setup.php:490
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr "Если работаете под Windows, см. \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../Zotlabs/Module/Setup.php:483
+#: ../../Zotlabs/Module/Setup.php:493
 msgid "Generate encryption keys"
 msgstr "Генерация ключей шифрования"
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Zotlabs/Module/Setup.php:510
 msgid "libCurl PHP module"
 msgstr "модуль PHP libcURL"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:511
 msgid "GD graphics PHP module"
 msgstr "модуль графики PHP GD"
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:512
 msgid "OpenSSL PHP module"
 msgstr "модуль PHP OpenSSL"
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:513
 msgid "PDO database PHP module"
 msgstr "модуль баз данных PHP PDO"
 
-#: ../../Zotlabs/Module/Setup.php:504
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "mb_string PHP module"
 msgstr "модуль PHP mb_string"
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:515
 msgid "xml PHP module"
 msgstr "модуль PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:506
+#: ../../Zotlabs/Module/Setup.php:516
 msgid "zip PHP module"
 msgstr "модуль PHP zip"
 
-#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:522
 msgid "Apache mod_rewrite module"
 msgstr "модуль Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:520
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Ошибка: требуемый модуль mod_rewrite веб-сервера Apache не установлен."
 
-#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
 msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:516
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr "Ошибка: exec требуется, однако не установлен или был отключён в php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525
+#: ../../Zotlabs/Module/Setup.php:532 ../../Zotlabs/Module/Setup.php:535
 msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:522
+#: ../../Zotlabs/Module/Setup.php:532
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Ошибка: shell_exec требуется, однако не установлен или был отключён в php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:530
+#: ../../Zotlabs/Module/Setup.php:540
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Ошибка: модуль PHP libсURL требуется, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:534
+#: ../../Zotlabs/Module/Setup.php:544
 msgid ""
 "Error: GD PHP module with JPEG support or ImageMagick graphics library "
 "required but not installed."
 msgstr "Ошибка: модуль PHP GD с поддержкой JPEG или графическая библиотека ImageMagick требуется, однако не установлена"
 
-#: ../../Zotlabs/Module/Setup.php:538
+#: ../../Zotlabs/Module/Setup.php:548
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Ошибка: модуль PHP OpenSSL требуется, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:544
+#: ../../Zotlabs/Module/Setup.php:554
 msgid ""
 "Error: PDO database PHP module missing a driver for either mysql or pgsql."
 msgstr "Ошибка: отсутствует драйвер MySQL или PgSQL в модуле баз данных PHP PDO"
 
-#: ../../Zotlabs/Module/Setup.php:549
+#: ../../Zotlabs/Module/Setup.php:559
 msgid "Error: PDO database PHP module required but not installed."
 msgstr "Ошибка: модуль баз данных PHP PDO требуется, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:553
+#: ../../Zotlabs/Module/Setup.php:563
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Ошибка: модуль PHP mb_string требуется, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:567
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Ошибка: модуль PHP xml требуется для DAV, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:561
+#: ../../Zotlabs/Module/Setup.php:571
 msgid "Error: zip PHP module required but not installed."
 msgstr "Ошибка: модуль PHP zip требуется, однако не установлен"
 
-#: ../../Zotlabs/Module/Setup.php:580 ../../Zotlabs/Module/Setup.php:589
+#: ../../Zotlabs/Module/Setup.php:590 ../../Zotlabs/Module/Setup.php:599
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php доступен для записи"
 
-#: ../../Zotlabs/Module/Setup.php:585
+#: ../../Zotlabs/Module/Setup.php:595
 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 "Инсталлятор требует возможности создать файл с именем \".htconfig.php\" в корневом каталоге вашего веб-сервера но не может этого сделать."
 
-#: ../../Zotlabs/Module/Setup.php:586
+#: ../../Zotlabs/Module/Setup.php:596
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr "В большинстве случаев это проблема прав доступа. Веб-сервер может не иметь возможности записывать файлы в этот каталог даже если вы можете это делать."
 
-#: ../../Zotlabs/Module/Setup.php:587
+#: ../../Zotlabs/Module/Setup.php:597
 msgid "Please see install/INSTALL.txt for additional information."
 msgstr "Пожалуйста, ознакомьтесь с install/INSTALL.txt для дополнительных сведений."
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:613
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr "Это программное обеспечение использует шаблонизатор Smarty3 для отображения своих веб-страниц. Smarty3 компилирует шаблоны для PHP для ускорения рендеринга."
 
-#: ../../Zotlabs/Module/Setup.php:604
+#: ../../Zotlabs/Module/Setup.php:614
 #, 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."
 msgstr "Для хранения этих скомпилированных шаблонов веб-сервер должен иметь доступ на запись к каталогу %s в каталоге верхнего уровня."
 
-#: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626
+#: ../../Zotlabs/Module/Setup.php:615 ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr "Убедитесь, что пользователь от имени которого работает ваш веб-сервер (например, www-data), имеет доступ на запись в этот каталог."
 
-#: ../../Zotlabs/Module/Setup.php:606
+#: ../../Zotlabs/Module/Setup.php:616
 #, php-format
 msgid ""
 "Note: as a security measure, you should give the web server write access to "
 "%s only--not the template files (.tpl) that it contains."
 msgstr "Примечание. В качестве меры безопасности вы должны предоставить доступ веб-серверу для записи только к %s но не к содержащимися в нём файлами шаблонов (.tpl)."
 
-#: ../../Zotlabs/Module/Setup.php:609
+#: ../../Zotlabs/Module/Setup.php:619
 #, php-format
 msgid "%s is writable"
 msgstr "%s доступен для записи"
 
-#: ../../Zotlabs/Module/Setup.php:625
+#: ../../Zotlabs/Module/Setup.php:635
 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/Module/Setup.php:629
+#: ../../Zotlabs/Module/Setup.php:639
 msgid "store is writable"
 msgstr "хранилище доступно для записи"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:671
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr "SSL certificate cannot be validated. Замените его или отключите https доступ к этому сайту."
 
-#: ../../Zotlabs/Module/Setup.php:662
+#: ../../Zotlabs/Module/Setup.php:672
 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 "Если у вас есть https-доступ к вашему сайту или разрешено подключение к TCP-порту 443 (порт https), вы ДОЛЖНЫ использовать сертификат, действительный для браузера. Вы НЕ ДОЛЖНЫ использовать самоподписанные сертификаты!"
 
-#: ../../Zotlabs/Module/Setup.php:663
+#: ../../Zotlabs/Module/Setup.php:673
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Эти ограничения приняты поскольку ваши общедоступные публикации могут, например, содержать ссылки на изображения на вашем собственном хабе."
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:674
 msgid ""
 "If your certificate is not recognized, members of other sites (who may "
 "themselves have valid certificates) will get a warning message on their own "
 "site complaining about security issues."
 msgstr "Если ваш сертификат не признан, пользователи других сайтов (которые могут сами иметь действительные сертификаты) получат предупреждающее сообщение о проблемах с безопасностью."
 
-#: ../../Zotlabs/Module/Setup.php:665
+#: ../../Zotlabs/Module/Setup.php:675
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Это может привести к проблемам удобства использования из других мест (не только на вашем собственном сайте), поэтому мы настаиваем на этом требовании."
 
-#: ../../Zotlabs/Module/Setup.php:666
+#: ../../Zotlabs/Module/Setup.php:676
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr "Доступны поставщики, которые выдают действительные для браузера бесплатные сертификаты."
 
-#: ../../Zotlabs/Module/Setup.php:667
+#: ../../Zotlabs/Module/Setup.php:677
 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. "
@@ -8565,48 +7508,160 @@ msgid ""
 "server communications."
 msgstr "Если вы уверены, что сертификат действителен и подписан доверенным органом, проверьте, установлен ли промежуточные сертификаты. Обычно они не требуются браузерами, но бывают необходимы для связи между серверами."
 
-#: ../../Zotlabs/Module/Setup.php:669
+#: ../../Zotlabs/Module/Setup.php:679
 msgid "SSL certificate validation"
 msgstr "Проверка SSL сертификата"
 
-#: ../../Zotlabs/Module/Setup.php:675
+#: ../../Zotlabs/Module/Setup.php:685
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr "Перезапись URL в .htaccess не работает. Проверьте настройки вашего сервера."
 
-#: ../../Zotlabs/Module/Setup.php:678
+#: ../../Zotlabs/Module/Setup.php:688
 msgid "Url rewrite is working"
 msgstr "Перезапись URL работает"
 
-#: ../../Zotlabs/Module/Setup.php:691
+#: ../../Zotlabs/Module/Setup.php:701
 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 "Файл конфигурации базы данных \".htconfig.php\" не может быть записан. Используйте прилагаемый текст для создания файла конфигурации в корневом каталоге веб-сервера."
 
-#: ../../Zotlabs/Module/Setup.php:766
+#: ../../Zotlabs/Module/Setup.php:730
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
+msgstr "При создании базы данных возникли ошибки."
+
+#: ../../Zotlabs/Module/Setup.php:776
 msgid "<h1>What next?</h1>"
 msgstr "<h1>Что дальше? </h1>"
 
-#: ../../Zotlabs/Module/Setup.php:767
+#: ../../Zotlabs/Module/Setup.php:777
 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/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
+msgid "Menu Item Permissions"
+msgstr "Разрешения на пункт меню"
+
+#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
+msgid "(click to open/close)"
+msgstr "(нажмите чтобы открыть/закрыть)"
+
+#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
+msgid "Link Name"
+msgstr "Имя ссылки"
+
+#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
+msgid "Link or Submenu Target"
+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/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
+msgid "Use magic-auth if available"
+msgstr "Использовать magic-auth если возможно"
+
+#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
+msgid "Open link in new window"
+msgstr "Открыть ссылку в новом окне"
+
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Order in list"
+msgstr "Порядок в списке"
+
+#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Большие значения в конце списка"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Submit and finish"
+msgstr "Отправить и завершить"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Submit and continue"
+msgstr "Отправить и продолжить"
+
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Menu:"
+msgstr "Меню:"
+
+#: ../../Zotlabs/Module/Mitem.php:192
+msgid "Link Target"
+msgstr "Цель ссылки"
+
+#: ../../Zotlabs/Module/Mitem.php:195
+msgid "Edit menu"
+msgstr "Редактировать меню"
+
+#: ../../Zotlabs/Module/Mitem.php:198
+msgid "Edit element"
+msgstr "Редактировать элемент"
+
+#: ../../Zotlabs/Module/Mitem.php:199
+msgid "Drop element"
+msgstr "Удалить элемент"
+
+#: ../../Zotlabs/Module/Mitem.php:200
+msgid "New element"
+msgstr "Новый элемент"
+
+#: ../../Zotlabs/Module/Mitem.php:201
+msgid "Edit this menu container"
+msgstr "Редактировать контейнер меню"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Add menu element"
+msgstr "Добавить элемент меню"
+
+#: ../../Zotlabs/Module/Mitem.php:203
+msgid "Delete this menu item"
+msgstr "Удалить этот элемент меню"
+
+#: ../../Zotlabs/Module/Mitem.php:204
+msgid "Edit this menu item"
+msgstr "Редактировать этот элемент меню"
+
+#: ../../Zotlabs/Module/Mitem.php:222
+msgid "Menu item not found."
+msgstr "Элемент меню не найден."
+
+#: ../../Zotlabs/Module/Mitem.php:235
+msgid "Menu item deleted."
+msgstr "Элемент меню удалён."
+
+#: ../../Zotlabs/Module/Mitem.php:237
+msgid "Menu item could not be deleted."
+msgstr "Невозможно удалить элемент меню."
+
+#: ../../Zotlabs/Module/Mitem.php:244
+msgid "Edit Menu Element"
+msgstr "Редактировать элемент меню"
+
+#: ../../Zotlabs/Module/Mitem.php:254
+msgid "Link text"
+msgstr "Текст ссылки"
+
+#: ../../Zotlabs/Module/Pubsites.php:24
+msgid "Public Hubs"
+msgstr "Публичные хабы"
 
 #: ../../Zotlabs/Module/Pubsites.php:27
 msgid ""
@@ -8637,122 +7692,27 @@ msgstr "Статистика"
 msgid "Software"
 msgstr "Программное обеспечение"
 
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1153
+msgid "Ratings"
+msgstr "Оценки"
+
 #: ../../Zotlabs/Module/Pubsites.php:49
 msgid "Rate"
 msgstr "Оценка"
 
-#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:258
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Wiki.php:210
-#: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Layouts.php:198
-msgid "View"
-msgstr "Просмотр"
-
-#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Hcard.php:37
-#: ../../Zotlabs/Module/Profile.php:62
-msgid "Posts and comments"
-msgstr "Публикации и комментарии"
-
-#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Hcard.php:44
-#: ../../Zotlabs/Module/Profile.php:69
-msgid "Only posts"
-msgstr "Только публикации"
-
-#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181
-#: ../../Zotlabs/Module/Hq.php:39 ../../Zotlabs/Module/Pubstream.php:47
-#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:83
-msgid "Malformed message id."
-msgstr "Неверный идентификатор сообщения."
-
-#: ../../Zotlabs/Module/Channel.php:217
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Недостаточно прав. Запрос перенаправлен на страницу профиля."
-
-#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:358
-msgid ""
-"You must enable javascript for your browser to be able to view this content."
-msgstr "Для просмотра этого содержимого в вашем браузере должен быть включён JavaScript"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Неверный идентификатор профиля"
-
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Редактор видимости профиля"
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr "Нажмите на контакт, чтобы добавить или удалить."
-
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
-msgstr "Видно"
-
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:218
-msgid "All Connections"
-msgstr "Все контакты"
-
-#: ../../Zotlabs/Module/Group.php:47
-msgid "Privacy group created."
-msgstr "Группа конфиденциальности создана."
-
-#: ../../Zotlabs/Module/Group.php:50
-msgid "Could not create privacy group."
-msgstr "Не удалось создать группу конфиденциальности."
-
-#: ../../Zotlabs/Module/Group.php:82
-msgid "Privacy group updated."
-msgstr "Группа конфиденциальности обновлена."
-
-#: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:301
-msgid "Post to this group by default"
-msgstr "Публиковать в этой группе по умолчанию"
-
-#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:302
-msgid "Add new contacts to this group by default"
-msgstr "Добавлять новые контакты в эту группу по умолчанию"
-
-#: ../../Zotlabs/Module/Group.php:146
-msgid "Privacy group name"
-msgstr "Имя группы конфиденциальности"
-
-#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249
-msgid "Members are visible to other channels"
-msgstr "Участники канала видимые для остальных"
-
-#: ../../Zotlabs/Module/Group.php:175
-msgid "Privacy group removed."
-msgstr "Группа конфиденциальности удалена."
-
-#: ../../Zotlabs/Module/Group.php:178
-msgid "Unable to remove privacy group."
-msgstr "Ну удалось удалить группу конфиденциальности."
-
-#: ../../Zotlabs/Module/Group.php:244
+#: ../../Zotlabs/Module/Mood.php:76 ../../include/conversation.php:286
 #, php-format
-msgid "Privacy Group: %s"
-msgstr "Группа конфиденциальности: %s"
-
-#: ../../Zotlabs/Module/Group.php:246
-msgid "Privacy group name: "
-msgstr "Название группы конфиденциальности: "
-
-#: ../../Zotlabs/Module/Group.php:262
-msgid "Group members"
-msgstr "Члены группы"
-
-#: ../../Zotlabs/Module/Group.php:264
-msgid "Not in this group"
-msgstr "Не в этой группе"
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s %2$s"
 
-#: ../../Zotlabs/Module/Group.php:296
-msgid "Click a channel to toggle membership"
-msgstr "Нажмите на канал для просмотра членства"
+#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:354
+msgid "Mood"
+msgstr "Настроение"
 
-#: ../../Zotlabs/Module/Card_edit.php:129
-msgid "Edit Card"
-msgstr "Редактировать карточку"
+#: ../../Zotlabs/Module/Mood.php:153
+msgid "Set your current mood and tell your friends"
+msgstr "Установить текущее настроение и рассказать друзьям"
 
 #: ../../Zotlabs/Module/Go.php:21
 msgid "This page is available only to site members"
@@ -8783,6 +7743,10 @@ msgstr "Загрузить фотографию обложки"
 msgid "Edit your default profile"
 msgstr "Редактировать ваш профиль по умолчанию"
 
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:46
+msgid "View friend suggestions"
+msgstr "Просмотр рекомендуемых друзей"
+
 #: ../../Zotlabs/Module/Go.php:39
 msgid "View the channel directory"
 msgstr "Просмотр каталога каналов"
@@ -8813,6687 +7777,7949 @@ 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:135
-#: ../../Zotlabs/Module/Cdav.php:1052 ../../Zotlabs/Module/Cdav.php:1388
-#: ../../Zotlabs/Module/Admin/Addons.php:457
-#: ../../Zotlabs/Module/Profiles.php:815 ../../Zotlabs/Module/Oauth2.php:58
-#: ../../Zotlabs/Module/Oauth2.php:142 ../../Zotlabs/Module/Connedit.php:748
-#: ../../Zotlabs/Lib/Apps.php:540
-msgid "Update"
-msgstr "Обновить"
+#: ../../Zotlabs/Module/Channel_calendar.php:70
+msgid "Event title and start time are required."
+msgstr "Требуются наименование события и время начала."
 
-#: ../../Zotlabs/Module/Oauth.php:108 ../../Zotlabs/Module/Oauth.php:134
-#: ../../Zotlabs/Module/Oauth.php:170 ../../Zotlabs/Module/Oauth2.php:141
-#: ../../Zotlabs/Module/Oauth2.php:191
-msgid "Add application"
-msgstr "Добавить приложение"
+#: ../../Zotlabs/Module/Channel_calendar.php:85
+#: ../../Zotlabs/Module/Channel_calendar.php:226
+msgid "Event not found."
+msgstr "Событие не найдено."
 
-#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth2.php:116
-#: ../../Zotlabs/Module/Oauth2.php:144
-msgid "Name of application"
-msgstr "Название приложения"
+#: ../../Zotlabs/Module/Channel_calendar.php:370
+msgid "Edit event"
+msgstr "Редактировать событие"
 
-#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:113
-#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Сгенерирован автоматические - измените если требуется. Макс. длина 20"
+#: ../../Zotlabs/Module/Channel_calendar.php:372
+msgid "Delete event"
+msgstr "Удалить событие"
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140
-#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146
-msgid "Redirect"
-msgstr "Перенаправление"
+#: ../../Zotlabs/Module/Channel_calendar.php:406
+msgid "calendar"
+msgstr "календарь"
 
-#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth2.php:118
-#: ../../Zotlabs/Module/Oauth2.php:146
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr "URI перенаправления - оставьте пустыми до тех пока ваше приложение не требует этого"
+#: ../../Zotlabs/Module/Channel_calendar.php:493
+msgid "Failed to remove event"
+msgstr "Не удалось удалить событие"
 
-#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141
-msgid "Icon url"
-msgstr "URL значка"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
+msgstr "Контактов нет."
 
-#: ../../Zotlabs/Module/Oauth.php:126
-msgid "Application not found."
-msgstr "Приложение не найдено."
+#: ../../Zotlabs/Module/Viewconnections.php:105
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Посетить %s ​​профиль [%s]"
 
-#: ../../Zotlabs/Module/Oauth.php:169
-msgid "Connected OAuth Apps"
-msgstr "Подключенные приложения OAuth"
+#: ../../Zotlabs/Module/Viewconnections.php:135
+msgid "View Connections"
+msgstr "Просмотр контактов"
 
-#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Oauth2.php:194
-msgid "Client key starts with"
-msgstr "Ключ клиента начинается с"
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+msgid "Files: shared with me"
+msgstr "Файлы: поделились со мной"
 
-#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Oauth2.php:195
-msgid "No name"
-msgstr "Без названия"
+#: ../../Zotlabs/Module/Sharedwithme.php:107
+msgid "NEW"
+msgstr "НОВОЕ"
 
-#: ../../Zotlabs/Module/Oauth.php:175 ../../Zotlabs/Module/Oauth2.php:196
-msgid "Remove authorization"
-msgstr "Удалить разрешение"
+#: ../../Zotlabs/Module/Sharedwithme.php:108
+#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1567
+msgid "Size"
+msgstr "Размер"
 
-#: ../../Zotlabs/Module/Editwebpage.php:139
-msgid "Page link"
-msgstr "Ссылка страницы"
+#: ../../Zotlabs/Module/Sharedwithme.php:109
+#: ../../Zotlabs/Storage/Browser.php:380
+msgid "Last Modified"
+msgstr "Последнее изменение"
 
-#: ../../Zotlabs/Module/Editwebpage.php:166
-msgid "Edit Webpage"
-msgstr "Редактировать веб-страницу"
+#: ../../Zotlabs/Module/Sharedwithme.php:110
+msgid "Remove all files"
+msgstr "Удалить все файлы"
 
-#: ../../Zotlabs/Module/Dirsearch.php:24 ../../Zotlabs/Module/Regdir.php:52
-msgid "This site is not a directory server"
-msgstr "Этот сайт не является сервером каталога"
+#: ../../Zotlabs/Module/Sharedwithme.php:111
+msgid "Remove this file"
+msgstr "Удалить этот файл"
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
-msgstr "Для доступа к этому серверу каталогов требуется токен"
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
+msgstr "Пожалуйста, войдите."
 
-#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:466
-msgid "Unable to locate original post."
-msgstr "Не удалось найти оригинальную публикацию."
+#: ../../Zotlabs/Module/Lang.php:20
+msgid "Language App"
+msgstr "Приложение \"Язык\""
 
-#: ../../Zotlabs/Module/Chat.php:192
-msgid "Room not found"
-msgstr "Комната не найдена"
+#: ../../Zotlabs/Module/Oauth2.php:54
+msgid "Name and Secret are required"
+msgstr "Требуются имя и код"
 
-#: ../../Zotlabs/Module/Chat.php:208
-msgid "Leave Room"
-msgstr "Покинуть комнату"
+#: ../../Zotlabs/Module/Oauth2.php:113
+msgid "Add OAuth2 application"
+msgstr "Добавить приложение OAuth2"
 
-#: ../../Zotlabs/Module/Chat.php:209
-msgid "Delete Room"
-msgstr "Удалить комнату"
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
+msgid "Grant Types"
+msgstr "Разрешить типы"
 
-#: ../../Zotlabs/Module/Chat.php:210
-msgid "I am away right now"
-msgstr "Я сейчас отошёл"
+#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:120
+msgid "leave blank unless your application sepcifically requires this"
+msgstr "оставьте пустыми до тех пока ваше приложение не требует этого"
 
-#: ../../Zotlabs/Module/Chat.php:211
-msgid "I am online"
-msgstr "Я на связи"
+#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
+msgid "Authorization scope"
+msgstr "Область полномочий"
 
-#: ../../Zotlabs/Module/Chat.php:213
-msgid "Bookmark this room"
-msgstr "Запомнить эту комнату"
+#: ../../Zotlabs/Module/Oauth2.php:132
+msgid "OAuth2 Application not found."
+msgstr "Приложение OAuth2 не найдено."
 
-#: ../../Zotlabs/Module/Chat.php:236
-msgid "New Chatroom"
-msgstr "Новый чат"
+#: ../../Zotlabs/Module/Oauth2.php:147 ../../Zotlabs/Module/Oauth2.php:148
+msgid "leave blank unless your application specifically requires this"
+msgstr "оставьте поле пустым, если ваше приложение не требует этого"
 
-#: ../../Zotlabs/Module/Chat.php:237
-msgid "Chatroom name"
-msgstr "Название чата"
+#: ../../Zotlabs/Module/Oauth2.php:190
+msgid "Connected OAuth2 Apps"
+msgstr "Подключённые приложения OAuth2"
 
-#: ../../Zotlabs/Module/Chat.php:238
-msgid "Expiration of chats (minutes)"
-msgstr "Завершение чатов (минут)"
+#: ../../Zotlabs/Module/Directory.php:121
+msgid "No default suggestions were found."
+msgstr "Предложений по умолчанию не найдено."
 
-#: ../../Zotlabs/Module/Chat.php:254
+#: ../../Zotlabs/Module/Directory.php:281
 #, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Чаты пользователя %1$s"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d оценка"
+msgstr[1] "%d оценки"
+msgstr[2] "%d оценок"
 
-#: ../../Zotlabs/Module/Chat.php:259
-msgid "No chatrooms available"
-msgstr "Нет доступных чатов"
+#: ../../Zotlabs/Module/Directory.php:292
+msgid "Gender: "
+msgstr "Пол:"
 
-#: ../../Zotlabs/Module/Chat.php:260
-msgid "Add Room"
-msgstr "Добавить комнату"
+#: ../../Zotlabs/Module/Directory.php:294
+msgid "Status: "
+msgstr "Статус:"
 
-#: ../../Zotlabs/Module/Chat.php:263
-msgid "Expiration"
-msgstr "Срок действия"
+#: ../../Zotlabs/Module/Directory.php:296
+msgid "Homepage: "
+msgstr "Домашняя страница:"
 
-#: ../../Zotlabs/Module/Chat.php:264
-msgid "min"
-msgstr "мин."
+#: ../../Zotlabs/Module/Directory.php:348 ../../include/channel.php:1799
+msgid "Age:"
+msgstr "Возраст:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:62
-msgid "Event can not end before it has started."
-msgstr "Событие не может завершиться до его начала."
+#: ../../Zotlabs/Module/Directory.php:353 ../../include/event.php:63
+#: ../../include/event.php:153 ../../include/channel.php:1625
+msgid "Location:"
+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/Directory.php:359
+msgid "Description:"
+msgstr "Описание:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:70
-msgid "Event title and start time are required."
-msgstr "Требуются наименование события и время начала."
+#: ../../Zotlabs/Module/Directory.php:366 ../../include/channel.php:1632
+#: ../../include/channel.php:1828
+msgid "Hometown:"
+msgstr "Родной город:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:85
-#: ../../Zotlabs/Module/Channel_calendar.php:226
-msgid "Event not found."
-msgstr "Событие не найдено."
+#: ../../Zotlabs/Module/Directory.php:368 ../../include/channel.php:1834
+msgid "About:"
+msgstr "О себе:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:370
-msgid "Edit event"
-msgstr "Редактировать событие"
+#: ../../Zotlabs/Module/Directory.php:370
+msgid "Public Forum:"
+msgstr "Публичный форум:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:372
-msgid "Delete event"
-msgstr "Удалить событие"
+#: ../../Zotlabs/Module/Directory.php:373
+msgid "Keywords: "
+msgstr "Ключевые слова:"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:392
-#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cal.php:165
-msgid "Link to source"
-msgstr "Ссылка на источник"
+#: ../../Zotlabs/Module/Directory.php:376
+msgid "Don't suggest"
+msgstr "Не предлагать"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:406
-msgid "calendar"
-msgstr "календарь"
+#: ../../Zotlabs/Module/Directory.php:378
+msgid "Common connections (estimated):"
+msgstr "Общие контакты (оценочно):"
 
-#: ../../Zotlabs/Module/Channel_calendar.php:493
-msgid "Failed to remove event"
-msgstr "Не удалось удалить событие"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Global Directory"
+msgstr "Глобальный каталог"
 
-#: ../../Zotlabs/Module/Like.php:112
-msgid "Like/Dislike"
-msgstr "Нравится / не нравится"
+#: ../../Zotlabs/Module/Directory.php:427
+msgid "Local Directory"
+msgstr "Локальный каталог"
 
-#: ../../Zotlabs/Module/Like.php:118
-msgid "This action is restricted to members."
-msgstr "Это действие доступно только участникам."
+#: ../../Zotlabs/Module/Directory.php:433
+msgid "Finding:"
+msgstr "Поиск:"
 
-#: ../../Zotlabs/Module/Like.php:119
-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:438
+msgid "next page"
+msgstr "следующая страница"
 
-#: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198
-#: ../../Zotlabs/Module/Like.php:236
-msgid "Invalid request."
-msgstr "Неверный запрос."
+#: ../../Zotlabs/Module/Directory.php:438
+msgid "previous page"
+msgstr "предыдущая страница"
 
-#: ../../Zotlabs/Module/Like.php:213
-msgid "thing"
-msgstr "предмет"
+#: ../../Zotlabs/Module/Directory.php:439
+msgid "Sort options"
+msgstr "Параметры сортировки"
 
-#: ../../Zotlabs/Module/Like.php:259
-msgid "Channel unavailable."
-msgstr "Канал недоступен."
+#: ../../Zotlabs/Module/Directory.php:440
+msgid "Alphabetic"
+msgstr "По алфавиту"
 
-#: ../../Zotlabs/Module/Like.php:295
-msgid "Previous action reversed."
-msgstr "Предыдущее действие отменено."
+#: ../../Zotlabs/Module/Directory.php:441
+msgid "Reverse Alphabetic"
+msgstr "Против алфавита"
 
-#: ../../Zotlabs/Module/Like.php:481
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s согласен с %2$s %3$s"
+#: ../../Zotlabs/Module/Directory.php:442
+msgid "Newest to Oldest"
+msgstr "От новых к старым"
 
-#: ../../Zotlabs/Module/Like.php:483
+#: ../../Zotlabs/Module/Directory.php:443
+msgid "Oldest to Newest"
+msgstr "От старых к новым"
+
+#: ../../Zotlabs/Module/Directory.php:460
+msgid "No entries (some entries may be hidden)."
+msgstr "Нет записей (некоторые записи могут быть скрыты)."
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:118
+msgid "Layout not found"
+msgstr "Макет на найден"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:126
+msgid "This template does not support pdledi_gui (no content regions defined)"
+msgstr "Этот шаблон не поддерживает pdledi_gui (не определены области содержимого)"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:361
+msgid "Main page content"
+msgstr "Содержимое основной страницы"
+
+#: ../../Zotlabs/Module/Pdledit_gui.php:362
+msgid "The main page content can not be edited!"
+msgstr "Содержимое основной страницы не может быть отредактировано!"
+
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
+msgstr "Ограничений класса обслуживание не найдено."
+
+#: ../../Zotlabs/Module/Sse_bs.php:588
+msgid "Private forum"
+msgstr "Частный форум"
+
+#: ../../Zotlabs/Module/Sse_bs.php:588
+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 doesn't agree with %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:485
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349
+#: ../../include/nav.php:448 ../../include/features.php:368
+msgid "Photos"
+msgstr "Фотографии"
+
+#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351
+#: ../../Zotlabs/Lib/Apps.php:344 ../../Zotlabs/Widget/Notifications.php:107
+#: ../../include/nav.php:456
+msgid "Files"
+msgstr "Файлы"
+
+#: ../../Zotlabs/Module/Tokens.php:94
 #, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s воздерживается от решения по %2$s%3$s"
+msgid "This channel is limited to %d tokens"
+msgstr "Этот канал ограничен %d токенами"
 
-#: ../../Zotlabs/Module/Like.php:592
-msgid "Action completed."
-msgstr "Действие завершено."
+#: ../../Zotlabs/Module/Tokens.php:100
+msgid "Name and Password are required."
+msgstr "Требуются имя и пароль."
 
-#: ../../Zotlabs/Module/Like.php:593
-msgid "Thank you."
-msgstr "Спасибо."
+#: ../../Zotlabs/Module/Tokens.php:215
+msgid "Token saved."
+msgstr "Токен сохранён."
 
-#: ../../Zotlabs/Module/Poke.php:198
-msgid "Poke somebody"
-msgstr "Ткнуть кого-нибудь"
+#: ../../Zotlabs/Module/Tokens.php:261
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in privacy groups and visitors may "
+"login using these credentials to access private content."
+msgstr "Используйте эту форму, чтобы создать временные идентификаторы доступа, чтобы делиться публикациями с незарегистрированными участниками. Эти идентификационные данные могут использоваться в группах конфиденциальности, и посетители могут входить в систему, используя их, для доступа к частному содержимому."
 
-#: ../../Zotlabs/Module/Poke.php:201
-msgid "Poke/Prod"
-msgstr "Толкнуть / подтолкнуть"
+#: ../../Zotlabs/Module/Tokens.php:274
+msgid "Please select a role for this guest!"
+msgstr "Пожалуйста, выберите роль для этого гостя!"
 
-#: ../../Zotlabs/Module/Poke.php:202
-msgid "Poke, prod or do other things to somebody"
-msgstr "Толкнуть, подтолкнуть или сделать что-то ещё с кем-то"
+#: ../../Zotlabs/Module/Tokens.php:287
+msgid "Select a role for this guest"
+msgstr "Выбрать роль для этого гостя"
 
-#: ../../Zotlabs/Module/Poke.php:209
-msgid "Recipient"
-msgstr "Получатель"
+#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:373
+msgid "Guest Access"
+msgstr "Гостевой доступ"
 
-#: ../../Zotlabs/Module/Poke.php:210
-msgid "Choose what you wish to do to recipient"
-msgstr "Выбрать что вы хотите сделать с получателем"
+#: ../../Zotlabs/Module/Tokens.php:291
+msgid "Login Name"
+msgstr "Имя"
 
-#: ../../Zotlabs/Module/Poke.php:213 ../../Zotlabs/Module/Poke.php:214
-msgid "Make this post private"
-msgstr "Сделать эту публикацию частной"
+#: ../../Zotlabs/Module/Tokens.php:292
+msgid "Login Password"
+msgstr "Пароль"
 
-#: ../../Zotlabs/Module/Cdav.php:819
-msgid "Calendar entries imported."
-msgstr "События календаря импортированы."
+#: ../../Zotlabs/Module/Tokens.php:293
+msgid "Expires (yyyy-mm-dd)"
+msgstr "Срок действия (yyyy-mm-dd)"
 
-#: ../../Zotlabs/Module/Cdav.php:821
-msgid "No calendar entries found."
-msgstr "Не найдено событий в календаре."
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."
 
-#: ../../Zotlabs/Module/Cdav.php:1008
-msgid "Event title"
-msgstr "Наименование события"
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be permanently removed. "
+msgstr "Этот канал будет удален навсегда. "
 
-#: ../../Zotlabs/Module/Cdav.php:1009
-msgid "Start date and time"
-msgstr "Дата и время начала"
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action can not be undone!"
+msgstr "Это действие не может быть отменено!"
 
-#: ../../Zotlabs/Module/Cdav.php:1010
-msgid "End date and time"
-msgstr "Дата и время окончания"
+#: ../../Zotlabs/Storage/Browser.php:292
+msgid "Change filename to"
+msgstr "Переименовать файл в"
 
-#: ../../Zotlabs/Module/Cdav.php:1011
-msgid "Timezone:"
-msgstr "Часовой пояс:"
+#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
+msgid "Select a target location"
+msgstr "Выбрать место назначения"
 
-#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Cal.php:203
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "Previous"
-msgstr "Предыдущая"
+#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
+msgid "Copy to target location"
+msgstr "Скопировать в место назнаения"
 
-#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cal.php:205
-msgid "Today"
-msgstr "Сегодня"
+#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
+msgid "Set permissions for all files and sub folders"
+msgstr "Установить разрешения для всех файлов и подкаталогов"
 
-#: ../../Zotlabs/Module/Cdav.php:1037
-msgid "Month"
-msgstr "Месяц"
+#: ../../Zotlabs/Storage/Browser.php:312
+msgid "Notify your contacts about this file"
+msgstr "Сообщить своим контактам об этом файле"
 
-#: ../../Zotlabs/Module/Cdav.php:1038
-msgid "Week"
-msgstr "Неделя"
+#: ../../Zotlabs/Storage/Browser.php:351
+msgid "File category"
+msgstr "Категория файла"
 
-#: ../../Zotlabs/Module/Cdav.php:1039
-msgid "Day"
-msgstr "День"
+#: ../../Zotlabs/Storage/Browser.php:362
+msgid "Total"
+msgstr "Всего"
 
-#: ../../Zotlabs/Module/Cdav.php:1040
-msgid "List month"
-msgstr "Просмотреть месяц"
+#: ../../Zotlabs/Storage/Browser.php:364
+msgid "Shared"
+msgstr "Общие"
 
-#: ../../Zotlabs/Module/Cdav.php:1041
-msgid "List week"
-msgstr "Просмотреть неделю"
+#: ../../Zotlabs/Storage/Browser.php:366
+msgid "Add Files"
+msgstr "Добавить файлы"
 
-#: ../../Zotlabs/Module/Cdav.php:1042
-msgid "List day"
-msgstr "Просмотреть день"
+#: ../../Zotlabs/Storage/Browser.php:369 ../../Zotlabs/Lib/ThreadItem.php:191
+msgid "Admin Delete"
+msgstr "Удалено администратором"
 
-#: ../../Zotlabs/Module/Cdav.php:1050
-msgid "More"
-msgstr "Больше"
+#: ../../Zotlabs/Storage/Browser.php:378
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:222
+msgid "Type"
+msgstr "Тип"
 
-#: ../../Zotlabs/Module/Cdav.php:1051
-msgid "Less"
-msgstr "Меньше"
+#: ../../Zotlabs/Storage/Browser.php:381
+msgid "parent"
+msgstr "источник"
 
-#: ../../Zotlabs/Module/Cdav.php:1053
-msgid "Select calendar"
-msgstr "Выбрать календарь"
+#: ../../Zotlabs/Storage/Browser.php:399
+msgid "Select All"
+msgstr "Выбрать всё"
 
-#: ../../Zotlabs/Module/Cdav.php:1056
-msgid "Delete all"
-msgstr "Удалить всё"
+#: ../../Zotlabs/Storage/Browser.php:400
+msgid "Bulk Actions"
+msgstr "Групповая обработка"
 
-#: ../../Zotlabs/Module/Cdav.php:1059
-msgid "Sorry! Editing of recurrent events is not yet implemented."
-msgstr "Простите, но редактирование повторяющихся событий пока не реализовано."
+#: ../../Zotlabs/Storage/Browser.php:401
+msgid "Adjust Permissions"
+msgstr "Настроить разрешения"
 
-#: ../../Zotlabs/Module/Cdav.php:1060
+#: ../../Zotlabs/Storage/Browser.php:402
+msgid "Move or Copy"
+msgstr "Переместить или копировать"
+
+#: ../../Zotlabs/Storage/Browser.php:404
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:215
+msgid "Download"
+msgstr "Загрузить"
+
+#: ../../Zotlabs/Storage/Browser.php:405
+msgid "Info"
+msgstr "Информация"
+
+#: ../../Zotlabs/Storage/Browser.php:406
+msgid "Rename"
+msgstr "Переименовать"
+
+#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:364
+msgid "Post"
+msgstr "Публикация"
+
+#: ../../Zotlabs/Storage/Browser.php:408
+msgid "Attachment BBcode"
+msgstr "Вложение BBcode"
+
+#: ../../Zotlabs/Storage/Browser.php:409
+msgid "Embed BBcode"
+msgstr "Встраивание BBcode"
+
+#: ../../Zotlabs/Storage/Browser.php:410
+msgid "Link BBcode"
+msgstr "Ссылка BBcode"
+
+#: ../../Zotlabs/Storage/Browser.php:480
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Вы используете %1$s из доступного вам хранилища файлов."
+
+#: ../../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/Storage/Browser.php:496
+msgid "WARNING:"
+msgstr "Предупреждение:"
+
+#: ../../Zotlabs/Storage/Browser.php:537
+msgid "Create new folder"
+msgstr "Создать новую папку"
+
+#: ../../Zotlabs/Storage/Browser.php:539
+msgid "Upload file"
+msgstr "Загрузить файл"
+
+#: ../../Zotlabs/Storage/Browser.php:551
+msgid "Drop files here to immediately upload"
+msgstr "Поместите файлы сюда для немедленной загрузки"
+
+#: ../../Zotlabs/Storage/Browser.php:554
 msgid ""
-"Could not fetch calendar resource. The selected calendar might be disabled."
-msgstr "Не удалось получить содержимое календаря. Выбранный календарь может быть отключен."
+"You can select files via the upload button or drop them right here or into "
+"an existing folder."
+msgstr "Вы можете выбрать файлы с помощью кнопки загрузки или перетащить их сюда или в существующую папку."
 
-#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733
-msgid "Organisation"
-msgstr "Организация"
+#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
+msgid "Channel is blocked on this site."
+msgstr "Канал блокируется на этом сайте."
 
-#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Connedit.php:735
-msgid "Phone"
-msgstr "Телефон"
+#: ../../Zotlabs/Lib/Connect.php:51
+msgid "Channel location missing."
+msgstr "Местоположение канала отсутствует."
 
-#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Connedit.php:737
-msgid "Instant messenger"
-msgstr "Мессенджер"
+#: ../../Zotlabs/Lib/Connect.php:103
+msgid "Remote channel or protocol unavailable."
+msgstr "Удалённый канал или протокол недоступен."
 
-#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:805
-#: ../../Zotlabs/Module/Connedit.php:738
-msgid "Website"
-msgstr "Веб-сайт"
+#: ../../Zotlabs/Lib/Connect.php:137
+msgid "Channel discovery failed."
+msgstr "Не удалось обнаружить канал."
 
-#: ../../Zotlabs/Module/Cdav.php:1379
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:806
-#: ../../Zotlabs/Module/Connedit.php:739 ../../Zotlabs/Module/Locs.php:122
-msgid "Address"
-msgstr "Адрес"
+#: ../../Zotlabs/Lib/Connect.php:155
+msgid "Protocol disabled."
+msgstr "Протокол отключен."
 
-#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:807
-#: ../../Zotlabs/Module/Connedit.php:740
-msgid "Note"
-msgstr "Заметка"
+#: ../../Zotlabs/Lib/Connect.php:167
+msgid "Cannot connect to yourself."
+msgstr "Нельзя подключиться к самому себе."
 
-#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:812
-#: ../../Zotlabs/Module/Connedit.php:745
-msgid "Add Contact"
-msgstr "Добавить контакт"
+#: ../../Zotlabs/Lib/Connect.php:272
+msgid "error saving data"
+msgstr "ошибка сохранения данных"
 
-#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:813
-#: ../../Zotlabs/Module/Connedit.php:746
-msgid "Add Field"
-msgstr "Добавить поле"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:67
+msgid "Source code of failed update: "
+msgstr "Исходный код неудачного обновления: "
 
-#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751
-msgid "P.O. Box"
-msgstr "абонентский ящик"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:88
+#, php-format
+msgid "Update Error at %s"
+msgstr "Ошибка обновления на %s"
 
-#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752
-msgid "Additional"
-msgstr "Дополнительно"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:94
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Выполнение %s неудачно. Проверьте системный журнал."
 
-#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753
-msgid "Street"
-msgstr "Улица"
+#: ../../Zotlabs/Lib/ThreadItem.php:110
+msgid "Restricted message"
+msgstr "Сообщение с ограниченным доступом"
 
-#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754
-msgid "Locality"
-msgstr "Населённый пункт"
+#: ../../Zotlabs/Lib/ThreadItem.php:117
+msgid "Direct message"
+msgstr "Прямое сообщение"
 
-#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755
-msgid "Region"
-msgstr "Регион"
+#: ../../Zotlabs/Lib/ThreadItem.php:122
+msgid "Public Policy"
+msgstr "Политика общего доступа"
 
-#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756
-msgid "ZIP Code"
-msgstr "Индекс"
+#: ../../Zotlabs/Lib/ThreadItem.php:160
+msgid "Privacy conflict. Discretion advised."
+msgstr "Конфиликт настроек конфиденциальности."
 
-#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:773
-#: ../../Zotlabs/Module/Connedit.php:757
-msgid "Country"
-msgstr "Страна"
+#: ../../Zotlabs/Lib/ThreadItem.php:197 ../../include/conversation.php:729
+msgid "Select"
+msgstr "Выбрать"
 
-#: ../../Zotlabs/Module/Cdav.php:1456
-msgid "Default Calendar"
-msgstr "Календарь по умолчанию"
+#: ../../Zotlabs/Lib/ThreadItem.php:222 ../../Zotlabs/Widget/Pinned.php:73
+msgid "I will attend"
+msgstr "Я буду участвовать"
 
-#: ../../Zotlabs/Module/Cdav.php:1467
-msgid "Default Addressbook"
-msgstr "Адресная книга по умолчанию"
+#: ../../Zotlabs/Lib/ThreadItem.php:222 ../../Zotlabs/Widget/Pinned.php:73
+msgid "I will not attend"
+msgstr "Я не буду участвовать"
 
-#: ../../Zotlabs/Module/Lockview.php:100
-msgid "Remote privacy information not available"
-msgstr "Информация о конфиденциальности удалённо недоступна"
+#: ../../Zotlabs/Lib/ThreadItem.php:222 ../../Zotlabs/Widget/Pinned.php:73
+msgid "I might attend"
+msgstr "Я возможно буду присутствовать"
 
-#: ../../Zotlabs/Module/Lockview.php:143 ../../Zotlabs/Module/Lockview.php:184
-#: ../../Zotlabs/Module/Acl.php:123
-msgctxt "acl"
-msgid "Profile"
-msgstr "Профиль"
+#: ../../Zotlabs/Lib/ThreadItem.php:236 ../../Zotlabs/Widget/Pinned.php:84
+msgid "I agree"
+msgstr "Я согласен"
 
-#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193
-msgid "Privacy group"
-msgstr "Группы конфиденциальности"
+#: ../../Zotlabs/Lib/ThreadItem.php:236 ../../Zotlabs/Widget/Pinned.php:84
+msgid "I disagree"
+msgstr "Я не согласен"
 
-#: ../../Zotlabs/Module/Lockview.php:214
+#: ../../Zotlabs/Lib/ThreadItem.php:236 ../../Zotlabs/Widget/Pinned.php:84
+msgid "I abstain"
+msgstr "Я воздержался"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:290 ../../include/conversation.php:736
+msgid "Toggle Star Status"
+msgstr "Переключить статус пометки"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:301 ../../Zotlabs/Widget/Pinned.php:91
+#: ../../include/conversation.php:751
+msgid "Message signature validated"
+msgstr "Подпись сообщения проверена"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../Zotlabs/Widget/Pinned.php:92
+#: ../../include/conversation.php:752
+msgid "Message signature incorrect"
+msgstr "Подпись сообщения неверная"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/conversation.php:950
+msgid "Conversation Features"
+msgstr "Возможности бесед"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:334 ../../include/taxonomy.php:584
+msgid "like"
+msgstr "нравится"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:335 ../../include/taxonomy.php:585
+msgid "dislike"
+msgstr "не нравится"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Reply on this comment"
+msgstr "Ответить на этот комментарий"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "reply"
+msgstr "ответить"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Reply to"
+msgstr "Ответить"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:346 ../../Zotlabs/Widget/Pinned.php:102
+msgid "Share This"
+msgstr "Поделиться этим"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:346 ../../Zotlabs/Widget/Pinned.php:102
+msgid "share"
+msgstr "поделиться"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:356
+msgid "Delivery Report"
+msgstr "Отчёт о доставке"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:375
 #, php-format
-msgid "Click to copy link to this ressource for guest %s to clipboard"
-msgstr "Нажмите чтобы скопировать этот ресурс в буфер для гостя %s"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d комментарий"
+msgstr[1] "%d комментария"
+msgstr[2] "%d комментариев"
 
-#: ../../Zotlabs/Module/Lockview.php:214
-msgid "Link copied"
-msgstr "Ссылка скопирована"
+#: ../../Zotlabs/Lib/ThreadItem.php:376
+#, php-format
+msgid "%d unseen"
+msgstr "новых %d"
 
-#: ../../Zotlabs/Module/Lockview.php:221
-msgid "Access"
-msgstr "Доступ"
+#: ../../Zotlabs/Lib/ThreadItem.php:426
+msgid "Forum"
+msgstr "Форум"
 
-#: ../../Zotlabs/Module/Item.php:748
-msgid "Empty post discarded."
-msgstr "Пустая публикация отклонена."
+#: ../../Zotlabs/Lib/ThreadItem.php:436
+msgid "to"
+msgstr "к"
 
-#: ../../Zotlabs/Module/Item.php:1188
-msgid "Duplicate post suppressed."
-msgstr "Подавлена дублирующаяся публикация."
+#: ../../Zotlabs/Lib/ThreadItem.php:437 ../../Zotlabs/Widget/Messages.php:107
+#: ../../Zotlabs/Widget/Pinned.php:130
+msgid "via"
+msgstr "через"
 
-#: ../../Zotlabs/Module/Item.php:1331
-msgid "System error. Post not saved."
-msgstr "Системная ошибка. Публикация не сохранена."
+#: ../../Zotlabs/Lib/ThreadItem.php:438
+msgid "Wall-to-Wall"
+msgstr "Стена-на-Стену"
 
-#: ../../Zotlabs/Module/Item.php:1365
-msgid "Your comment is awaiting approval."
-msgstr "Ваш комментарий ожидает одобрения."
+#: ../../Zotlabs/Lib/ThreadItem.php:439
+msgid "via Wall-To-Wall:"
+msgstr "через Стена-на-Стену:"
 
-#: ../../Zotlabs/Module/Item.php:1498
-msgid "Unable to obtain post information from database."
-msgstr "Невозможно получить информацию о публикации из базы данных"
+#: ../../Zotlabs/Lib/ThreadItem.php:453 ../../Zotlabs/Widget/Pinned.php:135
+#: ../../include/conversation.php:823
+#, php-format
+msgid "from %s"
+msgstr "от %s"
 
-#: ../../Zotlabs/Module/Item.php:1505
+#: ../../Zotlabs/Lib/ThreadItem.php:456 ../../Zotlabs/Widget/Pinned.php:138
+#: ../../include/conversation.php:826
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Вы достигли вашего ограничения в %1$.0f публикаций высокого уровня."
+msgid "last edited: %s"
+msgstr "последнее редактирование: %s"
 
-#: ../../Zotlabs/Module/Item.php:1512
+#: ../../Zotlabs/Lib/ThreadItem.php:457 ../../Zotlabs/Widget/Pinned.php:139
+#: ../../include/conversation.php:827
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Вы достигли вашего ограничения в %1$.0f  страниц."
+msgid "Expires: %s"
+msgstr "Срок действия: %s"
 
-#: ../../Zotlabs/Module/Mitem.php:31 ../../Zotlabs/Module/Menu.php:209
-msgid "Menu not found."
-msgstr "Меню не найдено"
+#: ../../Zotlabs/Lib/ThreadItem.php:467
+msgid "Attend"
+msgstr "Посетить"
 
-#: ../../Zotlabs/Module/Mitem.php:63
-msgid "Unable to create element."
-msgstr "Невозможно создать элемент."
+#: ../../Zotlabs/Lib/ThreadItem.php:468 ../../Zotlabs/Widget/Pinned.php:144
+msgid "Attendance Options"
+msgstr "Параметры посещаемости"
 
-#: ../../Zotlabs/Module/Mitem.php:87
-msgid "Unable to update menu element."
-msgstr "Невозможно обновить элемент меню."
+#: ../../Zotlabs/Lib/ThreadItem.php:469 ../../include/text.php:1995
+msgid "Vote"
+msgstr "Голосовать"
 
-#: ../../Zotlabs/Module/Mitem.php:103
-msgid "Unable to add menu element."
-msgstr "Невозможно добавить элемент меню."
+#: ../../Zotlabs/Lib/ThreadItem.php:470 ../../Zotlabs/Widget/Pinned.php:145
+msgid "Voting Options"
+msgstr "Параметры голосования"
 
-#: ../../Zotlabs/Module/Mitem.php:134 ../../Zotlabs/Module/Xchan.php:41
-#: ../../Zotlabs/Module/Menu.php:232
-msgid "Not found."
-msgstr "Не найдено."
+#: ../../Zotlabs/Lib/ThreadItem.php:485
+msgid "Go to previous comment"
+msgstr "Перейти к предыдущему комментарию"
 
-#: ../../Zotlabs/Module/Mitem.php:167 ../../Zotlabs/Module/Mitem.php:246
-msgid "Menu Item Permissions"
-msgstr "Разрешения на пункт меню"
+#: ../../Zotlabs/Lib/ThreadItem.php:494 ../../Zotlabs/Widget/Pinned.php:157
+msgid "Pinned post"
+msgstr "Прикреплённая заметка"
 
-#: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247
-msgid "(click to open/close)"
-msgstr "(нажмите чтобы открыть/закрыть)"
+#: ../../Zotlabs/Lib/ThreadItem.php:496 ../../Zotlabs/Widget/Pinned.php:158
+#: ../../include/js_strings.php:39
+msgid "Unpin from the top"
+msgstr "Открепить"
 
-#: ../../Zotlabs/Module/Mitem.php:174 ../../Zotlabs/Module/Mitem.php:191
-msgid "Link Name"
-msgstr "Имя ссылки"
+#: ../../Zotlabs/Lib/ThreadItem.php:496 ../../include/js_strings.php:38
+msgid "Pin to the top"
+msgstr "Прикрепить сверху"
 
-#: ../../Zotlabs/Module/Mitem.php:175 ../../Zotlabs/Module/Mitem.php:255
-msgid "Link or Submenu Target"
-msgstr "Ссылка или цель подменю"
+#: ../../Zotlabs/Lib/ThreadItem.php:497
+#: ../../extend/addon/hzaddons/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
+msgstr "Сохранить в закладках"
 
-#: ../../Zotlabs/Module/Mitem.php:175
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Введите URL ссылки или выберите имя меню для создания подменю"
+#: ../../Zotlabs/Lib/ThreadItem.php:498
+msgid "Add to Calendar"
+msgstr "Добавить в календарь"
 
-#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:256
-msgid "Use magic-auth if available"
-msgstr "Использовать magic-auth если возможно"
+#: ../../Zotlabs/Lib/ThreadItem.php:525 ../../include/conversation.php:516
+msgid "This is an unsaved preview"
+msgstr "Это несохранённый просмотр"
 
-#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:257
-msgid "Open link in new window"
-msgstr "Открыть ссылку в новом окне"
+#: ../../Zotlabs/Lib/ThreadItem.php:560 ../../include/js_strings.php:7
+#, php-format
+msgid "%s show all"
+msgstr "%s показать всё"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Order in list"
-msgstr "Порядок в списке"
+#: ../../Zotlabs/Lib/ThreadItem.php:853 ../../include/conversation.php:1476
+#: ../../extend/addon/hzaddons/hsse/hsse.php:200
+msgid "Bold"
+msgstr "Жирный"
 
-#: ../../Zotlabs/Module/Mitem.php:178 ../../Zotlabs/Module/Mitem.php:258
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Большие значения в конце списка"
+#: ../../Zotlabs/Lib/ThreadItem.php:854 ../../include/conversation.php:1477
+#: ../../extend/addon/hzaddons/hsse/hsse.php:201
+msgid "Italic"
+msgstr "Курсив"
 
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Submit and finish"
-msgstr "Отправить и завершить"
+#: ../../Zotlabs/Lib/ThreadItem.php:855 ../../include/conversation.php:1478
+#: ../../extend/addon/hzaddons/hsse/hsse.php:202
+msgid "Underline"
+msgstr "Подчеркнутый"
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Submit and continue"
-msgstr "Отправить и продолжить"
+#: ../../Zotlabs/Lib/ThreadItem.php:856 ../../include/conversation.php:1479
+#: ../../extend/addon/hzaddons/hsse/hsse.php:203
+msgid "Quote"
+msgstr "Цитата"
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Menu:"
-msgstr "Меню:"
+#: ../../Zotlabs/Lib/ThreadItem.php:857 ../../include/conversation.php:1480
+#: ../../extend/addon/hzaddons/hsse/hsse.php:204
+msgid "Code"
+msgstr "Код"
 
-#: ../../Zotlabs/Module/Mitem.php:192
-msgid "Link Target"
-msgstr "Цель ссылки"
+#: ../../Zotlabs/Lib/ThreadItem.php:858
+msgid "Image"
+msgstr "Изображение"
 
-#: ../../Zotlabs/Module/Mitem.php:195
-msgid "Edit menu"
-msgstr "Редактировать меню"
+#: ../../Zotlabs/Lib/ThreadItem.php:859 ../../include/conversation.php:1481
+#: ../../extend/addon/hzaddons/hsse/hsse.php:205
+msgid "Attach/Upload file"
+msgstr "Прикрепить/загрузить файл"
 
-#: ../../Zotlabs/Module/Mitem.php:198
-msgid "Edit element"
-msgstr "Редактировать элемент"
+#: ../../Zotlabs/Lib/ThreadItem.php:860
+msgid "Insert Link"
+msgstr "Вставить ссылку"
 
-#: ../../Zotlabs/Module/Mitem.php:199
-msgid "Drop element"
-msgstr "Удалить элемент"
+#: ../../Zotlabs/Lib/ThreadItem.php:861
+msgid "Video"
+msgstr "Видео"
 
-#: ../../Zotlabs/Module/Mitem.php:200
-msgid "New element"
-msgstr "Новый элемент"
+#: ../../Zotlabs/Lib/ThreadItem.php:871
+msgid "Your full name (required)"
+msgstr "Ваше полное имя (требуется)"
 
-#: ../../Zotlabs/Module/Mitem.php:201
-msgid "Edit this menu container"
-msgstr "Редактировать контейнер меню"
+#: ../../Zotlabs/Lib/ThreadItem.php:872
+msgid "Your email address (required)"
+msgstr "Ваш адрес электронной почты (требуется)"
 
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Add menu element"
-msgstr "Добавить элемент меню"
+#: ../../Zotlabs/Lib/ThreadItem.php:873
+msgid "Your website URL (optional)"
+msgstr "URL вашего вебсайта (необязательно)"
 
-#: ../../Zotlabs/Module/Mitem.php:203
-msgid "Delete this menu item"
-msgstr "Удалить этот элемент меню"
+#: ../../Zotlabs/Lib/Libzotdir.php:163
+msgid "Directory Options"
+msgstr "Параметры каталога"
 
-#: ../../Zotlabs/Module/Mitem.php:204
-msgid "Edit this menu item"
-msgstr "Редактировать этот элемент меню"
+#: ../../Zotlabs/Lib/Libzotdir.php:165
+msgid "Safe Mode"
+msgstr "Безопасный режим"
 
-#: ../../Zotlabs/Module/Mitem.php:222
-msgid "Menu item not found."
-msgstr "Элемент меню не найден."
+#: ../../Zotlabs/Lib/Libzotdir.php:166
+msgid "Public Forums Only"
+msgstr "Только публичные форумы"
 
-#: ../../Zotlabs/Module/Mitem.php:235
-msgid "Menu item deleted."
-msgstr "Элемент меню удалён."
+#: ../../Zotlabs/Lib/Libzotdir.php:168
+msgid "This Website Only"
+msgstr "Только этот веб-сайт"
 
-#: ../../Zotlabs/Module/Mitem.php:237
-msgid "Menu item could not be deleted."
-msgstr "Невозможно удалить элемент меню."
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:33
+msgid "Visible to your default audience"
+msgstr "Видно вашей аудитории по умолчанию."
 
-#: ../../Zotlabs/Module/Mitem.php:244
-msgid "Edit Menu Element"
-msgstr "Редактировать элемент меню"
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+#: ../../Zotlabs/Access/PermissionRoles.php:384
+msgid "Public"
+msgstr "Общедоступно"
 
-#: ../../Zotlabs/Module/Mitem.php:254
-msgid "Link text"
-msgstr "Текст ссылки"
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
+msgstr "Любому в сети $Projectname"
 
-#: ../../Zotlabs/Module/Profile.php:106
-msgid "vcard"
-msgstr "vCard"
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
+msgstr "Любой аккаунт в %s"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-msgid "Files: shared with me"
-msgstr "Файлы: поделились со мной"
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
+msgstr "Любой из моих контактов"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:107
-msgid "NEW"
-msgstr "НОВОЕ"
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
+msgstr "Только те контакты, кому я дам разрешение"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:109
-#: ../../Zotlabs/Storage/Browser.php:380
-msgid "Last Modified"
-msgstr "Последнее изменение"
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Любой аутентифицированный (может включать посетителей их других сетей)"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:110
-msgid "Remove all files"
-msgstr "Удалить все файлы"
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Любые контакты включая те, которые вы ещё не одобрили"
 
-#: ../../Zotlabs/Module/Sharedwithme.php:111
-msgid "Remove this file"
-msgstr "Удалить этот файл"
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Это настройка по умолчанию для аудитории ваших обычных потоков и публикаций"
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
-msgstr "Поиск документации"
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Это настройка по умолчанию для тех, кто может просматривать профиль вашего основного канала"
 
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Members"
-msgstr "Участники"
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
+msgstr "Это настройка по умолчанию для тех, кто может просматривать ваши контакты"
 
-#: ../../Zotlabs/Module/Help.php:85
-msgid "Administrators"
-msgstr "Администраторы"
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Это настройка по умолчанию для тех, кто может просматривать ваше хранилище файлов и фотографий"
 
-#: ../../Zotlabs/Module/Help.php:86
-msgid "Developers"
-msgstr "Разработчики"
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц"
 
-#: ../../Zotlabs/Module/Help.php:87
-msgid "Tutorials"
-msgstr "Руководства"
+#: ../../Zotlabs/Lib/Activity.php:2258
+#, php-format
+msgid "Likes %1$s's %2$s"
+msgstr "Нравится %1$s %2$s"
 
-#: ../../Zotlabs/Module/Help.php:98
-msgid "$Projectname Documentation"
-msgstr "$Projectname Документация"
+#: ../../Zotlabs/Lib/Activity.php:2261
+#, php-format
+msgid "Doesn't like %1$s's %2$s"
+msgstr "Не нравится %1$s %2$s"
 
-#: ../../Zotlabs/Module/Help.php:99
-msgid "Contents"
-msgstr "Содержимое"
+#: ../../Zotlabs/Lib/Activity.php:2267
+#, php-format
+msgid "Will attend %s's event"
+msgstr "Присоединится к мероприятию %s"
 
-#: ../../Zotlabs/Module/Webpages.php:67
-msgid "Import Webpage Elements"
-msgstr "Импортировать части веб-страницы"
+#: ../../Zotlabs/Lib/Activity.php:2270
+#, php-format
+msgid "Will not attend %s's event"
+msgstr "Не присоединится к мероприятию %s"
 
-#: ../../Zotlabs/Module/Webpages.php:68
-msgid "Import selected"
-msgstr "Импортировать выбранное"
+#: ../../Zotlabs/Lib/Activity.php:2273
+#, php-format
+msgid "May attend %s's event"
+msgstr "Возможно присоединится к мероприятию %s"
 
-#: ../../Zotlabs/Module/Webpages.php:91
-msgid "Export Webpage Elements"
-msgstr "Экспортировать часть веб-страницы"
+#: ../../Zotlabs/Lib/Activity.php:2276
+#, php-format
+msgid "May not attend %s's event"
+msgstr "Возможно не присоединится к мероприятию %s"
 
-#: ../../Zotlabs/Module/Webpages.php:92
-msgid "Export selected"
-msgstr "Экспортировать выбранное"
+#: ../../Zotlabs/Lib/Activity.php:3570 ../../include/network.php:1767
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:1332
+#: ../../extend/addon/hzaddons/pubcrawl/as.php:2002
+msgid "ActivityPub"
+msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:260
-msgid "Actions"
-msgstr "Действия"
+#: ../../Zotlabs/Lib/Apps.php:327 ../../include/nav.php:332
+msgid "Apps"
+msgstr "Приложения"
 
-#: ../../Zotlabs/Module/Webpages.php:261
-msgid "Page Link"
-msgstr "Ссылка страницы"
+#: ../../Zotlabs/Lib/Apps.php:328
+msgid "Affinity Tool"
+msgstr "Степень сходства"
 
-#: ../../Zotlabs/Module/Webpages.php:262
-msgid "Page Title"
-msgstr "Заголовок страницы"
+#: ../../Zotlabs/Lib/Apps.php:329
+#: ../../extend/addon/hzaddons/articles/Mod_Articles.php:228
+#: ../../extend/addon/hzaddons/articles/articles.php:46
+msgid "Articles"
+msgstr "Статьи"
 
-#: ../../Zotlabs/Module/Webpages.php:263 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:191
-msgid "Created"
-msgstr "Создано"
+#: ../../Zotlabs/Lib/Apps.php:330
+#: ../../extend/addon/hzaddons/cards/cards.php:47
+#: ../../extend/addon/hzaddons/cards/Mod_Cards.php:209
+msgid "Cards"
+msgstr "Карточки"
 
-#: ../../Zotlabs/Module/Webpages.php:264 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:192
-msgid "Edited"
-msgstr "Отредактировано"
+#: ../../Zotlabs/Lib/Apps.php:331
+msgid "Site Admin"
+msgstr "Администратор сайта"
 
-#: ../../Zotlabs/Module/Webpages.php:292
-msgid "Invalid file type."
-msgstr "Неверный тип файла."
+#: ../../Zotlabs/Lib/Apps.php:332
+#: ../../extend/addon/hzaddons/buglink/buglink.php:16
+msgid "Report Bug"
+msgstr "Сообщить об ошибке"
 
-#: ../../Zotlabs/Module/Webpages.php:304
-msgid "Error opening zip file"
-msgstr "Ошибка открытия ZIP файла"
+#: ../../Zotlabs/Lib/Apps.php:334 ../../Zotlabs/Widget/Chatroom_list.php:22
+#: ../../include/nav.php:481 ../../include/nav.php:484
+msgid "Chatrooms"
+msgstr "Чаты"
 
-#: ../../Zotlabs/Module/Webpages.php:315
-msgid "Invalid folder path."
-msgstr "Неверный путь к каталогу."
+#: ../../Zotlabs/Lib/Apps.php:335
+msgid "Content Filter"
+msgstr "Фильтр содержимого"
 
-#: ../../Zotlabs/Module/Webpages.php:342
-msgid "No webpage elements detected."
-msgstr "Не обнаружено частей веб-страницы."
+#: ../../Zotlabs/Lib/Apps.php:336
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:134
+msgid "Content Import"
+msgstr "Импорт содержимого"
 
-#: ../../Zotlabs/Module/Webpages.php:417
-msgid "Import complete."
-msgstr "Импорт завершен."
+#: ../../Zotlabs/Lib/Apps.php:338
+msgid "Remote Diagnostics"
+msgstr "Удалённая диагностика"
 
-#: ../../Zotlabs/Module/Filestorage.php:14
-#: ../../Zotlabs/Module/Filestorage.php:53
-msgid "Deprecated!"
-msgstr "Не рекомендовано!"
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Suggest Channels"
+msgstr "Предлагаемые каналы"
 
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Permission Denied."
-msgstr "Доступ запрещен."
+#: ../../Zotlabs/Lib/Apps.php:341
+msgid "Channel Manager"
+msgstr "Менеджер каналов"
 
-#: ../../Zotlabs/Module/Filestorage.php:190
-msgid "Edit file permissions"
-msgstr "Редактировать разрешения файла"
+#: ../../Zotlabs/Lib/Apps.php:342
+msgid "Stream"
+msgstr "Поток"
 
-#: ../../Zotlabs/Module/Filestorage.php:203
-msgid "Include all files and sub folders"
-msgstr "Включить все файлы и подкаталоги"
+#: ../../Zotlabs/Lib/Apps.php:346 ../../include/nav.php:519
+msgid "Wiki"
+msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:204
-msgid "Return to file list"
-msgstr "Вернутся к списку файлов"
+#: ../../Zotlabs/Lib/Apps.php:350 ../../include/nav.php:467
+#: ../../include/nav.php:470 ../../include/features.php:82
+msgid "Calendar"
+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/Apps.php:351 ../../include/features.php:192
+msgid "Directory"
+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/Apps.php:353
+msgid "Mail"
+msgstr "Переписка"
 
-#: ../../Zotlabs/Module/Filestorage.php:209
-msgid "Share this file"
-msgstr "Поделиться этим файлом"
+#: ../../Zotlabs/Lib/Apps.php:356
+msgid "Chat"
+msgstr "Чат"
 
-#: ../../Zotlabs/Module/Filestorage.php:210
-msgid "Show URL to this file"
-msgstr "Показать URL этого файла"
+#: ../../Zotlabs/Lib/Apps.php:358
+msgid "Probe"
+msgstr "Проба"
 
-#: ../../Zotlabs/Module/Filestorage.php:211
-#: ../../Zotlabs/Storage/Browser.php:552
-msgid "Show in your contacts shared folder"
-msgstr "Показать общий каталог в ваших контактах"
+#: ../../Zotlabs/Lib/Apps.php:359
+msgid "Suggest"
+msgstr "Предложить"
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
-msgstr "Тег удалён"
+#: ../../Zotlabs/Lib/Apps.php:360
+msgid "Random Channel"
+msgstr "Случайный канал"
 
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
-msgstr "Удалить тег элемента"
+#: ../../Zotlabs/Lib/Apps.php:361
+msgid "Invite"
+msgstr "Пригласить"
 
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
-msgstr "Выбрать тег для удаления:"
+#: ../../Zotlabs/Lib/Apps.php:362 ../../Zotlabs/Widget/Admin.php:31
+msgid "Features"
+msgstr "Функции"
 
-#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118
-msgid "Continue"
-msgstr "Продолжить"
+#: ../../Zotlabs/Lib/Apps.php:363
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr "Язык"
 
-#: ../../Zotlabs/Module/Connect.php:99
-msgid "Premium Channel Setup"
-msgstr "Установка премиального канала"
+#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../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/Module/Connect.php:101
-msgid "Enable premium channel connection restrictions"
-msgstr "Включить ограничения для премиального канала"
+#: ../../Zotlabs/Lib/Apps.php:369
+msgid "Notifications"
+msgstr "Оповещения"
 
-#: ../../Zotlabs/Module/Connect.php:102
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Пожалуйста введите ваши ограничения или условия, такие, как оплата PayPal, правила использования и т.п."
+#: ../../Zotlabs/Lib/Apps.php:370
+msgid "Order Apps"
+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/Apps.php:371
+msgid "CardDAV"
+msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:105
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Потенциальные соединения будут видеть следующий предварительный текст:"
+#: ../../Zotlabs/Lib/Apps.php:374 ../../Zotlabs/Widget/Notes.php:38
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2630
+msgid "Notes"
+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/Apps.php:375
+msgid "OAuth Apps Manager"
+msgstr "Менеджер OAuth"
 
-#: ../../Zotlabs/Module/Connect.php:115
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Владельцем канала не было представлено никаких специальных инструкций.)"
+#: ../../Zotlabs/Lib/Apps.php:376
+msgid "OAuth2 Apps Manager"
+msgstr "Менеджер OAuth2"
 
-#: ../../Zotlabs/Module/Connect.php:123
-msgid "Restricted or Premium Channel"
-msgstr "Ограниченный или премиальный канал"
+#: ../../Zotlabs/Lib/Apps.php:377
+msgid "PDL Editor"
+msgstr "Редактор PDL"
 
-#: ../../Zotlabs/Module/Cloud.php:120
-msgid "Not found"
-msgstr "Не найдено."
+#: ../../Zotlabs/Lib/Apps.php:380
+msgid "My Chatrooms"
+msgstr "Мои чаты"
 
-#: ../../Zotlabs/Module/Cloud.php:130
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
+#: ../../Zotlabs/Lib/Apps.php:381
+msgid "Channel Export"
+msgstr "Экспорт канала"
 
-#: ../../Zotlabs/Module/Share.php:120
-msgid "Post repeated"
-msgstr "Публикация повторяется"
+#: ../../Zotlabs/Lib/Apps.php:570 ../../Zotlabs/Lib/Apps.php:592
+msgid "Purchase"
+msgstr "Купить"
 
-#: ../../Zotlabs/Module/Acl.php:370
-msgid "network"
-msgstr "сеть"
+#: ../../Zotlabs/Lib/Apps.php:597
+msgid "Undelete"
+msgstr "Восстановить"
 
-#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43
-msgid "Item is not editable"
-msgstr "Элемент нельзя редактировать"
+#: ../../Zotlabs/Lib/Apps.php:605
+msgid "Add to app-tray"
+msgstr "Добавить в правое меню"
 
-#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:218
-msgid "Edit post"
-msgstr "Редактировать сообщение"
+#: ../../Zotlabs/Lib/Apps.php:606
+msgid "Remove from app-tray"
+msgstr "Удалить из правого меню"
 
-#: ../../Zotlabs/Module/Tagger.php:50
-msgid "Post not found."
-msgstr "Публикация не найдена"
+#: ../../Zotlabs/Lib/Apps.php:607
+msgid "Pin to navbar"
+msgstr "Добавить на панель навигации"
 
-#: ../../Zotlabs/Module/Tagger.php:121
+#: ../../Zotlabs/Lib/Apps.php:608
+msgid "Unpin from navbar"
+msgstr "Удалить с панели навигации"
+
+#: ../../Zotlabs/Lib/AccessList.php:26
+msgid ""
+"A deleted privacy group with this name was revived. Existing item "
+"permissions <strong>may</strong> apply to this privacy group and any future "
+"members. If this is not what you intended, please create another privacy "
+"group with a different name."
+msgstr "Удаленная группа конфиденциальности с таким названием восстановлена. Существующие разрешения элемента <strong>могут</strong> применяться к этой группе конфиденциальности и любым будущим участникам. Если это не то, что вы хотели, создайте другую группу конфиденциальности с другим именем."
+
+#: ../../Zotlabs/Lib/AccessList.php:268
+msgid "Select a privacy group"
+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 "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s отметил тегом %4$s %3$s %2$s"
+msgid "%s Administrator"
+msgstr "администратор %s"
 
-#: ../../Zotlabs/Module/Authorize.php:17
-msgid "Unknown App"
-msgstr "Неизвестное приложение"
+#: ../../Zotlabs/Lib/Enotify.php:66
+#, php-format
+msgid "This email was sent by %1$s at %2$s."
+msgstr "Это письмо было отправлено %1$s на %2$s."
 
-#: ../../Zotlabs/Module/Authorize.php:29
-msgid "Authorize"
-msgstr "Авторизовать"
+#: ../../Zotlabs/Lib/Enotify.php:67
+#, php-format
+msgid ""
+"To stop receiving these messages, please adjust your Notification Settings "
+"at %s"
+msgstr "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s"
 
-#: ../../Zotlabs/Module/Authorize.php:30
+#: ../../Zotlabs/Lib/Enotify.php:68
 #, php-format
-msgid "Do you authorize the app %s to access your channel data?"
-msgstr "Авторизуете ли вы приложение %s для доступа к данным вашего канала?"
+msgid "To stop receiving these messages, please adjust your %s."
+msgstr "Чтобы прекратить получать эти сообщения, пожалуйста измените %s."
 
-#: ../../Zotlabs/Module/Authorize.php:33
-#: ../../Zotlabs/Module/Admin/Accounts.php:319
-msgid "Deny"
-msgstr "Запретить"
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
-msgstr "Статистика очереди"
+#: ../../Zotlabs/Lib/Enotify.php:128
+#, php-format
+msgid "[$Projectname:Notify] New direct message received at %s"
+msgstr "[$Projectname:Notify] Получено новое сообщение в %s"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
-msgstr "Всего записей"
+#: ../../Zotlabs/Lib/Enotify.php:130
+#, php-format
+msgid "%1$s sent you a new direct message at %2$s"
+msgstr "%1$s отправил вам сообщение %2$s"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
-msgstr "Приоритет"
+#: ../../Zotlabs/Lib/Enotify.php:131
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s отправил вам %2$s."
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
-msgstr "Конечный URL-адрес"
+#: ../../Zotlabs/Lib/Enotify.php:131
+msgid "a direct message"
+msgstr "сообщение"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
-msgstr "Пометить хаб как постоянно отключенный"
+#: ../../Zotlabs/Lib/Enotify.php:132
+#, php-format
+msgid "Please visit %s to view and/or reply to your direct messages."
+msgstr "Пожалуйста, посетите %s для просмотра и/или ответа на ваши сообщения."
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
-msgstr "Освободить очередь для этого хаба"
+#: ../../Zotlabs/Lib/Enotify.php:145
+msgid "commented on"
+msgstr "прокомментировал"
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
-msgstr "Последний известный контакт"
+#: ../../Zotlabs/Lib/Enotify.php:158 ../../Zotlabs/Lib/Enotify.php:307
+msgid "liked"
+msgstr "понравилось"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
-msgstr "Настройки темы обновленны."
+#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:307
+msgid "disliked"
+msgstr "не понравилось"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
-msgstr "Темы не найдены."
+#: ../../Zotlabs/Lib/Enotify.php:166
+msgid "voted on"
+msgstr "проголосовал в"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-#: ../../Zotlabs/Module/Admin/Addons.php:311
-msgid "Disable"
-msgstr "Запретить"
+#: ../../Zotlabs/Lib/Enotify.php:209
+#, 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]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-#: ../../Zotlabs/Module/Admin/Addons.php:314
-msgid "Enable"
-msgstr "Разрешить"
+#: ../../Zotlabs/Lib/Enotify.php:217
+#, 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]"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
-msgstr "Снимок экрана"
+#: ../../Zotlabs/Lib/Enotify.php:226 ../../Zotlabs/Lib/Enotify.php:311
+#, 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/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/Lib/Enotify.php:238
+#, php-format
+msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Отмодерирован комментарий к беседе #%1$d по %2$s"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-#: ../../Zotlabs/Module/Admin/Addons.php:344
-msgid "Toggle"
-msgstr "Переключить"
+#: ../../Zotlabs/Lib/Enotify.php:240
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Комментарий к беседе #%1$d по %2$s"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-#: ../../Zotlabs/Module/Admin/Addons.php:352
-msgid "Author: "
-msgstr "Автор: "
+#: ../../Zotlabs/Lib/Enotify.php:241
+#, php-format
+msgid "%1$s commented on an item/conversation you have been following"
+msgstr "%1$s прокомментировал запись / беседу, на которую вы подписаны"
 
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-#: ../../Zotlabs/Module/Admin/Addons.php:353
-msgid "Maintainer: "
-msgstr "Сопровождающий:"
+#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:331
+#: ../../Zotlabs/Lib/Enotify.php:347 ../../Zotlabs/Lib/Enotify.php:371
+#: ../../Zotlabs/Lib/Enotify.php:388 ../../Zotlabs/Lib/Enotify.php:401
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Пожалуйста, посетите %s для просмотра и / или ответа в беседе."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
-msgstr "[экспериментальный]"
+#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249
+#, php-format
+msgid "Please visit %s to approve or reject this comment."
+msgstr "Пожалуйста посетитет %s для одобрения и отклонения комментария."
 
-#: ../../Zotlabs/Module/Admin/Themes.php:163
-msgid "[Unsupported]"
-msgstr "[неподдерживаемый]"
+#: ../../Zotlabs/Lib/Enotify.php:327
+#, php-format
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+msgstr "[$Projectname:Notify] Беседа получила отметку \"нравится\" #%1$d от %2$s"
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Lib/Enotify.php:328
 #, php-format
-msgid "Lock feature %s"
-msgstr "Заблокировать функцию \"%s\""
+msgid "%1$s liked an item/conversation you created"
+msgstr "%1$s понравился созданный вами объект / беседа"
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
-msgstr "Управление дополнительными функциями"
+#: ../../Zotlabs/Lib/Enotify.php:339
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
+msgstr "[$Projectname:Notify] %s сделал публикацию на стене вашего профиля"
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
-msgstr "По умолчанию, HTML без фильтрации доступен во встраиваемых медиа. Это небезопасно."
+#: ../../Zotlabs/Lib/Enotify.php:341
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s сделал публикацию на стене вашего профиля в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
-msgstr "Рекомендуется настроить разрешения использовать HTML без фильтрации только для следующих сайтов:"
+#: ../../Zotlabs/Lib/Enotify.php:343
+#, php-format
+msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
+msgstr "%1$s опубликовал на [zrl=%2$s]вашей стене[/zrl]"
 
-#: ../../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 ""
+#: ../../Zotlabs/Lib/Enotify.php:365
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
+msgstr "[$Projectname:Notify] %s отметил вас"
 
-#: ../../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/Enotify.php:366
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s отметил вас в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:101
-msgid "Block public"
-msgstr "Блокировать публичный доступ"
+#: ../../Zotlabs/Lib/Enotify.php:367
+#, php-format
+msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
+msgstr "%1$s [zrl=%2$s]отметил вас[/zrl]."
 
-#: ../../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/Enotify.php:378
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
+msgstr "[$Projectname:Notify] %1$s ткнул вас"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid "Provide a cloud root directory"
-msgstr "Предоставить корневой каталог в облаке"
+#: ../../Zotlabs/Lib/Enotify.php:379
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s ткнул вас в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:102
-msgid ""
-"The cloud root directory lists all channel names which provide public files"
-msgstr "В корневом каталоге облака показываются все имена каналов, которые предоставляют общедоступные файлы"
+#: ../../Zotlabs/Lib/Enotify.php:380
+#, php-format
+msgid "%1$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s [zrl=%2$s]ткнул вас[/zrl]."
 
-#: ../../Zotlabs/Module/Admin/Security.php:103
-msgid "Show total disk space available to cloud uploads"
-msgstr "Показывать общее доступное для загрузок место в хранилище"
+#: ../../Zotlabs/Lib/Enotify.php:395
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
+msgstr "[$Projectname:Notify] %s отметил вашу публикацию"
 
-#: ../../Zotlabs/Module/Admin/Security.php:104
-msgid "Set \"Transport Security\" HTTP header"
-msgstr "Установить HTTP-заголовок \"Transport Security\""
+#: ../../Zotlabs/Lib/Enotify.php:396
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s отметил вашу публикацию на %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:105
-msgid "Set \"Content Security Policy\" HTTP header"
-msgstr "Установить HTTP-заголовок \"Content Security Policy\""
+#: ../../Zotlabs/Lib/Enotify.php:397
+#, php-format
+msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
+msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]"
 
-#: ../../Zotlabs/Module/Admin/Security.php:106
-msgid "Allowed email domains"
-msgstr "Разрешённые домены email"
+#: ../../Zotlabs/Lib/Enotify.php:408
+msgid "[$Projectname:Notify] Introduction received"
+msgstr "[$Projectname:Notify] Получено приглашение"
 
-#: ../../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/Enotify.php:409
+#, php-format
+msgid "You've received an new connection request from '%1$s' at %2$s"
+msgstr "Вы получили новый запрос контакта от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:107
-msgid "Not allowed email domains"
-msgstr "Запрещённые домены email"
+#: ../../Zotlabs/Lib/Enotify.php:410
+#, 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/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/Enotify.php:413 ../../Zotlabs/Lib/Enotify.php:431
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Вы можете увидеть его профиль по ссылке %s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
-msgid "Allow communications only from these sites"
-msgstr "Разрешить связь только с этими сайтами"
+#: ../../Zotlabs/Lib/Enotify.php:415
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить запрос контакта."
 
-#: ../../Zotlabs/Module/Admin/Security.php:108
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
-msgstr "Один сайт на строку. Оставьте пустым для разрешения взаимодействия без ограничений (по умочанию)."
+#: ../../Zotlabs/Lib/Enotify.php:422
+msgid "[$Projectname:Notify] Friend suggestion received"
+msgstr "[$Projectname:Notify] Получено предложение дружить"
 
-#: ../../Zotlabs/Module/Admin/Security.php:109
-msgid "Block communications from these sites"
-msgstr "Блокировать связь с этими сайтами"
+#: ../../Zotlabs/Lib/Enotify.php:423
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Вы получили предложение дружить от '%1$s' в %2$s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:110
-msgid "Allow communications only from these channels"
-msgstr "Разрешить связь только для этих каналов"
+#: ../../Zotlabs/Lib/Enotify.php:424
+#, 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/Security.php:110
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
-msgstr "Один канал (или его хэш) на строку. Оставьте пустым для разрешения взаимодействия с любым каналом (по умолчанию)."
+#: ../../Zotlabs/Lib/Enotify.php:429
+msgid "Name:"
+msgstr "Имя:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:111
-msgid "Block communications from these channels"
-msgstr "Блокировать связь с этими каналами"
+#: ../../Zotlabs/Lib/Enotify.php:430
+msgid "Photo:"
+msgstr "Фото:"
 
-#: ../../Zotlabs/Module/Admin/Security.php:112
-msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr "Разрешать встраивание только для безопасных (SSL/TLS) сайтов и ссылок."
+#: ../../Zotlabs/Lib/Enotify.php:433
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение."
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr "Разрешить  встраивать нефильтруемое HTML-содержимое только для этих доменов"
+#: ../../Zotlabs/Lib/Enotify.php:658
+msgid "[$Projectname:Notify]"
+msgstr "[$Projectname:Уведомление]"
 
-#: ../../Zotlabs/Module/Admin/Security.php:113
-msgid "One site per line. By default embedded content is filtered."
-msgstr "Один сайт на строку. По умолчанию встраиваемое содержимое фильтруется."
+#: ../../Zotlabs/Lib/Enotify.php:826
+msgid "created a new poll"
+msgstr "создал новый опрос"
 
-#: ../../Zotlabs/Module/Admin/Security.php:114
-msgid "Block embedded HTML from these domains"
-msgstr "Блокировать встраивание HTML-содержимого для этих доменов"
+#: ../../Zotlabs/Lib/Enotify.php:826
+msgid "created a new post"
+msgstr "создал новую публикацию"
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "Allow SVG thumbnails in file browser"
-msgstr "Разрешить SVG миниатюры в просмотрщике файлов"
+#: ../../Zotlabs/Lib/Enotify.php:827
+#, php-format
+msgid "voted on %s's poll"
+msgstr "проголосова в опросе %s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:115
-msgid "WARNING: SVG images may contain malicious code."
-msgstr "Внимание: изображения SVG могут содержать вредоносный код."
+#: ../../Zotlabs/Lib/Enotify.php:827
+#, php-format
+msgid "commented on %s's post"
+msgstr "прокомментировал публикацию %s"
 
-#: ../../Zotlabs/Module/Admin/Security.php:116
-msgid "Allow embedded (inline) PDF files"
-msgstr "Разрешить встраивание для файлов PDF"
+#: ../../Zotlabs/Lib/Enotify.php:831
+#, php-format
+msgid "repeated %s's post"
+msgstr "разместил публикацию %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:128
+#: ../../Zotlabs/Lib/Enotify.php:835
 #, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] "%s аккаунт блокирован/разблокирован"
-msgstr[1] "%s аккаунтов блокировано/разблокировано"
-msgstr[2] "%s аккаунтов блокировано/разблокировано"
+msgid "liked %s's post"
+msgstr "понравилась публикация %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:135
+#: ../../Zotlabs/Lib/Enotify.php:839
 #, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] "%s аккаунт удалён"
-msgstr[1] "%s аккаунтов удалено"
-msgstr[2] "%s аккаунтов удалено"
+msgid "disliked %s's post"
+msgstr "не понравилась публикация %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Account not found"
-msgstr "Аккаунт не найден"
+#: ../../Zotlabs/Lib/Enotify.php:843 ../../Zotlabs/Lib/Enotify.php:946
+msgid "shared a file with you"
+msgstr "с вами поделились файлом"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:192
+#: ../../Zotlabs/Lib/Enotify.php:852
 #, php-format
-msgid "Account '%s' blocked"
-msgstr "Аккаунт '%s' заблокирован"
+msgid "edited a post dated %s"
+msgstr "отредактировал публикацию датированную %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:200
+#: ../../Zotlabs/Lib/Enotify.php:855
 #, php-format
-msgid "Account '%s' unblocked"
-msgstr "Аккаунт '%s' разблокирован"
+msgid "edited a comment dated %s"
+msgstr "отредактировал комментарий датированный %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:240
-msgid "Unverified"
-msgstr "Непроверено"
+#: ../../Zotlabs/Lib/Enotify.php:931
+msgid "added your channel"
+msgstr "добавил ваш канал"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:243
-msgid "Expired"
-msgstr "Истёк"
+#: ../../Zotlabs/Lib/Enotify.php:961
+msgid "sent you a direct message"
+msgstr "отправил вам сообщение"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show verified registrations"
-msgstr "Показать проверенные регистрации"
+#: ../../Zotlabs/Lib/Enotify.php:968
+msgid "g A l F d"
+msgstr "g A l F d"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:310
-msgid "Show all registrations"
-msgstr "Показать все регистрации"
+#: ../../Zotlabs/Lib/Enotify.php:971
+msgid "[today]"
+msgstr "[сегодня]"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:312
-msgid "Select toggle"
-msgstr "Выбрать"
+#: ../../Zotlabs/Lib/Enotify.php:981
+msgid "created an event"
+msgstr "создано событие"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:313
-msgid "Deny selected"
-msgstr "Запретить выбранное"
+#: ../../Zotlabs/Lib/Enotify.php:996
+msgid "status verified"
+msgstr "статус подтверждён"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:314
-msgid "Approve selected"
-msgstr "Утвердить выбранное"
+#: ../../Zotlabs/Lib/Chatroom.php:25
+msgid "Missing room name"
+msgstr "Отсутствует название комнаты"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "All registrations"
-msgstr "Все регистрации"
+#: ../../Zotlabs/Lib/Chatroom.php:34
+msgid "Duplicate room name"
+msgstr "Название комнаты дублируется"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:315
-msgid "Verified registrations waiting for approval"
-msgstr "Проверенные регистрации ожидающие утверждения"
+#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
+msgid "Invalid room specifier."
+msgstr "Неверный указатель комнаты."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Request date"
-msgstr "Дата запроса"
+#: ../../Zotlabs/Lib/Chatroom.php:124
+msgid "Room not found."
+msgstr "Комната не найдена."
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:316
-msgid "Requests"
-msgstr "Запросы"
+#: ../../Zotlabs/Lib/Chatroom.php:145
+msgid "Room is full"
+msgstr "Комната переполнена"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No registrations available"
-msgstr "Нет доступных регистраций"
+#: ../../Zotlabs/Lib/Techlevels.php:10
+msgid "0. Beginner/Basic"
+msgstr "Начинающий / Базовый"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:317
-msgid "No verified registrations available"
-msgstr "Нет доступных подтвержденных регистраций "
+#: ../../Zotlabs/Lib/Techlevels.php:11
+msgid "1. Novice - not skilled but willing to learn"
+msgstr "1. Новичок - не опытный, но желающий учиться"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:321
-#: ../../Zotlabs/Module/Contactedit.php:632
-#: ../../Zotlabs/Module/Connedit.php:508
-msgid "Block"
-msgstr "Блокировать"
+#: ../../Zotlabs/Lib/Techlevels.php:12
+msgid "2. Intermediate - somewhat comfortable"
+msgstr "2. Промежуточный - более удобный"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:322
-#: ../../Zotlabs/Module/Contactedit.php:632
-#: ../../Zotlabs/Module/Connedit.php:508
-msgid "Unblock"
-msgstr "Разблокировать"
+#: ../../Zotlabs/Lib/Techlevels.php:13
+msgid "3. Advanced - very comfortable"
+msgstr "3. Продвинутый - очень удобный"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:323
-msgid "Verified"
-msgstr "Подтверждён"
+#: ../../Zotlabs/Lib/Techlevels.php:14
+msgid "4. Expert - I can write computer code"
+msgstr "4. Эксперт - я умею программировать"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:324
-msgid "Not yet verified"
-msgstr "Ещё не проверено"
+#: ../../Zotlabs/Lib/Techlevels.php:15
+msgid "5. Wizard - I probably know more than you do"
+msgstr "5. Волшебник - возможно я знаю больше чем ты"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:329
-msgid "ID"
-msgstr ""
+#: ../../Zotlabs/Lib/Permcat.php:83
+msgctxt "permcat"
+msgid "Default"
+msgstr "По умолчанию"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:331
-msgid "All channels"
-msgstr "Все каналы"
+#: ../../Zotlabs/Lib/Libsync.php:805
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Невозможно проверить подпись сайта %s"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:332
-msgid "Register date"
-msgstr "Дата регистрации"
+#: ../../Zotlabs/Lib/Libzot.php:673
+msgid "Unable to verify channel signature"
+msgstr "Невозможно проверить подпись канала"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:333
-msgid "Last login"
-msgstr "Последний вход"
+#: ../../Zotlabs/Access/PermissionRoles.php:337
+msgid "Social Networking"
+msgstr "Социальная Сеть"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:334
-msgid "Expires"
-msgstr "Срок действия"
+#: ../../Zotlabs/Access/PermissionRoles.php:338
+msgid "Social - Federation"
+msgstr "Социальная - Федерация"
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:335
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Service class"
-msgstr "Класс обслуживания"
+#: ../../Zotlabs/Access/PermissionRoles.php:339
+msgid "Social - Mostly Public"
+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?"
-msgstr "Выбранные учётные записи будут удалены!\n\nВсё что было ими опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
+#: ../../Zotlabs/Access/PermissionRoles.php:340
+msgid "Social - Restricted"
+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?"
-msgstr "Этот аккаунт {0} будет удалён!\n\nВсё что им было опубликовано на этом сайте будет удалено навсегда!\n\nВы уверены?"
+#: ../../Zotlabs/Access/PermissionRoles.php:341
+msgid "Social - Private"
+msgstr "Социальная - Частный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:112
-msgid "Invalid input"
-msgstr "Неверный ввод"
+#: ../../Zotlabs/Access/PermissionRoles.php:344
+msgid "Community Forum"
+msgstr "Форум сообщества"
 
-#: ../../Zotlabs/Module/Admin/Site.php:132
-msgid "Errors"
-msgstr "Ошибки"
+#: ../../Zotlabs/Access/PermissionRoles.php:345
+msgid "Forum - Mostly Public"
+msgstr "Форум - В основном общественный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:225
-msgid "Site settings updated."
-msgstr "Настройки сайта обновлены."
+#: ../../Zotlabs/Access/PermissionRoles.php:346
+msgid "Forum - Restricted"
+msgstr "Форум - Ограниченный"
 
-#: ../../Zotlabs/Module/Admin/Site.php:262
-#: ../../Zotlabs/Module/Settings/Display.php:116
+#: ../../Zotlabs/Access/PermissionRoles.php:347
+msgid "Forum - Private"
+msgstr "Форум - Частный"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:350
+msgid "Feed Republish"
+msgstr "Публиковать ленты новостей"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:351
+msgid "Feed - Mostly Public"
+msgstr "Ленты новостей - В основном общественный"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:352
+msgid "Feed - Restricted"
+msgstr "Ленты новостей - Ограниченный"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:355
+msgid "Special Purpose"
+msgstr "Спец. назначение"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:356
+msgid "Special - Celebrity/Soapbox"
+msgstr "Спец. назначение - Знаменитость/Soapbox"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:357
+msgid "Special - Group Repository"
+msgstr "Спец. назначение - Групповой репозиторий"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:361
+msgid "Custom/Expert Mode"
+msgstr "Экспертный режим"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:385
+msgid "Personal"
+msgstr "Личное"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:386
+msgid "Community forum"
+msgstr "Форум сообщества"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:387
+msgid "Custom"
+msgstr "Собственные"
+
+#: ../../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"
+msgstr "Может загружать/изменять мои файлы и фотографии в хранилище"
+
+#: ../../Zotlabs/Access/Permissions.php:62
+msgid "Can view my channel webpages"
+msgstr "Может просматривать мои веб-страницы"
+
+#: ../../Zotlabs/Access/Permissions.php:63
+msgid "Can view my wiki pages"
+msgstr "Может просматривать мои вики-страницы"
+
+#: ../../Zotlabs/Access/Permissions.php:64
+msgid "Can create/edit my channel webpages"
+msgstr "Может редактировать мои веб-страницы"
+
+#: ../../Zotlabs/Access/Permissions.php:65
+msgid "Can write to my wiki pages"
+msgstr "Может редактировать мои вики-страницы"
+
+#: ../../Zotlabs/Access/Permissions.php:66
+msgid "Can post on my channel (wall) page"
+msgstr "Может публиковать на моей странице канала"
+
+#: ../../Zotlabs/Access/Permissions.php:67
+msgid "Can comment on or like my posts"
+msgstr "Может прокомментировать или отмечать как понравившиеся мои публикации"
+
+#: ../../Zotlabs/Access/Permissions.php:68
+msgid "Can send me direct messages"
+msgstr "Может отправлять мне сообщения"
+
+#: ../../Zotlabs/Access/Permissions.php:69
+msgid "Can like/dislike profiles and profile things"
+msgstr "Может комментировать или отмечать как нравится/ненравится мой профиль"
+
+#: ../../Zotlabs/Access/Permissions.php:70
+msgid "Can chat with me"
+msgstr "Может общаться со мной в чате"
+
+#: ../../Zotlabs/Access/Permissions.php:71
+msgid "Can source/mirror my public posts in derived channels"
+msgstr "Могу ли я создавать / зеркалировать мои общедоступные сообщения в производных каналах"
+
+#: ../../Zotlabs/Access/Permissions.php:73
+msgid "Can administer my channel"
+msgstr "Может администрировать мой канал"
+
+#: ../../Zotlabs/Widget/Cdav.php:41
+msgid "Select Channel"
+msgstr "Выбрать канал"
+
+#: ../../Zotlabs/Widget/Cdav.php:46
+msgid "Read-write"
+msgstr "Чтение-запись"
+
+#: ../../Zotlabs/Widget/Cdav.php:47
+msgid "Read-only"
+msgstr "Только чтение"
+
+#: ../../Zotlabs/Widget/Cdav.php:131
+msgid "Channel Calendar"
+msgstr "Календарь канала"
+
+#: ../../Zotlabs/Widget/Cdav.php:135
+msgid "Shared CalDAV Calendars"
+msgstr "Общие календари CalDAV"
+
+#: ../../Zotlabs/Widget/Cdav.php:139
+msgid "Share this calendar"
+msgstr "Поделиться этим календарём"
+
+#: ../../Zotlabs/Widget/Cdav.php:141
+msgid "Calendar name and color"
+msgstr "Имя и цвет календаря"
+
+#: ../../Zotlabs/Widget/Cdav.php:143
+msgid "Create new CalDAV calendar"
+msgstr "Создать новый календарь CalDAV"
+
+#: ../../Zotlabs/Widget/Cdav.php:145
+msgid "Calendar Name"
+msgstr "Имя календаря"
+
+#: ../../Zotlabs/Widget/Cdav.php:146
+msgid "Calendar Tools"
+msgstr "Инструменты календаря"
+
+#: ../../Zotlabs/Widget/Cdav.php:148
+msgid "Import calendar"
+msgstr "Импортировать календарь"
+
+#: ../../Zotlabs/Widget/Cdav.php:149
+msgid "Select a calendar to import to"
+msgstr "Выбрать календарь для импорта в"
+
+#: ../../Zotlabs/Widget/Cdav.php:176
+msgid "Addressbooks"
+msgstr "Адресные книги"
+
+#: ../../Zotlabs/Widget/Cdav.php:178
+msgid "Addressbook name"
+msgstr "Имя адресной книги"
+
+#: ../../Zotlabs/Widget/Cdav.php:180
+msgid "Create new addressbook"
+msgstr "Создать новую адресную книгу"
+
+#: ../../Zotlabs/Widget/Cdav.php:181
+msgid "Addressbook Name"
+msgstr "Имя адресной книги"
+
+#: ../../Zotlabs/Widget/Cdav.php:183
+msgid "Addressbook Tools"
+msgstr "Инструменты адресной книги"
+
+#: ../../Zotlabs/Widget/Cdav.php:184
+msgid "Import addressbook"
+msgstr "Импортировать адресную книгу"
+
+#: ../../Zotlabs/Widget/Cdav.php:185
+msgid "Select an addressbook to import to"
+msgstr "Выбрать адресную книгу для импорта в"
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:26
+msgid "Overview"
+msgstr "Обзор"
+
+#: ../../Zotlabs/Widget/Archive.php:49
+msgid "Archives"
+msgstr "Архивы"
+
+#: ../../Zotlabs/Widget/Suggestions.php:58
+msgid "Suggestions"
+msgstr "Рекомендации"
+
+#: ../../Zotlabs/Widget/Suggestions.php:59
+msgid "See more..."
+msgstr "Просмотреть больше..."
+
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:25
+msgid "Bookmarked Chatrooms"
+msgstr "Закладки чатов"
+
+#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Widget/Admin.php:65
+msgid "Member registrations waiting for confirmation"
+msgstr "Регистрации участников, ожидающие подверждения"
+
+#: ../../Zotlabs/Widget/Admin.php:34
+msgid "Inspect queue"
+msgstr "Просмотр очереди"
+
+#: ../../Zotlabs/Widget/Admin.php:36
+msgid "DB updates"
+msgstr "Обновление базы данных"
+
+#: ../../Zotlabs/Widget/Admin.php:60 ../../include/nav.php:197
+msgid "Admin"
+msgstr "Администрирование"
+
+#: ../../Zotlabs/Widget/Admin.php:61
+msgid "Addon Features"
+msgstr "Настройки расширений"
+
+#: ../../Zotlabs/Widget/Suggestedchats.php:36
+msgid "Suggested Chatrooms"
+msgstr "Рекомендуемые чаты"
+
+#: ../../Zotlabs/Widget/Hq_controls.php:24
+msgid "Toggle post editor"
+msgstr "Переключить редактор сообщений"
+
+#: ../../Zotlabs/Widget/Hq_controls.php:35
+msgid "Toggle personal notes"
+msgstr "Переключить личные заметки"
+
+#: ../../Zotlabs/Widget/Affinity.php:60
+msgid "Refresh"
+msgstr "Обновить"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:44
+#: ../../Zotlabs/Widget/Notifications.php:61
+msgid "Direct Messages"
+msgstr "Личные сообщения"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:48
+msgid "Show direct (private) messages"
+msgstr "Показать личные (прямые) сообщения"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:53
+#: ../../Zotlabs/Widget/Notifications.php:80
+msgid "Events"
+msgstr "События"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:57
+msgid "Show posts that include events"
+msgstr "Показывать публикации с событиями"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:63
+msgid "Polls"
+msgstr "Опросы"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:67
+msgid "Show posts that include polls"
+msgstr "Показывать публикации с опросами"
+
+#: ../../Zotlabs/Widget/Activity_filter.php:90
 #, php-format
-msgid "%s - (Incompatible)"
-msgstr "%s - (несовместимо)"
+msgid "Show posts related to the %s privacy group"
+msgstr "Показывать публикации относящиеся к группе конфиденциальности %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:269
-msgid "mobile"
-msgstr "мобильный"
+#: ../../Zotlabs/Widget/Activity_filter.php:99
+msgid "Show my privacy groups"
+msgstr "Показывать мои группы конфиденциальности"
 
-#: ../../Zotlabs/Module/Admin/Site.php:271
-msgid "experimental"
-msgstr "экспериментальный"
+#: ../../Zotlabs/Widget/Activity_filter.php:123
+msgid "Show posts to this forum"
+msgstr "Показывать публикации этого форума"
 
-#: ../../Zotlabs/Module/Admin/Site.php:273
-msgid "unsupported"
-msgstr "неподдерживаемый"
+#: ../../Zotlabs/Widget/Activity_filter.php:130
+#: ../../Zotlabs/Widget/Notifications.php:130
+#: ../../Zotlabs/Widget/Notifications.php:131
+#: ../../Zotlabs/Widget/Forums.php:77 ../../include/acl_selectors.php:125
+msgid "Forums"
+msgstr "Форумы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:320
-msgid "Yes - with approval"
-msgstr "Да - требует подтверждения"
+#: ../../Zotlabs/Widget/Activity_filter.php:134
+msgid "Show forums"
+msgstr "Показывать форумы"
 
-#: ../../Zotlabs/Module/Admin/Site.php:328
-msgid "My site is not a public server"
-msgstr "Мой сайт не является публичным сервером"
+#: ../../Zotlabs/Widget/Activity_filter.php:148
+msgid "Starred Posts"
+msgstr "Отмеченные публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:329
-msgid "My site has paid access only"
-msgstr "Мой сайт доступен только с оплатой "
+#: ../../Zotlabs/Widget/Activity_filter.php:152
+msgid "Show posts that I have starred"
+msgstr "Показывать публикации которые я отметил"
 
-#: ../../Zotlabs/Module/Admin/Site.php:330
-msgid "My site has free access only"
-msgstr "На моём сайте разрешён свободный доступ"
+#: ../../Zotlabs/Widget/Activity_filter.php:163
+msgid "Personal Posts"
+msgstr "Свои публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:331
-msgid "My site offers free accounts with optional paid upgrades"
-msgstr "На моём сайте разрешены бесплатные аккаунты с дополнительными платными услугами"
+#: ../../Zotlabs/Widget/Activity_filter.php:167
+msgid "Show posts that mention or involve me"
+msgstr "Показывать публикации где вы были упомянуты или привлечены"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid "Default permission role for new accounts"
-msgstr "Разрешения по умолчанию для новых аккаунтов"
+#: ../../Zotlabs/Widget/Activity_filter.php:190
+#, php-format
+msgid "Show posts that I have filed to %s"
+msgstr "Показывать публикации которые я добавил в %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:345
-msgid ""
-"This role will be used for the first channel created after registration."
-msgstr "Эта роль будет использоваться для первого канала, созданного после регистрации."
+#: ../../Zotlabs/Widget/Activity_filter.php:196
+#: ../../Zotlabs/Widget/Filer.php:33 ../../include/features.php:318
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Сохранённые каталоги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:397
-msgid "Minute(s)"
-msgstr "Минут"
+#: ../../Zotlabs/Widget/Activity_filter.php:200
+msgid "Show filed post categories"
+msgstr "Показывать категории добавленных публикаций"
 
-#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:398
-msgid "Hour(s)"
-msgstr "Часов"
+#: ../../Zotlabs/Widget/Activity_filter.php:214
+msgid "Panel search"
+msgstr "Панель поиска"
 
-#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:399
-msgid "Day(s)"
-msgstr "Дней"
+#: ../../Zotlabs/Widget/Activity_filter.php:224
+msgid "Filter by name"
+msgstr "Отфильтровать по имени"
 
-#: ../../Zotlabs/Module/Admin/Site.php:356
-msgid "Week(s)"
-msgstr "Недель"
+#: ../../Zotlabs/Widget/Activity_filter.php:239
+msgid "Remove active filter"
+msgstr "Удалить активный фильтр"
 
-#: ../../Zotlabs/Module/Admin/Site.php:357
-msgid "Month(s)"
-msgstr "Месяцев"
+#: ../../Zotlabs/Widget/Activity_filter.php:255
+msgid "Stream Filters"
+msgstr "Фильтры потока"
 
-#: ../../Zotlabs/Module/Admin/Site.php:358
-msgid "Year(s)"
-msgstr "Лет"
+#: ../../Zotlabs/Widget/Privacygroups.php:45
+msgid "Add new group"
+msgstr "Добавить новую группу"
 
-#: ../../Zotlabs/Module/Admin/Site.php:366
-msgid "Register verification delay"
-msgstr "Задержка проверки регистрации"
+#: ../../Zotlabs/Widget/Appstore.php:16
+msgid "App Collections"
+msgstr "Коллекции приложений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:369
-msgid "Time to wait before a registration can be verified"
-msgstr "Время ожидания до того, как регистрация может быть проверена"
+#: ../../Zotlabs/Widget/Appstore.php:18
+msgid "Installed apps"
+msgstr "Установленные приложения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:372
-#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:408
-msgid "duration up from now"
-msgstr "продолжительность с настоящего момента"
+#: ../../Zotlabs/Widget/Notifications.php:23
+msgid "New network activity notifications"
+msgstr "Уведомления о новой сетевой активности "
 
-#: ../../Zotlabs/Module/Admin/Site.php:388
-msgid "Register verification expiration time"
-msgstr "Время истечения срока проверки регистрации"
+#: ../../Zotlabs/Widget/Notifications.php:26
+msgid "Network stream"
+msgstr "Сетевой поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:391
-msgid "Time before an unverified registration will expire"
-msgstr "Время до истечения срока непроверенной регистрации "
+#: ../../Zotlabs/Widget/Notifications.php:29
+#: ../../Zotlabs/Widget/Notifications.php:68
+msgid "Mark all notifications read"
+msgstr "Пометить уведомления как прочитанные"
 
-#: ../../Zotlabs/Module/Admin/Site.php:414
-msgid "File upload"
-msgstr "Загрузка файла"
+#: ../../Zotlabs/Widget/Notifications.php:32
+#: ../../Zotlabs/Widget/Notifications.php:52
+#: ../../Zotlabs/Widget/Notifications.php:71
+#: ../../Zotlabs/Widget/Notifications.php:163
+msgid "Show new posts only"
+msgstr "Показывать только новые публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:415
-msgid "Policies"
-msgstr "Правила"
+#: ../../Zotlabs/Widget/Notifications.php:33
+#: ../../Zotlabs/Widget/Notifications.php:53
+#: ../../Zotlabs/Widget/Notifications.php:72
+#: ../../Zotlabs/Widget/Notifications.php:133
+#: ../../Zotlabs/Widget/Notifications.php:164
+msgid "Filter by name or address"
+msgstr "Фильтровать по имени или адресу"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Banner/Logo"
-msgstr "Баннер / логотип"
+#: ../../Zotlabs/Widget/Notifications.php:43
+msgid "New home activity notifications"
+msgstr "Уведомления о взаимодействии с вами"
 
-#: ../../Zotlabs/Module/Admin/Site.php:422
-msgid "Unfiltered HTML/CSS/JS is allowed"
-msgstr "Разрешён нефильтруемый HTML/CSS/JS"
+#: ../../Zotlabs/Widget/Notifications.php:46
+msgid "Home stream"
+msgstr "Ваш поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid "Administrator Information"
-msgstr "Информация об администраторе"
+#: ../../Zotlabs/Widget/Notifications.php:49
+#: ../../Zotlabs/Widget/Notifications.php:160
+msgid "Mark all notifications seen"
+msgstr "Пометить уведомления как просмотренные"
 
-#: ../../Zotlabs/Module/Admin/Site.php:423
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr "Контактная информация для администраторов сайта. Показывается на информационной странице сайта. Можно использовать BBCode."
+#: ../../Zotlabs/Widget/Notifications.php:62
+msgid "New direct messages notifications"
+msgstr "Уведомления о новых сообщениях"
 
-#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24
-msgid "Site Information"
-msgstr "Информация о сайте"
+#: ../../Zotlabs/Widget/Notifications.php:65
+msgid "Direct messages stream"
+msgstr "Поток сообщений"
 
-#: ../../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/Widget/Notifications.php:81
+msgid "New events notifications"
+msgstr "Уведомления о новых событиях"
 
-#: ../../Zotlabs/Module/Admin/Site.php:425
-msgid "System language"
-msgstr "Язык системы"
+#: ../../Zotlabs/Widget/Notifications.php:84
+msgid "View events"
+msgstr "Просмотреть события"
 
-#: ../../Zotlabs/Module/Admin/Site.php:426
-msgid "System theme"
-msgstr "Системная тема"
+#: ../../Zotlabs/Widget/Notifications.php:87
+msgid "Mark all events seen"
+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/Widget/Notifications.php:96
+msgid "New connections notifications"
+msgstr "Уведомления о новых контактах"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "Allow Feeds as Connections"
-msgstr "Разрешить ленты новостей как контакты"
+#: ../../Zotlabs/Widget/Notifications.php:99
+msgid "View all connections"
+msgstr "Просмотр всех контактов"
 
-#: ../../Zotlabs/Module/Admin/Site.php:429
-msgid "(Heavy system resource usage)"
-msgstr "(Высокое использование системных ресурсов)"
+#: ../../Zotlabs/Widget/Notifications.php:108
+msgid "New files notifications"
+msgstr "Уведомления о новых файлах"
 
-#: ../../Zotlabs/Module/Admin/Site.php:430
-msgid "Maximum image size"
-msgstr "Максимальный размер изображения"
+#: ../../Zotlabs/Widget/Notifications.php:115
+#: ../../Zotlabs/Widget/Notifications.php:116
+#: ../../Zotlabs/Widget/Messages.php:35
+msgid "Notices"
+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/Widget/Notifications.php:119
+msgid "View all notices"
+msgstr "Просмотреть все оповещения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age"
-msgstr "Минимальный возраст"
+#: ../../Zotlabs/Widget/Notifications.php:122
+msgid "Mark all notices seen"
+msgstr "Пометить все оповещения как просмотренные"
 
-#: ../../Zotlabs/Module/Admin/Site.php:431
-msgid "Minimum age (in years) for who may register on this site."
-msgstr "Минимальный возраст (в годах) для регистрации на этом сайте."
+#: ../../Zotlabs/Widget/Notifications.php:143
+msgid "Registrations"
+msgstr "Регистрации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "Which best describes the types of account offered by this hub?"
-msgstr "Как лучше описать тип учётных записей предлагаемых на этом хабе?"
+#: ../../Zotlabs/Widget/Notifications.php:144
+msgid "New registrations notifications"
+msgstr "Уведомления о новых регистрациях"
 
-#: ../../Zotlabs/Module/Admin/Site.php:432
-msgid "This is displayed on the public server site list."
-msgstr "Это отображается в списке общедоступных серверов."
+#: ../../Zotlabs/Widget/Notifications.php:154
+msgid "New public stream notifications"
+msgstr "Уведомления о новом в публичном потоке"
 
-#: ../../Zotlabs/Module/Admin/Site.php:438
-msgid "Register text"
-msgstr "Текст регистрации"
+#: ../../Zotlabs/Widget/Notifications.php:157
+msgid "Public stream"
+msgstr "Публичный поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:440
-msgid "This text will be displayed prominently at the registration page"
-msgstr "Этот текст будет отображаться на видном месте на странице регистрации"
+#: ../../Zotlabs/Widget/Notifications.php:171
+msgid "Sorry, you have got no notifications at the moment"
+msgstr "Извините, но сейчас у вас нет уведомлений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:444
-msgid "Does this site allow new member registration?"
-msgstr "Разрешается ли регистрация новых пользователей на этом сайте?"
+#: ../../Zotlabs/Widget/Filer.php:36 ../../Zotlabs/Widget/Appcategories.php:52
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:118
+#: ../../include/contact_widgets.php:152
+#: ../../extend/addon/hzaddons/articles/Widget/Articles_categories.php:75
+#: ../../extend/addon/hzaddons/cards/Widget/Cards_categories.php:75
+msgid "Everything"
+msgstr "Всё"
 
-#: ../../Zotlabs/Module/Admin/Site.php:451
-msgid "Configure the registration open days/hours"
-msgstr "Настройте рабочие дни / часы регистрации"
+#: ../../Zotlabs/Widget/Photo.php:54 ../../Zotlabs/Widget/Photo_rand.php:63
+msgid "photo/image"
+msgstr "фотография / изображение"
 
-#: ../../Zotlabs/Module/Admin/Site.php:453
-msgid "Empty or '-:-' value will keep registration open 24/7 (default)"
-msgstr "Пустое значение или '-:-' даст возможность регистрироваться 24/7 (по умолчанию) "
+#: ../../Zotlabs/Widget/Chatroom_members.php:17
+msgid "Chat Members"
+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/Widget/Newmember.php:36
+msgid "Profile Creation"
+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/Widget/Newmember.php:38
+msgid "Upload profile photo"
+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/Widget/Newmember.php:39
+msgid "Upload cover photo"
+msgstr "Загрузить фотографию обложки"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-msgid "Advanced examples:"
-msgstr "Дополнительные примеры:"
+#: ../../Zotlabs/Widget/Newmember.php:40 ../../include/nav.php:116
+msgid "Edit your profile"
+msgstr "Редактировать профиль"
 
-#: ../../Zotlabs/Module/Admin/Site.php:457
-#: ../../Zotlabs/Module/Settings/Channel.php:178
-msgid "or"
-msgstr "или"
+#: ../../Zotlabs/Widget/Newmember.php:43
+msgid "Find and Connect with others"
+msgstr "Найти и вступить в контакт"
 
-#: ../../Zotlabs/Module/Admin/Site.php:458
-msgid "Check your configuration"
-msgstr "Проверьте ваши настройки"
+#: ../../Zotlabs/Widget/Newmember.php:45
+msgid "View the directory"
+msgstr "Просмотреть каталог"
 
-#: ../../Zotlabs/Module/Admin/Site.php:462
-msgid "Max account registrations per day"
-msgstr "Максимальное количество регистраций в день"
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "Manage your connections"
+msgstr "Управление вашими контактами"
 
-#: ../../Zotlabs/Module/Admin/Site.php:464
-msgid "Unlimited if zero or no value - default 50"
-msgstr "Без ограничений если значение не предоставлено или равно 0 (по умолчанию 50)"
+#: ../../Zotlabs/Widget/Newmember.php:50
+msgid "Communicate"
+msgstr "Связаться"
 
-#: ../../Zotlabs/Module/Admin/Site.php:468
-msgid "Max account registrations from same IP"
-msgstr "Максимальное количество регистраций с одного IP-адреса"
+#: ../../Zotlabs/Widget/Newmember.php:52
+msgid "View your channel homepage"
+msgstr "Домашняя страница канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:470
-msgid "Unlimited if zero or no value - default 3"
-msgstr "Без ограничений если значение не предоставлено или равно 0 (по умолчанию 3)"
+#: ../../Zotlabs/Widget/Newmember.php:53
+msgid "View your network stream"
+msgstr "Просмотреть ваш сетевой поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:476
-msgid "Auto channel create"
-msgstr "Автоматическое создание канала"
+#: ../../Zotlabs/Widget/Newmember.php:59
+msgid "Documentation"
+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/Widget/Newmember.php:62
+msgid "Missing Features?"
+msgstr "Отсутствует функция?"
 
-#: ../../Zotlabs/Module/Admin/Site.php:482
-msgid "Require invite code"
-msgstr "Требуется код приглашения"
+#: ../../Zotlabs/Widget/Newmember.php:64
+msgid "Pin apps to navigation bar"
+msgstr "Прикрепить приложение к панели"
 
-#: ../../Zotlabs/Module/Admin/Site.php:487
-msgid "Allow invite code"
-msgstr "Разрешить использовать код приглашения"
+#: ../../Zotlabs/Widget/Newmember.php:65
+msgid "Install more apps"
+msgstr "Установить больше приложений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:492
-msgid "Require email address"
-msgstr "Требуется адрес электронной почты"
+#: ../../Zotlabs/Widget/Newmember.php:76
+msgid "View public stream"
+msgstr "Просмотреть публичный поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:494
-msgid "The provided email address will be verified (recommended)"
-msgstr "Предоставленный адрес электронной почты должен быт подтверждён (рекомендуется)"
+#: ../../Zotlabs/Widget/Activity_order.php:96
+msgid "Commented Date"
+msgstr "По комментариям"
 
-#: ../../Zotlabs/Module/Admin/Site.php:498
-msgid "Abandon account after x days"
-msgstr "Учётная запись считается заброшенной после X дней"
+#: ../../Zotlabs/Widget/Activity_order.php:100
+msgid "Order by last commented date"
+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/Widget/Activity_order.php:103
+msgid "Posted Date"
+msgstr "По публикациям"
 
-#: ../../Zotlabs/Module/Admin/Site.php:505
-msgid "Site homepage to show visitors (default: login box)"
-msgstr "Домашняя страница, которая будет показываться посетителям сайт (по умочанию - форма входа)."
+#: ../../Zotlabs/Widget/Activity_order.php:107
+msgid "Order by last posted date"
+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/Widget/Activity_order.php:110
+msgid "Date Unthreaded"
+msgstr "По порядку"
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid "Preserve site homepage URL"
-msgstr "Сохранить URL главной страницы сайта"
+#: ../../Zotlabs/Widget/Activity_order.php:114
+msgid "Order unthreaded by date"
+msgstr "Сортировка в порядке поступления"
 
-#: ../../Zotlabs/Module/Admin/Site.php:506
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
-msgstr "Показывать домашнюю страницу сайта во фрейме вместо стандартной переадресации"
+#: ../../Zotlabs/Widget/Activity_order.php:129
+msgid "Stream Order"
+msgstr "Упорядочить поток"
 
-#: ../../Zotlabs/Module/Admin/Site.php:507
-msgid "Allowed friend domains"
-msgstr "Разрешенные домены друзей"
+#: ../../Zotlabs/Widget/Savedsearch.php:81
+msgid "Remove term"
+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/Savedsearch.php:89 ../../include/features.php:310
+msgid "Saved Searches"
+msgstr "Сохранённые поиски"
 
-#: ../../Zotlabs/Module/Admin/Site.php:508
-msgid "Force publish"
-msgstr "Принудительно публиковать"
+#: ../../Zotlabs/Widget/Savedsearch.php:90 ../../include/group.php:332
+msgid "add"
+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/Messages.php:32
+msgid "Public and restricted messages"
+msgstr "Общедоступные и частные публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:509
-msgid "Import Public Streams"
-msgstr "Импортированные публичные потоки"
+#: ../../Zotlabs/Widget/Messages.php:33
+msgid "Direct messages"
+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/Messages.php:34
+msgid "Starred messages"
+msgstr "Отмеченные публикации"
 
-#: ../../Zotlabs/Module/Admin/Site.php:510
-msgid "Site only Public Streams"
-msgstr "Публичные потоки только с сайта"
+#: ../../Zotlabs/Widget/Messages.php:37
+msgid "No messages"
+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/Notes.php:39
+msgid "Read mode"
+msgstr "Читать дальше"
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid "Allow anybody on the internet to access the Public streams"
-msgstr "Разрешить всем доступ к публичным потокам"
+#: ../../Zotlabs/Widget/Notes.php:40
+msgid "Edit mode"
+msgstr "Режим редактирования"
 
-#: ../../Zotlabs/Module/Admin/Site.php:511
-msgid ""
-"Disable to require authentication before viewing. Warning: this content is "
-"unmoderated."
-msgstr "Отключите если для просмотра требуется аутентификация. Внимание - этот контент не может модерироваться."
+#: ../../Zotlabs/Widget/Notes.php:41
+msgid "Editing"
+msgstr "Редактируем"
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-msgid "Only import Public stream posts with this text"
-msgstr "Импортировать только публичные потоки с этим текстом"
+#: ../../Zotlabs/Widget/Notes.php:42
+msgid "Saving"
+msgstr "Сохраняем"
 
-#: ../../Zotlabs/Module/Admin/Site.php:512
-#: ../../Zotlabs/Module/Admin/Site.php:513
-#: ../../Zotlabs/Module/Contactedit.php:423
-#: ../../Zotlabs/Module/Contactedit.php:424
-#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Module/Connedit.php:707
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr "слова по одному в строку, #тег,  /шаблон/ или lang=xxl; оставьте пустым для импорта всех публикаций"
+#: ../../Zotlabs/Widget/Notes.php:43
+msgid "Saved"
+msgstr "Сохранено"
 
-#: ../../Zotlabs/Module/Admin/Site.php:513
-msgid "Do not import Public stream posts with this text"
-msgstr "Не импортировать публичные потоки с этим текстом"
+#: ../../Zotlabs/Widget/Tokens.php:41
+msgid "Add new guest"
+msgstr "Добавить нового гостя"
 
-#: ../../Zotlabs/Module/Admin/Site.php:516
-msgid "Login on Homepage"
-msgstr "Вход на домашней странице"
+#: ../../Zotlabs/Widget/Permcats.php:42
+msgid "Add new role"
+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/Permcats.php:94
+msgid "Role members"
+msgstr "Обладатели роли"
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid "Enable context help"
-msgstr "Включить контекстную помощь"
+#: ../../Zotlabs/Widget/Rating.php:57
+msgid "Rating Tools"
+msgstr "Инструменты оценки"
 
-#: ../../Zotlabs/Module/Admin/Site.php:517
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
-msgstr "Показывать контекстную помощь для текущей странице при нажатии на кнопку \"Помощь\"."
+#: ../../Zotlabs/Widget/Rating.php:61 ../../Zotlabs/Widget/Rating.php:63
+msgid "Rate Me"
+msgstr "Оценить меня"
 
-#: ../../Zotlabs/Module/Admin/Site.php:519
-msgid "Reply-to email address for system generated email."
-msgstr "Адрес email Reply-to для генерируемых системой сообщений."
+#: ../../Zotlabs/Widget/Rating.php:66
+msgid "View Ratings"
+msgstr "Просмотр оценок"
 
-#: ../../Zotlabs/Module/Admin/Site.php:520
-msgid "Sender (From) email address for system generated email."
-msgstr "Адрес email отправителя (From) для генерируемых системой сообщений."
+#: ../../Zotlabs/Widget/Tagcloud.php:27 ../../include/taxonomy.php:323
+#: ../../include/taxonomy.php:460 ../../include/taxonomy.php:481
+msgid "Tags"
+msgstr "Теги"
 
-#: ../../Zotlabs/Module/Admin/Site.php:521
-msgid "Name of email sender for system generated email."
-msgstr "Имя отправителя для генерируемых системой сообщений."
+#: ../../Zotlabs/Widget/Activity.php:55
+msgctxt "widget"
+msgid "Activity"
+msgstr "Активность"
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Directory Server URL"
-msgstr "URL сервера каталогов"
+#: ../../Zotlabs/Widget/Appcategories.php:49
+msgid "App Categories"
+msgstr "Категории приложений"
 
-#: ../../Zotlabs/Module/Admin/Site.php:523
-msgid "Default directory server"
-msgstr "Сервер каталогов по умолчанию"
+#: ../../Zotlabs/Widget/Follow.php:34
+msgid "Add New Connection"
+msgstr "Добавить новый контакт"
 
-#: ../../Zotlabs/Module/Admin/Site.php:525
-msgid "Enable SSE Notifications"
-msgstr "Включить уведомления SSE"
+#: ../../Zotlabs/Widget/Follow.php:35
+msgid "Enter channel address"
+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/Follow.php:36
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Пример: ivan@example.com, http://example.com/ivan"
 
-#: ../../Zotlabs/Module/Admin/Site.php:527
-msgid "Proxy user"
-msgstr "Имя пользователя proxy-сервера"
+#: ../../Zotlabs/Widget/Cover_photo.php:71
+msgid "Click to show more"
+msgstr "Нажмите чтобы показать больше"
 
-#: ../../Zotlabs/Module/Admin/Site.php:528
-msgid "Proxy URL"
-msgstr "URL proxy-сервера"
+#: ../../Zotlabs/Widget/Tasklist.php:31
+msgid "Tasks"
+msgstr "Задачи"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Network timeout"
-msgstr "Время ожидания сети"
+#: ../../Zotlabs/Widget/Pinned.php:125 ../../Zotlabs/Widget/Pinned.php:126
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Просмотр профиля %s - %s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:529
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Значение в секундах. Если установлен в 0 - без ограничений (не рекомендуется)."
+#: ../../Zotlabs/Widget/Pinned.php:159
+msgid "Don't show"
+msgstr "Не показывать"
 
-#: ../../Zotlabs/Module/Admin/Site.php:530
-msgid "Delivery interval"
-msgstr "Интервал доставки"
+#: ../../Zotlabs/Widget/Settings_menu.php:37
+msgid "Account settings"
+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/Settings_menu.php:43
+msgid "Channel settings"
+msgstr "Настройки канала"
 
-#: ../../Zotlabs/Module/Admin/Site.php:531
-msgid "Deliveries per process"
-msgstr "Доставок на процесс"
+#: ../../Zotlabs/Widget/Settings_menu.php:49
+msgid "Privacy settings"
+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/Settings_menu.php:56
+msgid "Display settings"
+msgstr "Настройки отображения"
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid "Queue Threshold"
-msgstr "Порог очереди"
+#: ../../Zotlabs/Widget/Settings_menu.php:63
+msgid "Manage locations"
+msgstr "Управление местоположением"
 
-#: ../../Zotlabs/Module/Admin/Site.php:532
-msgid ""
-"Always defer immediate delivery if queue contains more than this number of "
-"entries."
-msgstr "Всегда откладывать немедленную доставку, если в очереди содержится большее количество записей, чем это."
+#: ../../include/event.php:33 ../../include/event.php:128
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:533
-msgid "Poll interval"
-msgstr "Интервал опроса"
+#: ../../include/event.php:41
+msgid "Starts:"
+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 - использовать интервал доставки."
+#: ../../include/event.php:51
+msgid "Finishes:"
+msgstr "Окончание:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:534
-msgid "Path to ImageMagick convert program"
-msgstr "Путь к ImageMagick"
+#: ../../include/event.php:128
+msgid "l F d, Y"
+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"
+#: ../../include/event.php:132
+msgid "Start:"
+msgstr "Начало:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid "Maximum Load Average"
-msgstr "Максимальная средняя нагрузка"
+#: ../../include/event.php:136
+msgid "End:"
+msgstr "Окончание:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:535
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Максимальная нагрузка системы для откладывания процессов опроса и доставки - по умолчанию 50."
+#: ../../include/event.php:141
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:67
+msgid "Timezone"
+msgstr "Часовой пояс"
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "Expiration period in days for imported (grid/network) content"
-msgstr "Срок хранения в днях для импортированного содержимого (из матрицы / сети)."
+#: ../../include/event.php:1193
+msgid "This event has been added to your calendar."
+msgstr "Это событие было добавлено в ваш календарь."
 
-#: ../../Zotlabs/Module/Admin/Site.php:536
-msgid "0 for no expiration of imported content"
-msgstr "0 для постоянного хранения импортированного содержимого"
+#: ../../include/event.php:1426
+msgid "Not specified"
+msgstr "Не указано"
 
-#: ../../Zotlabs/Module/Admin/Site.php:537
-msgid ""
-"Do not expire any posts which have comments less than this many days ago"
-msgstr "Продлевать строк хранения для любых публикаций, которые имеют комментарии возрастом менее этого значения"
+#: ../../include/event.php:1427
+msgid "Needs Action"
+msgstr "Требует действия"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
-msgid ""
-"Public servers: Optional landing (marketing) webpage for new registrants"
-msgstr "Публичные серверы: необязательная маркетинговая лэндинг-страница для новых пользователей"
+#: ../../include/event.php:1428
+msgid "Completed"
+msgstr "Завершено"
 
-#: ../../Zotlabs/Module/Admin/Site.php:538
+#: ../../include/event.php:1429
+msgid "In Process"
+msgstr "В процессе"
+
+#: ../../include/event.php:1430
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: ../../include/event.php:1513 ../../include/connections.php:754
+msgid "Home, Voice"
+msgstr "Дом, голос"
+
+#: ../../include/event.php:1514 ../../include/connections.php:755
+msgid "Home, Fax"
+msgstr "Дом, факс"
+
+#: ../../include/event.php:1516 ../../include/connections.php:757
+msgid "Work, Voice"
+msgstr "Работа, голос"
+
+#: ../../include/event.php:1517 ../../include/connections.php:758
+msgid "Work, Fax"
+msgstr "Работа, факс"
+
+#: ../../include/channel.php:48
+msgid "Unable to obtain identity information from database"
+msgstr "Невозможно получить идентификационную информацию из базы данных"
+
+#: ../../include/channel.php:81
+msgid "Empty name"
+msgstr "Пустое имя"
+
+#: ../../include/channel.php:84
+msgid "Name too long"
+msgstr "Слишком длинное имя"
+
+#: ../../include/channel.php:201
+msgid "No account identifier"
+msgstr "Идентификатор аккаунта отсутствует"
+
+#: ../../include/channel.php:292
+msgid "Unable to retrieve created identity"
+msgstr "Не удается получить созданный идентификатор"
+
+#: ../../include/channel.php:402
+msgid "Default Profile"
+msgstr "Профиль по умолчанию"
+
+#: ../../include/channel.php:592 ../../include/channel.php:681
+msgid "Unable to retrieve modified identity"
+msgstr "Не удается найти изменённый идентификатор"
+
+#: ../../include/channel.php:1373
+msgid "Requested channel is not available"
+msgstr "Запрошенный канал недоступен"
+
+#: ../../include/channel.php:1531
+msgid "Create New Profile"
+msgstr "Создать новый профиль"
+
+#: ../../include/channel.php:1534 ../../include/nav.php:116
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:59
+msgid "Edit Profile"
+msgstr "Редактировать профиль"
+
+#: ../../include/channel.php:1552
+msgid "Visible to everybody"
+msgstr "Видно всем"
+
+#: ../../include/channel.php:1629 ../../include/channel.php:1758
+msgid "Gender:"
+msgstr "Пол:"
+
+#: ../../include/channel.php:1630 ../../include/channel.php:1802
+msgid "Status:"
+msgstr "Статус:"
+
+#: ../../include/channel.php:1631 ../../include/channel.php:1826
+msgid "Homepage:"
+msgstr "Домашняя страница:"
+
+#: ../../include/channel.php:1633
+msgid "Online Now"
+msgstr "Сейчас в сети"
+
+#: ../../include/channel.php:1686
+msgid "Change your profile photo"
+msgstr "Изменить фотографию вашего профиля"
+
+#: ../../include/channel.php:1713 ../../include/selectors.php:64
+#: ../../include/selectors.php:81
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:87
+msgid "Female"
+msgstr "Женщина"
+
+#: ../../include/channel.php:1715 ../../include/selectors.php:64
+#: ../../include/selectors.php:81
+#: ../../extend/addon/hzaddons/openid/Mod_Id.php:85
+msgid "Male"
+msgstr "Мужчина"
+
+#: ../../include/channel.php:1717
+msgid "Trans"
+msgstr "Трансексуал"
+
+#: ../../include/channel.php:1719 ../../include/selectors.php:64
+msgid "Neuter"
+msgstr "Среднего рода"
+
+#: ../../include/channel.php:1721 ../../include/selectors.php:64
+msgid "Non-specific"
+msgstr "Неспецифический"
+
+#: ../../include/channel.php:1756
+msgid "Full Name:"
+msgstr "Полное имя:"
+
+#: ../../include/channel.php:1763
+msgid "Like this channel"
+msgstr "нравится этот канал"
+
+#: ../../include/channel.php:1787
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1788
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1795
+msgid "Birthday:"
+msgstr "День рождения:"
+
+#: ../../include/channel.php:1808
 #, php-format
-msgid "Create this page first. Default is %s/register"
-msgstr "Создать эту страницу первой. По умолчанию %s/register"
+msgid "for %1$d %2$s"
+msgstr "для %1$d %2$s"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Page to display after creating a new channel"
-msgstr "Страница для показа после создания нового канала"
+#: ../../include/channel.php:1820
+msgid "Tags:"
+msgstr "Теги:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:539
-msgid "Default: profiles"
-msgstr "По умолчанию: profiles"
+#: ../../include/channel.php:1824
+msgid "Sexual Preference:"
+msgstr "Сексуальные предпочтения:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Optional: site location"
-msgstr "Необязательно: место размещения сайта"
+#: ../../include/channel.php:1830
+msgid "Political Views:"
+msgstr "Политические взгляды:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:540
-msgid "Region or country"
-msgstr "Регион или страна"
+#: ../../include/channel.php:1832
+msgid "Religion:"
+msgstr "Религия:"
 
-#: ../../Zotlabs/Module/Admin/Site.php:625
-#: ../../Zotlabs/Module/Admin/Site.php:626
-msgid "Invalid 24h time value (hhmm/hmm)"
-msgstr "Неверное 24-часовое значение (допустимо \"ччмм\" или \"чмм\")"
+#: ../../include/channel.php:1836
+msgid "Hobbies/Interests:"
+msgstr "Хобби / интересы:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
-msgstr "Настройки журнала обновлены."
+#: ../../include/channel.php:1838
+msgid "Likes:"
+msgstr "Что вам нравится:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
-msgstr "Очистить"
+#: ../../include/channel.php:1840
+msgid "Dislikes:"
+msgstr "Что вам не нравится:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
-msgstr "Отладка"
+#: ../../include/channel.php:1842
+msgid "Contact information and Social Networks:"
+msgstr "Контактная информация и социальные сети:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
-msgstr "Файл журнала"
+#: ../../include/channel.php:1844
+msgid "My other channels:"
+msgstr "Мои другие каналы:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
-msgstr "Должен быть доступен для записи веб-сервером. Пусть относителен основного каталога веб-сайта."
+#: ../../include/channel.php:1846
+msgid "Musical interests:"
+msgstr "Музыкальные интересы:"
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
-msgstr "Уровень журнала"
+#: ../../include/channel.php:1848
+msgid "Books, literature:"
+msgstr "Книги, литература:"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:31
+#: ../../include/channel.php:1850
+msgid "Television:"
+msgstr "Телевидение:"
+
+#: ../../include/channel.php:1852
+msgid "Film/dance/culture/entertainment:"
+msgstr "Кино / танцы / культура / развлечения:"
+
+#: ../../include/channel.php:1854
+msgid "Love/Romance:"
+msgstr "Любовь / романтика:"
+
+#: ../../include/channel.php:1856
+msgid "Work/employment:"
+msgstr "Работа / занятость:"
+
+#: ../../include/channel.php:1858
+msgid "School/education:"
+msgstr "Школа / образование:"
+
+#: ../../include/channel.php:1881
+msgid "Like this thing"
+msgstr "нравится этo"
+
+#: ../../include/channel.php:1882
+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 "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] "%s канал цензурируется/нецензурируется"
-msgstr[1] "%s канала цензурируется/нецензурируется"
-msgstr[2] "%s каналов цензурируется/нецензурируется"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s изменил %2$s на &ldquo;%3$s&rdquo;"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:40
+#: ../../include/activities.php:60
 #, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] "в %s канале код разрешён/запрещён"
-msgstr[1] "в %s каналах код разрешён/запрещён"
-msgstr[2] "в %s каналах код разрешён/запрещён"
+msgid "Visit %1$s's %2$s"
+msgstr "Посетить %1$s %2$s"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
+#: ../../include/activities.php:63
 #, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] "%s канал удалён"
-msgstr[1] "%s канала удалёны"
-msgstr[2] "%s каналов удалёно"
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s обновлено %2$s, изменено %3$s."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:65
-msgid "Channel not found"
-msgstr "Канал не найден"
+#: ../../include/datetime.php:140
+msgid "Birthday"
+msgstr "День рождения"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
+#: ../../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 "Channel '%s' deleted"
-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/Channels.php:87
+#: ../../include/datetime.php:273
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "год"
+msgstr[1] "года"
+msgstr[2] "лет"
+
+#: ../../include/datetime.php:276
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "месяц"
+msgstr[1] "месяца"
+msgstr[2] "месяцев"
+
+#: ../../include/datetime.php:279
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "неделю"
+msgstr[1] "недели"
+msgstr[2] "недель"
+
+#: ../../include/datetime.php:282
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "день"
+msgstr[1] "дня"
+msgstr[2] "дней"
+
+#: ../../include/datetime.php:285
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "час"
+msgstr[1] "часа"
+msgstr[2] "часов"
+
+#: ../../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 "Channel '%s' censored"
-msgstr "Канал '%s' цензурируется"
+msgid "%1$s's birthday"
+msgstr "День рождения %1$s"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
+#: ../../include/datetime.php:521
 #, php-format
-msgid "Channel '%s' uncensored"
-msgstr "Канал '%s' нецензурируется"
+msgid "Happy Birthday %1$s"
+msgstr "С Днем рождения %1$s !"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../include/language.php:433 ../../include/text.php:2172
+msgid "default"
+msgstr "по умолчанию"
+
+#: ../../include/language.php:446
+msgid "Select an alternate language"
+msgstr "Выбор дополнительного языка"
+
+#: ../../include/taxonomy.php:323
+msgid "Trending"
+msgstr "В тренде"
+
+#: ../../include/taxonomy.php:561
+msgid "Keywords"
+msgstr "Ключевые слова"
+
+#: ../../include/taxonomy.php:582
+msgid "have"
+msgstr "иметь"
+
+#: ../../include/taxonomy.php:582
+msgid "has"
+msgstr "есть"
+
+#: ../../include/taxonomy.php:583
+msgid "want"
+msgstr "хотеть"
+
+#: ../../include/taxonomy.php:583
+msgid "wants"
+msgstr "хотеть"
+
+#: ../../include/taxonomy.php:584
+msgid "likes"
+msgstr "нравится"
+
+#: ../../include/taxonomy.php:585
+msgid "dislikes"
+msgstr "не нравится"
+
+#: ../../include/help.php:81
+msgid "Help:"
+msgstr "Помощь:"
+
+#: ../../include/help.php:130
+msgid "Not Found"
+msgstr "Не найдено"
+
+#: ../../include/zid.php:408
 #, php-format
-msgid "Channel '%s' code allowed"
-msgstr "Код в канале '%s' разрешён"
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s приветствует %2$s"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
+#: ../../include/oembed.php:154
+msgid "View PDF"
+msgstr "Просмотреть PDF"
+
+#: ../../include/oembed.php:367
+msgid " by "
+msgstr " из "
+
+#: ../../include/oembed.php:368
+msgid " on "
+msgstr " на "
+
+#: ../../include/oembed.php:397
+msgid "Embedded content"
+msgstr "Встроенное содержимое"
+
+#: ../../include/oembed.php:406
+msgid "Embedding disabled"
+msgstr "Встраивание отключено"
+
+#: ../../include/photos.php:153
 #, php-format
-msgid "Channel '%s' code disallowed"
-msgstr "Код в канале '%s' запрещён"
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Файл превышает предельный размер для сайта в %lu байт"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
-msgstr "выбрать все"
+#: ../../include/photos.php:164
+msgid "Image file is empty."
+msgstr "Файл изображения пуст."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-#: ../../Zotlabs/Module/Directory.php:361
-msgid "Censor"
-msgstr "Цензурировать"
+#: ../../include/photos.php:324
+msgid "Photo storage failed."
+msgstr "Ошибка хранилища фотографий."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:151
-#: ../../Zotlabs/Module/Directory.php:361
-msgid "Uncensor"
-msgstr "Нецензурировать"
+#: ../../include/photos.php:373
+msgid "a new photo"
+msgstr "новая фотография"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow 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/Admin/Channels.php:153
-msgid "Disallow Code"
-msgstr "Запретить код"
+#: ../../include/photos.php:722 ../../include/nav.php:451
+msgid "Photo Albums"
+msgstr "Фотоальбомы"
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
-msgstr ""
+#: ../../include/photos.php:727
+msgid "Upload New Photos"
+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/opengraph.php:56
+#, php-format
+msgid "This is the home page of %s."
+msgstr "Это домашняя страница %s."
 
-#: ../../Zotlabs/Module/Admin/Channels.php:163
+#: ../../include/connections.php:136
+msgid "New window"
+msgstr "Новое окно"
+
+#: ../../include/connections.php:137
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Открыть выбранное местоположение в другом окне или вкладке браузера"
+
+#: ../../include/group.php:23
 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Вы уверены?"
+"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/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
-msgstr "Пароль для аккаунта %d изменён."
+#: ../../include/group.php:271
+msgid "Add new connections to this privacy group"
+msgstr "Добавить новые контакты в группу конфиденциальности"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
-msgstr "Настройки аккаунта обновлены."
+#: ../../include/group.php:305
+msgid "edit"
+msgstr "редактировать"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
-msgstr "Учётная запись не найдена."
+#: ../../include/group.php:328
+msgid "Edit group"
+msgstr "Редактировать группу"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
-msgstr "Редактировать аккаунт"
+#: ../../include/group.php:329
+msgid "Manage privacy groups"
+msgstr "Управлять группами конфиденциальности"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
-msgstr "Новый пароль"
+#: ../../include/group.php:330
+msgid "Channels not in any privacy group"
+msgstr "Каналы не включены ни в одну группу конфиденциальности"
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
-msgstr "Повторите новый пароль"
+#: ../../include/auth.php:194
+msgid "Delegation session ended."
+msgstr "Делегированная сессия завершена."
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Account language (for emails)"
-msgstr "Язык сообщения для email"
+#: ../../include/auth.php:198
+msgid "Logged out."
+msgstr "Вышел из системы."
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "New Profile Field"
-msgstr "Поле нового профиля"
+#: ../../include/auth.php:297
+msgid "Email validation is incomplete. Please check your email."
+msgstr "Проверка email не завершена. Пожалуйста, проверьте вашу почту."
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "Field nickname"
-msgstr "Псевдоним поля"
+#: ../../include/auth.php:313
+msgid "Failed authentication"
+msgstr "Ошибка аутентификации"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-#: ../../Zotlabs/Module/Admin/Profs.php:110
-msgid "System name of field"
-msgstr "Системное имя поля"
+#: ../../include/auth.php:323
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:189
+msgid "Login failed."
+msgstr "Не удалось войти."
 
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-#: ../../Zotlabs/Module/Admin/Profs.php:111
-msgid "Input type"
-msgstr "Тип ввода"
+#: ../../include/nav.php:93
+msgid "Remote authentication"
+msgstr "Удаленная аутентификация"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Field Name"
-msgstr "Имя поля"
+#: ../../include/nav.php:93
+msgid "Click to authenticate to your home hub"
+msgstr "Нажмите, чтобы аутентифицировать себя на домашнем узле"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-#: ../../Zotlabs/Module/Admin/Profs.php:112
-msgid "Label on profile pages"
-msgstr "Метка на странице профиля"
+#: ../../include/nav.php:99
+msgid "Manage your channels"
+msgstr "Управление вашими каналами"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Help text"
-msgstr "Текст подсказки"
+#: ../../include/nav.php:102
+msgid "Account/Channel Settings"
+msgstr "Настройки аккаунта / канала"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-#: ../../Zotlabs/Module/Admin/Profs.php:113
-msgid "Additional info (optional)"
-msgstr "Дополнительная информация (необязательно)"
+#: ../../include/nav.php:108 ../../include/nav.php:138
+msgid "End this session"
+msgstr "Закончить эту сессию"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:103
-msgid "Field definition not found"
-msgstr "Определения поля не найдено"
+#: ../../include/nav.php:111
+msgid "Your profile page"
+msgstr "Страницa вашего профиля"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:109
-msgid "Edit Profile Field"
-msgstr "Редактировать поле профиля"
+#: ../../include/nav.php:114
+msgid "Manage/Edit profiles"
+msgstr "Управление / редактирование профилей"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:169
-msgid "Basic Profile Fields"
-msgstr "Основные поля профиля"
+#: ../../include/nav.php:123 ../../include/nav.php:127
+msgid "Sign in"
+msgstr "Войти"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "Advanced Profile Fields"
-msgstr "Дополнительные поля профиля"
+#: ../../include/nav.php:157
+msgid "Take me home"
+msgstr "Домой"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:170
-msgid "(In addition to basic fields)"
-msgstr "(к основым полям)"
+#: ../../include/nav.php:159
+msgid "Log me out of this site"
+msgstr "Выйти с этого сайта"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:172
-msgid "All available fields"
-msgstr "Все доступные поля"
+#: ../../include/nav.php:164
+msgid "Create an account"
+msgstr "Создать аккаунт"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:173
-msgid "Custom Fields"
-msgstr "Настраиваемые поля"
+#: ../../include/nav.php:177
+msgid "Help and documentation"
+msgstr "Справочная информация и документация"
 
-#: ../../Zotlabs/Module/Admin/Profs.php:177
-msgid "Create Custom Field"
-msgstr "Создать настраиваемое поле"
+#: ../../include/nav.php:191
+msgid "Search site @name, !forum, #tag, ?docs, content"
+msgstr "Искать на сайте @имя, !форум, #тег, ?документ, содержимое"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Update has been marked successful"
-msgstr "Обновление было помечено как успешное"
+#: ../../include/nav.php:197
+msgid "Site Setup and Configuration"
+msgstr "Установка и конфигурация сайта"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#: ../../include/nav.php:325
+msgid "@name, #tag, ?doc, content"
+msgstr "@имя, #тег, ?документ, содержимое"
+
+#: ../../include/nav.php:326
+msgid "Please wait..."
+msgstr "Подождите пожалуйста ..."
+
+#: ../../include/nav.php:333
+msgid "Channel Apps"
+msgstr "Приложения канала"
+
+#: ../../include/nav.php:334
+msgid "System Apps"
+msgstr "Системные приложения"
+
+#: ../../include/nav.php:335
+msgid "Pinned Apps"
+msgstr "Прикреплённые приложения"
+
+#: ../../include/nav.php:336
+msgid "Featured Apps"
+msgstr "Популярные приложения"
+
+#: ../../include/nav.php:428
+msgid "Status Messages and Posts"
+msgstr "Статусы и публикации"
+
+#: ../../include/nav.php:441
+msgid "Profile Details"
+msgstr "Информация о профиле"
+
+#: ../../include/nav.php:459
+msgid "Files and Storage"
+msgstr "Файлы и хранилище"
+
+#: ../../include/nav.php:497
+msgid "Saved Bookmarks"
+msgstr "Сохранённые закладки"
+
+#: ../../include/nav.php:508
+msgid "View Webpages"
+msgstr "Просмотр веб-страниц"
+
+#: ../../include/nav.php:516
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_list.php:20
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:209
+msgid "Wikis"
+msgstr ""
+
+#: ../../include/feedutils.php:874 ../../include/text.php:1567
+msgid "unknown"
+msgstr "неизвестный"
+
+#: ../../include/bookmarks.php:34
 #, php-format
-msgid "Verification of update %s failed. Check system logs."
-msgstr "Проверка обновления %s не удалась. Проверьте системный журнал."
+msgid "%1$s's bookmarks"
+msgstr "Закладки пользователя %1$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:35
-#: ../../Zotlabs/Module/Admin/Dbsync.php:74
+#: ../../include/cdav.php:157
+msgid "INVALID EVENT DISMISSED!"
+msgstr "НЕДЕЙСТВИТЕЛЬНОЕ СОБЫТИЕ ОТКЛОНЕНО!"
+
+#: ../../include/cdav.php:158
+msgid "Summary: "
+msgstr "Резюме: "
+
+#: ../../include/cdav.php:159
+msgid "Date: "
+msgstr "Дата: "
+
+#: ../../include/cdav.php:160 ../../include/cdav.php:168
+msgid "Reason: "
+msgstr "Причина: "
+
+#: ../../include/cdav.php:166
+msgid "INVALID CARD DISMISSED!"
+msgstr "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!"
+
+#: ../../include/cdav.php:167
+msgid "Name: "
+msgstr "Имя: "
+
+#: ../../include/conversation.php:183
 #, php-format
-msgid "Update %s was successfully applied."
-msgstr "Обновление %s было успешно применено."
+msgid "likes %1$s's %2$s"
+msgstr "Нравится %1$s %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#: ../../include/conversation.php:186
 #, php-format
-msgid "Verifying update %s did not return a status. Unknown if it succeeded."
-msgstr "Проверка обновления %s не вернула его состояние. Неизвестно было ли оно успешным."
+msgid "doesn't like %1$s's %2$s"
+msgstr "Не нравится %1$s %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:42
+#: ../../include/conversation.php:226 ../../include/conversation.php:228
 #, php-format
-msgid "Update %s does not contain a verification function."
-msgstr "Обновление %s не содержит функцию проверки."
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s теперь в контакте с %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:46
-#: ../../Zotlabs/Module/Admin/Dbsync.php:81
+#: ../../include/conversation.php:263
 #, php-format
-msgid "Update function %s could not be found."
-msgstr "Функция обновления %s не может быть найдена."
+msgid "%1$s poked %2$s"
+msgstr "%1$s ткнул %2$s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:71
+#: ../../include/conversation.php:267 ../../include/text.php:1259
+#: ../../include/text.php:1263
+msgid "poked"
+msgstr "ткнут"
+
+#: ../../include/conversation.php:742
+msgid "Private Message"
+msgstr "Личное сообщение"
+
+#: ../../include/conversation.php:795
 #, php-format
-msgid "Executing update procedure %s failed. Check system logs."
-msgstr "Не удалось выполнить процедуру обновления %s.Проверьте системный журнал."
+msgid "View %s's profile @ %s"
+msgstr "Просмотреть профиль %s @ %s"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:78
+#: ../../include/conversation.php:816
+msgid "Categories:"
+msgstr "Категории:"
+
+#: ../../include/conversation.php:817
+msgid "Filed under:"
+msgstr "Хранить под:"
+
+#: ../../include/conversation.php:842
+#: ../../extend/addon/hzaddons/articles/articles.php:81
+#: ../../extend/addon/hzaddons/cards/cards.php:81
+msgid "View in context"
+msgstr "Показать в контексте"
+
+#: ../../include/conversation.php:945
+msgid "remove"
+msgstr "удалить"
+
+#: ../../include/conversation.php:949
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: ../../include/conversation.php:951
+msgid "Delete Selected Items"
+msgstr "Удалить выбранные элементы"
+
+#: ../../include/conversation.php:995
+msgid "View Source"
+msgstr "Просмотреть источник"
+
+#: ../../include/conversation.php:1005
+msgid "Follow Thread"
+msgstr "Следить за темой"
+
+#: ../../include/conversation.php:1014
+msgid "Unfollow Thread"
+msgstr "Прекратить отслеживать тему"
+
+#: ../../include/conversation.php:1129
+msgid "Edit Connection"
+msgstr "Редактировать контакт"
+
+#: ../../include/conversation.php:1289
 #, php-format
-msgid ""
-"Update %s did not return a status. It cannot be determined if it was "
-"successful."
-msgstr "Обновление %s не вернуло свой статус. Невозможно определить было ли оно успешным."
+msgid "%s likes this."
+msgstr "%s нравится это."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:99
-msgid "Failed Updates"
-msgstr "Обновления с ошибками"
+#: ../../include/conversation.php:1289
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s не нравится это."
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:101
-msgid "Mark success (if update was manually applied)"
-msgstr "Пометить успешным (если обновление было применено вручную)"
+#: ../../include/conversation.php:1293
+#, 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/Admin/Dbsync.php:102
-msgid "Attempt to verify this update if a verification procedure exists"
-msgstr "Попытайтесь проверить это обновление, если существует процедура проверки"
+#: ../../include/conversation.php:1295
+#, 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/Admin/Dbsync.php:103
-msgid "Attempt to execute this update step automatically"
-msgstr "Попытаться применить этот этап обновления автоматически"
+#: ../../include/conversation.php:1301
+msgid "and"
+msgstr "и"
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:108
-msgid "No failed updates."
-msgstr "Ошибок обновлений нет."
+#: ../../include/conversation.php:1304
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ", и ещё %d человеку"
+msgstr[1] ", и ещё %d человекам"
+msgstr[2] ", и ещё %d человекам"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:290
+#: ../../include/conversation.php:1305
 #, php-format
-msgid "Plugin %s disabled."
-msgstr "Плагин %s отключен."
+msgid "%s like this."
+msgstr "%s нравится это."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:295
+#: ../../include/conversation.php:1305
 #, php-format
-msgid "Plugin %s enabled."
-msgstr "Плагин %s включен."
+msgid "%s don't like this."
+msgstr "%s не нравится это."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:354
-msgid "Minimum project version: "
-msgstr "Минимальная версия проекта: "
+#: ../../include/conversation.php:1356
+#: ../../extend/addon/hzaddons/hsse/hsse.php:82
+msgid "Set your location"
+msgstr "Задать своё местоположение"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:355
-msgid "Maximum project version: "
-msgstr "Максимальная версия проекта: "
+#: ../../include/conversation.php:1357
+#: ../../extend/addon/hzaddons/hsse/hsse.php:83
+msgid "Clear browser location"
+msgstr "Очистить местоположение из браузера"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:356
-msgid "Minimum PHP version: "
-msgstr "Минимальная версия PHP: "
+#: ../../include/conversation.php:1373
+#: ../../extend/addon/hzaddons/hsse/hsse.php:99
+msgid "Embed (existing) photo from your photo albums"
+msgstr "Встроить (существующее) фото из вашего фотоальбома"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:357
-msgid "Compatible Server Roles: "
-msgstr "Совместимые роли сервера: "
+#: ../../include/conversation.php:1407
+#: ../../extend/addon/hzaddons/hsse/hsse.php:135
+msgid "Tag term:"
+msgstr "Теги:"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:358
-msgid "Requires: "
-msgstr "Необходимо:"
+#: ../../include/conversation.php:1408
+#: ../../extend/addon/hzaddons/hsse/hsse.php:136
+msgid "Where are you right now?"
+msgstr "Где вы сейчас?"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:359
-#: ../../Zotlabs/Module/Admin/Addons.php:446
-msgid "Disabled - version incompatibility"
-msgstr "Отключено - несовместимость версий"
+#: ../../include/conversation.php:1413
+#: ../../extend/addon/hzaddons/hsse/hsse.php:141
+msgid "Choose a different album..."
+msgstr "Выбрать другой альбом..."
 
-#: ../../Zotlabs/Module/Admin/Addons.php:415
-msgid "Enter the public git repository URL of the addon repo."
-msgstr "Введите URL публичного репозитория расширений git"
+#: ../../include/conversation.php:1417
+#: ../../extend/addon/hzaddons/hsse/hsse.php:145
+msgid "Comments enabled"
+msgstr "Комментарии включены"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:416
-msgid "Addon repo git URL"
-msgstr "URL репозитория расширений git"
+#: ../../include/conversation.php:1418
+#: ../../extend/addon/hzaddons/hsse/hsse.php:146
+msgid "Comments disabled"
+msgstr "Комментарии отключены"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "Custom repo name"
-msgstr "Пользовательское имя репозитория"
+#: ../../include/conversation.php:1471
+#: ../../extend/addon/hzaddons/hsse/hsse.php:195
+msgid "Page link name"
+msgstr "Название ссылки на страницу "
 
-#: ../../Zotlabs/Module/Admin/Addons.php:417
-msgid "(optional)"
-msgstr "(необязательно)"
+#: ../../include/conversation.php:1474
+#: ../../extend/addon/hzaddons/hsse/hsse.php:198
+msgid "Post as"
+msgstr "Опубликовать как"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:418
-msgid "Download Addon Repo"
-msgstr "Загрузить репозиторий расширений"
+#: ../../include/conversation.php:1484
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:403
+#: ../../extend/addon/hzaddons/hsse/hsse.php:208
+msgid "Embed an image from your albums"
+msgstr "Встроить изображение из ваших альбомов"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:425
-msgid "Install new repo"
-msgstr "Установить новый репозиторий"
+#: ../../include/conversation.php:1488
+#: ../../extend/addon/hzaddons/hsse/hsse.php:212
+msgid "Toggle voting"
+msgstr "Переключить голосование"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:540
-msgid "Install"
-msgstr "Установить"
+#: ../../include/conversation.php:1489
+msgid "Toggle poll"
+msgstr "Переключить опрос"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:449
-msgid "Manage Repos"
-msgstr "Управление репозиториями"
+#: ../../include/conversation.php:1490
+msgid "Option"
+msgstr "Вариант"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:450
-msgid "Installed Addon Repositories"
-msgstr "Установленные репозитории расширений"
+#: ../../include/conversation.php:1491
+msgid "Add option"
+msgstr "Добавить вариант"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:451
-msgid "Install a New Addon Repository"
-msgstr "Установить новый репозиторий расширений"
+#: ../../include/conversation.php:1492
+msgid "Minutes"
+msgstr "Минут"
 
-#: ../../Zotlabs/Module/Admin/Addons.php:458
-msgid "Switch branch"
-msgstr "Переключить ветку"
+#: ../../include/conversation.php:1492
+msgid "Hours"
+msgstr "Часов"
 
-#: ../../Zotlabs/Module/Apps.php:50
-msgid "Installed Apps"
-msgstr "Установленные приложения"
+#: ../../include/conversation.php:1492
+msgid "Days"
+msgstr "Дней"
 
-#: ../../Zotlabs/Module/Apps.php:53
-msgid "Manage Apps"
-msgstr "Управление приложениями"
+#: ../../include/conversation.php:1493
+msgid "Allow multiple answers"
+msgstr "Разрешить несколько ответов"
 
-#: ../../Zotlabs/Module/Apps.php:54
-msgid "Create Custom App"
-msgstr "Создать пользовательское приложение"
+#: ../../include/conversation.php:1495
+#: ../../extend/addon/hzaddons/hsse/hsse.php:215
+msgid "Disable comments"
+msgstr "Отключить комментарии"
 
-#: ../../Zotlabs/Module/Achievements.php:38
-msgid "Some blurb about what to do when you're new here"
-msgstr "Некоторые предложения о том, что делать, если вы здесь новичок "
+#: ../../include/conversation.php:1496
+#: ../../extend/addon/hzaddons/hsse/hsse.php:216
+msgid "Toggle comments"
+msgstr "Переключить комментарии"
 
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."
+#: ../../include/conversation.php:1503
+msgid "Summary (optional)"
+msgstr "Резюме (необязательно)"
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
-msgstr "Удалить этот канал"
+#: ../../include/conversation.php:1506
+#: ../../extend/addon/hzaddons/hsse/hsse.php:224
+msgid "Categories (optional, comma-separated list)"
+msgstr "Категории (необязательно, список через запятую)"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Changeaddr.php:78
-msgid "WARNING: "
-msgstr "ПРЕДУПРЕЖДЕНИЕ: "
+#: ../../include/conversation.php:1507
+#: ../../extend/addon/hzaddons/hsse/hsse.php:225
+msgid "Permission settings"
+msgstr "Настройки разрешений"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
-msgstr "Этот канал будет полностью удалён из сети. "
+#: ../../include/conversation.php:1529
+#: ../../extend/addon/hzaddons/hsse/hsse.php:247
+msgid "Other networks and post services"
+msgstr "Другие сети и службы публикаций"
 
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "Это действие необратимо и не может быть отменено!"
+#: ../../include/conversation.php:1532
+#: ../../extend/addon/hzaddons/hsse/hsse.php:250
+msgid "Set expiration date"
+msgstr "Установить срок действия"
 
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Changeaddr.php:79
-msgid "Please enter your password for verification:"
-msgstr "Пожалуйста, введите ваш пароль для проверки:"
+#: ../../include/conversation.php:1535
+#: ../../extend/addon/hzaddons/hsse/hsse.php:253
+msgid "Set publish date"
+msgstr "Установить дату публикации"
 
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:277
-msgid "Remove Channel"
-msgstr "Удаление канала"
+#: ../../include/conversation.php:1781
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Посетит"
+msgstr[1] "Посетят"
+msgstr[2] "Посетят"
 
-#: ../../Zotlabs/Module/Regate.php:84
-msgid "Email resent"
-msgstr "Электронная почта повторно отправлена"
+#: ../../include/conversation.php:1784
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Не посетит"
+msgstr[1] "Не посетят"
+msgstr[2] "Не посетят"
 
-#: ../../Zotlabs/Module/Regate.php:84
-msgid "Email resend failed"
-msgstr "Ошибка повторной отправки электронной почты"
+#: ../../include/conversation.php:1787
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr "Не решил"
 
-#: ../../Zotlabs/Module/Regate.php:109
-msgid "Verification successful"
-msgstr "Проверка прошла успешно"
+#: ../../include/conversation.php:1790
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "Согласен"
+msgstr[1] "Согласны"
+msgstr[2] "Согласны"
 
-#: ../../Zotlabs/Module/Regate.php:153
-msgid "Account successfull created"
-msgstr "Учётная запись успешно создана"
+#: ../../include/conversation.php:1793
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "Не согласен"
+msgstr[1] "Не согласны"
+msgstr[2] "Не согласны"
 
-#: ../../Zotlabs/Module/Regate.php:211
-msgid "Channel successfull created"
-msgstr "Канал успешно создан"
+#: ../../include/conversation.php:1796
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "Воздержался"
+msgstr[1] "Воздержались"
+msgstr[2] "Воздержались"
 
-#: ../../Zotlabs/Module/Regate.php:217
-msgid "Automatic channel creation failed. Please create a channel."
-msgstr "Автоматической создание канала не удалось. Пожалуйста создайте канал."
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Удалить этот элемент?"
 
-#: ../../Zotlabs/Module/Regate.php:229
-msgid "Account creation error"
-msgstr "Ошибка создания учётной записи"
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
+msgstr "%s показать меньше"
 
-#: ../../Zotlabs/Module/Regate.php:241
-msgid "Verify failed"
-msgstr "Проверка не удалась"
+#: ../../include/js_strings.php:9
+#, php-format
+msgid "%s expand"
+msgstr "%s развернуть"
 
-#: ../../Zotlabs/Module/Regate.php:246
-msgid "Token verification failed"
-msgstr "Неверный проверочный код"
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
+msgstr "%s свернуть"
 
-#: ../../Zotlabs/Module/Regate.php:251
-msgid "Request not inside time frame"
-msgstr "Запрос в не установленные сроки "
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "Пароль слишком короткий"
 
-#: ../../Zotlabs/Module/Regate.php:257 ../../Zotlabs/Module/Regate.php:287
-msgid "Identity unknown"
-msgstr "Личность не установлена"
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr "все"
 
-#: ../../Zotlabs/Module/Regate.php:263
-msgid "dId2 mistaken"
-msgstr "ошибочный dId2"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "Тайный пароль"
 
-#: ../../Zotlabs/Module/Regate.php:291
-msgid "Your Registration ID"
-msgstr "Идентификатор вашей регистрации"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Подсказка для пароля"
 
-#: ../../Zotlabs/Module/Regate.php:304 ../../Zotlabs/Module/Regate.php:396
-#: ../../Zotlabs/Module/Regate.php:428
-msgid "Registration verification"
-msgstr "Проверка регистрации"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Уведомление: Права доступа изменились, но до сих пор не сохранены."
 
-#: ../../Zotlabs/Module/Regate.php:311 ../../Zotlabs/Module/Regate.php:433
-msgid "Hold on, you can start verification in"
-msgstr "Подождите, вы можете начать проверку через "
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "закрыть все"
 
-#: ../../Zotlabs/Module/Regate.php:312
-msgid "Please remember your verification token for ID"
-msgstr "Пожалуйста, запомните свой код подтверждения для идентификации"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Здесь нет ничего нового"
 
-#: ../../Zotlabs/Module/Regate.php:314
-msgid "Token validity"
-msgstr "Срок действия кода"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr "Оценкa этoго канала (общедоступно)"
 
-#: ../../Zotlabs/Module/Regate.php:350
-msgid "Resend email"
-msgstr "Отправить электронное письмо повторно"
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr "Оценка"
 
-#: ../../Zotlabs/Module/Regate.php:355
-msgid "Registration status"
-msgstr "Статус регистрации"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr "Охарактеризовать (необязательно)"
 
-#: ../../Zotlabs/Module/Regate.php:358
-msgid "Verification successful!"
-msgstr "Проверка прошла успешно! "
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr "Пожалуйста, введите URL ссылки"
 
-#: ../../Zotlabs/Module/Regate.php:359
-msgid "Your login ID is"
-msgstr "Ваш логин для входа"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr "Есть несохраненные изменения. Вы уверены, что хотите покинуть эту страницу?"
 
-#: ../../Zotlabs/Module/Regate.php:360
+#: ../../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 ""
-"After your account has been approved by our administrator you will be able "
-"to login with your login ID and your provided password."
-msgstr "После того, как ваша учетная запись будет одобрена нашим администратором, вы сможете войти в систему, указав свой логин и пароль."
+"Your chosen nickname was either already taken or not valid. Please use our "
+"suggestion ("
+msgstr "Выбранный вами псевдоним уже используется или недействителен. Попробуйте использовать наше предложение ("
 
-#: ../../Zotlabs/Module/Regate.php:372
-msgid "Registration request revoked"
-msgstr "Запрос на регистрацию был отозван"
+#: ../../include/js_strings.php:31
+msgid ") or enter a new one."
+msgstr ") или введите новый."
 
-#: ../../Zotlabs/Module/Regate.php:373
-msgid "Sorry for any inconvience. Thank you for your response."
-msgstr "Приносим извинения за неудобства. Благодарим за ваш ответ."
+#: ../../include/js_strings.php:32
+msgid "Thank you, this nickname is valid."
+msgstr "Спасибо, этот псевдоним может быть использован."
 
-#: ../../Zotlabs/Module/Regate.php:397
-msgid "Please enter your verification token for ID"
-msgstr "Пожалуйста введите ваш проверочный код для идентификации"
+#: ../../include/js_strings.php:33
+msgid "A channel name is required."
+msgstr "Требуется название канала."
 
-#: ../../Zotlabs/Module/Regate.php:398 ../../Zotlabs/Module/Regate.php:425
-msgid "Please check your email!"
-msgstr "Пожалуйста, проверьте вашу электронную почту!"
+#: ../../include/js_strings.php:34
+msgid "This is a "
+msgstr "Это "
 
-#: ../../Zotlabs/Module/Regate.php:408
-msgid "Verification token"
-msgstr "Код проверки"
+#: ../../include/js_strings.php:35
+msgid " channel name"
+msgstr " название канала"
 
-#: ../../Zotlabs/Module/Regate.php:419
-msgid "ID expired"
-msgstr "Срок действия идентификатора истёк"
+#: ../../include/js_strings.php:36
+msgid "Back to reply"
+msgstr "Вернуться к ответу"
 
-#: ../../Zotlabs/Module/Regate.php:434
-msgid "You will require the verification token for ID"
-msgstr "Вам потребуется проверочный кода для идентификации"
+#: ../../include/js_strings.php:37
+msgid "Pinned"
+msgstr "Прикреплено"
 
-#: ../../Zotlabs/Module/Regate.php:443
-msgid "Unknown or expired ID"
-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:454
-msgid "dId2 malformed"
-msgstr "Неверный dId2"
+#: ../../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/Manage.php:130 ../../Zotlabs/Module/New_channel.php:147
+#: ../../include/js_strings.php:47
 #, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Вы создали %1$.0f из %2$.0f возможных каналов."
+msgid "%d days"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
 
-#: ../../Zotlabs/Module/Manage.php:137
-msgid "Create a new channel"
-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/Manage.php:137 ../../Zotlabs/Module/Profiles.php:852
-#: ../../Zotlabs/Module/Wiki.php:211
-msgid "Create New"
-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/Manage.php:163
-msgid "Current Channel"
-msgstr "Текущий канал"
+#: ../../include/js_strings.php:54
+msgid "timeago.prefixAgo"
+msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Switch to one of your channels by selecting it."
-msgstr "Выбрать и переключиться на один из ваших каналов"
+#: ../../include/js_strings.php:55
+msgid "timeago.prefixFromNow"
+msgstr "через"
 
-#: ../../Zotlabs/Module/Manage.php:166
-msgid "Default Channel"
-msgstr "Основной канал"
+#: ../../include/js_strings.php:56
+msgid "timeago.suffixAgo"
+msgstr "назад"
 
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Make Default"
-msgstr "Сделать основным"
+#: ../../include/js_strings.php:57
+msgid "timeago.suffixFromNow"
+msgstr "NONE"
 
-#: ../../Zotlabs/Module/Manage.php:170
-#, php-format
-msgid "%d new introductions"
-msgstr "%d новых представлений"
+#: ../../include/js_strings.php:60
+msgid "less than a minute"
+msgstr "менее чем одну минуту"
 
-#: ../../Zotlabs/Module/Manage.php:172
-msgid "Delegated Channel"
-msgstr "Делегированный канал"
+#: ../../include/js_strings.php:61
+msgid "about a minute"
+msgstr "около минуты"
 
-#: ../../Zotlabs/Module/Chanview.php:132
-msgid "toggle full screen mode"
-msgstr "переключение полноэкранного режима"
+#: ../../include/js_strings.php:63
+msgid "about an hour"
+msgstr "около часа"
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
-msgstr "Нет на месте"
+#: ../../include/js_strings.php:65
+msgid "a day"
+msgstr "день"
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
-msgstr "В сети"
+#: ../../include/js_strings.php:67
+msgid "about a month"
+msgstr "около месяца"
 
-#: ../../Zotlabs/Module/Permcats.php:56
-msgid "Contact role deleted."
-msgstr "Роль контакта удалена."
+#: ../../include/js_strings.php:69
+msgid "about a year"
+msgstr "около года"
 
-#: ../../Zotlabs/Module/Permcats.php:82
-msgid "Permission category name is required."
-msgstr "Требуется категория разрешений."
+#: ../../include/js_strings.php:71
+msgid " "
+msgstr " "
 
-#: ../../Zotlabs/Module/Permcats.php:98 ../../Zotlabs/Module/Permcats.php:123
-msgid "Contact role saved."
-msgstr "Роль контакта сохранена."
+#: ../../include/js_strings.php:72
+msgid "timeago.numbers"
+msgstr ""
 
-#: ../../Zotlabs/Module/Permcats.php:174
-msgid "Role to assign affected contacts and default role to"
-msgstr "Назначить роль выбранных контактов и роль по умолчанию для "
+#: ../../include/js_strings.php:74 ../../include/text.php:1503
+msgid "January"
+msgstr "Январь"
 
-#: ../../Zotlabs/Module/Permcats.php:174
-msgid "Role to assign affected contacts to"
-msgstr "Назначить роль выбранных контактов для"
+#: ../../include/js_strings.php:75 ../../include/text.php:1503
+msgid "February"
+msgstr "Февраль"
 
-#: ../../Zotlabs/Module/Permcats.php:205
-msgid "Assign this role to"
-msgstr "Назначить эту роль для"
+#: ../../include/js_strings.php:76 ../../include/text.php:1503
+msgid "March"
+msgstr "Март"
 
-#: ../../Zotlabs/Module/Permcats.php:207
-msgid "All my contacts"
-msgstr "Все мои контакты"
+#: ../../include/js_strings.php:77 ../../include/text.php:1503
+msgid "April"
+msgstr "Апрель"
 
-#: ../../Zotlabs/Module/Permcats.php:218
-msgid "Automatically assign this role to new contacts"
-msgstr "Автоматически назначать эту роль для новых контактов"
+#: ../../include/js_strings.php:78
+msgctxt "long"
+msgid "May"
+msgstr "Май"
 
-#: ../../Zotlabs/Module/Permcats.php:219 ../../Zotlabs/Lib/Apps.php:378
-msgid "Contact Roles"
-msgstr "Роли контактов"
+#: ../../include/js_strings.php:79 ../../include/text.php:1503
+msgid "June"
+msgstr "Июнь"
 
-#: ../../Zotlabs/Module/Permcats.php:220
-msgid "Role name"
-msgstr "Наименование роли"
+#: ../../include/js_strings.php:80 ../../include/text.php:1503
+msgid "July"
+msgstr "Июль"
 
-#: ../../Zotlabs/Module/Permcats.php:220
-msgid "System role - not editable"
-msgstr "Системная роль (не редактируется)"
+#: ../../include/js_strings.php:81 ../../include/text.php:1503
+msgid "August"
+msgstr "Август"
 
-#: ../../Zotlabs/Module/Permcats.php:221
-msgid "Deleting"
-msgstr "Удаляем"
+#: ../../include/js_strings.php:82 ../../include/text.php:1503
+msgid "September"
+msgstr "Сентябрь"
 
-#: ../../Zotlabs/Module/Permcats.php:224 ../../Zotlabs/Module/Defperms.php:262
-#: ../../Zotlabs/Module/Connedit.php:713
-msgid "inherited"
-msgstr "наследуется"
+#: ../../include/js_strings.php:83 ../../include/text.php:1503
+msgid "October"
+msgstr "Октябрь"
 
-#: ../../Zotlabs/Module/Permcats.php:226
-msgid "Role Permissions"
-msgstr "Разрешения роли"
+#: ../../include/js_strings.php:84 ../../include/text.php:1503
+msgid "November"
+msgstr "Ноябрь"
 
-#: ../../Zotlabs/Module/Permcats.php:227
-msgid ""
-"Some permissions may be inherited from your <a href=\"settings\">channel "
-"role</a>, which have higher priority than contact role settings."
-msgstr "Некоторые разрешения могут быть унаследованы от вашей <a href=\"settings\">роли канала</a>, которые имеют более высокий приоритет, чем настройки роли контакта."
+#: ../../include/js_strings.php:85 ../../include/text.php:1503
+msgid "December"
+msgstr "Декабрь"
 
-#: ../../Zotlabs/Module/Email_resend.php:12
-#: ../../Zotlabs/Module/Email_validation.php:24
-msgid "Token verification failed."
-msgstr "Не удалось выполнить проверку токена."
+#: ../../include/js_strings.php:86
+msgid "Jan"
+msgstr "Янв"
 
-#: ../../Zotlabs/Module/Email_resend.php:30
-msgid "Email verification resent"
-msgstr "Сообщение для проверки email отправлено повторно"
+#: ../../include/js_strings.php:87
+msgid "Feb"
+msgstr "Фев"
 
-#: ../../Zotlabs/Module/Email_resend.php:33
-msgid "Unable to resend email verification message."
-msgstr "Невозможно повторно отправить сообщение для проверки email"
+#: ../../include/js_strings.php:88
+msgid "Mar"
+msgstr "Мар"
 
-#: ../../Zotlabs/Module/Cal.php:62
-msgid "Permissions denied."
-msgstr "Доступ запрещен."
+#: ../../include/js_strings.php:89
+msgid "Apr"
+msgstr "Апр"
 
-#: ../../Zotlabs/Module/Viewsrc.php:43
-msgid "item"
-msgstr "пункт"
+#: ../../include/js_strings.php:90
+msgctxt "short"
+msgid "May"
+msgstr "Май"
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of Pinned Navbar Apps"
-msgstr "Изменить порядок приложений на панели навигации"
+#: ../../include/js_strings.php:91
+msgid "Jun"
+msgstr "Июн"
 
-#: ../../Zotlabs/Module/Apporder.php:47
-msgid "Change Order of App Tray Apps"
-msgstr "Изменить порядок приложений в лотке"
+#: ../../include/js_strings.php:92
+msgid "Jul"
+msgstr "Июл"
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid ""
-"Use arrows to move the corresponding app left (top) or right (bottom) in the "
-"navbar"
-msgstr "Используйте стрелки для перемещения приложения влево (вверх) или вправо (вниз) в панели навигации"
+#: ../../include/js_strings.php:93
+msgid "Aug"
+msgstr "Авг"
 
-#: ../../Zotlabs/Module/Apporder.php:48
-msgid "Use arrows to move the corresponding app up or down in the app tray"
-msgstr "Используйте стрелки для перемещения приложения вверх или вниз в лотке"
+#: ../../include/js_strings.php:94
+msgid "Sep"
+msgstr "Сен"
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Невозможно найти ваш сервер"
+#: ../../include/js_strings.php:95
+msgid "Oct"
+msgstr "Окт"
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Успешно опубликовано."
+#: ../../include/js_strings.php:96
+msgid "Nov"
+msgstr "Ноя"
 
-#: ../../Zotlabs/Module/Moderate.php:67
-msgid "Comment approved"
-msgstr "Комментарий одобрен"
+#: ../../include/js_strings.php:97
+msgid "Dec"
+msgstr "Дек"
 
-#: ../../Zotlabs/Module/Moderate.php:71
-msgid "Comment deleted"
-msgstr "Комментарий удалён"
+#: ../../include/js_strings.php:98 ../../include/text.php:1499
+msgid "Sunday"
+msgstr "Воскресенье"
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Удаление канала не разрешается в течении 48 часов после смены пароля у аккаунта."
+#: ../../include/js_strings.php:99 ../../include/text.php:1499
+msgid "Monday"
+msgstr "Понедельник"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
-msgstr "Удалить этот аккаунт"
+#: ../../include/js_strings.php:100 ../../include/text.php:1499
+msgid "Tuesday"
+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:101 ../../include/text.php:1499
+msgid "Wednesday"
+msgstr "Среда"
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:109
-msgid "Remove Account"
-msgstr "Удалить аккаунт"
+#: ../../include/js_strings.php:102 ../../include/text.php:1499
+msgid "Thursday"
+msgstr "Четверг"
 
-#: ../../Zotlabs/Module/Lang.php:20
-msgid "Language App"
-msgstr "Приложение \"Язык\""
+#: ../../include/js_strings.php:103 ../../include/text.php:1499
+msgid "Friday"
+msgstr "Пятница"
 
-#: ../../Zotlabs/Module/Uexport.php:108
-msgid "No content available for year"
-msgstr "Содержимое для года недоступно"
+#: ../../include/js_strings.php:104 ../../include/text.php:1499
+msgid "Saturday"
+msgstr "Суббота"
 
-#: ../../Zotlabs/Module/Uexport.php:171
-msgid "Export Channel"
-msgstr "Экспорт канала"
+#: ../../include/js_strings.php:105
+msgid "Sun"
+msgstr "Вск"
 
-#: ../../Zotlabs/Module/Uexport.php:173
-msgid "Export channel"
-msgstr "Экспортировать канал"
+#: ../../include/js_strings.php:106
+msgid "Mon"
+msgstr "Пон"
 
-#: ../../Zotlabs/Module/Uexport.php:174
-msgid ""
-"This will export your identity and social graph into a file which can be "
-"used to import your channel to a new hub."
-msgstr "Экспортировать ваши данные и социальный граф в файл, который можно использовать для импорта вашего канала на новом хабе."
+#: ../../include/js_strings.php:107
+msgid "Tue"
+msgstr "Вт"
 
-#: ../../Zotlabs/Module/Uexport.php:177
-msgid "Export content"
-msgstr "Экспортировать содержимое"
+#: ../../include/js_strings.php:108
+msgid "Wed"
+msgstr "Ср"
 
-#: ../../Zotlabs/Module/Uexport.php:178
-msgid ""
-"This will export your posts, direct messages, articles and cards per month "
-"stored into a zip file per year. Months with no posts will be dismissed."
-msgstr "Экспортировать ваши публикации, личные сообщения, статьи и карточки за месяц, хранящиеся в zip-файле за год. Месяцы без сообщений будут отклонены."
+#: ../../include/js_strings.php:109
+msgid "Thu"
+msgstr "Чет"
 
-#: ../../Zotlabs/Module/Uexport.php:180
-msgid "Export wikis"
-msgstr "Экспортировать wiki"
+#: ../../include/js_strings.php:110
+msgid "Fri"
+msgstr "Пят"
 
-#: ../../Zotlabs/Module/Uexport.php:181
-msgid "This will export your wikis and wiki pages."
-msgstr "Экспортировать ваши wiki и их страницы."
+#: ../../include/js_strings.php:111
+msgid "Sat"
+msgstr "Суб"
 
-#: ../../Zotlabs/Module/Uexport.php:183
-msgid "Export webpages"
-msgstr "Экспортировать веб-страницы"
+#: ../../include/js_strings.php:112
+msgctxt "calendar"
+msgid "today"
+msgstr "сегодня"
 
-#: ../../Zotlabs/Module/Uexport.php:184
-msgid "This will export your webpages and menus."
-msgstr "Экспортировать ваши веб-страницы и меню."
+#: ../../include/js_strings.php:113
+msgctxt "calendar"
+msgid "month"
+msgstr "месяц"
 
-#: ../../Zotlabs/Module/Uexport.php:186
-msgid "Export channel calendar"
-msgstr "Экспортировать календарь канала"
+#: ../../include/js_strings.php:114
+msgctxt "calendar"
+msgid "week"
+msgstr "неделя"
 
-#: ../../Zotlabs/Module/Uexport.php:187
-msgid ""
-"This will export your channel calendar events and associated items. CalDAV "
-"calendars are not included."
-msgstr "Экспортировать события календаря вашего канала и связанные элементы, за исключением календарей CalDAV."
+#: ../../include/js_strings.php:115
+msgctxt "calendar"
+msgid "day"
+msgstr "день"
 
-#: ../../Zotlabs/Module/Uexport.php:189
-msgid "Export chatrooms"
-msgstr "Экспортировать комнаты чатов"
+#: ../../include/js_strings.php:116
+msgctxt "calendar"
+msgid "All day"
+msgstr "Весь день"
 
-#: ../../Zotlabs/Module/Uexport.php:190
-msgid "This will export your chatrooms. Chat history is dismissed."
-msgstr "Эксортировать ваши комнаты чатов. История не сохраняется."
+#: ../../include/js_strings.php:119
+msgid "Please stand by while your download is being prepared."
+msgstr "Пожалуйста, подождите, пока готовится загрузка."
 
-#: ../../Zotlabs/Module/Uexport.php:192
-#, php-format
-msgid ""
-"This export can be imported or restored by visiting <a href=\"%1$s\">%2$s</"
-"a> on any site containing your channel."
-msgstr "Этот файл можно импортировать или восстановить, посетив <a href=\"%1$s\">% 2 $ s </a> на любом сайте, где есть ваш канал."
+#: ../../include/js_strings.php:122
+msgid "Email address not valid"
+msgstr "Адрес электронной почты недействителен"
 
-#: ../../Zotlabs/Module/Display.php:376
-msgid "Article"
-msgstr "Статья"
+#: ../../include/features.php:86
+msgid "Start calendar week on Monday"
+msgstr "Начинать календарную неделю с понедельника"
 
-#: ../../Zotlabs/Module/Display.php:421
-msgid "Item has been removed."
-msgstr "Элемент был удалён."
+#: ../../include/features.php:87
+msgid "Default is Sunday"
+msgstr "По умолчанию - воскресенье"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Канала нет."
+#: ../../include/features.php:94
+msgid "Event Timezone Selection"
+msgstr "Выбор часового пояса события"
 
-#: ../../Zotlabs/Module/Common.php:45
-msgid "No connections in common."
-msgstr "Общих контактов нет."
+#: ../../include/features.php:95
+msgid "Allow event creation in timezones other than your own."
+msgstr "Разрешить создание события в часовой зоне отличной от вашей"
 
-#: ../../Zotlabs/Module/Common.php:65
-msgid "View Common Connections"
-msgstr "Просмотр общий контактов"
+#: ../../include/features.php:104
+msgid "Channel Home"
+msgstr "Главная канала"
 
-#: ../../Zotlabs/Module/Impel.php:188
-#, php-format
-msgid "%s element installed"
-msgstr "%s элемент установлен"
+#: ../../include/features.php:108
+msgid "Search by Date"
+msgstr "Поиск по дате"
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installation failed"
-msgstr "%sустановка элемента неудачна."
+#: ../../include/features.php:109
+msgid "Ability to select posts by date ranges"
+msgstr "Возможность выбора сообщений по диапазонам дат"
 
-#: ../../Zotlabs/Module/New_channel.php:159
-msgid "Your real name is recommended."
-msgstr "Рекомендуется использовать ваше настоящее имя."
+#: ../../include/features.php:116
+msgid "Tag Cloud"
+msgstr "Облако тегов"
 
-#: ../../Zotlabs/Module/New_channel.php:160
+#: ../../include/features.php:117
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Показывает личное облако тегов на странице канала"
+
+#: ../../include/features.php:124 ../../include/features.php:358
+msgid "Use blog/list mode"
+msgstr "Использовать режим блога / списка"
+
+#: ../../include/features.php:125 ../../include/features.php:359
+msgid "Comments will be displayed separately"
+msgstr "Комментарии будут отображаться отдельно"
+
+#: ../../include/features.php:137
+msgid "Connection Filtering"
+msgstr "Фильтрация контактов"
+
+#: ../../include/features.php:138
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Фильтр входящих сообщений от контактов на основе ключевых слов / контента"
+
+#: ../../include/features.php:146
+msgid "Conversation"
+msgstr "Диалоги"
+
+#: ../../include/features.php:158
+msgid "Emoji Reactions"
+msgstr "Реакции Emoji"
+
+#: ../../include/features.php:159
+msgid "Add emoji reaction ability to posts"
+msgstr "Возможность добавлять реакции Emoji к публикациям"
+
+#: ../../include/features.php:166
+msgid "Dislike Posts"
+msgstr "Не нравящиеся публикации"
+
+#: ../../include/features.php:167
+msgid "Ability to dislike posts/comments"
+msgstr "Возможность отмечать не нравящиеся публикации / комментарии"
+
+#: ../../include/features.php:174
+msgid "Star Posts"
+msgstr "Помечать сообщения"
+
+#: ../../include/features.php:175
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Возможность отметить специальные сообщения индикатором-звёздочкой"
+
+#: ../../include/features.php:182
+msgid "Reply on comment"
+msgstr "Ответить на комментарий"
+
+#: ../../include/features.php:183
+msgid "Ability to reply on selected comment"
+msgstr "Возможность ответить на выбранный комментарий"
+
+#: ../../include/features.php:196
+msgid "Advanced Directory Search"
+msgstr "Расширенный поиск в каталоге"
+
+#: ../../include/features.php:197
+msgid "Allows creation of complex directory search queries"
+msgstr "Позволяет создание сложных поисковых запросов в каталоге"
+
+#: ../../include/features.php:206
+msgid "Editor"
+msgstr "Редактор"
+
+#: ../../include/features.php:210
+msgid "Post Categories"
+msgstr "Категории публикаций"
+
+#: ../../include/features.php:211
+msgid "Add categories to your posts"
+msgstr "Добавить категории для ваших публикаций"
+
+#: ../../include/features.php:218
+msgid "Large Photos"
+msgstr "Большие фотографии"
+
+#: ../../include/features.php:219
 msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
-msgstr "Примеры: \"Иван Иванов\", \"Оксана и кони\", \"Футбол\", \"Тимур и его команда\""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Включить большие (1024px) миниатюры изображений в публикациях. Если не включено, использовать маленькие (640px) миниатюры."
 
-#: ../../Zotlabs/Module/New_channel.php:165
+#: ../../include/features.php:226
+msgid "Even More Encryption"
+msgstr "Еще больше шифрования"
+
+#: ../../include/features.php:227
 msgid ""
-"This will be used to create a unique network address (like an email address)."
-msgstr "Это будет использовано для создания уникального сетевого адреса (наподобие email)."
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Разрешить дополнительное end-to-end шифрование содержимого с общим секретным ключом"
 
-#: ../../Zotlabs/Module/New_channel.php:167
-msgid "Allowed characters are a-z 0-9, - and _"
-msgstr "Разрешённые символы a-z 0-9, - и _"
+#: ../../include/features.php:234
+msgid "Disable Comments"
+msgstr "Отключить комментарии"
 
-#: ../../Zotlabs/Module/New_channel.php:175
-msgid "Channel name"
-msgstr "Название канала"
+#: ../../include/features.php:235
+msgid "Provide the option to disable comments for a post"
+msgstr "Предоставить возможность отключать комментарии для публикаций"
 
-#: ../../Zotlabs/Module/New_channel.php:178
-#: ../../Zotlabs/Module/Settings/Channel.php:228
-msgid "Channel role"
-msgstr "Роль канала"
+#: ../../include/features.php:242
+msgid "Delayed Posting"
+msgstr "Задержанная публикация"
 
-#: ../../Zotlabs/Module/New_channel.php:181
-msgid "Create a Channel"
-msgstr "Создать канал"
+#: ../../include/features.php:243
+msgid "Allow posts to be published at a later date"
+msgstr "Разрешить размешать публикации следующими датами"
 
-#: ../../Zotlabs/Module/New_channel.php:182
+#: ../../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 "Подавлять дублирующие публикации / комментарии"
+
+#: ../../include/features.php:259
 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 "Канал это уникальная сетевая идентичность. Он может представлять человека (профиль в социальной сети), форум или группу, бизнес или страницу знаменитости, новостную ленту и многие другие вещи."
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr "Предотвращает появление публикаций с одинаковым содержимым если интервал между ними менее 2 минут"
 
-#: ../../Zotlabs/Module/New_channel.php:183
+#: ../../include/features.php:266
+msgid "Auto-save drafts of posts and comments"
+msgstr "Автоматически сохранять черновики публикаций и комментариев"
+
+#: ../../include/features.php:267
 msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "или <a href=\"import\">импортировать существующий канал</a> из другого места."
+"Automatically saves post and comment drafts in local browser storage to help "
+"prevent accidental loss of compositions"
+msgstr "Автоматически сохраняет черновики публикаций и комментариев в локальном хранилище браузера для предотвращения их случайной утраты"
 
-#: ../../Zotlabs/Module/New_channel.php:188
-msgid "Validate"
-msgstr "Проверить"
+#: ../../include/features.php:276
+msgid "Manage"
+msgstr "Управление"
 
-#: ../../Zotlabs/Module/Dircensor.php:42
-msgid "Entry censored"
-msgstr "Запись цензурирована"
+#: ../../include/features.php:280
+msgid "Navigation Channel Select"
+msgstr "Выбор канала навигации"
 
-#: ../../Zotlabs/Module/Dircensor.php:45
-msgid "Entry uncensored"
-msgstr "Запись нецензурирована"
+#: ../../include/features.php:281
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Изменить канал напрямую из выпадающего меню"
 
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
-msgstr "Ограничений класса обслуживание не найдено."
+#: ../../include/features.php:294
+msgid "Events Filter"
+msgstr "Фильтр событий"
 
-#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:354
-msgid "Mood"
-msgstr "Настроение"
+#: ../../include/features.php:295
+msgid "Ability to display only events"
+msgstr "Возможность отображать только события"
 
-#: ../../Zotlabs/Module/Mood.php:153
-msgid "Set your current mood and tell your friends"
-msgstr "Установить текущее настроение и рассказать друзьям"
+#: ../../include/features.php:302
+msgid "Polls Filter"
+msgstr "Фильтр голосований"
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "About this site"
-msgstr "Об этом сайте"
+#: ../../include/features.php:303
+msgid "Ability to display only polls"
+msgstr "Возможность отображать только опросы"
 
-#: ../../Zotlabs/Module/Siteinfo.php:22
-msgid "Site Name"
-msgstr "Название сайта"
+#: ../../include/features.php:311
+msgid "Save search terms for re-use"
+msgstr "Сохранять результаты поиска для повторного использования"
 
-#: ../../Zotlabs/Module/Siteinfo.php:26
-msgid "Administrator"
-msgstr "Администратор"
+#: ../../include/features.php:319
+msgid "Ability to file posts under folders"
+msgstr "Возможность размещать публикации в каталогах"
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "Software and Project information"
-msgstr "Информация о программном обеспечении и проекте"
+#: ../../include/features.php:326
+msgid "Alternate Stream Order"
+msgstr "Отображение потока"
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid "This site is powered by $Projectname"
-msgstr "Этот сайт работает на $Projectname"
+#: ../../include/features.php:327
+msgid ""
+"Ability to order the stream by last post date, last comment date or "
+"unthreaded activities"
+msgstr "Возможность показывать поток по дате последнего сообщения, последнего комментария или в порядке поступления"
 
-#: ../../Zotlabs/Module/Siteinfo.php:31
+#: ../../include/features.php:334
+msgid "Contact Filter"
+msgstr "Фильтр контактов"
+
+#: ../../include/features.php:335
+msgid "Ability to display only posts of a selected contact"
+msgstr "Возможность показа публикаций только от выбранных контактов"
+
+#: ../../include/features.php:342
+msgid "Forum Filter"
+msgstr "Фильтр по форумам"
+
+#: ../../include/features.php:343
+msgid "Ability to display only posts of a specific forum"
+msgstr "Возможность показа публикаций только определённого форума"
+
+#: ../../include/features.php:350
+msgid "Personal Posts Filter"
+msgstr "Персональный фильтр публикаций"
+
+#: ../../include/features.php:351
+msgid "Ability to display only posts that you've interacted on"
+msgstr "Возможность показа только тех публикаций с которыми вы взаимодействовали"
+
+#: ../../include/features.php:372
+msgid "Photo Location"
+msgstr "Местоположение фотографии"
+
+#: ../../include/features.php:373
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Если данные о местоположении доступны на загруженных фотографий, связать их с картой."
+
+#: ../../include/features.php:380
+msgid "Flag Adult Photos"
+msgstr "Пометка фотографий для взрослых"
+
+#: ../../include/features.php:381
 msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr "Объединенные и децентрализованные сети и службы идентификациии обеспечиваются Zot"
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
+msgstr "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию"
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Additional federated transport protocols:"
-msgstr "Дополнительные федеративные транспортные протоколы:"
+#: ../../include/features.php:394
+msgid "Advanced Profiles"
+msgstr "Расширенные профили"
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
-#, php-format
-msgid "Version %s"
-msgstr "Версия %s"
+#: ../../include/features.php:395
+msgid "Additional profile sections and selections"
+msgstr "Дополнительные секции и выборы профиля"
 
-#: ../../Zotlabs/Module/Siteinfo.php:37
-msgid "Project homepage"
-msgstr "Домашняя страница проекта"
+#: ../../include/features.php:402
+msgid "Profile Import/Export"
+msgstr "Импорт / экспорт профиля"
 
-#: ../../Zotlabs/Module/Siteinfo.php:38
-msgid "Developer homepage"
-msgstr "Домашняя страница разработчика"
+#: ../../include/features.php:403
+msgid "Save and load profile details across sites/channels"
+msgstr "Сохранение и загрузка настроек профиля на всех сайтах / каналах"
 
-#: ../../Zotlabs/Module/Appman.php:39 ../../Zotlabs/Module/Appman.php:56
-msgid "App installed."
-msgstr "Приложение установлено."
+#: ../../include/features.php:410
+msgid "Multiple Profiles"
+msgstr "Несколько профилей"
 
-#: ../../Zotlabs/Module/Appman.php:49
-msgid "Malformed app."
-msgstr "Неработающее приложение."
+#: ../../include/features.php:411
+msgid "Ability to create multiple profiles"
+msgstr "Возможность создания нескольких профилей"
 
-#: ../../Zotlabs/Module/Appman.php:198
-msgid "Embed code"
-msgstr "Встроить код"
+#: ../../include/selectors.php:17
+msgid "Select a profile to assign to this contact"
+msgstr "Выберите профиль для этого контакта"
 
-#: ../../Zotlabs/Module/Appman.php:204
-msgid "Edit App"
-msgstr "Редактировать приложение"
+#: ../../include/selectors.php:45
+msgid "Frequently"
+msgstr "Часто"
 
-#: ../../Zotlabs/Module/Appman.php:204
-msgid "Create App"
-msgstr "Создать приложение"
+#: ../../include/selectors.php:46
+msgid "Hourly"
+msgstr "Ежечасно"
 
-#: ../../Zotlabs/Module/Appman.php:209
-msgid "Name of app"
-msgstr "Наименование приложения"
+#: ../../include/selectors.php:47
+msgid "Twice daily"
+msgstr "Дважды в день"
 
-#: ../../Zotlabs/Module/Appman.php:210
-msgid "Location (URL) of app"
-msgstr "Местоположение (URL) приложения"
+#: ../../include/selectors.php:48
+msgid "Daily"
+msgstr "Ежедневно"
 
-#: ../../Zotlabs/Module/Appman.php:212
-msgid "Photo icon URL"
-msgstr "URL пиктограммы"
+#: ../../include/selectors.php:49
+msgid "Weekly"
+msgstr "Еженедельно"
 
-#: ../../Zotlabs/Module/Appman.php:212
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 пикселей - необязательно"
+#: ../../include/selectors.php:50
+msgid "Monthly"
+msgstr "Ежемесячно"
 
-#: ../../Zotlabs/Module/Appman.php:213
-msgid "Categories (optional, comma separated list)"
-msgstr "Категории (необязательно, список через запятую)"
+#: ../../include/selectors.php:64
+msgid "Currently Male"
+msgstr "В настоящее время мужской"
 
-#: ../../Zotlabs/Module/Appman.php:214
-msgid "Version ID"
-msgstr "ID версии"
+#: ../../include/selectors.php:64
+msgid "Currently Female"
+msgstr "В настоящее время женский"
 
-#: ../../Zotlabs/Module/Appman.php:215
-msgid "Price of app"
-msgstr "Цена приложения"
+#: ../../include/selectors.php:64
+msgid "Mostly Male"
+msgstr "В основном мужской"
 
-#: ../../Zotlabs/Module/Appman.php:216
-msgid "Location (URL) to purchase app"
-msgstr "Ссылка (URL) для покупки приложения"
+#: ../../include/selectors.php:64
+msgid "Mostly Female"
+msgstr "В основном женский"
 
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "Blocked accounts"
-msgstr "Заблокированные аккаунты"
+#: ../../include/selectors.php:64
+msgid "Transgender"
+msgstr "Трансгендер"
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "Expired accounts"
-msgstr "Просроченные аккаунты"
+#: ../../include/selectors.php:64
+msgid "Intersex"
+msgstr "Интерсексуал"
 
-#: ../../Zotlabs/Module/Admin.php:98
-msgid "Expiring accounts"
-msgstr "Близкие к просрочке аккаунты"
+#: ../../include/selectors.php:64
+msgid "Transsexual"
+msgstr "Транссексуал"
 
-#: ../../Zotlabs/Module/Admin.php:122
-msgid "Message queues"
-msgstr "Очередь сообщений"
+#: ../../include/selectors.php:64
+msgid "Hermaphrodite"
+msgstr "Гермафродит"
 
-#: ../../Zotlabs/Module/Admin.php:136
-msgid "Your software should be updated"
-msgstr "Ваше программное обеспечение должно быть обновлено"
+#: ../../include/selectors.php:64
+msgid "Undecided"
+msgstr "Не решил"
 
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Summary"
-msgstr "Резюме"
+#: ../../include/selectors.php:100 ../../include/selectors.php:119
+msgid "Males"
+msgstr "Мужчины"
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Registered accounts"
-msgstr "Зарегистрированные аккаунты"
+#: ../../include/selectors.php:100 ../../include/selectors.php:119
+msgid "Females"
+msgstr "Женщины"
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Pending registrations"
-msgstr "Ждут утверждения"
+#: ../../include/selectors.php:100
+msgid "Gay"
+msgstr "Гей"
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Registered channels"
-msgstr "Зарегистрированные каналы"
+#: ../../include/selectors.php:100
+msgid "Lesbian"
+msgstr "Лесбиянка"
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Active addons"
-msgstr "Активные расширения"
+#: ../../include/selectors.php:100
+msgid "No Preference"
+msgstr "Без предпочтений"
 
-#: ../../Zotlabs/Module/Admin.php:148
-msgid "Version"
-msgstr "Версия системы"
+#: ../../include/selectors.php:100
+msgid "Bisexual"
+msgstr "Бисексуал"
 
-#: ../../Zotlabs/Module/Admin.php:149
-msgid "Repository version (master)"
-msgstr "Версия репозитория (master)"
+#: ../../include/selectors.php:100
+msgid "Autosexual"
+msgstr "Автосексуал"
 
-#: ../../Zotlabs/Module/Admin.php:150
-msgid "Repository version (dev)"
-msgstr "Версия репозитория (dev)"
+#: ../../include/selectors.php:100
+msgid "Abstinent"
+msgstr "Воздержание"
 
-#: ../../Zotlabs/Module/Contactedit.php:50
-msgid "Invalid abook_id"
-msgstr "Недействительный abook_id"
+#: ../../include/selectors.php:100
+msgid "Virgin"
+msgstr "Девственник"
 
-#: ../../Zotlabs/Module/Contactedit.php:78 ../../Zotlabs/Module/Defperms.php:67
-#: ../../Zotlabs/Module/Connedit.php:80
-msgid "Could not access contact record."
-msgstr "Не удалось получить доступ к записи контакта."
+#: ../../include/selectors.php:100
+msgid "Deviant"
+msgstr "Отклоняющийся от нормы"
 
-#: ../../Zotlabs/Module/Contactedit.php:107
-#: ../../Zotlabs/Module/Connedit.php:101
-msgid "Could not locate selected profile."
-msgstr "Не удалось обнаружить выбранный профиль."
+#: ../../include/selectors.php:100
+msgid "Fetish"
+msgstr "Фетишист"
 
-#: ../../Zotlabs/Module/Contactedit.php:192
-#: ../../Zotlabs/Module/Connedit.php:215
-msgid "is now connected to"
-msgstr "теперь подключён к"
+#: ../../include/selectors.php:100
+msgid "Oodles"
+msgstr "Множественный"
 
-#: ../../Zotlabs/Module/Contactedit.php:252
-#: ../../Zotlabs/Module/Contactedit.php:401
-#: ../../Zotlabs/Module/Connedit.php:701
-msgid "Contact Tools"
-msgstr "Инструменты контактов"
+#: ../../include/selectors.php:100
+msgid "Nonsexual"
+msgstr "Асексуал"
 
-#: ../../Zotlabs/Module/Contactedit.php:329
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid "Approve this contact"
-msgstr "Утвердить этот контакт"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Single"
+msgstr "Одиночка"
 
-#: ../../Zotlabs/Module/Contactedit.php:329
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid "Accept contact to allow communication"
-msgstr "Принять контакт, чтобы разрешить общение"
+#: ../../include/selectors.php:138
+msgid "Lonely"
+msgstr "Одинокий"
 
-#: ../../Zotlabs/Module/Contactedit.php:362
-#: ../../Zotlabs/Module/Connedit.php:658
-msgid "Please select a role for this contact!"
-msgstr "Пожалуйста, выберите роль для этого контакта!"
+#: ../../include/selectors.php:138
+msgid "Available"
+msgstr "Свободен"
 
-#: ../../Zotlabs/Module/Contactedit.php:382
-#: ../../Zotlabs/Module/Connedit.php:678
-msgid "This contact is unreachable from this location."
-msgstr "Этот контакт недоступен из этого местоположения."
+#: ../../include/selectors.php:138
+msgid "Unavailable"
+msgstr "Занят"
 
-#: ../../Zotlabs/Module/Contactedit.php:383
-#: ../../Zotlabs/Module/Connedit.php:679
-msgid "This contact may be unreachable from other channel locations."
-msgstr "Этот контакт может быть недоступен из других мест размещения канала."
+#: ../../include/selectors.php:138
+msgid "Has crush"
+msgstr "Влюблён"
 
-#: ../../Zotlabs/Module/Contactedit.php:385
-#: ../../Zotlabs/Module/Connedit.php:681
-msgid "Location independence is not supported by their network."
-msgstr "Независимое местоположение не поддерживается их сетью."
+#: ../../include/selectors.php:138
+msgid "Infatuated"
+msgstr "без ума"
 
-#: ../../Zotlabs/Module/Contactedit.php:395
-msgid "View profile"
-msgstr "Просмотреть профиль"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Dating"
+msgstr "Встречаюсь"
 
-#: ../../Zotlabs/Module/Contactedit.php:397
-#: ../../Zotlabs/Module/Connections.php:405
-msgid "This is a group/forum channel"
-msgstr "Это канал группы или форума"
+#: ../../include/selectors.php:138
+msgid "Unfaithful"
+msgstr "Неверный"
 
-#: ../../Zotlabs/Module/Contactedit.php:408
-msgid "Select a role for this contact"
-msgstr "Выбрать роль для этого контакта"
+#: ../../include/selectors.php:138
+msgid "Sex Addict"
+msgstr "Эротоман"
 
-#: ../../Zotlabs/Module/Contactedit.php:420
-#: ../../Zotlabs/Module/Connedit.php:703
-msgid "Slide to adjust your degree of friendship"
-msgstr "Прокрутить для настройки степени дружбы"
+#: ../../include/selectors.php:138
+msgid "Friends/Benefits"
+msgstr "Друзья / Выгоды"
 
-#: ../../Zotlabs/Module/Contactedit.php:422
-#: ../../Zotlabs/Module/Connedit.php:705
-msgid "Custom Filter"
-msgstr "Настраиваемый фильтр"
+#: ../../include/selectors.php:138
+msgid "Casual"
+msgstr "Легкомысленный"
 
-#: ../../Zotlabs/Module/Contactedit.php:423
-#: ../../Zotlabs/Module/Connedit.php:706
-msgid "Only import posts with this text"
-msgstr "Импортировать публикации только с этим текстом"
+#: ../../include/selectors.php:138
+msgid "Engaged"
+msgstr "Помолвлен"
 
-#: ../../Zotlabs/Module/Contactedit.php:424
-#: ../../Zotlabs/Module/Connedit.php:707
-msgid "Do not import posts with this text"
-msgstr "Не импортировать публикации с этим текстом"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Married"
+msgstr "В браке"
 
-#: ../../Zotlabs/Module/Contactedit.php:429
-#: ../../Zotlabs/Module/Connedit.php:714
-msgid "Approve contact"
-msgstr "Утвердить контакт"
+#: ../../include/selectors.php:138
+msgid "Imaginarily married"
+msgstr "В воображаемом браке"
 
-#: ../../Zotlabs/Module/Contactedit.php:431
-#: ../../Zotlabs/Module/Connedit.php:717
-msgid "Their"
-msgstr "Их"
+#: ../../include/selectors.php:138
+msgid "Partners"
+msgstr "Партнёрство"
 
-#: ../../Zotlabs/Module/Contactedit.php:432
-#: ../../Zotlabs/Module/Connedit.php:718
-msgid "My"
-msgstr "Мои"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Cohabiting"
+msgstr "Сожительствующие"
 
-#: ../../Zotlabs/Module/Contactedit.php:449
-msgid "Contact updated"
-msgstr "Контакт обновлён"
+#: ../../include/selectors.php:138
+msgid "Common law"
+msgstr "Гражданский брак"
 
-#: ../../Zotlabs/Module/Contactedit.php:449
-msgid "Contact update failed"
-msgstr "Обновление контакта не удалось"
+#: ../../include/selectors.php:138
+msgid "Happy"
+msgstr "Счастлив"
 
-#: ../../Zotlabs/Module/Contactedit.php:455
-#: ../../Zotlabs/Module/Connections.php:348
-msgid "Approve connection"
-msgstr "Утвердить контакт"
+#: ../../include/selectors.php:138
+msgid "Not looking"
+msgstr "Не нуждаюсь"
 
-#: ../../Zotlabs/Module/Contactedit.php:501
-#: ../../Zotlabs/Module/Contactedit.php:511
-msgid "Refresh succeeded"
-msgstr "Обновление выполнено"
+#: ../../include/selectors.php:138
+msgid "Swinger"
+msgstr "Свингер"
 
-#: ../../Zotlabs/Module/Contactedit.php:504
-msgid "Refresh failed - channel is currently unavailable"
-msgstr "Ошибка обновления - канал в настоящее время недоступен"
+#: ../../include/selectors.php:138
+msgid "Betrayed"
+msgstr "Предан"
 
-#: ../../Zotlabs/Module/Contactedit.php:523
-msgid "Block status updated"
-msgstr "Статус блокировки обновлён"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Separated"
+msgstr "Разделён"
 
-#: ../../Zotlabs/Module/Contactedit.php:527
-msgid "Block failed"
-msgstr "Блокировка не удалась"
+#: ../../include/selectors.php:138
+msgid "Unstable"
+msgstr "Нестабильно"
 
-#: ../../Zotlabs/Module/Contactedit.php:538
-msgid "Ignore status updated"
-msgstr "Статус игнорирования обновлён"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Divorced"
+msgstr "В разводе"
 
-#: ../../Zotlabs/Module/Contactedit.php:542
-msgid "Ignore failed"
-msgstr "Игнорирование не удалось"
+#: ../../include/selectors.php:138
+msgid "Imaginarily divorced"
+msgstr "В воображаемом разводе"
 
-#: ../../Zotlabs/Module/Contactedit.php:553
-msgid "Archive status updated"
-msgstr "Статус архивации обновлён"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "Widowed"
+msgstr "Вдовец / вдова"
 
-#: ../../Zotlabs/Module/Contactedit.php:557
-msgid "Archive failed"
-msgstr "Архивация не удалась"
+#: ../../include/selectors.php:138
+msgid "Uncertain"
+msgstr "Неопределенный"
 
-#: ../../Zotlabs/Module/Contactedit.php:568
-msgid "Hide status updated"
-msgstr "Статус скрытия обновлён"
+#: ../../include/selectors.php:138 ../../include/selectors.php:155
+msgid "It's complicated"
+msgstr "Это сложно"
 
-#: ../../Zotlabs/Module/Contactedit.php:572
-msgid "Hide failed"
-msgstr "Скрытие не удалось"
+#: ../../include/selectors.php:138
+msgid "Don't care"
+msgstr "Всё равно"
 
-#: ../../Zotlabs/Module/Contactedit.php:607
-msgid "Contact removed"
-msgstr "Контакт удалён"
+#: ../../include/selectors.php:138
+msgid "Ask me"
+msgstr "Спроси меня"
 
-#: ../../Zotlabs/Module/Contactedit.php:611
-msgid "Delete failed"
-msgstr "Не удалось удалить"
+#: ../../include/items.php:980 ../../include/items.php:1040
+msgid "(Unknown)"
+msgstr "(Неизвестный)"
 
-#: ../../Zotlabs/Module/Contactedit.php:621
-#: ../../Zotlabs/Module/Connedit.php:487
-msgid "Refresh Permissions"
-msgstr "Обновить разрешения"
+#: ../../include/items.php:1229
+msgid "Visible to anybody on the internet."
+msgstr "Виден всем в интернете."
 
-#: ../../Zotlabs/Module/Contactedit.php:622
-#: ../../Zotlabs/Module/Connedit.php:490
-msgid "Fetch updated permissions"
-msgstr "Получить обновлённые разрешения"
+#: ../../include/items.php:1231
+msgid "Visible to you only."
+msgstr "Видно только вам."
 
-#: ../../Zotlabs/Module/Contactedit.php:626
-#: ../../Zotlabs/Module/Connedit.php:494
-msgid "Refresh Photo"
-msgstr "Обновить фотографию"
+#: ../../include/items.php:1233
+msgid "Visible to anybody in this network."
+msgstr "Видно всем в этой сети."
 
-#: ../../Zotlabs/Module/Contactedit.php:627
-#: ../../Zotlabs/Module/Connedit.php:497
-msgid "Fetch updated photo"
-msgstr "Получить обновлённую фотографию"
+#: ../../include/items.php:1235
+msgid "Visible to anybody authenticated."
+msgstr "Видно всем аутентифицированным."
 
-#: ../../Zotlabs/Module/Contactedit.php:634
-#: ../../Zotlabs/Module/Connedit.php:511
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Блокировать (или разблокировать) связи с этим контактом"
+#: ../../include/items.php:1237
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Видно всем в %s."
 
-#: ../../Zotlabs/Module/Contactedit.php:635
-#: ../../Zotlabs/Module/Connedit.php:512
-msgid "This connection is blocked!"
-msgstr "Этот контакт заблокирован!"
+#: ../../include/items.php:1239
+msgid "Visible to all connections."
+msgstr "Видно всем контактам."
 
-#: ../../Zotlabs/Module/Contactedit.php:639
-#: ../../Zotlabs/Module/Connedit.php:516
-msgid "Unignore"
-msgstr "Не игнорировать"
+#: ../../include/items.php:1241
+msgid "Visible to approved connections."
+msgstr "Видно только одобренным контактам."
 
-#: ../../Zotlabs/Module/Contactedit.php:639
-#: ../../Zotlabs/Module/Connections.php:351
-#: ../../Zotlabs/Module/Connedit.php:516
-msgid "Ignore"
-msgstr "Игнорировать"
+#: ../../include/items.php:1243
+msgid "Visible to specific connections."
+msgstr "Видно указанным контактам."
 
-#: ../../Zotlabs/Module/Contactedit.php:641
-#: ../../Zotlabs/Module/Connedit.php:519
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Игнорировать (или не игнорировать) все связи для этого контакта"
+#: ../../include/items.php:4414
+msgid "Privacy group is empty."
+msgstr "Группа конфиденциальности пуста"
 
-#: ../../Zotlabs/Module/Contactedit.php:642
-#: ../../Zotlabs/Module/Connedit.php:520
-msgid "This connection is ignored!"
-msgstr "Этот контакт игнорируется!"
+#: ../../include/items.php:4421
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Группа конфиденциальности: %s"
 
-#: ../../Zotlabs/Module/Contactedit.php:646
-#: ../../Zotlabs/Module/Connedit.php:524
-msgid "Unarchive"
-msgstr "Разархивировать"
+#: ../../include/items.php:4431
+#, php-format
+msgid "Connection: %s"
+msgstr "Контакт: %s"
 
-#: ../../Zotlabs/Module/Contactedit.php:646
-#: ../../Zotlabs/Module/Connedit.php:524
-msgid "Archive"
-msgstr "Заархивировать"
+#: ../../include/items.php:4433
+msgid "Connection not found."
+msgstr "Контакт не найден."
 
-#: ../../Zotlabs/Module/Contactedit.php:648
-#: ../../Zotlabs/Module/Connedit.php:527
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое"
+#: ../../include/items.php:4786
+msgid "profile photo"
+msgstr "Фотография профиля"
 
-#: ../../Zotlabs/Module/Contactedit.php:649
-#: ../../Zotlabs/Module/Connedit.php:528
-msgid "This connection is archived!"
-msgstr "Этот контакт заархивирован!"
+#: ../../include/items.php:4983
+#, php-format
+msgid "[Edited %s]"
+msgstr "[Отредактировано %s]"
 
-#: ../../Zotlabs/Module/Contactedit.php:653
-#: ../../Zotlabs/Module/Connedit.php:532
-msgid "Unhide"
-msgstr "Показать"
+#: ../../include/items.php:4983
+msgctxt "edit_activity"
+msgid "Post"
+msgstr "Публикация"
 
-#: ../../Zotlabs/Module/Contactedit.php:653
-#: ../../Zotlabs/Module/Connedit.php:532
-msgid "Hide"
-msgstr "Скрыть"
+#: ../../include/items.php:4983
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr "Комментарий"
 
-#: ../../Zotlabs/Module/Contactedit.php:655
-#: ../../Zotlabs/Module/Connedit.php:535
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Скрыть или показать этот контакт от / для остальных"
+#: ../../include/attach.php:273 ../../include/attach.php:324
+#: ../../include/attach.php:419
+msgid "Item was not found."
+msgstr "Элемент не найден."
 
-#: ../../Zotlabs/Module/Contactedit.php:656
-#: ../../Zotlabs/Module/Connedit.php:536
-msgid "This connection is hidden!"
-msgstr "Этот контакт скрыт!"
+#: ../../include/attach.php:290
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
 
-#: ../../Zotlabs/Module/Contactedit.php:662
-#: ../../Zotlabs/Module/Connedit.php:543
-msgid "Delete this connection"
-msgstr "Удалить этот контакт"
+#: ../../include/attach.php:612
+msgid "No source file."
+msgstr "Нет исходного файла."
 
-#: ../../Zotlabs/Module/Cards.php:110
-msgid "Add Card"
-msgstr "Добавить карточку"
+#: ../../include/attach.php:634
+msgid "Cannot locate file to replace"
+msgstr "Не удается найти файл для замены"
 
-#: ../../Zotlabs/Module/Directory.php:121
-msgid "No default suggestions were found."
-msgstr "Предложений по умолчанию не найдено."
+#: ../../include/attach.php:653
+msgid "Cannot locate file to revise/update"
+msgstr "Не удается найти файл для пересмотра / обновления"
 
-#: ../../Zotlabs/Module/Directory.php:281
+#: ../../include/attach.php:800
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d оценка"
-msgstr[1] "%d оценки"
-msgstr[2] "%d оценок"
+msgid "File exceeds size limit of %d"
+msgstr "Файл превышает предельный размер %d"
 
-#: ../../Zotlabs/Module/Directory.php:292
-msgid "Gender: "
-msgstr "Пол:"
+#: ../../include/attach.php:821
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Вы достигли предела %1$.0f Мбайт для хранения вложений."
 
-#: ../../Zotlabs/Module/Directory.php:294
-msgid "Status: "
-msgstr "Статус:"
+#: ../../include/attach.php:1009
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена."
 
-#: ../../Zotlabs/Module/Directory.php:296
-msgid "Homepage: "
-msgstr "Домашняя страница:"
+#: ../../include/attach.php:1038
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Файл для сохранения не может быть проверен. Загрузка не удалась."
 
-#: ../../Zotlabs/Module/Directory.php:359
-msgid "Description:"
-msgstr "Описание:"
+#: ../../include/attach.php:1110 ../../include/attach.php:1126
+msgid "Path not available."
+msgstr "Путь недоступен."
 
-#: ../../Zotlabs/Module/Directory.php:370
-msgid "Public Forum:"
-msgstr "Публичный форум:"
+#: ../../include/attach.php:1174 ../../include/attach.php:1337
+msgid "Empty pathname"
+msgstr "Пустое имя пути"
 
-#: ../../Zotlabs/Module/Directory.php:373
-msgid "Keywords: "
-msgstr "Ключевые слова:"
+#: ../../include/attach.php:1200
+msgid "duplicate filename or path"
+msgstr "дублирующееся имя файла или пути"
 
-#: ../../Zotlabs/Module/Directory.php:376
-msgid "Don't suggest"
-msgstr "Не предлагать"
+#: ../../include/attach.php:1225
+msgid "Path not found."
+msgstr "Путь не найден."
 
-#: ../../Zotlabs/Module/Directory.php:378
-msgid "Common connections (estimated):"
-msgstr "Общие контакты (оценочно):"
+#: ../../include/attach.php:1293
+msgid "mkdir failed."
+msgstr "mkdir не удался"
 
-#: ../../Zotlabs/Module/Directory.php:427
-msgid "Global Directory"
-msgstr "Глобальный каталог"
+#: ../../include/attach.php:1297
+msgid "database storage failed."
+msgstr "ошибка при записи базы данных."
 
-#: ../../Zotlabs/Module/Directory.php:427
-msgid "Local Directory"
-msgstr "Локальный каталог"
+#: ../../include/attach.php:1343
+msgid "Empty path"
+msgstr "Пустое имя пути"
 
-#: ../../Zotlabs/Module/Directory.php:433
-msgid "Finding:"
-msgstr "Поиск:"
+#: ../../include/attach.php:2104
+#, php-format
+msgid "%s shared a %s with you"
+msgstr "%s поделился с вами %s"
 
-#: ../../Zotlabs/Module/Directory.php:438
-msgid "next page"
-msgstr "следующая страница"
+#: ../../include/attach.php:2104
+#: ../../extend/addon/hzaddons/redfiles/redfilehelper.php:64
+msgid "file"
+msgstr "файл"
 
-#: ../../Zotlabs/Module/Directory.php:438
-msgid "previous page"
-msgstr "предыдущая страница"
+#: ../../include/network.php:412
+msgid "url: "
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:439
-msgid "Sort options"
-msgstr "Параметры сортировки"
+#: ../../include/network.php:413
+msgid "error_code: "
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:440
-msgid "Alphabetic"
-msgstr "По алфавиту"
+#: ../../include/network.php:414
+msgid "error_string: "
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:441
-msgid "Reverse Alphabetic"
-msgstr "Против алфавита"
+#: ../../include/network.php:415
+msgid "content-type: "
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:442
-msgid "Newest to Oldest"
-msgstr "От новых к старым"
+#: ../../include/network.php:1762 ../../include/network.php:1763
+msgid "Friendica"
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:443
-msgid "Oldest to Newest"
-msgstr "От старых к новым"
+#: ../../include/network.php:1764
+msgid "OStatus"
+msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:460
-msgid "No entries (some entries may be hidden)."
-msgstr "Нет записей (некоторые записи могут быть скрыты)."
+#: ../../include/network.php:1765
+msgid "GNU-Social"
+msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:74 ../../Zotlabs/Module/Api.php:95
-msgid "Authorize application connection"
-msgstr "Авторизовать подключение приложения"
+#: ../../include/network.php:1766
+msgid "RSS/Atom"
+msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:75
-msgid "Return to your app and insert this Security Code:"
-msgstr "Вернитесь к своему приложению и вставьте этот код безопасности:"
+#: ../../include/network.php:1769
+msgid "Diaspora"
+msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:85
-msgid "Please login to continue."
-msgstr "Пожалуйста, войдите, чтобы продолжить."
+#: ../../include/network.php:1770
+msgid "Facebook"
+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/network.php:1771
+msgid "Zot"
+msgstr ""
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
-msgstr "Пожалуйста, войдите."
+#: ../../include/network.php:1772
+msgid "LinkedIn"
+msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
-msgid "Block Name"
-msgstr "Название блока"
+#: ../../include/network.php:1773
+msgid "XMPP/IM"
+msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
-msgstr "Заблокировать заголовок"
+#: ../../include/network.php:1774
+msgid "MySpace"
+msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:36
-msgid "Email Verification Required"
-msgstr "Требуется проверка адреса email"
+#: ../../include/bbcode.php:233 ../../include/bbcode.php:928
+#: ../../include/bbcode.php:1549 ../../include/bbcode.php:1557
+msgid "Image/photo"
+msgstr "Изображение / фотография"
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../include/bbcode.php:280 ../../include/bbcode.php:1574
+msgid "Encrypted content"
+msgstr "Зашифрованное содержание"
+
+#: ../../include/bbcode.php:334
+#, php-format
+msgid "Install %1$s element %2$s"
+msgstr "Установить %1$s элемент %2$s"
+
+#: ../../include/bbcode.php:338
 #, 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]. Введите этот токен здесь для завершения этапа проверки учётной записи. Пожалуйста, подождите несколько минут для завершения доставки и проверьте вашу папку \"Спам\" если вы не видите письма."
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Эта публикация содержит устанавливаемый %s элемент, однако у вас нет разрешений для его установки на этом сайте."
 
-#: ../../Zotlabs/Module/Email_validation.php:38
-msgid "Resend Email"
-msgstr "Выслать повторно"
+#: ../../include/bbcode.php:551
+msgid "card"
+msgstr "карточка"
 
-#: ../../Zotlabs/Module/Email_validation.php:41
-msgid "Validation token"
-msgstr "Проверочный код"
+#: ../../include/bbcode.php:553
+msgid "article"
+msgstr "статья"
 
-#: ../../Zotlabs/Module/Attach.php:68
-msgid "Item not available."
-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/Vote.php:40
-msgid "Poll not found."
-msgstr "Опрос не найден"
+#: ../../include/bbcode.php:636 ../../include/bbcode.php:644
+msgid "Click to open/close"
+msgstr "Нажмите, чтобы открыть/закрыть"
 
-#: ../../Zotlabs/Module/Vote.php:71
-msgid "Invalid response."
-msgstr "Неверный ответ."
+#: ../../include/bbcode.php:644 ../../include/markdown.php:256
+msgid "spoiler"
+msgstr "спойлер"
 
-#: ../../Zotlabs/Module/Vote.php:127
-msgid "Response submitted. Updates may not appear instantly."
-msgstr "Ответ отправлен. Обновления могут отображаться не сразу."
+#: ../../include/bbcode.php:657
+msgid "View article"
+msgstr "Просмотр статьи"
 
-#: ../../Zotlabs/Module/Profile_photo.php:128
-#: ../../Zotlabs/Module/Cover_photo.php:85
-msgid "Image uploaded but image cropping failed."
-msgstr "Изображение загружено но обрезка не удалась."
+#: ../../include/bbcode.php:657
+msgid "View summary"
+msgstr "Просмотр резюме"
 
-#: ../../Zotlabs/Module/Profile_photo.php:184
-#: ../../Zotlabs/Module/Cover_photo.php:212
-msgid "Image resize failed."
-msgstr "Не удалось изменить размер изображения."
+#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1235
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:622
+msgid "Different viewers will see this text differently"
+msgstr "Различные зрители увидят этот текст по-разному"
 
-#: ../../Zotlabs/Module/Profile_photo.php:350
-#: ../../Zotlabs/Module/Cover_photo.php:265
-msgid "Image upload failed."
-msgstr "Загрузка изображения не удалась."
+#: ../../include/bbcode.php:1525
+msgid "$1 wrote:"
+msgstr "$1 писал:"
 
-#: ../../Zotlabs/Module/Profile_photo.php:370
-#: ../../Zotlabs/Module/Cover_photo.php:282
-msgid "Unable to process image."
-msgstr "Невозможно обработать изображение."
+#: ../../include/security.php:629
+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-х часов) перед её отправкой."
 
-#: ../../Zotlabs/Module/Profile_photo.php:428
-#: ../../Zotlabs/Module/Profile_photo.php:493
-#: ../../Zotlabs/Module/Cover_photo.php:367
-#: ../../Zotlabs/Module/Cover_photo.php:382
-msgid "Photo not available."
-msgstr "Фотография недоступна."
+#: ../../include/account.php:38
+msgid "The provided email address is not valid"
+msgstr "Предоставленный адрес электронной почты недействителен"
 
-#: ../../Zotlabs/Module/Profile_photo.php:540
-msgid ""
-"This profile photo will be visible to anybody on the internet and may be "
-"distributed to other websites."
-msgstr "Эта фотография профиля будет видна любому человеку в Интернете и может быть отправлена на другие сайты."
+#: ../../include/account.php:41
+msgid "The provided email domain is not among those allowed on this site"
+msgstr "Домен электронной почты не входит в число разрешенных на этом сайте"
+
+#: ../../include/account.php:48
+msgid "The provided email address is already registered at this site"
+msgstr "Предоставленный адрес электронной почты уже зарегистрирован на этом сайте"
 
-#: ../../Zotlabs/Module/Profile_photo.php:540
+#: ../../include/account.php:55
 msgid ""
-"This profile photo will be visible only to channels with permission to view "
-"this profile."
-msgstr "Это фото профиля будет видно только тем каналам, у которых есть разрешение на просмотр этого профиля."
+"There is a pending registration for this address - click \"Register\" to "
+"continue verification"
+msgstr "Для этого адреса ожидается регистрация - нажмите \"Зарегистрироваться\", чтобы продолжить проверку"
 
-#: ../../Zotlabs/Module/Profile_photo.php:542
-msgid "Use Photo for Profile"
-msgstr "Использовать фотографию для профиля"
+#: ../../include/account.php:94
+msgid "An invitation is required."
+msgstr "Требуется приглашение."
 
-#: ../../Zotlabs/Module/Profile_photo.php:542
-msgid "Change Profile Photo"
-msgstr "Изменить фотографию профиля"
+#: ../../include/account.php:103
+msgid "Invitation could not be verified."
+msgstr "Не удалось проверить приглашение."
 
-#: ../../Zotlabs/Module/Profile_photo.php:544
-msgid "Reset to default"
-msgstr "Сброс до настроек по умолчанию"
+#: ../../include/account.php:191
+msgid "Please enter the required information."
+msgstr "Пожалуйста, введите необходимую информацию."
 
-#: ../../Zotlabs/Module/Profile_photo.php:547
-#: ../../Zotlabs/Module/Profile_photo.php:548
-#: ../../Zotlabs/Module/Cover_photo.php:426
-#: ../../Zotlabs/Module/Cover_photo.php:427
-msgid "Use a photo from your albums"
-msgstr "Использовать фотографию из ваших альбомов"
+#: ../../include/account.php:258 ../../include/account.php:366
+msgid "Failed to store account information."
+msgstr "Не удалось сохранить информацию аккаунта."
 
-#: ../../Zotlabs/Module/Profile_photo.php:553
-#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:402
-msgid "Choose a different album"
-msgstr "Выбрать другой альбом"
+#: ../../include/account.php:578
+#, php-format
+msgid "Registration request at %s"
+msgstr "Запрос регистрации на %s"
 
-#: ../../Zotlabs/Module/Profile_photo.php:558
-msgid "Select existing"
-msgstr "Выберите существующее"
+#: ../../include/account.php:600
+msgid "your registration password"
+msgstr "ваш пароль регистрации"
 
-#: ../../Zotlabs/Module/Profile_photo.php:577
-#: ../../Zotlabs/Module/Cover_photo.php:455
-msgid "Crop Image"
-msgstr "Обрезать изображение"
+#: ../../include/account.php:606 ../../include/account.php:695
+#, php-format
+msgid "Registration details for %s"
+msgstr "Регистрационные данные для %s"
 
-#: ../../Zotlabs/Module/Profile_photo.php:578
-#: ../../Zotlabs/Module/Cover_photo.php:456
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Пожалуйста настройте обрезку изображения для оптимального просмотра."
+#: ../../include/account.php:706
+msgid "Account approved."
+msgstr "Аккаунт утвержден."
 
-#: ../../Zotlabs/Module/Profile_photo.php:580
-msgid "Done editing"
-msgstr "Редактирование завершено"
+#: ../../include/account.php:762
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Регистрация отозвана для %s"
 
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
-msgstr "Редактировать блок"
+#: ../../include/account.php:769
+#, php-format
+msgid "Could not revoke registration for %s"
+msgstr "Не удалось отозвать регистрацию для %s"
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "Enter a folder name"
-msgstr "Введите название каталога"
+#: ../../include/account.php:1185 ../../include/account.php:1187
+msgid "Click here to upgrade."
+msgstr "Нажмите здесь для обновления."
 
-#: ../../Zotlabs/Module/Filer.php:53
-msgid "or select an existing folder (doubleclick)"
-msgstr "или выберите существующий каталог (двойной щелчок)"
+#: ../../include/account.php:1193
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Это действие превышает ограничения, установленные в вашем плане."
 
-#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:208
-msgid "Save to Folder"
-msgstr "Сохранить в каталог"
+#: ../../include/account.php:1198
+msgid "This action is not available under your subscription plan."
+msgstr "Это действие невозможно из-за ограничений в вашем плане."
 
-#: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Name"
-msgstr "Название шаблона"
+#: ../../include/account.php:1258
+msgid "open"
+msgstr "открыта"
 
-#: ../../Zotlabs/Module/Editlayout.php:129 ../../Zotlabs/Module/Layouts.php:132
-msgid "Layout Description (Optional)"
-msgstr "Описание шаблона (необязательно)"
+#: ../../include/account.php:1258
+msgid "closed"
+msgstr "закрыта"
 
-#: ../../Zotlabs/Module/Editlayout.php:137
-msgid "Edit Layout"
-msgstr "Редактировать шаблон"
+#: ../../include/account.php:1265
+msgid "Registration is currently"
+msgstr "В настоящее время регистрация"
 
-#: ../../Zotlabs/Module/Connections.php:58
-#: ../../Zotlabs/Module/Connections.php:116
-#: ../../Zotlabs/Module/Connections.php:282
-msgid "Active"
-msgstr "Активен"
+#: ../../include/account.php:1274
+msgid "please come back"
+msgstr "пожалуйста, возвращайтесь позднее"
 
-#: ../../Zotlabs/Module/Connections.php:63
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:287
-msgid "Blocked"
-msgstr "Заблокирован"
+#: ../../include/acl_selectors.php:100
+msgid "Profile-Based Privacy Groups"
+msgstr "Группы конфиденциальности основанные на профиле"
 
-#: ../../Zotlabs/Module/Connections.php:68
-#: ../../Zotlabs/Module/Connections.php:189
-#: ../../Zotlabs/Module/Connections.php:286
-msgid "Ignored"
-msgstr "Игнорируется"
+#: ../../include/acl_selectors.php:119
+msgid "Private Forum"
+msgstr "Частный форум"
 
-#: ../../Zotlabs/Module/Connections.php:73
-#: ../../Zotlabs/Module/Connections.php:203
-#: ../../Zotlabs/Module/Connections.php:285
-msgid "Hidden"
-msgstr "Скрыт"
+#: ../../include/acl_selectors.php:143
+msgid "Share with"
+msgstr "Поделиться с"
 
-#: ../../Zotlabs/Module/Connections.php:78
-#: ../../Zotlabs/Module/Connections.php:196
-msgid "Archived/Unreachable"
-msgstr "Заархивировано / недоступно"
+#: ../../include/acl_selectors.php:144
+msgid "Custom selection"
+msgstr "Настраиваемый выбор"
 
-#: ../../Zotlabs/Module/Connections.php:83
-#: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:180
-#: ../../Zotlabs/Module/Notifications.php:101
-msgid "New"
-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/Connections.php:158
-msgid "Active Connections"
-msgstr "Активные контакты"
+#: ../../include/acl_selectors.php:148
+msgid "Don't allow"
+msgstr "Не разрешать"
 
-#: ../../Zotlabs/Module/Connections.php:161
-msgid "Show active connections"
-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/Connections.php:168
-msgid "Show pending (new) connections"
-msgstr "Просмотр (новых) ожидающих контактов"
+#: ../../include/text.php:546
+msgid "prev"
+msgstr "предыдущий"
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show blocked connections"
-msgstr "Показать только заблокированные контакты"
+#: ../../include/text.php:548
+msgid "first"
+msgstr "первый"
 
-#: ../../Zotlabs/Module/Connections.php:192
-msgid "Only show ignored connections"
-msgstr "Показать только проигнорированные контакты"
+#: ../../include/text.php:577
+msgid "last"
+msgstr "последний"
 
-#: ../../Zotlabs/Module/Connections.php:199
-msgid "Only show archived/unreachable connections"
-msgstr "Показать только заархивированные / недоступные контакты"
+#: ../../include/text.php:580
+msgid "next"
+msgstr "следующий"
 
-#: ../../Zotlabs/Module/Connections.php:206
-msgid "Only show hidden connections"
-msgstr "Показать только скрытые контакты"
+#: ../../include/text.php:598
+msgid "older"
+msgstr "старше"
 
-#: ../../Zotlabs/Module/Connections.php:221
-msgid "Show all connections"
-msgstr "Просмотр всех контактов"
+#: ../../include/text.php:600
+msgid "newer"
+msgstr "новее"
 
-#: ../../Zotlabs/Module/Connections.php:283
-msgid "Pending approval"
-msgstr "Ожидающие подтверждения"
+#: ../../include/text.php:1093
+#, php-format
+msgid "View all %s connections"
+msgstr "Просмотреть все %s контактов"
 
-#: ../../Zotlabs/Module/Connections.php:284
-msgid "Archived"
-msgstr "Зархивирован"
+#: ../../include/text.php:1156
+#, php-format
+msgid "Network: %s"
+msgstr "Сеть: %s"
 
-#: ../../Zotlabs/Module/Connections.php:288
-msgid "Not connected at this location"
-msgstr "Не подключено в этом месте"
+#: ../../include/text.php:1259 ../../include/text.php:1263
+msgid "poke"
+msgstr "Ткнуть"
 
-#: ../../Zotlabs/Module/Connections.php:327
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr ""
+#: ../../include/text.php:1264
+msgid "ping"
+msgstr "Пингануть"
 
-#: ../../Zotlabs/Module/Connections.php:328
-msgid "Edit connection"
-msgstr "Редактировать контакт"
+#: ../../include/text.php:1264
+msgid "pinged"
+msgstr "Отпингован"
 
-#: ../../Zotlabs/Module/Connections.php:330
-msgid "Delete connection"
-msgstr "Удалить контакт"
+#: ../../include/text.php:1265
+msgid "prod"
+msgstr "Подтолкнуть"
 
-#: ../../Zotlabs/Module/Connections.php:336
-msgid "Channel address"
-msgstr "Адрес канала"
+#: ../../include/text.php:1265
+msgid "prodded"
+msgstr "Подтолкнут"
 
-#: ../../Zotlabs/Module/Connections.php:341
-msgid "Call"
-msgstr "Вызов"
+#: ../../include/text.php:1266
+msgid "slap"
+msgstr "Шлёпнуть"
 
-#: ../../Zotlabs/Module/Connections.php:343
-msgid "Status"
-msgstr "Статус"
+#: ../../include/text.php:1266
+msgid "slapped"
+msgstr "Шлёпнут"
 
-#: ../../Zotlabs/Module/Connections.php:346
-msgid "Connected"
-msgstr "Подключено"
+#: ../../include/text.php:1267
+msgid "finger"
+msgstr "Указать"
 
-#: ../../Zotlabs/Module/Connections.php:350
-msgid "Ignore connection"
-msgstr "Игнорировать контакт"
+#: ../../include/text.php:1267
+msgid "fingered"
+msgstr "Указан"
 
-#: ../../Zotlabs/Module/Connections.php:352
-msgid "Recent activity"
-msgstr "Последние действия"
+#: ../../include/text.php:1268
+msgid "rebuff"
+msgstr "Дать отпор"
 
-#: ../../Zotlabs/Module/Connections.php:358
-msgid "Connect at this location"
-msgstr "Подключить в этом месте"
+#: ../../include/text.php:1268
+msgid "rebuffed"
+msgstr "Дан отпор"
 
-#: ../../Zotlabs/Module/Connections.php:395
-#: ../../Zotlabs/Module/Connedit.php:686
-msgid "Contact role"
-msgstr "Роль контакта"
+#: ../../include/text.php:1291
+msgid "happy"
+msgstr "счастливый"
 
-#: ../../Zotlabs/Module/Connections.php:396
-msgid "Search your connections"
-msgstr "Поиск ваших контактов"
+#: ../../include/text.php:1292
+msgid "sad"
+msgstr "грустный"
 
-#: ../../Zotlabs/Module/Connections.php:397
-msgid "Contact search"
-msgstr "Поиск контакта"
+#: ../../include/text.php:1293
+msgid "mellow"
+msgstr "спокойный"
 
-#: ../../Zotlabs/Module/Cover_photo.php:196
-#: ../../Zotlabs/Module/Cover_photo.php:254
-msgid "Cover Photos"
-msgstr "Фотографии обложки"
+#: ../../include/text.php:1294
+msgid "tired"
+msgstr "усталый"
 
-#: ../../Zotlabs/Module/Cover_photo.php:418
-msgid "Your cover photo may be visible to anybody on the internet"
-msgstr "Фотография вашей обложки может быть видна всем в Интернете"
+#: ../../include/text.php:1295
+msgid "perky"
+msgstr "весёлый"
 
-#: ../../Zotlabs/Module/Cover_photo.php:420
-msgid "Upload File:"
-msgstr "Загрузить файл:"
+#: ../../include/text.php:1296
+msgid "angry"
+msgstr "сердитый"
 
-#: ../../Zotlabs/Module/Cover_photo.php:421
-msgid "Select a profile:"
-msgstr "Выбрать профиль:"
+#: ../../include/text.php:1297
+msgid "stupefied"
+msgstr "отупевший"
 
-#: ../../Zotlabs/Module/Cover_photo.php:422
-msgid "Change Cover Photo"
-msgstr "Изменить фотографию обложки"
+#: ../../include/text.php:1298
+msgid "puzzled"
+msgstr "недоумевающий"
 
-#: ../../Zotlabs/Module/Cover_photo.php:438
-msgid "Select existing photo"
-msgstr "Выбрать существующую фотографию"
+#: ../../include/text.php:1299
+msgid "interested"
+msgstr "заинтересованный"
 
-#: ../../Zotlabs/Module/Cover_photo.php:458
-msgid "Done Editing"
-msgstr "Закончить редактирование"
+#: ../../include/text.php:1300
+msgid "bitter"
+msgstr "едкий"
 
-#: ../../Zotlabs/Module/Photos.php:80
-msgid "Page owner information could not be retrieved."
-msgstr "Информация о владельце страницы не может быть получена."
+#: ../../include/text.php:1301
+msgid "cheerful"
+msgstr "бодрый"
 
-#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115
-msgid "Album not found."
-msgstr "Альбом не найден."
+#: ../../include/text.php:1302
+msgid "alive"
+msgstr "энергичный"
 
-#: ../../Zotlabs/Module/Photos.php:105
-msgid "Delete Album"
-msgstr "Удалить альбом"
+#: ../../include/text.php:1303
+msgid "annoyed"
+msgstr "раздражённый"
 
-#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1065
-msgid "Delete Photo"
-msgstr "Удалить фотографию"
+#: ../../include/text.php:1304
+msgid "anxious"
+msgstr "обеспокоенный"
 
-#: ../../Zotlabs/Module/Photos.php:534
-msgid "No photos selected"
-msgstr "Никакие фотографии не выбраны"
+#: ../../include/text.php:1305
+msgid "cranky"
+msgstr "капризный"
 
-#: ../../Zotlabs/Module/Photos.php:583
-msgid "Access to this item is restricted."
-msgstr "Доступ к этому элементу ограничен."
+#: ../../include/text.php:1306
+msgid "disturbed"
+msgstr "встревоженный"
 
-#: ../../Zotlabs/Module/Photos.php:626
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Вы использовали %1$.2f мегабайт из %2$.2f для хранения фото."
+#: ../../include/text.php:1307
+msgid "frustrated"
+msgstr "разочарованный"
 
-#: ../../Zotlabs/Module/Photos.php:629
+#: ../../include/text.php:1308
+msgid "depressed"
+msgstr "подавленный"
+
+#: ../../include/text.php:1309
+msgid "motivated"
+msgstr "мотивированный"
+
+#: ../../include/text.php:1310
+msgid "relaxed"
+msgstr "расслабленный"
+
+#: ../../include/text.php:1311
+msgid "surprised"
+msgstr "удивленный"
+
+#: ../../include/text.php:1503
+msgid "May"
+msgstr "Май"
+
+#: ../../include/text.php:1565
+msgid "Unknown Attachment"
+msgstr "Неизвестное вложение"
+
+#: ../../include/text.php:1608
+msgid "remove category"
+msgstr "удалить категорию"
+
+#: ../../include/text.php:1685
+msgid "remove from file"
+msgstr "удалить из файла"
+
+#: ../../include/text.php:1869
+msgid "Download binary/encrypted content"
+msgstr "Загрузить двоичное / зашифрованное содержимое"
+
+#: ../../include/text.php:1927 ../../include/text.php:1936
+#: ../../include/text.php:1963 ../../include/text.php:1972
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "Вы использовали %1$.2f мегабайт для хранения фото."
+msgctxt "noun"
+msgid "%d Vote"
+msgid_plural "%d Votes"
+msgstr[0] ""
 
-#: ../../Zotlabs/Module/Photos.php:671
-msgid "Upload Photos"
-msgstr "Загрузить фотографии"
+#: ../../include/text.php:1979
+#, php-format
+msgctxt "noun"
+msgid "%d Vote in total"
+msgid_plural "%d Votes in total"
+msgstr[0] ""
 
-#: ../../Zotlabs/Module/Photos.php:675
-msgid "Enter an album name"
-msgstr "Введите название альбома"
+#: ../../include/text.php:1985
+msgid "Poll has ended"
+msgstr "Опрос завершён"
 
-#: ../../Zotlabs/Module/Photos.php:676
-msgid "or select an existing album (doubleclick)"
-msgstr "или выберите существующий альбом (двойной щелчок)"
+#: ../../include/text.php:1988
+#, php-format
+msgid "Poll ends in %s"
+msgstr "Опрос заканчивается %s"
 
-#: ../../Zotlabs/Module/Photos.php:677
-msgid "Create a status post for this upload"
-msgstr "Сделать публикацию о статусе для этой загрузки"
+#: ../../include/text.php:2150
+msgid "Link to Source"
+msgstr "Ссылка на источник"
 
-#: ../../Zotlabs/Module/Photos.php:679
-msgid "Description (optional)"
-msgstr "Описание (необязательно)"
+#: ../../include/text.php:2180
+msgid "Page layout"
+msgstr "Шаблон страницы"
 
-#: ../../Zotlabs/Module/Photos.php:767
-msgid "Show Newest First"
-msgstr "Показать новые первыми"
+#: ../../include/text.php:2180
+msgid "You can create your own with the layouts tool"
+msgstr "Вы можете создать свой собственный с помощью инструмента шаблонов"
 
-#: ../../Zotlabs/Module/Photos.php:769
-msgid "Show Oldest First"
-msgstr "Показать старые первыми"
+#: ../../include/text.php:2190
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:37
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:94
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:220
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:374
+msgid "BBcode"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1368
-msgid "Add Photos"
-msgstr "Добавить фотографии"
+#: ../../include/text.php:2191
+msgid "HTML"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:874
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Доступ запрещен. Доступ к этому элементу может быть ограничен."
+#: ../../include/text.php:2192
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:37
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:94
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:220
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:374
+#: ../../extend/addon/hzaddons/mdpost/mdpost.php:41
+msgid "Markdown"
+msgstr "Разметка Markdown"
 
-#: ../../Zotlabs/Module/Photos.php:876
-msgid "Photo not available"
-msgstr "Фотография не доступна"
+#: ../../include/text.php:2193
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:37
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:94
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:220
+msgid "Text"
+msgstr "Текст"
 
-#: ../../Zotlabs/Module/Photos.php:934
-msgid "Use as profile photo"
-msgstr "Использовать в качестве фотографии профиля"
+#: ../../include/text.php:2194
+msgid "Comanche Layout"
+msgstr "Шаблон Comanche"
 
-#: ../../Zotlabs/Module/Photos.php:935
-msgid "Use as cover photo"
-msgstr "Использовать в качестве фотографии обложки"
+#: ../../include/text.php:2199
+msgid "PHP"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:942
-msgid "Private Photo"
-msgstr "Личная фотография"
+#: ../../include/text.php:2208
+msgid "Page content type"
+msgstr "Тип содержимого страницы"
 
-#: ../../Zotlabs/Module/Photos.php:957
-msgid "View Full Size"
-msgstr "Посмотреть в полный размер"
+#: ../../include/text.php:2341
+msgid "activity"
+msgstr "активность"
 
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Edit photo"
-msgstr "Редактировать фотографию"
+#: ../../include/text.php:2344
+msgid "poll"
+msgstr "голосование"
 
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "Rotate CW (right)"
-msgstr "Повернуть CW (направо)"
+#: ../../include/text.php:2457
+msgid "a-z, 0-9, -, and _ only"
+msgstr "Только a-z, 0-9, -, и _"
 
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Rotate CCW (left)"
-msgstr "Повернуть CCW (налево)"
+#: ../../include/text.php:2762
+msgid "Design Tools"
+msgstr "Инструменты дизайна"
 
-#: ../../Zotlabs/Module/Photos.php:1045
-msgid "Move photo to album"
-msgstr "Переместить фотографию в альбом"
+#: ../../include/text.php:2768
+msgid "Pages"
+msgstr "Страницы"
 
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Enter a new album name"
-msgstr "Введите новое название альбома"
+#: ../../include/text.php:2780
+msgid "Import"
+msgstr "Импортировать"
 
-#: ../../Zotlabs/Module/Photos.php:1047
-msgid "or select an existing one (doubleclick)"
-msgstr "или выбрать существующую (двойной щелчок)"
+#: ../../include/text.php:2781
+msgid "Import website..."
+msgstr "Импорт веб-сайта..."
 
-#: ../../Zotlabs/Module/Photos.php:1052
-msgid "Add a Tag"
-msgstr "Добавить тег"
+#: ../../include/text.php:2782
+msgid "Select folder to import"
+msgstr "Выбрать каталог для импорта"
 
-#: ../../Zotlabs/Module/Photos.php:1060
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Пример: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../include/text.php:2783
+msgid "Import from a zipped folder:"
+msgstr "Импортировать из каталога в zip-архиве:"
 
-#: ../../Zotlabs/Module/Photos.php:1063
-msgid "Flag as adult in album view"
-msgstr "Пометить как альбом \"для взрослых\""
+#: ../../include/text.php:2784
+msgid "Import from cloud files:"
+msgstr "Импортировать из сетевых файлов:"
 
-#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:341
-msgid "I like this (toggle)"
-msgstr "мне это нравится (переключение)"
+#: ../../include/text.php:2785
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:342
-msgid "I don't like this (toggle)"
-msgstr "мне это не нравится (переключение)"
+#: ../../include/text.php:2786
+msgid "Enter path to website files"
+msgstr "Введите путь к файлам веб-сайта"
 
-#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217
-#: ../../Zotlabs/Lib/ThreadItem.php:848
-msgid "This is you"
-msgstr "Это вы"
+#: ../../include/text.php:2787
+msgid "Select folder"
+msgstr "Выбрать каталог"
 
-#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150
-#: ../../Zotlabs/Lib/ThreadItem.php:262 ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "View all"
-msgstr "Просмотреть все"
+#: ../../include/text.php:2788
+msgid "Export website..."
+msgstr "Экспорт веб-сайта..."
 
-#: ../../Zotlabs/Module/Photos.php:1251
-msgid "Photo Tools"
-msgstr "Фото-Инструменты"
+#: ../../include/text.php:2789
+msgid "Export to a zip file"
+msgstr "Экспортировать в ZIP файл."
 
-#: ../../Zotlabs/Module/Photos.php:1260
-msgid "In This Photo:"
-msgstr "На этой фотографии:"
+#: ../../include/text.php:2790
+msgid "website.zip"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1265
-msgid "Map"
-msgstr "Карта"
+#: ../../include/text.php:2791
+msgid "Enter a name for the zip file."
+msgstr "Введите имя для ZIP файла."
 
-#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:515
-msgctxt "noun"
-msgid "Likes"
-msgstr "Нравится"
+#: ../../include/text.php:2792
+msgid "Export to cloud files"
+msgstr "Эскпортировать в сетевые файлы:"
 
-#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:516
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Не нравится"
+#: ../../include/text.php:2793
+msgid "/path/to/export/folder"
+msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Действительный аккаунт не найден."
+#: ../../include/text.php:2794
+msgid "Enter a path to a cloud files destination."
+msgstr "Введите путь к расположению сетевых файлов."
 
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Запрос на сброс пароля отправлен. Проверьте вашу электронную почту."
+#: ../../include/text.php:2795
+msgid "Specify folder"
+msgstr "Указать каталог"
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Site Member (%s)"
-msgstr "Участник сайта (%s)"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "доступно %d приглашение"
+msgstr[1] "доступны %d приглашения"
+msgstr[2] "доступны %d приглашений"
 
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Запрошен сброс пароля на %s"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Поиск каналов"
 
-#: ../../Zotlabs/Module/Lostpass.php:68
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Запрос не может быть проверен. (Вы могли отправить его раньше). Сброс пароля не возможен."
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Впишите имя или интерес"
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1747
-msgid "Password Reset"
-msgstr "Сбросить пароль"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Подключить / отслеживать"
 
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr "Ваш пароль в соответствии с просьбой сброшен."
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Примеры: Владимир Ильич, Революционер"
 
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr "Ваш новый пароль"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Случайный профиль"
 
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr "Сохраните ваш новый пароль и затем"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Пригласить друзей"
 
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
-msgstr "нажмите здесь чтобы войти"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Расширенный пример: name=ivan and country=russia"
 
-#: ../../Zotlabs/Module/Lostpass.php:96
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Ваш пароль может быть изменён на странице <em>Настройки</em> после успешного входа."
+#: ../../include/contact_widgets.php:182
+msgid "Common Connections"
+msgstr "Общие контакты"
 
-#: ../../Zotlabs/Module/Lostpass.php:117
+#: ../../include/contact_widgets.php:186
 #, php-format
-msgid "Your password has changed at %s"
-msgstr "Пароль был изменен на %s"
+msgid "View all %d common connections"
+msgstr "Просмотреть все %d общих контактов"
 
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
-msgstr "Забыли ваш пароль?"
+#: ../../include/import.php:30
+msgid "Unable to import a removed channel."
+msgstr "Невозможно импортировать удалённый канал."
 
-#: ../../Zotlabs/Module/Lostpass.php:131
+#: ../../include/import.php:56
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Введите ваш адрес электронной почты и нажмите отправить чтобы сбросить пароль. Затем проверьте ваш почтовый ящик для дальнейших инструкций. "
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Не удалось создать дублирующийся идентификатор канала. Импорт невозможен."
 
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
-msgstr "Адрес электронной почты"
+#: ../../include/import.php:77
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:43
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Не удалось создать уникальный адрес канала. Импорт не завершен."
 
-#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:76
-msgid "Reset"
-msgstr "Сбросить"
+#: ../../include/import.php:122
+msgid "Cloned channel not found. Import failed."
+msgstr "Клон канала не найден. Импорт невозможен."
 
-#: ../../Zotlabs/Module/Follow.php:93
-msgid "Connection added."
-msgstr "Контакт добавлен."
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
+msgstr "Канал-источник не найден."
 
-#: ../../Zotlabs/Module/Page.php:39 ../../Zotlabs/Module/Block.php:29
-msgid "Invalid item."
-msgstr "Недействительный элемент."
+#: ../../view/theme/redbasic/php/config.php:16
+#: ../../view/theme/redbasic/php/config.php:19
+msgid "Focus (Hubzilla default)"
+msgstr "Фокус (по умолчанию Hubzilla)"
 
-#: ../../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 ""
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Theme settings"
+msgstr "Настройки темы"
 
-#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214
-#: ../../Zotlabs/Module/Profiles.php:642
-msgid "Profile not found."
-msgstr "Профиль не найден."
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Narrow navbar"
+msgstr "Узкая панель навигации"
 
-#: ../../Zotlabs/Module/Profiles.php:46
-msgid "Profile deleted."
-msgstr "Профиль удален."
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Navigation bar background color"
+msgstr "Панель навигации, цвет фона"
 
-#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107
-msgid "Profile-"
-msgstr "Профиль -"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Navigation bar icon color "
+msgstr "Панель навигации, цвет значков"
 
-#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129
-msgid "New profile created."
-msgstr "Новый профиль создан."
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Navigation bar active icon color "
+msgstr "Панель навигации, цвет активного значка"
 
-#: ../../Zotlabs/Module/Profiles.php:113
-msgid "Profile unavailable to clone."
-msgstr "Профиль недоступен для клонирования."
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Link color"
+msgstr "Цвет ссылок"
 
-#: ../../Zotlabs/Module/Profiles.php:148
-msgid "Profile unavailable to export."
-msgstr "Профиль недоступен для экспорта."
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Set font-color for banner"
+msgstr "Цвет текста в шапке"
 
-#: ../../Zotlabs/Module/Profiles.php:225
-msgid "Profile Name is required."
-msgstr "Требуется имя профиля."
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set the background color"
+msgstr "Цвет фона"
 
-#: ../../Zotlabs/Module/Profiles.php:430
-msgid "Marital Status"
-msgstr "Семейное положение"
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set the background image"
+msgstr "Фоновое изображение"
 
-#: ../../Zotlabs/Module/Profiles.php:434
-msgid "Romantic Partner"
-msgstr "Романтический партнер"
+#: ../../view/theme/redbasic/php/config.php:107
+msgid "Set the background color of items"
+msgstr "Цвет фона элементов"
 
-#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:788
-msgid "Likes"
-msgstr "Нравится"
+#: ../../view/theme/redbasic/php/config.php:108
+msgid "Set the background color of comments"
+msgstr "Цвет фона комментариев"
 
-#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:789
-msgid "Dislikes"
-msgstr "Не нравится"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Set font-size for the entire application"
+msgstr "Установить системный размер шрифта"
 
-#: ../../Zotlabs/Module/Profiles.php:446 ../../Zotlabs/Module/Profiles.php:796
-msgid "Work/Employment"
-msgstr "Работа / Занятость"
+#: ../../view/theme/redbasic/php/config.php:109
+msgid "Examples: 1rem, 100%, 16px"
+msgstr "Например: 1rem, 100%, 16px"
 
-#: ../../Zotlabs/Module/Profiles.php:449
-msgid "Religion"
-msgstr "Религия"
+#: ../../view/theme/redbasic/php/config.php:110
+msgid "Set font-color for posts and comments"
+msgstr "Цвет шрифта для публикаций и комментариев"
 
-#: ../../Zotlabs/Module/Profiles.php:453
-msgid "Political Views"
-msgstr "Политические взгляды"
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Set radius of corners"
+msgstr "Радиус скруглений"
 
-#: ../../Zotlabs/Module/Profiles.php:461
-msgid "Sexual Preference"
-msgstr "Сексуальная ориентация"
+#: ../../view/theme/redbasic/php/config.php:111
+msgid "Example: 4px"
+msgstr "Например: 4px"
 
-#: ../../Zotlabs/Module/Profiles.php:465
-msgid "Homepage"
-msgstr "Домашняя страница"
+#: ../../view/theme/redbasic/php/config.php:112
+msgid "Set shadow depth of photos"
+msgstr "Глубина теней фотографий"
 
-#: ../../Zotlabs/Module/Profiles.php:469
-msgid "Interests"
-msgstr "Интересы"
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Set maximum width of content region in rem"
+msgstr "Установить максимальную ширину содержимого в rem"
 
-#: ../../Zotlabs/Module/Profiles.php:577
-msgid "Profile updated."
-msgstr "Профиль обновлен."
+#: ../../view/theme/redbasic/php/config.php:113
+msgid "Leave empty for default width"
+msgstr "Оставьте пустым для ширины по умолчанию"
 
-#: ../../Zotlabs/Module/Profiles.php:672
-msgid "Hide my connections from viewers of this profile"
-msgstr "Скрыть мои контакты от просматривающих этот профиль"
+#: ../../view/theme/redbasic/php/config.php:114
+msgid "Set size of conversation author photo"
+msgstr "Размер фотографии автора беседы"
 
-#: ../../Zotlabs/Module/Profiles.php:685
-msgid "Publish my default profile in the network directory"
-msgstr "Опубликовать мой профиль по умолчанию в каталоге сети"
+#: ../../view/theme/redbasic/php/config.php:115
+msgid "Set size of followup author photos"
+msgstr "Размер фотографий подписчиков"
 
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Suggest me as a potential contact to new members"
-msgstr "Предлагать меня как потенциальный новый контакт для новых участников"
+#: ../../view/theme/redbasic/php/config.php:116
+msgid "Show advanced settings"
+msgstr "Показать расширенные настройки"
 
-#: ../../Zotlabs/Module/Profiles.php:697
-msgid "Reveal my online status"
-msgstr "Показать мой статус в сети"
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:51
+msgid "Your Webbie:"
+msgstr "Ваш Webbie:"
 
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Edit Profile Details"
-msgstr "Редактирование профиля"
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:54
+msgid "Fontsize (px):"
+msgstr "Размер шрифта (px):"
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "View this profile"
-msgstr "Посмотреть этот профиль"
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:68
+msgid "Link:"
+msgstr "Ссылка:"
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Profile Tools"
-msgstr "Инструменты профиля"
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:70
+msgid "Like us on Hubzilla"
+msgstr "Нравится на Hubzilla"
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Change cover photo"
-msgstr "Изменить фотографию обложки"
+#: ../../extend/addon/hzaddons/likebanner/likebanner.php:72
+msgid "Embed:"
+msgstr "Встроить:"
 
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "Create a new profile using these settings"
-msgstr "Создать новый профиль с теми же настройками"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:27
+msgid "Photo Cache settings saved."
+msgstr "Настройки кэширования изображений сохранены."
 
-#: ../../Zotlabs/Module/Profiles.php:746
-msgid "Clone this profile"
-msgstr "Клонировать этот профиль"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:43
+msgid ""
+"Saves a copy of images from external sites locally to increase your "
+"anonymity in the web."
+msgstr "Сохраняет копии изображений с внешних сайтов локально, чтобы повысить вашу анонимность в Интернете."
 
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "Delete this profile"
-msgstr "Удалить этот профиль"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:49
+msgid "Minimal photo size for caching"
+msgstr "Минимальный размер изображений для кэширования"
 
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Add profile things"
-msgstr "Добавить в профиль"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:51
+msgid "In pixels. From 1 up to 1024, 0 will be replaced with system default."
+msgstr "В пикселях. От 1 до 1024, 0 будет заменён значением по умолчанию."
 
-#: ../../Zotlabs/Module/Profiles.php:749
-msgid "Basic"
-msgstr "Основной"
+#: ../../extend/addon/hzaddons/photocache/Mod_Photocache.php:60
+msgid "Photo Cache"
+msgstr "Кэширование изображений"
 
-#: ../../Zotlabs/Module/Profiles.php:751
-msgid "Relationship"
-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/Profiles.php:754
-msgid "Import profile from file"
-msgstr "Импортировать профиль из файла"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:109
+msgid "Enable Community Moderation"
+msgstr "Включить модерацию сообщества"
 
-#: ../../Zotlabs/Module/Profiles.php:755
-msgid "Export profile to file"
-msgstr "Экспортировать профиль в файл"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:117
+msgid "Reputation automatically given to new members"
+msgstr "Репутация автоматически предоставляемая новым участникам"
 
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Your gender"
-msgstr "Ваш пол"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:118
+msgid "Reputation will never fall below this value"
+msgstr "Репутация никогда не упадёт ниже этого значения"
 
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Marital status"
-msgstr "Семейное положение"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:119
+msgid "Minimum reputation before posting is allowed"
+msgstr "Минимальная репутация для разрешения возможности размещать публикации"
 
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Sexual preference"
-msgstr "Сексуальная ориентация"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:120
+msgid "Minimum reputation before commenting is allowed"
+msgstr "Минимальная репутация для разрешения комментирования"
 
-#: ../../Zotlabs/Module/Profiles.php:761
-msgid "Profile name"
-msgstr "Имя профиля"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:121
+msgid "Minimum reputation before a member is able to moderate other posts"
+msgstr "Минимальная репутация для возможности модерирования участником чужих публикаций"
 
-#: ../../Zotlabs/Module/Profiles.php:763
-msgid "This is your default profile."
-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/Profiles.php:765
-msgid "Your full name"
-msgstr "Ваше полное имя"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:123
+msgid "Reputation \"cost\" to post"
+msgstr "\"Стоимость\" репутации для публикации"
 
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Short title/description"
-msgstr "Краткий заголовок или наименование"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:124
+msgid "Reputation \"cost\" to comment"
+msgstr "\"Стоимость\" репутации для комментирования"
 
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Maximal 190 characters"
-msgstr "Не более 190 символов"
+#: ../../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/Profiles.php:769
-msgid "Street address"
-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/Profiles.php:770
-msgid "Locality/City"
-msgstr "Населенный пункт / город"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:140
+msgid "Community Moderation Settings"
+msgstr "Настройки модерирования сообщества"
 
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Region/State"
-msgstr "Регион / Область"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:232
+msgid "Channel Reputation"
+msgstr "Репутация канала"
 
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Postal/Zip code"
-msgstr "Почтовый индекс"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:236
+msgid "An Error has occurred."
+msgstr "Произошла ошибка."
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Who (if applicable)"
-msgstr "Кто (если применимо)"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:254
+msgid "Upvote"
+msgstr "За"
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Примеры: ivan1990, Ivan Petrov, ivan@example.com"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:255
+msgid "Downvote"
+msgstr "Против"
 
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Since (date)"
-msgstr "С (дата)"
+#: ../../extend/addon/hzaddons/channelreputation/channelreputation.php:414
+msgid "Can moderate reputation on my channel."
+msgstr "Может модерировать репутацию на моём канале"
 
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Tell us about yourself"
-msgstr "Расскажите нам о себе"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:106
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:179
+msgid "Network error"
+msgstr "Сетевая ошибка"
 
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "Hometown"
-msgstr "Родной город"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:110
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:183
+msgid "API error"
+msgstr "Ошибка API"
 
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "Political views"
-msgstr "Политические взгляды"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:114
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:187
+msgid "Unknown issue"
+msgstr "Неизвестная проблема"
 
-#: ../../Zotlabs/Module/Profiles.php:786
-msgid "Religious views"
-msgstr "Религиозные взгляды"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:152
+msgid "Unable to retrieve email address from remote identity provider"
+msgstr "Не удалось получить адрес электронной почты от удаленного удостоверяющего центра."
 
-#: ../../Zotlabs/Module/Profiles.php:787
-msgid "Keywords used in directory listings"
-msgstr "Ключевые слова для участия в каталоге"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:171
+msgid "Unable to login using email address "
+msgstr "Невозможно войти, используя адрес электронной почты "
 
-#: ../../Zotlabs/Module/Profiles.php:787
-msgid "Example: fishing photography software"
-msgstr "Например: fishing photography software"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:211
+msgid "Social Authentication using your social media account"
+msgstr "Social Authentication с использованием вашей учетной записи в социальных сетях"
 
-#: ../../Zotlabs/Module/Profiles.php:790
-msgid "Musical interests"
-msgstr "Музыкальные интересы"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:215
+msgid ""
+"This app enables one or more social provider sign-in buttons on the login "
+"page."
+msgstr "Это приложение добавляет на странице входа в систему одну или несколько кнопок для аутентификации при помощи учётных записей в социальных сетях"
 
-#: ../../Zotlabs/Module/Profiles.php:791
-msgid "Books, literature"
-msgstr "Книги, литература"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:233
+msgid "Add an identity provider"
+msgstr "Добавить провайдера идентификации"
 
-#: ../../Zotlabs/Module/Profiles.php:792
-msgid "Television"
-msgstr "Телевидение"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:260
+msgid "Enable "
+msgstr "Включить "
 
-#: ../../Zotlabs/Module/Profiles.php:793
-msgid "Film/Dance/Culture/Entertainment"
-msgstr "Кино / танцы / культура / развлечения"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:267
+msgid "Key"
+msgstr "Ключ"
 
-#: ../../Zotlabs/Module/Profiles.php:794
-msgid "Hobbies/Interests"
-msgstr "Хобби / интересы"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:267
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:272
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:288
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:299
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:308
+msgid "Word"
+msgstr "Слово"
 
-#: ../../Zotlabs/Module/Profiles.php:795
-msgid "Love/Romance"
-msgstr "Любовь / романтические отношения"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:272
+msgid "Secret"
+msgstr "Секрет"
 
-#: ../../Zotlabs/Module/Profiles.php:797
-msgid "School/Education"
-msgstr "Школа / образование"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:308
+msgid "Add a custom provider"
+msgstr "Добавить собственного провайдера"
 
-#: ../../Zotlabs/Module/Profiles.php:798
-msgid "Contact information and social networks"
-msgstr "Информация и социальные сети для связи"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:328
+msgid "Remove an identity provider"
+msgstr "Удалить провайдера идентификации"
 
-#: ../../Zotlabs/Module/Profiles.php:799
-msgid "My other channels"
-msgstr "Мои другие контакты"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:338
+msgid "Social authentication"
+msgstr "Аутентификация в социальных сетях"
 
-#: ../../Zotlabs/Module/Profiles.php:801
-msgid "Communications"
-msgstr "Связи"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:380
+msgid "Error while saving provider settings"
+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"
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:403
+msgid "Custom provider already exists"
+msgstr "Собственный провайдер уже существует"
 
-#: ../../Zotlabs/Module/Subthread.php:130
+#: ../../extend/addon/hzaddons/socialauth/Mod_SocialAuth.php:420
+msgid "Social authentication settings saved."
+msgstr "Настройки Social authentication сохранены."
+
+#: ../../extend/addon/hzaddons/visage/Mod_Visage.php:23
+msgid "Recent Channel/Profile Viewers"
+msgstr "Последние просмотры канала / профиля"
+
+#: ../../extend/addon/hzaddons/visage/Mod_Visage.php:34
+msgid "No entries."
+msgstr "Нет записей."
+
+#: ../../extend/addon/hzaddons/testdrive/testdrive.php:104
 #, php-format
-msgid "%1$s stopped following %2$s's %3$s"
-msgstr "%1$s прекратил отслеживать %2$s's %3$s"
+msgid "Your account on %s will expire in a few days."
+msgstr "Ваш аккаунт на %s перестанет работать через несколько дней."
 
-#: ../../Zotlabs/Module/Articles.php:114
-msgid "Add Article"
-msgstr "Добавить статью"
+#: ../../extend/addon/hzaddons/testdrive/testdrive.php:105
+msgid "Your $Productname test account is about to expire."
+msgstr Ваша тестовая учётная запись в $Productname близка к окончанию срока действия.
 
-#: ../../Zotlabs/Module/Bookmarks.php:62
-msgid "Bookmark added"
-msgstr "Закладка добавлена"
+#: ../../extend/addon/hzaddons/twitter/twitter.php:109
+msgid "Post to Twitter"
+msgstr "Опубликовать в Twitter"
 
-#: ../../Zotlabs/Module/Bookmarks.php:101
-msgid "My Connections Bookmarks"
-msgstr "Закладки моих контактов"
+#: ../../extend/addon/hzaddons/twitter/twitter.php:502
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:95
+msgid "Submit Settings"
+msgstr "Отправить настройки"
 
-#: ../../Zotlabs/Module/Changeaddr.php:35
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:65
+msgid "Twitter settings updated."
+msgstr "Настройки Twitter обновлены"
+
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:101
 msgid ""
-"Channel name changes are not allowed within 48 hours of changing the account "
-"password."
-msgstr "Изменение названия канала не разрешается в течении 48 часов после смены пароля у аккаунта."
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Не найдено пары ключей для Twitter. Пожалуйста, свяжитесь с администратором сайта."
 
-#: ../../Zotlabs/Module/Changeaddr.php:77
-msgid "Change channel nickname/address"
-msgstr "Изменить псевдоним / адрес канала"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:123
+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."
 
-#: ../../Zotlabs/Module/Changeaddr.php:78
-msgid "Any/all connections on other networks will be lost!"
-msgstr "Любые / все контакты в других сетях будут утеряны!"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:125
+msgid "Log in with Twitter"
+msgstr "Войти в Twitter"
 
-#: ../../Zotlabs/Module/Changeaddr.php:80
-msgid "New channel address"
-msgstr "Новый адрес канала"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:128
+msgid "Copy the PIN from Twitter here"
+msgstr "Скопируйте PIN-код из Twitter здесь"
 
-#: ../../Zotlabs/Module/Changeaddr.php:81
-msgid "Rename Channel"
-msgstr "Переименовать канал"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:145
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:270
+msgid "Currently connected to: "
+msgstr "В настоящее время подключён к: "
 
-#: ../../Zotlabs/Module/Invite.php:56
-msgid "Invite App"
-msgstr "Приложение \"Пригласить\""
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:150
+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, приведет посетителя к пустой странице, информирующей его о том, что доступ к вашему профилю был ограничен."
 
-#: ../../Zotlabs/Module/Invite.php:68
-msgid "Register is closed"
-msgstr "Регистрация закрыта"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:155
+msgid "Twitter post length"
+msgstr "Длина публикации Twitter"
 
-#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549
-msgid "Note, the invitation code is valid up to"
-msgstr "Обратите внимание: код приглашения действителен до "
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:155
+msgid "Maximum tweet length"
+msgstr "Максимальная длина твита"
 
-#: ../../Zotlabs/Module/Invite.php:115
-#, php-format
-msgid "Too many recipients for one invitation (max %d)"
-msgstr "Слишком много получателей для одного кода приглашения (не более %d)"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:160
+msgid "Send public postings to Twitter by default"
+msgstr "Отправлять общедоступные публикации в Twitter по умолчанию"
 
-#: ../../Zotlabs/Module/Invite.php:119
-msgid "No recipients for this invitation"
-msgstr "Нет получателей для этого приглашения"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:160
+msgid ""
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
+msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи Twitter по умолчанию"
 
-#: ../../Zotlabs/Module/Invite.php:138
-#, php-format
-msgid "(%s) : Not a real email address"
-msgstr "(%s) : Не настоящий адрес электронной почты"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:169
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:289
+msgid "Clear OAuth configuration"
+msgstr "Очистить конфигурацию OAuth"
 
-#: ../../Zotlabs/Module/Invite.php:145
-#, php-format
-msgid "(%s) : Not allowed email address"
-msgstr "(%s) : Не разрешённый адрес электронной почты"
+#: ../../extend/addon/hzaddons/twitter/Mod_Twitter.php:179
+msgid "Twitter Crosspost Connector"
+msgstr "Публикация в Twitter"
 
-#: ../../Zotlabs/Module/Invite.php:158
-#, php-format
-msgid "(%s) : email address already in use"
-msgstr "(%s) : Адрес электронной почты уже используется"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:123
+msgid "generic profile image"
+msgstr "Стандартное изображение профиля"
 
-#: ../../Zotlabs/Module/Invite.php:165
-#, php-format
-msgid "(%s) : Accepted email address"
-msgstr "%s) : Подтверждённый адрес электронной почты"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:124
+msgid "random geometric pattern"
+msgstr "Случайный геометрический рисунок"
 
-#: ../../Zotlabs/Module/Invite.php:257
-#, php-format
-msgid "To %s : Message delivery success."
-msgstr "Для %s : Сообщение успешно доставлено."
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:125
+msgid "monster face"
+msgstr "Лицо чудовища"
 
-#: ../../Zotlabs/Module/Invite.php:289
-#, php-format
-msgid "%1$d mail(s) sent, %2$d mail error(s)"
-msgstr "%1$d писем отправлено, %2$d ошибок доставки"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:126
+msgid "computer generated face"
+msgstr "Сгенерированное компьютером лицо"
 
-#: ../../Zotlabs/Module/Invite.php:314
-msgid "Invites not proposed by configuration"
-msgstr "Использование приглашений не предлагается"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:127
+msgid "retro arcade style face"
+msgstr "Лицо в стиле старой аркадной игры"
 
-#: ../../Zotlabs/Module/Invite.php:315
-msgid "Contact the site admin"
-msgstr "Связатся с администратором сайта"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:128
+msgid "Hub default profile photo"
+msgstr "Фотография профиля по умолчанию"
 
-#: ../../Zotlabs/Module/Invite.php:331
-msgid "Invites by users not enabled"
-msgstr "Приглашения от пользователей отключены"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:143
+msgid "Information"
+msgstr "Информация"
 
-#: ../../Zotlabs/Module/Invite.php:336
-msgid "You have no more invitations available"
-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/Invite.php:352
-msgid "Not on xchan"
-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/Invite.php:385
-msgid "All users invitation limit exceeded."
-msgstr "Превышен лимит приглашений для всех пользователей."
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:151
+msgid "Default avatar image"
+msgstr "Изображение аватара по умолчанию"
 
-#: ../../Zotlabs/Module/Invite.php:403
-msgid "Invitation expires after"
-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/Invite.php:504 ../../Zotlabs/Module/Invite.php:543
-msgid "Invitation"
-msgstr "Приглашение"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152
+msgid "Rating of images"
+msgstr "Оценки изображений"
 
-#: ../../Zotlabs/Module/Invite.php:534
-msgid "Send invitations"
-msgstr "Отправить приглашение"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:152
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Выберите подходящую оценку аватара для вашего сайта (см. README)."
 
-#: ../../Zotlabs/Module/Invite.php:535
-msgid "Invitations I am using"
-msgstr "Приглашения, которые я использую"
+#: ../../extend/addon/hzaddons/gravatar/gravatar.php:165
+msgid "Gravatar settings updated."
+msgstr "Настройки Gravatar обновлены."
 
-#: ../../Zotlabs/Module/Invite.php:536
-msgid "Invitations we are using"
-msgstr "Приглашения, которые мы используем"
+#: ../../extend/addon/hzaddons/cart/widgets/catalogitem.php:57
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:263
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:660
+msgid "Price"
+msgstr "Цена"
 
-#: ../../Zotlabs/Module/Invite.php:537
-msgid "§ Note, the email(s) sent will be recorded in the system logs"
-msgstr "Внимание: адреса электронной почты будут записаны в системные журналы."
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:58
+msgid "Enable Test Catalog"
+msgstr "Включить тестовый каталог"
 
-#: ../../Zotlabs/Module/Invite.php:538
-msgid "Enter email addresses, one per line:"
-msgstr "Введите адреса электронной почты, по одному в строке:"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:70
+msgid "Enable Manual Payments"
+msgstr "Включить ручные платежи"
 
-#: ../../Zotlabs/Module/Invite.php:539
-msgid "Your message:"
-msgstr "Сообщение:"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:90
+msgid "Base Merchant Currency"
+msgstr "Основная торговая валюта"
 
-#: ../../Zotlabs/Module/Invite.php:540
-msgid "Invite template"
-msgstr "Шаблон приглашения"
+#: ../../extend/addon/hzaddons/cart/Settings/Cart.php:129
+#: ../../extend/addon/hzaddons/cart/cart.php:1375
+msgid "Cart Settings"
+msgstr "Настройки карточек"
 
-#: ../../Zotlabs/Module/Invite.php:542
-msgid "Subject:"
-msgstr "Тема:"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:86
+msgid "Enable Paypal Button Module (API-v2)"
+msgstr "Включить модуль кнопки Paypal (API-v2)"
 
-#: ../../Zotlabs/Module/Invite.php:548
-msgid "Here you may enter personal notes to the recipient(s)"
-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/Sse_bs.php:572
-msgid "Private forum"
-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/Sse_bs.php:572
-msgid "Public forum"
-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/Xchan.php:10
-msgid "Xchan Lookup"
-msgstr "Поиск Xchan"
+#: ../../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/Xchan.php:13
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Запрос Xchan начинается с (или webbie):"
+#: ../../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/Affinity.php:35
-msgid "Affinity Tool settings updated."
-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/Affinity.php:54
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbuttonV2.php:282
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:270
 msgid ""
-"The numbers below represent the minimum and maximum slider default positions "
-"for your network/stream page as a percentage."
-msgstr "Числа ниже представляют минимальное и максимальное значение по умолчанию для вашей сети / потока в процентах."
+"Paypal button payments are not properly configured.  Please choose another "
+"payment option."
+msgstr "Кнопка Paypal для платежей настроена неправильно. Пожалуйста, используйте другой вариант оплаты."
 
-#: ../../Zotlabs/Module/Affinity.php:61
-msgid "Default maximum affinity level"
-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:1580
+msgid "Order not found."
+msgstr "Заказ не найден."
 
-#: ../../Zotlabs/Module/Affinity.php:61
-msgid "0-99 default 99"
-msgstr "0-99 (по умолчанию 99)"
+#: ../../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:1558
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:81
+msgid "Invalid channel"
+msgstr "Недействительный канал"
 
-#: ../../Zotlabs/Module/Affinity.php:67
-msgid "Default minimum affinity level"
-msgstr "Максимальная степень сходства по умолчанию."
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:61
+msgid "Enable Manual Cart Module"
+msgstr "Включить модуль ручного управления карточками"
 
-#: ../../Zotlabs/Module/Affinity.php:67
-msgid "0-99 - default 0"
-msgstr "0-99 (по умолчанию 0)"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:172
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:164
+msgid "New Sku"
+msgstr "Новый код"
 
-#: ../../Zotlabs/Module/Affinity.php:73
-msgid "Persistent affinity levels"
-msgstr "Устоявшиеся степени сходства"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:208
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:199
+msgid "Cannot save edits to locked item."
+msgstr "Невозможно сохранить изменения заблокированной позиции."
 
-#: ../../Zotlabs/Module/Affinity.php:73
-msgid ""
-"If disabled the max and min levels will be reset to default after page reload"
-msgstr "Если этот параметр отключен, максимальный и минимальный уровни будут сброшены к значениям по умолчанию после перезагрузки страницы"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:252
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:649
+msgid "Changes Locked"
+msgstr "Изменения заблокированы"
 
-#: ../../Zotlabs/Module/Affinity.php:81
-msgid "Affinity Tool Settings"
-msgstr "Настройки степени сходства"
+#: ../../extend/addon/hzaddons/cart/submodules/manualcat.php:256
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:653
+msgid "Item available for purchase."
+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/cart/submodules/manualcat.php:266
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:663
+msgid "Photo URL"
+msgstr "URL изображения"
 
-#: ../../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/cart/submodules/orderoptions.php:70
+msgid "Enable Order/Item Options"
+msgstr "Включить параметры заказа / позиции"
 
-#: ../../Zotlabs/Module/Settings/Network.php:59
-msgid "Stream Settings"
-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/Features.php:45
-msgid "Additional Features"
-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:103
-#: ../../Zotlabs/Module/Settings/Channel.php:212
-msgid "Please select a channel role"
-msgstr "Пожалуйста, выберите роль канала"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:65
+msgid "Enable Hubzilla Services Module"
+msgstr "Включить модуль сервиса Hubzilla"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:189
-msgid "Your channel address is"
-msgstr "Адрес вашего канала"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:248
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:335
+msgid "SKU not found."
+msgstr "Код не найден."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:192
-msgid "Your files/photos are accessible via WebDAV at"
-msgstr "Ваши файлы / фотографии доступны через WebDAV по"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:301
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:305
+msgid "Invalid Activation Directive."
+msgstr "Недействительная директива активации."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:223
-msgid "Channel Settings"
-msgstr "Настройки канала"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:376
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:380
+msgid "Invalid Deactivation Directive."
+msgstr "Недействительная директива деактивации"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:230
-msgid "Basic Settings"
-msgstr "Основные настройки"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:566
+msgid "Add to this privacy group"
+msgstr "Добавить в эту группу конфиденциальности"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:231
-msgid "Channel timezone:"
-msgstr "Часовой пояс канала:"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:582
+msgid "Set user service class"
+msgstr "Установить класс обслуживания пользователя"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:232
-msgid "Default post location:"
-msgstr "Местоположение публикации по умолчанию:"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:609
+msgid "You must be using a local account to purchase this service."
+msgstr "Вы должны использовать локальную учётноую запись для покупки этого сервиса."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:232
-msgid "Geographical location to display on your posts"
-msgstr "Показывать географическое положение в ваших публикациях"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:667
+msgid "Add buyer to privacy group"
+msgstr "Добавить покупателя в группу конфиденциальности"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:233
-msgid "Use browser location"
-msgstr "Использовать данные о местоположении из браузера"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:672
+msgid "Add buyer as connection"
+msgstr "Добавить покупателя как контакт"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:234
-msgid "Adult content"
-msgstr "Содержимое для взрослых"
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:680
+#: ../../extend/addon/hzaddons/cart/submodules/hzservices.php:722
+msgid "Set Service Class"
+msgstr "Установить класс обслуживания"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:234
-msgid "This channel frequently or regularly publishes adult content"
-msgstr "На этом канале часто или регулярно публикуется контент для взрослых"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:151
+msgid "Enable Subscription Management Module"
+msgstr "Включить модуль управления подписками"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:235
-msgid "Maximum Friend Requests/Day:"
-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:235
-msgid "May reduce spam activity"
-msgstr "Может ограничить спам активность"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:372
+msgid "Select Subscription to Edit"
+msgstr "Выбрать подписку для редактирования"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:236
-#: ../../Zotlabs/Lib/Enotify.php:68
-msgid "Notification Settings"
-msgstr "Настройки уведомлений"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:380
+msgid "Edit Subscriptions"
+msgstr "Редактировать подписки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:237
-msgid "By default post a status message when:"
-msgstr "По умолчанию публиковать новый статус при:"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:414
+msgid "Subscription SKU"
+msgstr "Код подписки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:238
-msgid "accepting a friend request"
-msgstr "одобрении запроса в друзья"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:419
+msgid "Catalog Description"
+msgstr "Описание каталога"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:239
-msgid "joining a forum/community"
-msgstr "вступлении в сообщество / форум"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:423
+msgid "Subscription available for purchase."
+msgstr "Подписка доступна для покупки."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:240
-msgid "making an <em>interesting</em> profile change"
-msgstr "<em>интересном</em> изменении профиля"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:428
+msgid "Maximum active subscriptions to this item per account."
+msgstr "Максимальное количество подписок на аккаунт для этой позиции"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:241
-msgid "Send a notification email when:"
-msgstr "Отправить уведомление по email когда:"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:431
+msgid "Subscription price."
+msgstr "Цена подписки."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:242
-msgid "You receive a connection request"
-msgstr "вы получили новый запрос контакта"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:435
+msgid "Quantity"
+msgstr "Количество"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:243
-msgid "Your connections are confirmed"
-msgstr "Ваш запрос контакта был одобрен"
+#: ../../extend/addon/hzaddons/cart/submodules/subscriptions.php:439
+msgid "Term"
+msgstr "Условия"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:244
-msgid "Someone writes on your profile wall"
-msgstr "Кто-то написал на стене вашего профиля"
+#: ../../extend/addon/hzaddons/cart/submodules/paypalbutton.php:85
+msgid "Enable Paypal Button Module"
+msgstr "Включить модуль кнопки Paypal"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:245
-msgid "Someone writes a followup comment"
-msgstr "Кто-то пишет комментарий"
+#: ../../extend/addon/hzaddons/cart/myshop.php:30
+msgid "Access Denied."
+msgstr "Доступ запрещён."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:246
-msgid "You receive a private message"
-msgstr "Вы получили личное сообщение"
+#: ../../extend/addon/hzaddons/cart/myshop.php:112
+#: ../../extend/addon/hzaddons/cart/cart.php:1446
+msgid "Order Not Found"
+msgstr "Заказ не найден"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:247
-msgid "You receive a friend suggestion"
-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/Channel.php:248
-msgid "You are tagged in a post"
-msgstr "Вы были отмечены в публикации"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:7
+msgid "Error: order mismatch. Please try again."
+msgstr "Ошибка: несоответствие заказа. Пожалуйста, попробуйте ещё раз"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:249
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Вас толкнули, подтолкнули и т.п. в публикации"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:61
+msgid "Manual payments are not enabled."
+msgstr "Ручные платежи не подключены."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:250
-msgid "Someone likes your post/comment"
-msgstr "Кому-то нравится ваша публикация / комментарий"
+#: ../../extend/addon/hzaddons/cart/manual_payments.php:77
+msgid "Finished"
+msgstr "Завершено"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:251
-msgid "Show visual notifications including:"
-msgstr "Показывать визуальные оповещения включая:"
+#: ../../extend/addon/hzaddons/cart/cart.php:252
+msgid "DB Cleanup Failure"
+msgstr "Сбой очистки базы данных"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:252
-msgid "Unseen stream activity"
-msgstr "Новая активность в потоке"
+#: ../../extend/addon/hzaddons/cart/cart.php:674
+msgid "[cart] Item Added"
+msgstr "[cart] Элемент добавлен"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:253
-msgid "Unseen channel activity"
-msgstr "Новая активность в канале"
+#: ../../extend/addon/hzaddons/cart/cart.php:1063
+msgid "Order already checked out."
+msgstr "Заказ уже проверен."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:254
-msgid "Unseen private messages"
-msgstr "Новые личные сообщения"
+#: ../../extend/addon/hzaddons/cart/cart.php:1368
+msgid "Drop database tables when uninstalling."
+msgstr "Сбросить таблицы базы данных при деинсталляции"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:254
-#: ../../Zotlabs/Module/Settings/Channel.php:259
-#: ../../Zotlabs/Module/Settings/Channel.php:260
-#: ../../Zotlabs/Module/Settings/Channel.php:261
-msgid "Recommended"
-msgstr "Рекомендовано"
+#: ../../extend/addon/hzaddons/cart/cart.php:1387
+#: ../../extend/addon/hzaddons/cart/cart.php:1390
+msgid "Shop"
+msgstr "Магазин"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:255
-msgid "Upcoming events"
-msgstr "Грядущие события"
+#: ../../extend/addon/hzaddons/cart/cart.php:1410
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:52
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:36
+msgid "Profile Unavailable."
+msgstr "Профиль недоступен."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:256
-msgid "Events today"
-msgstr "События сегодня"
+#: ../../extend/addon/hzaddons/cart/cart.php:1547
+msgid "You must be logged into the Grid to shop."
+msgstr "Вы должны быть в сети для доступа к магазину"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:257
-msgid "Upcoming birthdays"
-msgstr "Грядущие дни рождения"
+#: ../../extend/addon/hzaddons/cart/cart.php:1594
+msgid "Access denied."
+msgstr "Доступ запрещён."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:257
-msgid "Not available in all themes"
-msgstr "Не доступно во всех темах"
+#: ../../extend/addon/hzaddons/cart/cart.php:1646
+#: ../../extend/addon/hzaddons/cart/cart.php:1789
+msgid "No Order Found"
+msgstr "Нет найденных заказов"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:258
-msgid "System (personal) notifications"
-msgstr "Системные (личные) уведомления"
+#: ../../extend/addon/hzaddons/cart/cart.php:1655
+msgid "An unknown error has occurred Please start again."
+msgstr "Произошла неизвестная ошибка. Пожалуйста, начните снова."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:259
-msgid "System info messages"
-msgstr "Сообщения с системной информацией"
+#: ../../extend/addon/hzaddons/cart/cart.php:1798
+msgid "Requirements not met."
+msgstr "Требования не соблюдены."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:260
-msgid "System critical alerts"
-msgstr "Критические уведомления системы"
+#: ../../extend/addon/hzaddons/cart/cart.php:1798
+msgid "Review your order and complete any needed requirements."
+msgstr "Ÿросмотрите свой заказ и выполните все необходимые требования"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:261
-msgid "New connections"
-msgstr "Новые контакты"
+#: ../../extend/addon/hzaddons/cart/cart.php:1824
+msgid "Invalid Payment Type.  Please start again."
+msgstr "Недействительный тип платежа. Пожалуйста, начните снова."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:262
-msgid "System Registrations"
-msgstr "Системные регистрации"
+#: ../../extend/addon/hzaddons/cart/cart.php:1831
+msgid "Order not found"
+msgstr "Заказ не найден"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:263
-msgid "Unseen shared files"
-msgstr "Новые общие файлы"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:57
+msgid "Errors encountered deleting database table "
+msgstr "Возникшие при удалении таблицы базы данных ошибки"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:264
-msgid "Unseen public stream activity"
-msgstr "Новая активность в публичном потоке"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:96
+msgid "Drop tables when uninstalling?"
+msgstr "Удалить таблицы при деинсталляции?"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:265
-msgid "Unseen likes and dislikes"
-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/Channel.php:266
-msgid "Unseen forum posts"
-msgstr "Новые публикации на форуме"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:97
+msgid "Mapbox Access Token"
+msgstr "Токен доступа к Mapbox"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:267
-msgid "Email notification hub (hostname)"
-msgstr "Центр уведомлений по email (имя хоста)"
+#: ../../extend/addon/hzaddons/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 "Если вы введете токен доступа к Mapbox, он будет использоваться для извлечения фрагментов карты из Mapbox вместо стандартного сервера OpenStreetMap."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:267
-#, php-format
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:162
+msgid "Rendezvous"
+msgstr ""
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:167
 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"
+"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/Channel.php:268
-msgid "Show new wall posts, private messages and connections under Notices"
-msgstr "Показать новые сообщения на стене, личные сообщения и контакты в \"Уведомлениях\""
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:168
+msgid "Welcome to Rendezvous!"
+msgstr "Добро пожаловать в Rendezvous!"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:269
-msgid "Mark all notices of the thread read if a notice is clicked"
-msgstr "Отметить все уведомления цепочки как прочитанные при нажатии"
+#: ../../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/Channel.php:269
-msgid "If no, only the clicked notice will be marked read"
-msgstr "Если выключено, только одно уведомление будет помечено как прочитанное"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:171
+msgid "Let's meet here"
+msgstr "Давайте встретимся здесь"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:270
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:174
+msgid "New marker"
+msgstr "Новый маркер"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:175
+msgid "Edit marker"
+msgstr "Редактировать маркер"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:176
+msgid "New identity"
+msgstr "Новый идентификатор"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:177
+msgid "Delete marker"
+msgstr "Удалить маркер"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:178
+msgid "Delete member"
+msgstr "Удалить участника"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:179
+msgid "Edit proximity alert"
+msgstr "Изменить оповещение о близости"
+
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180
 msgid ""
-"Desktop notifications are unavailable because the required browser "
-"permission has not been granted"
-msgstr "Уведомления на рабочем столе недоступны, поскольку не предоставлено необходимое разрешение от браузера."
+"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/Channel.php:271
-msgid "Grant permission"
-msgstr "Предоставить разрешение"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:180
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:185
+msgid "distance"
+msgstr "расстояние"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:272
-msgid "Notify me of events this many days in advance"
-msgstr "Уведомлять меня о событиях заранее, дней"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
+msgstr "Расстояние для уведомления о близости (метров)"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:272
-msgid "Must be greater than 0"
-msgstr "Должно быть больше 0"
+#: ../../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/Channel.php:275
-msgid "Default photo upload folder"
-msgstr "Каталог загрузки фотографий по умолчанию"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
+msgstr "Маркер уведомления о близости"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:275
-#: ../../Zotlabs/Module/Settings/Channel.php:276
-msgid "%Y - current year, %m -  current month"
-msgstr "%Y - текущий год, %y - текущий месяц"
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:186
+msgid "Reminder note"
+msgstr "Напоминание"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:276
-msgid "Default file upload folder"
-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/Settings/Channel.php:278
-msgid "Remove this channel."
-msgstr "Удалить этот канал."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
+msgstr "Добавить новое Rendezvous."
 
-#: ../../Zotlabs/Module/Settings/Channel.php:279
-msgid "Expire other channel content after this many days"
-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/Settings/Channel.php:279
-msgid "0 or blank to use the website limit."
-msgstr "0 или пусто - использовать настройки сайта."
+#: ../../extend/addon/hzaddons/rendezvous/rendezvous.php:232
+msgid "You have no rendezvous. Press the button above to create a rendezvous!"
+msgstr "У вас нет Rendezvous. Нажмите на кнопку ниже чтобы создать его!"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:279
-#, php-format
-msgid "This website expires after %d days."
-msgstr "Срок хранения содержимого этого сайта истекает через %d дней"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr "дал леща"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:279
-msgid "This website does not expire imported content."
-msgstr "Срок хранения импортированного содержимого этого сайта не ограничен."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr "получил леща"
 
-#: ../../Zotlabs/Module/Settings/Channel.php:279
-msgid "The website limit takes precedence if lower than your limit."
-msgstr "Ограничение сайта имеет приоритет если ниже вашего значения."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20
+msgid "shag"
+msgstr "вздрючил"
 
-#: ../../Zotlabs/Module/Settings/Account.php:21
-msgid "Not valid email."
-msgstr "Не действительный адрес email."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr "вздрюченный"
 
-#: ../../Zotlabs/Module/Settings/Account.php:24
-msgid "Protected email address. Cannot change to that email."
-msgstr "Защищенный адрес электронной почты. Нельзя изменить."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21
+msgid "patent"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:33
-msgid "System failure storing new email. Please try again."
-msgstr "Системная ошибка сохранения email. Пожалуйста попробуйте ещё раз."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:21
+msgid "patented"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Account.php:51
-msgid "Password verification failed."
-msgstr "Не удалось выполнить проверку пароля."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22
+msgid "hug"
+msgstr "обнял"
 
-#: ../../Zotlabs/Module/Settings/Account.php:58
-msgid "Passwords do not match. Password unchanged."
-msgstr "Пароли не совпадают. Пароль не изменён."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:22
+msgid "hugged"
+msgstr "обнятый"
 
-#: ../../Zotlabs/Module/Settings/Account.php:62
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Пустые пароли не допускаются. Пароль не изменён."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23
+msgid "murder"
+msgstr "убил"
 
-#: ../../Zotlabs/Module/Settings/Account.php:76
-msgid "Password changed."
-msgstr "Пароль изменен."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:23
+msgid "murdered"
+msgstr "убитый"
 
-#: ../../Zotlabs/Module/Settings/Account.php:78
-msgid "Password update failed. Please try again."
-msgstr "Изменение пароля не удалось. Пожалуйста, попробуйте ещё раз."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24
+msgid "worship"
+msgstr "почитает"
 
-#: ../../Zotlabs/Module/Settings/Account.php:103
-msgid "Account Settings"
-msgstr "Настройки аккаунта"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:24
+msgid "worshipped"
+msgstr "почитаемый"
 
-#: ../../Zotlabs/Module/Settings/Account.php:104
-msgid "Current Password"
-msgstr "Текущий пароль"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25
+msgid "kiss"
+msgstr "поцеловал"
 
-#: ../../Zotlabs/Module/Settings/Account.php:105
-msgid "Enter New Password"
-msgstr "Введите новый пароль:"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:25
+msgid "kissed"
+msgstr "поцелованный"
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Confirm New Password"
-msgstr "Подтвердите новый пароль:"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26
+msgid "tempt"
+msgstr "искушает"
 
-#: ../../Zotlabs/Module/Settings/Account.php:106
-msgid "Leave password fields blank unless changing"
-msgstr "Оставьте поля пустыми до измнения"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:26
+msgid "tempted"
+msgstr "искушённый"
 
-#: ../../Zotlabs/Module/Settings/Account.php:108
-msgid "DId2 or Email Address:"
-msgstr "dId2 или адрес электронной почты:"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27
+msgid "raise eyebrows at"
+msgstr "поднял брови"
 
-#: ../../Zotlabs/Module/Settings/Account.php:110
-msgid "Remove this account including all its channels"
-msgstr "Удалить этот аккаунт включая все каналы"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:27
+msgid "raised their eyebrows at"
+msgstr "поднял брови"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:25
-msgid "No feature settings configured"
-msgstr "Параметры функций не настроены"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28
+msgid "insult"
+msgstr "оскорбил"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "Addon Settings"
-msgstr "Настройки расширений"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:28
+msgid "insulted"
+msgstr "оскорблённый"
 
-#: ../../Zotlabs/Module/Settings/Featured.php:35
-msgid "Please save/submit changes to any panel before opening another."
-msgstr "Пожалуйста сохраните / отправьте изменения на панели прежде чем открывать другую."
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29
+msgid "praise"
+msgstr "похвалил"
 
-#: ../../Zotlabs/Module/Settings/Events.php:40
-msgid "Events Settings"
-msgstr "Настройки событий"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:29
+msgid "praised"
+msgstr "похваленный"
 
-#: ../../Zotlabs/Module/Settings/Manage.php:41
-msgid "Channel Manager Settings"
-msgstr "Настройки менеджера канала"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30
+msgid "be dubious of"
+msgstr "сомневается"
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:61
-msgid "Personal menu to display in your channel pages"
-msgstr "Персональное меню для отображения на странице вашего канала"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:30
+msgid "was dubious of"
+msgstr "усомнился"
 
-#: ../../Zotlabs/Module/Settings/Channel_home.php:88
-msgid "Channel Home Settings"
-msgstr "Настройки главной страницы канала"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31
+msgid "eat"
+msgstr "ест"
 
-#: ../../Zotlabs/Module/Settings/Calendar.php:40
-msgid "Calendar Settings"
-msgstr "Настройки календаря"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:31
+msgid "ate"
+msgstr "съел"
 
-#: ../../Zotlabs/Module/Settings/Display.php:125
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (экспериментальный)"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32
+msgid "giggle and fawn at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:181
-msgid "Display Settings"
-msgstr "Настройки отображения"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:32
+msgid "giggled and fawned at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:182
-msgid "Theme Settings"
-msgstr "Настройки темы"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33
+msgid "doubt"
+msgstr "сомневается"
 
-#: ../../Zotlabs/Module/Settings/Display.php:183
-msgid "Custom Theme Settings"
-msgstr "Дополнительные настройки темы"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:33
+msgid "doubted"
+msgstr "усомнился"
 
-#: ../../Zotlabs/Module/Settings/Display.php:184
-msgid "Content Settings"
-msgstr "Настройки содержимого"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34
+msgid "glare"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:190
-msgid "Display Theme:"
-msgstr "Тема отображения:"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:34
+msgid "glared at"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:191
-msgid "Select scheme"
-msgstr "Выбрать схему"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35
+msgid "fuck"
+msgstr "трахает"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
-msgid "Preload images before rendering the page"
-msgstr "Предзагрузка изображений перед обработкой страницы"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:35
+msgid "fucked"
+msgstr "трахнул"
 
-#: ../../Zotlabs/Module/Settings/Display.php:193
-msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
-msgstr "Субъективное время загрузки страницы будет длиннее, но страница будет готова при отображении"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36
+msgid "bonk"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:194
-msgid "Enable user zoom on mobile devices"
-msgstr "Включить масштабирование на мобильных устройствах"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:36
+msgid "bonked"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
-msgid "Update browser every xx seconds"
-msgstr "Обновление браузера каждые N секунд"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37
+msgid "declare undying love for"
+msgstr "признаётся в любви к"
 
-#: ../../Zotlabs/Module/Settings/Display.php:195
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Минимум 10 секунд, без максимума"
+#: ../../extend/addon/hzaddons/morepokes/morepokes.php:37
+msgid "declared undying love for"
+msgstr "признался в любви к"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Максимальное количество бесед для загрузки одновременно:"
+#: ../../extend/addon/hzaddons/wppost/wppost.php:47
+msgid "Post to WordPress"
+msgstr "Опубликовать в WordPress"
 
-#: ../../Zotlabs/Module/Settings/Display.php:196
-msgid "Maximum of 30 items"
-msgstr "Не более 30 элементов"
+#: ../../extend/addon/hzaddons/wppost/wppost.php:174
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:96
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:387
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:134
+#: ../../extend/addon/hzaddons/dwpost/dwpost.php:134
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:67
+msgid "Source"
+msgstr "Источник"
 
-#: ../../Zotlabs/Module/Settings/Display.php:197
-msgid "Show emoticons (smilies) as images"
-msgstr "Показывать эмотиконы (смайлики) как изображения"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:30
+msgid "Wordpress Settings saved."
+msgstr "Настройки WordPress сохранены."
 
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Link post titles to source"
-msgstr "Ссылки на источник заголовков публикаций"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:67
+msgid "WordPress username"
+msgstr "Имя пользователя WordPress"
 
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Display new member quick links menu"
-msgstr "Показать меню быстрых ссылок для новых участников"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:71
+msgid "WordPress password"
+msgstr "Пароль WordPress"
 
-#: ../../Zotlabs/Module/Settings/Directory.php:40
-msgid "Directory Settings"
-msgstr "Настройки каталога"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:75
+msgid "WordPress API URL"
+msgstr "URL API WordPress"
 
-#: ../../Zotlabs/Module/Settings/Editor.php:40
-msgid "Editor Settings"
-msgstr "Настройки редактора"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:76
+msgid "Typically https://your-blog.tld/xmlrpc.php"
+msgstr "Обычно https://your-blog.tld/xmlrpc.php"
 
-#: ../../Zotlabs/Module/Settings/Connections.php:40
-msgid "Connections Settings"
-msgstr "Настройки контактов"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:79
+msgid "WordPress blogid"
+msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Photos.php:40
-msgid "Photos Settings"
-msgstr "Настройки фотографий"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:80
+msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
+msgstr "Для многопользовательских сайтов, таких, как wordpress.com. В противном случае оставьте пустым"
 
-#: ../../Zotlabs/Module/Settings/Profiles.php:41
-msgid "Default profile for new contacts"
-msgstr "Профиль по умолчанию для новых контактов"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:84
+msgid "Post to WordPress by default"
+msgstr "Публиковать в WordPress по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Profiles.php:49
-msgid "Profiles Settings"
-msgstr "Настройки профилей"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:88
+msgid "Forward comments (requires hubzilla_wp plugin)"
+msgstr "Пересылать комментарии (требуется плагин hubzilla_wp)"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:39
-msgid "Privacy settings updated."
-msgstr "Настройки конфиденциальности обновлены."
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:92
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:69
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:63
+msgid "Add link to original post"
+msgstr "Добавить ссылку на оригинальную заметку"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:57
-msgid "Only those you specifically allow"
-msgstr "Только персонально разрешённые"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:96
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:67
+msgid "Link description (default:"
+msgstr "Описание ссылки (по-умолчанию:"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:58
-msgid "Approved connections"
-msgstr "Одобренные контакты"
+#: ../../extend/addon/hzaddons/wppost/Mod_Wppost.php:104
+msgid "Wordpress Post"
+msgstr "Публикация в WordPress"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:59
-msgid "Any connections"
-msgstr "Любые контакты"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:21
+msgid "nofed Settings saved."
+msgstr "Настройки nofed сохранены."
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:60
-msgid "Anybody on this website"
-msgstr "Любой на этом сайте"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:40
+msgid "Federate posts by default"
+msgstr "Разрешить федерацию публикаций по умолчанию"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:61
-msgid "Anybody in this network"
-msgstr "Любой в этой сети"
+#: ../../extend/addon/hzaddons/nofed/Mod_Nofed.php:48
+msgid "No Federation"
+msgstr "Отключить Federation"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:62
-msgid "Anybody authenticated"
-msgstr "Любой аутентифицированный"
+#: ../../extend/addon/hzaddons/nofed/nofed.php:47
+msgid "Federate"
+msgstr "Федерировать"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:63
-msgid "Anybody on the internet"
-msgstr "Любой в интернете"
+#: ../../extend/addon/hzaddons/gallery/Mod_Gallery.php:134
+#: ../../extend/addon/hzaddons/gallery/gallery.php:43
+msgid "Gallery"
+msgstr "Галерея"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:73
-msgid ""
-"Advise: set to \"Anybody on the internet\" and use privacy groups to "
-"restrict access"
-msgstr "Совет: установите значение «Кто угодно в Интернете» и используйте группы конфиденциальности для ограничения доступа."
+#: ../../extend/addon/hzaddons/gallery/gallery.php:46
+msgid "Photo Gallery"
+msgstr "Фотогалерея"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:109
-msgid "Privacy Settings"
-msgstr "Настройки конфиденциальности"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:106
+msgid "Photos imported"
+msgstr "Фотографии импортированы"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:114
-msgid "Advanced configuration"
-msgstr "Расширенная конфигурация"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:129
+msgid "Redmatrix Photo Album Import"
+msgstr "Импортировать альбом фотографий Redmatrix"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:116
-msgid "Proceed with caution"
-msgstr "Применять с осторожностью"
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:130
+msgid "This will import all your Redmatrix photo albums to this channel."
+msgstr "Это позволит импортировать все ваши альбомы фотографий Redmatrix в этот канал."
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:117
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:131
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:121
+msgid "Redmatrix Server base URL"
+msgstr "Базовый URL сервера Redmatrix"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:132
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:122
+msgid "Redmatrix Login Username"
+msgstr "Имя пользователя Redmatrix"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:133
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:123
+msgid "Redmatrix Login Password"
+msgstr "Пароль Redmatrix"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134
+msgid "Import just this album"
+msgstr "Импортировать только этот альбом"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:134
+msgid "Leave blank to import all albums"
+msgstr "Оставьте пустым для импорта всех альбомов"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135
+msgid "Maximum count to import"
+msgstr "Максимальное количество для импорта"
+
+#: ../../extend/addon/hzaddons/redphotos/redphotos.php:135
+msgid "0 or blank to import all available"
+msgstr "0 или пусто для импорта всех доступных"
+
+#: ../../extend/addon/hzaddons/piwik/piwik.php:85
 msgid ""
-"Changing advanced configuration settings can impact your, and your contacts "
-"channels functionality and security."
-msgstr "Изменение дополнительных параметров конфигурации может повлиять на работу и безопасность ваших каналов и контактов."
+"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/Settings/Privacy.php:118
-msgid "Accept the risk and continue"
-msgstr "Принять риск и продолжить"
+#: ../../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/Settings/Privacy.php:120
-msgid "Automatically approve new contacts"
-msgstr "Автоматически одобрять новые контакты"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:96
+msgid "Piwik Base URL"
+msgstr "Базовый URL Piwik"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:121
-msgid "Opt-out of search engine indexing"
-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/Settings/Privacy.php:122
-msgid "Group actor"
-msgstr "Представление группы"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:97
+msgid "Site ID"
+msgstr "ID сайта"
 
-#: ../../Zotlabs/Module/Settings/Privacy.php:122
-msgid "Allow this channel to act as a forum"
-msgstr "Разрешить выступать этому каналу в качестве форума"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:98
+msgid "Show opt-out cookie link?"
+msgstr "Показывать ссылку на отказ от использования cookies?"
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:23
-msgid "Settings saved."
-msgstr "Настройки сохранены."
+#: ../../extend/addon/hzaddons/piwik/piwik.php:99
+msgid "Asynchronous tracking"
+msgstr "Асинхронное отслеживание"
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:25
-msgid "Settings saved. Reload page please."
-msgstr "Настройки сохранены. Пожалуйста, перезагрузите страницу."
+#: ../../extend/addon/hzaddons/piwik/piwik.php:100
+msgid "Enable frontend JavaScript error tracking"
+msgstr "Включить отслеживание ошибок JavaScript на фронтенде."
 
-#: ../../Zotlabs/Module/Settings/Conversation.php:47
-msgid "Conversation Settings"
-msgstr "Настройки бесед"
+#: ../../extend/addon/hzaddons/piwik/piwik.php:100
+msgid "This feature requires Piwik >= 2.2.0"
+msgstr "Эта функция требует версию Piwik >= 2.2.0"
 
-#: ../../Zotlabs/Module/Menu.php:68
-msgid "Unable to update menu."
-msgstr "Невозможно обновить меню."
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:22
+msgid "Fuzzloc Settings updated."
+msgstr "Настройки примерного положения обновлены."
 
-#: ../../Zotlabs/Module/Menu.php:79
-msgid "Unable to create menu."
-msgstr "Невозможно создать меню."
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:38
+msgid "Minimum offset in meters"
+msgstr "Минимальное смещение в метрах"
 
-#: ../../Zotlabs/Module/Menu.php:161 ../../Zotlabs/Module/Menu.php:174
-msgid "Menu Name"
-msgstr "Название меню"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:42
+msgid "Maximum offset in meters"
+msgstr "Максимальное смещение в метрах"
 
-#: ../../Zotlabs/Module/Menu.php:161
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Уникальное название (не видимо на странице) - требуется"
+#: ../../extend/addon/hzaddons/fuzzloc/Mod_Fuzzloc.php:51
+msgid "Fuzzy Location"
+msgstr "Примерное положение"
 
-#: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:175
-msgid "Menu Title"
-msgstr "Заголовок меню"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:24
+msgid "Channel is required."
+msgstr "Необходим канал."
 
-#: ../../Zotlabs/Module/Menu.php:162
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Видимость на странице - оставьте пустым если не хотите иметь заголовок"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:38
+msgid "Hubzilla Crosspost Connector Settings saved."
+msgstr "Настройки пересылки публикаций Hubzilla сохранены."
 
-#: ../../Zotlabs/Module/Menu.php:163
-msgid "Allow Bookmarks"
-msgstr "Разрешить закладки"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:61
+msgid "Send public postings to Hubzilla channel by default"
+msgstr "Отправлять общедоступные публикации в канал Hubzilla по умолчанию"
 
-#: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Меню может использоваться, чтобы сохранить закладки"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:65
+msgid "Hubzilla API Path"
+msgstr "Путь к Hubzilla API"
 
-#: ../../Zotlabs/Module/Menu.php:164 ../../Zotlabs/Module/Menu.php:225
-msgid "Submit and proceed"
-msgstr "Отправить и обработать"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:65
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:51
+msgid "https://{sitename}/api"
+msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:124
-msgid "Drop"
-msgstr "Удалить"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:69
+msgid "Hubzilla login name"
+msgstr "Имя входа Hubzilla"
 
-#: ../../Zotlabs/Module/Menu.php:181
-msgid "Bookmarks allowed"
-msgstr "Закладки разрешены"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:73
+msgid "Hubzilla channel name"
+msgstr "Название канала Hubzilla"
 
-#: ../../Zotlabs/Module/Menu.php:183
-msgid "Delete this menu"
-msgstr "Удалить это меню"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:77
+msgid "Hubzilla password"
+msgstr "Пароль Hubzilla"
 
-#: ../../Zotlabs/Module/Menu.php:184 ../../Zotlabs/Module/Menu.php:219
-msgid "Edit menu contents"
-msgstr "Редактировать содержание меню"
+#: ../../extend/addon/hzaddons/redred/Mod_Redred.php:85
+msgid "Hubzilla Crosspost Connector"
+msgstr "Пересылка публикаций Hubzilla"
 
-#: ../../Zotlabs/Module/Menu.php:185
-msgid "Edit this menu"
-msgstr "Редактировать это меню"
+#: ../../extend/addon/hzaddons/redred/redred.php:50
+msgid "Post to Hubzilla"
+msgstr "Опубликовать в Hubzilla"
 
-#: ../../Zotlabs/Module/Menu.php:201
-msgid "Menu could not be deleted."
-msgstr "Меню не может быть удалено."
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:30
+msgid ""
+"Allow magic authentication only to websites of your immediate connections"
+msgstr "Разрешить волшебную аутентификацию только на сайтах ваших непосредственных соединений"
 
-#: ../../Zotlabs/Module/Menu.php:214
-msgid "Edit Menu"
-msgstr "Редактировать меню"
+#: ../../extend/addon/hzaddons/authchoose/Mod_Authchoose.php:36
+msgid "Authchoose"
+msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:218
-msgid "Add or remove entries to this menu"
-msgstr "Добавить или удалить пункты этого меню"
+#: ../../extend/addon/hzaddons/irc/irc.php:37
+msgid "Channels to auto connect"
+msgstr "Каналы для автоматического подключения"
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Menu name"
-msgstr "Название меню"
+#: ../../extend/addon/hzaddons/irc/irc.php:37
+#: ../../extend/addon/hzaddons/irc/irc.php:41
+msgid "Comma separated list"
+msgstr "Список, разделённый запятыми"
 
-#: ../../Zotlabs/Module/Menu.php:220
-msgid "Must be unique, only seen by you"
-msgstr "Должно быть уникальным (видно только вам)"
+#: ../../extend/addon/hzaddons/irc/irc.php:41
+#: ../../extend/addon/hzaddons/irc/Mod_Irc.php:23
+msgid "Popular Channels"
+msgstr "Популярные каналы"
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title"
-msgstr "Заголовок меню"
+#: ../../extend/addon/hzaddons/irc/irc.php:45
+msgid "IRC Settings"
+msgstr "Настройки IRC"
 
-#: ../../Zotlabs/Module/Menu.php:221
-msgid "Menu title as seen by others"
-msgstr "Видимый другими заголовок меню"
+#: ../../extend/addon/hzaddons/irc/irc.php:54
+msgid "IRC settings saved."
+msgstr "Настройки IRC сохранены"
 
-#: ../../Zotlabs/Module/Menu.php:222
-msgid "Allow bookmarks"
-msgstr "Разрешить закладки"
+#: ../../extend/addon/hzaddons/irc/irc.php:58
+msgid "IRC Chatroom"
+msgstr "Чат IRC"
 
-#: ../../Zotlabs/Module/Defperms.php:252
-msgid "Connection Default Permissions"
-msgstr "Разрешения по умолчанию для контакта"
+#: ../../extend/addon/hzaddons/fediwordle/fediwordle.php:211
+msgid "ERROR: word length is not correct!"
+msgstr "ОШИБКА: неверная длина слова!"
 
-#: ../../Zotlabs/Module/Defperms.php:253
-msgid "Apply these permissions automatically"
-msgstr "Применить эти разрешения автоматически"
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:22
+msgid "Fediwordle App"
+msgstr "Приложение Fediwordle"
 
-#: ../../Zotlabs/Module/Defperms.php:253
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:23
+msgid "A distributed word game inspired by wordle."
+msgstr "Распределенная игра в слова, вдохновленная wordle."
+
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:24
 msgid ""
-"If enabled, connection requests will be approved without your interaction"
-msgstr "Если включено, запросы контактов будут одобрены без вашего участия"
+"To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel "
+"post."
+msgstr "Чтобы начать игру, введите [wordle]ваше_слово[/wordle] где-нибудь на вверху заметки."
 
-#: ../../Zotlabs/Module/Defperms.php:254
-msgid "Permission role"
-msgstr "Роль разрешения"
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:25
+msgid "Your contacts can post their guess in the comments."
+msgstr "Ваши контакты могут оставлять свои предположения в комментариях."
 
-#: ../../Zotlabs/Module/Defperms.php:255
-msgid "Add permission role"
-msgstr "Добавить роль разрешения"
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:26
+msgid ""
+"Your channel will evaluate the guess and automatically post the response."
+msgstr "Ваш канал оценит догадку и автоматически опубликует ответ."
 
-#: ../../Zotlabs/Module/Defperms.php:259 ../../Zotlabs/Module/Connedit.php:700
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:28
+msgid "Correct letters"
+msgstr "Верные буквы"
+
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:29
+msgid "Letters contained in the word but at the wrong spot"
+msgstr "Буквы, содержащиеся в слове, но не в том месте"
+
+#: ../../extend/addon/hzaddons/fediwordle/Mod_Fediwordle.php:30
+msgid "Letters not contained in the word"
+msgstr "Буквы, не входящие в слово"
+
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:145
+msgid "Post to GNU social"
+msgstr "Опубликовать в GNU Social"
+
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:594
+msgid "API URL"
+msgstr ""
+
+#: ../../extend/addon/hzaddons/statusnet/statusnet.php:597
+msgid "Application name"
+msgstr "Название приложения"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:61
 msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Разрешения, указанные на этой странице, будут применяться ко всем новым соединениям."
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Пожалуйста свяжитесь с администратором сайта. <br />Предоставленный URL API недействителен."
 
-#: ../../Zotlabs/Module/Defperms.php:260
-msgid "Automatic approval settings"
-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/Defperms.php:264
-msgid "My Settings"
-msgstr "Мои настройки"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:130
+msgid "GNU social settings updated."
+msgstr "Настройки GNU Social обновлены."
 
-#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720
-msgid "Individual Permissions"
-msgstr "Индивидуальные разрешения"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:179
+msgid "Globally Available GNU social OAuthKeys"
+msgstr "Глобально доступные ключи OAuthKeys GNU Social"
 
-#: ../../Zotlabs/Module/Defperms.php:268
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:181
 msgid ""
-"Some individual permissions may have been preset or locked based on your "
-"channel type and privacy settings."
-msgstr "Некоторые индивидуальные разрешения могут быть предустановлены или заблокированы на основании типа вашего канала и настроек приватности."
+"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/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Этот параметр требует специальной обработки и редактирования и был заблокирован."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:196
+msgid "Provide your own OAuth Credentials"
+msgstr "Предоставьте ваши собственные регистрационные данные OAuth"
 
-#: ../../Zotlabs/Module/Pconfig.php:57
-msgid "Configuration Editor"
-msgstr "Редактор конфигурации"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:198
+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/Pconfig.php:58
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:202
+msgid "OAuth Consumer Key"
+msgstr "Ключ клиента OAuth"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:206
+msgid "OAuth Consumer Secret"
+msgstr "Пароль клиента OAuth"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:210
+msgid "Base API Path"
+msgstr "Основной путь к API"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:210
+msgid "Remember the trailing /"
+msgstr "Запомнить закрывающий /"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:214
+msgid "GNU social application name"
+msgstr "Имя приложения GNU social"
+
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:237
 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 "Предупреждение. Изменение некоторых настроек может привести к неработоспособности вашего канала. Пожалуйста, покиньте эту страницу, если вы точно не знаете, как правильно использовать эту функцию."
+"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/Oauth2.php:54
-msgid "Name and Secret are required"
-msgstr "Требуются имя и код"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:239
+msgid "Log in with GNU social"
+msgstr "Войти с GNU social"
 
-#: ../../Zotlabs/Module/Oauth2.php:113
-msgid "Add OAuth2 application"
-msgstr "Добавить приложение OAuth2"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:242
+msgid "Copy the security code from GNU social here"
+msgstr "Скопируйте код безопасности GNU social здесь"
 
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147
-msgid "Grant Types"
-msgstr "Разрешить типы"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:252
+msgid "Cancel Connection Process"
+msgstr "Отменить процесс подключения"
 
-#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:120
-msgid "leave blank unless your application sepcifically requires this"
-msgstr "оставьте пустыми до тех пока ваше приложение не требует этого"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:254
+msgid "Current GNU social API is"
+msgstr "Текущий GNU social API"
 
-#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148
-msgid "Authorization scope"
-msgstr "Область полномочий"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:258
+msgid "Cancel GNU social Connection"
+msgstr "Отменить подключение с GNU social"
 
-#: ../../Zotlabs/Module/Oauth2.php:132
-msgid "OAuth2 Application not found."
-msgstr "Приложение OAuth2 не найдено."
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:275
+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/Oauth2.php:147 ../../Zotlabs/Module/Oauth2.php:148
-msgid "leave blank unless your application specifically requires this"
-msgstr "оставьте поле пустым, если ваше приложение не требует этого"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:280
+msgid "Post to GNU social by default"
+msgstr "Публиковать в GNU social по умолчанию"
 
-#: ../../Zotlabs/Module/Oauth2.php:190
-msgid "Connected OAuth2 Apps"
-msgstr "Подключённые приложения OAuth2"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:280
+msgid ""
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
+msgstr "Если включено, ваши общедоступные публикации будут опубликованы в связанной учётной записи GNU social по умолчанию"
 
-#: ../../Zotlabs/Module/Dreport.php:38
-msgid "Invalid message"
-msgstr "Неверное сообщение"
+#: ../../extend/addon/hzaddons/statusnet/Mod_Statusnet.php:301
+msgid "GNU-Social Crosspost Connector"
+msgstr "Подключение пересылки публикаций GNU Social"
 
-#: ../../Zotlabs/Module/Dreport.php:65
-msgid "no results"
-msgstr "Ничего не найдено."
+#: ../../extend/addon/hzaddons/flashcards/Mod_Flashcards.php:225
+msgid "Not allowed."
+msgstr "Запрещено."
 
-#: ../../Zotlabs/Module/Dreport.php:79
-msgid "channel sync processed"
-msgstr "синхронизация канала завершена"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:81
+msgid "Hubzilla File Storage Import"
+msgstr "Импорт файлового хранилища Hubzilla"
 
-#: ../../Zotlabs/Module/Dreport.php:83
-msgid "queued"
-msgstr "в очереди"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:82
+msgid "This will import all your cloud files from another server."
+msgstr "Это позволит импортировать все ваши файлы с другого сервера."
 
-#: ../../Zotlabs/Module/Dreport.php:87
-msgid "posted"
-msgstr "опубликовано"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:83
+msgid "Hubzilla Server base URL"
+msgstr "Базовый URL сервера Hubzilla"
 
-#: ../../Zotlabs/Module/Dreport.php:91
-msgid "accepted for delivery"
-msgstr "принято к доставке"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:84
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:139
+msgid "Since modified date yyyy-mm-dd"
+msgstr "Начиная с даты изменений yyyy-mm-dd"
 
-#: ../../Zotlabs/Module/Dreport.php:95
-msgid "updated"
-msgstr "обновлено"
+#: ../../extend/addon/hzaddons/hzfiles/hzfiles.php:85
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:140
+msgid "Until modified date yyyy-mm-dd"
+msgstr "Заканчивая датой изменений yyyy-mm-dd"
 
-#: ../../Zotlabs/Module/Dreport.php:98
-msgid "update ignored"
-msgstr "обновление игнорируется"
+#: ../../extend/addon/hzaddons/articles/Mod_Articles.php:119
+msgid "Add Article"
+msgstr "Добавить статью"
 
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "permission denied"
-msgstr "доступ запрещен"
+#: ../../extend/addon/hzaddons/articles/Mod_Article_edit.php:127
+msgid "Edit Article"
+msgstr "Редактировать статью"
 
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "recipient not found"
-msgstr "получатель не найден"
+#: ../../extend/addon/hzaddons/articles/articles.php:49
+msgid "View Articles"
+msgstr "Просмотр статей"
 
-#: ../../Zotlabs/Module/Dreport.php:125
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr "Отчёт о доставке для %1$s"
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:60
+msgid "Page to load after login"
+msgstr "Страница для загрузки после входа"
 
-#: ../../Zotlabs/Module/Dreport.php:130
-msgid "Redeliver"
-msgstr "Доставить повторно"
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:60
+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; (оставьте пустым для для страницы сети по умолчанию)."
 
-#: ../../Zotlabs/Module/Thing.php:122
-msgid "Thing updated"
-msgstr "Обновлено"
+#: ../../extend/addon/hzaddons/startpage/Mod_Startpage.php:68
+msgid "Startpage"
+msgstr "Стартовая страница"
 
-#: ../../Zotlabs/Module/Thing.php:174
-msgid "Object store: failed"
-msgstr "Хранлищие объектов: неудача"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:51
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:129
+msgid "System defaults:"
+msgstr "Системные по умолчанию:"
 
-#: ../../Zotlabs/Module/Thing.php:178
-msgid "Thing added"
-msgstr "Добавлено"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55
+msgid "Preferred Clipart IDs"
+msgstr "Предпочитаемый Clipart ID"
 
-#: ../../Zotlabs/Module/Thing.php:204
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr ""
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:55
+msgid "List of preferred clipart ids. These will be shown first."
+msgstr "Список предпочитаемых Clipart ID. Эти будут показаны первыми."
 
-#: ../../Zotlabs/Module/Thing.php:267
-msgid "Show Thing"
-msgstr "Показать"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56
+msgid "Default Search Term"
+msgstr "Условие поиска по умолчанию"
 
-#: ../../Zotlabs/Module/Thing.php:274
-msgid "item not found."
-msgstr "Элемент не найден."
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:56
+msgid "The default search term. These will be shown second."
+msgstr "Условие поиска по умолчанию. Показываются во вторую очередь."
 
-#: ../../Zotlabs/Module/Thing.php:307
-msgid "Edit Thing"
-msgstr "Редактировать"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57
+msgid "Return After"
+msgstr "Вернуться после"
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366
-msgid "Select a profile"
-msgstr "Выбрать профиль"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:57
+msgid "Page to load after image selection."
+msgstr "Страница для загрузки после выбора изображения."
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Post an activity"
-msgstr "Опубликовать мероприятие"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:60
+msgid "Profile List"
+msgstr "Список профилей"
 
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Отправлять только подходящий профиль"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:62
+msgid "Order of Preferred"
+msgstr "Порядок предпочтения"
 
-#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371
-msgid "Name of thing e.g. something"
-msgstr "Наименование, например \"нечто\""
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:62
+msgid "Sort order of preferred clipart ids."
+msgstr "Порядок сортировки предпочитаемых Clipart ID. "
 
-#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372
-msgid "URL of thing (optional)"
-msgstr "URL (необязательно)"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:63
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:69
+msgid "Newest first"
+msgstr "Новое первым"
 
-#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373
-msgid "URL for photo of thing (optional)"
-msgstr "URL для фотографии (необязательно)"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:66
+msgid "As entered"
+msgstr "По мере ввода"
 
-#: ../../Zotlabs/Module/Thing.php:364
-msgid "Add Thing to your Profile"
-msgstr "Добавить к вашему профилю"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:68
+msgid "Order of other"
+msgstr "Порядок других"
 
-#: ../../Zotlabs/Module/Rmagic.php:46
-msgid "Authentication failed."
-msgstr "Ошибка аутентификации."
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:68
+msgid "Sort order of other clipart ids."
+msgstr "Порядок сортировки остальных Clipart ID."
 
-#: ../../Zotlabs/Module/Import_progress.php:36
-msgid "Item sync completed!"
-msgstr "Синхронизация объектов завершена!"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:70
+msgid "Most downloaded first"
+msgstr "Самое загружаемое первым"
 
-#: ../../Zotlabs/Module/Import_progress.php:51
-msgid "Item sync completed but no items were found!"
-msgstr "Синхронизация объектов завершена, но объекты не найдены!"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:71
+msgid "Most liked first"
+msgstr "Самое нравящееся первым"
 
-#: ../../Zotlabs/Module/Import_progress.php:73
-msgid "File sync completed!"
-msgstr "Синхронизация файлов завершена!"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:73
+msgid "Preferred IDs Message"
+msgstr "Сообщение от предпочитаемых ID"
 
-#: ../../Zotlabs/Module/Import_progress.php:90
-msgid "File sync completed but no files were found!"
-msgstr "Синхронизация файлов завершена, но файлы не найдены! "
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:73
+msgid "Message to display above preferred results."
+msgstr "Отображаемое сообщение над предпочитаемыми результатами."
 
-#: ../../Zotlabs/Module/Import_progress.php:105
-msgid "Channel clone status"
-msgstr "Статус клонирования канала"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:79
+msgid "Uploaded by: "
+msgstr "Загружено:"
 
-#: ../../Zotlabs/Module/Import_progress.php:106
-msgid "Item sync status"
-msgstr "Статус синхронизации объектов"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:79
+msgid "Drawn by: "
+msgstr "Нарисовано:"
 
-#: ../../Zotlabs/Module/Import_progress.php:107
-msgid "File sync status"
-msgstr "Статус синхронизации файлов"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:183
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:195
+msgid "Use this image"
+msgstr "Использовать это изображение"
 
-#: ../../Zotlabs/Module/Import_progress.php:114
-msgid "Channel cloning completed!"
-msgstr "Клонирование канала завершено!"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:193
+msgid "Or select from a free OpenClipart.org image:"
+msgstr "Или выберите из бесплатных изображений на OpenClipart.org"
 
-#: ../../Zotlabs/Module/Import_progress.php:115
-msgid "Resume"
-msgstr "Возобновить"
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:196
+msgid "Search Term"
+msgstr "Условие поиска"
 
-#: ../../Zotlabs/Module/Import_progress.php:116
-msgid "Only resume if sync stalled!"
-msgstr "Возобновлять только в том случае, если синхронизация остановилась! "
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:233
+msgid "Unknown error. Please try again later."
+msgstr "Неизвестная ошибка. Пожалуйста, повторите попытку позже."
 
-#: ../../Zotlabs/Module/Pdledit.php:27
-msgid "Layout updated."
-msgstr "Шаблон обновлен."
+#: ../../extend/addon/hzaddons/openclipatar/openclipatar.php:309
+msgid "Profile photo updated successfully."
+msgstr "Фотография профиля обновлена успешно."
 
-#: ../../Zotlabs/Module/Pdledit.php:55 ../../Zotlabs/Module/Pdledit.php:98
-msgid "Edit System Page Description"
-msgstr "Редактировать описание системной страницы"
+#: ../../extend/addon/hzaddons/cards/cards.php:50
+msgid "View Cards"
+msgstr "Просмотреть карточки"
 
-#: ../../Zotlabs/Module/Pdledit.php:76
-msgid "(modified)"
-msgstr "(изменено)"
+#: ../../extend/addon/hzaddons/cards/Mod_Card_edit.php:129
+msgid "Edit Card"
+msgstr "Редактировать карточку"
 
-#: ../../Zotlabs/Module/Pdledit.php:93
-msgid "Layout not found."
-msgstr "Шаблон не найден."
+#: ../../extend/addon/hzaddons/cards/Mod_Cards.php:115
+msgid "Add Card"
+msgstr "Добавить карточку"
 
-#: ../../Zotlabs/Module/Pdledit.php:99
-msgid "Module Name:"
-msgstr "Имя модуля:"
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:23
+msgid "NSA Bait App"
+msgstr "Приложение NSA Bait"
 
-#: ../../Zotlabs/Module/Pdledit.php:100
-msgid "Layout Help"
-msgstr "Помощь к шаблону"
+#: ../../extend/addon/hzaddons/nsabait/Mod_Nsabait.php:25
+msgid "Make yourself a political target."
+msgstr "Сделайте себя политической мишенью."
 
-#: ../../Zotlabs/Module/Pdledit.php:101
-msgid "Edit another layout"
-msgstr "Редактировать другой шаблон"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:38
+msgid "Some setting"
+msgstr "Некоторые настройки"
 
-#: ../../Zotlabs/Module/Pdledit.php:102
-msgid "System layout"
-msgstr "Системный шаблон"
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:38
+msgid "A setting"
+msgstr "Настройка"
+
+#: ../../extend/addon/hzaddons/skeleton/Mod_Skeleton.php:46
+msgid "Skeleton Settings"
+msgstr "Настройки скелета"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWiki.php:144
+msgid "Wiki updated successfully"
+msgstr "Wiki успешно обновлена"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWiki.php:204
+msgid "Wiki files deleted successfully"
+msgstr "Wiki успешно удалена"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:41
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:109
+msgid "(No Title)"
+msgstr "(нет заголовка)"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:123
+msgid "Wiki page create failed."
+msgstr "Не удалось создать страницу Wiki."
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:137
+msgid "Wiki not found."
+msgstr "Wiki не найдена."
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:148
+msgid "Destination name already exists"
+msgstr "Имя назначения уже существует"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:181
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:376
+msgid "Page not found"
+msgstr "Страница не найдена."
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:211
+msgid "Error reading page content"
+msgstr "Ошибка чтения содержимого страницы"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:367
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:417
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:485
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:526
+msgid "Error reading wiki"
+msgstr "Ошибка чтения Wiki"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:404
+msgid "Page update failed."
+msgstr "Не удалось обновить страницу."
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:439
+msgid "Nothing deleted"
+msgstr "Ничего не удалено"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:506
+msgid "Compare: object not found."
+msgstr "Сравнение: объект не найден."
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:513
+msgid "Page updated"
+msgstr "Страница обновлена"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:521
+msgid "Wiki resource_id required for git commit"
+msgstr "Требуется resource_id Wiki для отправки в Git"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:581
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_page_history.php:29
+msgctxt "wiki_history"
+msgid "Message"
+msgstr "Сообщение"
 
-#: ../../Zotlabs/Module/Wiki.php:130
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:582
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_page_history.php:30
+msgid "Date"
+msgstr "Дата"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:583
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_page_history.php:31
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:370
+msgid "Revert"
+msgstr "Отменить"
+
+#: ../../extend/addon/hzaddons/wiki/Lib/NativeWikiPage.php:584
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_page_history.php:32
+msgid "Compare"
+msgstr "Сравнить"
+
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:33
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:90
+msgid "Add new page"
+msgstr "Добавить новую страницу"
+
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:84
+msgid "Wiki Pages"
+msgstr "Wiki страницы"
+
+#: ../../extend/addon/hzaddons/wiki/Widget/Wiki_pages.php:95
+msgid "Page name"
+msgstr "Название страницы"
+
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:136
 msgid "Error retrieving wiki"
 msgstr "Ошибка при получении Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:137
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:143
 msgid "Error creating zip file export folder"
 msgstr "Ошибка при создании zip-файла при экспорте каталога"
 
-#: ../../Zotlabs/Module/Wiki.php:188
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:194
 msgid "Error downloading wiki: "
 msgstr "Ошибка загрузки Wiki:"
 
-#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Storage/Browser.php:404
-msgid "Download"
-msgstr "Загрузить"
-
-#: ../../Zotlabs/Module/Wiki.php:213
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:219
 msgid "Wiki name"
 msgstr "Название Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:214
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:220
 msgid "Content type"
 msgstr "Тип содержимого"
 
-#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Storage/Browser.php:378
-msgid "Type"
-msgstr "Тип"
-
-#: ../../Zotlabs/Module/Wiki.php:217
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:223
 msgid "Any&nbsp;type"
 msgstr "Любой&nbsp;тип"
 
-#: ../../Zotlabs/Module/Wiki.php:224
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:230
 msgid "Lock content type"
 msgstr "Зафиксировать тип содержимого"
 
-#: ../../Zotlabs/Module/Wiki.php:225
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:231
 msgid "Create a status post for this wiki"
 msgstr "Создать публикацию о статусе этой Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:226
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:232
 msgid "Edit Wiki Name"
 msgstr "Редактировать наименование Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:271
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:277
 msgid "Wiki not found"
 msgstr "Wiki не найдена"
 
-#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:303
 msgid "Rename page"
 msgstr "Переименовать страницу"
 
-#: ../../Zotlabs/Module/Wiki.php:318
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:324
 msgid "Error retrieving page content"
 msgstr "Ошибка при получении содержимого страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:326 ../../Zotlabs/Module/Wiki.php:328
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:332
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:334
 msgid "New page"
 msgstr "Новая страница"
 
-#: ../../Zotlabs/Module/Wiki.php:363
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:369
 msgid "Revision Comparison"
 msgstr "Сравнение ревизий"
 
-#: ../../Zotlabs/Module/Wiki.php:371
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:377
 msgid "Short description of your changes (optional)"
 msgstr "Краткое описание ваших изменений (необязательно)"
 
-#: ../../Zotlabs/Module/Wiki.php:391
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:397
 msgid "New page name"
 msgstr "Новое имя страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:396
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:402
 msgid "Embed image from photo albums"
 msgstr "Встроить изображение из фотоальбома"
 
-#: ../../Zotlabs/Module/Wiki.php:407
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:413
 msgid "History"
 msgstr "История"
 
-#: ../../Zotlabs/Module/Wiki.php:485
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:491
 msgid "Error creating wiki. Invalid name."
 msgstr "Ошибка создания Wiki. Неверное имя."
 
-#: ../../Zotlabs/Module/Wiki.php:492
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:498
 msgid "A wiki with this name already exists."
 msgstr "Wiki с таким именем уже существует."
 
-#: ../../Zotlabs/Module/Wiki.php:505
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:511
 msgid "Wiki created, but error creating Home page."
 msgstr "Wiki создана, но возникла ошибка при создании домашней страницы"
 
-#: ../../Zotlabs/Module/Wiki.php:512
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:518
 msgid "Error creating wiki"
 msgstr "Ошибка при создании Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:536
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:542
 msgid "Error updating wiki. Invalid name."
 msgstr "Ошибка при обновлении Wiki. Неверное имя."
 
-#: ../../Zotlabs/Module/Wiki.php:555
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:561
 msgid "Error updating wiki"
 msgstr "Ошибка при обновлении Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:570
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:576
 msgid "Wiki delete permission denied."
 msgstr "Нет прав на удаление Wiki."
 
-#: ../../Zotlabs/Module/Wiki.php:580
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:586
 msgid "Error deleting wiki"
 msgstr "Ошибка удаления Wiki"
 
-#: ../../Zotlabs/Module/Wiki.php:613
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:619
 msgid "New page created"
 msgstr "Создана новая страница"
 
-#: ../../Zotlabs/Module/Wiki.php:739
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:745
 msgid "Cannot delete Home"
 msgstr "Невозможно удалить домашнюю страницу"
 
-#: ../../Zotlabs/Module/Wiki.php:815
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:821
 msgid "Current Revision"
 msgstr "Текущая ревизия"
 
-#: ../../Zotlabs/Module/Wiki.php:815
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:821
 msgid "Selected Revision"
 msgstr "Выбранная ревизия"
 
-#: ../../Zotlabs/Module/Wiki.php:870
+#: ../../extend/addon/hzaddons/wiki/Mod_Wiki.php:876
 msgid "You must be authenticated."
 msgstr "Вы должны быть аутентифицированы."
 
-#: ../../Zotlabs/Module/Home.php:104
-#, php-format
-msgid "Welcome to %s"
-msgstr "Добро пожаловать в %s"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:25
+msgid "ActivityPub Protocol Settings updated."
+msgstr "Настройки протокола ActivityPub обновлены."
 
-#: ../../Zotlabs/Module/Suggest.php:52
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:41
 msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Нет предложений. Если это новый сайт, повторите попытку через 24 часа."
-
-#: ../../Zotlabs/Module/Connedit.php:171
-msgid "Connection updated."
-msgstr "Контакты обновлены."
-
-#: ../../Zotlabs/Module/Connedit.php:173
-msgid "Failed to update connection record."
-msgstr "Не удалось обновить запись контакта."
-
-#: ../../Zotlabs/Module/Connedit.php:320
-msgid "Could not access address book record."
-msgstr "Не удалось получить доступ к записи адресной книги."
-
-#: ../../Zotlabs/Module/Connedit.php:368
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Обновление невозможно - в настоящее время канал недоступен."
-
-#: ../../Zotlabs/Module/Connedit.php:382 ../../Zotlabs/Module/Connedit.php:391
-#: ../../Zotlabs/Module/Connedit.php:400 ../../Zotlabs/Module/Connedit.php:409
-#: ../../Zotlabs/Module/Connedit.php:422
-msgid "Unable to set address book parameters."
-msgstr "Не удалось получить доступ к параметрам адресной книги."
-
-#: ../../Zotlabs/Module/Connedit.php:441
-msgid "Connection has been removed."
-msgstr "Контакт был удалён."
-
-#: ../../Zotlabs/Module/Connedit.php:483
-#, php-format
-msgid "View %s's profile"
-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 не поддерживает независимость от расположения. Ваши контакты установленные в этой сети могут быть недоступны из альтернативных мест размещения канала."
 
-#: ../../Zotlabs/Module/Connedit.php:504
-msgid "View recent posts and comments"
-msgstr "Просмотреть последние публикации и комментарии"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:47
+msgid "Deliver to ActivityPub recipients in privacy groups"
+msgstr "Доставить получателям ActivityPub в группах конфиденциальности"
 
-#: ../../Zotlabs/Module/Connedit.php:550
-msgid "Fetch Vcard"
-msgstr "Получить vCard"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:47
+msgid ""
+"May result in a large number of mentions and expose all the members of your "
+"privacy group"
+msgstr "Может привести к большому количеству упоминаний и раскрытию участников группы конфиденциальности"
 
-#: ../../Zotlabs/Module/Connedit.php:553
-msgid "Fetch electronic calling card for this connection"
-msgstr "Получить электронную телефонную карточку для этого контакта"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:51
+msgid "Send multi-media HTML articles"
+msgstr "Отправить HTML статьи с мультимедиа"
 
-#: ../../Zotlabs/Module/Connedit.php:572
-msgid "Affinity"
-msgstr "Сходство"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:51
+msgid "Not supported by some microblog services such as Mastodon"
+msgstr "Не поддерживается некоторыми микроблогами, например Mastodon"
 
-#: ../../Zotlabs/Module/Connedit.php:575
-msgid "Open Set Affinity section by default"
-msgstr "Открыть секцию установления сходства по умолчанию"
+#: ../../extend/addon/hzaddons/pubcrawl/Mod_Pubcrawl.php:59
+msgid "Activitypub Protocol"
+msgstr "Протокол ActivityPub"
 
-#: ../../Zotlabs/Module/Connedit.php:612
-msgid "Filter"
-msgstr "Фильтр"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:43
+msgid "Diaspora Protocol Settings updated."
+msgstr "Настройки протокола Diaspora обновлены."
 
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Open Custom Filter section by default"
-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/Connedit.php:626
-msgid "Set Affinity"
-msgstr "Установить сходство"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:75
+msgid "Allow any Diaspora member to comment or like your public posts"
+msgstr "Разрешить любому участнику Diaspora комментировать или отмечать понравившимися ваши общедоступные сообщения"
 
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Set Profile"
-msgstr "Установить профиль"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:75
+msgid ""
+"If this setting is disabled only your contacts will be able to comment or "
+"like your public posts"
+msgstr "Если этот параметр отключен, только ваши контакты смогут комментировать или лайкать ваши общедоступные сообщения"
 
-#: ../../Zotlabs/Module/Connedit.php:632
-msgid "Set Affinity & Profile"
-msgstr "Установить сходство и профиль"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:79
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr "Предотвратить перенаправление тегов на другие сайты"
 
-#: ../../Zotlabs/Module/Connedit.php:685
-#, php-format
-msgid "Contact: %s"
-msgstr "Контакт: %s"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:83
+msgid "Sign and forward posts and comments with no existing Diaspora signature"
+msgstr "Подписывать и отправлять публикации и комментарии с несуществующей подписью Diaspora"
 
-#: ../../Zotlabs/Module/Connedit.php:687
-msgid "Manage contact roles"
-msgstr "Управление ролями контактов"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:88
+msgid "Followed hashtags (comma separated, do not include the #)"
+msgstr "Отслеживаемые теги (через запятую, исключая #)"
 
-#: ../../Zotlabs/Module/Connedit.php:694
-msgid "This contacts's primary address is"
-msgstr "Основной адрес этого контакта:"
+#: ../../extend/addon/hzaddons/diaspora/Mod_Diaspora.php:97
+msgid "Diaspora Protocol"
+msgstr "Протокол Diaspora"
 
-#: ../../Zotlabs/Module/Connedit.php:695
-msgid "Available locations:"
-msgstr "Доступные расположения:"
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:18
+msgid "No username found in import file."
+msgstr "Имя пользователя не найдено в файле для импорта."
 
-#: ../../Zotlabs/Module/Connedit.php:710
-msgid "Contact Pending Approval"
-msgstr "Контакты ожидающие утверждения"
+#: ../../extend/addon/hzaddons/diaspora/import_diaspora.php:140
+msgid "Import completed."
+msgstr "Импорт завершен."
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../extend/addon/hzaddons/diaspora/Receiver.php:1592
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Пожалуйста, выберите профиль который вы хотит показывать в %s при безопасном просмотре."
-
-#: ../../Zotlabs/Module/Connedit.php:721
-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> менять эти настройки здесь."
+msgid "%1$s dislikes %2$s's %3$s"
+msgstr "%1$s не нравится %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:77
 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> вашего канала, которые могут иметь более высокий приоритет чем индивидуальные. Вы можете изменить эти настройки, однако они не будут применены до изменения переданных по наследству настроек."
-
-#: ../../Zotlabs/Module/Connedit.php:723
-msgid "Last update:"
-msgstr "Последнее обновление:"
-
-#: ../../Zotlabs/Module/Connedit.php:731
-msgid "Details"
-msgstr "Сведения"
-
-#: ../../Zotlabs/Module/Notifications.php:106
-#: ../../Zotlabs/Module/Notify.php:85
-msgid "No more system notifications."
-msgstr "Нет новых оповещений системы."
-
-#: ../../Zotlabs/Module/Notifications.php:110
-#: ../../Zotlabs/Module/Notify.php:89
-msgid "System Notifications"
-msgstr "Системные оповещения "
+"Please install the statistics addon to be able to configure a diaspora relay"
+msgstr "Пожалуйста, установите расширение статистики, чтобы иметь возможность настраивать пересылку Diaspora"
 
-#: ../../Zotlabs/Module/Notifications.php:111
-#: ../../Zotlabs/Lib/ThreadItem.php:508
-msgid "Mark all seen"
-msgstr "Отметить как просмотренное"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:87
+msgid "Diaspora Relay Handle"
+msgstr "Пересылка Diaspora"
 
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
-msgstr "Помощь по языку описания страниц Comanche "
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:87
+msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld"
+msgstr "Адрес пересылки Diaspora. Например: relay@diasporarelay.tld"
 
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
-msgstr "Описание шаблона"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:107
+msgid "Diaspora relay could not be imported"
+msgstr "Невозможно импортировать адрес пересылки Diaspora"
 
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
-msgstr "Загрузить PDL файл"
+#: ../../extend/addon/hzaddons/diaspora/diaspora.php:1030
+msgid "No subject"
+msgstr "Без темы"
 
-#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:65
-msgid "Location not found."
-msgstr "Местоположение не найдено"
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:133
+msgid "View Larger"
+msgstr "Увеличить"
 
-#: ../../Zotlabs/Module/Locs.php:74
-msgid "Location lookup failed."
-msgstr "Поиск местоположения не удался"
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:156
+msgid "Tile Server URL"
+msgstr "URL сервера Tile"
 
-#: ../../Zotlabs/Module/Locs.php:78
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:156
 msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
-msgstr "Пожалуйста, выберите другое местоположение в качестве основного прежде чем удалить предыдущее"
-
-#: ../../Zotlabs/Module/Locs.php:106
-msgid "Syncing locations"
-msgstr "Синхронизировать местоположение"
-
-#: ../../Zotlabs/Module/Locs.php:115
-msgid "No locations found."
-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:120
-msgid "Manage Channel Locations"
-msgstr "Управление местоположением канала"
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:157
+msgid "Nominatim (reverse geocoding) Server URL"
+msgstr "URL сервера Nominatim (обратное геокодирование)"
 
-#: ../../Zotlabs/Module/Locs.php:126
-msgid "Sync Now"
-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/Locs.php:127
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Пожалуйста, подождите несколько минут между последовательными операциями."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:158
+msgid "Default zoom"
+msgstr "Масштаб по умолчанию"
 
-#: ../../Zotlabs/Module/Locs.php:128
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:158
 msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
-msgstr "По возможности, очистите местоположение, войдя на этот веб-сайт / хаб и удалив свой канал."
-
-#: ../../Zotlabs/Module/Locs.php:129
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Используйте эту форму, чтобы удалить местоположение, если хаб больше не функционирует."
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+msgstr "Уровень размера по умолчанию (1 - весь мир, 18 - максимальный; зависит от сервера)."
 
-#: ../../Zotlabs/Module/Sources.php:41
-msgid "Failed to create source. No channel selected."
-msgstr "Не удалось создать источник. Канал не выбран."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:159
+msgid "Include marker on map"
+msgstr "Включите маркер на карте"
 
-#: ../../Zotlabs/Module/Sources.php:57
-msgid "Source created."
-msgstr "Источник создан."
+#: ../../extend/addon/hzaddons/openstreetmap/openstreetmap.php:159
+msgid "Include a marker on the map."
+msgstr "Включить маркер на карте"
 
-#: ../../Zotlabs/Module/Sources.php:70
-msgid "Source updated."
-msgstr "Источник обновлен."
+#: ../../extend/addon/hzaddons/tictac/tictac.php:21
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tic-Tac-Toe в трёх измерениях"
 
-#: ../../Zotlabs/Module/Sources.php:99
-msgid "*"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:54
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:372
-msgid "Channel Sources"
-msgstr "Источники канала"
-
-#: ../../Zotlabs/Module/Sources.php:106
-msgid "Manage remote sources of content for your channel."
-msgstr "Управление удалённым источниками содержимого для вашего канала"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:59
+msgid "New game"
+msgstr "Новая игра"
 
-#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Module/Sources.php:117
-msgid "New Source"
-msgstr "Новый источник"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:60
+msgid "New game with handicap"
+msgstr "Новая игра с форой"
 
-#: ../../Zotlabs/Module/Sources.php:118 ../../Zotlabs/Module/Sources.php:152
+#: ../../extend/addon/hzaddons/tictac/tictac.php:61
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Импортировать всё или выбранное содержимое из следующего канала в этот канал и распределить его в соответствии с вашими настройками."
-
-#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
-msgid "Only import content with these words (one per line)"
-msgstr "Импортировать содержимое только с этим текстом (построчно)"
-
-#: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153
-msgid "Leave blank to import all public content"
-msgstr "Оставьте пустым для импорта всего общедоступного содержимого"
-
-#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:159
-msgid "Channel Name"
-msgstr "Название канала"
+"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:121 ../../Zotlabs/Module/Sources.php:156
+#: ../../extend/addon/hzaddons/tictac/tictac.php:62
 msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
-msgstr "Добавить следующие категории к импортированным публикациям из этого источника (через запятые)"
-
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
-msgid "Resend posts with this channel as author"
-msgstr "Отправить публикации в этот канал повторно как автор"
-
-#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157
-msgid "Copyrights may apply"
-msgstr "Могут применяться авторские права"
-
-#: ../../Zotlabs/Module/Sources.php:142 ../../Zotlabs/Module/Sources.php:172
-msgid "Source not found."
-msgstr "Источник не найден."
-
-#: ../../Zotlabs/Module/Sources.php:149
-msgid "Edit Source"
-msgstr "Редактировать источник"
-
-#: ../../Zotlabs/Module/Sources.php:150
-msgid "Delete Source"
-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:180
-msgid "Source removed"
-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:182
-msgid "Unable to remove source."
-msgstr "Невозможно удалить источник."
+#: ../../extend/addon/hzaddons/tictac/tictac.php:183
+msgid "You go first..."
+msgstr "Вы начинаете..."
 
-#: ../../Zotlabs/Module/Rbmark.php:93
-msgid "Select a bookmark folder"
-msgstr "Выбрать каталог для закладок"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:188
+msgid "I'm going first this time..."
+msgstr "На этот раз начинаю я..."
 
-#: ../../Zotlabs/Module/Rbmark.php:98
-msgid "Save Bookmark"
-msgstr "Сохранить закладку"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:194
+msgid "You won!"
+msgstr "Вы выиграли!"
 
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "URL of bookmark"
-msgstr "URL закладки"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:200
+#: ../../extend/addon/hzaddons/tictac/tictac.php:225
+msgid "\"Cat\" game!"
+msgstr "Ничья!"
 
-#: ../../Zotlabs/Module/Rbmark.php:104
-msgid "Or enter new bookmark folder name"
-msgstr "или введите новое имя каталога закладок"
+#: ../../extend/addon/hzaddons/tictac/tictac.php:223
+msgid "I won!"
+msgstr "Я выиграл!"
 
-#: ../../Zotlabs/Lib/AccessList.php:26
-msgid ""
-"A deleted privacy group with this name was revived. Existing item "
-"permissions <strong>may</strong> apply to this privacy group and any future "
-"members. If this is not what you intended, please create another privacy "
-"group with a different name."
-msgstr "Удаленная группа конфиденциальности с таким названием восстановлена. Существующие разрешения элемента <strong>могут</strong> применяться к этой группе конфиденциальности и любым будущим участникам. Если это не то, что вы хотели, создайте другую группу конфиденциальности с другим именем."
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:62
+msgid "superblock settings updated"
+msgstr "Настройки Superblock обновлены."
 
-#: ../../Zotlabs/Lib/AccessList.php:265
-msgid "Select a privacy group"
-msgstr "Выбрать группу конфиденциальности"
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:86
+msgid "Currently blocked"
+msgstr "В настоящее время заблокирован"
 
-#: ../../Zotlabs/Lib/Permcat.php:84
-msgctxt "permcat"
-msgid "Default"
-msgstr "По умолчанию"
+#: ../../extend/addon/hzaddons/superblock/Mod_Superblock.php:88
+msgid "No channels currently blocked"
+msgstr "В настоящее время никакие каналы не блокируются"
 
-#: ../../Zotlabs/Lib/Activity.php:2287
-#, php-format
-msgid "Likes %1$s's %2$s"
-msgstr "Нравится %1$s %2$s"
+#: ../../extend/addon/hzaddons/superblock/superblock.php:337
+msgid "Block Completely"
+msgstr "Заблокировать полностью"
 
-#: ../../Zotlabs/Lib/Activity.php:2290
-#, php-format
-msgid "Doesn't like %1$s's %2$s"
-msgstr "Не нравится %1$s %2$s"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:24
+msgid "Friendica Crosspost Connector Settings saved."
+msgstr "Настройки пересылки публикаций Friendica сохранены."
 
-#: ../../Zotlabs/Lib/Activity.php:2296
-#, php-format
-msgid "Will attend %s's event"
-msgstr "Присоединится к мероприятию %s"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:47
+msgid "Send public postings to Friendica by default"
+msgstr "Отправлять общедоступные публикации во Friendica по умолчанию"
 
-#: ../../Zotlabs/Lib/Activity.php:2299
-#, php-format
-msgid "Will not attend %s's event"
-msgstr "Не присоединится к мероприятию %s"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:51
+msgid "Friendica API Path"
+msgstr "Путь к Friendica API"
 
-#: ../../Zotlabs/Lib/Activity.php:2302
-#, php-format
-msgid "May attend %s's event"
-msgstr "Возможно присоединится к мероприятию %s"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:55
+msgid "Friendica login name"
+msgstr "Имя входа Friendica"
 
-#: ../../Zotlabs/Lib/Activity.php:2305
-#, php-format
-msgid "May not attend %s's event"
-msgstr "Возможно не присоединится к мероприятию %s"
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:59
+msgid "Friendica password"
+msgstr "Пароль Friendica"
 
-#: ../../Zotlabs/Lib/Enotify.php:60
-msgid "$Projectname Notification"
-msgstr "Оповещение $Projectname "
+#: ../../extend/addon/hzaddons/rtof/Mod_Rtof.php:67
+msgid "Friendica Crosspost Connector"
+msgstr "Публикация в Friendica"
 
-#: ../../Zotlabs/Lib/Enotify.php:63
-msgid "Thank You,"
-msgstr "Спасибо,"
+#: ../../extend/addon/hzaddons/rtof/rtof.php:51
+msgid "Post to Friendica"
+msgstr "Опубликовать в Friendica"
 
-#: ../../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/wholikesme/wholikesme.php:29
+msgid "Who likes me?"
+msgstr "Кому я нравлюсь?"
 
-#: ../../Zotlabs/Lib/Enotify.php:67
-#, php-format
-msgid ""
-"To stop receiving these messages, please adjust your Notification Settings "
-"at %s"
-msgstr "Чтобы прекратить получать эти сообщения, настройте параметры уведомлений в %s"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:25
+msgid "Show Upload Limits"
+msgstr "Показать ограничения на загрузку"
 
-#: ../../Zotlabs/Lib/Enotify.php:68
-#, php-format
-msgid "To stop receiving these messages, please adjust your %s."
-msgstr "Чтобы прекратить получать эти сообщения, пожалуйста измените %s."
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:27
+msgid "Hubzilla configured maximum size: "
+msgstr "Максимальный размер настроенный в Hubzilla:"
 
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../extend/addon/hzaddons/upload_limits/upload_limits.php:28
+msgid "PHP upload_max_filesize: "
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:128
-#, php-format
-msgid "[$Projectname:Notify] New direct message received at %s"
-msgstr "[$Projectname:Notify] Получено новое сообщение в %s"
-
-#: ../../Zotlabs/Lib/Enotify.php:130
-#, php-format
-msgid "%1$s sent you a new direct message at %2$s"
-msgstr "%1$s отправил вам сообщение %2$s"
-
-#: ../../Zotlabs/Lib/Enotify.php:131
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s отправил вам %2$s."
+#: ../../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/Enotify.php:131
-msgid "a direct message"
-msgstr "сообщение"
+#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:101
+msgid "An account has been created for you."
+msgstr "Учётная запись, которая была для вас создана."
 
-#: ../../Zotlabs/Lib/Enotify.php:132
-#, php-format
-msgid "Please visit %s to view and/or reply to your direct messages."
-msgstr "Пожалуйста, посетите %s для просмотра и/или ответа на ваши сообщения."
+#: ../../extend/addon/hzaddons/ldapauth/ldapauth.php:108
+msgid "Authentication successful but rejected: account creation is disabled."
+msgstr "Аутентификация выполнена успешно, но отклонена: создание учетной записи отключено."
 
-#: ../../Zotlabs/Lib/Enotify.php:145
-msgid "commented on"
-msgstr "прокомментировал"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:48
+msgid "QR code"
+msgstr "QR-код"
 
-#: ../../Zotlabs/Lib/Enotify.php:158
-msgid "liked"
-msgstr "понравилось"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:63
+msgid "QR Generator"
+msgstr "Генератор QR-кодов"
 
-#: ../../Zotlabs/Lib/Enotify.php:161
-msgid "disliked"
-msgstr "не понравилось"
+#: ../../extend/addon/hzaddons/qrator/qrator.php:64
+msgid "Enter some text"
+msgstr "Введите любой текст"
 
-#: ../../Zotlabs/Lib/Enotify.php:166
-msgid "voted on"
-msgstr "проголосовал в"
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:19
+msgid "Send email to all members"
+msgstr "Отправить email всем участникам"
 
-#: ../../Zotlabs/Lib/Enotify.php:209
-#, 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/hubwall/hubwall.php:50
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:50
+msgid "No recipients found."
+msgstr "Получателей не найдено."
 
-#: ../../Zotlabs/Lib/Enotify.php:217
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:73
 #, 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]"
+msgid "%1$d of %2$d messages sent."
+msgstr "%1$d из %2$d сообщений отправлено."
 
-#: ../../Zotlabs/Lib/Enotify.php:226
-#, 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/hubwall/hubwall.php:81
+msgid "Send email to all hub members."
+msgstr "Отправить email всем участникам узла."
 
-#: ../../Zotlabs/Lib/Enotify.php:238
-#, php-format
-msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Отмодерирован комментарий к беседе #%1$d по %2$s"
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:92
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:96
+msgid "Message subject"
+msgstr "Тема сообщения"
 
-#: ../../Zotlabs/Lib/Enotify.php:240
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[$Projectname:Notify] Комментарий к беседе #%1$d по %2$s"
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:93
+msgid "Sender Email address"
+msgstr "Адрес электронной почты отправителя"
 
-#: ../../Zotlabs/Lib/Enotify.php:241
-#, php-format
-msgid "%1$s commented on an item/conversation you have been following"
-msgstr "%1$s прокомментировал запись / беседу, на которую вы подписаны"
+#: ../../extend/addon/hzaddons/hubwall/hubwall.php:94
+msgid "Test mode (only send to hub administrator)"
+msgstr "Тестовый режим (отправка только администратору узла)"
 
-#: ../../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 "Пожалуйста, посетите %s для просмотра и / или ответа в беседе."
+#: ../../extend/addon/hzaddons/logrot/logrot.php:36
+msgid "Logfile archive directory"
+msgstr "Каталог архивирования журнала"
 
-#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249
-#, php-format
-msgid "Please visit %s to approve or reject this comment."
-msgstr "Пожалуйста посетитет %s для одобрения и отклонения комментария."
+#: ../../extend/addon/hzaddons/logrot/logrot.php:36
+msgid "Directory to store rotated logs"
+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/logrot/logrot.php:37
+msgid "Logfile size in bytes before rotating"
+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"
+#: ../../extend/addon/hzaddons/logrot/logrot.php:38
+msgid "Number of logfiles to retain"
+msgstr "Количество сохраняемых файлов журналов"
 
-#: ../../Zotlabs/Lib/Enotify.php:321
-#, php-format
-msgid "%1$s liked an item/conversation you created"
-msgstr "%1$s понравился созданный вами объект / беседа"
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:42
+msgid "Hide the button and show the smilies directly."
+msgstr "Скрыть кнопку и сразу показывать смайлики."
 
-#: ../../Zotlabs/Lib/Enotify.php:332
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
-msgstr "[$Projectname:Notify] %s сделал публикацию на стене вашего профиля"
+#: ../../extend/addon/hzaddons/smileybutton/Mod_Smileybutton.php:50
+msgid "Smileybutton Settings"
+msgstr "Настройки кнопки со смайликами"
 
-#: ../../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/nsfw/nsfw.php:152
+msgid "Possible adult content"
+msgstr "Возможно содержимое для взрослых"
 
-#: ../../Zotlabs/Lib/Enotify.php:336
+#: ../../extend/addon/hzaddons/nsfw/nsfw.php:167
 #, php-format
-msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
-msgstr "%1$s опубликовал на [zrl=%2$s]вашей стене[/zrl]"
+msgid "%s - view"
+msgstr "%s -  просмотр"
 
-#: ../../Zotlabs/Lib/Enotify.php:358
-#, php-format
-msgid "[$Projectname:Notify] %s tagged you"
-msgstr "[$Projectname:Notify] %s отметил вас"
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:22
+msgid "NSFW Settings saved."
+msgstr "Настройки NSFW сохранены."
 
-#: ../../Zotlabs/Lib/Enotify.php:359
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s отметил вас в %2$s"
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:42
+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/Lib/Enotify.php:360
-#, php-format
-msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
-msgstr "%1$s [zrl=%2$s]отметил вас[/zrl]."
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:47
+msgid "Comma separated list of keywords to hide"
+msgstr "Список ключевых слов для скрытия, через запятую"
 
-#: ../../Zotlabs/Lib/Enotify.php:371
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
-msgstr "[$Projectname:Notify] %1$s ткнул вас"
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:47
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
+msgstr "слово, /регулярное_выражение/, lang=xx, lang!=xx"
 
-#: ../../Zotlabs/Lib/Enotify.php:372
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s ткнул вас в %2$s"
+#: ../../extend/addon/hzaddons/nsfw/Mod_Nsfw.php:56
+msgid "NSFW"
+msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:373
-#, php-format
-msgid "%1$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s [zrl=%2$s]ткнул вас[/zrl]."
+#: ../../extend/addon/hzaddons/redfiles/redfiles.php:119
+msgid "Redmatrix File Storage Import"
+msgstr "Импорт файлового хранилища Redmatrix"
 
-#: ../../Zotlabs/Lib/Enotify.php:388
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
-msgstr "[$Projectname:Notify] %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:389
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s отметил вашу публикацию на %2$s"
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:32
+msgid "OpenID protocol error. No ID returned."
+msgstr "Ошибка протокола OpenID. Идентификатор не возвращён."
 
-#: ../../Zotlabs/Lib/Enotify.php:390
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:78
+#: ../../extend/addon/hzaddons/openid/Mod_Openid.php:179
 #, php-format
-msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
-msgstr "%1$s отметил [zrl=%2$s]вашу публикацию[/zrl]"
-
-#: ../../Zotlabs/Lib/Enotify.php:401
-msgid "[$Projectname:Notify] Introduction received"
-msgstr "[$Projectname:Notify] Получено приглашение"
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Добро пожаловать %s. Удаленная аутентификация успешно завершена."
 
-#: ../../Zotlabs/Lib/Enotify.php:402
-#, php-format
-msgid "You've received an new connection request from '%1$s' at %2$s"
-msgstr "Вы получили новый запрос контакта от '%1$s' в %2$s"
+#: ../../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:403
-#, 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/openid/openid.php:49
+msgid "The error message was:"
+msgstr "Сообщение об ошибке было:"
 
-#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Вы можете увидеть его профиль по ссылке %s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:52
+msgid "First Name"
+msgstr "Имя"
 
-#: ../../Zotlabs/Lib/Enotify.php:408
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить запрос контакта."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:53
+msgid "Last Name"
+msgstr "Фамилия"
 
-#: ../../Zotlabs/Lib/Enotify.php:415
-msgid "[$Projectname:Notify] Friend suggestion received"
-msgstr "[$Projectname:Notify] Получено предложение дружить"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:55
+msgid "Full Name"
+msgstr "Полное имя"
 
-#: ../../Zotlabs/Lib/Enotify.php:416
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Вы получили предложение дружить от '%1$s' в %2$s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:61
+msgid "Profile Photo 16px"
+msgstr "Фотография профиля 16px"
 
-#: ../../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 "Вы получили [zrl=%1$s]предложение дружить[/zrl] для %2$s от %3$s."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:62
+msgid "Profile Photo 32px"
+msgstr "Фотография профиля 32px"
 
-#: ../../Zotlabs/Lib/Enotify.php:422
-msgid "Name:"
-msgstr "Имя:"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:63
+msgid "Profile Photo 48px"
+msgstr "Фотография профиля 48px"
 
-#: ../../Zotlabs/Lib/Enotify.php:423
-msgid "Photo:"
-msgstr "Фото:"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:64
+msgid "Profile Photo 64px"
+msgstr "Фотография профиля 64px"
 
-#: ../../Zotlabs/Lib/Enotify.php:426
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Пожалуйста, посетите %s, чтобы одобрить или отклонить предложение."
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:65
+msgid "Profile Photo 80px"
+msgstr "Фотография профиля 80px"
 
-#: ../../Zotlabs/Lib/Enotify.php:651
-msgid "[$Projectname:Notify]"
-msgstr "[$Projectname:Уведомление]"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:66
+msgid "Profile Photo 128px"
+msgstr "Фотография профиля 128px"
 
-#: ../../Zotlabs/Lib/Enotify.php:819
-msgid "created a new poll"
-msgstr "создал новый опрос"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:70
+msgid "Birth Year"
+msgstr "Год рождения"
 
-#: ../../Zotlabs/Lib/Enotify.php:819
-msgid "created a new post"
-msgstr "создал новую публикацию"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:71
+msgid "Birth Month"
+msgstr "Месяц рождения"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-#, php-format
-msgid "voted on %s's poll"
-msgstr "проголосова в опросе %s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:72
+msgid "Birth Day"
+msgstr "День рождения"
 
-#: ../../Zotlabs/Lib/Enotify.php:820
-#, php-format
-msgid "commented on %s's post"
-msgstr "прокомментировал публикацию %s"
+#: ../../extend/addon/hzaddons/openid/MysqlProvider.php:73
+msgid "Birthdate"
+msgstr "Дата рождения"
 
-#: ../../Zotlabs/Lib/Enotify.php:824
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:26
 #, php-format
-msgid "repeated %s's post"
-msgstr "разместил публикацию %s"
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
+msgstr "Искать %1$s (%2$s)"
 
-#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:927
-msgid "shared a file with you"
-msgstr "с вами поделились файлом"
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:837
-#, php-format
-msgid "edited a post dated %s"
-msgstr "отредактировал публикацию датированную %s"
+#: ../../extend/addon/hzaddons/opensearch/opensearch.php:43
+msgid "Search $Projectname"
+msgstr "Поиск $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:840
-#, php-format
-msgid "edited a comment dated %s"
-msgstr "отредактировал комментарий датированный %s"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:53
+msgid "Livejournal username"
+msgstr "Имя пользователя Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:912
-msgid "added your channel"
-msgstr "добавил ваш канал"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:57
+msgid "Livejournal password"
+msgstr "Пароль Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:942
-msgid "sent you a direct message"
-msgstr "отправил вам сообщение"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:61
+msgid "Post to Livejournal by default"
+msgstr "Публиковать в Livejournal по умолчанию"
 
-#: ../../Zotlabs/Lib/Enotify.php:949
-msgid "g A l F d"
-msgstr "g A l F d"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:65
+msgid "Send wall-to-wall posts to Livejournal"
+msgstr "Отправлять публикации на стене в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:952
-msgid "[today]"
-msgstr "[сегодня]"
+#: ../../extend/addon/hzaddons/ljpost/Mod_Ljpost.php:77
+msgid "Livejournal Crosspost Connector"
+msgstr "Публикация в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:962
-msgid "created an event"
-msgstr "создано событие"
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:49
+msgid "Post to Livejournal"
+msgstr "Опубликовать в Livejournal"
 
-#: ../../Zotlabs/Lib/Enotify.php:977
-msgid "status verified"
-msgstr "статус подтверждён"
+#: ../../extend/addon/hzaddons/ljpost/ljpost.php:127
+msgid "Posted by"
+msgstr "Опубликовано"
 
-#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143
-msgid "Channel is blocked on this site."
-msgstr "Канал блокируется на этом сайте."
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:28
+msgid "Hide Aside App"
+msgstr "Скрывать приложения"
 
-#: ../../Zotlabs/Lib/Connect.php:51
-msgid "Channel location missing."
-msgstr "Местоположение канала отсутствует."
+#: ../../extend/addon/hzaddons/hideaside/Mod_Hideaside.php:29
+msgid "Fade out aside areas after a while when using endless scroll"
+msgstr "Через некоторое время при использовании прокрутки область приложений исчезает"
 
-#: ../../Zotlabs/Lib/Connect.php:103
-msgid "Remote channel or protocol unavailable."
-msgstr "Удалённый канал или протокол недоступен."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:40
+msgid "Pump.io Settings saved."
+msgstr "Настройки Pump.io сохранены."
 
-#: ../../Zotlabs/Lib/Connect.php:137
-msgid "Channel discovery failed."
-msgstr "Не удалось обнаружить канал."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:71
+msgid "Pump.io servername"
+msgstr "Имя сервера Pump.io"
 
-#: ../../Zotlabs/Lib/Connect.php:155
-msgid "Protocol disabled."
-msgstr "Протокол отключен."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:71
+msgid "Without \"http://\" or \"https://\""
+msgstr "Без \"http://\" или \"https://\""
 
-#: ../../Zotlabs/Lib/Connect.php:167
-msgid "Cannot connect to yourself."
-msgstr "Нельзя подключиться к самому себе."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:75
+msgid "Pump.io username"
+msgstr "Имя пользователя Pump.io"
 
-#: ../../Zotlabs/Lib/Connect.php:272
-msgid "error saving data"
-msgstr "ошибка сохранения данных"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:75
+msgid "Without the servername"
+msgstr "без имени сервера"
 
-#: ../../Zotlabs/Lib/Chatroom.php:25
-msgid "Missing room name"
-msgstr "Отсутствует название комнаты"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:86
+msgid "You are not authenticated to pumpio"
+msgstr "Вы не аутентифицированы на Pump.io"
 
-#: ../../Zotlabs/Lib/Chatroom.php:34
-msgid "Duplicate room name"
-msgstr "Название комнаты дублируется"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:88
+msgid "(Re-)Authenticate your pump.io connection"
+msgstr "Аутентифицировать (повторно) ваше соединение с Pump.io"
 
-#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92
-msgid "Invalid room specifier."
-msgstr "Неверный указатель комнаты."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:92
+msgid "Post to pump.io by default"
+msgstr "Публиковать в Pump.io по умолчанию"
 
-#: ../../Zotlabs/Lib/Chatroom.php:124
-msgid "Room not found."
-msgstr "Комната не найдена."
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:96
+msgid "Should posts be public"
+msgstr "Публикации должны быть общедоступными"
 
-#: ../../Zotlabs/Lib/Chatroom.php:145
-msgid "Room is full"
-msgstr "Комната переполнена"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:100
+msgid "Mirror all public posts"
+msgstr "Отображать все общедоступные публикации"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:146
-msgid "Wiki updated successfully"
-msgstr "Wiki успешно обновлена"
+#: ../../extend/addon/hzaddons/pumpio/Mod_Pumpio.php:110
+msgid "Pump.io Crosspost Connector"
+msgstr "Публикация в Pump.io"
 
-#: ../../Zotlabs/Lib/NativeWiki.php:206
-msgid "Wiki files deleted successfully"
-msgstr "Wiki успешно удалена"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:152
+msgid "You are now authenticated to pumpio."
+msgstr "Вы аутентифицированы в Pump.io"
 
-#: ../../Zotlabs/Lib/Apps.php:328
-msgid "Affinity Tool"
-msgstr "Степень сходства"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:153
+msgid "return to the featured settings page"
+msgstr "Вернутся к странице настроек"
 
-#: ../../Zotlabs/Lib/Apps.php:331
-msgid "Site Admin"
-msgstr "Администратор сайта"
+#: ../../extend/addon/hzaddons/pumpio/pumpio.php:168
+msgid "Post to Pump.io"
+msgstr "Опубликовать в Pump.io"
 
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Content Filter"
-msgstr "Фильтр содержимого"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:48
+msgid "Your channel has been upgraded to $Projectname version"
+msgstr "Ваш канал был обновлён до версии $Projectname"
 
-#: ../../Zotlabs/Lib/Apps.php:338
-msgid "Remote Diagnostics"
-msgstr "Удалённая диагностика"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:50
+msgid "Please have a look at the"
+msgstr "Пожалуйста, взгляните на"
 
-#: ../../Zotlabs/Lib/Apps.php:339
-msgid "Suggest Channels"
-msgstr "Предлагаемые каналы"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:52
+msgid "git history"
+msgstr "журнал изменений"
 
-#: ../../Zotlabs/Lib/Apps.php:341
-msgid "Channel Manager"
-msgstr "Менеджер каналов"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:54
+msgid "change log"
+msgstr "историю git"
 
-#: ../../Zotlabs/Lib/Apps.php:342
-msgid "Stream"
-msgstr "Поток"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:55
+msgid "for further info."
+msgstr "для дополнительных сведений."
 
-#: ../../Zotlabs/Lib/Apps.php:353
-msgid "Mail"
-msgstr "Переписка"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:60
+msgid "Upgrade Info"
+msgstr "Сведения об обновлении"
 
-#: ../../Zotlabs/Lib/Apps.php:356
-msgid "Chat"
-msgstr "Чат"
+#: ../../extend/addon/hzaddons/upgrade_info/upgrade_info.php:64
+msgid "Do not show this again"
+msgstr "Больше не показывать"
 
-#: ../../Zotlabs/Lib/Apps.php:358
-msgid "Probe"
-msgstr "Проба"
+#: ../../extend/addon/hzaddons/msgfooter/msgfooter.php:47
+msgid "text to include in all outgoing posts from this site"
+msgstr "текст, который будет добавлен во все исходящие публикации с этого сайта"
 
-#: ../../Zotlabs/Lib/Apps.php:359
-msgid "Suggest"
-msgstr "Предложить"
+#: ../../extend/addon/hzaddons/planets/Mod_Planets.php:23
+msgid "Random Planet App"
+msgstr "Приложение \"Случайная планета\""
 
-#: ../../Zotlabs/Lib/Apps.php:360
-msgid "Random Channel"
-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/Apps.php:361
-msgid "Invite"
-msgstr "Пригласить"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:23
+msgid "Insane Journal Crosspost Connector Settings saved."
+msgstr "Настройки пересылки публикаций Insane Journal сохранены."
 
-#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Storage/Browser.php:407
-msgid "Post"
-msgstr "Публикация"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:35
+msgid "Insane Journal Crosspost Connector App"
+msgstr "Приложение \"Публикация в Insane Journal\""
 
-#: ../../Zotlabs/Lib/Apps.php:369
-msgid "Notifications"
-msgstr "Оповещения"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:36
+msgid "Relay public postings to Insane Journal"
+msgstr "Пересылает общедоступные публикации в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:370
-msgid "Order Apps"
-msgstr "Порядок приложений"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:53
+msgid "InsaneJournal username"
+msgstr "Имя пользователя Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:371
-msgid "CardDAV"
-msgstr ""
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:57
+msgid "InsaneJournal password"
+msgstr "Пароль Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:375
-msgid "OAuth Apps Manager"
-msgstr "Менеджер OAuth"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:61
+msgid "Post to InsaneJournal by default"
+msgstr "Публиковать в Insane Journal по умолчанию"
 
-#: ../../Zotlabs/Lib/Apps.php:376
-msgid "OAuth2 Apps Manager"
-msgstr "Менеджер OAuth2"
+#: ../../extend/addon/hzaddons/ijpost/Mod_Ijpost.php:69
+msgid "Insane Journal Crosspost Connector"
+msgstr "Публикация в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:377
-msgid "PDL Editor"
-msgstr "Редактор PDL"
+#: ../../extend/addon/hzaddons/ijpost/ijpost.php:44
+msgid "Post to Insane Journal"
+msgstr "Опубликовать в Insane Journal"
 
-#: ../../Zotlabs/Lib/Apps.php:380
-msgid "My Chatrooms"
-msgstr "Мои чаты"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:22
+msgid "Rainbow Tag App"
+msgstr "Приложение \"Радуга тегов\""
 
-#: ../../Zotlabs/Lib/Apps.php:381
-msgid "Channel Export"
-msgstr "Экспорт канала"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:23
+msgid "Add some colour to tag clouds"
+msgstr "Добавить немного цвета для облака тегов"
 
-#: ../../Zotlabs/Lib/Apps.php:570 ../../Zotlabs/Lib/Apps.php:592
-msgid "Purchase"
-msgstr "Купить"
+#: ../../extend/addon/hzaddons/rainbowtag/Mod_Rainbowtag.php:30
+msgid "Rainbow Tag"
+msgstr "Радуга тегов"
 
-#: ../../Zotlabs/Lib/Apps.php:597
-msgid "Undelete"
-msgstr "Восстановить"
+#: ../../extend/addon/hzaddons/libertree/libertree.php:43
+msgid "Post to Libertree"
+msgstr "Опубликовать в Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:605
-msgid "Add to app-tray"
-msgstr "Добавить в правое меню"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:25
+msgid "Libertree Crosspost Connector Settings saved."
+msgstr "Настройки пересылки публикаций Libertree сохранены."
 
-#: ../../Zotlabs/Lib/Apps.php:606
-msgid "Remove from app-tray"
-msgstr "Удалить из правого меню"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:49
+msgid "Libertree API token"
+msgstr "Токен Libertree API"
 
-#: ../../Zotlabs/Lib/Apps.php:607
-msgid "Pin to navbar"
-msgstr "Добавить на панель навигации"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:53
+msgid "Libertree site URL"
+msgstr "URL сайта Libertree"
 
-#: ../../Zotlabs/Lib/Apps.php:608
-msgid "Unpin from navbar"
-msgstr "Удалить с панели навигации"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:57
+msgid "Post to Libertree by default"
+msgstr "Публиковать в Libertree по умолчанию"
 
-#: ../../Zotlabs/Lib/Techlevels.php:10
-msgid "0. Beginner/Basic"
-msgstr "Начинающий / Базовый"
+#: ../../extend/addon/hzaddons/libertree/Mod_Libertree.php:65
+msgid "Libertree Crosspost Connector"
+msgstr "Пересылка публикаций Libertree"
 
-#: ../../Zotlabs/Lib/Techlevels.php:11
-msgid "1. Novice - not skilled but willing to learn"
-msgstr "1. Новичок - не опытный, но желающий учиться"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:27
+msgid "No server specified"
+msgstr "Сервер не указан"
 
-#: ../../Zotlabs/Lib/Techlevels.php:12
-msgid "2. Intermediate - somewhat comfortable"
-msgstr "2. Промежуточный - более удобный"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:73
+msgid "Posts imported"
+msgstr "Публикации импортированы"
 
-#: ../../Zotlabs/Lib/Techlevels.php:13
-msgid "3. Advanced - very comfortable"
-msgstr "3. Продвинутый - очень удобный"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:113
+msgid "Files imported"
+msgstr "Файлы импортированы"
 
-#: ../../Zotlabs/Lib/Techlevels.php:14
-msgid "4. Expert - I can write computer code"
-msgstr "4. Эксперт - я умею программировать"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:135
+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/Techlevels.php:15
-msgid "5. Wizard - I probably know more than you do"
-msgstr "5. Волшебник - возможно я знаю больше чем ты"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:136
+msgid "Include posts"
+msgstr "Включая публикации"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:43
-#: ../../Zotlabs/Lib/NativeWikiPage.php:111
-msgid "(No Title)"
-msgstr "(нет заголовка)"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:136
+msgid "Conversations, Articles, Cards, and other posted content"
+msgstr "Беседы, Статьи, Карточки и другое опубликованное содержимое"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:125
-msgid "Wiki page create failed."
-msgstr "Не удалось создать страницу Wiki."
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+msgid "Include files"
+msgstr "Включая файлы"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:139
-msgid "Wiki not found."
-msgstr "Wiki не найдена."
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:137
+msgid "Files, Photos and other cloud storage"
+msgstr "Файлы, Фотографии и прочее из хранилища"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:150
-msgid "Destination name already exists"
-msgstr "Имя назначения уже существует"
+#: ../../extend/addon/hzaddons/content_import/Mod_content_import.php:138
+msgid "Original Server base URL"
+msgstr "Базовый URL сервера-источника"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:183
-#: ../../Zotlabs/Lib/NativeWikiPage.php:378
-msgid "Page not found"
-msgstr "Страница не найдена."
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:22
+msgid "pageheader Settings saved."
+msgstr "Настройки шапки страницы сохранены."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:213
-msgid "Error reading page content"
-msgstr "Ошибка чтения содержимого страницы"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:41
+msgid "Message to display on every page on this server"
+msgstr "Отображаемое сообщение на каждой странице на этом сервере."
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:369
-#: ../../Zotlabs/Lib/NativeWikiPage.php:419
-#: ../../Zotlabs/Lib/NativeWikiPage.php:487
-#: ../../Zotlabs/Lib/NativeWikiPage.php:528
-msgid "Error reading wiki"
-msgstr "Ошибка чтения Wiki"
+#: ../../extend/addon/hzaddons/pageheader/Mod_Pageheader.php:49
+msgid "Page Header"
+msgstr "Заголовок страницы"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:406
-msgid "Page update failed."
-msgstr "Не удалось обновить страницу."
+#: ../../extend/addon/hzaddons/donate/donate.php:21
+msgid "Project Servers and Resources"
+msgstr "Серверы и ресурсы проекта"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:441
-msgid "Nothing deleted"
-msgstr "Ничего не удалено"
+#: ../../extend/addon/hzaddons/donate/donate.php:22
+msgid "Project Creator and Tech Lead"
+msgstr "Создатель проекта и технический руководитель"
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:508
-msgid "Compare: object not found."
-msgstr "Сравнение: объект не найден."
+#: ../../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/NativeWikiPage.php:515
-msgid "Page updated"
-msgstr "Страница обновлена"
+#: ../../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:523
-msgid "Wiki resource_id required for git commit"
-msgstr "Требуется resource_id Wiki для отправки в Git"
+#: ../../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/Libzotdir.php:163
-msgid "Directory Options"
-msgstr "Параметры каталога"
+#: ../../extend/addon/hzaddons/donate/donate.php:54
+msgid ""
+"Help support our ground-breaking work in decentralisation, web identity, and "
+"privacy."
+msgstr "Помогите поддержать нашу новаторскую работу в областях децентрализации, веб-идентификации и конфиденциальности."
 
-#: ../../Zotlabs/Lib/Libzotdir.php:165
-msgid "Safe Mode"
-msgstr "Безопасный режим"
+#: ../../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/Libzotdir.php:166
-msgid "Public Forums Only"
-msgstr "Только публичные форумы"
+#: ../../extend/addon/hzaddons/donate/donate.php:59
+msgid "Donate"
+msgstr "Пожертвовать"
 
-#: ../../Zotlabs/Lib/Libzotdir.php:168
-msgid "This Website Only"
-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/Libzot.php:673
-msgid "Unable to verify channel signature"
-msgstr "Невозможно проверить подпись канала"
+#: ../../extend/addon/hzaddons/donate/donate.php:62
+msgid "Donate Now"
+msgstr "Пожертвовать сейчас"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:109
-msgid "Restricted message"
-msgstr "Сообщение с ограниченным доступом"
+#: ../../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/ThreadItem.php:116
-msgid "Public Policy"
-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/ThreadItem.php:154
-msgid "Privacy conflict. Discretion advised."
-msgstr "Конфиликт настроек конфиденциальности."
+#: ../../extend/addon/hzaddons/donate/donate.php:65
+msgid "Sponsor"
+msgstr "Спонсор"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:198 ../../Zotlabs/Storage/Browser.php:369
-msgid "Admin Delete"
-msgstr "Удалено администратором"
+#: ../../extend/addon/hzaddons/donate/donate.php:68
+msgid "Special thanks to: "
+msgstr "Особые благодарности:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343
-msgid "Reply on this comment"
-msgstr "Ответить на этот комментарий"
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:44
+msgid "Jabber BOSH host"
+msgstr "Узел Jabber BOSH"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343
-msgid "reply"
-msgstr "ответить"
+#: ../../extend/addon/hzaddons/xmpp/xmpp.php:45
+msgid "Use central userbase"
+msgstr "Использовать центральную базу данных"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:343
-msgid "Reply to"
-msgstr "Ответить"
+#: ../../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:363
-msgid "Delivery Report"
-msgstr "Отчёт о доставке"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:23
+msgid "XMPP settings updated."
+msgstr "Настройки XMPP обновлены."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:382
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d комментарий"
-msgstr[1] "%d комментария"
-msgstr[2] "%d комментариев"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:35
+msgid "XMPP App"
+msgstr "Приложение XMPP"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:383
-#, php-format
-msgid "%d unseen"
-msgstr "новых %d"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:36
+msgid "Embedded XMPP (Jabber) client"
+msgstr "Встренный клиент XMPP (Jabber)"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:427
-msgid "Forum"
-msgstr "Форум"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:52
+msgid "Individual credentials"
+msgstr "Индивидуальные разрешения"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:437
-msgid "to"
-msgstr "к"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:58
+msgid "Jabber BOSH server"
+msgstr "Сервер Jabber BOSH"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:439
-msgid "Wall-to-Wall"
-msgstr "Стена-на-Стену"
+#: ../../extend/addon/hzaddons/xmpp/Mod_Xmpp.php:67
+msgid "XMPP Settings"
+msgstr "Настройки XMPP"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:440
-msgid "via Wall-To-Wall:"
-msgstr "через Стена-на-Стену:"
+#: ../../extend/addon/hzaddons/mdpost/mdpost.php:42
+msgid "Use markdown for editing posts"
+msgstr "Использовать язык разметки Markdown для редактирования публикаций"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:468
-msgid "Attend"
-msgstr "Посетить"
+#: ../../extend/addon/hzaddons/dwpost/dwpost.php:49
+msgid "Post to Dreamwidth"
+msgstr "Публиковать в Dreamwidth"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:486
-msgid "Go to previous comment"
-msgstr "Перейти к предыдущему комментарию"
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:26
+msgid "Dreamwidth Crosspost Connector Settings saved."
+msgstr "Настройки пересылки публикаций Dreamwidth сохранены."
 
-#: ../../Zotlabs/Lib/ThreadItem.php:499
-msgid "Add to Calendar"
-msgstr "Добавить в календарь"
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:51
+msgid "Dreamwidth username"
+msgstr "Имя пользователя Dreamwidth"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:857
-msgid "Image"
-msgstr "Изображение"
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:55
+msgid "Dreamwidth password"
+msgstr "Пароль Dreamwidth"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:859
-msgid "Insert Link"
-msgstr "Вставить ссылку"
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:59
+msgid "Post to Dreamwidth by default"
+msgstr "Публиковать в Dreamwidth по умолчанию"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:860
-msgid "Video"
-msgstr "Видео"
+#: ../../extend/addon/hzaddons/dwpost/Mod_Dwpost.php:75
+msgid "Dreamwidth Crosspost Connector"
+msgstr "Публикация в Dreamwidth"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:870
-msgid "Your full name (required)"
-msgstr "Ваше полное имя (требуется)"
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:34
+msgid "New registration"
+msgstr "Новая регистрация"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:871
-msgid "Your email address (required)"
-msgstr "Ваш адрес электронной почты (требуется)"
+#: ../../extend/addon/hzaddons/notifyadmin/notifyadmin.php:42
+#, php-format
+msgid "Message sent to %s. New account registration: %s"
+msgstr "Сообщение отправлено в %s. Регистрация нового аккаунта: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:872
-msgid "Your website URL (optional)"
-msgstr "URL вашего вебсайта (необязательно)"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:222
+msgid "Workflow user."
+msgstr "Пользователь \"Рабочего процесса\"."
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:67
-msgid "Source code of failed update: "
-msgstr "Исходный код неудачного обновления: "
+#: ../../extend/addon/hzaddons/workflow/workflow.php:272
+msgid "This channel"
+msgstr "Этот канал"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:88
-#, php-format
-msgid "Update Error at %s"
-msgstr "Ошибка обновления на %s"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:327
+msgid "Create New Workflow Item"
+msgstr "Создать новый элемент рабочего процесса"
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:94
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Выполнение %s неудачно. Проверьте системный журнал."
+#: ../../extend/addon/hzaddons/workflow/workflow.php:546
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1442
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1461
+msgid "Workflow"
+msgstr "Рабочий процесс"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-#: ../../Zotlabs/Access/PermissionRoles.php:384
-msgid "Public"
-msgstr "Общедоступно"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1430
+msgid "No Workflows Available"
+msgstr "Нет доступных рабочих процессов"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
-msgstr "Любому в сети $Projectname"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1460
+msgid "Add item to which workflow"
+msgstr "Подключить рабочий процесс к элементу"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-#, php-format
-msgid "Any account on %s"
-msgstr "Любой аккаунт в %s"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1520
+#: ../../extend/addon/hzaddons/workflow/workflow.php:1639
+msgid "Create Workflow Item"
+msgstr "Создать элемент рабочего процесса"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
-msgstr "Любой из моих контактов"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2601
+msgid "Link"
+msgstr "Ссылка"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
-msgstr "Только те контакты, кому я дам разрешение"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2603
+msgid "Web link."
+msgstr "Веб-ссылка."
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Любой аутентифицированный (может включать посетителей их других сетей)"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2624
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2685
+msgid "Brief description or title"
+msgstr "Подробное описание или заголовок"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Любые контакты включая те, которые вы ещё не одобрили"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2632
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2693
+msgid "Notes and Info"
+msgstr "Замечания и информация"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Это настройка по умолчанию для аудитории ваших обычных потоков и публикаций"
+#: ../../extend/addon/hzaddons/workflow/workflow.php:2691
+msgid "Body"
+msgstr "Текст"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Это настройка по умолчанию для тех, кто может просматривать профиль вашего основного канала"
+#: ../../extend/addon/hzaddons/workflow/Settings/Mod_WorkflowSettings.php:101
+msgid "Workflow Settings"
+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:94
+msgid "Hubzilla Directory Stats"
+msgstr "Каталог статистики Hubzilla"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Это настройка по умолчанию для тех, кто может просматривать ваше хранилище файлов и фотографий"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:95
+msgid "Total Hubs"
+msgstr "Всего хабов"
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Это настройка по умолчанию для аудитории ваших веб-страниц"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:97
+msgid "Hubzilla Hubs"
+msgstr "Хабы Hubzilla"
 
-#: ../../Zotlabs/Lib/Libsync.php:805
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Невозможно проверить подпись сайта %s"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:99
+msgid "Friendica Hubs"
+msgstr "Хабы Friendica"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:337
-msgid "Social Networking"
-msgstr "Социальная Сеть"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:101
+msgid "Diaspora Pods"
+msgstr "Стручки Diaspora"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:338
-msgid "Social - Federation"
-msgstr "Социальная - Федерация"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:103
+msgid "Hubzilla Channels"
+msgstr "Каналы Hubzilla"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:339
-msgid "Social - Mostly Public"
-msgstr "Социальная - В основном общественный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:105
+msgid "Friendica Channels"
+msgstr "Каналы Friendica"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:340
-msgid "Social - Restricted"
-msgstr "Социальная - Ограниченный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:107
+msgid "Diaspora Channels"
+msgstr "Каналы Diaspora"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:341
-msgid "Social - Private"
-msgstr "Социальная - Частный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:109
+msgid "Aged 35 and above"
+msgstr "Возраст 35 и выше"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:344
-msgid "Community Forum"
-msgstr "Форум сообщества"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:111
+msgid "Aged 34 and under"
+msgstr "Возраст 34 и ниже"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:345
-msgid "Forum - Mostly Public"
-msgstr "Форум - В основном общественный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:113
+msgid "Average Age"
+msgstr "Средний возраст"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:346
-msgid "Forum - Restricted"
-msgstr "Форум - Ограниченный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:115
+msgid "Known Chatrooms"
+msgstr "Известные чаты"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:347
-msgid "Forum - Private"
-msgstr "Форум - Частный"
+#: ../../extend/addon/hzaddons/dirstats/dirstats.php:117
+msgid "Known Tags"
+msgstr "Известные теги"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:350
-msgid "Feed Republish"
-msgstr "Публиковать ленты новостей"
+#: ../../extend/addon/hzaddons/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/Access/PermissionRoles.php:351
-msgid "Feed - Mostly Public"
-msgstr "Ленты новостей - В основном общественный"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:15
+msgid "WYSIWYG status editor"
+msgstr "WYSIWYG редактор статуса "
 
-#: ../../Zotlabs/Access/PermissionRoles.php:352
-msgid "Feed - Restricted"
-msgstr "Ленты новостей - Ограниченный"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:24
+msgid "WYSIWYG Status App"
+msgstr "Приложение \"WYSIWYG статус\""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:355
-msgid "Special Purpose"
-msgstr "Спец. назначение"
+#: ../../extend/addon/hzaddons/hsse/Mod_Hsse.php:32
+msgid "WYSIWYG Status"
+msgstr "WYSIWYG статус"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:356
-msgid "Special - Celebrity/Soapbox"
-msgstr "Спец. назначение - Знаменитость/Soapbox"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:19
+msgid "lonely"
+msgstr "одинокий"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:357
-msgid "Special - Group Repository"
-msgstr "Спец. назначение - Групповой репозиторий"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:20
+msgid "drunk"
+msgstr "пьяный"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:361
-msgid "Custom/Expert Mode"
-msgstr "Экспертный режим"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:21
+msgid "horny"
+msgstr "возбуждённый"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:385
-msgid "Personal"
-msgstr "Личное"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:22
+msgid "stoned"
+msgstr "под кайфом"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:386
-msgid "Community forum"
-msgstr "Форум сообщества"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:23
+msgid "fucked up"
+msgstr "облажался"
 
-#: ../../Zotlabs/Access/PermissionRoles.php:387
-msgid "Custom"
-msgstr "Собственные"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:24
+msgid "clusterfucked"
+msgstr "в полной заднице"
 
-#: ../../Zotlabs/Access/Permissions.php:56
-msgid "Can view my channel stream and posts"
-msgstr "Может просматривать мой поток и сообщения"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:25
+msgid "crazy"
+msgstr "сумасшедший"
 
-#: ../../Zotlabs/Access/Permissions.php:57
-msgid "Can send me their channel stream and posts"
-msgstr "Может присылать мне свои потоки и сообщения"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:26
+msgid "hurt"
+msgstr "обиженный"
 
-#: ../../Zotlabs/Access/Permissions.php:58
-msgid "Can view my default channel profile"
-msgstr "Может просматривать мой стандартный профиль канала"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:27
+msgid "sleepy"
+msgstr "сонный"
 
-#: ../../Zotlabs/Access/Permissions.php:59
-msgid "Can view my connections"
-msgstr "Может просматривать мои контакты"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:28
+msgid "grumpy"
+msgstr "сердитый"
 
-#: ../../Zotlabs/Access/Permissions.php:60
-msgid "Can view my file storage and photos"
-msgstr "Может просматривать мое хранилище файлов"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:29
+msgid "high"
+msgstr "кайфует"
 
-#: ../../Zotlabs/Access/Permissions.php:61
-msgid "Can upload/modify my file storage and photos"
-msgstr "Может загружать/изменять мои файлы и фотографии в хранилище"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:30
+msgid "semi-conscious"
+msgstr "в полубезсознании"
 
-#: ../../Zotlabs/Access/Permissions.php:62
-msgid "Can view my channel webpages"
-msgstr "Может просматривать мои веб-страницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:31
+msgid "in love"
+msgstr "влюблённый"
 
-#: ../../Zotlabs/Access/Permissions.php:63
-msgid "Can view my wiki pages"
-msgstr "Может просматривать мои вики-страницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:32
+msgid "in lust"
+msgstr "похотливый"
 
-#: ../../Zotlabs/Access/Permissions.php:64
-msgid "Can create/edit my channel webpages"
-msgstr "Может редактировать мои веб-страницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:33
+msgid "naked"
+msgstr "обнажённый"
 
-#: ../../Zotlabs/Access/Permissions.php:65
-msgid "Can write to my wiki pages"
-msgstr "Может редактировать мои вики-страницы"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:34
+msgid "stinky"
+msgstr "вонючий"
 
-#: ../../Zotlabs/Access/Permissions.php:66
-msgid "Can post on my channel (wall) page"
-msgstr "Может публиковать на моей странице канала"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:35
+msgid "sweaty"
+msgstr "потный"
 
-#: ../../Zotlabs/Access/Permissions.php:67
-msgid "Can comment on or like my posts"
-msgstr "Может прокомментировать или отмечать как понравившиеся мои публикации"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:36
+msgid "bleeding out"
+msgstr "истекающий кровью"
 
-#: ../../Zotlabs/Access/Permissions.php:68
-msgid "Can send me direct messages"
-msgstr "Может отправлять мне сообщения"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:37
+msgid "victorious"
+msgstr "победивший"
 
-#: ../../Zotlabs/Access/Permissions.php:69
-msgid "Can like/dislike profiles and profile things"
-msgstr "Может комментировать или отмечать как нравится/ненравится мой профиль"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:38
+msgid "defeated"
+msgstr "проигравший"
 
-#: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can chat with me"
-msgstr "Может общаться со мной в чате"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:39
+msgid "envious"
+msgstr "завидует"
 
-#: ../../Zotlabs/Access/Permissions.php:71
-msgid "Can source/mirror my public posts in derived channels"
-msgstr "Могу ли я создавать / зеркалировать мои общедоступные сообщения в производных каналах"
+#: ../../extend/addon/hzaddons/moremoods/moremoods.php:40
+msgid "jealous"
+msgstr "ревнует"
 
-#: ../../Zotlabs/Access/Permissions.php:73
-msgid "Can administer my channel"
-msgstr "Может администрировать мой канал"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:99
+msgid "You're welcome."
+msgstr "Пожалуйста."
 
-#: ../../Zotlabs/Storage/Browser.php:292
-msgid "Change filename to"
-msgstr "Переименовать файл в"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:100
+msgid "Ah shucks..."
+msgstr "О, чёрт..."
 
-#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390
-msgid "Select a target location"
-msgstr "Выбрать место назначения"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:101
+msgid "Don't mention it."
+msgstr "Не стоит благодарности."
 
-#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391
-msgid "Copy to target location"
-msgstr "Скопировать в место назнаения"
+#: ../../extend/addon/hzaddons/randpost/randpost.php:102
+msgid "&lt;blush&gt;"
+msgstr "&lt;краснею&gt;"
 
-#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389
-msgid "Set permissions for all files and sub folders"
-msgstr "Установить разрешения для всех файлов и подкаталогов"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:19
+msgid "Send test email"
+msgstr "Отправить тестовый email"
 
-#: ../../Zotlabs/Storage/Browser.php:312
-msgid "Notify your contacts about this file"
-msgstr "Сообщить своим контактам об этом файле"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:66
+msgid "Mail sent."
+msgstr "Сообщение отправлено"
 
-#: ../../Zotlabs/Storage/Browser.php:351
-msgid "File category"
-msgstr "Категория файла"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:68
+msgid "Sending of mail failed."
+msgstr "Не удалось отправить сообщение."
 
-#: ../../Zotlabs/Storage/Browser.php:362
-msgid "Total"
-msgstr "Всего"
+#: ../../extend/addon/hzaddons/mailtest/mailtest.php:77
+msgid "Mail Test"
+msgstr "Тестовое сообщение"
 
-#: ../../Zotlabs/Storage/Browser.php:364
-msgid "Shared"
-msgstr "Общие"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:92
+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/Storage/Browser.php:366
-msgid "Add Files"
-msgstr "Добавить файлы"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:95
+msgid "Your TOTP secret is"
+msgstr "Ваш секретный код TOTP"
 
-#: ../../Zotlabs/Storage/Browser.php:381
-msgid "parent"
-msgstr "источник"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:96
+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:399
-msgid "Select All"
-msgstr "Выбрать всё"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:101
+msgid "Test"
+msgstr "Тест"
 
-#: ../../Zotlabs/Storage/Browser.php:400
-msgid "Bulk Actions"
-msgstr "Групповая обработка"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:102
+msgid "Generate New Secret"
+msgstr "Сгенерировать новый код"
 
-#: ../../Zotlabs/Storage/Browser.php:401
-msgid "Adjust Permissions"
-msgstr "Настроить разрешения"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:103
+msgid "Go"
+msgstr "Вперёд"
 
-#: ../../Zotlabs/Storage/Browser.php:402
-msgid "Move or Copy"
-msgstr "Переместить или копировать"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:104
+msgid "Enter your password"
+msgstr "Введите ваш пароль"
 
-#: ../../Zotlabs/Storage/Browser.php:405
-msgid "Info"
-msgstr "Информация"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:105
+msgid "enter TOTP code from your device"
+msgstr "введите код TOTP из вашего устройства"
 
-#: ../../Zotlabs/Storage/Browser.php:406
-msgid "Rename"
-msgstr "Переименовать"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:106
+msgid "Pass!"
+msgstr "Принято!"
 
-#: ../../Zotlabs/Storage/Browser.php:408
-msgid "Attachment BBcode"
-msgstr "Вложение BBcode"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:107
+msgid "Fail"
+msgstr "Отказано"
 
-#: ../../Zotlabs/Storage/Browser.php:409
-msgid "Embed BBcode"
-msgstr "Встраивание BBcode"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:108
+msgid "Incorrect password, try again."
+msgstr "Неверный пароль, попробуйте снова."
 
-#: ../../Zotlabs/Storage/Browser.php:410
-msgid "Link BBcode"
-msgstr "Ссылка BBcode"
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:109
+msgid "Record your new TOTP secret and rescan the QR code above."
+msgstr "Запишите ваш секретный код TOTP и повторно отсканируйте приведенный ниже QR-код."
 
-#: ../../Zotlabs/Storage/Browser.php:480
-#, php-format
-msgid "You are using %1$s of your available file storage."
-msgstr "Вы используете %1$s из доступного вам хранилища файлов."
+#: ../../extend/addon/hzaddons/totp/Settings/Totp.php:117
+msgid "TOTP Settings"
+msgstr "Настройки TOTP"
 
-#: ../../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/totp/Mod_Totp.php:32
+msgid "TOTP Two-Step Verification"
+msgstr "Двухэтапная верификация TOTP"
 
-#: ../../Zotlabs/Storage/Browser.php:496
-msgid "WARNING:"
-msgstr "Предупреждение:"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:33
+msgid "Enter the 2-step verification generated by your authenticator app:"
+msgstr "Введите код проверки, созданный вашим приложением для аутентификации"
 
-#: ../../Zotlabs/Storage/Browser.php:537
-msgid "Create new folder"
-msgstr "Создать новую папку"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:34
+msgid "Success!"
+msgstr "Успех!"
 
-#: ../../Zotlabs/Storage/Browser.php:539
-msgid "Upload file"
-msgstr "Загрузить файл"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:35
+msgid "Invalid code, please try again."
+msgstr "Неверный код. Пожалуйста, попробуйте ещё раз."
 
-#: ../../Zotlabs/Storage/Browser.php:551
-msgid "Drop files here to immediately upload"
-msgstr "Поместите файлы сюда для немедленной загрузки"
+#: ../../extend/addon/hzaddons/totp/Mod_Totp.php:36
+msgid "Too many invalid codes..."
+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/totp/Mod_Totp.php:37
+msgid "Verify"
+msgstr "Проверить"
 
-#: ../../boot.php:1714
-msgid "Create an account to access services and applications"
-msgstr "Создайте аккаунт для доступа к службам и приложениям"
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:21
+msgid "Send your identity to all websites"
+msgstr "Отправить ваши данные на все веб-сайты"
 
-#: ../../boot.php:1732
-msgid "Email or nickname"
-msgstr "Электронная почта или псевдоним"
+#: ../../extend/addon/hzaddons/sendzid/Mod_Sendzid.php:29
+msgid "Send ZID"
+msgstr "Отправить ZID"
 
-#: ../../boot.php:1742
-msgid "Password"
-msgstr "Пароль"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:77
+msgid "Max queueworker threads"
+msgstr "Макс. количество обработчиков очереди"
 
-#: ../../boot.php:1743
-msgid "Remember me"
-msgstr "Запомнить меня"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:79
+msgid "Minimum 4, default 4"
+msgstr "Минимум 4, по умолчанию 4"
 
-#: ../../boot.php:1746
-msgid "Forgot your password?"
-msgstr "Забыли пароль или логин?"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:90
+msgid "Assume workers dead after"
+msgstr "Считать обработчики неактивными после"
 
-#: ../../boot.php:2624
-#, php-format
-msgid "[$Projectname] Website SSL error for %s"
-msgstr "[$Projectname] Ошибка SSL/TLS веб-сайта для %s"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:92
+msgid "Minimum 120, default 300 seconds"
+msgstr "Минимум 120, по умолчанию 300 секунд"
 
-#: ../../boot.php:2629
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "SSL/TLS сертификат веб-сайт недействителен. Исправьте это."
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:103
+msgid "Pause before starting next task"
+msgstr "Задержка перед запуском следующей задачи"
 
-#: ../../boot.php:2745
-#, php-format
-msgid "[$Projectname] Cron tasks not running on %s"
-msgstr "[$Projectname] Задания Cron не запущены на %s"
+#: ../../extend/addon/hzaddons/queueworker/Mod_Queueworker.php:105
+msgid "Minimum 100, default 100 microseconds"
+msgstr "Минимум 100, по умолчанию 100 микросекунд"
 
-#: ../../boot.php:2750
-msgid "Cron/Scheduled tasks not running."
-msgstr "Задания Cron / планировщика не запущены."
+#: ../../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 c8a8008ce..a20ede547 100644
--- a/view/ru/hstrings.php
+++ b/view/ru/hstrings.php
@@ -6,1806 +6,78 @@ function string_plural_select_ru($n){
 }}
 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 rem"] = "Установить максимальную ширину содержимого в rem";
-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 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["Make yourself a political target."] = "Сделайте себя политической мишенью.";
-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["Rainbow Tag App"] = "Приложение \"Радуга тегов\"";
-App::$strings["Add some colour to tag clouds"] = "Добавить немного цвета для облака тегов";
-App::$strings["Rainbow Tag"] = "Радуга тегов";
-App::$strings["Photo Cache settings saved."] = "Настройки кэширования изображений сохранены.";
-App::$strings["Saves a copy of images from external sites locally to increase your anonymity in the web."] = "Сохраняет копии изображений с внешних сайтов локально, чтобы повысить вашу анонимность в Интернете.";
-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["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["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["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["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 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["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["Not Installed"] = "не установлено";
-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["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["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 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["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["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["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 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["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["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["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию";
-App::$strings["No Federation"] = "Отключить Federation";
-App::$strings["Federate"] = "Федерировать";
-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["No subject"] = "Без темы";
-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["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["Create New Workflow Item"] = "Создать новый элемент рабочего процесса";
-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["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 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["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["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["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["Send test email"] = "Отправить тестовый email";
-App::$strings["Mail sent."] = "Сообщение отправлено";
-App::$strings["Sending of mail failed."] = "Не удалось отправить сообщение.";
-App::$strings["Mail Test"] = "Тестовое сообщение";
-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::$strings["pageheader Settings saved."] = "Настройки шапки страницы сохранены.";
-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["prev"] = "предыдущий";
-App::$strings["first"] = "первый";
-App::$strings["last"] = "последний";
-App::$strings["next"] = "следующий";
-App::$strings["older"] = "старше";
-App::$strings["newer"] = "новее";
-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["__ctx:noun__ %d Vote"] = array(
-	0 => "",
-);
-App::$strings["__ctx:noun__ %d Vote in total"] = array(
-	0 => "",
-);
-App::$strings["Poll has ended"] = "Опрос завершён";
-App::$strings["Poll ends in %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["Channels"] = "Каналы";
-App::$strings["Manage your channels"] = "Управление вашими каналами";
-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, #tag, ?doc, content"] = "@имя, #тег, ?документ, содержимое";
-App::$strings["Please wait..."] = "Подождите пожалуйста ...";
-App::$strings["Apps"] = "Приложения";
-App::$strings["Channel Apps"] = "Приложения канала";
-App::$strings["System Apps"] = "Системные приложения";
-App::$strings["Pinned Apps"] = "Прикреплённые приложения";
-App::$strings["Featured 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["Unknown"] = "Неизвестный";
-App::$strings["Date: "] = "Дата: ";
-App::$strings["Reason: "] = "Причина: ";
-App::$strings["INVALID CARD DISMISSED!"] = "НЕДЕЙСТВИТЕЛЬНАЯ КАРТОЧКА ОТКЛОНЕНА!";
-App::$strings["Name: "] = "Имя: ";
-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 Features"] = "Возможности бесед";
-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["Select a profile to assign to this contact"] = "Выберите профиль для этого контакта";
-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["Privacy Groups"] = "Группы конфиденциальности";
-App::$strings["Edit group"] = "Редактировать группу";
-App::$strings["Manage privacy groups"] = "Управлять группами конфиденциальности";
-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["&#x1f501; Repeated %1\$s's %2\$s"] = "&#x1f501; Повторил %1\$s %2\$s";
-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["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 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["Hometown:"] = "Родной город:";
-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["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["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s приветствует %2\$s";
-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["Add new guest"] = "Добавить нового гостя";
-App::$strings["Guest access"] = "Гостевой доступ";
-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["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["Privacy 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["App Categories"] = "Категории приложений";
-App::$strings["__ctx:wiki_history__ Message"] = "Сообщение";
-App::$strings["Date"] = "Дата";
-App::$strings["Revert"] = "Отменить";
-App::$strings["Compare"] = "Сравнить";
-App::$strings["Toggle post editor"] = "Переключить редактор сообщений";
-App::$strings["Toggle personal notes"] = "Переключить личные заметки";
-App::$strings["Add new role"] = "Добавить новую роль";
-App::$strings["Contact roles"] = "Роли контакта";
-App::$strings["Role members"] = "Обладатели роли";
-App::$strings["photo/image"] = "фотография / изображение";
-App::$strings["Site"] = "Сайт";
-App::$strings["Accounts"] = "Учётные записи";
-App::$strings["Member registrations waiting for confirmation"] = "Регистрации участников, ожидающие подверждения";
-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["Add new group"] = "Добавить новую группу";
-App::$strings["Privacy groups"] = "Группы конфиденциальности";
-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["Public and restricted messages"] = "Общедоступные и частные публикации";
-App::$strings["Direct messages"] = "Сообщения";
-App::$strings["Starred messages"] = "Отмеченные публикации";
-App::$strings["Notices"] = "Оповещения";
-App::$strings["No messages"] = "Сообщений нет";
-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["Read mode"] = "Читать дальше";
-App::$strings["Edit mode"] = "Режим редактирования";
-App::$strings["Editing"] = "Редактируем";
-App::$strings["Saving"] = "Сохраняем";
-App::$strings["Saved"] = "Сохранено";
-App::$strings["Me"] = "Я";
-App::$strings["Family"] = "Семья";
-App::$strings["Acquaintances"] = "Знакомые";
-App::$strings["All"] = "Все";
-App::$strings["Refresh"] = "Обновить";
-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"] = "Новые контакты";
-App::$strings["New connections notifications"] = "Уведомления о новых контактах";
-App::$strings["View all connections"] = "Просмотр всех контактов";
-App::$strings["New files notifications"] = "Уведомления о новых файлах";
-App::$strings["View all notices"] = "Просмотреть все оповещения";
-App::$strings["Mark all notices seen"] = "Пометить все оповещения как просмотренные";
-App::$strings["Registrations"] = "Регистрации";
-App::$strings["New registrations notifications"] = "Уведомления о новых регистрациях";
-App::$strings["Public Stream"] = "Публичный поток";
-App::$strings["New public stream notifications"] = "Уведомления о новом в публичном потоке";
-App::$strings["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["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["Please select a role for this guest!"] = "Пожалуйста, выберите роль для этого гостя!";
-App::$strings["Select a role for this guest"] = "Выбрать роль для этого гостя";
-App::$strings["Guest Access"] = "Гостевой доступ";
-App::$strings["Login Name"] = "Имя";
-App::$strings["Login Password"] = "Пароль";
-App::$strings["Expires (yyyy-mm-dd)"] = "Срок действия (yyyy-mm-dd)";
-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["Not a zip file or zip file corrupted."] = "Не zip файл или повреждённый zip файл.";
-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["Imported file is empty."] = "Импортированный файл пуст.";
-App::$strings["Content import completed"] = "Импорт содержимого завершён";
-App::$strings["Chatroom import completed"] = "Импорт комнат чатов завершён";
-App::$strings["Channel calendar import 1/2 completed"] = "Импорт календаря канала завершён на 1/2";
-App::$strings["Channel calendar import 2/2 completed"] = "Импорт календаря канала завершён на 2/2";
-App::$strings["Menu import completed"] = "Импорт меню завершён";
-App::$strings["Wiki import completed"] = "Импорт wiki завершён";
-App::$strings["Webpages import completed"] = "Импорт веб-страниц завершён";
-App::$strings["Nothing to import."] = "Ничего импортировать.";
-App::$strings["Unable to download data from old server"] = "Невозможно загрузить данные со старого сервера";
-App::$strings["Your service plan only allows %d channels."] = "Ваш класс обслуживания разрешает только %d каналов.";
-App::$strings["No channel. Import failed."] = "Канала нет. Импорт невозможен.";
-App::$strings["Automatic content and files import was not possible due to API version incompatiblity. Please import content and files manually!"] = "Автоматический импорт содержимого и файлов был невозможен из-за несовместимости версий API. Пожалуйста, импортируйте контент и файлы вручную!";
-App::$strings["You must be logged in to use this feature."] = "Вы должны войти в систему, чтобы использовать эту функцию.";
-App::$strings["Channel Import"] = "Импортировать канал";
-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 your items and files (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["No content available for year"] = "Содержимое для года недоступно";
+App::$strings["Export Channel"] = "Экспорт канала";
+App::$strings["Export channel"] = "Экспортировать канал";
+App::$strings["This will export your identity and social graph into a file which can be used to import your channel to a new hub."] = "Экспортировать ваши данные и социальный граф в файл, который можно использовать для импорта вашего канала на новом хабе.";
+App::$strings["Export content"] = "Экспортировать содержимое";
+App::$strings["This will export your posts, direct messages, articles and cards per month stored into a zip file per year. Months with no posts will be dismissed."] = "Экспортировать ваши публикации, личные сообщения, статьи и карточки за месяц, хранящиеся в zip-файле за год. Месяцы без сообщений будут отклонены.";
+App::$strings["Export wikis"] = "Экспортировать wiki";
+App::$strings["This will export your wikis and wiki pages."] = "Экспортировать ваши wiki и их страницы.";
+App::$strings["Export webpages"] = "Экспортировать веб-страницы";
+App::$strings["This will export your webpages and menus."] = "Экспортировать ваши веб-страницы и меню.";
+App::$strings["Export channel calendar"] = "Экспортировать календарь канала";
+App::$strings["This will export your channel calendar events and associated items. CalDAV calendars are not included."] = "Экспортировать события календаря вашего канала и связанные элементы, за исключением календарей CalDAV.";
+App::$strings["Export chatrooms"] = "Экспортировать комнаты чатов";
+App::$strings["This will export your chatrooms. Chat history is dismissed."] = "Эксортировать ваши комнаты чатов. История не сохраняется.";
+App::$strings["This export can be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel."] = "Этот файл можно импортировать или восстановить, посетив <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["Malformed message id."] = "Неверный идентификатор сообщения.";
+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"] = "Приглашение истекло или введено не вовремя";
@@ -1813,6 +85,7 @@ App::$strings["Invitation email failed"] = "Не удалось отправит
 App::$strings["Invitation code failed"] = "Неверный код приглашения";
 App::$strings["Invitations are not available"] = "Приглашения не доступны";
 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."] = "Регистрация на этом хабе отключена.";
@@ -1824,6 +97,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"] = "Пожалуйста, введите пароль еще раз";
@@ -1837,400 +111,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["Malformed message id."] = "Неверный идентификатор сообщения.";
-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["Post to this group by default"] = "Публиковать в этой группе по умолчанию";
-App::$strings["Add new contacts to this group by default"] = "Добавлять новые контакты в эту группу по умолчанию";
-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["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["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["Unable to locate original post."] = "Не удалось найти оригинальную публикацию.";
-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["Add Room"] = "Добавить комнату";
-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 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["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["Could not fetch calendar resource. The selected calendar might be disabled."] = "Не удалось получить содержимое календаря. Выбранный календарь может быть отключен.";
-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["__ctx:acl__ Profile"] = "Профиль";
-App::$strings["Privacy group"] = "Группы конфиденциальности";
-App::$strings["Click to copy link to this ressource for guest %s to clipboard"] = "Нажмите чтобы скопировать этот ресурс в буфер для гостя %s";
-App::$strings["Link copied"] = "Ссылка скопирована";
-App::$strings["Access"] = "Доступ";
-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["Members"] = "Участники";
-App::$strings["Administrators"] = "Администраторы";
-App::$strings["Developers"] = "Разработчики";
-App::$strings["Tutorials"] = "Руководства";
-App::$strings["\$Projectname Documentation"] = "\$Projectname Документация";
-App::$strings["Contents"] = "Содержимое";
-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["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 аккаунтов блокировано/разблокировано",
@@ -2242,10 +233,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"] = "Выбрать";
@@ -2254,9 +248,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"] = "Подтверждён";
@@ -2266,12 +263,78 @@ 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["Retry delivery to this hub"] = "Повторить доставку на этот хаб";
+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"] = "экспериментальный";
@@ -2294,8 +357,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"] = "Информация об администраторе";
@@ -2390,12 +456,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 канала цензурируется/нецензурируется",
@@ -2417,444 +477,97 @@ 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["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["You have created %1$.0f of %2$.0f allowed channels."] = "Вы создали %1$.0f из %2$.0f возможных каналов.";
-App::$strings["Create a new channel"] = "Создать новый канал";
-App::$strings["Create New"] = "Создать новый";
-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["toggle full screen mode"] = "переключение полноэкранного режима";
-App::$strings["Away"] = "Нет на месте";
-App::$strings["Online"] = "В сети";
-App::$strings["Contact role deleted."] = "Роль контакта удалена.";
-App::$strings["Permission category name is required."] = "Требуется категория разрешений.";
-App::$strings["Contact role saved."] = "Роль контакта сохранена.";
-App::$strings["Role to assign affected contacts and default role to"] = "Назначить роль выбранных контактов и роль по умолчанию для ";
-App::$strings["Role to assign affected contacts to"] = "Назначить роль выбранных контактов для";
-App::$strings["Assign this role to"] = "Назначить эту роль для";
-App::$strings["All my contacts"] = "Все мои контакты";
-App::$strings["Automatically assign this role to new contacts"] = "Автоматически назначать эту роль для новых контактов";
-App::$strings["Contact Roles"] = "Роли контактов";
-App::$strings["Role name"] = "Наименование роли";
-App::$strings["System role - not editable"] = "Системная роль (не редактируется)";
-App::$strings["Deleting"] = "Удаляем";
-App::$strings["inherited"] = "наследуется";
-App::$strings["Role Permissions"] = "Разрешения роли";
-App::$strings["Some permissions may be inherited from your <a href=\"settings\">channel role</a>, which have higher priority than contact role settings."] = "Некоторые разрешения могут быть унаследованы от вашей <a href=\"settings\">роли канала</a>, которые имеют более высокий приоритет, чем настройки роли контакта.";
-App::$strings["Token verification failed."] = "Не удалось выполнить проверку токена.";
-App::$strings["Email verification resent"] = "Сообщение для проверки email отправлено повторно";
-App::$strings["Unable to resend email verification message."] = "Невозможно повторно отправить сообщение для проверки email";
-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["No content available for year"] = "Содержимое для года недоступно";
-App::$strings["Export Channel"] = "Экспорт канала";
-App::$strings["Export channel"] = "Экспортировать канал";
-App::$strings["This will export your identity and social graph into a file which can be used to import your channel to a new hub."] = "Экспортировать ваши данные и социальный граф в файл, который можно использовать для импорта вашего канала на новом хабе.";
-App::$strings["Export content"] = "Экспортировать содержимое";
-App::$strings["This will export your posts, direct messages, articles and cards per month stored into a zip file per year. Months with no posts will be dismissed."] = "Экспортировать ваши публикации, личные сообщения, статьи и карточки за месяц, хранящиеся в zip-файле за год. Месяцы без сообщений будут отклонены.";
-App::$strings["Export wikis"] = "Экспортировать wiki";
-App::$strings["This will export your wikis and wiki pages."] = "Экспортировать ваши wiki и их страницы.";
-App::$strings["Export webpages"] = "Экспортировать веб-страницы";
-App::$strings["This will export your webpages and menus."] = "Экспортировать ваши веб-страницы и меню.";
-App::$strings["Export channel calendar"] = "Экспортировать календарь канала";
-App::$strings["This will export your channel calendar events and associated items. CalDAV calendars are not included."] = "Экспортировать события календаря вашего канала и связанные элементы, за исключением календарей CalDAV.";
-App::$strings["Export chatrooms"] = "Экспортировать комнаты чатов";
-App::$strings["This will export your chatrooms. Chat history is dismissed."] = "Эксортировать ваши комнаты чатов. История не сохраняется.";
-App::$strings["This export can be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel."] = "Этот файл можно импортировать или восстановить, посетив <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"] = "Роль канала";
-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["Entry censored"] = "Запись цензурирована";
-App::$strings["Entry uncensored"] = "Запись нецензурирована";
-App::$strings["No service class restrictions found."] = "Ограничений класса обслуживание не найдено.";
-App::$strings["Mood"] = "Настроение";
-App::$strings["Set your current mood and tell your friends"] = "Установить текущее настроение и рассказать друзьям";
-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["Invalid abook_id"] = "Недействительный abook_id";
-App::$strings["Could not access contact record."] = "Не удалось получить доступ к записи контакта.";
-App::$strings["Could not locate selected profile."] = "Не удалось обнаружить выбранный профиль.";
-App::$strings["is now connected to"] = "теперь подключён к";
-App::$strings["Contact Tools"] = "Инструменты контактов";
-App::$strings["Approve this contact"] = "Утвердить этот контакт";
-App::$strings["Accept contact to allow communication"] = "Принять контакт, чтобы разрешить общение";
-App::$strings["Please select a role for this contact!"] = "Пожалуйста, выберите роль для этого контакта!";
-App::$strings["This contact is unreachable from this location."] = "Этот контакт недоступен из этого местоположения.";
-App::$strings["This contact may be unreachable from other channel locations."] = "Этот контакт может быть недоступен из других мест размещения канала.";
-App::$strings["Location independence is not supported by their network."] = "Независимое местоположение не поддерживается их сетью.";
-App::$strings["View profile"] = "Просмотреть профиль";
-App::$strings["This is a group/forum channel"] = "Это канал группы или форума";
-App::$strings["Select a role for this contact"] = "Выбрать роль для этого контакта";
-App::$strings["Slide to adjust your degree of friendship"] = "Прокрутить для настройки степени дружбы";
-App::$strings["Custom Filter"] = "Настраиваемый фильтр";
-App::$strings["Only import posts with this text"] = "Импортировать публикации только с этим текстом";
-App::$strings["Do not import posts with this text"] = "Не импортировать публикации с этим текстом";
-App::$strings["Approve contact"] = "Утвердить контакт";
-App::$strings["Their"] = "Их";
-App::$strings["My"] = "Мои";
-App::$strings["Contact updated"] = "Контакт обновлён";
-App::$strings["Contact update failed"] = "Обновление контакта не удалось";
-App::$strings["Approve connection"] = "Утвердить контакт";
-App::$strings["Refresh succeeded"] = "Обновление выполнено";
-App::$strings["Refresh failed - channel is currently unavailable"] = "Ошибка обновления - канал в настоящее время недоступен";
-App::$strings["Block status updated"] = "Статус блокировки обновлён";
-App::$strings["Block failed"] = "Блокировка не удалась";
-App::$strings["Ignore status updated"] = "Статус игнорирования обновлён";
-App::$strings["Ignore failed"] = "Игнорирование не удалось";
-App::$strings["Archive status updated"] = "Статус архивации обновлён";
-App::$strings["Archive failed"] = "Архивация не удалась";
-App::$strings["Hide status updated"] = "Статус скрытия обновлён";
-App::$strings["Hide failed"] = "Скрытие не удалось";
-App::$strings["Contact removed"] = "Контакт удалён";
-App::$strings["Delete failed"] = "Не удалось удалить";
-App::$strings["Refresh Permissions"] = "Обновить разрешения";
-App::$strings["Fetch updated permissions"] = "Получить обновлённые разрешения";
-App::$strings["Refresh Photo"] = "Обновить фотографию";
-App::$strings["Fetch updated photo"] = "Получить обновлённую фотографию";
-App::$strings["Block (or Unblock) all communications with this connection"] = "Блокировать (или разблокировать) связи с этим контактом";
-App::$strings["This connection is blocked!"] = "Этот контакт заблокирован!";
-App::$strings["Unignore"] = "Не игнорировать";
-App::$strings["Ignore"] = "Игнорировать";
-App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Игнорировать (или не игнорировать) все связи для этого контакта";
-App::$strings["This connection is ignored!"] = "Этот контакт игнорируется!";
-App::$strings["Unarchive"] = "Разархивировать";
-App::$strings["Archive"] = "Заархивировать";
-App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое";
-App::$strings["This connection is archived!"] = "Этот контакт заархивирован!";
-App::$strings["Unhide"] = "Показать";
-App::$strings["Hide"] = "Скрыть";
-App::$strings["Hide or Unhide this connection from your other connections"] = "Скрыть или показать этот контакт от / для остальных";
-App::$strings["This connection is hidden!"] = "Этот контакт скрыт!";
-App::$strings["Delete this connection"] = "Удалить этот контакт";
-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["This profile photo will be visible to anybody on the internet and may be distributed to other websites."] = "Эта фотография профиля будет видна любому человеку в Интернете и может быть отправлена на другие сайты.";
-App::$strings["This profile photo will be visible only to channels with permission to view this profile."] = "Это фото профиля будет видно только тем каналам, у которых есть разрешение на просмотр этого профиля.";
-App::$strings["Use Photo for Profile"] = "Использовать фотографию для профиля";
-App::$strings["Change Profile Photo"] = "Изменить фотографию профиля";
-App::$strings["Reset to default"] = "Сброс до настроек по умолчанию";
-App::$strings["Use a photo from your albums"] = "Использовать фотографию из ваших альбомов";
-App::$strings["Choose a different album"] = "Выбрать другой альбом";
-App::$strings["Select existing"] = "Выберите существующее";
-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["Ignore connection"] = "Игнорировать контакт";
-App::$strings["Recent activity"] = "Последние действия";
-App::$strings["Connect at this location"] = "Подключить в этом месте";
-App::$strings["Contact role"] = "Роль контакта";
-App::$strings["Search your connections"] = "Поиск ваших контактов";
-App::$strings["Contact search"] = "Поиск контакта";
-App::$strings["Cover Photos"] = "Фотографии обложки";
-App::$strings["Your cover photo may be visible to anybody on the internet"] = "Фотография вашей обложки может быть видна всем в Интернете";
-App::$strings["Upload File:"] = "Загрузить файл:";
-App::$strings["Select a profile:"] = "Выбрать профиль:";
-App::$strings["Change Cover Photo"] = "Изменить фотографию обложки";
-App::$strings["Select existing photo"] = "Выбрать существующую фотографию";
-App::$strings["Done Editing"] = "Закончить редактирование";
-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["*"] = "";
+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::$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["Profile not found."] = "Профиль не найден.";
 App::$strings["Profile deleted."] = "Профиль удален.";
 App::$strings["Profile-"] = "Профиль -";
@@ -2869,9 +582,11 @@ 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 my connections from viewers of this profile"] = "Скрыть мои контакты от просматривающих этот профиль";
 App::$strings["Publish my default profile in the network directory"] = "Опубликовать мой профиль по умолчанию в каталоге сети";
@@ -2879,14 +594,17 @@ App::$strings["Suggest me as a potential contact to new members"] = "Предл�
 App::$strings["Reveal my online status"] = "Показать мой статус в сети";
 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["Basic"] = "Основной";
 App::$strings["Relationship"] = "Отношения";
+App::$strings["Miscellaneous"] = "Прочее";
 App::$strings["Import profile from file"] = "Импортировать профиль из файла";
 App::$strings["Export profile to file"] = "Экспортировать профиль в файл";
 App::$strings["Your gender"] = "Ваш пол";
@@ -2901,10 +619,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"] = "Религиозные взгляды";
@@ -2919,66 +639,443 @@ App::$strings["Love/Romance"] = "Любовь / романтические от�
 App::$strings["School/Education"] = "Школа / образование";
 App::$strings["Contact information and social networks"] = "Информация и социальные сети для связи";
 App::$strings["My other channels"] = "Мои другие контакты";
-App::$strings["Communications"] = "Связи";
+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["You have %1$.0f of %2$.0f allowed connections."] = "У вас есть %1$.0f из %2$.0f разрешенных контактов.";
+App::$strings["Connections"] = "Контакты";
+App::$strings["Search"] = "Поиск";
+App::$strings["Contact role"] = "Роль контакта";
+App::$strings["Search your connections"] = "Поиск ваших контактов";
+App::$strings["Contact search"] = "Поиск контакта";
+App::$strings["Find"] = "Поиск";
+App::$strings["This is a group/forum channel"] = "Это канал группы или форума";
+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["This profile photo will be visible to anybody on the internet and may be distributed to other websites."] = "Эта фотография профиля будет видна любому человеку в Интернете и может быть отправлена на другие сайты.";
+App::$strings["This profile photo will be visible only to channels with permission to view this profile."] = "Это фото профиля будет видно только тем каналам, у которых есть разрешение на просмотр этого профиля.";
+App::$strings["Use Photo for Profile"] = "Использовать фотографию для профиля";
+App::$strings["Change Profile Photo"] = "Изменить фотографию профиля";
+App::$strings["Reset to default"] = "Сброс до настроек по умолчанию";
+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"] = "Выберите существующее";
+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["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["Create"] = "Создать";
+App::$strings["Sorry! Editing of recurrent events is not yet implemented."] = "Простите, но редактирование повторяющихся событий пока не реализовано.";
+App::$strings["Could not fetch calendar resource. The selected calendar might be disabled."] = "Не удалось получить содержимое календаря. Выбранный календарь может быть отключен.";
+App::$strings["Categories"] = "Категории";
+App::$strings["Organisation"] = "Организация";
+App::$strings["Title"] = "Наименование";
+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["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["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["Privacy group"] = "Группы конфиденциальности";
+App::$strings["Click to copy link to this ressource for guest %s to clipboard"] = "Нажмите чтобы скопировать этот ресурс в буфер для гостя %s";
+App::$strings["Link copied"] = "Ссылка скопирована";
+App::$strings["Access"] = "Доступ";
+App::$strings["Guest access"] = "Гостевой доступ";
+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["Add Article"] = "Добавить статью";
-App::$strings["Bookmark added"] = "Закладка добавлена";
-App::$strings["My Connections Bookmarks"] = "Закладки моих контактов";
+App::$strings["Item not found"] = "Элемент не найден";
+App::$strings["Page link"] = "Ссылка страницы";
+App::$strings["Insert web 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["Not a zip file or zip file corrupted."] = "Не zip файл или повреждённый zip файл.";
+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["Imported file is empty."] = "Импортированный файл пуст.";
+App::$strings["Content import completed"] = "Импорт содержимого завершён";
+App::$strings["Chatroom import completed"] = "Импорт комнат чатов завершён";
+App::$strings["Channel calendar import 1/2 completed"] = "Импорт календаря канала завершён на 1/2";
+App::$strings["Channel calendar import 2/2 completed"] = "Импорт календаря канала завершён на 2/2";
+App::$strings["Menu import completed"] = "Импорт меню завершён";
+App::$strings["Wiki import completed"] = "Импорт wiki завершён";
+App::$strings["Webpages import completed"] = "Импорт веб-страниц завершён";
+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 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["Your message:"] = "Сообщение:";
-App::$strings["Invite template"] = "Шаблон приглашения";
-App::$strings["Subject:"] = "Тема:";
-App::$strings["Here you may enter personal notes to the recipient(s)"] = "Здесь вы можете ввести личные заметки для получателей";
-App::$strings["Private forum"] = "Частный форум";
-App::$strings["Public forum"] = "Публичный форум";
+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::$strings["My Connections Bookmarks"] = "Закладки моих контактов";
+App::$strings["Could not access contact record."] = "Не удалось получить доступ к записи контакта.";
+App::$strings["Settings updated."] = "Настройки обновлены.";
+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["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["Not found."] = "Не найдено.";
+App::$strings["This directory server requires an access token"] = "Для доступа к этому серверу каталогов требуется токен";
+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["Contact role deleted."] = "Роль контакта удалена.";
+App::$strings["Permission category name is required."] = "Требуется категория разрешений.";
+App::$strings["Contact role saved."] = "Роль контакта сохранена.";
+App::$strings["Role to assign affected contacts and default role to"] = "Назначить роль выбранных контактов и роль по умолчанию для ";
+App::$strings["Role to assign affected contacts to"] = "Назначить роль выбранных контактов для";
+App::$strings["Assign this role to"] = "Назначить эту роль для";
+App::$strings["All my contacts"] = "Все мои контакты";
+App::$strings["Automatically assign this role to new contacts"] = "Автоматически назначать эту роль для новых контактов";
+App::$strings["Contact Roles"] = "Роли контактов";
+App::$strings["Role name"] = "Наименование роли";
+App::$strings["System role - not editable"] = "Системная роль (не редактируется)";
+App::$strings["Deleting"] = "Удаляем";
+App::$strings["Role Permissions"] = "Разрешения роли";
+App::$strings["Some permissions may be inherited from your <a href=\"settings\">channel role</a>, which have higher priority than contact role settings."] = "Некоторые разрешения могут быть унаследованы от вашей <a href=\"settings\">роли канала</a>, которые имеют более высокий приоритет, чем настройки роли контакта.";
+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["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["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["Add Room"] = "Добавить комнату";
+App::$strings["Expiration"] = "Срок действия";
+App::$strings["min"] = "мин.";
+App::$strings["Blocks"] = "Блокировки";
+App::$strings["Block Title"] = "Заблокировать заголовок";
+App::$strings["Privacy settings updated."] = "Настройки конфиденциальности обновлены.";
+App::$strings["Only me"] = "Только мне";
+App::$strings["Only those you specifically allow"] = "Только персонально разрешённые";
+App::$strings["Approved connections"] = "Одобренные контакты";
+App::$strings["Any connections"] = "Любые контакты";
+App::$strings["Anybody on this website"] = "Любой на этом сайте";
+App::$strings["Anybody in this network"] = "Любой в этой сети";
+App::$strings["Anybody authenticated"] = "Любой аутентифицированный";
+App::$strings["Anybody on the internet"] = "Любой в интернете";
+App::$strings["Advise: set to \"Anybody on the internet\" and use privacy groups to restrict access"] = "Совет: установите значение «Кто угодно в Интернете» и используйте группы конфиденциальности для ограничения доступа.";
+App::$strings["Privacy Settings"] = "Настройки конфиденциальности";
+App::$strings["Advanced configuration"] = "Расширенная конфигурация";
+App::$strings["Proceed with caution"] = "Применять с осторожностью";
+App::$strings["Changing advanced configuration settings can impact your, and your contacts channels functionality and security."] = "Изменение дополнительных параметров конфигурации может повлиять на работу и безопасность ваших каналов и контактов.";
+App::$strings["Accept the risk and continue"] = "Принять риск и продолжить";
+App::$strings["Automatically approve new contacts"] = "Автоматически одобрять новые контакты";
+App::$strings["Opt-out of search engine indexing"] = "Исключить из индексирования поисковых систем";
+App::$strings["Group actor"] = "Представление группы";
+App::$strings["Allow this channel to act as a forum"] = "Разрешить выступать этому каналу в качестве форума";
+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["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["Default profile for new contacts"] = "Профиль по умолчанию для новых контактов";
+App::$strings["Profiles Settings"] = "Настройки профилей";
 App::$strings["Please select a channel role"] = "Пожалуйста, выберите роль канала";
 App::$strings["Your channel address is"] = "Адрес вашего канала";
 App::$strings["Your files/photos are accessible via WebDAV at"] = "Ваши файлы / фотографии доступны через WebDAV по";
 App::$strings["Channel Settings"] = "Настройки канала";
+App::$strings["Channel role"] = "Роль канала";
 App::$strings["Basic Settings"] = "Основные настройки";
 App::$strings["Channel timezone:"] = "Часовой пояс канала:";
 App::$strings["Default post location:"] = "Местоположение публикации по умолчанию:";
@@ -3033,79 +1130,206 @@ App::$strings["Must be greater than 0"] = "Должно быть больше 0"
 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["Expire other channel content after this many days"] = "Храненить содержимое других каналов, дней";
 App::$strings["0 or blank to use the website limit."] = "0 или пусто - использовать настройки сайта.";
 App::$strings["This website expires after %d days."] = "Срок хранения содержимого этого сайта истекает через %d дней";
 App::$strings["This website does not expire imported content."] = "Срок хранения импортированного содержимого этого сайта не ограничен.";
 App::$strings["The website limit takes precedence if lower than your limit."] = "Ограничение сайта имеет приоритет если ниже вашего значения.";
-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["Do not import posts with this text"] = "Не импортировать публикации с этим текстом";
+App::$strings["Words one per line or #tags, \$categories, /patterns/, lang=xx, lang!=xx - leave blank to import all posts"] = "Слова, по одному на строку, или #теги, $категории, /шаблоны/, lang=xx, lang!=xx - оставьте пустым для импорта всех публикаций";
+App::$strings["Only import posts with this text"] = "Импортировать публикации только с этим текстом";
+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["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["Default profile for new contacts"] = "Профиль по умолчанию для новых контактов";
-App::$strings["Profiles Settings"] = "Настройки профилей";
-App::$strings["Privacy settings updated."] = "Настройки конфиденциальности обновлены.";
-App::$strings["Only those you specifically allow"] = "Только персонально разрешённые";
-App::$strings["Approved connections"] = "Одобренные контакты";
-App::$strings["Any connections"] = "Любые контакты";
-App::$strings["Anybody on this website"] = "Любой на этом сайте";
-App::$strings["Anybody in this network"] = "Любой в этой сети";
-App::$strings["Anybody authenticated"] = "Любой аутентифицированный";
-App::$strings["Anybody on the internet"] = "Любой в интернете";
-App::$strings["Advise: set to \"Anybody on the internet\" and use privacy groups to restrict access"] = "Совет: установите значение «Кто угодно в Интернете» и используйте группы конфиденциальности для ограничения доступа.";
-App::$strings["Privacy Settings"] = "Настройки конфиденциальности";
-App::$strings["Advanced configuration"] = "Расширенная конфигурация";
-App::$strings["Proceed with caution"] = "Применять с осторожностью";
-App::$strings["Changing advanced configuration settings can impact your, and your contacts channels functionality and security."] = "Изменение дополнительных параметров конфигурации может повлиять на работу и безопасность ваших каналов и контактов.";
-App::$strings["Accept the risk and continue"] = "Принять риск и продолжить";
-App::$strings["Automatically approve new contacts"] = "Автоматически одобрять новые контакты";
-App::$strings["Opt-out of search engine indexing"] = "Исключить из индексирования поисковых систем";
-App::$strings["Group actor"] = "Представление группы";
-App::$strings["Allow this channel to act as a forum"] = "Разрешить выступать этому каналу в качестве форума";
-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["Invalid abook_id"] = "Недействительный abook_id";
+App::$strings["Could not locate selected profile."] = "Не удалось обнаружить выбранный профиль.";
+App::$strings["is now connected to"] = "теперь подключён к";
+App::$strings["Contact Tools"] = "Инструменты контактов";
+App::$strings["Me"] = "Я";
+App::$strings["Family"] = "Семья";
+App::$strings["Friends"] = "Друзья";
+App::$strings["Acquaintances"] = "Знакомые";
+App::$strings["Approve this contact"] = "Утвердить этот контакт";
+App::$strings["Accept contact to allow communication"] = "Принять контакт, чтобы разрешить общение";
+App::$strings["Please select a role for this contact!"] = "Пожалуйста, выберите роль для этого контакта!";
+App::$strings["This contact is unreachable from this location."] = "Этот контакт недоступен из этого местоположения.";
+App::$strings["This contact may be unreachable from other channel locations."] = "Этот контакт может быть недоступен из других мест размещения канала.";
+App::$strings["Location independence is not supported by their network."] = "Независимое местоположение не поддерживается их сетью.";
+App::$strings["View profile"] = "Просмотреть профиль";
+App::$strings["Select a role for this contact"] = "Выбрать роль для этого контакта";
+App::$strings["Contact roles"] = "Роли контакта";
+App::$strings["Slide to adjust your degree of friendship"] = "Прокрутить для настройки степени дружбы";
+App::$strings["Custom Filter"] = "Настраиваемый фильтр";
+App::$strings["Approve contact"] = "Утвердить контакт";
+App::$strings["Their"] = "Их";
+App::$strings["My"] = "Мои";
+App::$strings["Roles"] = "Роли";
+App::$strings["Compare permissions"] = "Сравнить разрешения";
+App::$strings["Permission"] = "Разрешение";
+App::$strings["Privacy groups"] = "Группы конфиденциальности";
+App::$strings["Profiles"] = "Редактировать профиль";
+App::$strings["Affinity"] = "Сходство";
+App::$strings["Content filter"] = "Фильтр содержимого";
+App::$strings["Contact updated"] = "Контакт обновлён";
+App::$strings["Contact update failed"] = "Обновление контакта не удалось";
+App::$strings["Refresh succeeded"] = "Обновление выполнено";
+App::$strings["Refresh failed - channel is currently unavailable"] = "Ошибка обновления - канал в настоящее время недоступен";
+App::$strings["Block status updated"] = "Статус блокировки обновлён";
+App::$strings["Block failed"] = "Блокировка не удалась";
+App::$strings["Ignore status updated"] = "Статус игнорирования обновлён";
+App::$strings["Ignore failed"] = "Игнорирование не удалось";
+App::$strings["Archive status updated"] = "Статус архивации обновлён";
+App::$strings["Archive failed"] = "Архивация не удалась";
+App::$strings["Hide status updated"] = "Статус скрытия обновлён";
+App::$strings["Hide failed"] = "Скрытие не удалось";
+App::$strings["Contact removed"] = "Контакт удалён";
+App::$strings["Delete failed"] = "Не удалось удалить";
+App::$strings["Refresh Permissions"] = "Обновить разрешения";
+App::$strings["Fetch updated permissions"] = "Получить обновлённые разрешения";
+App::$strings["Refresh Photo"] = "Обновить фотографию";
+App::$strings["Fetch updated photo"] = "Получить обновлённую фотографию";
+App::$strings["Block (or Unblock) all communications with this connection"] = "Блокировать (или разблокировать) связи с этим контактом";
+App::$strings["This connection is blocked!"] = "Этот контакт заблокирован!";
+App::$strings["Unignore"] = "Не игнорировать";
+App::$strings["Ignore (or Unignore) all inbound communications from this connection"] = "Игнорировать (или не игнорировать) все связи для этого контакта";
+App::$strings["This connection is ignored!"] = "Этот контакт игнорируется!";
+App::$strings["Unarchive"] = "Разархивировать";
+App::$strings["Archive"] = "Заархивировать";
+App::$strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Заархивировать (или разархивировать) этот контакт - пометить канал отключённым но сохранить содержимое";
+App::$strings["This connection is archived!"] = "Этот контакт заархивирован!";
+App::$strings["Unhide"] = "Показать";
+App::$strings["Hide"] = "Скрыть";
+App::$strings["Hide or Unhide this connection from your other connections"] = "Скрыть или показать этот контакт от / для остальных";
+App::$strings["This connection is hidden!"] = "Этот контакт скрыт!";
+App::$strings["Delete this connection"] = "Удалить этот контакт";
+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["Not Installed"] = "не установлено";
+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 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["Upload File:"] = "Загрузить файл:";
+App::$strings["Select a profile:"] = "Выбрать профиль:";
+App::$strings["Change Cover Photo"] = "Изменить фотографию обложки";
+App::$strings["Select existing photo"] = "Выбрать существующую фотографию";
+App::$strings["Done Editing"] = "Закончить редактирование";
+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["Delivery report for %1\$s"] = "Отчёт о доставке для %1\$s";
+App::$strings["Options"] = "Параметры";
+App::$strings["Redeliver"] = "Доставить повторно";
+App::$strings["Affinity Tool settings updated."] = "Настройки степени сходства обновлены.";
+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["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["Unable to update menu."] = "Невозможно обновить меню.";
 App::$strings["Unable to create menu."] = "Невозможно создать меню.";
 App::$strings["Menu Name"] = "Название меню";
@@ -3115,12 +1339,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"] = "Название меню";
@@ -3128,39 +1353,28 @@ 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["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["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["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["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["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["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["Delivery report for %1\$s"] = "Отчёт о доставке для %1\$s";
-App::$strings["Redeliver"] = "Доставить повторно";
+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["Thing updated"] = "Обновлено";
 App::$strings["Object store: failed"] = "Хранлищие объектов: неудача";
 App::$strings["Thing added"] = "Добавлено";
@@ -3175,71 +1389,77 @@ 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["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["Item sync completed!"] = "Синхронизация объектов завершена!";
-App::$strings["Item sync completed but no items were found!"] = "Синхронизация объектов завершена, но объекты не найдены!";
-App::$strings["File sync completed!"] = "Синхронизация файлов завершена!";
-App::$strings["File sync completed but no files were found!"] = "Синхронизация файлов завершена, но файлы не найдены! ";
-App::$strings["Channel clone status"] = "Статус клонирования канала";
-App::$strings["Item sync status"] = "Статус синхронизации объектов";
-App::$strings["File sync status"] = "Статус синхронизации файлов";
-App::$strings["Channel cloning completed!"] = "Клонирование канала завершено!";
-App::$strings["Resume"] = "Возобновить";
-App::$strings["Only resume if sync stalled!"] = "Возобновлять только в том случае, если синхронизация остановилась! ";
-App::$strings["Layout updated."] = "Шаблон обновлен.";
-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["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["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["Nothing to import."] = "Ничего импортировать.";
+App::$strings["Unable to download data from old server"] = "Невозможно загрузить данные со старого сервера";
+App::$strings["Your service plan only allows %d channels."] = "Ваш класс обслуживания разрешает только %d каналов.";
+App::$strings["No channel. Import failed."] = "Канала нет. Импорт невозможен.";
+App::$strings["Automatic content and files import was not possible due to API version incompatiblity. Please import content and files manually!"] = "Автоматический импорт содержимого и файлов был невозможен из-за несовместимости версий API. Пожалуйста, импортируйте контент и файлы вручную!";
+App::$strings["You must be logged in to use this feature."] = "Вы должны войти в систему, чтобы использовать эту функцию.";
+App::$strings["Channel Import"] = "Импортировать канал";
+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 your items and files (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["Post to this group by default"] = "Публиковать в этой группе по умолчанию";
+App::$strings["Add new contacts to this group by default"] = "Добавлять новые контакты в эту группу по умолчанию";
+App::$strings["Privacy Groups"] = "Группы конфиденциальности";
+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["Group members"] = "Члены группы";
+App::$strings["Not in this group"] = "Не в этой группе";
+App::$strings["Click a channel to toggle membership"] = "Нажмите на канал для просмотра членства";
+App::$strings["vcard"] = "vCard";
 App::$strings["Connection updated."] = "Контакты обновлены.";
 App::$strings["Failed to update connection record."] = "Не удалось обновить запись контакта.";
 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["Recent Activity"] = "Последние действия";
 App::$strings["View recent posts and comments"] = "Просмотреть последние публикации и комментарии";
 App::$strings["Fetch Vcard"] = "Получить vCard";
 App::$strings["Fetch electronic calling card for this connection"] = "Получить электронную телефонную карточку для этого контакта";
-App::$strings["Affinity"] = "Сходство";
 App::$strings["Open Set Affinity section by default"] = "Открыть секцию установления сходства по умолчанию";
 App::$strings["Filter"] = "Фильтр";
 App::$strings["Open Custom Filter section by default"] = "Открывать секцию \"Настраиваемый фильтр\" по умолчанию";
@@ -3256,56 +1476,430 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 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["*"] = "";
-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["A deleted privacy group with this name was revived. Existing item permissions <strong>may</strong> apply to this privacy group and any future members. If this is not what you intended, please create another privacy group with a different name."] = "Удаленная группа конфиденциальности с таким названием восстановлена. Существующие разрешения элемента <strong>могут</strong> применяться к этой группе конфиденциальности и любым будущим участникам. Если это не то, что вы хотели, создайте другую группу конфиденциальности с другим именем.";
-App::$strings["Select a privacy group"] = "Выбрать группу конфиденциальности";
-App::$strings["__ctx:permcat__ Default"] = "По умолчанию";
+App::$strings["Item is not editable"] = "Элемент нельзя редактировать";
+App::$strings["Edit post"] = "Редактировать сообщение";
+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 introductions"] = "%d новых представлений";
+App::$strings["Delegated Channel"] = "Делегированный канал";
+App::$strings["Item sync completed!"] = "Синхронизация объектов завершена!";
+App::$strings["Item sync completed but no items were found!"] = "Синхронизация объектов завершена, но объекты не найдены!";
+App::$strings["File sync completed!"] = "Синхронизация файлов завершена!";
+App::$strings["File sync completed but no files were found!"] = "Синхронизация файлов завершена, но файлы не найдены! ";
+App::$strings["Channel clone status"] = "Статус клонирования канала";
+App::$strings["Item sync status"] = "Статус синхронизации объектов";
+App::$strings["File sync status"] = "Статус синхронизации файлов";
+App::$strings["Channel cloning completed!"] = "Клонирование канала завершено!";
+App::$strings["Resume"] = "Возобновить";
+App::$strings["Only resume if sync stalled!"] = "Возобновлять только в том случае, если синхронизация остановилась! ";
+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 8.0 or greater is required."] = "Требуется PHP версии 8.0 или выше.";
+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["(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["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::$strings["Set your current mood and tell your friends"] = "Установить текущее настроение и рассказать друзьям";
+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["Name and Secret are required"] = "Требуются имя и код";
+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["Layout not found"] = "Макет на найден";
+App::$strings["This template does not support pdledi_gui (no content regions defined)"] = "Этот шаблон не поддерживает pdledi_gui (не определены области содержимого)";
+App::$strings["Main page content"] = "Содержимое основной страницы";
+App::$strings["The main page content can not be edited!"] = "Содержимое основной страницы не может быть отредактировано!";
+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["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["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in privacy groups and visitors may login using these credentials to access private content."] = "Используйте эту форму, чтобы создать временные идентификаторы доступа, чтобы делиться публикациями с незарегистрированными участниками. Эти идентификационные данные могут использоваться в группах конфиденциальности, и посетители могут входить в систему, используя их, для доступа к частному содержимому.";
+App::$strings["Please select a role for this guest!"] = "Пожалуйста, выберите роль для этого гостя!";
+App::$strings["Select a role for this guest"] = "Выбрать роль для этого гостя";
+App::$strings["Guest Access"] = "Гостевой доступ";
+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["This channel will be permanently removed. "] = "Этот канал будет удален навсегда. ";
+App::$strings["This action can not be undone!"] = "Это действие не может быть отменено!";
+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["Type"] = "Тип";
+App::$strings["parent"] = "источник";
+App::$strings["Select All"] = "Выбрать всё";
+App::$strings["Bulk Actions"] = "Групповая обработка";
+App::$strings["Adjust Permissions"] = "Настроить разрешения";
+App::$strings["Move or Copy"] = "Переместить или копировать";
+App::$strings["Download"] = "Загрузить";
+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["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["Restricted message"] = "Сообщение с ограниченным доступом";
+App::$strings["Direct message"] = "Прямое сообщение";
+App::$strings["Public Policy"] = "Политика общего доступа";
+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 Features"] = "Возможности бесед";
+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["Forum"] = "Форум";
+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["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["Articles"] = "Статьи";
+App::$strings["Cards"] = "Карточки";
+App::$strings["Site Admin"] = "Администратор сайта";
+App::$strings["Report Bug"] = "Сообщить об ошибке";
+App::$strings["Chatrooms"] = "Чаты";
+App::$strings["Content Filter"] = "Фильтр содержимого";
+App::$strings["Content Import"] = "Импорт содержимого";
+App::$strings["Remote Diagnostics"] = "Удалённая диагностика";
+App::$strings["Suggest Channels"] = "Предлагаемые каналы";
+App::$strings["Channel Manager"] = "Менеджер каналов";
+App::$strings["Stream"] = "Поток";
+App::$strings["Wiki"] = "";
+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["Notifications"] = "Оповещения";
+App::$strings["Order Apps"] = "Порядок приложений";
+App::$strings["CardDAV"] = "";
+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 privacy group with this name was revived. Existing item permissions <strong>may</strong> apply to this privacy group and any future members. If this is not what you intended, please create another privacy group with a different name."] = "Удаленная группа конфиденциальности с таким названием восстановлена. Существующие разрешения элемента <strong>могут</strong> применяться к этой группе конфиденциальности и любым будущим участникам. Если это не то, что вы хотели, создайте другую группу конфиденциальности с другим именем.";
+App::$strings["Select a privacy group"] = "Выбрать группу конфиденциальности";
 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.";
@@ -3327,7 +1921,6 @@ 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 прокомментировал запись / беседу, на которую вы подписаны";
 App::$strings["Please visit %s to view and/or reply to the conversation."] = "Пожалуйста, посетите %s для просмотра и / или ответа в беседе.";
 App::$strings["Please visit %s to approve or reject this comment."] = "Пожалуйста посетитет %s для одобрения и отклонения комментария.";
-App::$strings["%1\$s liked [zrl=%2\$s]your %3\$s[/zrl]"] = "%1\$s понравился [zrl=%2\$s]ваш %3\$s[/zrl]";
 App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = "[\$Projectname:Notify] Беседа получила отметку \"нравится\" #%1\$d от %2\$s";
 App::$strings["%1\$s liked an item/conversation you created"] = "%1\$s понравился созданный вами объект / беседа";
 App::$strings["[\$Projectname:Notify] %s posted to your profile wall"] = "[\$Projectname:Notify] %s сделал публикацию на стене вашего профиля";
@@ -3359,6 +1952,8 @@ 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["liked %s's post"] = "понравилась публикация %s";
+App::$strings["disliked %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";
@@ -3368,114 +1963,20 @@ App::$strings["g A l F d"] = "g A l F d";
 App::$strings["[today]"] = "[сегодня]";
 App::$strings["created an event"] = "создано событие";
 App::$strings["status verified"] = "статус подтверждён";
-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["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["Affinity Tool"] = "Степень сходства";
-App::$strings["Site Admin"] = "Администратор сайта";
-App::$strings["Content Filter"] = "Фильтр содержимого";
-App::$strings["Remote Diagnostics"] = "Удалённая диагностика";
-App::$strings["Suggest Channels"] = "Предлагаемые каналы";
-App::$strings["Channel Manager"] = "Менеджер каналов";
-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["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["Wiki resource_id required for git commit"] = "Требуется resource_id Wiki для отправки в Git";
-App::$strings["Directory Options"] = "Параметры каталога";
-App::$strings["Safe Mode"] = "Безопасный режим";
-App::$strings["Public Forums Only"] = "Только публичные форумы";
-App::$strings["This Website Only"] = "Только этот веб-сайт";
-App::$strings["Unable to verify channel signature"] = "Невозможно проверить подпись канала";
-App::$strings["Restricted message"] = "Сообщение с ограниченным доступом";
-App::$strings["Public Policy"] = "Политика общего доступа";
-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["Forum"] = "Форум";
-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["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"] = "Социальная - В основном общественный";
@@ -3512,38 +2013,1559 @@ App::$strings["Can like/dislike profiles and profile things"] = "Может ко
 App::$strings["Can chat with me"] = "Может общаться со мной в чате";
 App::$strings["Can source/mirror 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["Email or nickname"] = "Электронная почта или псевдоним";
-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["Add new group"] = "Добавить новую группу";
+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["Everything"] = "Всё";
+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["add"] = "добавить";
+App::$strings["Public and restricted messages"] = "Общедоступные и частные публикации";
+App::$strings["Direct messages"] = "Сообщения";
+App::$strings["Starred messages"] = "Отмеченные публикации";
+App::$strings["No messages"] = "Сообщений нет";
+App::$strings["Read mode"] = "Читать дальше";
+App::$strings["Edit mode"] = "Режим редактирования";
+App::$strings["Editing"] = "Редактируем";
+App::$strings["Saving"] = "Сохраняем";
+App::$strings["Saved"] = "Сохранено";
+App::$strings["Add new guest"] = "Добавить нового гостя";
+App::$strings["Add new role"] = "Добавить новую роль";
+App::$strings["Role members"] = "Обладатели роли";
+App::$strings["Rating Tools"] = "Инструменты оценки";
+App::$strings["Rate Me"] = "Оценить меня";
+App::$strings["View Ratings"] = "Просмотр оценок";
+App::$strings["Tags"] = "Теги";
+App::$strings["__ctx:widget__ Activity"] = "Активность";
+App::$strings["App Categories"] = "Категории приложений";
+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["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["Privacy 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["Full Name:"] = "Полное имя:";
+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["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["Manage privacy groups"] = "Управлять группами конфиденциальности";
+App::$strings["Channels not in any privacy group"] = "Каналы не включены ни в одну группу конфиденциальности";
+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["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, #tag, ?doc, content"] = "@имя, #тег, ?документ, содержимое";
+App::$strings["Please wait..."] = "Подождите пожалуйста ...";
+App::$strings["Channel Apps"] = "Приложения канала";
+App::$strings["System Apps"] = "Системные приложения";
+App::$strings["Pinned Apps"] = "Прикреплённые приложения";
+App::$strings["Featured Apps"] = "Популярные приложения";
+App::$strings["Status Messages and Posts"] = "Статусы и публикации";
+App::$strings["Profile Details"] = "Информация о профиле";
+App::$strings["Files and Storage"] = "Файлы и хранилище";
+App::$strings["Saved Bookmarks"] = "Сохранённые закладки";
+App::$strings["View Webpages"] = "Просмотр веб-страниц";
+App::$strings["Wikis"] = "";
+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["Private Message"] = "Личное сообщение";
+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["Embed an image from your albums"] = "Встроить изображение из ваших альбомов";
+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["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["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["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["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["Flag Adult Photos"] = "Пометка фотографий для взрослых";
+App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Предоставьте возможность редактирования фотографий, чтобы скрыть неприемлемые фотографии из альбома по умолчанию";
+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["Select a profile to assign to this contact"] = "Выберите профиль для этого контакта";
+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: %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["url: "] = "";
+App::$strings["error_code: "] = "";
+App::$strings["error_string: "] = "";
+App::$strings["content-type: "] = "";
+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["Different viewers will see this text differently"] = "Различные зрители увидят этот текст по-разному";
+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["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["__ctx:noun__ %d Vote"] = array(
+	0 => "",
+);
+App::$strings["__ctx:noun__ %d Vote in total"] = array(
+	0 => "",
+);
+App::$strings["Poll has ended"] = "Опрос завершён";
+App::$strings["Poll ends in %s"] = "Опрос заканчивается %s";
+App::$strings["Link to Source"] = "Ссылка на источник";
+App::$strings["Page layout"] = "Шаблон страницы";
+App::$strings["You can create your own with the layouts tool"] = "Вы можете создать свой собственный с помощью инструмента шаблонов";
+App::$strings["BBcode"] = "";
+App::$strings["HTML"] = "";
+App::$strings["Markdown"] = "Разметка Markdown";
+App::$strings["Text"] = "Текст";
+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 rem"] = "Установить максимальную ширину содержимого в rem";
+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["Saves a copy of images from external sites locally to increase your anonymity in the web."] = "Сохраняет копии изображений с внешних сайтов локально, чтобы повысить вашу анонимность в Интернете.";
+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 retrieve email address from remote identity provider"] = "Не удалось получить адрес электронной почты от удаленного удостоверяющего центра.";
+App::$strings["Unable to login using email address "] = "Невозможно войти, используя адрес электронной почты ";
+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["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["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["Invalid channel"] = "Недействительный канал";
+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["Profile Unavailable."] = "Профиль недоступен.";
+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["Source"] = "Источник";
+App::$strings["Wordpress Settings saved."] = "Настройки WordPress сохранены.";
+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["Federate posts by default"] = "Разрешить федерацию публикаций по умолчанию";
+App::$strings["No Federation"] = "Отключить Federation";
+App::$strings["Federate"] = "Федерировать";
+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["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["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["Allow magic authentication only to websites of your immediate connections"] = "Разрешить волшебную аутентификацию только на сайтах ваших непосредственных соединений";
+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["ERROR: word length is not correct!"] = "ОШИБКА: неверная длина слова!";
+App::$strings["Fediwordle App"] = "Приложение Fediwordle";
+App::$strings["A distributed word game inspired by wordle."] = "Распределенная игра в слова, вдохновленная wordle.";
+App::$strings["To start a game, enter [wordle]your_word[/wordle] somewhere in a toplevel post."] = "Чтобы начать игру, введите [wordle]ваше_слово[/wordle] где-нибудь на вверху заметки.";
+App::$strings["Your contacts can post their guess in the comments."] = "Ваши контакты могут оставлять свои предположения в комментариях.";
+App::$strings["Your channel will evaluate the guess and automatically post the response."] = "Ваш канал оценит догадку и автоматически опубликует ответ.";
+App::$strings["Correct letters"] = "Верные буквы";
+App::$strings["Letters contained in the word but at the wrong spot"] = "Буквы, содержащиеся в слове, но не в том месте";
+App::$strings["Letters not contained in the word"] = "Буквы, не входящие в слово";
+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["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["Add Article"] = "Добавить статью";
+App::$strings["Edit Article"] = "Редактировать статью";
+App::$strings["View Articles"] = "Просмотр статей";
+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["View Cards"] = "Просмотреть карточки";
+App::$strings["Edit Card"] = "Редактировать карточку";
+App::$strings["Add Card"] = "Добавить карточку";
+App::$strings["NSA Bait App"] = "Приложение NSA Bait";
+App::$strings["Make yourself a political target."] = "Сделайте себя политической мишенью.";
+App::$strings["Some setting"] = "Некоторые настройки";
+App::$strings["A setting"] = "Настройка";
+App::$strings["Skeleton Settings"] = "Настройки скелета";
+App::$strings["Wiki updated successfully"] = "Wiki успешно обновлена";
+App::$strings["Wiki files deleted successfully"] = "Wiki успешно удалена";
+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["Wiki resource_id required for git commit"] = "Требуется resource_id Wiki для отправки в Git";
+App::$strings["__ctx:wiki_history__ Message"] = "Сообщение";
+App::$strings["Date"] = "Дата";
+App::$strings["Revert"] = "Отменить";
+App::$strings["Compare"] = "Сравнить";
+App::$strings["Add new page"] = "Добавить новую страницу";
+App::$strings["Wiki Pages"] = "Wiki страницы";
+App::$strings["Page name"] = "Название страницы";
+App::$strings["Error retrieving wiki"] = "Ошибка при получении Wiki";
+App::$strings["Error creating zip file export folder"] = "Ошибка при создании zip-файла при экспорте каталога";
+App::$strings["Error downloading wiki: "] = "Ошибка загрузки Wiki:";
+App::$strings["Wiki name"] = "Название Wiki";
+App::$strings["Content 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["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["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["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["Import completed."] = "Импорт завершен.";
+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 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["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["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["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 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 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["Rainbow Tag App"] = "Приложение \"Радуга тегов\"";
+App::$strings["Add some colour to tag clouds"] = "Добавить немного цвета для облака тегов";
+App::$strings["Rainbow Tag"] = "Радуга тегов";
+App::$strings["Post to Libertree"] = "Опубликовать в Libertree";
+App::$strings["Libertree Crosspost Connector Settings saved."] = "Настройки пересылки публикаций 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 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["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 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["Create New Workflow Item"] = "Создать новый элемент рабочего процесса";
+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["Send ZID"] = "Отправить ZID";
+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 ebbc1aaa3..3b2370b7f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -845,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: $radius;
-	margin-right: 10px;
+	margin-right: .75rem;
 }
 
 .tag1 {
diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css
index 90fd51b02..1b09137a9 100644
--- a/view/theme/redbasic/schema/Focus-Boxy.css
+++ b/view/theme/redbasic/schema/Focus-Boxy.css
@@ -1,11 +1,16 @@
 .comment .wall-item-body {
-	padding-left: 42px;
+	padding-left: 3rem;
 }
 
-.wall-item-content-wrapper.comment {
+.wall-item-content-wrapper {
 	border-bottom: 1px solid rgba(0,0,0,.125);
 }
 
+.hide-comments-outer,
+.hide-comments-outer:hover {
+	border: 0;
+}
+
 .widget {
 	border: 1px solid rgba(0,0,0,.125);
 }
diff --git a/view/tpl/cards.tpl b/view/tpl/cards.tpl
deleted file mode 100644
index 60e6163ae..000000000
--- a/view/tpl/cards.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="live-cards"></div>
-{{$editor}}
-{{$content}}
-{{$pager}}
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
deleted file mode 100644
index 640678ae8..000000000
--- a/view/tpl/wiki.tpl
+++ /dev/null
@@ -1,475 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div class="float-end">
-			<span class="text-muted wiki-typename">[{{$typename}}]&nbsp;</span>
-			{{if $showPageControls}}
-			<div id="page-tools" class="btn-group" style="display: none;">
-				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown">
-					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-				</button>
-				<div class="dropdown-menu dropdown-menu-end">
-					{{if $renamePage}}
-					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
-					{{/if}}
-					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
-				</div>
-			</div>
-			{{/if}}
-			<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button>
-			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
-		</div>
-		<h2>
-			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
-			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
-		</h2>
-		<div class="clear"></div>
-	</div>
-	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-		<form id="rename-page-form" action="wiki/rename/page" method="post" >
-			{{include file="field_input.tpl" field=$pageRename}}
-			<div class="mb-3">
-				<div class="float-end">
-					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
-				</div>
-				<div>
-					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
-				</div>
-				<div class="clear"></div>
-			</div>
-		</form>
-	</div>
-	<div id="wiki-content-container" class="section-content-wrapper">
-		<ul class="nav nav-tabs" id="wiki-nav-tabs">
-			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-bs-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
-			<li class="nav-item"><a class="nav-link active" data-bs-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li>
-			<li class="nav-item"><a class="nav-link" data-bs-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li>
-		</ul>
-		<div class="tab-content" id="wiki-page-tabs">
-			<div id="edit-pane" class="tab-pane">
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				<div id="ace-editor"></div>
-				{{else}}
-				<div id="editor-wrapper">
-					<textarea id="editor">{{$content}}</textarea>
-				</div>
-				{{/if}}
-			</div>
-			<div id="preview-pane" class="tab-pane active">
-				<div id="wiki-preview">
-					{{$renderedContent}}
-				</div>
-			</div>
-			<div id="page-history-pane" class="tab-pane">
-				<div id="page-history-list"></div>
-			</div>
-			{{if $showPageControls}}
-			<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
-				<div class="input-group">
-					<input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-					<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
-				</div>
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
-
-{{$wikiModal}}
-
-<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
-			</div>
-			<div class="modal-body" id="embedPhotoModalBody" >
-				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-					<div id="embedPhotoModalBodyAlbumList"></div>
-				</div>
-				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<script>
-	window.wiki_resource_id = '{{$resource_id}}';
-	window.wiki_page_name = '{{$page|escape:'javascript'}}';
-	window.wiki_page_content = '{{$content|escape:'javascript'}}';
-	window.wiki_page_commit = '{{$commit}}';
-	window.saved = true;
-
-	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
-
-	$('.rename-page').click(function (ev) {
-		$('#rename-page-form-wrapper').toggle();
-		ev.preventDefault();
-	});
-
-	$( "#rename-page-form" ).submit(function( event ) {
-		$.post("wiki/{{$channel_address}}/rename/page",
-		{
-			oldName: window.wiki_page_name,
-			newName: $('#id_pageRename').val(),
-			resource_id: window.wiki_resource_id
-		},
-		function (data) {
-			if (data.success) {
-				$('#rename-page-form-wrapper').hide();
-				window.console.log('data: ' + JSON.stringify(data));
-				window.wiki_page_name = data.name.htmlName;
-				$('#wiki-header-page').html(data.name.htmlName);
-				wiki_refresh_page_list();
-			} else {
-				window.console.log('Error renaming page.');
-			}
-		}, 'json');
-		event.preventDefault();
-	});
-
-	{{if !$mimeType || $mimeType == 'text/markdown'}}
-	var editor = ace.edit("ace-editor");
-	editor.setOptions({
-		theme: "ace/theme/github",
-		mode: "ace/mode/markdown",
-
-		maxLines: Infinity,
-		minLines: 30,
-
-		wrap: true,
-
-		printMargin: false
-	});
-
-	editor.getSession().setValue(window.wiki_page_content);
-	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
-	{{else}}
-	window.editor = editor = $('#editor');
-	{{/if}}
-
-	{{if !$showPageControls}}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
-		{{else}}
-		editor.prop('readonly', true);
-		{{/if}}
-	{{/if}}
-
-	$('#edit-pane-tab').click(function (ev) {
-		setTimeout(function() {
-			window.editor.focus();
-			if($('main').hasClass('fullscreen')) {
-				adjustFullscreenEditorHeight();
-			}
-			else {
-				adjustInlineEditorHeight();
-			}
-		}, 500); // Return the focus to the editor allowing immediate text entry
-		$('#page-tools, #id_{{$commitMsg.0}}_wrapper').show();
-	});
-
-	$('#wiki-get-preview').click(function (ev) {
-		if(window.saved) {
-			$('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
-		}
-		else {
-			$('#page-tools').hide();
-		}
-		$.post("wiki/{{$channel_address}}/preview", {
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			content: editor.getValue(),
-			{{else}}
-			content: editor.val(),
-			{{/if}}
-			resource_id: window.wiki_resource_id,
-			mimetype: '{{$mimeType}}'
-		},
-		function (data) {
-			if (data.success) {
-				$('#wiki-preview').html(data.html);
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-				{{/if}}
-			} else {
-				window.console.log('Error previewing page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	$('#wiki-get-history').click(function (ev) {
-		if(window.saved) {
-			$('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
-		}
-		else {
-			$('#page-tools').hide();
-		}
-		$.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#page-history-list').html(data.historyHTML);
-			} else {
-				window.console.log('Error getting page history.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_refresh_page_list() {
-		if (window.wiki_resource_id === '') {
-			return false;
-		}
-		$.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) {
-			if (data.success) {
-				$('#wiki_page_list').html(data.pages);
-			} else {
-				alert('Error fetching page list!');
-				window.console.log('Error fetching page list!');
-			}
-		}, 'json');
-		return false;
-	}
-
-	$('#save-page').click(function (ev) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to edit pages.');
-			ev.preventDefault();
-			return false;
-		}
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		var currentContent = editor.getValue();
-		{{else}}
-		var currentContent = editor.val();
-		{{/if}}
-
-		if (window.wiki_page_content === currentContent) {
-			$('#save-page').addClass('disabled');  // Disable the save button
-			window.console.log('No edits to save.');
-			ev.preventDefault();
-			return false;
-		}
-		$.post("wiki/{{$channel_address}}/save/page", {
-			content: currentContent,
-			commitMsg: $('#id_commitMsg').val(),
-			name: window.wiki_page_name,
-			resource_id: window.wiki_resource_id
-		},
-		function (data) {
-			if (data.success) {
-				window.saved = true;
-				window.console.log('Page saved successfully.');
-				//window.wiki_page_content = currentContent;
-				window.wiki_page_content = data.content;
-				$('#id_commitMsg').val(''); // Clear the commit message box
-				$('#save-page').addClass('disabled');  // Disable the save button
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
-				{{/if}}
-
-				window.editor.focus();  // Return focus to the editor for continued editing
-				// $('#wiki-get-history').click();
-			} else {
-				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups
-				window.console.log('Error saving page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_revert_page(commitHash) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel_address}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id},
-		function (data) {
-			if (data.success) {
-			$('button[id^=revert-]').removeClass('btn-success');
-			$('button[id^=revert-]').addClass('btn-danger');
-			$('button[id^=revert-]').html('Revert');
-			$('#revert-'+commitHash).removeClass('btn-danger');
-			$('#revert-'+commitHash).addClass('btn-success');
-			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
-			window.wiki_page_commit = commitHash;
-			// put contents in editor
-			editor.getSession().setValue(data.content);
-			} else {
-			window.console.log('Error reverting page.');
-			}
-		}, 'json');
-	}
-
-	function wiki_compare_page(compareCommit) {
-		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
-			window.console.log('You must have a wiki page open in order to revert pages.');
-			return false;
-		}
-		$.post("wiki/{{$channel_address}}/compare/page", {
-			compareCommit: compareCommit,
-			currentCommit: window.wiki_page_commit,
-			name: window.wiki_page_name,
-			resource_id: window.wiki_resource_id
-		},
-		function (data) {
-			console.log(data);
-			if (data.success) {
-				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
-				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
-				$('.modal-dialog').addClass('modal-lg');
-				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
-				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
-					wiki_revert_page(compareCommit);
-					$('#generic-modal-{{$wikiModalID}}').modal('hide');
-				});
-				$('#generic-modal-{{$wikiModalID}}').modal('show');
-			} else {
-				window.console.log('Error comparing page.');
-			}
-		}, 'json');
-	}
-
-	function adjustFullscreenEditorHeight() {
-		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: null,
-			minLines: null
-		});
-		editor.resize();
-		{{/if}}
-	}
-
-	function adjustInlineEditorHeight() {
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		editor.setOptions({
-			maxLines: Infinity,
-			minLines: 30
-		});
-		editor.resize();
-		{{else}}
-		editor.height(editor[0].scrollHeight);
-		{{/if}}
-	}
-
-	$('#embed-image').click(function (ev) {
-		initializeEmbedPhotoDialog();
-		ev.preventDefault();
-	});
-
-	var initializeEmbedPhotoDialog = function () {
-		$('.embed-photo-selected-photo').each(function (index) {
-			$(this).removeClass('embed-photo-selected-photo');
-		});
-		getPhotoAlbumList();
-		$('#embedPhotoModalBodyAlbumDialog').off('click');
-		$('#embedPhotoModal').modal('show');
-	};
-
-	var choosePhotoFromAlbum = function (album) {
-		$.post("embedphotos/album", {name: album},
-			function(data) {
-				if (data['status']) {
-					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
-					$('#embedPhotoModalBodyAlbumDialog').html('\
-							<div><ul class="nav nav-pills flex-column">\n\
-								<li class="nav-item"><a class="nav-link" href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-									<i class="fa fa-chevron-left"></i>&nbsp;\n\
-									{{$modaldiffalbum}}\n\
-									</a>\n\
-								</li>\n\
-							</ul><br></div>')
-					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-						evt.preventDefault();
-						var image = document.getElementById(evt.target.id);
-						if (typeof($(image).parent()[0]) !== 'undefined') {
-							var imageparent = document.getElementById($(image).parent()[0].id);
-							$(imageparent).toggleClass('embed-photo-selected-photo');
-							var href = $(imageparent).attr('href');
-                            $.post("embedphotos/photolink", {href: href},
-                                function(ddata) {
-                                    if (ddata['status']) {
-										{{if !$mimeType || $mimeType == 'text/markdown'}}
-										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
-										editor.getSession().insert(editor.getCursorPosition(), imgURL)
-										{{else}}
-										var currentContent = $('#editor').val();
-										$('#editor').val(currentContent + ddata['photolink']);
-										{{/if}}
-                                    } else {
-                                        window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
-                                    }
-                                    return false;
-								},
-                               'json');
-                            $('#embedPhotoModalBodyAlbumDialog').html('');
-                            $('#embedPhotoModalBodyAlbumDialog').off('click');
-                            $('#embedPhotoModal').modal('hide');
-						}
-                    });
-
-					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-				} else {
-					window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	var getPhotoAlbumList = function () {
-		$.post("embedphotos/albumlist", {},
-			function(data) {
-				if (data['status']) {
-					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-					$('#embedPhotoModalLabel').html("{{$modalchoosealbum}}");
-					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav nav-pills flex-column"></ul>');
-					for(var i = 0; i < albums.length; i++) {
-						var albumName = albums[i].text;
-						var jsAlbumName = albums[i].jstext;
-						var albumLink = '<li class="nav-item">';
-						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-						albumLink += '</li>';
-						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-					}
-					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-				} else {
-					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
-				}
-				return false;
-			},
-		'json');
-	};
-
-	$(document).ready(function () {
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-		window.editor.on("input", function() {
-			window.saved = false;
-			if(window.editor.getSession().getUndoManager().isClean()) {
-				$('#save-page').addClass('disabled');
-			} else {
-				$('#save-page').removeClass('disabled');
-			}
-		});
-		{{else}}
-		window.editor.on("input", function() {
-			window.saved = false;
-			$('#save-page').removeClass('disabled');
-		});
-		{{if $mimeType == 'text/bbcode'}}
-		window.editor.bbco_autocomplete('bbcode');
-		{{/if}}
-		{{/if}}
-	});
-
-	$(window).resize(function () {
-		if($('main').hasClass('fullscreen')) {
-			adjustFullscreenEditorHeight();
-		}
-	});
-</script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
deleted file mode 100644
index 9e5ba0f9c..000000000
--- a/view/tpl/wiki_page_history.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-<style>
-  .diff {
-    width:100%;
-    word-break: break-all;
-  }
-
-  .diff td{
-    padding:0 0.667em;
-    vertical-align:top;
-    white-space:pre;
-    white-space:pre-wrap;
-    font-family:Consolas,'Courier New',Courier,monospace;
-    font-size:1.0em;
-    line-height:1.333;
-  }
-
-  .diff span{
-    display:block;
-    min-height:1.333em;
-    margin-top:-1px;
-    padding:0 3px;
-  }
-
-  * html .diff span{
-    height:1.333em;
-  }
-
-  .diff span:first-child{
-    margin-top:0;
-  }
-
-  .diffDeleted span{
-    border:1px solid rgb(255,192,192);
-    background:rgb(255,224,224);
-  }
-
-  .diffInserted span{
-    border:1px solid rgb(192,255,192);
-    background:rgb(224,255,224);
-  }
-</style>
-<table class="table-striped table-responsive table-hover" style="width: 100%;">
-  {{foreach $pageHistory as $commit}}
-  <tr><td>
-      <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
-            <td rowspan="3" width="20%" align="right">
-		{{if $permsWrite}}
-              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-sm" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
-              <br><br>
-		{{/if}}
-              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-sm" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
-            </td></tr>
-        <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
-        <tr><td>Message</td><td>{{$commit.title}}</td></tr>
-      </table>
-    </td></tr>
-  {{/foreach}}          
-</table>
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
deleted file mode 100644
index 4f99587c2..000000000
--- a/view/tpl/wiki_page_list.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-{{if ! $refresh}}
-<div id="wiki_page_list" class="widget" >
-{{/if}}
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{if $pages}}
-		{{foreach $pages as $page}}
-		<li class="nav-item nav-item-hack" id="{{$page.link_id}}">
-			{{if $page.resource_id && $candel}}
-			<i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title|escape:'javascript'}}', '{{$page.title|escape:'javascript'}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i>
-			{{/if}}
-			<a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a>
-		</li>
-		{{/foreach}}
-		{{/if}}
-		{{if $canadd}}
-			<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
-		{{/if}}
-		{{if $canadd}}
-		<div id="new-page-form-wrapper" class="clearfix sub-menu" style="display:none;">
-			<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
-				<input type="hidden" name="resource_id" value="{{$resource_id}}">
-				{{include file="field_input.tpl" field=$pageName}}
-				{{if $typelock}}
-				<input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}">
-				{{else}}
-				<div id="wiki_page_options" style="display: none">
-					{{$mimetype}}
-				</div>
-				<div class="float-end fakelink" onClick="openClose('wiki_page_options')">
-					{{$options}}
-				</div>
-				{{/if}}
-				<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >{{$submit}}</button>
-			</form>
-		</div>
-		{{/if}}
-	</ul>
-{{if ! $refresh}}
-</div>
-{{/if}}
-
-{{if $canadd}}
-<script>
-	$('#new-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id, mimetype: $('#id_mimetype').val() },
-		function(data) {
-			if(data.success) {
-				window.location = data.url;
-			} else {
-				window.console.log('Error creating page.');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-	function wiki_delete_page(wiki_page_name, wiki_page_url, wiki_resource_id, wiki_link_id) {
-		if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) {
-			return;
-		}
-		$.post("wiki/{{$channel_address}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id},
-		function (data) {
-			if (data.success) {
-				window.console.log('Page deleted successfully.');
-				if(wiki_page_url == window.wiki_page_name) {
-					var url = window.location.href;
-					if(url.substr(-1) == '/')
-						url = url.substr(0, url.length - 2);
-					url = url.split('/');
-					url.pop();
-					window.location = url.join('/');
-				}
-				else {
-					$('#' + wiki_link_id).remove();
-				}
-			} else {
-				alert('Error deleting page.'); // TODO: Replace alerts with auto-timeout popups
-				window.console.log('Error deleting page.');
-			}
-		}, 'json');
-		return false;
-	}
-
-	function wiki_show_new_page_form() {
-		$('#new-page-form-wrapper').toggle();
-		$('#id_pageName').focus();
-		return false;
-	}
-</script>
-{{/if}}
diff --git a/view/tpl/wiki_page_not_found.tpl b/view/tpl/wiki_page_not_found.tpl
deleted file mode 100644
index 8fdee4596..000000000
--- a/view/tpl/wiki_page_not_found.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-	<h3>Page does not exist</h3>
-        <br /><br /><br />
-		{{if $canadd}}
-			<form id="new-page-form" action="/wiki/{{$channel_address}}/create/page" method="post" >
-				<input type="hidden" name="resource_id" value="{{$resource_id}}">
-				{{include file="field_input.tpl" field=$pageName}}
-				{{if $typelock}}
-				<input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}">
-				{{else}}
-				<div id="wiki_missing_page_options" style="display: none">
-					{{$mimetype}}
-				</div>
-				<div class="float-end fakelink" onClick="openClose('wiki_missing_page_options')">
-					{{$options}}
-				</div>
-				{{/if}}
-				<button id="create-missing-page-submit" class="btn btn-primary" type="submit" name="submit" >{{$submit}}</button>
-			</form>
-
-<script>
-	$('#create-missing-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_missingPageName').val(), resource_id: window.wiki_resource_id, mimetype: $('#id_mimetype').val() },
-		function(data) {
-			if(data.success) {
-				window.location = data.url;
-			} else {
-				window.console.log('Error creating page. ('+data.message+')');
-			}
-		}, 'json');
-		ev.preventDefault();
-	});
-
-</script>
-{{/if}}
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
deleted file mode 100644
index bc8461dac..000000000
--- a/view/tpl/wikilist.tpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper clearfix">
-		{{if $owner}}
-		<button type="button" class="btn btn-success btn-sm float-end acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
-		{{/if}}
-		<h2>{{$header}}</h2>
-	</div>
-	{{if $owner}}
-	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper">
-		<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-			{{include file="field_input.tpl" field=$wikiName}}
-			{{include file="field_select.tpl" field=$mimeType}}
-			{{include file="field_checkbox.tpl" field=$typelock}}
-			{{include file="field_checkbox.tpl" field=$notify}}
-			<div>
-				<div class="btn-group float-end">
-					<button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="Permission settings" onclick="return false;">
-						<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
-					</button>
-					<button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-				</div>
-			</div>
-		</form>
-		<div class="clear"></div>
-	</div>
-	{{/if}}
-	<div class="section-content-wrapper-np">
-		<table id="wikis-index">
-			<tr>
-				<th width="96%">{{$name}}</th>
-				<th width="1%">{{$type}}</th>
-				<th width="1%"></th>
-				{{if $owner}}
-				<th width="1%"></th>
-				{{/if}}
-				<th width="1%"></th>
-				{{if $owner}}
-				<th width="1%"></th>
-				{{/if}}
-			</tr>
-			{{foreach $wikis as $wiki}}
-			<tr class="wikis-index-row">
-				<td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td>
-				<td>{{if $wiki.typelock}}{{$wiki.mimeType}}{{else}}{{$unlocked}}{{/if}}</td>
-				{{if $owner}}
-				<td><i class="fa fa-pencil" onclick="openCloseTR('wikis-index-edit-{{$wiki.id}}')"></i></td>
-				{{/if}}
-				<td class="dropdown">
-					{{if $wiki.lockstate == 'lock'}}
-					<i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i>
-					<ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-end"></ul>
-					{{/if}}
-				</td>
-				<td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td>
-				{{if $owner}}
-				<td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title|escape:'javascript'}}', '{{$wiki.resource_id}}'); return false;"></i></td>
-				{{/if}}
-			</tr>
-			{{if $owner}}
-			<tr id="wikis-index-edit-{{$wiki.id}}" style="display:none">
-				<td colspan="6">
-					<form id="edit-wiki-form-{{$wiki.id}}" method="post" action="wiki/{{$channel}}/update/wiki" class="acl-form" data-form_id="edit-wiki-form-{{$wiki.id}}" data-allow_cid='{{$wiki.json_allow_cid}}' data-allow_gid='{{$wiki.json_allow_gid}}' data-deny_cid='{{$wiki.json_deny_cid}}' data-deny_gid='{{$wiki.json_deny_gid}}'>
-						<input type="hidden" name="origRawName" value="{{$wiki.title}}">
-						{{include file="field_input.tpl" field=['updateRawName', $edit_wiki_name, $wiki.title]}}
-						<div class="btn-group float-end">
-							<button class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" type="button">
-								<i class="jot-perms-icon fa fa-{{$wiki.lockstate}}"></i>
-							</button>
-							<button class="btn btn-primary btn-sm" type="submit" value="edit">Submit</button>
-						</div>						
-					</form>
-				</td>
-			</tr>
-			{{/if}}
-			{{/foreach}}
-		</table>
-	</div>
-</div>
-{{$acl}}
-<script>
-	{{if $owner}}
-	function wiki_delete_wiki(wikiHtmlName, resource_id) {
-		if(!confirm('Are you sure you want to delete the entire wiki: ' + JSON.stringify(wikiHtmlName))) {
-			return;
-		}
-		$.post("wiki/{{$channel}}/delete/wiki", {resource_id: resource_id}, function (data) {
-			if (data.success) {
-				window.console.log('Wiki deleted');
-				// Refresh list and redirect page as necessary
-				window.location = 'wiki/{{$channel}}';
-			} else {
-				alert('Error deleting wiki!');
-				window.console.log('Error deleting wiki.');
-			}
-		}, 'json');
-	}
-	{{/if}}
-	function wiki_download_wiki(resource_id) {
-			window.location = "wiki/{{$channel}}/download/wiki/" + resource_id;
-	}
-</script>
diff --git a/view/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl
deleted file mode 100644
index 9853f9850..000000000
--- a/view/tpl/wikilist_widget.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="wiki_list" class="widget">
-	<h3>{{$header}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{foreach $wikis as $wiki}}
-		<li class="nav-item"><a class="nav-link" href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a></li> 
-		{{/foreach}}
-	</ul>
-</div>