Merge pull request #2 from friendica/develop

sync with friendica
2019-01-30 13:21:28 +01:00 · 2019-01-30 13:21:28 +01:00 · 9a5f9829c1
commit 9a5f9829c1
parent 431306b026 8db9b0987e
34 changed files with 5146 additions and 4588 deletions
--- a/doc/Config.md
+++ b/doc/Config.md
@ -142,7 +142,7 @@ $a->config['register_policy'] = REGISTER_CLOSED;
 </pre></td>
                    <td><pre>
 'config' => [
-    'register_policty' => REGISTER_CLOSED,
+    'register_policy' => \Friendica\Module\Register::CLOSED,
 ],
 </pre></td>
        </tr>
@ -242,7 +242,7 @@ register_policty = REGISTER_CLOSED
 </pre></td>
        			<td><pre>
 'config' => [
-    'register_policty' => REGISTER_CLOSED,
+    'register_policy' => \Friendica\Module\Register::CLOSED,
 ],
 </pre></td>
        </tr>
--- a/mod/admin.php
+++ b/mod/admin.php
@ -936,6 +936,10 @@ function admin_page_summary(App $a)
 		$showwarning = true;
 		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
 	}
+	if (file_exists('config/local.ini.php')) {
+		$showwarning = true;
+		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->getBaseURL() . '/help/Config');
+	}

 	// Check server vitality
 	if (!admin_page_server_vital()) {
@ -1104,7 +1108,7 @@ function admin_page_site_post(App $a)
 	$banner           = (!empty($_POST['banner'])           ? trim($_POST['banner'])                             : false);
 	$shortcut_icon    = (!empty($_POST['shortcut_icon'])    ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : '');
 	$touch_icon       = (!empty($_POST['touch_icon'])       ? Strings::escapeTags(trim($_POST['touch_icon']))    : '');
-	$info             = (!empty($_POST['info'])             ? trim($_POST['info'])                               : false);
+	$additional_info  = (!empty($_POST['additional_info'])  ? trim($_POST['additional_info'])                    : '');
 	$language         = (!empty($_POST['language'])         ? Strings::escapeTags(trim($_POST['language']))      : '');
 	$theme            = (!empty($_POST['theme'])            ? Strings::escapeTags(trim($_POST['theme']))         : '');
 	$theme_mobile     = (!empty($_POST['theme_mobile'])     ? Strings::escapeTags(trim($_POST['theme_mobile']))  : '');
@ -1300,10 +1304,10 @@ function admin_page_site_post(App $a)
 		Config::set('system', 'banner', $banner);
 	}

-	if (empty($info)) {
+	if (empty($additional_info)) {
 		Config::delete('config', 'info');
 	} else {
-		Config::set('config', 'info', $info);
+		Config::set('config', 'info', $additional_info);
 	}
 	Config::set('system', 'language', $language);
 	Config::set('system', 'theme', $theme);
@ -1501,7 +1505,7 @@ function admin_page_site(App $a)
 		$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
 	}

-	$info = Config::get('config', 'info');
+	$additional_info = Config::get('config', 'info');

 	// Automatically create temporary paths
 	get_temppath();
@ -1594,7 +1598,7 @@ function admin_page_site(App $a)
 		'$banner'           => ['banner', L10n::t("Banner/Logo"), $banner, ""],
 		'$shortcut_icon'    => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system', 'shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")],
 		'$touch_icon'       => ['touch_icon', L10n::t("Touch icon"), Config::get('system', 'touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")],
-		'$info'             => ['info', L10n::t('Additional Info'), $info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
+		'$additional_info'  => ['additional_info', L10n::t('Additional Info'), $additional_info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())],
 		'$language'         => ['language', L10n::t("System language"), Config::get('system', 'language'), "", $lang_choices],
 		'$theme'            => ['theme', L10n::t("System theme"), Config::get('system', 'theme'), L10n::t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices],
 		'$theme_mobile'     => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile],
--- a/mod/babel.php
+++ b/mod/babel.php
@ -72,6 +72,21 @@ function babel_content()
 					'title' => L10n::t('BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode'),
 					'content' => visible_whitespace($bbcode4)
 				];
+
+				$item = [
+					'body' => $bbcode,
+					'tag' => '',
+				];
+
+				\Friendica\Model\Item::setHashtags($item);
+				$results[] = [
+					'title' => L10n::t('Item Body'),
+					'content' => visible_whitespace($item['body'])
+				];
+				$results[] = [
+					'title' => L10n::t('Item Tags'),
+					'content' => $item['tag']
+				];
 				break;
 			case 'markdown':
 				$markdown = trim($_REQUEST['text']);
--- a/mod/help.php
+++ b/mod/help.php
@ -84,7 +84,7 @@ function help_content(App $a)
 					$level = intval($level);
 					if ($level < $lastlevel) {
 						for ($k = $level; $k < $lastlevel; $k++) {
-							$toc .= "</ul>";
+							$toc .= "</ul></li>";
 						}

 						for ($k = $level + 1; $k < count($idnum); $k++) {
@ -93,7 +93,7 @@ function help_content(App $a)
 					}

 					if ($level > $lastlevel) {
-						$toc .= "<ul>";
+						$toc .= "<li><ul>";
 					}

 					$idnum[$level] ++;
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@ -66,7 +66,7 @@ function viewcontacts_content(App $a)
 		'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]
 	];

-	$total = DBA::count('count', $condition);
+	$total = DBA::count('contact', $condition);

 	$pager = new Pager($a->query_string);

--- a/src/App.php
+++ b/src/App.php
@ -703,7 +703,7 @@ class App
 			$this->hostname = Core\Config::get('config', 'hostname');
 		}

-		return $scheme . '://' . $this->hostname . !empty($this->getURLPath() ? '/' . $this->getURLPath() : '' );
+		return $scheme . '://' . $this->hostname . (!empty($this->getURLPath()) ? '/' . $this->getURLPath() : '' );
 	}

 	/**
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@ -1178,7 +1178,7 @@ class BBCode extends BaseObject
 		// Extracting multi-line code blocks before the whitespace processing
 		$codeblocks = [];

-		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
+		$text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#ism",
 			function ($matches) use (&$codeblocks) {
 				$return = $matches[0];
 				if (strpos($matches[2], "\n") !== false) {
@ -1743,7 +1743,7 @@ class BBCode extends BaseObject

 		// Clean up the HTML by loading and saving the HTML with the DOM.
 		// Bad structured html can break a whole page.
-		// For performance reasons do it only with ativated item cache or at export.
+		// For performance reasons do it only with activated item cache or at export.
 		if (!$try_oembed || (get_itemcachepath() != "")) {
 			$doc = new DOMDocument();
 			$doc->preserveWhiteSpace = false;
@ -1959,7 +1959,7 @@ class BBCode extends BaseObject
        $string = preg_replace('/#\[url\=([^\[\]]*)\](.*?)\[\/url\]/ism', '#$2', $string);

        // ignore anything in a code block
-        $string = preg_replace('/\[code\](.*?)\[\/code\]/sm', '', $string);
+        $string = preg_replace('/\[code.*?\].*?\[\/code\]/sm', '', $string);

        // Force line feeds at bbtags
        $string = str_replace(['[', ']'], ["\n[", "]\n"], $string);
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@ -559,10 +559,10 @@ class Item extends BaseObject

 		$fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];

-		$fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
+		$fields['author'] = ['url' => 'author-link', 'name' => 'author-name', 'addr' => 'author-addr',
 			'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];

-		$fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name',
+		$fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name', 'addr' => 'owner-addr',
 			'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network'];

 		$fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
@ -2386,7 +2386,6 @@ class Item extends BaseObject

 	public static function setHashtags(&$item)
 	{
-
 		$tags = BBCode::getTags($item["body"]);

 		// No hashtags?
@ -2394,6 +2393,17 @@ class Item extends BaseObject
 			return false;
 		}

+		// What happens in [code], stays in [code]!
+		// escape the # and the [
+		// hint: we will also get in trouble with #tags, when we want markdown in posts -> ### Headline 3
+		$item["body"] = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism",
+			function ($match) {
+				// we truly ESCape all # and [ to prevent gettin weird tags in [code] blocks
+				$find = ['#', '['];
+				$replace = [chr(27).'sharp', chr(27).'leftsquarebracket'];
+				return ("[code" . $match[1] . "]" . str_replace($find, $replace, $match[2]) . "[/code]");
+			}, $item["body"]);
+
 		// This sorting is important when there are hashtags that are part of other hashtags
 		// Otherwise there could be problems with hashtags like #test and #test2
 		rsort($tags);
@ -2430,12 +2440,11 @@ class Item extends BaseObject
 				"&num;$2", $item["body"]);

 		foreach ($tags as $tag) {
-			if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=')) {
+			if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=') || $tag[1] == '#') {
 				continue;
 			}

 			$basetag = str_replace('_',' ',substr($tag,1));
-
 			$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';

 			$item["body"] = str_replace($tag, $newtag, $item["body"]);
@ -2450,6 +2459,16 @@ class Item extends BaseObject

 		// Convert back the masked hashtags
 		$item["body"] = str_replace("&num;", "#", $item["body"]);
+
+		// Remember! What happens in [code], stays in [code]
+		// roleback the # and [
+		$item["body"] = preg_replace_callback("/\[code(.*?)\](.*?)\[\/code\]/ism",
+			function ($match) {
+				// we truly unESCape all sharp and leftsquarebracket
+				$find = [chr(27).'sharp', chr(27).'leftsquarebracket'];
+				$replace = ['#', '['];
+				return ("[code" . $match[1] . "]" . str_replace($find, $replace, $match[2]) . "[/code]");
+			}, $item["body"]);
 	}

 	public static function getGuidById($id)
--- a/src/Model/Storage/Filesystem.php
+++ b/src/Model/Storage/Filesystem.php
@ -28,7 +28,8 @@ class Filesystem implements IStorage

 	private static function getBasePath()
 	{
-		return Config::get('storage', 'filesystem_path', self::DEFAULT_BASE_FOLDER);
+		$path = Config::get('storage', 'filesystem_path', self::DEFAULT_BASE_FOLDER);
+		return rtrim($path, '/');
 	}

 	/**
@ -69,10 +70,13 @@ class Filesystem implements IStorage
 			if (!is_file($path . '/index.html')) {
 				file_put_contents($path . '/index.html', '');
 			}
+			chmod($path . '/index.html', 0660);
+			chmod($path, 0770);
 			$path = dirname($path);
 		}
 		if (!is_file($path . '/index.html')) {
 			file_put_contents($path . '/index.html', '');
+			chmod($path . '/index.html', 0660);
 		}
 	}

@ -100,6 +104,7 @@ class Filesystem implements IStorage
 			Logger::log('Failed to write data to ' . $file);
 			throw new StorageException(L10n::t('Filesystem storage failed to save data to "%s". Check your write permissions', $file));
 		}
+		chmod($file, 0660);
 		return $ref;
 	}

--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@ -768,6 +768,40 @@ class Post extends BaseObject
 		return $this->comment_box_template;
 	}

+	/**
+	 * Get default text for the comment box
+	 *
+	 * @return string
+	 */
+	private function getDefaultText()
+	{
+		$a = self::getApp();
+
+		$item = Item::selectFirst(['author-addr'], ['id' => $this->getId()]);
+		if (!DBA::isResult($item) || empty($item['author-addr'])) {
+			// Should not happen
+			return '';
+		}
+
+		if ($item['author-addr'] != $a->profile['addr']) {
+			$text = '@' . $item['author-addr'] . ' ';
+		} else {
+			$text = '';
+		}
+
+		$terms = Term::tagArrayFromItemId($this->getId(), TERM_MENTION);
+
+		foreach ($terms as $term) {
+			$profile = Contact::getDetailsByURL($term['url']);
+			if (!empty($profile['addr']) && ($profile['contact-type'] != Contact::TYPE_COMMUNITY) &&
+				($profile['addr'] != $a->profile['addr']) && !strstr($text, $profile['addr'])) {
+				$text .= '@' . $profile['addr'] . ' ';
+			}
+		}
+
+		return $text;
+	}
+
 	/**
 	 * Get the comment box
 	 *
@ -804,6 +838,8 @@ class Post extends BaseObject
 			$uid = $conv->getProfileOwner();
 			$parent_uid = $this->getDataValue('uid');

+			$default_text = $this->getDefaultText();
+
 			if (!is_null($parent_uid) && ($uid != $parent_uid)) {
 				$uid = $parent_uid;
 			}
@ -817,6 +853,7 @@ class Post extends BaseObject
 				'$id'          => $this->getId(),
 				'$parent'      => $this->getId(),
 				'$qcomment'    => $qcomment,
+				'$default'     => $default_text,
 				'$profile_uid' => $uid,
 				'$mylink'      => $a->removeBaseURL($a->contact['url']),
 				'$mytitle'     => L10n::t('This is you'),
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@ -28,6 +28,7 @@ use Friendica\Util\Map;
 use Friendica\Util\Network;

 require_once 'include/api.php';
+require_once 'mod/share.php';

 /**
 * @brief ActivityPub Transmitter Protocol class
@ -635,16 +636,29 @@ class Transmitter
 			return false;
 		}

-		$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
-		$conversation = DBA::selectFirst('conversation', ['source'], $condition);
-		if (DBA::isResult($conversation)) {
-			$data = json_decode($conversation['source']);
-			if (!empty($data)) {
-				return $data;
+		if ($item['wall']) {
+			$owner = User::getOwnerDataById($item['uid']);
+			if (($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) && ($item['author-link'] != $owner['url'])) {
+				$type = 'Announce';
+
+				// Disguise forum posts as reshares. Will later be converted to a real announce
+				$item['body'] = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+					$item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
 			}
 		}

-		$type = self::getTypeOfItem($item);
+		if (empty($type)) {
+			$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
+			if (DBA::isResult($conversation)) {
+				$data = json_decode($conversation['source']);
+				if (!empty($data)) {
+					return $data;
+				}
+			}
+
+			$type = self::getTypeOfItem($item);
+		}

 		if (!$object_mode) {
 			$data = ['@context' => ActivityPub::CONTEXT];
@ -671,7 +685,7 @@ class Transmitter
 		if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
 			$data['object'] = self::createNote($item);
 		} elseif ($data['type'] == 'Announce') {
-			$data['object'] = self::createAnnounce($item);
+			$data = self::createAnnounce($item, $data);
 		} elseif ($data['type'] == 'Undo') {
 			$data['object'] = self::createActivityFromItem($item_id, true);
 		} else {
@ -1045,11 +1059,13 @@ class Transmitter
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function createAnnounce($item)
+	private static function createAnnounce($item, $data)
 	{
 		$announce = api_share_as_retweet($item);
 		if (empty($announce['plink'])) {
-			return self::createNote($item);
+			$data['type'] = 'Create';
+			$data['object'] = self::createNote($item);
+			return $data;
 		}

 		// Fetch the original id of the object
@ -1058,11 +1074,14 @@ class Transmitter
 			$ldactivity = JsonLD::compact($activity);
 			$id = JsonLD::fetchElement($ldactivity, '@id');
 			if (!empty($id)) {
-				return $id;
+				$data['object'] = $id;
+				return $data;
 			}
 		}

-		return self::createNote($item);
+		$data['type'] = 'Create';
+		$data['object'] = self::createNote($item);
+		return $data;
 	}

 	/**
--- a/src/Util/Logger/FriendicaIntrospectionProcessor.php
+++ b/src/Util/Logger/FriendicaIntrospectionProcessor.php
@ -11,28 +11,28 @@ use Monolog\Processor\ProcessorInterface;
 * Based on the class IntrospectionProcessor without the "class" information
 * @see IntrospectionProcessor
 */
-class FriendicaProcessor implements ProcessorInterface
+class FriendicaIntrospectionProcessor implements ProcessorInterface
 {
 	private $level;

 	private $skipStackFramesCount;

+	private $skipClassesPartials;
+
 	private $skipFunctions = [
 		'call_user_func',
 		'call_user_func_array',
 	];

-	private $skipFiles = [
-		'Logger.php'
-	];
-
 	/**
 	 * @param string|int $level The minimum logging level at which this Processor will be triggered
+	 * @param array $skipClassesPartials An array of classes to skip during logging
 	 * @param int $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
 	 */
-	public function __construct($level = Logger::DEBUG, $skipStackFramesCount = 0)
+	public function __construct($level = Logger::DEBUG, $skipClassesPartials = array(), $skipStackFramesCount = 0)
 	{
 		$this->level = Logger::toMonologLevel($level);
+		$this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials);
 		$this->skipStackFramesCount = $skipStackFramesCount;
 	}

@ -47,13 +47,12 @@ class FriendicaProcessor implements ProcessorInterface

 		$i = 1;

-		// Skip everything that we shouldn't display
-		while (in_array($trace[$i]['function'], $this->skipFunctions) ||
-			!isset($trace[$i - 1]['file']) ||
-			in_array(basename($trace[$i - 1]['file']), $this->skipFiles)) {
+		while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
 			$i++;
 		}

+		$i += $this->skipStackFramesCount;
+
 		// we should have the call source now
 		$record['extra'] = array_merge(
 			$record['extra'],
@ -66,4 +65,30 @@ class FriendicaProcessor implements ProcessorInterface

 		return $record;
 	}
+
+	/**
+	 * Checks if the current trace class or function has to be skipped
+	 *
+	 * @param array $trace The current trace array
+	 * @param int   $index The index of the current hierarchy level
+	 * @return bool True if the class or function should get skipped, otherwise false
+	 */
+	private function isTraceClassOrSkippedFunction(array $trace, $index)
+	{
+		if (!isset($trace[$index])) {
+			return false;
+		}
+
+		if (isset($trace[$index]['class'])) {
+			foreach ($this->skipClassesPartials as $part) {
+				if (strpos($trace[$index]['class'], $part) !== false) {
+					return true;
+				}
+			}
+		} elseif (in_array($trace[$index]['function'], $this->skipFunctions)) {
+			return true;
+		}
+
+		return false;
+	}
 }
--- a/src/Util/LoggerFactory.php
+++ b/src/Util/LoggerFactory.php
@ -4,7 +4,7 @@ namespace Friendica\Util;

 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Logger\FriendicaDevelopHandler;
-use Friendica\Util\Logger\FriendicaProcessor;
+use Friendica\Util\Logger\FriendicaIntrospectionProcessor;
 use Monolog;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@ -28,7 +28,8 @@ class LoggerFactory
 		$logger = new Monolog\Logger($channel);
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
-		$logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, 1));
+		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));

 		return $logger;
 	}
@ -51,7 +52,8 @@ class LoggerFactory
 		$logger = new Monolog\Logger($channel);
 		$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 		$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
-		$logger->pushProcessor(new FriendicaProcessor(LogLevel::DEBUG, 1));
+		$logger->pushProcessor(new Monolog\Processor\UidProcessor());
+		$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));


 		$logger->pushHandler(new FriendicaDevelopHandler($developerIp));
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@ -603,15 +603,20 @@ class Notifier
 			return false;
 		}

+		return self::isForum($item['contact-id']);
+	}
+
+	private static function isForum($contactid)
+	{
 		$fields = ['forum', 'prv'];
-		$condition = ['id' => $item['contact-id']];
+		$condition = ['id' => $contactid];
 		$contact = DBA::selectFirst('contact', $fields, $condition);
 		if (!DBA::isResult($contact)) {
 			// Should never happen
 			return false;
 		}

-		// Is the post from a forum?
+		// Is it a forum?
 		return ($contact['forum'] || $contact['prv']);
 	}
 }
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@ -92,7 +92,7 @@ $a->strings["upload photo"] = "nahrát fotku";
 $a->strings["Attach file"] = "Přiložit soubor";
 $a->strings["attach file"] = "přiložit soubor";
 $a->strings["Bold"] = "Tučné";
-$a->strings["Italic"] = "Kurzíva";
+$a->strings["Italic"] = "Kurziva";
 $a->strings["Underline"] = "Podtržené";
 $a->strings["Quote"] = "Citace";
 $a->strings["Code"] = "Kód";
@ -149,18 +149,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s Vám posl
 $a->strings["a private message"] = "soukromou zprávu";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s Vám poslal %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s Vás označil/a na [url=%2\$s]%3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]%3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s Vás označil/a na  [url=%2\$s]%3\$s uživatele %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]%4\$s od %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$sVás označil/a na [url=%2\$s]Vašem %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]Váš/Vaši %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s Vás označil/a na [url=%2\$s]jeho/její %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]svůj %3\$s[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Oznámení] %s Vás označil/a";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s Vás označil/a na %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Oznámení] Komentář ke konverzaci #%1\$d od %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s okomentoval/a Vámi sledovanou položku/konverzaci.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Oznámení] %s přidal/a příspěvek na Vaši profilovou zeď";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s přidal/a příspěvek na Vaši profilovou zeď na %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s přidal/a příspěvek na [url=%2\$s]Vaši zeď[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Oznámení] %s Vás označil/a";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s Vás označil/a na %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]Vás označil/a[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Oznámení] %s sdílel/a nový příspěvek";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s sdílel/a nový příspěvek na %2\$s";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]sdílel/a příspěvek[/url].";
@ -359,6 +363,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Nekontrolovat";
 $a->strings["check the stable version"] = "kontrolovat stabilní verzi";
 $a->strings["check the development version"] = "kontrolovat vývojovou verzi";
+$a->strings["None"] = "Žádné";
 $a->strings["Republish users to directory"] = "Znovu publikovat uživatele do adresáře";
 $a->strings["Registration"] = "Registrace";
 $a->strings["File upload"] = "Nahrání souborů";
@ -394,6 +399,8 @@ $a->strings["Hide help entry from navigation menu"] = "Skrýt nápovědu z navig
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Skryje z navigačního menu položku pro stránky nápovědy. Nápovědu můžete stále zobrazit přímo zadáním /help.";
 $a->strings["Single user instance"] = "Jednouživatelská instance";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Nastavit tuto instanci víceuživatelskou nebo jednouživatelskou pro pojmenovaného uživatele";
+$a->strings["File storage backend"] = "Backend souborového úložiště";
+$a->strings["Backend used to store uploaded files data"] = "Backend použitý pro ukládání nahraných souborů";
 $a->strings["Maximum image size"] = "Maximální velikost obrázků";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximální velikost nahraných obrázků v bajtech. Výchozí hodnota je 0, což znamená bez omezení.";
 $a->strings["Maximum image length"] = "Maximální velikost obrázků";
@ -426,7 +433,7 @@ $a->strings["Global directory URL"] = "Adresa URL globálního adresáře";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "Adresa URL globálního adresáře. Pokud toto není nastaveno, globální adresář bude aplikaci naprosto nedostupný.";
 $a->strings["Private posts by default for new users"] = "Nastavit pro nové uživatele příspěvky jako soukromé";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Nastavit výchozí práva pro příspěvky od všech nových členů na výchozí soukromou skupinu místo veřejné.";
-$a->strings["Don't include post content in email notifications"] = "Nezahrnovat v e-mailových upozorněních obsah příspěvků";
+$a->strings["Don't include post content in email notifications"] = "Nezahrnovat v e-mailových oznámeních obsah příspěvků";
 $a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = " V e-mailových oznámeních, které jsou odesílány z tohoto webu, nebudou z důvodů bezpečnosti obsaženy příspěvky/komentáře/soukromé zprávy apod. ";
 $a->strings["Disallow public access to addons listed in the apps menu."] = "Zakázat veřejný přístup k rozšířením uvedeným v menu aplikace.";
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Označení této volby omezí rozšíření uvedená v menu aplikace pouze pro členy.";
@ -645,8 +652,6 @@ $a->strings["No"] = "Ne";
 $a->strings["You must be logged in to use addons. "] = "Pro použití doplňků musíte být přihlášen/a.";
 $a->strings["Applications"] = "Aplikace";
 $a->strings["No installed applications."] = "Žádné nainstalované aplikace.";
-$a->strings["Item not available."] = "Položka není k dispozici.";
-$a->strings["Item was not found."] = "Položka nebyla nalezena.";
 $a->strings["Source input"] = "Zdrojový vstup";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (hrubé HTML)";
@ -1342,7 +1347,7 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "povoleno";
 $a->strings["disabled"] = "zakázáno";
 $a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s";
-$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
+$a->strings["GNU Social (OStatus)"] = "GNU social (OStatus)";
 $a->strings["Email access is disabled on this site."] = "Přístup k e-mailu je na tomto serveru zakázán.";
 $a->strings["General Social Media Settings"] = "Obecná nastavení sociálních sítí";
 $a->strings["Disable Content Warning"] = "Vypnout varování o obsahu";
@ -1361,7 +1366,6 @@ $a->strings["Last successful email check:"] = "Poslední úspěšná kontrola e-
 $a->strings["IMAP server name:"] = "Jméno IMAP serveru:";
 $a->strings["IMAP port:"] = "IMAP port:";
 $a->strings["Security:"] = "Zabezpečení:";
-$a->strings["None"] = "Žádné";
 $a->strings["Email login name:"] = "Přihlašovací jméno k e-mailu:";
 $a->strings["Email password:"] = "Heslo k e-mailu:";
 $a->strings["Reply-to address:"] = "Odpovědět na adresu:";
@ -1644,7 +1648,7 @@ $a->strings["Display membership date in profile"] = "Zobrazit v profilu datum p
 $a->strings["Forums"] = "Fóra";
 $a->strings["External link to forum"] = "Externí odkaz na fórum";
 $a->strings["Nothing new here"] = "Zde není nic nového";
-$a->strings["Clear notifications"] = "Smazat notifikace";
+$a->strings["Clear notifications"] = "Vymazat oznámení";
 $a->strings["@name, !forum, #tags, content"] = "@jméno, !fórum, #štítky, obsah";
 $a->strings["Logout"] = "Odhlásit se";
 $a->strings["End this session"] = "Konec této relace";
@ -1679,8 +1683,8 @@ $a->strings["Network Reset"] = "Reset sítě";
 $a->strings["Load Network page with no filters"] = "Načíst stránku Síť bez filtrů";
 $a->strings["Introductions"] = "Představení";
 $a->strings["Friend Requests"] = "Požadavky o přátelství";
-$a->strings["See all notifications"] = "Zobrazit všechny upozornění";
-$a->strings["Mark all system notifications seen"] = "Označit všechny upozornění systému jako přečtené";
+$a->strings["See all notifications"] = "Zobrazit všechna oznámení";
+$a->strings["Mark all system notifications seen"] = "Označit všechna systémová oznámení jako přečtené";
 $a->strings["Private mail"] = "Soukromá pošta";
 $a->strings["Inbox"] = "Doručená pošta";
 $a->strings["Outbox"] = "Odeslaná pošta";
@ -1927,7 +1931,7 @@ $a->strings["No browser URL could be matched to this address."] = "Této adrese
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem.";
 $a->strings["Use mailto: in front of address to force email check."] = "Použite mailo: před adresou k vynucení emailové kontroly.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímá/osobní sdělení.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímá/osobní oznámení.";
 $a->strings["Unable to retrieve contact information."] = "Nepodařilo se získat kontaktní informace.";
 $a->strings["Starts:"] = "Začíná:";
 $a->strings["Finishes:"] = "Končí:";
@ -2002,6 +2006,13 @@ $a->strings["Profile Details"] = "Detaily profilu";
 $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
 $a->strings["Tips for New Members"] = "Tipy pro nové členy";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s vítá uživatele %2\$s";
+$a->strings["Database storage failed to update %s"] = "Aktualizace %s v úložišti databáze neuspěla";
+$a->strings["Database storage failed to insert data"] = "Vklad dat do databázového úložiště neuspěl";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Vytvoření „%s“ v úložišti souborového systému neuspělo. Zkontrolujte Vaše povolení zapisovat.";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Uložení dat do „%s“ v úložišti souborového systému neuspělo. Zkontrolujte vaše povolení zapisovat";
+$a->strings["Storage base path"] = "Cesta ke kořenové složce úložiště";
+$a->strings["Folder were uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Složka, do které jsou ukládány nahrané soubory. Pro maximální bezpečnost to musí být cesta mimo složku webového serveru";
+$a->strings["Enter a valid existing folder"] = "Zadejte platnou existující složku";
 $a->strings["Login failed"] = "Přihlášení selhalo";
 $a->strings["Not enough information to authenticate"] = "Není dost informací pro autentikaci";
 $a->strings["Password can't be empty"] = "Heslo nemůže být prázdné";
@ -2045,6 +2056,7 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Registrace na %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tDěkujeme, že jste se registroval/a na %2\$s. Váš účet byl vytvořen.\n\t\t";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tZde jsou Vaše přihlašovací detaily:\n\n\t\t\tAdresa stránky:\t\t%3\$s\n\t\t\tPřihlašovací jméno:\t%1\$s\n\t\t\tHeslo:\t\t\t%5\$s\n\n\t\t\tSvé heslo si po přihlášení můžete změnit na stránce „Nastavení“ vašeho\n\t\t\túčtu.\n\n\t\t\tProsím, prohlédněte si na chvilku ostatní nastavení účtu na této stránce.\n\n\t\t\tMožná byste si také přál/a přidat pár základních informací na svůj výchozí\n\t\t\tprofil (na stránce „Profily“) aby vás další lidé mohli snadno najít.\n\t\t\tDoporučujeme nastavit si Vaše celé jméno, přidat profilovou fotku,\n\t\t\tpřidat pár „klíčových slov“ k profilu (velmi užitečné při získávání nových\n\t\t\tpřátel) - a možná v jaké zemi žijete; pokud nechcete být konkrétnější.\n\n\t\t\tZcela respektujeme Vaše právo na soukromí a žádnou z těchto položek\n\t\t\tnení potřeba vyplňovat. Pokud jste zde nový/á a nikoho zde neznáte, mohou vám\n\t\t\tpomoci si získat nové a zajímavé přátele.\n\t\t\tPokud byste si někdy přál/a smazat účet, můžete tak učinit na stránce\n\t\t\t%3\$s/removeme.\n\n\t\t\tDěkujeme Vám a vítáme Vás na %2\$s.";
+$a->strings["Item was not found."] = "Položka nebyla nalezena.";
 $a->strings["%d contact edited."] = [
 	0 => "%d kontakt upraven",
 	1 => "%d kontakty upraveny",
@ -2098,23 +2110,23 @@ $a->strings["Currently ignored"] = "V současnosti ignorováno";
 $a->strings["Currently archived"] = "Aktuálně archivován";
 $a->strings["Awaiting connection acknowledge"] = "Čekám na potrvzení spojení";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou</strong> být stále viditelné";
-$a->strings["Notification for new posts"] = "Upozornění na nové příspěvky";
-$a->strings["Send a notification of every new post of this contact"] = "Poslat upozornění při každém novém příspěvku tohoto kontaktu";
+$a->strings["Notification for new posts"] = "Oznámení o nových příspěvcích";
+$a->strings["Send a notification of every new post of this contact"] = "Posílat oznámení o každém novém příspěvku tohoto kontaktu";
 $a->strings["Blacklisted keywords"] = "Zakázaná klíčová slova";
 $a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno „Načíst informace a klíčová slova“. Oddělujte čárkami";
 $a->strings["Actions"] = "Akce";
 $a->strings["Suggestions"] = "Návrhy";
 $a->strings["Suggest potential friends"] = "Navrhnout potenciální přátele";
 $a->strings["Show all contacts"] = "Zobrazit všechny kontakty";
-$a->strings["Unblocked"] = "Odblokován";
+$a->strings["Unblocked"] = "Neblokované";
 $a->strings["Only show unblocked contacts"] = "Zobrazit pouze neblokované kontakty";
-$a->strings["Blocked"] = "Blokován";
+$a->strings["Blocked"] = "Blokované";
 $a->strings["Only show blocked contacts"] = "Zobrazit pouze blokované kontakty";
-$a->strings["Ignored"] = "Ignorován";
+$a->strings["Ignored"] = "Ignorované";
 $a->strings["Only show ignored contacts"] = "Zobrazit pouze ignorované kontakty";
-$a->strings["Archived"] = "Archivován";
+$a->strings["Archived"] = "Archivované";
 $a->strings["Only show archived contacts"] = "Zobrazit pouze archivované kontakty";
-$a->strings["Hidden"] = "Skrytý";
+$a->strings["Hidden"] = "Skryté";
 $a->strings["Only show hidden contacts"] = "Zobrazit pouze skryté kontakty";
 $a->strings["Organize your contact groups"] = "Organizovat vaše skupiny kontaktů";
 $a->strings["Search your contacts"] = "Prohledat Vaše kontakty";
@ -2197,6 +2209,10 @@ $a->strings["to"] = "na";
 $a->strings["via"] = "přes";
 $a->strings["Wall-to-Wall"] = "Ze zdi na zeď";
 $a->strings["via Wall-To-Wall:"] = "ze zdi na zeď";
+$a->strings["Notifier task is pending"] = "Úloha pro notifiera čeká";
+$a->strings["Delivery to remote servers is pending"] = "Doručení vzdáleným serverům čeká";
+$a->strings["Delivery to remote servers is underway"] = "Doručení vzdáleným serverům je v plném proudu";
+$a->strings["Delivery to remote servers is mostly done"] = "Doručení vzdáleným serverům je téměř hotovo";
 $a->strings["%d comment"] = [
 	0 => "%d komentář",
 	1 => "%d komentáře",
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@ -135,18 +135,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir e
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "%1\$s markierte dich auf [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s markierte dich auf  [url=%2\$s]%3\$s's %4\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "%1\$s markierte dich auf [url=%2\$s]a %3\$s[/url]";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "%1\$s markierte dich auf [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat Dich erwähnt";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica-Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem Du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica-Meldung] %s hat auf Deine Pinnwand geschrieben";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb um %2\$s auf Deine Pinnwand";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s hat etwas auf [url=%2\$s]Deiner Pinnwand[/url] gepostet";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica-Meldung] %s hat Dich erwähnt";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]erwähnte Dich[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica Benachrichtigung] %s hat einen Beitrag geteilt";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s hat einen neuen Beitrag auf %2\$s geteilt";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]hat einen Beitrag geteilt[/url].";
@ -281,7 +285,7 @@ $a->strings["The GUID of the item you want to delete."] = "Die GUID des zu lösc
 $a->strings["Item marked for deletion."] = "Eintrag wurden zur Löschung markiert";
 $a->strings["unknown"] = "Unbekannt";
 $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt.";
-$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern.";
+$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Regelmäßig globale Kontakte überprüfen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern.";
 $a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Momentan kennt dieser Knoten %d Knoten mit insgesamt %d registrierten Nutzern, die die folgenden Plattformen verwenden:";
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "Empfänger Name";
@ -341,6 +345,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Nicht überprüfen";
 $a->strings["check the stable version"] = "überprüfe die stabile Version";
 $a->strings["check the development version"] = "überprüfe die Entwicklungsversion";
+$a->strings["None"] = "Keine";
 $a->strings["Republish users to directory"] = "Nutzer erneut im globalen Verzeichnis veröffentlichen.";
 $a->strings["Registration"] = "Registrierung";
 $a->strings["File upload"] = "Datei hochladen";
@ -376,6 +381,8 @@ $a->strings["Hide help entry from navigation menu"] = "Verberge den Menüeintrag
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden.";
 $a->strings["Single user instance"] = "Ein-Nutzer Instanz";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt.";
+$a->strings["File storage backend"] = "Datenspeicher im Hintergrund";
+$a->strings["Backend used to store uploaded files data"] = "Benutzter Datenspeicher um hochgeladene Daten zu speichern";
 $a->strings["Maximum image size"] = "Maximale Bildgröße";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Maximum image length"] = "Maximale Bildlänge";
@ -623,8 +630,6 @@ $a->strings["No"] = "Nein";
 $a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
-$a->strings["Item not available."] = "Beitrag nicht verfügbar.";
-$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
 $a->strings["Source input"] = "Originaltext:";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (pures HTML)";
@ -1331,7 +1336,6 @@ $a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Chec
 $a->strings["IMAP server name:"] = "IMAP-Server-Name:";
 $a->strings["IMAP port:"] = "IMAP-Port:";
 $a->strings["Security:"] = "Sicherheit:";
-$a->strings["None"] = "Keine";
 $a->strings["Email login name:"] = "E-Mail-Login-Name:";
 $a->strings["Email password:"] = "E-Mail-Passwort:";
 $a->strings["Reply-to address:"] = "Reply-to Adresse:";
@ -1962,6 +1966,13 @@ $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$sherzlich willkommen";
+$a->strings["Database storage failed to update %s"] = "Datenbankspeicher konnte nicht aktualisiert werden %s";
+$a->strings["Database storage failed to insert data"] = "Der Datenbankspeicher konnte keine Daten einfügen";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "Dateisystemspeicher konnte nicht erstellt werden \"%s\". Überprüfen Sie, ob Sie Schreibberechtigungen haben.";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "Der Dateisystemspeicher konnte die Daten nicht in \"%s\", speichern. Überprüfen Sie Ihre Schreibberechtigungen";
+$a->strings["Storage base path"] = "Speicherbasispfad";
+$a->strings["Folder were uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "Ordner in die Dateien hochgeladen werden. Für maximale Sicherheit sollte dies ein Pfad außerhalb der Webserver-Ordnerstruktur sein";
+$a->strings["Enter a valid existing folder"] = "Geben Sie einen gültigen, existierenden Ordner ein";
 $a->strings["Login failed"] = "Anmeldung fehlgeschlagen";
 $a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung";
 $a->strings["Password can't be empty"] = "Das Passwort kann nicht leer sein";
@ -2001,6 +2012,7 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Registrierung als %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
+$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
 $a->strings["%d contact edited."] = [
 	0 => "%d Kontakt bearbeitet.",
 	1 => "%d Kontakte bearbeitet.",
@ -2151,6 +2163,10 @@ $a->strings["to"] = "zu";
 $a->strings["via"] = "via";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["Notifier task is pending"] = "Die Benachrichtigungsaufgabe ist ausstehend";
+$a->strings["Delivery to remote servers is pending"] = "Die Auslieferung an Remote-Server steht noch aus";
+$a->strings["Delivery to remote servers is underway"] = "Die Auslieferung an Remote-Server ist unterwegs";
+$a->strings["Delivery to remote servers is mostly done"] = "Die Zustellung an Remote-Server ist fast erledigt";
 $a->strings["%d comment"] = [
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
--- a/view/lang/pl/messages.po
+++ b/view/lang/pl/messages.po
--- a/view/lang/pl/strings.php
+++ b/view/lang/pl/strings.php
@ -149,18 +149,22 @@ $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s wysłał(
 $a->strings["a private message"] = "prywatna wiadomość";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s wysłał(-a) ci %2\$s.";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Odwiedź %s, aby zobaczyć i/lub odpowiedzieć na twoje prywatne wiadomości.";
+$a->strings["%1\$s tagged you on [url=%2\$s]a %3\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s skomentował [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]%3\$s's %4\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$sskomentował [url=%2\$s]%3\$s %4\$s[/url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]your %3\$s[/url]"] = "";
 $a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s skomentował [url=%2\$s] twój %3\$s[/ url]";
+$a->strings["%1\$s tagged you on [url=%2\$s]their %3\$s[/url]"] = "";
+$a->strings["%1\$s commented on [url=%2\$s]their %3\$s[/url]"] = "";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Powiadomienie] %s dodał Cię";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s oznaczono Cię tagiem %2\$s";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Powiadomienie] Komentarz do rozmowy #%1\$d przez %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s skomentował(-a) rozmowę którą śledzisz.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Odwiedź %s, aby zobaczyć i/lub odpowiedzieć na rozmowę.";
 $a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Powiadomienie] %s napisał na twoim profilu";
 $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s opublikował(-a) wpis na twojej ścianie o %2\$s";
 $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s opublikował(-a) na [url=%2\$s]twojej ścianie[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Powiadomienie] %s dodał Cię";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s oznaczono Cię tagiem %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]oznaczył(-a) Cię[/url].";
 $a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Powiadomienie] %s udostępnił nowy wpis";
 $a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s udostępnił(-a) nowy wpis na %2\$s";
 $a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s[url=%2\$s]udostępnił wpis[/url].";
@ -359,6 +363,7 @@ $a->strings["Self-signed certificate, use SSL for local links only (discouraged)
 $a->strings["Don't check"] = "Nie sprawdzaj";
 $a->strings["check the stable version"] = "sprawdź wersję stabilną";
 $a->strings["check the development version"] = "sprawdź wersję rozwojową";
+$a->strings["None"] = "Brak";
 $a->strings["Republish users to directory"] = "Ponownie opublikuj użytkowników w katalogu";
 $a->strings["Registration"] = "Rejestracja";
 $a->strings["File upload"] = "Przesyłanie plików";
@ -368,8 +373,8 @@ $a->strings["Auto Discovered Contact Directory"] = "Katalog kontaktów automatyc
 $a->strings["Performance"] = "Ustawienia";
 $a->strings["Worker"] = "Pracownik";
 $a->strings["Message Relay"] = "Przekazywanie wiadomości";
-$a->strings["Relocate Instance"] = "";
-$a->strings["Warning! Advanced function. Could make this server unreachable."] = "";
+$a->strings["Relocate Instance"] = "Zmień lokalizację";
+$a->strings["Warning! Advanced function. Could make this server unreachable."] = "Ostrzeżenie! Zaawansowana funkcja. Może spowodować, że serwer będzie nieosiągalny.";
 $a->strings["Site name"] = "Nazwa strony";
 $a->strings["Host name"] = "Nazwa hosta";
 $a->strings["Sender Email"] = "E-mail nadawcy";
@ -394,6 +399,8 @@ $a->strings["Hide help entry from navigation menu"] = "Ukryj pomoc w menu nawiga
 $a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Chowa pozycje menu dla stron pomocy ze strony nawigacyjnej. Możesz nadal ją wywołać poprzez komendę /help.";
 $a->strings["Single user instance"] = "Tryb pojedynczego użytkownika";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Ustawia tryb dla wielu użytkowników lub pojedynczego użytkownika dla nazwanego użytkownika";
+$a->strings["File storage backend"] = "";
+$a->strings["Backend used to store uploaded files data"] = "";
 $a->strings["Maximum image size"] = "Maksymalny rozmiar zdjęcia";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maksymalny rozmiar w bitach dla wczytywanego obrazu . Domyślnie jest to  0 , co oznacza bez limitu .";
 $a->strings["Maximum image length"] = "Maksymalna długość obrazu";
@ -438,16 +445,16 @@ $a->strings["Allow Users to set remote_self"] = "Zezwól użytkownikom na ustawi
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Po sprawdzeniu tego każdy użytkownik może zaznaczyć każdy kontakt jako zdalny w oknie dialogowym kontaktu naprawczego. Ustawienie tej flagi na kontakcie powoduje dublowanie każdego wpisu tego kontaktu w strumieniu użytkowników.";
 $a->strings["Block multiple registrations"] = "Zablokuj wielokrotną rejestrację";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Nie pozwalaj użytkownikom na zakładanie dodatkowych kont do używania jako strony. ";
-$a->strings["OpenID support"] = "Wsparcie OpenID";
-$a->strings["OpenID support for registration and logins."] = "Obsługa OpenID do rejestracji i logowania.";
-$a->strings["Fullname check"] = "Sprawdzanie pełnej nazwy";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Aby ograniczyć spam, wymagaj by użytkownik przy rejestracji w polu Imię i nazwisko użył spacji pomiędzy imieniem i nazwiskiem.";
+$a->strings["Disable OpenID"] = "Wyłącz OpenID";
+$a->strings["Disable OpenID support for registration and logins."] = "Wyłącz obsługę OpenID dla rejestracji i logowania.";
+$a->strings["No Fullname check"] = "Bez sprawdzania pełnej nazwy";
+$a->strings["Allow users to register without a space between the first name and the last name in their full name."] = "Zezwól użytkownikom na rejestrację bez spacji między imieniem i nazwiskiem w ich pełnym imieniu.";
 $a->strings["Community pages for visitors"] = "Strony społecznościowe dla odwiedzających";
 $a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Które strony społeczności powinny być dostępne dla odwiedzających. Lokalni użytkownicy zawsze widzą obie strony.";
 $a->strings["Posts per user on community page"] = "Lista postów użytkownika na stronie społeczności";
 $a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Maksymalna liczba postów na użytkownika na stronie społeczności. (Nie dotyczy 'społeczności globalnej')";
-$a->strings["Enable OStatus support"] = "Włącz wsparcie OStatus";
-$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Zapewnij kompatybilność z OStatus (StatusNet, GNU Social itp.). Cała komunikacja w stanie OStatus jest jawna, dlatego ostrzeżenia o prywatności będą czasami wyświetlane.";
+$a->strings["Disable OStatus support"] = "Wyłącz obsługę OStatus";
+$a->strings["Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
 $a->strings["Only import OStatus/ActivityPub threads from our contacts"] = "Importuj wątki OStatus/ActivityPub tylko z naszych kontaktów";
 $a->strings["Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normalnie importujemy każdą zawartość z naszych kontaktów OStatus i ActivityPub. W tej opcji przechowujemy tylko wątki uruchomione przez kontakt znany w naszym systemie.";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "Obsługa OStatus może być włączona tylko wtedy, gdy włączone jest wątkowanie.";
@ -560,7 +567,7 @@ $a->strings["%s user blocked/unblocked"] = [
 	2 => "zablokowano/odblokowano %s użytkowników",
 	3 => "%sużytkowników zablokowanych/odblokowanych",
 ];
-$a->strings["You can't remove yourself"] = "";
+$a->strings["You can't remove yourself"] = "Nie możesz usunąć siebie";
 $a->strings["%s user deleted"] = [
 	0 => "usunięto %s użytkownika",
 	1 => "usunięto %s użytkowników",
@ -596,7 +603,7 @@ $a->strings["User blocked"] = "Użytkownik zablokowany";
 $a->strings["Site admin"] = "Administracja stroną";
 $a->strings["Account expired"] = "Konto wygasło";
 $a->strings["New User"] = "Nowy użytkownik";
-$a->strings["Delete in"] = "Usuń w";
+$a->strings["Permanent deletion"] = "Trwałe usunięcie";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Zaznaczeni użytkownicy zostaną usunięci!\\n\\n Wszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?";
 $a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Użytkownik {0} zostanie usunięty!\\n\\n Wszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?";
 $a->strings["Name of the new user."] = "Nazwa nowego użytkownika.";
@ -645,8 +652,6 @@ $a->strings["No"] = "Nie";
 $a->strings["You must be logged in to use addons. "] = "Musisz być zalogowany(-a), aby korzystać z dodatków. ";
 $a->strings["Applications"] = "Aplikacje";
 $a->strings["No installed applications."] = "Brak zainstalowanych aplikacji.";
-$a->strings["Item not available."] = "Element niedostępny.";
-$a->strings["Item was not found."] = "Element nie znaleziony.";
 $a->strings["Source input"] = "Źródło wejściowe";
 $a->strings["BBCode::toPlaintext"] = "BBCode::na prosty tekst";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode:: konwersjia (raw HTML)";
@ -849,7 +854,6 @@ $a->strings["Upload"] = "Załaduj";
 $a->strings["Files"] = "Pliki";
 $a->strings["You must be logged in to use this module"] = "Musisz być zalogowany, aby korzystać z tego modułu";
 $a->strings["Source URL"] = "Źródłowy adres URL";
-$a->strings["Not Found"] = "Nie znaleziono";
 $a->strings["- select -"] = "- wybierz -";
 $a->strings["The contact could not be added."] = "Nie można dodać kontaktu.";
 $a->strings["You already added this contact."] = "Już dodałeś ten kontakt.";
@ -893,6 +897,7 @@ $a->strings["Add contact to group"] = "Dodaj kontakt do grupy";
 $a->strings["No profile"] = "Brak profilu";
 $a->strings["Help:"] = "Pomoc:";
 $a->strings["Help"] = "Pomoc";
+$a->strings["Not Found"] = "Nie znaleziono";
 $a->strings["Welcome to %s"] = "Witamy w %s";
 $a->strings["Total invitation limit exceeded."] = "Przekroczono limit zaproszeń ogółem.";
 $a->strings["%s : Not a valid email address."] = "%s : Nieprawidłowy adres e-mail.";
@ -959,7 +964,8 @@ $a->strings["Manage Identities and/or Pages"] = "Zarządzaj tożsamościami i/lu
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Przełącz między różnymi tożsamościami lub stronami społeczność/grupy, które udostępniają dane Twojego konta lub które otrzymałeś uprawnienia \"zarządzaj\"";
 $a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania: ";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Brak pasujących słów kluczowych. Dodaj słowa kluczowe do domyślnego profilu.";
-$a->strings["is interested in:"] = "interesuje się:";
+$a->strings["first"] = "pierwszy";
+$a->strings["next"] = "następny";
 $a->strings["Profile Match"] = "Dopasowanie profilu";
 $a->strings["New Message"] = "Nowa wiadomość";
 $a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
@ -1148,7 +1154,6 @@ $a->strings["Comment"] = "Komentarz";
 $a->strings["Map"] = "Mapa";
 $a->strings["View Album"] = "Zobacz album";
 $a->strings["{0} wants to be your friend"] = "{0} chce być Twoim znajomym";
-$a->strings["{0} sent you a message"] = "{0} wysłałem Ci wiadomość";
 $a->strings["{0} requested registration"] = "{0} wymagana rejestracja";
 $a->strings["Poke/Prod"] = "Zaczepić";
 $a->strings["poke, prod or do other things to somebody"] = "szturchać, zaczepić lub robić inne rzeczy";
@ -1156,7 +1161,6 @@ $a->strings["Recipient"] = "Odbiorca";
 $a->strings["Choose what you wish to do to recipient"] = "Wybierz, co chcesz zrobić";
 $a->strings["Make this post private"] = "Ustaw ten post jako prywatny";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Tylko zalogowani użytkownicy mogą wykonywać sondowanie.";
-$a->strings["Requested profile is not available."] = "Żądany profil jest niedostępny.";
 $a->strings["%s's timeline"] = "oś czasu %s";
 $a->strings["%s's posts"] = "wpisy %s";
 $a->strings["%s's comments"] = "komentarze %s";
@ -1313,12 +1317,10 @@ $a->strings["Failed to connect with email account using the settings provided."]
 $a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
 $a->strings["Features updated"] = "Funkcje zaktualizowane";
 $a->strings["Relocate message has been send to your contacts"] = "Przeniesienie wiadomości zostało wysłane do Twoich kontaktów";
-$a->strings["Passwords do not match. Password unchanged."] = "Hasła nie pasują do siebie. Hasło niezmienione.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Puste hasła są niedozwolone. Hasło niezmienione.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne.";
-$a->strings["Wrong password."] = "Złe hasło.";
-$a->strings["Password changed."] = "Hasło zostało zmienione.";
+$a->strings["Passwords do not match."] = "Hasła nie pasują do siebie.";
 $a->strings["Password update failed. Please try again."] = "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie.";
+$a->strings["Password changed."] = "Hasło zostało zmienione.";
+$a->strings["Password unchanged."] = "Hasło niezmienione.";
 $a->strings[" Please use a shorter name."] = " Proszę użyć krótszej nazwy.";
 $a->strings[" Name too short."] = " Nazwa jest zbyt krótka.";
 $a->strings["Wrong Password"] = "Złe hasło";
@ -1364,7 +1366,6 @@ $a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
 $a->strings["IMAP server name:"] = "Nazwa serwera IMAP:";
 $a->strings["IMAP port:"] = "Port IMAP:";
 $a->strings["Security:"] = "Ochrona:";
-$a->strings["None"] = "Brak";
 $a->strings["Email login name:"] = "Nazwa logowania e-mail:";
 $a->strings["Email password:"] = "E-mail hasło:";
 $a->strings["Reply-to address:"] = "Adres zwrotny:";
@ -1447,6 +1448,7 @@ $a->strings["Expire photos:"] = "Wygasanie zdjęć:";
 $a->strings["Only expire posts by others:"] = "Wygaszaj tylko te posty, które zostały napisane przez inne osoby:";
 $a->strings["Account Settings"] = "Ustawienia konta";
 $a->strings["Password Settings"] = "Ustawienia hasła";
+$a->strings["Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:)."] = "";
 $a->strings["Leave password fields blank unless changing"] = "Pozostaw pole hasła puste, jeżeli nie chcesz go zmienić.";
 $a->strings["Current Password:"] = "Aktualne hasło:";
 $a->strings["Your current password to confirm the changes"] = "Wpisz aktualne hasło, aby potwierdzić zmiany";
@ -1698,9 +1700,7 @@ $a->strings["Embedding disabled"] = "Osadzanie wyłączone";
 $a->strings["Embedded content"] = "Osadzona zawartość";
 $a->strings["newer"] = "nowsze";
 $a->strings["older"] = "starsze";
-$a->strings["first"] = "pierwszy";
 $a->strings["prev"] = "poprzedni";
-$a->strings["next"] = "następny";
 $a->strings["last"] = "ostatni";
 $a->strings["view full size"] = "zobacz pełny rozmiar";
 $a->strings["Image/photo"] = "Obrazek/zdjęcie";
@ -1764,7 +1764,6 @@ $a->strings["Welcome back "] = "Witaj ponownie ";
 $a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Nie można znaleźć żadnego wpisu kontaktu zarchiwizowanego dla tego adresu URL (%s)";
 $a->strings["The contact entries have been archived"] = "Wpisy kontaktów zostały zarchiwizowane";
 $a->strings["Enter new password: "] = "Wprowadź nowe hasło: ";
-$a->strings["Password can't be empty"] = "Hasło nie może być puste";
 $a->strings["Post update version number has been set to %s."] = "Numer wersji aktualizacji posta został ustawiony na %s.";
 $a->strings["Check for pending update actions."] = "Sprawdź oczekujące działania aktualizacji.";
 $a->strings["Done."] = "Gotowe.";
@ -1806,11 +1805,13 @@ $a->strings["iconv PHP module"] = "Moduł PHP iconv";
 $a->strings["Error: iconv PHP module required but not installed."] = "Błąd: wymagany moduł PHP iconv, ale nie zainstalowany.";
 $a->strings["POSIX PHP module"] = "Moduł POSIX PHP";
 $a->strings["Error: POSIX PHP module required but not installed."] = "Błąd: wymagany moduł POSIX PHP, ale nie zainstalowany.";
-$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "";
+$a->strings["JSON PHP module"] = "Moduł PHP JSON";
+$a->strings["Error: JSON PHP module required but not installed."] = "Błąd: wymagany jest moduł JSON PHP, ale nie jest zainstalowany.";
+$a->strings["The web installer needs to be able to create a file called \"local.config.php\" in the \"config\" folder of your web server and it is unable to do so."] = "Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \"local.config.php\" w folderze \"config\" serwera WWW i nie może tego zrobić.";
 $a->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."] = "Jest to najczęściej ustawienie uprawnień, ponieważ serwer sieciowy może nie być w stanie zapisywać plików w folderze - nawet jeśli możesz.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica \"config\" folder."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatywnie można pominąć tę procedurę i wykonać ręczną instalację. Proszę zobaczyć plik 'INSTALL.txt' z instrukcjami.";
-$a->strings["config/local.config.php is writable"] = "";
+$a->strings["config/local.config.php is writable"] = "config/local.config.php jest zapisywalny";
 $a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica używa silnika szablonów Smarty3 do renderowania swoich widoków. Smarty3 kompiluje szablony do PHP, aby przyspieszyć renderowanie.";
 $a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Aby przechowywać te skompilowane szablony, serwer WWW musi mieć dostęp do zapisu do katalogu view/smarty3/ w folderze najwyższego poziomu Friendica.";
 $a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Upewnij się, że użytkownik, na którym działa serwer WWW (np. www-data), ma prawo do zapisu do tego folderu.";
@ -1882,6 +1883,18 @@ $a->strings["%s is now friends with %s"] = "%s jest teraz znajomym %s";
 $a->strings["Friend Suggestion"] = "Propozycja znajomych";
 $a->strings["Friend/Connect Request"] = "Prośba o dodanie do przyjaciół/powiązanych";
 $a->strings["New Follower"] = "Nowy obserwujący";
+$a->strings["Error 400 - Bad Request"] = "Błąd 400 - nieprawidłowe żądanie";
+$a->strings["Error 401 - Unauthorized"] = "Błąd 401 - Nieautoryzowane";
+$a->strings["Error 403 - Forbidden"] = "Błąd 403 - Zabroniony";
+$a->strings["Error 404 - Not Found"] = "Błąd 404 nie znaleziono";
+$a->strings["Error 500 - Internal Server Error"] = "Błąd 500 - Błąd wewnętrzny serwera";
+$a->strings["Error 503 - Service Unavailable"] = "Błąd 503 Usługa Niedostępna";
+$a->strings["The server cannot or will not process the request due to an apparent client error."] = "Serwer nie może lub nie będzie przetwarzać żądania z powodu widocznego błędu klienta.";
+$a->strings["Authentication is required and has failed or has not yet been provided."] = "Uwierzytelnienie jest wymagane i nie powiodło się lub nie zostało jeszcze dostarczone.";
+$a->strings["The request was valid, but the server is refusing action. The user might not have the necessary permissions for a resource, or may need an account."] = "Żądanie było ważne, ale serwer odmawia działania. Użytkownik może nie mieć wymaganych uprawnień do zasobu lub może potrzebować konta.";
+$a->strings["The requested resource could not be found but may be available in the future."] = "Żądany zasób nie został znaleziony, ale może być dostępny w przyszłości.";
+$a->strings["An unexpected condition was encountered and no more specific message is suitable."] = "Napotkano nieoczekiwany warunek i nie jest odpowiedni żaden bardziej szczegółowy komunikat.";
+$a->strings["The server is currently unavailable (because it is overloaded or down for maintenance). Please try again later."] = "Serwer jest obecnie niedostępny (ponieważ jest przeciążony lub wyłączony z powodu konserwacji). Spróbuj ponownie później.";
 $a->strings["Update %s failed. See error logs."] = "Aktualizacja %s nie powiodła się. Zobacz dziennik błędów.";
 $a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tDeweloperzy friendica wydali niedawno aktualizację %s,\n\t\t\t\tale podczas próby instalacji, coś poszło nie tak.\n\t\t\t\tZostanie to naprawione wkrótce i nie mogę tego zrobić sam. Proszę skontaktować się z \n\t\t\t\tprogramistami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być nieprawidłowa.";
 $a->strings["The error message is\n[pre]%s[/pre]"] = "Komunikat o błędzie jest \n[pre]%s[/ pre]";
@ -1959,6 +1972,7 @@ $a->strings["View on separate page"] = "Zobacz na oddzielnej stronie";
 $a->strings["view on separate page"] = "zobacz na oddzielnej stronie";
 $a->strings["[no subject]"] = "[bez tematu]";
 $a->strings["Requested account is not available."] = "Żądane konto jest niedostępne.";
+$a->strings["Requested profile is not available."] = "Żądany profil jest niedostępny.";
 $a->strings["Edit profile"] = "Edytuj profil";
 $a->strings["Atom feed"] = "Kanał Atom";
 $a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
@ -1992,8 +2006,20 @@ $a->strings["Profile Details"] = "Szczegóły profilu";
 $a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
 $a->strings["Tips for New Members"] = "Wskazówki dla nowych użytkowników";
 $a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s wita %2\$s";
+$a->strings["Database storage failed to update %s"] = "";
+$a->strings["Database storage failed to insert data"] = "Magazyn bazy danych nie mógł wstawić danych";
+$a->strings["Filesystem storage failed to create \"%s\". Check you write permissions."] = "";
+$a->strings["Filesystem storage failed to save data to \"%s\". Check your write permissions"] = "";
+$a->strings["Storage base path"] = "";
+$a->strings["Folder were uploaded files are saved. For maximum security, This should be a path outside web server folder tree"] = "";
+$a->strings["Enter a valid existing folder"] = "";
 $a->strings["Login failed"] = "Logowanie nieudane";
 $a->strings["Not enough information to authenticate"] = "Za mało informacji do uwierzytelnienia";
+$a->strings["Password can't be empty"] = "Hasło nie może być puste";
+$a->strings["Empty passwords are not allowed."] = "Puste hasła są niedozwolone.";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne.";
+$a->strings["The password can't contain accentuated letters, white spaces or colons (:)"] = "Hasło nie może zawierać podkreślonych liter, białych spacji ani dwukropków (:)";
+$a->strings["Passwords do not match. Password unchanged."] = "Hasła nie pasują do siebie. Hasło niezmienione.";
 $a->strings["An invitation is required."] = "Wymagane zaproszenie.";
 $a->strings["Invitation could not be verified."] = "Zaproszenie niezweryfikowane.";
 $a->strings["Invalid OpenID url"] = "Nieprawidłowy adres url OpenID";
@ -2030,6 +2056,7 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Rejestracja w %s";
 $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tSzanowny(-a) %1\$s,\n\t\t\t\tDziękujemy za rejestrację na stronie %2\$s. Twoje konto zostało utworzone.";
 $a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%3\$s\n\t\t\tNazwa użytkownika:\t\t%1\$s\n\t\t\tHasło:\t\t%5\$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\".\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil użytkownika\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) \n\t\t\ti być może gdzie mieszkasz; jeśli nie chcesz podać więcej szczegów.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół.\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić na stronie %3\$s/removeme\n\n\t\t\tDziękujemy i Zapraszamy do %2\$s.";
+$a->strings["Item was not found."] = "Element nie znaleziony.";
 $a->strings["%d contact edited."] = [
 	0 => "Zedytowano %d kontakt.",
 	1 => "Zedytowano %d kontakty.",
@ -2182,6 +2209,10 @@ $a->strings["to"] = "do";
 $a->strings["via"] = "przez";
 $a->strings["Wall-to-Wall"] = "Wall-to-Wall";
 $a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["Notifier task is pending"] = "";
+$a->strings["Delivery to remote servers is pending"] = "";
+$a->strings["Delivery to remote servers is underway"] = "";
+$a->strings["Delivery to remote servers is mostly done"] = "";
 $a->strings["%d comment"] = [
 	0 => "%d komentarz",
 	1 => "%d komentarze",
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@ -51,7 +51,7 @@
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_input.tpl" field=$shortcut_icon}}
 	{{include file="field_input.tpl" field=$touch_icon}}
-	{{include file="field_textarea.tpl" field=$info}}
+	{{include file="field_textarea.tpl" field=$additional_info}}
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}
 	{{include file="field_select.tpl" field=$theme_mobile}}
--- a/view/templates/comment_item.tpl
+++ b/view/templates/comment_item.tpl
@ -17,7 +17,7 @@
 					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});">{{if $threaded != false}}{{$default}}{{/if}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
 					<option value=""></option>
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@ -45,12 +45,45 @@
 <script type="text/javascript" src="view/js/main.js" ></script>
 <script>

-	var updateInterval = {{$update_interval}};
+	// Lifted from https://css-tricks.com/snippets/jquery/move-cursor-to-end-of-textarea-or-input/
+    jQuery.fn.putCursorAtEnd = function() {
+        return this.each(function() {
+            // Cache references
+            var $el = $(this),
+                el = this;
+
+            // Only focus if input isn't already
+            if (!$el.is(":focus")) {
+                $el.focus();
+            }
+
+            // If this function exists... (IE 9+)
+            if (el.setSelectionRange) {
+                // Double the length because Opera is inconsistent about whether a carriage return is one character or two.
+                var len = $el.val().length * 2;
+
+                // Timeout seems to be required for Blink
+                setTimeout(function() {
+                    el.setSelectionRange(len, len);
+                }, 1);
+            } else {
+                // As a fallback, replace the contents with itself
+                // Doesn't work in Chrome, but Chrome supports setSelectionRange
+                $el.val($el.val());
+            }
+
+            // Scroll to the bottom, in case we're in a tall textarea
+            // (Necessary for Firefox and Chrome)
+            this.scrollTop = 999999;
+        });
+    };
+
+    var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};

 	function confirmDelete() { return confirm("{{$delitem}}"); }
 	function commentExpand(id) {
-		$("#comment-edit-text-" + id).value = "";
+		$("#comment-edit-text-" + id).putCursorAtEnd();
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#comment-edit-text-" + id).focus();
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@ -4,7 +4,7 @@
 *}}
 {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
 <span class="delivery">
-	&bullet;
+	&bull;
 	{{if $delivery.queue_count == 0}}
 		{{$delivery.notifier_pending}}
 	{{elseif $delivery.queue_done == 0}}
--- a/view/theme/duepuntozero/templates/comment_item.tpl
+++ b/view/theme/duepuntozero/templates/comment_item.tpl
@ -44,7 +44,7 @@
 						data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"></a></li>
 				</ul>
 				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});"></textarea>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});">{{if $threaded != false}}{{$default}}{{/if}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
 					<option value=""></option>
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@ -2,6 +2,39 @@
 * @brief The file contains functions for text editing and commenting
 */

+// Lifted from https://css-tricks.com/snippets/jquery/move-cursor-to-end-of-textarea-or-input/
+jQuery.fn.putCursorAtEnd = function() {
+	return this.each(function() {
+		// Cache references
+		var $el = $(this),
+			el = this;
+
+		// Only focus if input isn't already
+		if (!$el.is(":focus")) {
+			$el.focus();
+		}
+
+		// If this function exists... (IE 9+)
+		if (el.setSelectionRange) {
+			// Double the length because Opera is inconsistent about whether a carriage return is one character or two.
+			var len = $el.val().length * 2;
+
+			// Timeout seems to be required for Blink
+			setTimeout(function() {
+				el.setSelectionRange(len, len);
+			}, 1);
+		} else {
+			// As a fallback, replace the contents with itself
+			// Doesn't work in Chrome, but Chrome supports setSelectionRange
+			$el.val($el.val());
+		}
+
+		// Scroll to the bottom, in case we're in a tall textarea
+		// (Necessary for Firefox and Chrome)
+		this.scrollTop = 999999;
+	});
+};
+
 function commentGetLink(id, prompttext) {
 	reply = prompt(prompttext);
 	if(reply && reply.length) {
@ -102,7 +135,7 @@ function cmtBbClose(id) {
 }

 function commentExpand(id) {
-	$("#comment-edit-text-" + id).value = '';
+	$("#comment-edit-text-" + id).putCursorAtEnd();
 	$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 	$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 	$("#comment-edit-text-" + id).focus();
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@ -80,7 +80,7 @@
 					{{include file="field_textarea.tpl" field=$banner}}
 					{{include file="field_input.tpl" field=$shortcut_icon}}
 					{{include file="field_input.tpl" field=$touch_icon}}
-					{{include file="field_textarea.tpl" field=$info}}
+					{{include file="field_textarea.tpl" field=$additional_info}}
 					{{include file="field_select.tpl" field=$language}}
 					{{include file="field_select.tpl" field=$theme}}
 					{{include file="field_select.tpl" field=$theme_mobile}}
--- a/view/theme/frio/templates/admin/users.tpl
+++ b/view/theme/frio/templates/admin/users.tpl
@ -106,141 +106,147 @@
 				<div id="admin-settings-user-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-user">

 					{{if $users}}
-					<table id="users" class="table table-hover">
-						<thead>
-							<tr>
-								<th></th>
-								<th></th>
-								{{foreach $th_users as $k=>$th}}
-									{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
-									<th class="th-{{$k}}">
-										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="btn-link table-order">
-											{{if $order_users == $th.1}}
-												{{if $order_direction_users == "+"}}
-												&#8595;
+					<div class="panel-body">
+						<table id="users" class="table table-hover">
+							<thead>
+								<tr>
+									<th></th>
+									<th></th>
+									{{foreach $th_users as $k=>$th}}
+										{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+										<th class="th-{{$k}}">
+											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="btn-link table-order">
+												{{if $order_users == $th.1}}
+													{{if $order_direction_users == "+"}}
+													&#8595;
+													{{else}}
+													&#8593;
+													{{/if}}
 												{{else}}
-												&#8593;
+												&#8597;
 												{{/if}}
-											{{else}}
-											&#8597;
-											{{/if}}
-											{{$th.0}}
-										</button>
-									</th>
-									{{/if}}
-								{{/foreach}}
-								<th></th>
-							</tr>
-						</thead>
-						<tbody>
-						{{foreach $users as $u}}
-							<tr id="user-{{$u.uid}}" class="{{if $u.blocked != 0}}blocked{{/if}}">
-								<td>
-								{{if $u.is_deletable}}
-								<div class="checkbox">
-									<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
-									<label for="id_user_{{$u.uid}}"></label>
-								</div>
-								{{else}}
-								&nbsp;
-								{{/if}}
-								</td>
-								<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
-								<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
-								<td>{{$u.email}}</td>
-								{{if $order_users == $th_users.2.1}}
-								<td>{{$u.register_date}}</td>
-								{{/if}}
-
-								{{if $order_users == $th_users.3.1}}
-								<td>{{$u.login_date}}</td>
-								{{/if}}
-
-								{{if $order_users == $th_users.4.1}}
-								<td>{{$u.lastitem_date}}</td>
-								{{/if}}
-
-								{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
-								<td>
-									<i class="fa
-										{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
-										{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
-										{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
-										{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
-										{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
-										{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
-										" title="{{$u.page_flags}}">
-									</i>
-									{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
-									<i class="fa
-										{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
-										{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
-										{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
-										" title="{{$u.account_type}}">
-									</i>
-									{{/if}}
-									{{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin}}"></i>{{/if}}
-									{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
-								</td>
-								{{/if}}
-
-								<td class="text-right">
-									<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
-								</td>
-							</tr>
-							<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
-								<td>&nbsp;</td>
-								<td colspan="4">
-									{{if $order_users != $th_users.2.1}}
-									<p>
-										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
-										&#8597; {{$th_users.2.0}}</button> : {{$u.register_date}}
-									</p>
-									{{/if}}
-
-									{{if $order_users != $th_users.3.1}}
-									<p>
-										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
-											&#8597; {{$th_users.3.0}}</button> : {{$u.login_date}}
-									</p>
-									{{/if}}
-
-									{{if $order_users != $th_users.4.1}}
-									<p>
-										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
-											&#8597; {{$th_users.4.0}}</button> : {{$u.lastitem_date}}
-									</p>
-									{{/if}}
-
-									{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
-									<p>
-										<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
-											&#8597; {{$th_users.5.0}}</button> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
-									</p>
-									{{/if}}
-
-								</td>
-								<td class="text-right">
-									{{if $u.is_deletable}}
-									<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link"title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
-										{{if $u.blocked == 0}}
-										<i class="fa fa-ban" aria-hidden="true"></i>
-										{{else}}
-										<i class="fa fa-circle-o" aria-hidden="true"></i>
+												{{$th.0}}
+											</button>
+										</th>
 										{{/if}}
-									</a>
-									<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
-										<i class="fa fa-trash" aria-hidden="true"></i>
-									</a>
+									{{/foreach}}
+									<th></th>
+								</tr>
+							</thead>
+							<tbody>
+							{{foreach $users as $u}}
+								<tr id="user-{{$u.uid}}" class="{{if $u.blocked != 0}}blocked{{/if}}">
+									<td>
+									{{if $u.is_deletable}}
+									<div class="checkbox">
+										<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
+										<label for="id_user_{{$u.uid}}"></label>
+									</div>
 									{{else}}
 									&nbsp;
 									{{/if}}
-								</td>
-							</tr>
-						{{/foreach}}
-						</tbody>
-					</table>
+									</td>
+									<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+									<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
+									<td>{{$u.email}}</td>
+									{{if $order_users == $th_users.2.1}}
+									<td>{{$u.register_date}}</td>
+									{{/if}}
+
+									{{if $order_users == $th_users.3.1}}
+									<td>{{$u.login_date}}</td>
+									{{/if}}
+
+									{{if $order_users == $th_users.4.1}}
+									<td>{{$u.lastitem_date}}</td>
+									{{/if}}
+
+									{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+									<td>
+										<i class="fa
+											{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
+											{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
+											{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
+											{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
+											{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
+											{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
+											" title="{{$u.page_flags}}">
+										</i>
+										{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
+										<i class="fa
+											{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
+											{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
+											{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
+											" title="{{$u.account_type}}">
+										</i>
+										{{/if}}
+										{{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin}}"></i>{{/if}}
+										{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
+									</td>
+									{{/if}}
+
+									<td class="text-right">
+										<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
+									</td>
+								</tr>
+								<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
+									<td>&nbsp;</td>
+									<td colspan="4">
+										{{if $order_users != $th_users.2.1}}
+										<p>
+											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
+											&#8597; {{$th_users.2.0}}</button> : {{$u.register_date}}
+										</p>
+										{{/if}}
+
+										{{if $order_users != $th_users.3.1}}
+										<p>
+											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
+												&#8597; {{$th_users.3.0}}</button> : {{$u.login_date}}
+										</p>
+										{{/if}}
+
+										{{if $order_users != $th_users.4.1}}
+										<p>
+											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
+												&#8597; {{$th_users.4.0}}</button> : {{$u.lastitem_date}}
+										</p>
+										{{/if}}
+
+										{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+										<p>
+											<button type="button" data-order-url="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
+												&#8597; {{$th_users.5.0}}</button> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
+										</p>
+										{{/if}}
+
+									</td>
+									<td class="text-right">
+										{{if $u.is_deletable}}
+										<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link"title="{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}">
+											{{if $u.blocked == 0}}
+											<i class="fa fa-ban" aria-hidden="true"></i>
+											{{else}}
+											<i class="fa fa-circle-o" aria-hidden="true"></i>
+											{{/if}}
+										</a>
+										<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
+											<i class="fa fa-trash" aria-hidden="true"></i>
+										</a>
+										{{else}}
+										&nbsp;
+										{{/if}}
+									</td>
+								</tr>
+							{{/foreach}}
+							</tbody>
+						</table>
+					</div>
+					{{else}}
+					<div class="panel-body text-center bg-danger">NO USERS?!?</div>
+					{{/if}}
 					<div class="panel-footer">
+						{{if $users}}
 						<div class="row">
 							<div class="col-xs-3 admin-settings-footer-elements">
 								<div class="checkbox">
@ -257,10 +263,8 @@
 								</button>
 							</div>
 						</div>
+						{{/if}}
 					</div>
-					{{else}}
-					<div class="panel-body text-center bg-danger">NO USERS?!?</div>
-					{{/if}}
 				</div>
 			</div>

--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@ -14,7 +14,7 @@
 		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />

 		<div class="bb form-group">
-			<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});"></textarea>
+			<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});">{{$default}}</textarea>
 		</div>
 		{{if $qcomment}}
 			<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
--- a/view/theme/frio/templates/sub/delivery_count.tpl
+++ b/view/theme/frio/templates/sub/delivery_count.tpl
@ -1,6 +1,6 @@
 {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
 <span class="delivery">
-	&bullet;
+	&bull;
 	{{if $delivery.queue_count == 0}}
 		<i class="fa fa-hourglass-o" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
 		<span class="sr-only">{{$delivery.notifier_pending}}</span>
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@ -237,25 +237,25 @@ function frio_remote_nav($a, &$nav)
 	} elseif (!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
 		$nav['remote'] = L10n::t('Guest');
-		$remoteUser = $r[0];
 	} elseif (Model\Profile::getMyURL()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
 			DBA::escape($webbie));
 		$nav['remote'] = L10n::t('Visitor');
-		$remoteUser = $r[0];
 	} else {
 		$r = false;
 	}

+	$remoteUser = null;
 	if (DBA::isResult($r)) {
 		$nav['userinfo'] = [
 			'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
 			'name' => $r[0]['name'],
 		];
+		$remoteUser = $r[0];
 	}

-	if (!local_user() && !empty($server_url)) {
+	if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
 		$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];

 		// user menu
--- a/view/theme/quattro/templates/comment_item.tpl
+++ b/view/theme/quattro/templates/comment_item.tpl
@ -42,7 +42,7 @@
 					class="comment-edit-text-empty"
 					name="body"
 					placeholder="{{$comment}}"
-					onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});"></textarea>
+					onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});">{{if $threaded != false}}{{$default}}{{/if}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
 					<option value=""></option>
--- a/view/theme/vier/templates/comment_item.tpl
+++ b/view/theme/vier/templates/comment_item.tpl
@ -17,7 +17,7 @@
 					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});"></textarea>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});">{{if $threaded != false}}{{$default}}{{/if}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
 					<option value=""></option>
--- a/view/theme/vier/templates/sub/delivery_count.tpl
+++ b/view/theme/vier/templates/sub/delivery_count.tpl
@ -1,6 +1,6 @@
 {{if $delivery.queue_count >= -1 && $delivery.queue_count !== '' && $delivery.queue_count !== null}}
 <span class="delivery">
-	&bullet;
+	&bull;
 	{{if $delivery.queue_count == 0}}
 		<i class="icon-spinner" aria-hidden="true" title="{{$delivery.notifier_pending}}"></i>
 		<span class="sr-only">{{$delivery.notifier_pending}}</span>